commit 5127857 refs/heads/master (HEAD, origin/master, origin/HEAD, master) Merge: 64e64c6 336783a Author: Aaron Patterson Date: 2014-10-10 09:11:56 -0700 Merge pull request #17014 from grosser/grosser/fast-fixtures speed up fixtures by not loading all their classes commit 64e64c6 refs/heads/master Author: Yves Senn Date: 2014-10-10 08:53:22 +0200 tests, move `original_` var assignments outside of `begin`. M activejob/test/cases/queue_naming_test.rb M activejob/test/integration/queuing_test.rb commit 5f1a274 refs/heads/master Merge: e3207bd 4a1dbba Author: Yves Senn Date: 2014-10-10 08:48:01 +0200 Merge pull request #17223 from bgentry/active-job-empty-queue-name ActiveJob: allow empty queue names commit 4a1dbba refs/heads/master Author: Blake Gentry Date: 2014-10-09 10:33:55 -0700 ActiveJob: allow blank queue names As discussed in #17195, Que uses blank queue names by default for performance reasons. At the very least, ActiveJob should allow users to choose "" as their queue name. This commit allows blank queue names, as well as tests to make sure that nil queue names still use the default. M activejob/lib/active_job/queue_name.rb M activejob/test/cases/queue_naming_test.rb commit e462489 refs/remotes/origin/4-0-stable (origin/4-0-stable) Author: Rafael Mendonça França Date: 2014-10-09 13:18:59 -0300 Merge pull request #17221 from StefanH/fix-unknown-http-method-message Invalid HTTP method will raise I18n::InvalidLocale if :en is not a valid locale. Conflicts: actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit 937010f refs/remotes/origin/4-1-stable (origin/4-1-stable) Author: Rafael Mendonça França Date: 2014-10-09 13:18:59 -0300 Merge pull request #17221 from StefanH/fix-unknown-http-method-message Invalid HTTP method will raise I18n::InvalidLocale if :en is not a valid locale. M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit e3207bd refs/heads/master Merge: 344ec1b e86cadc Author: Rafael Mendonça França Date: 2014-10-09 13:18:59 -0300 Merge pull request #17221 from StefanH/fix-unknown-http-method-message Invalid HTTP method will raise I18n::InvalidLocale if :en is not a valid locale. commit e86cadc refs/heads/master Author: Stefan Henzen Date: 2014-10-09 15:45:49 +0200 Request#check_method no longer breaks when :en is not available locale Request#check_method would use to_sentence(locale: :en), which breaks when I18n.available_locales does not include :en and I18n.enforce_available_locales is true (default). Inlined to_sentence functionality to solve this. M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit 344ec1b refs/heads/master Merge: 30ea1a7 c6a06e8 Author: Abdelkader Boudih Date: 2014-10-09 13:06:45 +0100 Merge pull request #17219 from Gaurav2728/gaurav-missing_i18_link [ci skip] removing ruby-i18n.org/wiki link that is not available and usi... commit c6a06e8 refs/heads/master Author: Gaurav Sharma Date: 2014-10-09 17:07:58 +0530 [ci skip] removing ruby-i18n.org/wiki link that is not available and using “gems” instead of plugins M guides/source/i18n.md commit 30ea1a7 refs/heads/master Merge: ee9f86e 1472e0c Author: Rafael Mendonça França Date: 2014-10-08 15:06:46 -0300 Merge pull request #17215 from aripollak/sidekiq-no-retry-option Don't pass retry option to Sidekiq commit 1472e0c refs/heads/master Author: Ari Pollak Date: 2014-10-08 13:41:38 -0400 Don't pass retry option to Sidekiq * This would override whatever default is configured in Sidekiq system-wide, and retry is true by default anyway. M activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb commit ee9f86e refs/heads/master Author: Rafael Mendonça França Date: 2014-10-08 11:24:16 -0300 Point to a specific version of guide to make the redirect work M activejob/lib/active_job/queue_adapters/inline_adapter.rb commit a7a6349 refs/heads/master Merge: c736aaa a1e925d Author: Abdelkader Boudih Date: 2014-10-08 08:51:13 +0100 Merge pull request #17205 from y-yagi/patch-1 update error message when InlineAdapter is used commit c736aaa refs/heads/master Merge: 0bd1a4e 094a7ce Author: Abdelkader Boudih Date: 2014-10-08 08:45:32 +0100 Merge pull request #17187 from Bounga/middleware_reloading_explaination Warning about middleware not auto-reloading commit 094a7ce refs/heads/master Author: Nicolas Cavigneaux Date: 2014-10-06 11:07:29 +0200 Warning about middleware not auto-reloading Add a section in the guide to explain that Rails can't auto-reload a middleware on code change. Fix #16806 [ci skip] M guides/source/rails_on_rack.md commit a1e925d refs/heads/master Author: yuuji.yaginuma Date: 2014-10-08 09:08:11 +0900 update error message when InlineAdapter is used M activejob/lib/active_job/queue_adapters/inline_adapter.rb commit 0bd1a4e refs/heads/master Author: Rafael Mendonça França Date: 2014-10-07 20:01:40 -0300 Only include the needed assertions M actionmailer/lib/action_mailer/test_case.rb M actionmailer/test/base_test.rb commit 2b3d67d refs/heads/master Merge: 4b8f0f8 e6b0b76 Author: Rafael Mendonça França Date: 2014-10-07 20:00:17 -0300 Merge pull request #17204 from schneems/schneems/fix-am-tests-master fix tests on action_mailer commit e6b0b76 refs/heads/master Author: schneems Date: 2014-10-07 17:40:59 -0500 fix tests on action_mailer Include appropriate helpers and use `assert_dom_equal` where applicable M actionmailer/lib/action_mailer/test_case.rb M actionmailer/test/asset_host_test.rb M actionmailer/test/base_test.rb M actionmailer/test/url_test.rb commit 4b8f0f8 refs/heads/master Merge: 01aefa5 03d30ce Author: Rafael Mendonça França Date: 2014-10-07 19:00:01 -0300 Merge pull request #17203 from schneems/schneems/av-tag_helper remove un-needed sort commit 03d30ce refs/heads/master Author: schneems Date: 2014-10-07 16:53:50 -0500 remove un-needed sort HTML doesn't care what order the elements are rendered in, so why should we? Updates tests to use proper `assert_dom_equal` instead of `assert_equal` /cc @jeremy M actionview/lib/action_view/helpers/tag_helper.rb M actionview/test/template/asset_tag_helper_test.rb M actionview/test/template/form_helper_test.rb commit 01aefa5 refs/heads/master Merge: c214dd7 8e79abb Author: Abdelkader Boudih Date: 2014-10-07 21:40:25 +0100 Merge pull request #17201 from djpowers/patch-1 Fix grammar [ci skip] commit 8e79abb refs/heads/master Author: Dave Powers Date: 2014-10-07 16:32:54 -0400 Fix grammar M guides/source/upgrading_ruby_on_rails.md commit c214dd7 refs/heads/master Merge: cc03ad7 590efa4 Author: Rafael Mendonça França Date: 2014-10-07 12:24:26 -0300 Merge pull request #17198 from neerajdotname/wordsmitthing Rephrasing sentences commit cc03ad7 refs/heads/master Merge: fbfc4ac 1bf5220 Author: Rafael Mendonça França Date: 2014-10-07 12:11:09 -0300 Merge pull request #17184 from fillman/master fix autoload tests commit fbfc4ac refs/heads/master Merge: 3dc9c52 8764ef9 Author: Rafael Mendonça França Date: 2014-10-07 12:07:56 -0300 Merge pull request #17146 from divineforest/active-record-gsub-to-tr Change `gsub` to `tr` where possible commit 590efa4 refs/heads/master Author: Neeraj Singh Date: 2014-10-07 09:23:51 -0400 Rephrasing sentences M actionpack/lib/action_controller/metal/params_wrapper.rb commit 336783a refs/heads/master Author: grosser Date: 2014-09-22 13:19:39 -0700 speed up fixtures by not loading all their classes M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/fixtures_test.rb M activerecord/test/cases/helper.rb commit 3dc9c52 refs/heads/master Merge: fda7bc3 76056c6 Author: Zachary Scott Date: 2014-10-06 09:51:07 -0700 Merge pull request #17189 from jipiboily/update-queue-classic-details update queue_classic details [ci skip] commit 76056c6 refs/heads/master Author: Jean-Philippe Boily Date: 2014-10-06 11:58:45 -0400 update queue_classic details M activejob/lib/active_job/queue_adapters.rb M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb commit 8764ef9 refs/heads/master Author: Alexander Balashov Date: 2014-10-02 21:16:25 +0400 Change `gsub` to `tr` where possible M actionview/test/template/test_case_test.rb M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/lib/active_record/model_schema.rb M activesupport/lib/active_support/values/time_zone.rb commit fda7bc3 refs/heads/master Author: Yves Senn Date: 2014-10-06 10:30:21 +0200 unify PG spelling in CHANGELOGs. [ci skip] M activerecord/CHANGELOG.md commit 1bf5220 refs/heads/master Author: fillman Date: 2014-10-05 18:58:33 +0300 fix autoload tests M activesupport/test/autoload_test.rb commit 85c3d5b refs/heads/master Merge: b56d3ad 391f5dc Author: Abdelkader Boudih Date: 2014-10-05 14:01:43 +0100 Merge pull request #17183 from prathamesh-sonpatki/fix-typo-in-am-guide Fix typo in Active Model guide commit 391f5dc refs/heads/master Author: Prathamesh Sonpatki Date: 2014-10-05 18:28:42 +0530 Fix typo in Active Model guide - instrospection -> introspection. - [ci skip] M guides/source/active_model_basics.md commit b56d3ad refs/heads/master Merge: d882348 1df925d Author: Zachary Scott Date: 2014-10-04 17:20:59 -0700 [ci skip] Merge ActiveModel::SecurePassword guide from @aditya-kapoor Merge branch 'active-model-secure-password-guide' of https://github.com/aditya-kapoor/rails into aditya-kapoor-active-model-secure-password-guide Conflicts: guides/source/active_model_basics.md commit d882348 refs/heads/master Author: Nick Meehan Date: 2014-08-28 10:40:58 -0600 Edits to ActiveModel guide [ci skip] - Some grammatical errors and rewording of sentences throughout document - Renaming headers to be more human readable, and if following paragraphs do not include module names, adding those in - In ActiveModel::AttributeMethods * formatting expected output correctly, changing from `#` to `# =>` - In ActiveModel::Dirty * changing expected output of person.first_name_was from "First Name" to nil * removing 'active_model' requirement at top of code snippet - In ActiveModel::Validations * originally Person.new(token: "2b1f325") raises an argument error (1 for 0), so setting of attribute occurs on the line after object instantiation - In ActiveModel::Naming * closing code snippet tag at end of section so ActiveModel::Model is a separate section - In ActiveModel::Model * fixing spelling mistake of attr_accessor - In ActiveModel::Serialization * adding edit to description of how from_json and from_xml works under serialization - In ActiveModel::Lint::Tests * capitalizing person for class name M guides/source/active_model_basics.md commit 8935e89 refs/heads/master Author: Mauro George Date: 2014-06-02 19:06:37 -0300 Add Active Model to guides [ci skip] M guides/source/active_model_basics.md M guides/source/documents.yaml commit b5a8fd7 refs/heads/master Merge: edc24da 02d3a25 Author: Zachary Scott Date: 2014-10-04 17:02:25 -0700 Merge pull request #17179 from eileencodes/clarify-delete-strategies-on-collection-proxy [ci skip] Clarify deletion strategies for collection proxies commit edc24da refs/heads/master Merge: a4d8b62 619f82b Author: Zachary Scott Date: 2014-10-04 16:52:13 -0700 Merge pull request #17176 from kuldeepaggarwal/doc-alias_method_chain doc added for `writer` method in `alias_method_chain` [ci skip] commit 02d3a25 refs/heads/master Author: eileencodes Date: 2014-10-04 11:19:37 -0400 [ci skip] Clarify deletion strategies for collection proxies For detailed testing of behavior see: https://gist.github.com/eileencodes/5b0a2fe011dcff6203fe This shows destroy_all always destroys records and fires callbacks. It will never use nullify or delete_all delete_all's behavior varies greatly based on `hm` vs `hm:t` and deletion strategy. M activerecord/lib/active_record/associations/collection_proxy.rb commit 619f82b refs/heads/master Author: Kuldeep Aggarwal Date: 2014-10-04 18:51:50 +0530 doc added for `writer` method in `alias_method_chain`[ci skip] M activesupport/lib/active_support/core_ext/module/aliasing.rb commit a4d8b62 refs/heads/master Author: Zachary Scott Date: 2014-10-03 17:36:56 -0700 Clarify possible validations you can use to avoid a NULL boolean value in the database. Closes #16304 [ci skip] M guides/source/active_record_validations.md commit 44e6d91 refs/heads/master Merge: cad6359 2bb0abb Author: Zachary Scott Date: 2014-10-03 17:29:25 -0700 Merge pull request #16409 from justinweiss/update_validation_context_documentation Docs: Add a note on custom validation contexts. [ci skip] commit cad6359 refs/heads/master Author: Matthew Draper Date: 2014-10-04 08:41:03 +0930 :heart: 1.9 M activesupport/lib/active_support/inflector/methods.rb commit cf66278 refs/heads/master Merge: 657ce17 6a8464f Author: Matthew Draper Date: 2014-10-04 08:15:41 +0930 Merge pull request #14146 from chewi/fix-underscore-acronyms-regex Fix underscore inflector handling of namespaced and adjacent acronyms commit 657ce17 refs/heads/master Merge: cefb00a afb9275 Author: Jeremy Kemper Date: 2014-10-03 15:39:58 -0700 Merge pull request #17150 from effektz/tr-instead-of-gsub Use #tr instead of #gsub where possible commit 6a8464f refs/heads/master Author: James Le Cuirot Date: 2014-10-03 22:45:40 +0100 Fix underscore inflector handling of adjacent acronyms I suspect that positive lookbehind would have been used in the original implementation had it been available in supported Ruby versions at the time. Now that Rails requires Ruby 1.9.2 or above, this is no longer an issue. This fixes #14146 for acronyms such as APIRESTful. This technique also addresses namespaced acronyms that are not entirely uppercased. This was broken when the commit was originally written but has since been fixed in ccbb481. The latter does not deal with adjacent acronyms so this commit wins. M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/inflector_test.rb commit cefb00a refs/heads/master Merge: 1609ec9 9ded108 Author: Abdelkader Boudih Date: 2014-10-03 22:33:45 +0100 Merge pull request #17172 from rselk/typo fix typo in in define_model_callbacks comment [ci skip] commit 9ded108 refs/heads/master Author: Ryan Selk Date: 2014-10-03 15:31:14 -0600 fix typo in in define_model_callbacks comment [ci skip] M activemodel/lib/active_model/callbacks.rb M activesupport/lib/active_support/callbacks.rb commit 1609ec9 refs/heads/master Merge: 9596f12 d717588 Author: Xavier Noria Date: 2014-10-03 21:40:57 +0200 Merge pull request #17168 from jwworth/task/fix_typo Fix typo [ci skip] commit d717588 refs/heads/master Author: Jake Worth Date: 2014-10-03 14:28:41 -0500 Fix typo M guides/source/4_2_release_notes.md commit 9596f12 refs/heads/master Merge: 23ef525 f50430e Author: Rafael Mendonça França Date: 2014-10-03 14:35:15 -0300 Merge pull request #17167 from kuldeepaggarwal/doc-define_model_callbacks add notes for `define_model_callbacks` commit f50430e refs/heads/master Author: Kuldeep Aggarwal Date: 2014-10-03 23:04:01 +0530 add notes for `define_model_callbacks` [ci skip] M activemodel/lib/active_model/callbacks.rb M activesupport/lib/active_support/callbacks.rb commit 23ef525 refs/heads/master Merge: de50a91 6c57c78 Author: Aaron Patterson Date: 2014-10-03 16:52:25 +0200 Merge pull request #17160 from lsylvester/duration-hash define hash on duration commit 6c57c78 refs/heads/master Author: lsylvester Date: 2014-10-03 19:53:54 +1000 define hash on duration M activesupport/lib/active_support/duration.rb M activesupport/test/core_ext/duration_test.rb commit de50a91 refs/heads/master Author: Xavier Noria Date: 2014-10-03 09:24:12 +0200 minor fixes in the configuring guide [ci skip] M guides/source/configuring.md commit 78a1418 refs/heads/master Author: Xavier Noria Date: 2014-10-03 09:20:48 +0200 Revert "Fix style for rescue responses doc [ci skip]" Reason: There is a wrong newline, a typo, and the change to singular is not good. This reverts commit d76380cf1ccec7ffeff19827ae9b6d9b71327418. M guides/source/configuring.md commit c9e510c refs/heads/master Merge: d93854f d76380c Author: Abdelkader Boudih Date: 2014-10-03 05:40:32 +0100 Merge pull request #17153 from yuki24/fix-doc-format-for-rescue-responses [Railsguides] Fix style for rescue responses doc [ci skip] commit d93854f refs/heads/master Merge: 29006a7 2589542 Author: Abdelkader Boudih Date: 2014-10-03 05:37:13 +0100 Merge pull request #17151 from y-yagi/patch-1 [ci skip] add `test:jobs` task to testing guide commit d76380c refs/heads/master Author: Yuki Nishijima Date: 2014-10-02 18:55:42 -0700 Fix style for rescue responses doc [ci skip] * Change 'Any ***s that are...' to 'Any *** that is...' * Fix style for default rescue_responses setting This is a follow-up commit to: * https://github.com/rails/rails/pull/17076 * https://github.com/yuki24/rails/commit/89b8836f2470c689f6b7d52cab3a418bb63aef26 M guides/source/configuring.md commit 2589542 refs/heads/master Author: yuuji.yaginuma Date: 2014-10-03 08:45:52 +0900 [ci skip] add `test:jobs` task to testing guide M guides/source/testing.md commit afb9275 refs/heads/master Author: Alex Weidmann Date: 2014-10-02 17:35:13 -0600 Use #tr instead of #gsub where possible M actionview/lib/action_view/helpers/form_tag_helper.rb M actionview/lib/action_view/template.rb commit 29006a7 refs/heads/master Merge: 4cd57a8 4e51100 Author: Xavier Noria Date: 2014-10-02 23:03:29 +0200 Merge pull request #17148 from mgenereu/patch-1 Disallow appended newlines when parsing as integer commit 4e51100 refs/heads/master Author: Michael Genereux Date: 2014-10-02 13:55:22 -0700 Disallow appended newlines when parsing as integer \Z allows appended newlines where \z does not. M activemodel/lib/active_model/validations/numericality.rb commit 4cd57a8 refs/heads/master Merge: 7b740f3 bc6421c Author: Abdelkader Boudih Date: 2014-10-02 18:10:55 +0100 Merge pull request #17068 from mokhan/update-active-job-documentation [ci-skip] Update Active Job API documentation commit bc6421c refs/heads/master Author: mo khan Date: 2014-09-26 11:10:06 -0600 Add documentation on Active Job. This adds documentation for the Active Job API. It includes documentation on how to configure the queue_adapter, and how to create new jobs. It adds links to the various other sections of the Active Job documentation. M activejob/lib/active_job/arguments.rb M activejob/lib/active_job/base.rb M activejob/lib/active_job/logging.rb M activejob/lib/active_job/queue_adapter.rb M activejob/lib/active_job/queue_name.rb M guides/source/4_2_release_notes.md commit 1713c61 refs/remotes/origin/4-1-stable Merge: 06a9e18 0d74c5c Author: Aaron Patterson Date: 2014-10-02 18:53:04 +0200 Merge pull request #17145 from mrbrdo/issue15920-4-1 always reorder bind parameters. fixes #15920 commit 0d74c5c refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-09-04 14:40:10 -0700 always reorder bind parameters. fixes #15920 Conflicts: activerecord/lib/active_record/relation/query_methods.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations_test.rb commit 7b740f3 refs/heads/master Merge: 6aa4482 1fac7b7 Author: Rafael Mendonça França Date: 2014-10-01 22:56:08 -0300 Merge pull request #17088 from robin850/jruby-dev Follow up to #16613 commit 6aa4482 refs/heads/master Merge: cd50a6d 56d26d1 Author: Xavier Noria Date: 2014-10-01 12:50:42 +0200 Merge pull request #17125 from acrogenesis/master use tr instead of gsub when possible commit 56d26d1 refs/heads/master Author: Adrian Rangel Date: 2014-10-01 02:19:52 -0500 use tr instead of gsub when possible M actionview/lib/action_view/template.rb M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit cd50a6d refs/heads/master Merge: 1f14b9f 67a605d Author: Abdelkader Boudih Date: 2014-10-01 07:49:40 +0100 Merge pull request #17124 from yuktikhurana/fix_render_file_guide In render file, by default the current layout is rendered always [ci skip] commit 67a605d refs/heads/master Author: yuktikhurana Date: 2014-10-01 11:03:49 +0530 In render file, by default the current layout is rendered always M guides/source/layouts_and_rendering.md commit 1f14b9f refs/heads/master Merge: 09975bb 0e50b7b Author: Rafael Mendonça França Date: 2014-09-30 15:10:52 -0300 Merge pull request #17113 from igor04/helpers-highlight Added processing of `nil` to `highlight` helper method commit 09975bb refs/heads/master Merge: 098158c 291f644 Author: Rafael Mendonça França Date: 2014-09-30 15:09:38 -0300 Merge pull request #17114 from pabloh/replace_use_of_eval_with_lambda Refactor callback setup to use lambda instead of eval commit 098158c refs/heads/master Author: Rafael Mendonça França Date: 2014-09-30 13:42:55 -0300 Generate the application pointing to rails-dom-testing master It is temporary until we do the final release M railties/lib/rails/generators/rails/app/templates/Gemfile commit ee89640 refs/heads/master Merge: 79c491e 71db7fd Author: Abdelkader Boudih Date: 2014-09-30 16:04:18 +0100 Merge pull request #17118 from zhangsu/patch-1 Update single table inheritance link anchor commit 71db7fd refs/heads/master Author: Su Zhang (張甦) Date: 2014-09-30 11:01:15 -0400 Update single table inheritance link anchor The current one is old-of-date and doesn't make the browser navigation to the correct heading. M guides/source/active_record_basics.md commit 291f644 refs/heads/master Author: Pablo Herrero Date: 2014-09-30 08:58:37 -0300 Refactor callback setup in to use lambda instead of eval M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validations/callbacks.rb commit 0e50b7b refs/heads/master Author: igor04 Date: 2014-09-30 14:48:48 +0300 Added processing of `nil` to `highlight` helper method M actionview/lib/action_view/helpers/text_helper.rb M actionview/test/template/text_helper_test.rb commit 79c491e refs/heads/master Merge: fe88af6 eddd4d4 Author: Yves Senn Date: 2014-09-30 11:18:12 +0200 Merge pull request #17110 from claudiob/remove-running-tests Remove RUNNING UNIT TESTS from ActionPack commit eddd4d4 refs/heads/master Author: claudiob Date: 2014-09-30 02:00:03 -0700 Remove RUNNING UNIT TESTS from ActionPack [ci skip] Following discussion with @senny https://github.com/rails/rails/pull/17100#issuecomment-57285273 it only makes sense to keep this file form projects that require extra instructions. D actionpack/RUNNING_UNIT_TESTS.rdoc commit fe88af6 refs/heads/master Author: Akira Matsuda Date: 2014-09-30 17:17:11 +0900 Responder was removed at ee77770d57de9da87b05a2fe84b9d46ec6852c62 M actionpack/lib/action_controller.rb commit c935d6f refs/heads/master Author: Xavier Noria Date: 2014-09-29 23:05:27 +0200 fixes typo in AS CHANGELOG [ci skip] References f92ac24. M activesupport/CHANGELOG.md commit f93df52 refs/heads/master Merge: a455e3f f939904 Author: Rafael Mendonça França Date: 2014-09-29 16:50:46 -0300 Merge pull request #17107 from kaspth/parse-html-as-fragments Parse HTML as document fragment. commit f939904 refs/heads/master Author: Kasper Timm Hansen Date: 2014-09-29 21:41:52 +0200 Parse HTML as document fragment. This is to match the changes in Rails Dom Testing rails/rails-dom-testing#20. M Gemfile M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/testing/assertions.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/controller/integration_test.rb M actionview/lib/action_view/test_case.rb commit a455e3f refs/heads/master Merge: 035cc69 796cab4 Author: Aaron Patterson Date: 2014-09-29 12:34:53 -0700 Merge pull request #17093 from phiggins/remove-dynamic-send-on-built-in-callbacks Reduce allocations when running AR callbacks. commit 035cc69 refs/heads/master Merge: 06f9927 e2b49b2 Author: Rafael Mendonça França Date: 2014-09-29 14:03:19 -0300 Merge pull request #17099 from sferik/each_key Use Hash#each_key instead of Hash#keys.each commit 06f9927 refs/heads/master Merge: 3b451fc 175ca45 Author: Rafael Mendonça França Date: 2014-09-29 12:43:44 -0300 Merge pull request #17086 from seuros/master correct filename for jobs tests commit e2b49b2 refs/heads/master Author: Erik Michaels-Ober Date: 2014-09-29 16:07:18 +0200 Use Hash#each_key instead of Hash#keys.each Hash#keys.each allocates an array of keys; Hash#each_key iterates through the keys without allocating a new array. This is the reason why Hash#each_key exists. M actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb M actionpack/test/controller/resources_test.rb M actionpack/test/controller/test_case_test.rb M actionpack/test/dispatch/mime_type_test.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/railties/databases.rake M activesupport/test/time_zone_test.rb commit 3b451fc refs/heads/master Merge: 482e80e 588c321 Author: Rafael Mendonça França Date: 2014-09-29 10:49:46 -0300 Merge pull request #17092 from Empact/defunct-ivars Remove defunct ivars commit 588c321 refs/heads/master Author: Ben Woosley Date: 2014-09-24 21:18:44 -0700 Remove defunct ivars @column_names_with_alias, @dynamic_methods_hash, @time_zone_column_names, and @cached_time_zone M activerecord/lib/active_record/associations/join_dependency/join_part.rb M activerecord/lib/active_record/model_schema.rb commit 796cab4 refs/heads/master Author: Pete Higgins Date: 2014-09-28 14:42:26 -0700 Reduce allocations when running AR callbacks. Inspired by @tenderlove's work in c363fff29f060e6a2effe1e4bb2c4dd4cd805d6e, this reduces the number of strings allocated when running callbacks for ActiveRecord instances. I measured that using this script: ``` require 'objspace' require 'active_record' require 'allocation_tracer' ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:" ActiveRecord::Base.connection.instance_eval do create_table(:articles) { |t| t.string :name } end class Article < ActiveRecord::Base; end a = Article.create name: "foo" a = Article.find a.id N = 10 result = ObjectSpace::AllocationTracer.trace do N.times { Article.find a.id } end result.sort.each do |k,v| p k => v end puts "total: #{result.values.map(&:first).inject(:+)}" ``` When I run this against master and this branch I get this output: ``` pete@balloon:~/projects/rails/activerecord$ git checkout master M Gemfile Switched to branch 'master' pete@balloon:~/projects/rails/activerecord$ bundle exec ruby benchmark_allocation_with_callback_send.rb > allocations_before pete@balloon:~/projects/rails/activerecord$ git checkout remove-dynamic-send-on-built-in-callbacks M Gemfile Switched to branch 'remove-dynamic-send-on-built-in-callbacks' pete@balloon:~/projects/rails/activerecord$ bundle exec ruby benchmark_allocation_with_callback_send.rb > allocations_after pete@balloon:~/projects/rails/activerecord$ diff allocations_before allocations_after 39d38 < {["/home/pete/projects/rails/activesupport/lib/active_support/callbacks.rb", 81]=>[40, 0, 0, 0, 0, 0]} 42c41 < total: 630 --- > total: 590 ``` In addition to this, there are two micro-optimizations present: * Using `block.call if block` vs `yield if block_given?` when the block was being captured already. ``` pete@balloon:~/projects$ cat benchmark_block_call_vs_yield.rb require 'benchmark/ips' def block_capture_with_yield &block yield if block_given? end def block_capture_with_call &block block.call if block end def no_block_capture yield if block_given? end Benchmark.ips do |b| b.report("block_capture_with_yield") { block_capture_with_yield } b.report("block_capture_with_call") { block_capture_with_call } b.report("no_block_capture") { no_block_capture } end pete@balloon:~/projects$ ruby benchmark_block_call_vs_yield.rb Calculating ------------------------------------- block_capture_with_yield 124979 i/100ms block_capture_with_call 138340 i/100ms no_block_capture 136827 i/100ms ------------------------------------------------- block_capture_with_yield 5703108.9 (±2.4%) i/s - 28495212 in 4.999368s block_capture_with_call 6840730.5 (±3.6%) i/s - 34169980 in 5.002649s no_block_capture 5821141.4 (±2.8%) i/s - 29144151 in 5.010580s ``` * Defining and calling methods instead of using send. ``` pete@balloon:~/projects$ cat benchmark_method_call_vs_send.rb require 'benchmark/ips' class Foo def tacos nil end end my_foo = Foo.new Benchmark.ips do |b| b.report('send') { my_foo.send('tacos') } b.report('call') { my_foo.tacos } end pete@balloon:~/projects$ ruby benchmark_method_call_vs_send.rb Calculating ------------------------------------- send 97736 i/100ms call 151142 i/100ms ------------------------------------------------- send 2683730.3 (±2.8%) i/s - 13487568 in 5.029763s call 8005963.9 (±2.7%) i/s - 40052630 in 5.006604s ``` The result of this is making typical ActiveRecord operations slightly faster: https://gist.github.com/phiggins/e46e51dcc7edb45b5f98 M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validations/callbacks.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/callbacks.rb M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/transactions.rb M activesupport/lib/active_support/callbacks.rb commit 482e80e refs/heads/master Merge: 3a9b3ba 21ba9b1 Author: Robin Dupret Date: 2014-09-28 18:35:00 +0200 Merge pull request #17087 from taboularasa/master technical correction in guides under 'Generating an engine' [ci skip] commit 21ba9b1 refs/heads/master Author: David Elliott Date: 2014-09-28 07:12:46 -0700 technical correction in guides under 'Generating an engine' `bin/rails` would not exist outside of a rails project M guides/source/engines.md M guides/source/plugins.md commit 175ca45 refs/heads/master Author: Abdelkader Boudih Date: 2014-09-28 10:31:17 +0000 correct filename for jobs tests M railties/lib/rails/generators/test_unit/job/job_generator.rb commit 1fac7b7 refs/heads/master Author: Robin Dupret Date: 2014-09-27 16:37:44 +0200 Follow up to #16613 Since we want this flag to be enabled anytime we are running the tests under JRuby, let's enable this at the Rakefile level so people get the performance boost on their local checkout. Moreover, we avoid having to update this particular line anytime the option changes on the JRuby side. The only drawback is that we have to define it in every Rakefile but there's no big deal, this is already the case for other options. M .travis.yml M actionmailer/Rakefile M actionpack/Rakefile M actionview/Rakefile M activejob/Rakefile M activemodel/Rakefile M activerecord/Rakefile M activesupport/Rakefile M railties/Rakefile commit 3a9b3ba refs/heads/master Merge: e1e8e53 6c941ea Author: Vijay Dev Date: 2014-09-28 06:11:30 +0000 Merge branch 'master' of github.com:rails/docrails commit e1e8e53 refs/heads/master Merge: d630054 dfbcfaf Author: Jeremy Kemper Date: 2014-09-27 20:03:35 -0700 Merge pull request #17077 from schneems/schneems/backtrace-string-allocations Decrease backtrace cleaner object allocations commit d630054 refs/heads/master Author: Robin Dupret Date: 2014-09-27 16:22:15 +0200 Tiny follow-up to #16999 [ci skip] * Fix a typo * Remove references to Rails version * Remove an extra whitespace M activejob/lib/active_job/queue_adapters/qu_adapter.rb M activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb M guides/source/active_job_basics.md commit d7a058f refs/heads/master Author: Matthew Draper Date: 2014-09-27 21:55:03 +0930 Make AJ integration tests much less verbose In passing, avoid a blind retry in QC: instead, just fix the problem. M activejob/test/support/integration/adapters/delayed_job.rb M activejob/test/support/integration/adapters/que.rb M activejob/test/support/integration/adapters/queue_classic.rb M activejob/test/support/integration/adapters/resque.rb M activejob/test/support/integration/adapters/sidekiq.rb M activejob/test/support/integration/adapters/sucker_punch.rb M activejob/test/support/integration/dummy_app_template.rb M activejob/test/support/integration/helper.rb commit d13b75b refs/heads/master Merge: 6a5ee60 04cced0 Author: Abdelkader Boudih Date: 2014-09-27 12:45:44 +0100 Merge pull request #17082 from prathamesh-sonpatki/fix-typo-in-upgrading-guide Fix typo in upgrading guide commit 04cced0 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-27 17:12:57 +0530 Fix typo in upgrading guide - [ci skip] - behvaior -> behavior M guides/source/upgrading_ruby_on_rails.md commit 6a5ee60 refs/heads/master Merge: 05ed448 76ccbc2 Author: Abdelkader Boudih Date: 2014-09-27 12:25:24 +0100 Merge pull request #17081 from prathamesh-sonpatki/fix-aj-typos Fix some typos in ActiveJob commit 76ccbc2 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-27 16:51:29 +0530 Fix some typos in ActiveJob [ci skip] M activejob/lib/active_job/queue_adapters/qu_adapter.rb M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb commit 05ed448 refs/heads/master Merge: c363fff 739eee6 Author: Abdelkader Boudih Date: 2014-09-27 11:53:44 +0100 Merge pull request #17080 from prathamesh-sonpatki/fix-typo-in-ar-changelog Fix typo in AR changelog [ci skip] commit 739eee6 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-27 16:18:29 +0530 Fix typo in AR changelog - middlware -> middleware M activerecord/CHANGELOG.md commit c363fff refs/heads/master Author: Aaron Patterson Date: 2014-09-27 11:00:58 +0400 some object allocation reduction for new AR objects Benchmark: ```ruby require 'objspace' require 'active_record' ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:" ActiveRecord::Base.connection.instance_eval do create_table(:articles) { |t| t.string :name } end class Article < ActiveRecord::Base; end a = Article.create name: "foo" a = Article.find a.id N = 10 ObjectSpace::AllocationTracer.trace do N.times { Article.find a.id } end ObjectSpace::AllocationTracer.allocated_count_table table.sort_by { |_,x| x }.each do |k,v| p k => (v / N) end ``` M activerecord/lib/active_record/attribute_set/builder.rb M activerecord/lib/active_record/querying.rb commit 512122d refs/heads/master Merge: 7c4a623 ab22946 Author: Zachary Scott Date: 2014-09-26 23:23:18 -0700 Merge pull request #17079 from y-yagi/patch-1 [ci skip] fix typo in set examples commit ab22946 refs/heads/master Author: yuuji.yaginuma Date: 2014-09-27 15:07:24 +0900 [ci skip] fix typo in set examples M activejob/lib/active_job/core.rb commit dfbcfaf refs/heads/master Author: Richard Schneeman Date: 2014-09-27 11:03:18 +0800 Move object allocation out of loop Right now BenchmarkCleaner allocates hundreds of strings on every request with an exception. This patch moves those strings to be generated at boot once and re-used. ## Bench Methods I took a modified form of CodeTriage https://github.com/schneems/codetriage-ko1-test-app/blob/master/perf.rake and ran given rake tasks with and without the patch to BacktraceCleaner. I made an endpoint results in exception ``` def index raise “foo" end ``` The gem `memory_profiler` was used to capture objects allocated for a single request. Then `benchmark/ips` was used to test the speed of the patch. You will see that we use less objects and the code becomes measurably faster with this patch. ## With patch: Memory for one request: ``` Total allocated 7441 Total retained 37 ``` Requests per second: ``` Calculating ------------------------------------- ips 4 i/100ms ------------------------------------------------- ips 43.0 (±4.7%) i/s - 216 in 5.037733s ``` ## Without patch: Memory used for one request: ``` Total allocated 11599 Total retained 35 ``` Requests per second: ``` Calculating ------------------------------------- ips 3 i/100ms ------------------------------------------------- ips 39.4 (±7.6%) i/s - 198 in 5.052783s ``` ## Analysis The patch is faster: ``` (43.0 - 39.4 ) / 39.4 * 100 # => 9 # % ~ speed bump ``` It also allocates less objects: ``` 11599 - 7441 # => 4158 ``` These strings are allocated on __EVERY SINGLE REQUEST__. This patch saves us 4158 objects __PER REQUEST__ with exception. Faster errors == Faster applications M railties/lib/rails/backtrace_cleaner.rb commit 7c4a623 refs/heads/master Merge: 4581d04 89b8836 Author: Zachary Scott Date: 2014-09-26 19:53:10 -0700 Merge pull request #17076 from yuki24/write-doc-for-rescue-responses Add documentation about rescue_responses in Configuring [ci skip] commit 89b8836 refs/heads/master Author: Yuki Nishijima Date: 2014-09-26 19:45:05 -0700 Add documentation about `config.action_dispatch.rescue_responses` [ci skip] M guides/source/configuring.md commit 4581d04 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-26 14:33:35 -0300 Preparing for 4.2.0.beta2 release M RAILS_VERSION M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/lib/action_view/gem_version.rb M activejob/lib/active_job/gem_version.rb M activemodel/lib/active_model/gem_version.rb M activerecord/lib/active_record/gem_version.rb M activesupport/lib/active_support/gem_version.rb M railties/lib/rails/gem_version.rb M version.rb commit 5ae8617 refs/heads/master Merge: 64fcdce 0b725aa Author: Rafael Mendonça França Date: 2014-09-26 17:14:35 -0300 Merge pull request #17071 from claudiob/don-t-require-action-dispatch-twice Don’t require already required modules commit 0b725aa refs/heads/master Author: claudiofullscreen Date: 2014-09-26 13:05:00 -0700 Don’t require already required modules abstract_unit.rb requires `action_controller` which [already includes the following lines of code](https://github.com/rails/rails/blob/64fcdce1d3a6a8768ab17f3be144270456814f82/actionpack/lib/action_controller.rb#L2L3): ```ruby require 'abstract_controller' require 'action_dispatch' ``` M actionview/test/abstract_unit.rb commit 64fcdce refs/heads/master Merge: 4af5899 0d49841 Author: Rafael Mendonça França Date: 2014-09-26 16:53:53 -0300 Merge pull request #17070 from felipecvo/master Add +variants to ActionView::FileSystemResolver documentation. commit 21bc833 refs/tags/v4.2.0.beta2 (tag: v4.2.0.beta2) Author: Rafael Mendonça França Date: 2014-09-26 14:33:35 -0300 Preparing for 4.2.0.beta2 release M RAILS_VERSION M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/lib/action_view/gem_version.rb M activejob/lib/active_job/gem_version.rb M activemodel/lib/active_model/gem_version.rb M activerecord/lib/active_record/gem_version.rb M activesupport/lib/active_support/gem_version.rb M railties/lib/rails/gem_version.rb M version.rb commit 0d49841 refs/heads/master Author: Felipe Oliveira Date: 2014-09-26 14:26:16 -0300 Add +variants to ActionView::FileSystemResolver documentation. M actionview/lib/action_view/template/resolver.rb commit 4af5899 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 18:07:22 -0300 Revert "Merge pull request #16966 from why-el/symbolize-path-params" This reverts commit 9d05d6de52871e57bfbf54a60de005e8a5f5b0e4, reversing changes made to 0863c9248fd47a15e88e05ce4fcd80966684c0e3. The change in the behaviour reported at #16958 doesn't exist since 4.0 and 4.1 works in the same way M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing/route_set_test.rb commit 3a88535 refs/heads/master Merge: 419dfea fe1b02d Author: Rafael Mendonça França Date: 2014-09-25 18:02:53 -0300 Merge pull request #17061 from bronzle/remove_extra_# remove extra # in css commit 419dfea refs/heads/master Merge: 9d05d6d 5571fe8 Author: Abdelkader Boudih Date: 2014-09-25 22:01:32 +0100 Merge pull request #17059 from bronzle/remove_threadsafe_from_guides [ci skip] Remove reference to config.threadsafe! in guides/configuring.md commit fe1b02d refs/heads/master Author: Byron Bischoff Date: 2014-09-25 13:53:45 -0700 remove extra # in css M railties/lib/rails/templates/rails/welcome/index.html.erb commit 5571fe8 refs/heads/master Author: Byron Bischoff Date: 2014-09-25 13:42:08 -0700 [ci skip] Remove reference to config.threadsafe! in guides/configuriing.md M guides/source/configuring.md commit 9d05d6d refs/heads/master Merge: 0863c92 f10b38b Author: Rafael Mendonça França Date: 2014-09-25 17:40:34 -0300 Merge pull request #16966 from why-el/symbolize-path-params Ensure named path params are symbols (Fixes #16958) commit f10b38b refs/heads/master Author: Mohamed Wael Khobalatte Date: 2014-09-19 00:15:24 +0200 Ensure named path params are symbols (Fixes #16958) M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing/route_set_test.rb commit 0863c92 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 17:21:43 -0300 No need CHANGLOG entry for a bug in a non released version [ci skip] M actionpack/CHANGELOG.md commit bc644c5 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 17:20:52 -0300 Keep the original implementation to not having to allocate new objects M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit f82ecef refs/heads/master Merge: b98c593 2d08fd2 Author: Rafael Mendonça França Date: 2014-09-25 17:15:00 -0300 Merge pull request #17058 from eval/issue-17057 Remove internal options from query string of paths commit b98c593 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 16:48:45 -0300 No need to install the deprecated_sanitizer gem It is not being used in our tests M Gemfile commit 80990e2 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 16:45:45 -0300 rails-html-sanitizer is now the default Also add to upgrading guide a notice about the deprecated sanitizers M Gemfile M guides/source/upgrading_ruby_on_rails.md M railties/lib/rails/generators/rails/app/templates/Gemfile commit 64fc896 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 16:20:31 -0300 Remove unused code M railties/lib/rails/info.rb M railties/test/rails_info_test.rb commit 2922f63 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 16:09:43 -0300 :nail_care: the CSS M railties/lib/rails/templates/rails/welcome/index.html.erb commit 89307fe refs/heads/master Merge: 3f1d04e be0206e Author: Rafael Mendonça França Date: 2014-09-25 16:07:19 -0300 Merge pull request #17024 from buddhamagnet/amend-welcome-page Amend welcome page commit 3f1d04e refs/heads/master Author: Jeremy Kemper Date: 2014-09-14 19:34:17 -0700 Fix string/gid collision in job arguments Serialize Global IDs as special objects, distinguishable from Strings M activejob/lib/active_job/arguments.rb M activejob/test/cases/argument_serialization_test.rb commit 391cfc2 refs/heads/master Author: Godfrey Chan Date: 2014-09-26 00:26:29 +0900 Fix actionpack test cases broken by #16888 M actionpack/test/controller/new_base/render_file_test.rb M actionpack/test/controller/new_base/render_template_test.rb commit b5571b3 refs/heads/master Author: Godfrey Chan Date: 2014-09-26 00:07:07 +0900 Revert "Revert "Merge pull request #16888 from jejacks0n/render_template"" This reverts commit 585e75696b31395aee895e5366e331c07c3f5ee1. M actionview/CHANGELOG.md M actionview/lib/action_view/rendering.rb M actionview/test/actionpack/controller/render_test.rb M guides/source/4_2_release_notes.md commit b008e4b refs/heads/master Author: Godfrey Chan Date: 2014-09-26 01:37:05 +0900 Use released rails-html-sanitizer and rails-deprecated_sanitizer M Gemfile M actionpack/actionpack.gemspec M actionview/actionview.gemspec M railties/lib/rails/generators/rails/app/templates/Gemfile commit be0206e refs/heads/master Author: buddhamagnet Date: 2014-09-23 09:13:58 +0100 Improve welcome page css and table cell aignments. M railties/lib/rails/info.rb M railties/lib/rails/templates/rails/welcome/index.html.erb commit 2d08fd2 refs/heads/master Author: Gert Goet Date: 2014-09-25 17:50:16 +0200 Remove internal options from query string of paths Fixes #17057 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/test/activerecord/polymorphic_routes_test.rb commit 478ad3f refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 12:35:06 -0300 Use release web-console M railties/lib/rails/generators/rails/app/templates/Gemfile commit 2c0cad8 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-25 12:31:42 -0300 Use released rails-dom-testing M Gemfile M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M actionview/actionview.gemspec commit f468464 refs/remotes/origin/gc-revert-revert-16888 (origin/gc-revert-revert-16888) Author: Godfrey Chan Date: 2014-09-26 00:26:29 +0900 Fix actionpack test cases broken by #16888 M actionpack/test/controller/new_base/render_file_test.rb M actionpack/test/controller/new_base/render_template_test.rb commit 15f305c refs/remotes/origin/gc-revert-revert-16888 Author: Godfrey Chan Date: 2014-09-26 00:07:07 +0900 Revert "Revert "Merge pull request #16888 from jejacks0n/render_template"" This reverts commit 585e75696b31395aee895e5366e331c07c3f5ee1. M actionview/CHANGELOG.md M actionview/lib/action_view/rendering.rb M actionview/test/actionpack/controller/render_test.rb M guides/source/4_2_release_notes.md commit f620299 refs/heads/master Merge: 2bb0fcb 76eba91 Author: Rafael Mendonça França Date: 2014-09-24 17:43:50 -0300 Merge pull request #17051 from jwworth/task/fix_typo Fix typo commit 76eba91 refs/heads/master Author: Jake Worth Date: 2014-09-24 15:38:51 -0500 Fix typo M guides/source/4_2_release_notes.md commit 2bb0fcb refs/heads/master Merge: 4e8ea13 8e9bc11 Author: Rafael Mendonça França Date: 2014-09-24 13:39:20 -0300 Merge pull request #17042 from DanOlson/remove-skip-action-view Remove --skip-action-view option from application generator commit 8e9bc11 refs/heads/master Author: Dan Olson Date: 2014-09-23 18:43:18 -0500 Remove --skip-action-view option from application generator M railties/CHANGELOG.md M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/lib/rails/generators/rails/plugin/templates/rails/application.rb M railties/test/generators/app_generator_test.rb commit 4e8ea13 refs/heads/master Merge: f8b44d1 cb598c2 Author: Aaron Patterson Date: 2014-09-23 07:54:03 -0700 Merge pull request #17020 from Sirupsen/ar-override-rack-test activerecord/connection_pool: honor overidden rack.test in tests commit f8b44d1 refs/heads/master Merge: e88f8d7 c7bce61 Author: Arthur Nogueira Neves Date: 2014-09-23 10:46:55 -0400 Merge pull request #17032 from tgxworld/update_contributing_guide [CI SKIP] Improve force push note. commit c7bce61 refs/heads/master Author: Guo Xiang Tan Date: 2014-09-23 22:35:09 +0800 [CI SKIP] Improve force push note. M guides/source/contributing_to_ruby_on_rails.md commit e88f8d7 refs/heads/master Merge: 13e1348 95e3e42 Author: Santiago Pastorino Date: 2014-09-23 10:48:05 -0300 Merge pull request #17029 from grk/fix-loading-fixtures-in-engine-tests Fix loading fixtures in engine tests commit 13e1348 refs/heads/master Merge: 0172940 6aa11fb Author: Richard Schneeman Date: 2014-09-23 19:37:39 +0900 Merge pull request #17026 from prathamesh-sonpatki/mention-updating-pull-requests Added note about updating pull requests by force push commit 95e3e42 refs/heads/master Author: Grzesiek Kolodziejczyk Date: 2014-09-23 11:50:10 +0200 Fix loading fixtures in engine tests fixture_path is a class attribute of ActiveSupport::TestCase, so ActiveSupport::TestCase.method_defined?(:fixture_path=) would always return false. This should fix #4971 M railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb commit 6aa11fb refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-23 18:15:30 +0900 Added note about updating pull requests by force push - Added note about force pushing same branch to update a existing pull request instead of opening new one in contributing guide. - [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 0172940 refs/heads/master Merge: 92cef19 39bef58 Author: Yves Senn Date: 2014-09-23 10:43:59 +0200 Merge pull request #17005 from y-yagi/fix_aj_test_helper add message to `assert` in `assert_enqueued_with` commit 92cef19 refs/heads/master Merge: fc6accf a7ed629 Author: Yves Senn Date: 2014-09-23 10:36:36 +0200 Merge pull request #17022 from prathamesh-sonpatki/test-for-validate-message Added test for exception message for validate method commit a7ed629 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-23 14:36:15 +0900 Added test for exception message for validate method - Test case for https://github.com/rails/rails/pull/16851 M activemodel/test/cases/validations_test.rb commit cb598c2 refs/heads/master Author: Simon Eskildsen Date: 2014-09-23 02:26:54 +0000 ar/connection_pool: honor overriden rack.test in middleware Honoring an overidden `rack.test` allows testing closed connection between multiple requests. This is useful if you're working on database resiliency, to ensure the connection is in the expected state from one request to another on the same worker. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/test/cases/connection_management_test.rb commit fc6accf refs/heads/master Merge: 9a4e183 a1e38ef Author: Abdelkader Boudih Date: 2014-09-23 01:28:51 +0100 Merge pull request #17018 from prathamesh-sonpatki/tenderlove Update changelog with tenderlove's entry commit a1e38ef refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-23 09:21:17 +0900 Update changelog with tenderlove's entry [ci skip] M activerecord/CHANGELOG.md commit 39bef58 refs/heads/master Author: yuuji.yaginuma Date: 2014-09-22 23:40:41 +0900 add message to `assert` in `assert_enqueued_with` M activejob/lib/active_job/test_helper.rb M activejob/test/cases/test_helper_test.rb commit 9a4e183 refs/heads/master Author: Aaron Patterson Date: 2014-09-22 14:57:07 -0700 add a truncate method to the connection it doesn't work on SQLite3 since it doesn't support truncate, but that's OK. If you call truncate on the connection, you're now bound to that database (same as if you use hstore or any other db specific feature). M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 53a8a7f refs/heads/master Merge: f4595e6 949deed Author: Rafael Mendonça França Date: 2014-09-22 16:28:19 -0300 Merge pull request #17012 from petedmarsh/clarify-association-primary-key-option-documentation Clarify the documentation of the primary_key option for associations commit 949deed refs/heads/master Author: Peter Marsh Date: 2014-09-22 20:13:21 +0100 Clarify the documentation of the primary_key option for associations Previously the documentation stated that `primary_key` should be the name of a *method* that returns the primary key used for the association. This is incorrect. This changes the documentation to say that the value must be the name of a column. M activerecord/lib/active_record/associations.rb commit f4595e6 refs/heads/master Merge: b61a2db 0b10565 Author: Rafael Mendonça França Date: 2014-09-22 14:33:29 -0300 Merge pull request #16963 from collectiveidea/activejob-dj Cleaner queuing of jobs using Delayed Job Conflicts: activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb commit b61a2db refs/heads/master Merge: 585e756 c36ca05 Author: Rafael Mendonça França Date: 2014-09-22 14:23:40 -0300 Merge pull request #17009 from arthurnn/foreign_key_symbols Fixtures using Foreign key symbols commit c36ca05 refs/heads/master Author: Arthur Neves Date: 2014-09-22 13:12:19 -0400 Better regression test for Fixtures with fk as a symbol M activerecord/test/cases/fixtures_test.rb M activerecord/test/models/parrot.rb commit 2a1b45a refs/heads/master Author: Will Bryant Date: 2014-09-08 23:32:42 +1200 fix fixtures not loading if a belongs_to association is defined with a :foreign_key option that's a symbol M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/fixtures_test.rb commit 585e756 refs/heads/master Author: Godfrey Chan Date: 2014-09-23 02:06:08 +0900 Revert "Merge pull request #16888 from jejacks0n/render_template" This reverts commit 07635a74b5ee08dcba3f6617def6230d8f114fe5, reversing changes made to 1b5f61a025b6ce1ee52b7148e3ed2a9acbde28b9. Reason: it's not ready :bomb:, see https://github.com/rails/rails/pull/16888#issuecomment-56400816 M actionview/CHANGELOG.md M actionview/lib/action_view/rendering.rb M actionview/test/actionpack/controller/render_test.rb M guides/source/4_2_release_notes.md commit ca67632 refs/heads/master Author: Godfrey Chan Date: 2014-09-23 01:59:43 +0900 Move the array to a constant M activemodel/lib/active_model/validations.rb commit b52add7 refs/heads/master Merge: 4dfbfc7 a91b36f Author: Godfrey Chan Date: 2014-09-23 01:15:44 +0900 Merge pull request #16851 from prathamesh-sonpatki/mention-validate-in-upgrade-guide Update error message of Active Model's validate method commit 4dfbfc7 refs/heads/master Merge: b04ac97 c7f0cd6 Author: Godfrey Chan Date: 2014-09-23 00:59:16 +0900 Merge pull request #16985 from matthewd/no-isolated-for-prs Skip isolated tests for PRs commit b04ac97 refs/heads/master Author: Godfrey Chan Date: 2014-09-23 00:48:06 +0900 CHANGELOG for 07635a7 M actionview/CHANGELOG.md M guides/source/4_2_release_notes.md commit 07635a7 refs/heads/master Merge: 1b5f61a 428722b Author: Godfrey Chan Date: 2014-09-23 00:34:36 +0900 Merge pull request #16888 from jejacks0n/render_template Changes default render behavior from file to template. commit 1b5f61a refs/heads/master Merge: 7aca4a7 c9a4c2a Author: Abdelkader Boudih Date: 2014-09-22 15:40:09 +0100 Merge pull request #16999 from cristianbica/activejob-adapters-rdoc [ci skip] Added RDoc for each Active Job adapter commit c9a4c2a refs/heads/master Author: Cristian Bica Date: 2014-09-21 23:20:23 +0300 Added RDoc for each Active Job adapter M activejob/README.md M activejob/lib/active_job/queue_adapters.rb M activejob/lib/active_job/queue_adapters/backburner_adapter.rb M activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb M activejob/lib/active_job/queue_adapters/inline_adapter.rb M activejob/lib/active_job/queue_adapters/qu_adapter.rb M activejob/lib/active_job/queue_adapters/que_adapter.rb M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb M activejob/lib/active_job/queue_adapters/resque_adapter.rb M activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb M activejob/lib/active_job/queue_adapters/sneakers_adapter.rb M activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb M activejob/lib/active_job/queue_adapters/test_adapter.rb M guides/source/active_job_basics.md commit 06a9e18 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-09-22 16:08:17 +0200 Merge pull request #16974 from silp-com/mail_was_called ActionMailer: mark mail as called after instead of before processing it Conflicts: actionmailer/CHANGELOG.md M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/mail_helper.rb M actionmailer/test/base_test.rb A actionmailer/test/fixtures/base_test/late_inline_attachment_mailer/on_render.erb commit 7aca4a7 refs/heads/master Merge: 748105a b37e848 Author: Yves Senn Date: 2014-09-22 16:08:17 +0200 Merge pull request #16974 from silp-com/mail_was_called ActionMailer: mark mail as called after instead of before processing it commit b37e848 refs/heads/master Author: Christian Felder (masone) Date: 2014-09-19 10:32:08 +0200 Allow attaching files while the mail view is rendered M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/mail_helper.rb M actionmailer/test/base_test.rb A actionmailer/test/fixtures/base_test/late_inline_attachment_mailer/on_render.erb commit 748105a refs/heads/master Merge: 625fea9 606ce3f Author: Yves Senn Date: 2014-09-22 10:09:18 +0200 Merge pull request #17001 from claudiob/remove-wrapping-div-from-form-helpers-doc Remove wrapping
in form helpers from doc [ci skip] commit 606ce3f refs/heads/master Author: claudiob Date: 2014-09-22 00:34:39 -0700 Remove wrapping
in form helpers from doc [ci skip] 89ff1f8 and 1de258e6 removed from the HTML generated by the form helpers the
that was wrapping the field elements inside the
. This commit updates the documentation of the methods to reflect the two commits above. M actionview/lib/action_view/helpers/form_helper.rb M actionview/lib/action_view/helpers/url_helper.rb commit 625fea9 refs/heads/master Merge: 5263f5e f8e26c8 Author: Yves Senn Date: 2014-09-22 09:26:08 +0200 Merge pull request #17000 from yuki24/fix-false-assertions Fix another false assertions commit 5263f5e refs/heads/master Author: Zachary Scott Date: 2014-09-22 16:18:19 +0900 Wrap it up! :trollface: [ci skip] M guides/source/4_2_release_notes.md commit 8060959 refs/heads/master Author: Zachary Scott Date: 2014-09-22 16:17:37 +0900 Wrap Adequate Record release notes at 80 chars [ci skip] M guides/source/4_2_release_notes.md commit f8e26c8 refs/heads/master Author: Yuki Nishijima Date: 2014-09-21 14:36:00 -0700 Fix another false assertions * The assertions in AS::Duration don't actually assert. * The assertion in Railtie will pass even when `eager_load_namespaces` doesn't include `AppTemplate::Application` if `Rails.application` is truthy. For more details, see here: * https://github.com/rails/rails/pull/16998 * https://github.com/rails/rails/pull/17000 M activesupport/test/core_ext/duration_test.rb M railties/test/application/configuration_test.rb commit 3f39ac4 refs/heads/master Merge: 3e27a03 0756375 Author: Matthew Draper Date: 2014-09-22 05:44:27 +0930 Merge pull request #16998 from yuki24/fix-false-assertion Fix false assertions in AR::TestCase::AttributeMethodsTest commit 0756375 refs/heads/master Author: Yuki Nishijima Date: 2014-09-21 11:34:37 -0700 Fix assertions in AR::TestCase::AttributeMethodsTest This test has always been green because it uses "assert" and the first argument is an truthy class/object. M activerecord/test/cases/attribute_methods_test.rb commit 3e27a03 refs/heads/master Merge: fac25eb 5919cce Author: Godfrey Chan Date: 2014-09-22 01:08:19 +0900 Merge pull request #16984 from chancancode/fix_16578 Document that the default for `rails server -b` has changed commit 5919cce refs/heads/master Author: Godfrey Chan Date: 2014-09-20 18:44:36 +0900 Document that the default for `rails server -b` has changed Fixes #16578 M guides/source/4_2_release_notes.md M railties/lib/rails/commands/server.rb commit fac25eb refs/heads/master Merge: cdbb206 994d3eb Author: Yves Senn Date: 2014-09-21 11:42:51 +0200 Merge pull request #16979 from square/standardize-call-style Standardize on `Rails.application` [ci skip] commit cdbb206 refs/heads/master Merge: 5f8c1b19 38d6697 Author: Zachary Scott Date: 2014-09-21 12:51:57 +0900 Merge pull request #16994 from yuki24/fix-typo-in-ar-attribute-method-test [ci skip] Fix typo in activerecord/test/cases/attribute_methods_test.rb:737 commit 38d6697 refs/heads/master Author: Yuki Nishijima Date: 2014-09-20 20:40:38 -0700 Fix typo [ci skip] M activerecord/test/cases/attribute_methods_test.rb commit 5f8c1b19 refs/heads/master Merge: b537f14 4f5d60f Author: Zachary Scott Date: 2014-09-21 12:43:31 +0900 Merge pull request #16988 from y-yagi/chg_default_log_level [ci skip] modify the description of production log level default commit 4f5d60f refs/heads/master Author: yuuji.yaginuma Date: 2014-09-20 23:05:41 +0900 [ci skip] modify the description of production log level default M guides/source/configuring.md M guides/source/debugging_rails_applications.md commit b537f14 refs/heads/master Merge: 1a2e3a0 1415fdd Author: Yves Senn Date: 2014-09-20 18:45:53 +0200 Merge pull request #16987 from jonatack/patch-8 ActiveRecord CHANGELOG improvements [skip ci] commit a91b36f refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-09 14:46:54 +0530 Update error message for validate method - Improve the error message by suggesting that the user may have intended to call validates instead of validate method. M activemodel/lib/active_model/validations.rb commit 1415fdd refs/heads/master Author: Jon Atack Date: 2014-09-20 15:21:23 +0200 ActiveRecord CHANGELOG improvements [skip ci] M activerecord/CHANGELOG.md commit c7f0cd6 refs/heads/master Author: Matthew Draper Date: 2014-09-20 19:17:12 +0930 Skip isolated tests for PRs They're valuable, but the types of errors they catch are fairly rare: we can address them post-merge when they show up. M ci/travis.rb commit 1a2e3a0 refs/heads/master Author: Godfrey Chan Date: 2014-09-20 18:05:01 +0900 No need to call to_sym here The hash is now string-keyed, and [_]reflect_on_association calls `to_s` on the argument anyway. M activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/predicate_builder.rb commit 90f9968 refs/heads/master Author: Godfrey Chan Date: 2014-09-20 17:53:49 +0900 Fix find_by with associations not working with adequate record For now, we will just skip the cache when a non-column key is used in the hash. If the future, we can probably move some of the logic in PredicateBuilder.expand up the chain to make caching possible for association queries. Closes #16903 Fixes #16884 M activerecord/lib/active_record/core.rb M activerecord/test/cases/finder_test.rb commit 793e4aa refs/heads/master Author: Godfrey Chan Date: 2014-09-20 16:55:49 +0900 Quick fix to address the borken build caused by #15791 This is pretty lame though, so feel free to send a PR with a better fix! ;) cc @zev @tenderlove M activerecord/lib/active_record/core.rb commit 808070b refs/heads/master Merge: d68c642 2ea51a1 Author: Aaron Patterson Date: 2014-09-19 23:15:44 -0700 Merge pull request #15791 from zev/add_model_to_recordnotfound_message Update RecordNotFound exception cases to include a message with the commit d68c642 refs/heads/master Merge: 620f4a4 f37ad33 Author: Rafael Mendonça França Date: 2014-09-19 18:38:08 -0300 Merge pull request #16981 from gsamokovarov/concern-docs-comment-reword [ci skip] Reword a comment in concern's documentation commit f37ad33 refs/heads/master Author: Genadi Samokovarov Date: 2014-09-19 23:30:59 +0200 [ci skip] Reword a comment in concern's documentation Nothing biggie. Skimmed through `ActiveSupport::Concern` docs these days and this one comment seemed a bit off. M activesupport/lib/active_support/concern.rb commit 6081904 refs/remotes/origin/4-1-stable Author: Xavier Noria Date: 2014-09-19 20:35:52 +0200 Revert "inject Rack::Lock if config.eager_load is false" After some discussion in Campfire we have decided to revert this one. There are legit use cases where concurrent but coordinated requests are made. We have seen a test suite that uses Rack::Reproxy to redispatch requests down, and also some actions that call un-mocked services that call the original app and need to complete the cycle to complete the original request. While this is a more sane default for 4.2, its backport is more dubious because it would break those test suites. As a workaround, people having issues related to this before 4.2 can throw config.allow_concurrency = false in config/environments/test.rb. This reverts commit 65f75c0ceadac0080a576c1a4551b7c55f4bdff6. M railties/CHANGELOG.md M railties/lib/rails/application/default_middleware_stack.rb M railties/test/application/middleware_test.rb commit 994d3eb refs/heads/master Author: Tamir Duberstein Date: 2014-09-19 10:30:31 -0700 Standardize on `Rails.application` [ci skip] This seems to be the style settled on in most of the templates. M guides/source/4_2_release_notes.md M guides/source/active_job_basics.md M guides/source/upgrading_ruby_on_rails.md M railties/CHANGELOG.md M railties/lib/rails/application.rb commit 65f75c0 refs/remotes/origin/4-1-stable Author: Xavier Noria Date: 2014-09-18 22:35:19 +0200 inject Rack::Lock if config.eager_load is false If code is not eager loaded constants are loaded on demand. Constant autoloading is not thread-safe, so if eager loading is not enabled multi-threading should not be allowed. This showed up in certain Capybara scenarios: Most Capybara drivers other than Rack::Test need a web server. In particular, drivers for JavaScript support. Capybara launches WEBrick in its own thread for those but that per se is fine, because the spec thread and the server thread are coordinated. Problem comes if the page being served in the spec makes Ajax calls. Those may hit WEBrick in parallel, and since WEBrick is multi-threaded and allow_concurrency? returns true in the test environment before this patch, threads are spawned to serve those parallel requests. On the other hand, since eager_load is false by default in the test environment, constants are not preloaded. So the suite is autoloading constants in a multi-threaded set. That's a receipt for paracetamol. The symptom is random obscure errors whose messages point somehow to constant autoloading. As a consequence of this fix for allow_concurrency? WEBrick in Capybara scenarios no longer runs in multi-threaded mode. Fixes #15089. Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/application/default_middleware_stack.rb M railties/test/application/middleware_test.rb commit 620f4a4 refs/heads/master Merge: 88c7237 c8450d8 Author: Rafael Mendonça França Date: 2014-09-19 11:10:49 -0300 Merge pull request #16973 from prathamesh-sonpatki/fixtures-features Updated comment about features of fixtures commit 88c7237 refs/heads/master Merge: 8b39dfd 48ee6b8 Author: Abdelkader Boudih Date: 2014-09-19 13:54:53 +0100 Merge pull request #16975 from lethalbrains/master [ci skip] ActionRecord CHANGELOG docs fixes commit 8b39dfd refs/heads/master Merge: c2dfc31 1a787eb Author: Matthew Draper Date: 2014-09-19 21:26:32 +0930 Merge pull request #16964 from Agis-/issue-16956 Make delegation work with the reserved words passed to `:to` commit 48ee6b8 refs/heads/master Author: lethalbrains Date: 2014-09-19 17:17:50 +0530 [ci skip] ActionRecord CHANGELOG docs fixes M activerecord/CHANGELOG.md commit c8450d8 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-19 17:49:42 +0900 Updated comment about features of fixtures - Added a note about some features which are not dependent on auto-generated ID's. - [ci skip] M activerecord/lib/active_record/fixtures.rb commit 1a787eb refs/heads/master Author: Agis- Date: 2014-09-18 23:55:13 +0300 Delegation works with reserved words passed to `:to` Fixes #16956. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/module/delegation.rb M activesupport/test/core_ext/module_test.rb commit 4539038 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-18 18:39:44 -0300 Merge pull request #16936 from untidy-hair/plugin_test_db_migrate_path Specify dummy app's db migrate path in plugin's test_helper.rb Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb M railties/test/generators/plugin_generator_test.rb commit c2dfc31 refs/heads/master Merge: 112077c 7137c6b Author: Rafael Mendonça França Date: 2014-09-18 18:39:44 -0300 Merge pull request #16936 from untidy-hair/plugin_test_db_migrate_path Specify dummy app's db migrate path in plugin's test_helper.rb Conflicts: railties/CHANGELOG.md commit 112077c refs/heads/master Author: Xavier Noria Date: 2014-09-18 22:35:19 +0200 inject Rack::Lock if config.eager_load is false If code is not eager loaded constants are loaded on demand. Constant autoloading is not thread-safe, so if eager loading is not enabled multi-threading should not be allowed. This showed up in certain Capybara scenarios: Most Capybara drivers other than Rack::Test need a web server. In particular, drivers for JavaScript support. Capybara launches WEBrick in its own thread for those but that per se is fine, because the spec thread and the server thread are coordinated. Problem comes if the page being served in the spec makes Ajax calls. Those may hit WEBrick in parallel, and since WEBrick is multi-threaded and allow_concurrency? returns true in the test environment before this patch, threads are spawned to serve those parallel requests. On the other hand, since eager_load is false by default in the test environment, constants are not preloaded. So the suite is autoloading constants in a multi-threaded set. That's a receipt for paracetamol. The symptom is random obscure errors whose messages point somehow to constant autoloading. As a consequence of this fix for allow_concurrency? WEBrick in Capybara scenarios no longer runs in multi-threaded mode. Fixes #15089. M railties/CHANGELOG.md M railties/lib/rails/application/default_middleware_stack.rb M railties/test/application/middleware_test.rb commit 0b10565 refs/heads/master Author: David Genord II Date: 2014-09-18 15:52:30 -0400 Cleaner queuing of jobs using Delayed Job M activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb commit e19b701 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-18 15:29:26 -0300 Merge pull request #16954 from geoffharcourt/inject-over-sum Use #inject over #sum to build PG create DB statement M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 25f5af7 refs/heads/master Merge: 44033d8 707958b Author: Rafael Mendonça França Date: 2014-09-18 15:29:26 -0300 Merge pull request #16954 from geoffharcourt/inject-over-sum Use #inject over #sum to build PG create DB statement commit c6110da refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-07-15 12:45:35 -0300 Merge branch 'jbrowning-fix_mariadb_rename_index' Closes #15936 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit 707958b refs/heads/master Author: Geoff Harcourt Date: 2014-09-17 18:58:59 -0400 Use #inject over #sum to build PG create DB statement While investigating #16951 I found that another library's monkey-patching of `Enumerable` was causing the test migrations helper to break when trying to build the `CREATE DATABASE` statement. The prior approach used `#sum` to build the string from the options hash. As the code that combines the options to build the database statement is not user-facing, using `#inject` here instead will remove the only place where the database creation/migration code is dependent on ActiveSupport's monkey-patching of `Enumerable`. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 44033d8 refs/heads/master Merge: ddf0c0a 8841f45 Author: Abdelkader Boudih Date: 2014-09-17 23:14:43 +0100 Merge pull request #16953 from akshay-vishnoi/docs-rails-4point2 [ci skip] ActionView and ActionMailerCHANGELOG docs fixes commit 8841f45 refs/heads/master Author: Akshay Vishnoi Date: 2014-09-18 03:40:51 +0530 [ci skip] ActionView and ActionMailer CHANGELOG docs fixes M actionmailer/CHANGELOG.md M actionview/CHANGELOG.md commit ddf0c0a refs/heads/master Merge: 46d168e 57a893b Author: Rafael Mendonça França Date: 2014-09-17 18:34:17 -0300 Merge pull request #16952 from akshay-vishnoi/docs-rails-4point2 [ci skip] ActiveModel CHANGELOG docs fixes commit 57a893b refs/heads/master Author: Akshay Vishnoi Date: 2014-09-18 02:57:13 +0530 [ci skip] ActiveModel CHANGELOG docs fixes M activemodel/CHANGELOG.md commit 46d168e refs/heads/master Merge: 026289e f92ac24 Author: Abdelkader Boudih Date: 2014-09-17 21:59:46 +0100 Merge pull request #16950 from akshay-vishnoi/docs-rails-4point2 Grammar correction in ActiveSupport CHANGELOG [ci skip] commit f92ac24 refs/heads/master Author: Akshay Vishnoi Date: 2014-09-18 02:27:18 +0530 Grammar correction in ActiveSupport CHANGELOG [ci skip] M activesupport/CHANGELOG.md commit 026289e refs/heads/master Merge: 402ac43 7a8fb28 Author: Rafael Mendonça França Date: 2014-09-17 17:28:50 -0300 Merge pull request #16948 from akshay-vishnoi/docs-rails-4point2 [ci skip] ActiveSupport CHANGELOG fixes commit 7a8fb28 refs/heads/master Author: Akshay Vishnoi Date: 2014-09-18 01:55:29 +0530 [ci skip] ActiveSupport CHANGELOG fixes 1. spacing issues 2. spelling correction 3. grammar correction 4. Add missing docs M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/inflections.rb commit 402ac43 refs/heads/master Merge: 1bf1386 a857113 Author: Abdelkader Boudih Date: 2014-09-17 21:03:51 +0100 Merge pull request #16930 from todd/upgrade_guide Added Responders docs, made Web Console docs more consistent. [ci skip] commit 1bf1386 refs/heads/master Merge: 168c0c1 9fddcdd Author: Rafael Mendonça França Date: 2014-09-17 16:58:57 -0300 Merge pull request #16944 from akshay-vishnoi/docs-rails-4point2 [ci skip] AJ docs fixes commit 9fddcdd refs/heads/master Author: Akshay Vishnoi Date: 2014-09-18 01:16:53 +0530 [ci skip] AJ docs fixes 1. Indentation 2. Spaces issues 3. Spelling correction 4. Grammar correction 5. Add #:nodoc: to all internal classes M activejob/lib/active_job/callbacks.rb M activejob/lib/active_job/core.rb M activejob/lib/active_job/enqueuing.rb M activejob/lib/active_job/execution.rb M activejob/lib/active_job/logging.rb M activejob/lib/active_job/queue_adapters/backburner_adapter.rb M activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb M activejob/lib/active_job/queue_adapters/qu_adapter.rb M activejob/lib/active_job/queue_adapters/que_adapter.rb M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb M activejob/lib/active_job/queue_adapters/resque_adapter.rb M activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb M activejob/lib/active_job/queue_adapters/sneakers_adapter.rb M activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 168c0c1 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-17 16:26:49 -0300 Use has_attribute? M activerecord/lib/active_record/autosave_association.rb commit afa4780 refs/heads/master Merge: 3fd016b 93717f3 Author: Rafael Mendonça França Date: 2014-09-17 16:26:35 -0300 Merge pull request #16875 from alan/dont_autosave_has_one_through_record Don't autosave unchanged has_one through records Conflicts: activerecord/CHANGELOG.md commit 3fd016b refs/heads/master Merge: acda46d fab4872 Author: Rafael Mendonça França Date: 2014-09-17 16:20:03 -0300 Merge pull request #16943 from sgrif/sg-fix-tz-converter-serialization Allow YAML serialization when using TZ aware attributes commit acda46d refs/heads/master Merge: 8408796 369a107 Author: Rafael Mendonça França Date: 2014-09-17 16:15:25 -0300 Merge pull request #11794 from yoazt/duration-eql Added method `#eql?` to `ActiveSupport::Duration`, in addition to `#==`. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/duration.rb activesupport/test/core_ext/duration_test.rb commit 8408796 refs/heads/master Merge: 8c6c1dd 6a3626b Author: Rafael Mendonça França Date: 2014-09-17 16:02:55 -0300 Merge pull request #16929 from kongregate/fix-activerecord-deprecated_finders-find-symbol ActiveRecord deprecated finders are broken in 4.2 commit fab4872 refs/heads/master Author: Sean Griffin Date: 2014-09-17 12:37:00 -0600 Allow YAML serialization when using TZ aware attributes M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/type.rb A activerecord/lib/active_record/type/decorator.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/test/cases/attribute_methods_test.rb commit 8c6c1dd refs/heads/master Author: Rafael Mendonça França Date: 2014-09-17 15:21:47 -0300 OMG mysql! M .travis.yml commit 3d4046f refs/heads/master Author: Rafael Mendonça França Date: 2014-09-17 15:00:49 -0300 ruby-head should be green Ruby 2.2 is near to be released so we should support it properly M .travis.yml commit 38b5e19 refs/heads/master Author: Yves Senn Date: 2014-09-17 11:43:42 +0200 do not dump foreign keys for ignored tables. M activerecord/CHANGELOG.md M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/schema_dumper_test.rb commit 6d82213 refs/heads/master Author: Yves Senn Date: 2014-09-17 11:25:30 +0200 unify wording in Active Record CHANGELOG. [ci skip] M activerecord/CHANGELOG.md commit c1ab07c refs/heads/master Author: Yves Senn Date: 2014-09-17 11:09:31 +0200 pg, correctly dump foreign keys targeting tables in a different schema. Closes #16907. [Matthew Draper & Yves Senn] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb commit 7137c6b refs/heads/master Author: Yukio Mizuta Date: 2014-09-16 19:42:04 -0700 Specify dummy app's db migrate path in plugin's test_helper.rb M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb M railties/test/generators/plugin_generator_test.rb commit 6c941ea refs/heads/master Author: Steven Harman Date: 2014-09-16 15:24:24 -0400 Consistently markup etag options. M actionpack/lib/action_controller/metal/conditional_get.rb commit 2210521 refs/heads/master Author: Steven Harman Date: 2014-09-16 15:23:24 -0400 Consistently capitalize ETag. M actionpack/lib/action_controller/metal/conditional_get.rb commit de33fe7 refs/heads/master Merge: fde7858 00e30b8 Author: Rafael Mendonça França Date: 2014-09-16 16:22:57 -0300 Merge pull request #16844 from zerothabhishek/master [guides] 4.2 release notes: added technical details for Adequate Record commit fde7858 refs/heads/master Merge: 1bdb233 c9213e1 Author: Rafael Mendonça França Date: 2014-09-16 16:09:41 -0300 Merge pull request #16841 from tjouan/environment-config-consistency Improve environment config templates consistency commit c9213e1 refs/heads/master Author: Thibault Jouan Date: 2014-09-08 15:57:12 +0000 Improve environment config templates consistency: * Fix long lines; * Use simple quotes for string literals when interpolation is not used. M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 00e30b8 refs/heads/master Author: abhishek Date: 2014-09-16 23:53:02 +0530 [guides] 4.2 release notes: added technical details for Adequate Record M guides/source/4_2_release_notes.md commit 6a3626b refs/heads/master Author: stopdropandrew Date: 2014-09-15 17:03:10 -0700 Backwards compat for activerecord-deprecated_finders Maintain compatibility for: * ActiveRecord::Base#find(:all) * ActiveRecord::Base#find(:first) * ActiveRecord::Base#find(:last) M activerecord/lib/active_record/core.rb commit a857113 refs/heads/master Author: Todd Bealmear Date: 2014-09-15 21:17:07 -0700 Added Responders docs, made Web Console docs more consistent. [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 1bdb233 refs/heads/master Merge: 6e4aa9d 700ec89 Author: Rafael Mendonça França Date: 2014-09-16 11:14:28 -0300 Merge pull request #16790 from cirosantilli/explain-erb-space-removal Explain ERB space removal. [ci skip] commit cbe7493 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-16 10:51:29 -0300 Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error Use dynamic path for dummy app location in plugin's test_helper.rb Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb M railties/test/generators/plugin_generator_test.rb commit 6e4aa9d refs/heads/master Merge: 0da9923 8c9b347 Author: Rafael Mendonça França Date: 2014-09-16 10:51:29 -0300 Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error Use dynamic path for dummy app location in plugin's test_helper.rb commit 0da9923 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-12 15:54:08 -0300 Make explicit 4.1 is being maintained by a special situation [ci skip] M guides/source/maintenance_policy.md commit 0f51aab refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-16 10:24:51 -0300 Put the CHANGELOG entry in the right place [ci skip] M actionpack/CHANGELOG.md commit 6dbaea6 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-09-15 11:07:56 -0300 Merge pull request #16886 from yuki24/bugfix-bad-request-from-public-exception-4-1-stable [4-1-stable] Fix a bug where malformed query strings lead to 500 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/public_exceptions.rb M actionpack/test/dispatch/show_exceptions_test.rb commit 49f8356 refs/heads/master Author: Juanito Fatas Date: 2014-09-16 15:32:38 +0800 [ci skip] Fix code snippet display in Action Mailer Basics guide. M guides/source/action_mailer_basics.md commit 7d1feb0 refs/heads/master Merge: 62955c7 4a634e5 Author: Rafael Mendonça França Date: 2014-09-15 17:01:48 -0300 Merge pull request #16927 from akshay-vishnoi/fix-typo [ci skip] Fix typo `equals to` --> `equal to` commit 4a634e5 refs/heads/master Author: Akshay Vishnoi Date: 2014-09-16 01:15:00 +0530 [ci skip] Fix typo `equals to` --> `equal to` M guides/source/3_0_release_notes.md commit 93717f3 refs/heads/master Author: Alan Kennedy Date: 2014-09-15 09:18:24 +0100 Don't autosave unchanged has_one through records M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/autosave_association_test.rb commit d50bbc0 refs/remotes/origin/4-1-stable Merge: 4af29d8 1cbeb61 Author: Rafael Mendonça França Date: 2014-09-15 11:21:05 -0300 Merge pull request #16486 from yahonda/backport_16196_to_4-1-stable Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode" commit 4af29d8 refs/remotes/origin/4-1-stable Merge: 1d6d72a 616de8f Author: Rafael Mendonça França Date: 2014-09-15 11:07:56 -0300 Merge pull request #16886 from yuki24/bugfix-bad-request-from-public-exception-4-1-stable [4-1-stable] Fix a bug where malformed query strings lead to 500 commit 62955c7 refs/heads/master Author: Matthew Draper Date: 2014-09-15 21:41:25 +0930 As of Unicode 6.3, Mongolian Vowel Separator is not whitespace Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's not a good candidate for testing String#squish. M activesupport/lib/active_support/core_ext/string/filters.rb M activesupport/lib/active_support/multibyte/unicode.rb M activesupport/test/core_ext/string_ext_test.rb M guides/source/active_support_core_extensions.md commit c0a4a30 refs/heads/master Merge: a3a8a69 f976751 Author: Jeremy Kemper Date: 2014-09-14 22:20:58 -0700 Merge pull request #16574 from lsylvester/duration-respond_to add implementation of respond_to? for ActiveSupport::Duration commit f976751 refs/heads/master Author: lsylvester Date: 2014-08-20 04:56:54 -0200 add implementation of respond_to? for ActiveSupport::Duration M activesupport/lib/active_support/duration.rb M activesupport/test/core_ext/duration_test.rb M activesupport/test/core_ext/object/duplicable_test.rb commit a3a8a69 refs/heads/master Merge: 8a47e87 14f07fd Author: Godfrey Chan Date: 2014-09-15 08:57:58 +0800 Merge pull request #16922 from y-yagi/add_test_jobs_task Add test jobs task commit 14f07fd refs/heads/master Author: yuuji.yaginuma Date: 2014-09-15 08:23:14 +0900 Add `test:jobs` task M railties/lib/rails/test_unit/testing.rake M railties/test/application/test_runner_test.rb commit 8a47e87 refs/heads/master Author: Aaron Patterson Date: 2014-09-14 17:11:04 -0700 handle <%== nil %> cases This is much less common than string literal appends, so add a special case method for it. Maybe fixes bug reported by @jeremy on 97ef636191933f1d4abc92fc10871e6d1195285c M actionview/lib/action_view/buffers.rb M actionview/lib/action_view/template/handlers/erb.rb A actionview/test/fixtures/test/nil_return.erb M actionview/test/template/compiled_templates_test.rb commit ac94109 refs/heads/master Merge: 2ceb3aa b820eb2 Author: Jeremy Kemper Date: 2014-09-14 16:15:38 -0700 Merge pull request #16920 from seuros/aj simplify test_adapter commit 2ceb3aa refs/heads/master Merge: e3a65c6 5ec944e Author: Abdelkader Boudih Date: 2014-09-14 23:22:01 +0100 Merge pull request #16918 from kiuru/master Singular credit_card controller name changed to plural [ci skip] commit b820eb2 refs/heads/master Author: Abdelkader Boudih Date: 2014-09-14 22:11:03 +0000 simplify test_adapter M activejob/lib/active_job/queue_adapters/test_adapter.rb commit e3a65c6 refs/heads/master Author: Jeremy Kemper Date: 2014-09-14 00:58:45 -0700 Tighten up AJ::Arguments and its tests * Disallow deserialization of non-primitive objects * Broaden coverage; remove superfluous tests M activejob/lib/active_job/arguments.rb A activejob/test/cases/argument_serialization_test.rb D activejob/test/cases/parameters_test.rb commit 01ac234 refs/heads/master Author: Jeremy Kemper Date: 2014-09-14 01:21:55 -0700 Pare down and simplify Active Job's rake tasks M Gemfile M activejob/Rakefile commit 97ef636 refs/heads/master Author: Aaron Patterson Date: 2014-09-14 13:26:39 -0700 Stop nil checking on safe_append= ERB compiler guarantees safe_append= will be called with a string, so nil checks don't make sense. Anything else calling this method should check for nil themselves before calling M actionview/lib/action_view/buffers.rb commit 8c9b347 refs/heads/master Author: Yukio Mizuta Date: 2014-09-13 18:17:54 -0700 Use dynamic path for dummy app location in plugin's test_helper.rb M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb M railties/test/generators/plugin_generator_test.rb commit 5ec944e refs/heads/master Author: Niko Kiuru Date: 2014-09-14 20:40:43 +0300 Singular credit_card controller name changed to plural M guides/source/command_line.md commit e47b3e1 refs/heads/master Merge: 4a7d889 75eaefc Author: Jeremy Kemper Date: 2014-09-13 18:02:45 -0700 Merge pull request #16912 from yuki24/rescue-rack-parameter-type-error Rescue `Rack::Utils::ParameterTypeError` instead of `TypeError` commit 4a7d889 refs/heads/master Merge: afc2137 7a3e5ac Author: Jeremy Kemper Date: 2014-09-13 18:01:29 -0700 Merge pull request #16758 from Agis-/time-change-nsec Add support for `:nsec` option to `Time#change` commit 75eaefc refs/heads/master Author: Yuki Nishijima Date: 2014-09-13 16:54:20 -0700 Rescue Rack::Utils::ParameterTypeError instead of TypeError As of rack/rack@167b6480235ff00ed5f355698bf00ec2f250f72e, Rack raises Rack::Utils::ParameterTypeError which inherits TypeError. In terms of the behavior, Rescuing TypeError still works but this method shouldn't rescue if TypeError is raised for other reasons. M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit 7a3e5ac refs/heads/master Author: Agis- Date: 2014-09-01 22:19:58 +0300 Time#change can now change nanoseconds (:nsec) Closes #16392. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/test/core_ext/time_ext_test.rb commit be83a17 refs/heads/master Author: Thiago Pinto Date: 2014-09-13 19:32:23 -0300 form_helpers: demonstrating there is also a collection_select method in form builder M guides/source/form_helpers.md commit afc2137 refs/heads/master Merge: 1d4d15a 869a905 Author: Santiago Pastorino Date: 2014-09-13 19:23:00 -0300 Merge pull request #16910 from kuldeepaggarwal/use-rails-options use `allow_blank` option instead of custom condition commit 1d4d15a refs/heads/master Merge: 457c876 997a621 Author: Matthew Draper Date: 2014-09-14 07:17:00 +0930 Merge pull request #13656 from chanks/rollback_transactions_in_killed_threads Data corruption risk: Roll back open transactions when the running thread is killed. commit 457c876 refs/heads/master Author: Matthew Draper Date: 2014-09-14 06:51:29 +0930 Revert "Merge pull request #15312 from JuanitoFatas/action_view/asset_path" This reverts commit 21ec7fefea5a1b823cb88733b019b3d52240801d. Per #16911, there's actually a good reason for a "blank" value to have a useful `to_s` here. So let's also add some tests to prove that. M actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit 869a905 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-09-14 00:19:33 +0530 use `allow_blank` option instead M activemodel/lib/active_model/secure_password.rb commit 75e06a1 refs/heads/master Merge: 7578037 b3c9d3e Author: Abdelkader Boudih Date: 2014-09-13 10:57:48 +0100 Merge pull request #16908 from y-yagi/change_activejob_test_dir Change ActiveJob test directory to "test/jobs" [ci skip] commit b3c9d3e refs/heads/master Author: yuuji.yaginuma Date: 2014-09-13 12:54:55 +0900 Change ActiveJob test directory to "test/jobs" M railties/lib/rails/generators/test_unit/job/job_generator.rb commit 616de8f refs/remotes/origin/4-1-stable Author: Yuki Nishijima Date: 2014-09-10 20:42:59 -0700 Fix a bug where malformed query strings lead to 500 If a request contains an malformed query string, Rails responds with an internal server error insted of a bad request. This is because ActionDispatch::PublicExceptions calls request#formats and it raises an ActionController::BadRequest from inside ActionDispatch::ShowExceptions, hence the 500 error. This commit changes PublicExceptions to catch BadRequest if raised from request#formats. fixes #11502 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/public_exceptions.rb M actionpack/test/dispatch/show_exceptions_test.rb commit 1d6d72a refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-12 17:10:56 -0300 Merge pull request #16669 from aantix/dangerous_attribute_error_better_message Improved the error messaging for the DangerousAttributeError exception M activerecord/lib/active_record/attribute_methods.rb commit 7578037 refs/heads/master Merge: 867bc25 53e753b Author: Rafael Mendonça França Date: 2014-09-12 17:10:56 -0300 Merge pull request #16669 from aantix/dangerous_attribute_error_better_message Improved the error messaging for the DangerousAttributeError exception commit 867bc25 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-12 15:13:37 -0300 Prepare maintenance policy for 4.2 release [ci skip] M guides/source/maintenance_policy.md commit 6c0addd refs/heads/master Author: Rafael Mendonça França Date: 2014-09-12 14:32:03 -0300 Se the test order of activejob tests M activejob/test/helper.rb commit a7dbfcf refs/heads/master Author: Rafael Mendonça França Date: 2014-09-12 14:31:51 -0300 Change gid calls to to_gid M activejob/test/cases/parameters_test.rb commit 87de073 refs/heads/master Merge: fb0bd54 1ac20c5 Author: Rafael Mendonça França Date: 2014-09-12 13:57:30 -0300 Merge pull request #16897 from kostia/message-varifier-raises-exception-on-nil-secret MessageVerifier.new raises an appropriate exception if the secret is nil commit 1ac20c5 refs/heads/master Author: Kostiantyn Kahanskyi Date: 2014-09-12 18:47:33 +0200 Changes "if secret.nil?" to unless secret in MessageVerfier M activesupport/lib/active_support/message_verifier.rb commit fb0bd54 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-12 13:39:10 -0300 Globalid was released M Gemfile commit 2dd6ec2 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-12 13:11:18 -0300 Use latest globalid M Gemfile commit 3900efb refs/heads/master Merge: 893b7b8 ed9f71d Author: Rafael Mendonça França Date: 2014-09-12 13:11:07 -0300 Merge pull request #16890 from seuros/globalid Bump globalid version commit 893b7b8 refs/heads/master Merge: 19b670e 9cd7452 Author: Santiago Pastorino Date: 2014-09-12 11:11:12 -0300 Merge pull request #16896 from seuros/revert-16895-suck1-1 Revert "lock suckerpunch version to 1.1" commit 19b670e refs/heads/master Merge: 6f2baa2 878d6c1 Author: Santiago Pastorino Date: 2014-09-12 11:09:55 -0300 Merge pull request #16898 from brandonhilkert/master Remove version. No longer using Celluloid 0.16. commit 878d6c1 refs/heads/master Author: Brandon Hilkert Date: 2014-09-12 09:59:39 -0400 Remove version. No longer using Celluloid 0.16. M Gemfile commit 4bf9d19 refs/heads/master Author: Kostiantyn Kahanskyi Date: 2014-09-12 14:58:04 +0200 MessageVerifier raises an appropriate exception if the secret is nil Otherwise this will lead to another error later on when generating a signature: TypeError (no implicit conversion of nil into String). M activesupport/CHANGELOG.md M activesupport/lib/active_support/message_verifier.rb M activesupport/test/message_verifier_test.rb commit 9cd7452 refs/heads/master Author: Abdelkader Boudih Date: 2014-09-12 13:49:13 +0100 Revert "lock suckerpunch version to 1.1" M Gemfile commit 6f2baa2 refs/heads/master Merge: b259b06 558b6d0 Author: Jeremy Kemper Date: 2014-09-12 05:36:37 -0700 Merge pull request #16895 from seuros/suck1-1 lock suckerpunch version to 1.1 commit 558b6d0 refs/heads/master Author: Abdelkader Boudih Date: 2014-09-12 12:01:08 +0000 lock suckerpunch version to 1.1 M Gemfile commit b259b06 refs/heads/master Merge: 516f431 2e51d6f Author: Matthew Draper Date: 2014-09-12 21:24:38 +0930 Merge pull request #16893 from tanmay3011/docs [ci skip] #find_in_batches doesn't support :include option commit 2e51d6f refs/heads/master Author: tanmay3011 Date: 2014-09-12 17:14:24 +0530 [ci skip] #find_in_batches doesn't support :include option M guides/source/active_record_querying.md commit ed9f71d refs/heads/master Author: Abdelkader Boudih Date: 2014-09-12 08:28:20 +0000 Bump globalid version M activejob/activejob.gemspec M activejob/lib/active_job/arguments.rb commit 428722b refs/heads/master Author: jejacks0n Date: 2014-09-11 21:54:49 -0600 Changes default render behavior from file to template. M actionview/lib/action_view/rendering.rb M actionview/test/actionpack/controller/render_test.rb commit 093f3e9 refs/remotes/origin/4-0-stable Merge: 4d5196e 5aef91e Author: Rafael Mendonça França Date: 2014-09-11 14:34:40 -0300 Merge branch '4-0-10' into 4-0-stable Conflicts: activerecord/CHANGELOG.md commit 5aef91e refs/tags/v4.0.10 (tag: v4.0.10) Author: Rafael Mendonça França Date: 2014-09-11 14:31:56 -0300 Preparing for 4.0.10 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit 13cfa62 refs/remotes/origin/4-1-stable Merge: d1c09ec 2402716 Author: Rafael Mendonça França Date: 2014-09-11 14:28:23 -0300 Merge branch '4-1-6' into 4-1-stable Conflicts: activerecord/CHANGELOG.md activesupport/CHANGELOG.md commit 2402716 refs/tags/v4.1.6 (tag: v4.1.6) Author: Rafael Mendonça França Date: 2014-09-11 14:24:13 -0300 Preparing for 4.1.6 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 516f431 refs/heads/master Author: Yves Senn Date: 2014-09-11 13:37:52 +0200 pg, add test cases for updateable views. M activerecord/test/cases/adapters/postgresql/view_test.rb commit 395573b refs/heads/master Author: Yves Senn Date: 2014-09-11 13:14:37 +0200 reuse view test-cases for pg materialized view tests. M activerecord/test/cases/adapters/postgresql/view_test.rb M activerecord/test/cases/view_test.rb commit e40bf04 refs/heads/master Merge: e581b01 dbe9759 Author: Rafael Mendonça França Date: 2014-09-11 11:24:01 -0300 Merge pull request #16874 from Bartuz/patch-1 [docs] Changes puts to logger.info [ci skip] commit dbe9759 refs/heads/master Author: Filip Bartuzi Date: 2014-09-11 10:06:24 +0200 Changes puts to logger.info M guides/source/asset_pipeline.md commit 700ec89 refs/heads/master Author: Ciro Santilli Date: 2014-09-03 16:08:22 +0200 Explain ERB space removal. [ci skip] M actionview/lib/action_view/base.rb commit e581b01 refs/heads/master Author: Yves Senn Date: 2014-09-11 08:07:35 +0200 switch `assert_operator` arguments as discussed in #16860. Working with two different machines is hard :sweat: M activerecord/test/cases/relations_test.rb commit 16868b5 refs/heads/master Author: Yves Senn Date: 2014-09-09 19:16:26 +0200 A `NullRelation` should represent nothing. Closes #15176. [Matthew Draper & Yves Senn] Closes #16860. (pull request to discuss the implementation) M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/mutation_test.rb M activerecord/test/cases/relations_test.rb commit 53e753b refs/heads/master Author: Jim Jones Date: 2014-09-10 21:40:00 -0700 Changed the DangerousAttributeError exception message to include messaging that the conflict could be because of a conflicting attribute. M activerecord/lib/active_record/attribute_methods.rb commit 1245a9e refs/heads/master Author: Rafael Mendonça França Date: 2014-09-11 00:55:05 -0300 Always define capture to remove the deprecation message M railties/test/abstract_unit.rb commit 53e877f refs/heads/master Author: Rafael Mendonça França Date: 2014-09-11 00:54:43 -0300 Define the configuration at Active Support M activesupport/lib/active_support.rb M activesupport/lib/active_support/test_case.rb M railties/test/configuration/middleware_stack_proxy_test.rb M railties/test/isolation/abstract_unit.rb commit 8edb5ee refs/heads/master Author: Rafael Mendonça França Date: 2014-09-10 22:42:15 -0300 Set test order in ActiveSupport::TestCase of isolation/abstract_unit M railties/test/isolation/abstract_unit.rb commit e4c529e refs/heads/master Author: Rafael Mendonça França Date: 2014-09-10 22:34:55 -0300 Set the test order to be random in the generated app This will avoid the warning in our tests. We delete all the config/environments/ files in the test app so our default code will not work. M railties/test/isolation/abstract_unit.rb commit 9ba9ce6 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-10 22:34:40 -0300 Fix typo M guides/source/upgrading_ruby_on_rails.md commit 412f651 refs/heads/master Merge: 7dd3856 2b41343 Author: Rafael Mendonça França Date: 2014-09-10 22:34:06 -0300 Merge pull request #16839 from chancancode/default_test_order Default to sorting user's test cases for now commit 7dd3856 refs/heads/master Merge: fdba1a7 175ba66 Author: Rafael Mendonça França Date: 2014-09-10 20:35:41 -0300 Merge pull request #16541 from cristianbica/activejob-integration-tests ActiveJob Integration Tests commit fdba1a7 refs/heads/master Author: Jeremy Kemper Date: 2014-09-10 15:32:29 -0700 Speed up schema dumper tests Dump the standard schema once instead of redoing it per test M activerecord/test/cases/schema_dumper_test.rb commit 2c76793 refs/heads/master Author: Jeremy Kemper Date: 2014-09-10 14:22:41 -0700 Include default column limits in schema.rb Allows :limit defaults to be changed without pulling the rug out from under old migrations that omitted :limit because it matched the default at the time. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/test/cases/schema_dumper_test.rb commit da74eeb refs/heads/master Author: Jeremy Kemper Date: 2014-09-10 14:03:34 -0700 MySQL: schema.rb now includes TEXT and BLOB column limits. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/schema_dumper_test.rb commit 39303c0 refs/heads/master Author: Jeremy Kemper Date: 2014-09-10 14:01:52 -0700 MySQL: correct LONGTEXT and LONGBLOB limits from 2GB to their true 4GB M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/schema_dumper_test.rb commit 175ba66 refs/heads/master Author: Cristian Bica Date: 2014-08-18 10:19:41 +0300 ActiveJob Integration Tests M .travis.yml M Gemfile A activejob/.gitignore M activejob/Rakefile M activejob/lib/active_job/queue_adapters/sneakers_adapter.rb M activejob/test/helper.rb A activejob/test/integration/queuing_test.rb A activejob/test/support/integration/adapters/backburner.rb A activejob/test/support/integration/adapters/delayed_job.rb A activejob/test/support/integration/adapters/inline.rb A activejob/test/support/integration/adapters/qu.rb A activejob/test/support/integration/adapters/que.rb A activejob/test/support/integration/adapters/queue_classic.rb A activejob/test/support/integration/adapters/resque.rb A activejob/test/support/integration/adapters/sidekiq.rb A activejob/test/support/integration/adapters/sneakers.rb A activejob/test/support/integration/adapters/sucker_punch.rb A activejob/test/support/integration/dummy_app_template.rb A activejob/test/support/integration/helper.rb A activejob/test/support/integration/jobs_manager.rb A activejob/test/support/integration/test_case_helpers.rb M ci/travis.rb commit 467e570 refs/heads/master Merge: 44ed7a8 27c9a23 Author: Rafael Mendonça França Date: 2014-09-10 16:53:24 -0300 Merge pull request #16379 from JackDanger/update-preloader-documentation Updating Associations::Preloader docs commit 44ed7a8 refs/heads/master Merge: a8eb601 cb8b416 Author: Rafael Mendonça França Date: 2014-09-10 16:06:05 -0300 Merge pull request #16867 from yahonda/use_drop_table_to_drop_sequences Replace drop sql statement to drop_table method commit cb8b416 refs/heads/master Author: Yasuo Honda Date: 2014-09-11 01:43:41 +0900 Replace drop sql statement to drop_table method to drop sequences at the same time each tables dropped for Oracle M activerecord/test/cases/associations/required_test.rb M activerecord/test/cases/attribute_decorators_test.rb M activerecord/test/cases/migration/foreign_key_test.rb commit a8eb601 refs/heads/master Author: Xavier Noria Date: 2014-09-10 19:23:41 +0200 i18n guide: clarify interpolation rules in _html keys [ci skip] M guides/source/i18n.md commit 4159159 refs/heads/master Merge: ed9d220 4f6f433 Author: Rafael Mendonça França Date: 2014-09-10 11:49:03 -0300 Merge pull request #16861 from suginoy/fix_typo_people_post [ci skip]Correct variables in the sample code commit 4f6f433 refs/heads/master Author: suginoy Date: 2014-09-10 11:28:17 +0900 [ci skip]Correct variables in the sample code M actionpack/lib/action_dispatch/http/mime_type.rb commit ed9d220 refs/heads/master Author: Akira Matsuda Date: 2014-09-10 19:25:01 +0900 Tell the user which file is missing when config/database.yml was not found Since cc03675d30b58e28f585720dad14e947a57ff5b the error message became like "Could not load database configuration. No such file -" which doesn't really tell what's actually missing. M railties/lib/rails/application/configuration.rb M railties/test/application/configuration_test.rb commit 9e1a739 refs/heads/master Merge: b1b9651 e6f8cba Author: Guillermo Iguaran Date: 2014-09-10 01:32:36 -0400 Merge pull request #16858 from y-yagi/fix_web_console_docs [ci skip] application.rb -> development.rb in web-console docs commit e6f8cba refs/heads/master Author: yuuji.yaginuma Date: 2014-09-10 13:51:56 +0900 [ci skip] application.rb -> development.rb in web-console docs M guides/source/upgrading_ruby_on_rails.md commit b1b9651 refs/heads/master Merge: e6001cb f234d1f Author: Jeremy Kemper Date: 2014-09-09 13:51:12 -0700 Merge pull request #16855 from slavingia/patch-1 Removed any default margin from mail preview body. commit f234d1f refs/heads/master Author: Sahil Lavingia Date: 2014-09-09 13:38:53 -0700 Removed any default margin from body. M railties/lib/rails/templates/rails/mailers/email.html.erb commit e6001cb refs/heads/master Author: Yves Senn Date: 2014-09-09 15:33:23 +0200 Oracle does not support `IF EXISTS` for `DROP VIEW`. /cc @yahonda M activerecord/test/cases/view_test.rb commit fde0d02 refs/heads/master Author: Yves Senn Date: 2014-09-09 15:17:46 +0200 models backed by views don't assume "id" columns are the primary key. Closes #10247. The same goes for tables with an "id" column but without primary key constraint. Reading from the view works without configuration. If you have an updateable view you need to use `self.primary_key = ''`. M activerecord/test/cases/view_test.rb commit ec6eee5 refs/heads/master Author: Yves Senn Date: 2014-09-09 12:00:01 +0200 add test-cases for primary-key-less-views. Closes #16555. M activerecord/test/cases/view_test.rb commit d2069d6 refs/heads/master Merge: ae9412e bbf6df7 Author: Yves Senn Date: 2014-09-09 11:34:11 +0200 Merge pull request #14056 from girishso/14041 SQLite3Adapter now checks for views in table_exists? fixes: 14041 Conflicts: activerecord/CHANGELOG.md commit ae9412e refs/heads/master Author: Yves Senn Date: 2014-09-09 11:21:23 +0200 introduce `connection.supports_views?` and basic view tests. `AbstractAdapter#supports_views?` defaults to `false` so we have to turn it on in adapter subclasses. Currently the flag only controls test execution. /cc @yahonda M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb A activerecord/test/cases/view_test.rb commit 2dbfd77 refs/heads/master Merge: 3302c8b ce39d73 Author: Vijay Dev Date: 2014-09-09 14:31:30 +0530 Merge pull request #16849 from y-yagi/patch-1 Remove extra newline from ActiveJob test template commit 3302c8b refs/heads/master Merge: d5580b9 3212b15 Author: Vijay Dev Date: 2014-09-09 14:29:07 +0530 Merge pull request #16850 from aditya-kapoor/correct-line [ci skip] change the line orientation on asset precompile page commit d1c09ec refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-09-09 09:44:48 +0200 Allow included modules to override association methods. Closes #16684. This is achieved by always generating `GeneratedAssociationMethods` when `ActiveRecord::Base` is subclassed. When some of the included modules of `ActiveRecord::Base` were reordered this behavior was broken as `Core#initialize_generated_modules` was no longer called. Meaning that the module was generated on first access. Conflicts: activerecord/test/cases/attribute_methods/read_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/associations_test.rb M activerecord/test/cases/attribute_methods/read_test.rb commit d5580b9 refs/heads/master Author: Yves Senn Date: 2014-09-09 09:44:48 +0200 Allow included modules to override association methods. Closes #16684. This is achieved by always generating `GeneratedAssociationMethods` when `ActiveRecord::Base` is subclassed. When some of the included modules of `ActiveRecord::Base` were reordered this behavior was broken as `Core#initialize_generated_modules` was no longer called. Meaning that the module was generated on first access. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/associations_test.rb M activerecord/test/cases/attribute_methods/read_test.rb commit 3212b15 refs/heads/master Author: Aditya Kapoor Date: 2014-09-09 13:21:13 +0530 [ci skip] change the line orientation on asset precompile page M guides/source/asset_pipeline.md commit ce39d73 refs/heads/master Author: yuuji.yaginuma Date: 2014-09-09 16:37:28 +0900 Remove extra newline from ActiveJob test template M railties/lib/rails/generators/test_unit/job/templates/unit_test.rb.erb commit c563656 refs/heads/master Author: Godfrey Chan Date: 2014-09-08 23:32:15 -0700 :scissors: "now" [ci skip] minor fix for #16846 M guides/source/upgrading_ruby_on_rails.md commit 44a9028 refs/heads/master Merge: c211924 e40c3ee Author: Godfrey Chan Date: 2014-09-08 23:30:10 -0700 Merge pull request #16846 from prathamesh-sonpatki/document-error-handling-in-transactions-callbacks Update upgrading guide about error handling in transactional callbacks [ci skip] commit e40c3ee refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-09 10:11:13 +0530 Update upgrading guide about error handling in transactional callbacks - Part of 16576 - [ci skip] M guides/source/upgrading_ruby_on_rails.md commit c211924 refs/heads/master Merge: f3062be 29a1017 Author: Guillermo Iguaran Date: 2014-09-09 00:40:23 -0500 Merge pull request #16848 from prathamesh-sonpatki/kill-extra-has-been Remove extra 'has been' from deprecation warning about asserting selectors commit 29a1017 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-09 11:07:30 +0530 Remove extra 'has been' from deprecation warning about asserting selectors [ci skip] M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit f3062be refs/heads/master Merge: 89d897e ceb9ca2 Author: Guillermo Iguaran Date: 2014-09-09 00:32:38 -0500 Merge pull request #16847 from prathamesh-sonpatki/kill-extra-has-been Remove extra 'has been' from the deprecation message commit ceb9ca2 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-09-09 10:47:40 +0530 Remove extra 'has been' from the deprecation message - [ci skip] M actionpack/lib/action_dispatch/testing/assertions/tag.rb commit 89d897e refs/heads/master Merge: fb11038 453f5ec Author: Guillermo Iguaran Date: 2014-09-08 23:17:02 -0500 Merge pull request #16845 from todd/upgrade_guide_console_docs Add docs for web-console to 4.2 Upgrade Guide commit 453f5ec refs/heads/master Author: Todd Bealmear Date: 2014-09-08 20:30:47 -0700 Add docs for web-console to 4.2 Upgrade Guide [ci skip] M guides/source/upgrading_ruby_on_rails.md commit fb11038 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-08 18:03:17 -0300 Do not memoize document_root_element in view tests Memoizing will not make possible to assert the output of the view if it is changed after the first assert_select call Related with plataformatec/simple_form#1130 and rails/rails-dom-testing#15 M actionview/lib/action_view/test_case.rb M actionview/test/template/test_case_test.rb commit 847c621 refs/tags/v4.0.10 Author: Sam Ruby Date: 2014-08-23 15:37:12 -0400 Use latest 2.1 version of sprockets-rails M railties/lib/rails/generators/app_base.rb commit 19f9cb3 refs/tags/v4.0.10 Author: Rafael Mendonça França Date: 2014-09-05 18:43:10 -0300 Do not mark object as persisted after an association is saved Callback order in Active Record objects are important. Users should not define callbacks before the association definition or surprising behaviours like the described at #3798 will happen. This callback order dependency is documented at https://github.com/rails/rails/blob/31bfcdc77ca0d8cec9b5fe513bdc6f05814dd4f1/activerecord/lib/active_record/associations.rb#L1222-1227. This reverts #15728. Fixes #16620. Conflicts: activerecord/lib/active_record/autosave_association.rb activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 4d5196e refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-09-05 18:43:10 -0300 Do not mark object as persisted after an association is saved Callback order in Active Record objects are important. Users should not define callbacks before the association definition or surprising behaviours like the described at #3798 will happen. This callback order dependency is documented at https://github.com/rails/rails/blob/31bfcdc77ca0d8cec9b5fe513bdc6f05814dd4f1/activerecord/lib/active_record/associations.rb#L1222-1227. This reverts #15728. Fixes #16620. Conflicts: activerecord/lib/active_record/autosave_association.rb activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 3a9bcd9 refs/tags/v4.1.6 Author: Sam Ruby Date: 2014-08-23 15:31:09 -0400 Use latest 2.1 version of sprockets-rails M railties/lib/rails/generators/app_base.rb commit 57d65e3 refs/tags/v4.1.6.rc2 (tag: v4.1.6.rc2) Author: Rafael Mendonça França Date: 2014-09-08 15:10:13 -0300 Preparing for 4.1.6.rc2 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 91d4433 refs/tags/v4.0.10.rc2 (tag: v4.0.10.rc2) Author: Rafael Mendonça França Date: 2014-09-08 14:53:15 -0300 Preparing for 4.0.10.rc2 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit 2152e89 refs/remotes/origin/4-0-stable Author: Jeremy Kemper Date: 2014-09-06 07:10:23 -0700 Merge pull request #16824 from rajcybage/action_view_content_tag fix the undefined method content_tag #15245 M actionpack/lib/action_view/helpers/translation_helper.rb M actionpack/test/template/translation_helper_test.rb commit 2b41343 refs/heads/master Author: Godfrey Chan Date: 2014-09-08 05:32:16 -0700 Default to sorting user's test cases for now Goals: 1. Default to :random for newly generated applications 2. Default to :sorted for existing applications with a warning 3. Only show the warning once 4. Only show the warning if the app actually uses AS::TestCase Fixes #16769 M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionview/test/abstract_unit.rb M activemodel/test/cases/helper.rb M activerecord/test/cases/helper.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/test_case.rb M activesupport/test/abstract_unit.rb M activesupport/test/test_case_test.rb M guides/source/4_2_release_notes.md M guides/source/configuring.md M guides/source/upgrading_ruby_on_rails.md M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt M railties/test/abstract_unit.rb commit 8683396 refs/heads/master Merge: c3207a1 5663f06 Author: Yves Senn Date: 2014-09-08 11:46:36 +0200 Merge pull request #16827 from kuldeepaggarwal/f-disable-migration-logging disable migrations logging while running test cases for AR schema tests commit c3207a1 refs/heads/master Merge: 42e69c3 72d1663 Author: Matthew Draper Date: 2014-09-08 13:12:04 +0930 Merge pull request #16825 from cristianbica/fix-ar-nested-arrays Fix query with nested array in Active Record commit 42e69c3 refs/heads/master Merge: 23d1b92 90c0671 Author: Guillermo Iguaran Date: 2014-09-07 21:19:49 -0500 Merge pull request #16834 from tchandy/removing_unused_fake_models Removing unused fake models commit 90c0671 refs/heads/master Author: Thiago Pradi Date: 2014-09-07 22:51:14 -0300 Removing unused fake models M actionpack/test/lib/controller/fake_models.rb commit 23d1b92 refs/heads/master Author: Jeremy Kemper Date: 2014-09-07 18:37:00 -0700 Schema dumper: all connection adapters implement #primary_key, so rely on it exclusively M activerecord/lib/active_record/schema_dumper.rb commit 353b881 refs/heads/master Merge: 4c3b3a2 92fb081 Author: Santiago Pastorino Date: 2014-09-07 21:15:09 -0300 Merge pull request #16830 from teeparham/schema_dumper Cleanup SchemaDumper commit 92fb081 refs/heads/master Author: Tee Parham Date: 2014-09-06 11:52:26 -0600 Fix warnings for undefined local variable * Add private method primary_key_for, which more clearly shows that the expected return value is nil when a primary key is not found. M activerecord/lib/active_record/schema_dumper.rb commit 95456eb refs/heads/master Author: Tee Parham Date: 2014-09-06 11:02:40 -0600 Prefer "if any?" to "unless empty?" * Consistent whitespace * Remove unnecessary parentheses M activerecord/lib/active_record/schema_dumper.rb commit 4a1e2c3 refs/heads/master Author: Tee Parham Date: 2014-09-06 10:55:29 -0600 Convert string concatenations to substitutions M activerecord/lib/active_record/schema_dumper.rb commit 29366cd refs/heads/master Author: Juanito Fatas Date: 2014-09-08 03:29:48 +0800 [ci skip] Fix some typos, normalize sentence. Follow up of #16722. https://github.com/rails/rails/pull/16722 also normalize all instance gained methods’ sentence. M guides/source/association_basics.md commit 4c3b3a2 refs/heads/master Merge: 749e289 7143e0d Author: Zachary Scott Date: 2014-09-06 20:33:23 -0700 Merge pull request #16832 from yuki24/use-match-via-all-in-custom-exceptions-app [guides] Use `match ..., via: :all` in the custom exceptions app [ci skip] commit 7143e0d refs/heads/master Author: Yuki Nishijima Date: 2014-09-06 19:32:49 -0700 [guides] Use `match ..., via: :all` in the custom exceptions app [ci skip] Using `get` results in an unexpected error page(returning empty body) for requests of other HTTP mehtods other than GET. Use `match ..., via: :all` so the exceptions app can be more stable. M guides/source/action_controller_overview.md commit 749e289 refs/heads/master Author: Jeremy Kemper Date: 2014-09-06 17:15:00 -0700 Ignore segfault build errors with 2.0.0 + mysql-ruby Continuation of c9a43126c5e2c608ab3ff1be994bce69e815a144 :cry: M .travis.yml commit f5383ee refs/heads/master Merge: da2f619 66f8997 Author: Jeremy Kemper Date: 2014-09-06 17:11:18 -0700 Merge pull request #16793 from javan/comply_with_rack_content_length_middleware Add support for Rack::ContentLength middelware commit 72d1663 refs/heads/master Author: Cristian Bica Date: 2014-09-06 10:25:36 +0300 Fix query with nested array in Active Record `User.where(id: [[1,2],3])` was equal to `User.where(id:[1, 2, 3])` in Rails 4.1.x but because of some refactoring in Arel this stopped working in 4.2.0. This fixes it in Rails. [Dan Olson & Cristian Bica] M activerecord/lib/active_record/relation/predicate_builder/array_handler.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/fixtures/developers.yml commit 66f8997 refs/heads/master Author: Javan Makhmali Date: 2014-09-03 11:16:37 -0400 Add support for Rack::ContentLength middelware M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/dispatch/response_test.rb commit 5663f06 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-09-06 21:44:08 +0530 disable migrations logging while running test cases for AR schema tests M activerecord/test/cases/ar_schema_test.rb commit da2f619 refs/heads/master Author: Akira Matsuda Date: 2014-09-06 20:06:40 +0900 Dynamically modified schema and association would not be correctly reset This fixes <"SQLite3::SQLException: no such column: legacy_things.person_id: SELECT \"legacy_things\".* FROM \"legacy_things\" WHERE \"legacy_things\".\"person_id\" = ?"> in OptimisticLockingTest#test_lock_destroy M activerecord/test/cases/locking_test.rb M activerecord/test/models/person.rb A activerecord/test/models/personal_legacy_thing.rb M activerecord/test/schema/schema.rb commit dd05fe9 refs/remotes/origin/4-1-stable Author: Rajarshi Das Date: 2014-09-06 11:49:39 +0530 fix the undefined method content_tag #15245 not required include ActionView::Helpers::TagHelper in test as well M actionview/lib/action_view/helpers/translation_helper.rb M actionview/test/template/translation_helper_test.rb commit e11914b refs/heads/master Merge: 8d75aa9 ab2ace6 Author: Jeremy Kemper Date: 2014-09-06 07:10:23 -0700 Merge pull request #16824 from rajcybage/action_view_content_tag fix the undefined method content_tag #15245 commit 8d75aa9 refs/heads/master Merge: 381f993 2a78d6f Author: Jeremy Kemper Date: 2014-09-06 07:08:10 -0700 Merge pull request #16822 from jeremy/deprecate-problematic-implicit-response-splatting Deprecate implicit AD::Response splatting and Array conversion commit 2a78d6f refs/heads/master Author: Jeremy Kemper Date: 2014-09-05 13:33:20 -0700 Deprecate implicit AD::Response splatting and Array conversion M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/dispatch/response_test.rb commit ab2ace6 refs/heads/master Author: Rajarshi Das Date: 2014-09-06 11:49:39 +0530 fix the undefined method content_tag #15245 not required include ActionView::Helpers::TagHelper in test as well M actionview/lib/action_view/helpers/translation_helper.rb M actionview/test/template/translation_helper_test.rb commit 381f993 refs/heads/master Author: Godfrey Chan Date: 2014-09-05 20:20:26 -0700 Dependencies: bump to jquery-rails 4.0.0.beta2 M Gemfile M railties/lib/rails/generators/app_base.rb commit b1bc95b refs/heads/master Author: Godfrey Chan Date: 2014-09-05 17:55:45 -0700 Use the released jquery-rails gem M Gemfile M railties/lib/rails/generators/app_base.rb commit dc8a759 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-05 19:41:02 -0300 Add TODO to release the gems before the next Rails release M Gemfile commit aca714e refs/heads/master Merge: d12b9b2 0ab9301 Author: Rafael Mendonça França Date: 2014-09-05 19:20:19 -0300 Merge pull request #16114 from seuros/test_clean [Postgresql tests] Added enable_extension! to helper commit 5cfd7d5 refs/tags/v4.1.6.rc2 Author: Rafael Mendonça França Date: 2014-09-05 18:43:10 -0300 Do not mark object as persisted after an association is saved Callback order in Active Record objects are important. Users should not define callbacks before the association definition or surprising behaviours like the described at #3798 will happen. This callback order dependency is documented at https://github.com/rails/rails/blob/31bfcdc77ca0d8cec9b5fe513bdc6f05814dd4f1/activerecord/lib/active_record/associations.rb#L1222-1227. This reverts #15728. Fixes #16620. Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 381cc43 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-05 18:43:10 -0300 Do not mark object as persisted after an association is saved Callback order in Active Record objects are important. Users should not define callbacks before the association definition or surprising behaviours like the described at #3798 will happen. This callback order dependency is documented at https://github.com/rails/rails/blob/31bfcdc77ca0d8cec9b5fe513bdc6f05814dd4f1/activerecord/lib/active_record/associations.rb#L1222-1227. This reverts #15728. Fixes #16620. Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit d12b9b2 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-05 18:48:22 -0300 Remove CHANGELOG entry [ci skip] M activerecord/CHANGELOG.md commit ad4ea98 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-05 18:43:10 -0300 Do not mark object as persisted after an association is saved Callback order in Active Record objects are important. Users should not define callbacks before the association definition or surprising behaviours like the described at #3798 will happen. This callback order dependency is documented at https://github.com/rails/rails/blob/31bfcdc77ca0d8cec9b5fe513bdc6f05814dd4f1/activerecord/lib/active_record/associations.rb#L1222-1227. This reverts #15728. Fixes #16620. M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 0ab9301 refs/heads/master Author: Abdelkader Boudih Date: 2014-07-09 21:10:49 +0000 Added enable_extension! to helper M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/citext_test.rb M activerecord/test/cases/adapters/postgresql/ltree_test.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/test/cases/helper.rb M activerecord/test/cases/migration/rename_table_test.rb M activerecord/test/schema/schema.rb commit 2c15c10 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-05 16:43:14 -0300 Merge pull request #14911 from estsauver/14908 Propagate test messages through assert_routing helper, Fixes #14908 M actionpack/lib/action_dispatch/testing/assertions/routing.rb M actionpack/test/dispatch/routing_assertions_test.rb commit 31bfcdc refs/heads/master Author: Rafael Mendonça França Date: 2014-09-05 16:47:57 -0300 :scissors: M actionpack/lib/action_dispatch/testing/assertions/routing.rb commit 67117f7 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-05 16:47:00 -0300 Add test to assert_recognizes with custom message M actionpack/test/dispatch/routing_assertions_test.rb commit 2bb19fa refs/heads/master Author: Rafael Mendonça França Date: 2014-09-05 16:46:52 -0300 Message doesn't need to be optional M actionpack/lib/action_dispatch/testing/assertions/routing.rb commit 3f720d5 refs/heads/master Merge: ccbb481 31c3eec Author: Rafael Mendonça França Date: 2014-09-05 16:43:14 -0300 Merge pull request #14911 from estsauver/14908 Propagate test messages through assert_routing helper, Fixes #14908 commit ccbb481 refs/heads/master Author: Matthew Draper Date: 2014-09-06 04:56:25 +0930 Fix for inflector's incorrect camelCase replacement for acronyms Fixes #8015, #9756. [Fred Wu & Matthew Draper] M activesupport/CHANGELOG.md M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/inflector_test.rb M activesupport/test/inflector_test_cases.rb commit 72e42d2 refs/heads/master Author: Harshad Sabne Date: 2014-09-06 00:20:03 +0530 'Revert' ->active_record_migrations [ci skip] Revert method documentation moved from migrations.md to active_record_migrations.md M guides/source/4_0_release_notes.md commit 9576605 refs/heads/master Merge: 7025d77 d69e0ad Author: Rafael Mendonça França Date: 2014-09-05 14:31:20 -0300 Merge pull request #16818 from phoet/patch-4 world writable might be a bit too open... commit d69e0ad refs/heads/master Author: Peter Schröder Date: 2014-09-05 16:44:41 +0200 world writable might be a bit too open... M railties/lib/rails/application/bootstrap.rb commit 7025d77 refs/heads/master Author: Matthew Draper Date: 2014-09-05 23:32:48 +0930 For now, we will keep sorting the tests. This reverts commits e969c928463e329fd6529ac59cad96385c538ffb and bd2b3fbe54e750ba97469a7896e8d143d6dfd465. M actionpack/Rakefile M actionview/Rakefile M activemodel/Rakefile M activerecord/Rakefile commit 4c440a5 refs/heads/master Merge: a8827cb 1fc9ddb Author: Santiago Pastorino Date: 2014-09-05 10:39:50 -0300 Merge pull request #16815 from seuros/ar-freeze-adapter-name Freeze ADAPTER_NAME in adapters commit 1fc9ddb refs/heads/master Author: Abdelkader Boudih Date: 2014-09-05 11:41:42 +0000 Freeze ADAPTER_NAME in adapters M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit a8827cb refs/heads/master Author: Godfrey Chan Date: 2014-09-05 04:27:54 -0700 Fixed regression with referencing polymorphic assoc in eager-load This is cased by 03118bc + 9b5d603. The first commit referenced the undefined local variable `column` when it should be using `reflection.type` as the lookup key. The second commit changed `build_arel` to not modify the `bind_values` in- place so we need to combine the arel's `bind_values` with the relation's when building the SQL. Fixes #16591 Related #15821 / #15892 / 7aeca50 M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/eager_test.rb commit ce43e8a refs/heads/master Merge: c4fbe14 3fe864f Author: Yves Senn Date: 2014-09-05 09:12:37 +0200 Merge pull request #16807 from tgxworld/carry_out_assignment_within_block Move variable assignment within logging block. commit c4fbe14 refs/heads/master Merge: 7d69eae 57b2c37 Author: Andrew White Date: 2014-09-05 07:51:08 +0100 Merge pull request #16765 from Agis-/time-change-bug Time#change throws exception with an out-of-range :usec commit 7d69eae refs/heads/master Merge: 9f52f04 fbe116a Author: Zachary Scott Date: 2014-09-04 23:39:46 -0700 Merge pull request #16813 from seuros/rdoc Fix ActiveJob rdoc `enqueue` -> `perform_later` [ci skip] commit fbe116a refs/heads/master Author: Abdelkader Boudih Date: 2014-09-05 06:35:19 +0000 correct rdoc [ci skip] M activejob/lib/active_job/test_helper.rb commit 9f52f04 refs/heads/master Merge: 4d8523c 8f87a54 Author: Guillermo Iguaran Date: 2014-09-04 22:53:45 -0500 Merge pull request #16809 from akshay-vishnoi/for_not_to_do_not Cover all cases of `For not` --> `Do not`, related to #16804 commit 8f87a54 refs/heads/master Author: Akshay Vishnoi Date: 2014-09-05 09:21:30 +0530 cover all cases of `For not` --> `Do not`, related to #16804 M activerecord/CHANGELOG.md commit 3fe864f refs/heads/master Author: Guo Xiang Tan Date: 2014-09-05 10:33:28 +0800 Move variable assignment within logging block. M activejob/lib/active_job/logging.rb commit 4d8523c refs/heads/master Merge: 312e4cd 15ddf60 Author: David Heinemeier Hansson Date: 2014-09-04 18:50:28 -0700 Merge pull request #16699 from cristianbica/aj-refactor-queueing Active Job partial refactor commit 312e4cd refs/heads/master Author: Akira Matsuda Date: 2014-09-05 09:49:22 +0900 Load :developers fixtures where expecting a Developer to be there M activerecord/test/cases/relation/merging_test.rb commit ed7c851 refs/heads/master Merge: 2e6625f 4abbdbd Author: Aaron Patterson Date: 2014-09-04 17:24:34 -0700 Merge pull request #16788 from codeodor/fix-16761 Skip StatementCache for eager loaded associations commit 2e6625f refs/heads/master Author: Aaron Patterson Date: 2014-09-04 14:40:10 -0700 always reorder bind parameters. fixes #15920 M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations_test.rb commit c523b7c refs/heads/master Author: Zachary Scott Date: 2014-09-04 14:19:47 -0700 :scissors: and from #16803 [ci skip] M guides/source/active_support_core_extensions.md commit 67463d5 refs/heads/master Merge: 181d4f2 b947b6e Author: Zachary Scott Date: 2014-09-04 14:19:11 -0700 Merge pull request #16803 from Peeja/methods-are-not-duplicable--update-guide Document that method objects are not `duplicable?` [ci skip] commit 181d4f2 refs/heads/master Merge: 703a2e8 39fc362 Author: Rafael Mendonça França Date: 2014-09-04 18:12:17 -0300 Merge pull request #16804 from kaleworsley/for_not_to_do_not Change "For not..." to "Do not...". commit 39fc362 refs/heads/master Author: Kale Worsley Date: 2014-09-04 15:08:36 -0600 Change "For not..." to "Do not...". M railties/lib/rails/generators/rails/app/templates/config/application.rb commit 57b2c37 refs/heads/master Author: Agis- Date: 2014-09-01 15:54:29 +0300 Time#change throws exception with an out-of-range :usec https://github.com/rails/rails/commit/98b46bf5e201307cae56ee14bf41363a539779c5 did not properly handled out-of-range `:usec`s. Passing a `:usec` that's out of range now throws an `ArgumentError` as it should. Fixes #16759. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/test/core_ext/time_ext_test.rb commit b947b6e refs/heads/master Author: Peter Jaros Date: 2014-09-04 15:08:07 -0400 Document that method objects are not `duplicable?` M guides/source/active_support_core_extensions.md commit 703a2e8 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-04 14:06:40 -0300 Remove example file This documentation should be in the guides. Closes #16691 D activemodel/examples/validations.rb commit 4abbdbd refs/heads/master Author: Sammy Larbi Date: 2014-08-31 14:18:02 -0500 Skip StatementCache for eager loaded associations (Fixes #16761) Eagerly loaded collection and singular associations are ignored by the StatementCache, which causes errors when the queries they generate reference columns that were not eagerly loaded. This commit skips the creation of the StatementCache as a fix for these scenarios. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/singular_association.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/scoping/default_scoping_test.rb M activerecord/test/models/comment.rb M activerecord/test/models/post.rb commit 40f9407 refs/heads/master Merge: 2198a9f 0b6358b Author: Rafael Mendonça França Date: 2014-09-04 11:54:59 -0300 Merge pull request #16801 from eileencodes/refactor-scope_chain-on-through-refelction-to-eliminate-branch-in-eval_scope Always add lambda to scope chain to eliminate branch in eval_scope commit 2198a9f refs/heads/master Author: Matthew Draper Date: 2014-09-05 00:05:37 +0930 Fix a warning M activejob/lib/active_job/arguments.rb commit 0b6358b refs/heads/master Author: eileencodes Date: 2014-09-02 14:13:32 -0400 Always add lambda to scope chain to eliminate branch in eval_scope We convert all other scopes to lambda's so it makes sense that we should always returns a lambda on a ThroughReflection as well. This eliminates the need to check if the scope is a Relation. M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/reflection.rb commit 4c23701 refs/heads/master Merge: b8fbcc0 8dac515 Author: Matthew Draper Date: 2014-09-04 21:33:40 +0930 Merge pull request #16797 from eileencodes/refactor-add_constraints-followup-to-16762 Followup to PR #16762 commit 8dac515 refs/heads/master Author: eileencodes Date: 2014-09-03 18:55:48 -0400 Follup to PR #16762 Remove chain from parameters, it's no longer needed since chain and i are being passed via next_reflection Change name of `reflection` to `owner_reflection` because of shadow variable warning. The last reflection will always be the owner. M activerecord/lib/active_record/associations/association_scope.rb commit b8fbcc0 refs/heads/master Merge: 94b7328 633f72c Author: Yves Senn Date: 2014-09-04 10:27:49 +0200 Merge pull request #16799 from rramsden/fix-typo [ci skip] Fix typo in rails guide for routing commit 9105fc5 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-09-04 00:26:27 -0700 Enums shouldn't ruin people's anniversaries Added a few more methods on Module/Class to the dangerous class methods blacklist. (Technically, allocate and new are already protected currently because we happen to redefine them in the current implantation.) Closes #16792 M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/enum_test.rb M activerecord/test/cases/scoping/named_scoping_test.rb commit 94b7328 refs/heads/master Author: Godfrey Chan Date: 2014-09-04 00:26:27 -0700 Enums shouldn't ruin people's anniversaries Added a few more methods on Module/Class to the dangerous class methods blacklist. (Technically, allocate and new are already protected currently because we happen to redefine them in the current implantation.) Closes #16792 M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/enum_test.rb M activerecord/test/cases/scoping/named_scoping_test.rb commit 0aa4eda refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-09-03 17:31:38 +0200 schema loading rake tasks maintain database connection for current env. [Joshua Cody & Yves Senn] Closes #16757. Prior to this patch schema loading rake tasks had the potential to leak a connection to a different database. This had side-effects when rake tasks operating on the current connection (like `db:seed`) were chained. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/tasks/database_tasks.rb activerecord/test/cases/tasks/database_tasks_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M railties/test/application/rake/dbs_test.rb commit 316962d refs/heads/master Author: Yves Senn Date: 2014-09-03 21:59:38 +0200 build fix, we have to reset the RACK_ENV as well. This is a follow-up to ded17a4 to get the build passing on Travis. As Travis has `ENV["RACK_ENV"]` set to `test` we need to reset that as well. M railties/test/application/rake/dbs_test.rb commit 9831875 refs/heads/master Author: Yves Senn Date: 2014-09-03 18:46:01 +0200 get rid of shadowing warning when running tests AR and railtie tests. Warning looked like this: ``` /Users/senny/Projects/rails/activerecord/lib/active_record/associations/association_scope.rb:142: warning: shadowing outer local variable - reflection ``` M activerecord/lib/active_record/associations/association_scope.rb commit 633f72c refs/heads/master Author: Richard Ramsden Date: 2014-09-04 14:44:47 +0900 [ci skip] Fix typo in rails guide for routing M guides/source/routing.md commit 15ddf60 refs/heads/master Author: Cristian Bica Date: 2014-09-04 08:08:06 +0300 Rename remaining :in / :at to :wait / :wait_until M actionmailer/lib/action_mailer/message_delivery.rb M actionmailer/test/message_delivery_test.rb M activejob/lib/active_job/configured_job.rb M activejob/lib/active_job/enqueuing.rb commit f57fd2f refs/heads/master Author: Harshad Sabne Date: 2014-09-04 10:16:44 +0530 'Reversible' ->active_record_migrations [ci skip] Reversible method documentation moved from migrations.md to active_record_migrations.md M guides/source/4_0_release_notes.md commit 4dfe140 refs/heads/master Author: Xavier Noria Date: 2014-09-04 00:18:39 +0200 code gardening in ActionController::Renderers * Renames _handle_render_options to _render_to_body_with_renderer, which is more intention-revealing. * The name of the dynamically generated method for a renderer with key :js was "_render_option_js". That name is too weak. :js is an option if you see the render argument as just a generic options hash, but in the context of renderers that's the renderer key, is what identifies the renderer. Now "_render_with_renderer_js" is generated instead, which is crystal clear. * The name of the dynamically generated method for the renderer was constructed using string literals in a few places. That is now encapsulated in a method. * Since we were on it, also removed a couple of redundant selfs. M actionpack/lib/action_controller/metal/renderers.rb commit faa0f32 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-03 18:31:04 -0300 Extract data/aria attribute prefixes to a constant M actionview/lib/action_view/helpers/tag_helper.rb commit a794fd2 refs/heads/master Merge: b79ab4c ee61b76 Author: Rafael Mendonça França Date: 2014-09-03 18:18:05 -0300 Merge pull request #16796 from ARIATeam/aria Add support for ARIA attributes in tags commit ee61b76 refs/heads/master Author: PaoMar Date: 2014-09-03 15:03:58 -0500 Add support for ARIA attributes in tags M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/tag_helper.rb M actionview/test/template/tag_helper_test.rb commit 7fd2a01 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-03 17:11:24 -0300 Merge pull request #16795 from Peeja/methods-are-not-duplicable Methods are not duplicable. Conflicts: activesupport/CHANGELOG.md activesupport/test/core_ext/duplicable_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/duplicable.rb M activesupport/test/core_ext/duplicable_test.rb commit b79ab4c refs/heads/master Merge: d4cc941 fdc5e76 Author: Rafael Mendonça França Date: 2014-09-03 17:11:24 -0300 Merge pull request #16795 from Peeja/methods-are-not-duplicable Methods are not duplicable. commit fdc5e76 refs/heads/master Author: Peter Jaros Date: 2014-09-03 16:00:06 -0400 Methods are not duplicable. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/duplicable.rb M activesupport/test/core_ext/object/duplicable_test.rb commit d4cc941 refs/heads/master Merge: 5db4e7f 57d56aa Author: Matthew Draper Date: 2014-09-04 05:33:39 +0930 Merge pull request #16787 from cristianbica/fix-globalid-deserialization [Active Job] Try to deserialize with GlobalID only strings and globalids commit 1e237b4 refs/heads/master Author: Cristian Bica Date: 2014-08-25 17:34:50 +0300 Active Job refactoring M actionmailer/lib/action_mailer/message_delivery.rb M actionmailer/test/message_delivery_test.rb M activejob/README.md M activejob/lib/active_job.rb M activejob/lib/active_job/base.rb A activejob/lib/active_job/configured_job.rb A activejob/lib/active_job/core.rb M activejob/lib/active_job/enqueuing.rb M activejob/lib/active_job/execution.rb D activejob/lib/active_job/identifier.rb M activejob/lib/active_job/logging.rb M activejob/lib/active_job/queue_adapters/backburner_adapter.rb M activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb M activejob/lib/active_job/queue_adapters/inline_adapter.rb M activejob/lib/active_job/queue_adapters/qu_adapter.rb M activejob/lib/active_job/queue_adapters/que_adapter.rb M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb M activejob/lib/active_job/queue_adapters/resque_adapter.rb M activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb M activejob/lib/active_job/queue_adapters/sneakers_adapter.rb M activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb M activejob/lib/active_job/queue_adapters/test_adapter.rb M activejob/lib/active_job/queue_name.rb M activejob/test/cases/callbacks_test.rb M activejob/test/cases/job_serialization_test.rb M activejob/test/cases/logging_test.rb M activejob/test/cases/queue_naming_test.rb M activejob/test/cases/queuing_test.rb M activejob/test/cases/rescue_test.rb M activejob/test/cases/test_helper_test.rb M activejob/test/jobs/nested_job.rb M activejob/test/jobs/rescue_job.rb M guides/source/active_job_basics.md commit 5db4e7f refs/heads/master Merge: 66c9d31 28eecd9 Author: Rafael Mendonça França Date: 2014-09-03 16:59:58 -0300 Merge pull request #16775 from kaspth/ship-secure-sanitizer Ship with rails-html-sanitizer instead. commit 980ab84 refs/tags/v4.0.10.rc2 Author: Rafael Mendonça França Date: 2014-09-03 16:28:33 -0300 Merge pull request #16756 from huoxito/dont-mess-railties-default-order Dont mess with default order engines load (4.1.6.rc1 regression) Conflicts: railties/lib/rails/application.rb M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit 90c49a6 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-09-03 16:28:33 -0300 Merge pull request #16756 from huoxito/dont-mess-railties-default-order Dont mess with default order engines load (4.1.6.rc1 regression) Conflicts: railties/lib/rails/application.rb M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit 63fb433 refs/tags/v4.1.6.rc2 Author: Rafael Mendonça França Date: 2014-09-03 16:28:33 -0300 Merge pull request #16756 from huoxito/dont-mess-railties-default-order Dont mess with default order engines load (4.1.6.rc1 regression) M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit 937bb5c refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-09-03 16:28:33 -0300 Merge pull request #16756 from huoxito/dont-mess-railties-default-order Dont mess with default order engines load (4.1.6.rc1 regression) M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit 66c9d31 refs/heads/master Merge: 0942100 435e8d7 Author: Rafael Mendonça França Date: 2014-09-03 16:28:33 -0300 Merge pull request #16756 from huoxito/dont-mess-railties-default-order Dont mess with default order engines load (4.1.6.rc1 regression) commit 0942100 refs/heads/master Author: Aaron Patterson Date: 2014-09-03 12:09:21 -0700 extract updating all fixture cache to a method so we can lock later M activerecord/lib/active_record/fixtures.rb commit 28eecd9 refs/heads/master Author: Kasper Timm Hansen Date: 2014-09-02 21:07:41 +0200 Ship with rails-html-sanitizer instead. M actionpack/actionpack.gemspec M actionview/actionview.gemspec M actionview/lib/action_view/helpers/sanitize_helper.rb M actionview/test/template/sanitize_helper_test.rb M guides/source/4_2_release_notes.md D railties/test/application/default_stack_test.rb commit 1fc2e70 refs/heads/master Merge: ded17a4 077d28f Author: Vijay Dev Date: 2014-09-03 16:14:10 +0000 Merge branch 'master' of github.com:rails/docrails commit 077d28f refs/heads/master Author: Vijay Dev Date: 2014-09-03 16:12:45 +0000 copy edit AS core ext changes [ci skip] M guides/source/active_support_core_extensions.md commit ded17a4 refs/heads/master Author: Yves Senn Date: 2014-09-03 17:31:38 +0200 schema loading rake tasks maintain database connection for current env. [Joshua Cody & Yves Senn] Closes #16757. Prior to this patch schema loading rake tasks had the potential to leak a connection to a different database. This had side-effects when rake tasks operating on the current connection (like `db:seed`) were chained. M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/test/cases/tasks/database_tasks_test.rb M railties/test/application/rake/dbs_test.rb commit 57d56aa refs/heads/master Author: Cristian Bica Date: 2014-09-03 15:06:10 +0300 [Active Job] Try to deserialize with GlobalID only strings and globalids M activejob/lib/active_job/arguments.rb commit e2ce4c7 refs/heads/master Merge: a4de217 56f992f Author: Matthew Draper Date: 2014-09-03 20:56:25 +0930 Merge pull request #16785 from cristianbica/fix-double-aj-deserialization-error Fix for double ActiveJob::DeserializationErorr commit 56f992f refs/heads/master Author: Cristian Bica Date: 2014-09-03 10:38:02 +0300 Fix for double ActiveJob::DeserializationErorr M activejob/lib/active_job/arguments.rb M activejob/test/cases/rescue_test.rb commit a4de217 refs/heads/master Merge: f6d3af4 330df51 Author: Yves Senn Date: 2014-09-03 12:04:38 +0200 Merge pull request #16263 from zuhao/refactor_activerecord_serialized_attribute_test reset_column_infomation shouldn't be part of the assertion. commit f6d3af4 refs/heads/master Merge: ea1a028 6d988e2 Author: Yves Senn Date: 2014-09-03 08:59:52 +0200 Merge pull request #16780 from viditn91/use-correct-operators-in-query use correct operator in query based on JSON document [ci skip] commit ea1a028 refs/heads/master Merge: 3cce762 f6767b9 Author: Yves Senn Date: 2014-09-03 08:55:15 +0200 Merge pull request #16781 from kamipo/move_column_option_handling Move column option handling to new_column_definition commit 3cce762 refs/heads/master Author: Akira Matsuda Date: 2014-09-03 11:17:27 +0900 Reset ActiveRecord::SchemaDumper.ignore_tables value after changed in tests M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/support/schema_dumping_helper.rb commit 435e8d7 refs/heads/master Author: Washington Luiz Date: 2014-08-30 19:39:38 -0300 Dont mess with default order engines load When copying migrations some engines might depend on schema from other engine so we can't blindly reverse all railties collection as that would affect the order they were originally loaded. This patch helps to only apply the order from engines specified in `railties_order` M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit f6767b9 refs/heads/master Author: Ryuta Kamizono Date: 2014-09-03 06:01:48 +0900 Move column option handling to new_column_definition TableDefinition#column is not called from `add_column`. Use TableDefinition#new_column_definition for column option handling. M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb commit 6d988e2 refs/heads/master Author: viditn91 Date: 2014-09-03 02:31:00 +0530 use correct operator in query based on JSON document M guides/source/active_record_postgresql.md commit 268a55f refs/heads/master Merge: 5ddbaea a70bdfe Author: Matthew Draper Date: 2014-09-03 06:18:51 +0930 Merge pull request #16777 from seuros/testcase Fix failing tests in ActiveJob Adapter commit 5ddbaea refs/heads/master Merge: a2f8377 252165e Author: Rafael Mendonça França Date: 2014-09-02 17:43:29 -0300 Merge pull request #16778 from yahonda/if_exists Remove 'if exists' from drop table statement then use `table_exists?` commit a70bdfe refs/heads/master Author: Abdelkader Boudih Date: 2014-09-02 20:27:32 +0000 Fix failing tests in ActiveJob Adapter M activejob/lib/active_job/queue_adapters/test_adapter.rb commit 252165e refs/heads/master Author: Yasuo Honda Date: 2014-09-03 02:51:27 +0900 Remove 'if exists' from drop table statement then use `table_exists?` Since 'drop table if exists' statement does not always work with some databases such as Oracle. M activerecord/test/cases/associations/required_test.rb M activerecord/test/cases/attribute_decorators_test.rb M activerecord/test/cases/migration/foreign_key_test.rb M activerecord/test/cases/schema_dumper_test.rb commit a2f8377 refs/heads/master Author: Matthew Draper Date: 2014-09-03 03:46:28 +0930 Add a quick straw-man Incompatibilities section Is this a thing we want? Note current duplication between the `assert_select` section here, and the corresponding release note entry... does this detail *move* from there to here? [ci skip] M guides/source/4_2_release_notes.md commit 00775e7 refs/heads/master Merge: 4e7e29d 8e9e424 Author: Aaron Patterson Date: 2014-09-02 10:34:10 -0700 Merge pull request #16762 from eileencodes/refactor-add_constraints-complex-loop-conditional Refactor add_constraints complex loop conditional commit 4e7e29d refs/heads/master Merge: c247aa4 247cc94 Author: Zachary Scott Date: 2014-09-02 10:14:46 -0700 Merge pull request #16774 from cirosantilli/erb-erubis2 Shorten ActionView::Base doc summary line. [ci skip] commit 247cc94 refs/heads/master Author: Ciro Santilli Date: 2014-09-02 19:09:42 +0200 Shorten ActionView::Base doc summary line. [ci skip] M actionview/lib/action_view/base.rb commit c247aa4 refs/heads/master Merge: e905848 afb230e Author: Zachary Scott Date: 2014-09-02 09:33:53 -0700 Merge pull request #16773 from cirosantilli/erb-erubis Clarify Rails uses erubis not stdlin ERB. [ci skip] commit afb230e refs/heads/master Author: Ciro Santilli Date: 2014-09-02 18:12:04 +0200 Clarify Rails uses erubis not stdlin ERB. [ci skip] M actionview/lib/action_view/base.rb commit e905848 refs/heads/master Merge: bff5ef6 5bd1d0a Author: Zachary Scott Date: 2014-09-02 08:44:06 -0700 Merge pull request #16772 from satoryu/master Remove '*' which doesn't belong [ci skip] commit 5bd1d0a refs/heads/master Author: Tatsuya Sato Date: 2014-09-03 00:30:36 +0900 Remove '*' which doesn't work I found an * does not work in Markdown notation. It should be removed. M guides/source/configuring.md commit bff5ef6 refs/heads/master Merge: 2e500e5 a6db1ed Author: Rafael Mendonça França Date: 2014-09-02 11:49:34 -0300 Merge pull request #16770 from arthurnn/add_string_strip_require Add and Remove string/strip require commit a6db1ed refs/heads/master Author: Arthur Neves Date: 2014-09-02 10:40:45 -0400 Add and Remove string/strip require Method .strip_heredoc is defined in active_support/core_ext/string/strip.rb so we need to require it. [fixes #16677] M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 2e500e5 refs/heads/master Merge: 2f52f96 d7add53 Author: Rafael Mendonça França Date: 2014-09-02 11:31:08 -0300 Merge pull request #16724 from seuros/testcase [ActiveJob] TestCase commit d7add53 refs/heads/master Author: Abdelkader Boudih Date: 2014-09-02 14:06:19 +0000 [ActiveJob] TestCase (Will squash before merge) M activejob/lib/active_job/queue_adapters/test_adapter.rb M activejob/lib/active_job/test_case.rb M activejob/lib/active_job/test_helper.rb M activejob/test/cases/test_case_test.rb M activejob/test/cases/test_helper_test.rb commit 2f52f96 refs/heads/master Author: Matthew Draper Date: 2014-09-02 23:48:23 +0930 Leave all our tests as order_dependent! for now We're seeing too many failures to believe otherwise. This reverts commits bc116a55ca3dd9f63a1f1ca7ade3623885adcc57, cbde413df3839e06dd14e3c220e9800af91e83ab, bf0a67931dd8e58f6f878b9510ae818ae1f29a3a, and 2440933fe2c27b27bcafcd9019717800db2641aa. M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionview/test/abstract_unit.rb M activemodel/test/cases/helper.rb M activerecord/test/cases/helper.rb M activesupport/test/abstract_unit.rb M railties/test/abstract_unit.rb commit cc7fadd refs/heads/master Merge: 368001c 5255e4f Author: Yves Senn Date: 2014-09-02 13:38:11 +0200 Merge pull request #16672 from cristianbica/queue-classic-later ActiveJob: Implemented enqueue_at for QueueClassic commit 5255e4f refs/heads/master Author: Cristian Bica Date: 2014-08-24 15:29:20 +0300 ActiveJob: Implemented enqueue_at for QueueClassic M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb M activejob/test/support/queue_classic/inline.rb M guides/source/active_job_basics.md commit 368001c refs/heads/master Merge: 97e689a 83bf95f Author: Yves Senn Date: 2014-09-02 12:31:51 +0200 Merge pull request #16767 from y-yagi/fix_message_delivery_doc [ci skip] Fix a typo in the doc of MessageDelivery commit 83bf95f refs/heads/master Author: yuuji.yaginuma Date: 2014-09-02 17:57:23 +0900 [ci skip] Fix a typo in the doc of MessageDelivery M actionmailer/lib/action_mailer/message_delivery.rb commit fccf3d0 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-29 20:11:17 +0000 [ActiveJob] TestCase M activejob/lib/active_job/queue_adapter.rb M activejob/lib/active_job/queue_adapters/test_adapter.rb M activejob/lib/active_job/test_case.rb M activejob/lib/active_job/test_helper.rb A activejob/test/cases/test_case_test.rb M activejob/test/cases/test_helper_test.rb D activejob/test/cases/test_test.rb M railties/lib/rails/generators/test_unit/job/templates/unit_test.rb.erb commit eb4245d refs/heads/master Author: Abdelkader Boudih Date: 2014-08-26 20:08:49 +0000 [ActiveJob] TestCase M activejob/lib/active_job.rb M activejob/lib/active_job/base.rb M activejob/lib/active_job/queue_adapter.rb M activejob/lib/active_job/queue_adapters.rb A activejob/lib/active_job/queue_adapters/test_adapter.rb A activejob/lib/active_job/test_case.rb A activejob/lib/active_job/test_helper.rb A activejob/test/cases/test_helper_test.rb A activejob/test/cases/test_test.rb M railties/lib/rails/generators/test_unit/job/templates/unit_test.rb.erb commit 97e689a refs/heads/master Merge: 3579120 6e0f273 Author: Yves Senn Date: 2014-09-02 08:43:39 +0200 Merge pull request #16450 from tgxworld/dont_swallow_error_when_identifying_constant_from_test_name Do not swallow exception on NameError within constant. commit 3579120 refs/heads/master Author: Yves Senn Date: 2014-09-02 08:42:44 +0200 remove trailing whitespace. [ci skip] M activesupport/CHANGELOG.md commit 41e48c2 refs/heads/master Author: Jeremy Kemper Date: 2014-09-01 22:35:56 -0700 MySQL: skip GTID-unsafe statement tests when enforce_gtid_consistency is enabled M activerecord/test/cases/adapters/mysql2/schema_test.rb M activerecord/test/cases/helper.rb M activerecord/test/cases/migration_test.rb commit 67b42cb refs/heads/master Author: Rafael Mendonça França Date: 2014-09-01 23:26:10 -0300 Move implementation to the gems Now we keep only the common code and move the specific code to the gems M Gemfile M actionview/lib/action_view/helpers/sanitize_helper.rb commit c6f9cec refs/heads/master Author: Rafael Mendonça França Date: 2014-09-01 22:46:05 -0300 Add test to assert the right sanitizer vendor is being used M Gemfile A railties/test/application/default_stack_test.rb commit 8e9e424 refs/heads/master Author: eileencodes Date: 2014-08-30 07:59:40 -0400 Break conditional branches into separate methods This breaks the two branches of the `if reflection.last` and `else` to clearer see where the two methods can be refactored. Eventually we hope to remove the need for these separated methods altogether. Move the first branch outside the loop This code doesn't need to be in the loop because it it always affects the last chain. `get_bind_values` and `add_constraints` must match in this context because `get_bind_values` is the caching of `add_constraints` Use each_cons to remove need for `chain[i + 1]` The `chain[i + 1]` is confusing because it's not immediately obvious what it's trying to achieve. The use of `each_cons` makes it clear we need to get the `next_reflection`. M activerecord/lib/active_record/associations/association_scope.rb commit 5c057f9 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-01 22:20:39 -0300 Remove warning M actionview/test/activerecord/polymorphic_routes_test.rb commit 2fc6d41 refs/heads/master Author: Rafael Mendonça França Date: 2014-09-01 21:46:56 -0300 Try with web-console master M railties/lib/rails/generators/rails/app/templates/Gemfile commit dd1fb2d refs/heads/master Author: Rafael Mendonça França Date: 2014-09-01 21:41:48 -0300 Use jquery-rails master M Gemfile M railties/lib/rails/generators/app_base.rb commit 6e0f273 refs/heads/master Author: Guo Xiang Tan Date: 2014-08-10 14:56:03 +0800 Use `safe_constantize`. Fixes https://github.com/rails/rails/issues/9933. M activesupport/lib/active_support/testing/constant_lookup.rb M activesupport/test/constantize_test_cases.rb M activesupport/test/dependencies_test.rb M activesupport/test/testing/constant_lookup_test.rb commit fcbdac7 refs/heads/master Merge: a4ecc64 b99a899 Author: Rafael Mendonça França Date: 2014-09-01 11:27:21 -0300 Merge pull request #16704 from ankit1910/use-existing-method use self instead of #read_attribute commit a4ecc64 refs/heads/master Author: Akira Matsuda Date: 2014-09-01 20:59:08 +0900 Clear schema cache before each test M activerecord/test/cases/adapters/mysql/consistency_test.rb commit 3bac1cb refs/heads/master Merge: 095241d 072f103 Author: Godfrey Chan Date: 2014-09-01 04:20:21 -0700 Merge pull request #16763 from brainopia/patch-1 Fix for configuring rails guide [ci skip] commit 072f103 refs/heads/master Author: Ravil Bayramgalin Date: 2014-09-01 10:41:01 +0400 Fix for configuring rails guide `ActiveSupport::Logger` has no concept like auto flushing since it has no userspace buffering. It's a remnant of `ActiveSupport::BufferedLogger` epoch which was since removed from rails. M guides/source/configuring.md commit 095241d refs/heads/master Author: Akira Matsuda Date: 2014-09-01 09:59:28 +0900 Clear schema cache before each test M activerecord/test/cases/adapters/mysql2/boolean_test.rb commit ba7d35c refs/heads/master Merge: 0db179a 2fae37f Author: Aaron Patterson Date: 2014-08-31 13:06:13 -0700 Merge pull request #16755 from codeodor/master Allow polymorphic routes with nil when a route can still be drawn commit 0db179a refs/heads/master Author: Godfrey Chan Date: 2014-08-31 12:23:05 -0700 Keep it closer to the original wording [ci skip] M railties/lib/rails/generators/rails/app/templates/Gemfile commit eb8f58d refs/heads/master Merge: eb8aa4d fc23ff6 Author: Guillermo Iguaran Date: 2014-08-31 14:14:48 -0500 Merge pull request #16747 from rsutphin/web-console-gemfile-comment Clarify that /console is an optional feature commit fc23ff6 refs/heads/master Author: Rhett Sutphin Date: 2014-08-29 16:36:33 -0500 Since /console is an optional feature, mention <%= console %> instead. (/console is not mounted by default with web-console 2.0.) M railties/lib/rails/generators/rails/app/templates/Gemfile commit 2fae37f refs/heads/master Author: Sammy Larbi Date: 2014-08-30 17:19:16 -0500 Allow polymorphic routes with nil when a route can still be drawn Suppose you have two resources routed in the following manner: ```ruby resources :blogs do resources :posts end resources :posts ``` When using polymorphic resource routing like `url_for([@blog, @post])`, and `@blog` is `nil` Rails should still try to match the route to the top-level posts resource. Fixes #16754 M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/test/activerecord/polymorphic_routes_test.rb commit 4b9d22e refs/heads/master Author: Harshad Sabne Date: 2014-08-31 17:22:01 +0530 Update caching_with_rails.md [ci skip] Highlight methods M guides/source/caching_with_rails.md commit f0249bc refs/heads/master Author: Harshad Sabne Date: 2014-08-31 16:58:51 +0530 Highlight Class/Module [ci skip] M guides/source/active_job_basics.md commit eb8aa4d refs/heads/master Author: Zachary Scott Date: 2014-08-30 19:44:53 -0700 Clean up grammar from #16752 [ci skip] M guides/source/layouts_and_rendering.md commit d233d6e refs/heads/master Merge: 9de18a2 377d0de Author: Jeremy Kemper Date: 2014-08-30 15:28:19 -0700 Merge pull request #16751 from seuros/rename [ActionMailer] Rename test/test_test to test/test_case_test commit 9de18a2 refs/heads/master Merge: d5ad203 64c2215 Author: Zachary Scott Date: 2014-08-30 11:37:17 -0700 Merge pull request #16752 from Shruti2791/shruti_workspace [ci skip] add line about text layout commit d5ad203 refs/heads/master Author: Jeremy Kemper Date: 2014-08-30 09:32:50 -0700 MySQL: set connection collation along with the charset Sets the connection collation to the database collation configured in database.yml. Otherwise, `SET NAMES utf8mb4` will use the default collation for that charset (utf8mb4_general_ci) when you may have chosen a different collation, like utf8mb4_unicode_ci. This only applies to literal string comparisons, not column values, so it is unlikely to affect you. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/config.example.yml commit 39f3495 refs/heads/master Author: Akira Matsuda Date: 2014-08-31 00:04:08 +0900 AR#reset_column_information sometimes queries via table_exists? so this assertion causes random test fail M activerecord/test/cases/serialized_attribute_test.rb commit 64c2215 refs/heads/master Author: shruti2791 Date: 2014-08-30 20:17:30 +0530 [ci skip] add line about text layout M guides/source/layouts_and_rendering.md commit 377d0de refs/heads/master Author: Abdelkader Boudih Date: 2014-08-30 14:38:33 +0000 [ActionMailer] Rename test/test_test to test/test_case_test A actionmailer/test/test_case_test.rb D actionmailer/test/test_test.rb commit 84c0f73 refs/heads/master Author: Robin Dupret Date: 2014-08-30 11:58:23 +0200 Refer to the library name instead of the constant When we are loading a component and we want to know its version, we are actually not speaking about the constant but the library itself. [ci skip] [Godfrey Chan & Xavier Noria] M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/lib/action_view/gem_version.rb M activejob/lib/active_job/gem_version.rb M activemodel/lib/active_model/gem_version.rb M activerecord/lib/active_record/gem_version.rb M activesupport/lib/active_support/gem_version.rb commit 4c917da refs/heads/master Merge: c67c5e6 b7ab73a Author: Xavier Noria Date: 2014-08-30 09:49:13 +0200 Merge pull request #16644 from Agis-/drb-tests-actionpack-vagrant Use system /tmp for temp files when testing actionpack commit c67c5e6 refs/heads/master Author: Godfrey Chan Date: 2014-08-29 21:51:32 -0700 Bring back the test cases for `presence` This was removed by mistake in 5e51bdd M activesupport/test/core_ext/object/blank_test.rb commit f0737d8 refs/heads/master Author: Akira Matsuda Date: 2014-08-30 11:45:58 +0900 Forgot to set Migration.verbose at f8d9a51949d6f6cfcab7cc7d501e137836eb88dc :bomb: M activerecord/lib/active_record/tasks/database_tasks.rb commit 365aa65 refs/heads/master Author: Aaron Patterson Date: 2014-08-29 18:19:30 -0700 reduce object allocations in utc_offset `try` allocates an array on every call, we should avoid calling it in hotspots. This reduced AttributeMethodsTest#test_setting_time_zone_aware_attribute_with_string from 18k allocations to 14k M activesupport/lib/active_support/values/time_zone.rb commit 5e51bdd refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-29 15:32:24 -0700 We tenderized the wrong method! Object#try already had the yield option, just needed some tenderloving instance_eval to fit the bill M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/blank.rb M activesupport/lib/active_support/core_ext/object/try.rb M activesupport/test/core_ext/object/blank_test.rb M activesupport/test/core_ext/object/try_test.rb commit 39691ba refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-29 15:24:36 -0700 Clarify the origin of this great addition to Rails :trollface: :trollface :trollface: M activesupport/test/core_ext/object/blank_test.rb commit 9619450 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-29 15:19:32 -0700 Use instance_eval on @tenderlove's suggestion :trollface: M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/blank.rb M activesupport/test/core_ext/object/blank_test.rb commit cc0d8fb refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-29 15:04:37 -0700 Update examples to show real worth M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/blank.rb commit 141d864 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-29 14:58:36 -0700 Added yield to Object#presence M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/blank.rb M activesupport/test/core_ext/object/blank_test.rb commit 7475b43 refs/heads/master Merge: 6a23bf0 4445478 Author: David Heinemeier Hansson Date: 2014-08-29 14:54:08 -0700 Merge branch 'master' of github.com:rails/rails commit 4445478 refs/heads/master Merge: f8d9a51 02b63a5 Author: Godfrey Chan Date: 2014-08-29 14:24:12 -0700 Merge pull request #16746 from cristianbica/fix-backburner-adapter Fixed Active Job Backburner adapter commit 02b63a5 refs/heads/master Author: Cristian Bica Date: 2014-08-30 00:04:01 +0300 Fixed Active Job Backburner adapter M activejob/lib/active_job/queue_adapters/backburner_adapter.rb commit f8d9a51 refs/heads/master Author: Akira Matsuda Date: 2014-08-30 02:28:44 +0900 Don't allow AR::Tasks::DatabaseTasks.migrate to mutate Migration.verbose value This fixes random test failure in migrator_test.rb M activerecord/lib/active_record/tasks/database_tasks.rb commit 4606e75 refs/heads/master Merge: cf75695 a548e2b Author: Santiago Pastorino Date: 2014-08-29 10:41:35 -0300 Merge pull request #16741 from robin850/am-isolated-wo-bundle Make test:isolated run without bundler for Action Mailer commit cf75695 refs/heads/master Merge: 38d6c72 1da209f Author: Santiago Pastorino Date: 2014-08-29 10:39:40 -0300 Merge pull request #16742 from robin850/rbx-aj-sidekiq Avoid skipping Sidekiq tests on Rubinius commit 1da209f refs/heads/master Author: Robin Dupret Date: 2014-08-27 19:47:39 +0200 Avoid skipping Sidekiq tests on Rubinius Now that Travis provides support for Rubinius 2.2.10, we can run the Sidekiq tests against this version. M activejob/test/helper.rb commit a548e2b refs/heads/master Author: Robin Dupret Date: 2014-08-27 19:38:04 +0200 Make test:isolated run without bundler for Action Mailer Action Mailer tests weren't able to run in isolation without the bundle exec prefix since we were requiring gems before requiring abstract_unit. We don't need the `gem` call thus and the require_relative since the test directory should be present in the load path when we run any test. M actionmailer/test/message_delivery_test.rb commit 38d6c72 refs/heads/master Author: Robin Dupret Date: 2014-08-29 12:36:45 +0200 Some documentation fixes [ci skip] M activejob/lib/active_job/callbacks.rb M activejob/lib/active_job/gem_version.rb M guides/source/4_2_release_notes.md commit 7447e0b refs/heads/master Author: Akira Matsuda & Kohei Suzuki Date: 2014-08-29 19:06:56 +0900 Don't test PostgreSQL implementation details Asserting that the message contains "QUERY PLAN" is enough for the adapter's test. The plan may vary according to number of tuples etc. but that's out of our concern. M activerecord/test/cases/adapters/postgresql/explain_test.rb commit 42d5e78 refs/heads/master Merge: 82cb3de d56caea Author: Yves Senn Date: 2014-08-29 11:15:24 +0200 Merge pull request #16740 from seuros/activejob [ActiveJob] extract JobBuffer from helper commit d56caea refs/heads/master Author: Abdelkader Boudih Date: 2014-08-29 08:28:07 +0000 [ActiveJob] extract JobBuffer from helper M activejob/test/helper.rb M activejob/test/jobs/gid_job.rb M activejob/test/jobs/hello_job.rb M activejob/test/jobs/rescue_job.rb A activejob/test/support/job_buffer.rb commit 82cb3de refs/heads/master Author: Yves Senn Date: 2014-08-29 09:28:59 +0200 Revert "Merge pull request #16254 from zuhao/refactor_activerecord_attribute_decorators_test" This reverts commit 16fe19831548f108c113094d106663497fc190d5, reversing changes made to 4c81c8ce533896be28bdc0b055ff30bb9dee1316. The call to `Model.reset_column_information` was to express the intent of the test. `reset_column_information` itself can trigger SQL queries because it checks for a tables existance. Let's move it outside of the block. /cc @sgrif M activerecord/test/cases/attribute_decorators_test.rb commit 3bff204 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-08-29 09:26:53 +0200 Merge pull request #16739 from y-yagi/patch-6 [ci skip] Fix example code of ActiveRecord::FixtureSet.context_class M activerecord/lib/active_record/fixtures.rb M guides/source/upgrading_ruby_on_rails.md commit 82a9ce8 refs/heads/master Merge: 3cce387 2c8badd Author: Yves Senn Date: 2014-08-29 09:26:53 +0200 Merge pull request #16739 from y-yagi/patch-6 [ci skip] Fix example code of ActiveRecord::FixtureSet.context_class commit 3cce387 refs/heads/master Merge: 0cc22f4 a59a9b7 Author: Yves Senn Date: 2014-08-29 09:06:33 +0200 Merge pull request #16728 from splattael/invalid_address_error Don't rescue IPAddr::InvalidAddressError commit a59a9b7 refs/heads/master Author: Peter Suschlik Date: 2014-08-28 09:09:04 +0200 Don't rescue IPAddr::InvalidAddressError IPAddr::InvalidAddressError does not exist in Ruby 1.9.3 and fails for JRuby in 1.9 mode. As IPAddr::InvalidAddressError is a subclass of ArgumentError (via IPAddr::Error) just rescuing ArgumentError is fine. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/remote_ip.rb commit 2c8badd refs/heads/master Author: yuuji.yaginuma Date: 2014-08-29 15:41:30 +0900 [ci skip] Fix example code of ActiveRecord::FixtureSet.context_class M activerecord/lib/active_record/fixtures.rb M guides/source/upgrading_ruby_on_rails.md commit 0cc22f4 refs/heads/master Author: Akira Matsuda Date: 2014-08-29 10:36:27 +0900 Reset ActiveRecord::Migration.message_count counter before start testing M activerecord/test/cases/migrator_test.rb commit 17b837b refs/heads/master Author: Akira Matsuda Date: 2014-08-29 09:40:33 +0900 Bring original puts back after finishing tests M activerecord/test/cases/migration/helper.rb M activerecord/test/cases/migrator_test.rb commit 9bb495e refs/heads/master Author: Akira Matsuda Date: 2014-08-29 10:33:57 +0900 Silence another test that runs migrations M activerecord/test/cases/invertible_migration_test.rb commit 9c76381 refs/heads/master Author: Akira Matsuda Date: 2014-08-29 10:06:05 +0900 MigrationTest doesn't need to be verbose anymore M activerecord/test/cases/migration_test.rb commit aefb667 refs/heads/master Author: Akira Matsuda Date: 2014-08-29 09:38:15 +0900 No tests are dealing with ActiveRecord::Migration.message_count here anymore M activerecord/test/cases/migration_test.rb commit fb7eeca refs/heads/master Author: Akira Matsuda Date: 2014-08-29 09:27:26 +0900 Reset ActiveRecord::Migration.verbose to the value before M activerecord/test/cases/migration_test.rb M activerecord/test/cases/migrator_test.rb commit 19cdec3 refs/heads/master Author: Akira Matsuda Date: 2014-08-29 06:31:31 +0900 Demodulize ActiveRecord::MigratorTest M activerecord/test/cases/migrator_test.rb commit 6d86762 refs/heads/master Merge: 8c52480 d78f3f0 Author: Aaron Patterson Date: 2014-08-28 10:33:40 -0700 Merge pull request #16637 from Agis-/redirect-with-constraint-route Fix the router ignoring constraints when used together with a redirect route commit 8c52480 refs/heads/master Author: Godfrey Chan Date: 2014-08-28 09:19:11 -0700 Avoid using heredoc for user warnings Using heredoc would enforce line wrapping to whatever column width we decided to use in the code, making it difficult for the users to read on some consoles. This does make the source code read slightly worse and a bit more error-prone, but this seems like a fair price to pay since the primary purpose for these messages are for the users to read and the code will not stick around for too long. M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/range.rb M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/transactions.rb commit 4e68c5d refs/heads/master Author: Akira Matsuda Date: 2014-08-29 00:43:18 +0900 No transaction for a test that creates fixtures in the test body M activerecord/test/cases/fixtures_test.rb commit 2211caa refs/heads/master Author: Yves Senn Date: 2014-08-28 14:47:47 +0200 make it easy to copy & paste the config from deprecation warning. [ci skip] M activerecord/lib/active_record/transactions.rb commit bd7b4f7 refs/heads/master Author: Akira Matsuda Date: 2014-08-28 19:27:22 +0900 User Model#last to certainly get lastly created data This test would fail when executed after any test that calls fixtures(:binaries) M activerecord/test/cases/dirty_test.rb commit b23365f refs/heads/master Author: Akira Matsuda Date: 2014-08-28 16:56:53 +0900 Move model definition to test/models for test order indenendency M activemodel/test/cases/serializers/json_serialization_test.rb M activemodel/test/cases/serializers/xml_serialization_test.rb M activemodel/test/models/contact.rb commit 4304eb8 refs/heads/master Author: Akira Matsuda Date: 2014-08-28 15:50:14 +0900 Move association definition to the model file M activerecord/test/cases/calculations_test.rb M activerecord/test/models/company.rb commit 9489b21 refs/heads/master Author: Akira Matsuda Date: 2014-08-28 15:30:29 +0900 Be sure that test fixtures satisfy referential integrity before calculating There exists some other test files that load :minivans fixtures but don't load :speedometers. Loading :speedometers here prevents the following error when this test was run after such test: CalculationsTest#test_should_group_by_association_with_non_numeric_foreign_key: ActiveRecord::RecordNotFound: Couldn't find all Speedometers with 'speedometer_id': (ABC, s1) (found 1 results, but was looking for 2) M activerecord/test/cases/calculations_test.rb commit 4ded131 refs/heads/master Author: Akira Matsuda Date: 2014-08-27 00:53:19 +0900 Expectations first M railties/test/application/configuration_test.rb M railties/test/application/initializers/frameworks_test.rb M railties/test/application/middleware_test.rb M railties/test/commands/dbconsole_test.rb commit 0c885d6 refs/heads/master Author: Akira Matsuda Date: 2014-08-27 00:17:21 +0900 Reset RACK_ENV after modified in a test case M railties/test/commands/dbconsole_test.rb commit 357edaa refs/heads/master Author: Akira Matsuda Date: 2014-08-26 19:08:54 +0900 Rails.root should be a Pathname M railties/test/generators/generators_test_helper.rb commit bd2b3fb refs/heads/master Author: Akira Matsuda Date: 2014-08-26 16:51:45 +0900 No need to sort tests Dir.glob result must be already sorted anyway M actionview/Rakefile M activemodel/Rakefile M activerecord/Rakefile commit b7d649d refs/heads/master Author: Akira Matsuda Date: 2014-08-26 16:39:15 +0900 Test everything This actually was testing test everything, so why not do it simpler? M actionpack/Rakefile commit e969c92 refs/heads/master Author: Akira Matsuda Date: 2014-08-26 16:38:22 +0900 AP test files does no more need to be alphabetically sorted here M actionpack/Rakefile commit f7d09fa refs/heads/master Author: Akira Matsuda Date: 2014-08-21 15:47:35 +0900 Ignore SCHEMA queries when asserting no queries M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/relations_test.rb commit 3412d4a refs/heads/master Author: Akira Matsuda Date: 2014-08-21 07:08:15 +0900 Reset schema properly after schema changing test M activerecord/test/cases/locking_test.rb commit ff62f70 refs/heads/master Merge: cab85e9 bc1134a Author: Rafael Mendonça França Date: 2014-08-27 23:28:46 -0300 Merge pull request #16727 from BanzaiMan/travis-yml-fix Add language directive to .travis.yml commit cab85e9 refs/heads/master Author: Aaron Patterson Date: 2014-08-27 17:59:34 -0700 remove useless parameter M actionview/lib/action_view/template.rb commit 7a2622b refs/heads/master Author: Aaron Patterson Date: 2014-08-27 17:58:59 -0700 remove dead code the ERB has already been compiled to Ruby code by the time we're calling module_eval. Nothing that module eval raises will be caught by a blank `rescue`, so I think we can remove this M actionview/lib/action_view/template.rb commit bc1134a refs/heads/master Author: Hiro Asari Date: 2014-08-27 19:59:16 -0400 Add language directive to .travis.yml Currently, Travis CI assumes that the project is in Ruby in the absence of the `language` key. This behavior may change in the future. (For example, switch to a "blank" image which *may* be created.) M .travis.yml commit 728f2eb refs/heads/master Merge: 5bcd5a3 0b1a87f Author: Guillermo Iguaran Date: 2014-08-27 14:00:37 -0500 Merge pull request #16544 from schneems/schneems/death-to-dir-glob Refactor out Dir.glob from ActionDispatch::Static commit 0b1a87f refs/heads/master Author: schneems Date: 2014-08-18 11:20:06 -0500 Refactor out Dir.glob from ActionDispatch::Static Dir.glob can be a security concern. The original use was to provide logic of fallback files. Example a request to `/` should render the file from `/public/index.html`. We can replace the dir glob with the specific logic it represents. The glob {,index,index.html} will look for the current path, then in the directory of the path with index file and then in the directory of the path with index.html. This PR replaces the glob logic by manually checking each potential match. Best case scenario this results in one less file API request, worst case, this has one more file API request. Related to #16464 Update: added a test for when a file of a given name (`public/bar.html` and a directory `public/bar` both exist in the same root directory. Changed logic to accommodate this scenario. M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/dispatch/static_test.rb A actionpack/test/fixtures/public/bar.html A actionpack/test/fixtures/public/bar/index.html A "actionpack/test/fixtures/\345\205\254\345\205\261/bar.html" A "actionpack/test/fixtures/\345\205\254\345\205\261/bar/index.html" commit 5bcd5a3 refs/heads/master Merge: f1a5e15 16ed2c9 Author: Zachary Scott Date: 2014-08-27 10:23:22 -0700 Merge pull request #16723 from rubys/mention_assert_select_changes [ci skip] mention assert_select in release notes commit 16ed2c9 refs/heads/master Author: Sam Ruby Date: 2014-08-27 11:17:01 -0400 [ci skip] mention assert_select in release notes M guides/source/4_2_release_notes.md commit f1a5e15 refs/heads/master Merge: 2939e94 03e660e Author: Santiago Pastorino Date: 2014-08-27 11:51:36 -0300 Merge pull request #16717 from splattael/keygenerator Use less iterations for KeyGenerator in tests commit 2939e94 refs/heads/master Merge: 77f5a70 db2e0f8 Author: Santiago Pastorino Date: 2014-08-27 11:50:23 -0300 Merge pull request #16707 from katmutua/master update 4_2_release_notes commit af4f897 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-07-24 16:38:41 +0200 fix, mysql `db:purge` respects `Rails.env`. Previously this method always established a connection to the test database. This resulted in buggy behavior when combined with other tasks like `bin/rake db:schema:load`. This was one of the reasons why #15394 (22e9a91189af2c4e6217a888e77f22a23d3247d1) was reverted: > I’ve replicated it on a new app by the following commands: 1) rails generate model post:title, 2) rake db:migrate, 3) rake db:schema:load, 4) rails runner ‘puts Post.first’. The last command goes boom. Problem is that rake db:schema:load wipes the database, and then doesn’t actually restore it. This is all on MySQL. There’s no problem with SQLite. -- DHH https://github.com/rails/rails/commit/22e9a91189af2c4e6217a888e77f22a23d3247d1#commitcomment-6834245 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/tasks/mysql_rake_test.rb commit 5787592 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-08-27 16:11:33 +0200 remove deprecation warning which is not yet issued. This will be deprecated with `4.2`. [ci skip] M activerecord/CHANGELOG.md commit 6cd46fc refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-08-06 08:26:13 +0200 Merge pull request #16316 from rails/senny/purge_schema_maintenance purge database before loading schema, take 2 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb M railties/test/application/test_test.rb commit 77f5a70 refs/heads/master Merge: 17a39c8 990322b Author: Rafael Mendonça França Date: 2014-08-27 11:06:22 -0300 Merge pull request #16702 from sgrif/sg-binary-serialized Correctly detect mutation on serialized columns mapping to binary commit 17a39c8 refs/heads/master Merge: e0d28ef 277355a Author: Rafael Mendonça França Date: 2014-08-27 10:49:48 -0300 Merge pull request #16722 from yui-knk/fix/guides_association_basics2 [ci skip] Fix typo of `collection_singular_ids=` method. commit e0d28ef refs/heads/master Merge: 35b1c4f 2d2cd7e Author: Rafael Mendonça França Date: 2014-08-27 10:45:53 -0300 Merge pull request #16721 from yui-knk/fix/guides_association_basics [ci skip] Fix typo of `collection=` method. commit 2d2cd7e refs/heads/master Author: yui-knk Date: 2014-08-27 22:31:42 +0900 [ci skip] Fix typo of `collection=` method. M guides/source/association_basics.md commit 277355a refs/heads/master Author: yui-knk Date: 2014-08-27 22:34:52 +0900 [ci skip] Fix typo of `collection_singular_ids=` method. M guides/source/association_basics.md commit db2e0f8 refs/heads/master Author: Jackie Mutua Date: 2014-08-26 17:28:54 -0300 [ci skip] Update 4_2_release notes M guides/source/4_2_release_notes.md commit 990322b refs/heads/master Author: Sean Griffin Date: 2014-08-26 08:43:04 -0600 Correctly detect mutation on serialized columns mapping to binary Fixes #16701 M activerecord/lib/active_record/type/binary.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/test/cases/dirty_test.rb commit 35b1c4f refs/heads/master Merge: b9b5213 a32298f Author: Arun Agrawal Date: 2014-08-27 14:17:23 +0200 Merge pull request #16719 from tgxworld/fix_spelling_in_changelog Fix spelling. [CI SKIP] commit a32298f refs/heads/master Author: Guo Xiang Tan Date: 2014-08-27 20:13:41 +0800 Fix spelling. [CI SKIP] M railties/CHANGELOG.md commit b9b5213 refs/heads/master Author: Yves Senn Date: 2014-08-27 12:30:35 +0200 fix broken `gem` method with non-String arguments. Closes #16709. This was caused by #15327. M railties/CHANGELOG.md M railties/lib/rails/generators/actions.rb M railties/test/generators/actions_test.rb commit 20e7f08 refs/heads/master Author: Yves Senn Date: 2014-08-27 12:09:21 +0200 minor changelog formatting changes. M actionpack/CHANGELOG.md M actionview/CHANGELOG.md M activerecord/CHANGELOG.md commit bf44481 refs/heads/master Merge: 8148ae2 e57ad6d Author: Yves Senn Date: 2014-08-27 11:34:47 +0200 Merge pull request #16661 from edogawaconan/doc-fix Update documentation to match change in #5942 [ci skip] commit 03e660e refs/heads/master Author: Peter Suschlik Date: 2014-08-27 11:34:17 +0200 Use less iterations for KeyGenerator in tests This commit improves performance of cookie tests: Ruby | After | Before ----- | --------:| --------: MRI | 5.03s | 9.28s JRuby | 25.45s | 1648.23s Please note the improvement for JRuby. M actionpack/test/dispatch/cookies_test.rb commit 8148ae2 refs/heads/master Merge: c87c36f 397a310 Author: Zachary Scott Date: 2014-08-27 02:15:43 -0700 Merge pull request #16715 from y-yagi/update_4_2_release_notes [ci skip] Modify a web-console PR link for release noted commit 397a310 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-27 17:23:53 +0900 [ci skip] Modify a web-console PR link M guides/source/4_2_release_notes.md commit c87c36f refs/heads/master Merge: 37f884b 02dfc9e Author: Zachary Scott Date: 2014-08-27 00:16:59 -0700 Merge pull request #16713 from tomkadwill/documented_eqls_other_param [ci skip] Updated documentation syntax of other parameter for rdoc commit 02dfc9e refs/heads/master Author: Tom Kadwill Date: 2014-08-27 07:48:50 +0100 [ci skip] Updated documentation syntax of other parameter for rdoc M activerecord/lib/active_record/associations/collection_proxy.rb commit 37f884b refs/heads/master Merge: ecf353b 2096390 Author: Zachary Scott Date: 2014-08-26 14:57:20 -0700 Merge pull request #16708 from zzak/bcjordan-patch-1 Adjusted punctuation and grammar for Form Helpers guide [ci skip] commit 2096390 refs/heads/master Author: Brian Jordan Date: 2014-06-23 16:54:06 -0700 Adjusted punctuation and grammar for Form Helpers guide [ci skip] M guides/source/form_helpers.md commit 36cf2d8 refs/remotes/origin/4-1-stable Author: Wojciech Wnętrzak Date: 2014-06-01 17:41:04 +0200 Fixed automatic maintaining test schema to properly handle sql structure schema format. Additionally: * It changes `purge` task on `sqlite3` adapter to recreate database file, to be consistent with other adapters. * Adds `purge` step when loading from `schema.rb` Conflicts: activerecord/CHANGELOG.md railties/test/application/test_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb M railties/test/application/test_test.rb commit ecf353b refs/heads/master Merge: 7645713 d418d4f Author: Zachary Scott Date: 2014-08-26 14:08:32 -0700 Merge pull request #16705 from tomkadwill/documented_many_block_param [ci skip] Updated documentation syntax of block parameter for rdoc commit 7645713 refs/heads/master Merge: 73428f1 c03c991 Author: Zachary Scott Date: 2014-08-26 14:05:30 -0700 Merge pull request #16706 from tomkadwill/documented_include_record_param [ci skip] Updated include to reference record parameter for rdoc commit c03c991 refs/heads/master Author: Tom Kadwill Date: 2014-08-26 22:03:32 +0100 [ci skip] Updated include to reference record parameter for rdoc M activerecord/lib/active_record/associations/collection_proxy.rb commit d418d4f refs/heads/master Author: Tom Kadwill Date: 2014-08-26 21:56:04 +0100 [ci skip] Updated documentation syntax of block parameter for rdoc M activerecord/lib/active_record/associations/collection_proxy.rb commit 73428f1 refs/heads/master Merge: 14e2bbf 489ee95 Author: Zachary Scott Date: 2014-08-26 10:45:33 -0700 Merge pull request #16703 from tomkadwill/documented_any_block_param [ci skip] Updated documentation syntax of block parameter for rdoc commit 489ee95 refs/heads/master Author: Tom Kadwill Date: 2014-08-26 18:39:48 +0100 [ci skip] Updated documentation syntax of block parameter for rdoc M activerecord/lib/active_record/associations/collection_proxy.rb commit b99a899 refs/heads/master Author: ankit1910 Date: 2014-08-26 22:40:08 +0530 use self instead of #read_attribute M activerecord/lib/active_record/attribute_methods/query.rb commit 14e2bbf refs/heads/master Merge: 2c84512 7e99855 Author: Rafael Mendonça França Date: 2014-08-26 12:59:26 -0300 Merge pull request #16700 from seuros/autoload [ActiveJob] Autoload adapters commit ac0df59 refs/heads/master Author: schneems Date: 2014-08-26 10:45:41 -0500 [ci skip] docs grammar M guides/source/asset_pipeline.md commit a8511f3 refs/heads/master Author: schneems Date: 2014-08-26 10:44:53 -0500 [ci skip] proper end to sentence M guides/source/asset_pipeline.md commit 0508da1 refs/heads/master Author: schneems Date: 2014-08-26 10:43:22 -0500 [ci skip] use NOTE instead of Note M guides/source/asset_pipeline.md commit 2c84512 refs/heads/master Merge: d2d003e 1072357 Author: Matthew Draper Date: 2014-08-27 01:06:34 +0930 Merge pull request #16613 from splattael/master Speed up JRuby tests by improving the startup time commit d2d003e refs/heads/master Author: Matthew Draper Date: 2014-08-27 01:01:18 +0930 Keep the first string we fetch Otherwise, it's possible for GC to run in between, and fail the test. M activesupport/test/caching_test.rb commit 7e99855 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-26 12:22:59 +0000 [ActiveJob] Autoload adapters M activejob/lib/active_job.rb M activejob/lib/active_job/queue_adapter.rb A activejob/lib/active_job/queue_adapters.rb commit 49b27db refs/heads/master Merge: 99a5333 64d3b5e Author: Zachary Scott Date: 2014-08-26 00:02:32 -0700 Merge pull request #16697 from tomkadwill/has_and_belongs_to_many_documenting_extension_param [ci skip] Added documentation for has_and_belongs_to_many extension parameter commit 64d3b5e refs/heads/master Author: Tom Kadwill Date: 2014-08-26 07:49:37 +0100 [ci skip] Added documentation for has_and_belongs_to_many extension parameter M activerecord/lib/active_record/associations.rb commit 41739a2 refs/heads/master Author: प्रथमेश Date: 2014-08-26 00:01:28 -0500 Fix typo in ActiveJob guide [ci skip] M guides/source/active_job_basics.md commit 99a5333 refs/heads/master Merge: 37939e2 9384fa4 Author: Jeremy Kemper Date: 2014-08-25 20:59:47 -0700 Merge pull request #16646 from sgrif/sg-perf-regression Cache the value of `changed_attributes` when calling `changes_applied` commit 37939e2 refs/heads/master Author: Godfrey Chan Date: 2014-08-24 05:01:59 -0700 Override #find_by! in core to enable AST caching M activerecord/lib/active_record/core.rb M activerecord/test/cases/finder_test.rb commit 58c5261 refs/heads/master Author: Godfrey Chan Date: 2014-08-24 04:42:12 -0700 Fixed find_by("sql fragment without bindings") on master * Also duplicated find_by tests from relations_test.rb to finder_test.rb now that we have a completely different implementation on the class (in core.rb with AST caching stuff). * Also removed a (failing) test that used mocks. Now that we have tests for the behavior, there's no point having another test that tests the implementation (that it delegates). Further, what the test was implying is nolonger true with the current implementation, because Class.find_by is a real method now. M activerecord/lib/active_record/core.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/relations_test.rb commit 3041b0b refs/heads/master Merge: 9fb1662 8a97fcb Author: Rafael Mendonça França Date: 2014-08-25 21:07:09 -0300 Merge pull request #16695 from ericbrooke/patch-1 Added web links commit 8a97fcb refs/heads/master Author: Eric Brooke Date: 2014-08-25 17:06:03 -0700 Added web links Added web links to resque, delayed_job and sidekiq M guides/source/4_2_release_notes.md commit 9fb1662 refs/heads/master Merge: a91f3b1 5284f98 Author: Eileen M. Uchitelle Date: 2014-08-25 19:37:10 -0400 Merge pull request #16689 from ankit1910/improve-english [ci skip] make assert messages consistent commit a91f3b1 refs/heads/master Merge: a501ae8 097ca3f Author: Jeremy Kemper Date: 2014-08-25 15:11:37 -0700 Merge pull request #16682 from untidy-hair/use_activesupport_concern Use ActiveSupport::Concern commit 5aea02c refs/remotes/origin/4-1-stable Merge: 11f12be a0c4d5c Author: Rafael Mendonça França Date: 2014-08-25 18:08:28 -0300 Merge pull request #16693 from tjschuck/form_for_doc_options_4-1 Backport: documentation update for form_for options commit a501ae8 refs/heads/master Author: Robin Dupret Date: 2014-08-25 22:58:05 +0200 Quick pass through the 4.2 release notes [ci skip] Fix a few typos and made some tiny improvements. Refs #16576. [Zachary Scott & Robin Dupret] M guides/source/4_2_release_notes.md commit a0c4d5c refs/remotes/origin/4-1-stable Author: T.J. Schuck Date: 2014-08-22 15:22:59 -0400 Remove erroneous form_tag option docs This is true of the first param (url_for_options), not of the second options param which is being documented here. [ci skip] M actionview/lib/action_view/helpers/form_tag_helper.rb commit a2d5658 refs/remotes/origin/4-1-stable Author: T.J. Schuck Date: 2014-08-22 15:19:57 -0400 Clarify that unknown keys will become HTML attrs Docs for all the other form tag helpers in this file already clarify this. [ci skip] M actionview/lib/action_view/helpers/form_tag_helper.rb commit 097ca3f refs/heads/master Author: Yukio Mizuta Date: 2014-08-24 14:51:46 -0700 Use ActiveSupport::Concern instead of the traditinal way M activemodel/lib/active_model/model.rb commit b934cbe refs/heads/master Merge: 0b7edd4 d433dc5 Author: Rafael Mendonça França Date: 2014-08-25 14:42:05 -0300 Merge pull request #16690 from ankit1910/proper-use-of-aporstrophe [ci skip] use proper apostrophe commit 5284f98 refs/heads/master Author: ankit1910 Date: 2014-08-25 22:07:27 +0530 [ci skip] make assert messages consistent M activemodel/test/cases/validations_test.rb commit f464aa9 refs/remotes/origin/4-0-stable Merge: ebf0c0e 82f3e05 Author: Rafael Mendonça França Date: 2014-08-25 13:35:20 -0300 Merge pull request #16686 from jeremyf/normalizing-respond-to-method-definitions Correcting #respond_to? method arity commit d433dc5 refs/heads/master Author: ankit1910 Date: 2014-08-25 22:03:31 +0530 [ci skip] use proper apostrophe M activesupport/test/transliterate_test.rb commit 82f3e05 refs/remotes/origin/4-0-stable Author: Jeremy Friesen Date: 2014-08-25 11:51:04 -0400 Correcting #respond_to? method arity Both of the following methods had method arity of 1: * Rails::Railtie::Configuration#respond_to? * ActionDispatch::Response#respond_to? Other instances of #respond_to? in Rails have a method arity of -2. The method arity of -2 matches the interface for Ruby 1.9.3, 2.0.0, 2.1.2, and 2.1.0. See: http://ruby-doc.org/core-2.1.0/Object.html#method-i-respond_to-3F http://ruby-doc.org/core-2.1.2/Object.html#method-i-respond_to-3F http://ruby-doc.org/core-2.0.0/Object.html#method-i-respond_to-3F http://ruby-doc.org/core-1.9.3/Object.html#method-i-respond_to-3F Closes rails/rails#16685 M actionpack/lib/action_dispatch/http/response.rb M railties/lib/rails/railtie/configuration.rb commit 11f12be refs/remotes/origin/4-1-stable Merge: 304fd0c e927cc2 Author: Jeremy Kemper Date: 2014-08-25 08:37:13 -0700 Merge pull request #16664 from rubys/4-1-stable Use latest 2.1 version of sprockets-rails commit ebf0c0e refs/remotes/origin/4-0-stable Merge: ef7656c e811e7d Author: Jeremy Kemper Date: 2014-08-25 08:37:08 -0700 Merge pull request #16663 from rubys/4-0-stable Use latest 2.1 version of sprockets-rails commit 0b7edd4 refs/heads/master Merge: 3fe54b3 ce8e4a4 Author: Jeremy Kemper Date: 2014-08-25 07:22:17 -0700 Merge pull request #16488 from agrobbin/form-label-builder Provide a builder for form labels to customize wrapping around I18n content commit 3fe54b3 refs/heads/master Author: Yves Senn Date: 2014-08-25 11:58:12 +0200 pg, `default_sequence_name` needs to return a string. This is a reacon to https://github.com/rails/rails/commit/d6c1205584b1ba597db4071b168681678b1e9875#commitcomment-7502487 This backwards incompatibility was introduced with d6c12055 to fix #7516. However both `connection.default_sequence_name` and `model.sequence_name` are public API. The PostgreSQL adapter should honor the interface and return strings. /cc @matthewd @chancancode M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 1072357 refs/heads/master Author: Peter Suschlik Date: 2014-08-21 15:57:27 +0200 Speed up JRuby tests by improving its startup time Emulate `jruby --dev` which improves JRuby's startup time. See https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag Follow @headius' idea and give Java more memory to reduce GC time. M .travis.yml commit 4d600ed refs/heads/master Author: schneems Date: 2014-08-24 23:33:31 -0500 [ci skip] fix grammar in docs M guides/source/asset_pipeline.md commit 5cdd02d refs/heads/master Merge: 671615a 8fc9919 Author: Jeremy Kemper Date: 2014-08-24 15:49:09 -0700 Merge pull request #16681 from seuros/master [ActiveJob] Add activesupport as dependency [ci skip] commit 671615a refs/heads/master Merge: cc31c7f f99e62e Author: Jeremy Kemper Date: 2014-08-24 15:26:24 -0700 Merge pull request #16639 from agrobbin/input-placeholder-i18n Add I18n support for `:placeholder` HTML option is passed to form fields commit 8fc9919 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-24 22:16:48 +0000 [ActiveJob] Add activesupport as dependency [ci skip] M activejob/activejob.gemspec commit cc31c7f refs/heads/master Merge: ae66fda 61a371c Author: Jeremy Kemper Date: 2014-08-24 14:39:48 -0700 Merge pull request #16662 from robin850/duration-instance-of Fix `ActiveSupport::Duration#instance_of?` to behave like `#is_a?` commit ae66fda refs/heads/master Merge: cb62f92 8e31fa3 Author: Jeremy Kemper Date: 2014-08-24 14:38:12 -0700 Merge pull request #16616 from schneems/schneems/jeremy-comments Address comments on Gzip implementation commit d78f3f0 refs/heads/master Author: Agis- Date: 2014-08-22 16:52:48 +0300 Don't ignore constraints in redirect routes https://github.com/rails/rails/commit/402c2af55053c2f29319091ad21fd6fa6b90ee89 introduced a regression that caused any constraints added to redirect routes to be ignored. Fixes #16605 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit cb62f92 refs/heads/master Merge: 53cc3ab da3d6c9 Author: Robin Dupret Date: 2014-08-24 23:08:43 +0200 Merge pull request #16680 from huoxito/update-dependencies treetop is no longer a mail (rails) dependency [ci skip] commit 8e31fa3 refs/heads/master Author: schneems Date: 2014-08-21 11:52:25 -0500 Address comments on Gzip implementation - don't mutate PATH_INFO in env, test - test fallback content type matches Rack::File - change assertion style - make HTTP_ACCEPT_ENCODING comparison case insensitive - return gzip path from method instead of true/false so we don't have to assume later - don't allocate un-needed hash. Original comments: https://github.com/rails/rails/commit/ cfaaacd9763642e91761de54c90669a88d772e5a#commitcomment-7468728 cc @jeremy M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/dispatch/static_test.rb A actionpack/test/fixtures/public/gzip/foo.zoo A actionpack/test/fixtures/public/gzip/foo.zoo.gz A "actionpack/test/fixtures/\345\205\254\345\205\261/gzip/foo.zoo" A "actionpack/test/fixtures/\345\205\254\345\205\261/gzip/foo.zoo.gz" M guides/source/4_2_release_notes.md commit fa704ed refs/heads/master Author: schneems Date: 2014-08-24 15:44:32 -0500 [ci skip] docs can URL cache invalidation M guides/source/asset_pipeline.md commit 8c2b3c9 refs/heads/master Author: schneems Date: 2014-08-24 15:44:09 -0500 [ci skip] docs CDN Cache-Control behavior M guides/source/asset_pipeline.md commit 8ea49ec refs/heads/master Author: schneems Date: 2014-08-24 15:43:27 -0500 [ci skip] docs CDN header debugging M guides/source/asset_pipeline.md commit 053dd00 refs/heads/master Author: schneems Date: 2014-08-24 15:42:39 -0500 [ci skip] docs CDN caching behavior M guides/source/asset_pipeline.md commit d736e9e refs/heads/master Author: schneems Date: 2014-08-24 15:40:55 -0500 [ci skip] docs asset_pipeline CDN set up M guides/source/asset_pipeline.md commit a05b46c refs/heads/master Author: schneems Date: 2014-08-24 15:40:22 -0500 [ci skip] docs asset_pipeline#CDNs M guides/source/asset_pipeline.md commit 597f98c refs/heads/master Author: schneems Date: 2014-08-24 15:31:42 -0500 [ci skip] wrap to 80 chars M guides/source/asset_pipeline.md commit da3d6c9 refs/heads/master Author: Washington Luiz Date: 2014-08-24 15:24:07 -0300 treetop is no longer a mail (rails) dependency see https://github.com/mikel/mail/commit/2da7c7985c221272f6451b27ab8b41e84e0a6804 M guides/source/initialization.md commit 53cc3ab refs/heads/master Author: Robin Dupret Date: 2014-08-24 19:44:03 +0200 Whoops, duplicated word [ci skip] M guides/source/development_dependencies_install.md commit 7fc404a refs/heads/master Author: Robin Dupret Date: 2014-08-24 19:29:11 +0200 Some tweaks to the development set-up guide * Remove the libxml2 and libxslt part ; Nokogiri ships now with these libraries bundled. * Add the missing installation instructions for either Arch Linux, FreeBSD or Mac OS X. * Use the new `pkg install` syntax over `pkg_add -r` for FreeBSD 10+ users. * Point to the up-to-date version of PostgreSQL as for the BSD port. * Make the platform installation instructions order consistent throughout the guide. * Remove useless duplicated links to Homebrew's home. [ci skip] M guides/source/development_dependencies_install.md commit f3b8a0d refs/heads/master Author: Robin Dupret Date: 2014-08-24 18:33:59 +0200 Fix a few typos [ci skip] M activejob/lib/active_job/arguments.rb M activerecord/lib/active_record/associations.rb commit fe62df5 refs/heads/master Merge: fe21a9f 8a732e0 Author: Matthew Draper Date: 2014-08-25 02:01:44 +0930 Merge pull request #16673 from y-yagi/update_statistics_rake show stats for app/jobs commit fe21a9f refs/heads/master Merge: da3d847 a5ae5fc Author: Santiago Pastorino Date: 2014-08-24 13:22:47 -0300 Merge pull request #16675 from tomkadwill/has_many_documenting_extension_param [ci skip] Added documentation for has_many extension parameter commit da3d847 refs/heads/master Merge: aa58167 0e04957 Author: Matthew Draper Date: 2014-08-25 01:48:28 +0930 Merge pull request #16676 from tgxworld/web_console_release_note_fixes Grammer and spelling pass on web console release note. [CI SKIP] commit 61a371c refs/heads/master Author: Robin Dupret Date: 2014-08-23 13:14:22 +0200 Skip #eql? tests on Rubinius for AS::Duration Since Rubinius is relying on #instance_of? for its definition of #eql? (http://git.io/MtmbbA) but ActiveSupport::Duration should behave like is_a? it returns true with `Fixnum`. Thus, for the moment, the last assertion is failing so we have to skip this test. M activesupport/test/core_ext/duration_test.rb commit d5578cd refs/heads/master Author: Robin Dupret Date: 2014-08-23 13:09:41 +0200 Follow-up to #16560 For the sake of backward-compatibility, we need to make #instance_of? return true for Fixnum. On the other hand, the method should still give true for ActiveSupport::Duration itself which was not the case before. M activesupport/CHANGELOG.md M activesupport/lib/active_support/duration.rb M activesupport/test/core_ext/duration_test.rb commit 0e04957 refs/heads/master Author: Guo Xiang Tan Date: 2014-08-25 00:13:11 +0800 Grammer and spelling pass on web console release note. [CI SKIP] M guides/source/4_2_release_notes.md commit a5ae5fc refs/heads/master Author: Tom Kadwill Date: 2014-08-24 17:03:57 +0100 [ci skip] Added documentation for has_many extension parameter M activerecord/lib/active_record/associations.rb commit aa58167 refs/heads/master Merge: 1f1cc0f 6964d5d Author: Guillermo Iguaran Date: 2014-08-24 10:41:18 -0500 Merge pull request #16674 from gsamokovarov/describe-web-console Describe web-console in the release notes commit 1f1cc0f refs/heads/master Merge: ba1d02d 23329d3 Author: Matthew Draper Date: 2014-08-25 00:00:24 +0930 Merge pull request #16671 from cristianbica/aj-raise-serialization-error Raise ActiveJob::SerializationError when cannot serialize job arguments commit 6964d5d refs/heads/master Author: Genadi Samokovarov Date: 2014-08-24 17:04:11 +0300 Describe web-console in the release notes [ci skip] I put a more up-to-date description of Web Console in the release notes. I'm not really happy with the language, so if you guys can help me with that I'll be grateful :) M guides/source/4_2_release_notes.md commit 23329d3 refs/heads/master Author: Cristian Bica Date: 2014-08-23 14:19:44 +0300 Raise ActiveJob::SerializationError when cannot serialize job arguments M activejob/lib/active_job/arguments.rb M activejob/test/cases/parameters_test.rb commit 8a732e0 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-24 21:41:58 +0900 show stats for app/jobs M railties/lib/rails/tasks/statistics.rake commit ba1d02d refs/heads/master Merge: 4287f6d 2735b9c Author: Godfrey Chan Date: 2014-08-24 03:08:55 -0700 Merge pull request #16667 from JuanitoFatas/patch/anchor-generation Fix guide anchor generation logic. commit 52f430f refs/heads/master Author: Mikhail Dieterle Date: 2014-08-24 12:27:27 +0300 code quotes for classname M guides/source/form_helpers.md commit 8fe74a0 refs/tags/v4.0.10.rc2 Author: Godfrey Chan Date: 2014-08-23 23:54:22 -0700 CHANGELOG & improvements to #16649 * Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 68b0454 refs/tags/v4.0.10.rc2 Author: Godfrey Chan Date: 2014-08-23 23:36:40 -0700 Merge pull request #16649 from Agis-/pg-columns-for-distinct Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't Conflicts: activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit ef7656c refs/remotes/origin/4-0-stable Author: Godfrey Chan Date: 2014-08-23 23:54:22 -0700 CHANGELOG & improvements to #16649 * Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 8531663 refs/remotes/origin/4-0-stable Author: Godfrey Chan Date: 2014-08-23 23:36:40 -0700 Merge pull request #16649 from Agis-/pg-columns-for-distinct Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't Conflicts: activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 80aa428 refs/tags/v4.1.6.rc2 Author: Godfrey Chan Date: 2014-08-23 23:54:22 -0700 CHANGELOG & improvements to #16649 * Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 3a48728 refs/tags/v4.1.6.rc2 Author: Godfrey Chan Date: 2014-08-23 23:36:40 -0700 Merge pull request #16649 from Agis-/pg-columns-for-distinct Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 304fd0c refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-08-23 23:54:22 -0700 CHANGELOG & improvements to #16649 * Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 6cc22cd refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-08-23 23:36:40 -0700 Merge pull request #16649 from Agis-/pg-columns-for-distinct Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 4287f6d refs/heads/master Author: Godfrey Chan Date: 2014-08-23 23:54:22 -0700 CHANGELOG & improvements to #16649 * Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 5b27d15 refs/heads/master Merge: 33c0536 291fece Author: Godfrey Chan Date: 2014-08-23 23:36:40 -0700 Merge pull request #16649 from Agis-/pg-columns-for-distinct Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't commit 2735b9c refs/heads/master Author: Juanito Fatas Date: 2014-08-24 11:58:01 +0800 Fix guide anchor generation logic. This could use in any translation because it's not limited to `[^a-z0-9]`. Verify after this change, all guides still have same anchors. [Robin Dupret & Juanito Fatas] M guides/rails_guides/markdown.rb commit 291fece refs/heads/master Author: Agis- Date: 2014-08-23 00:26:16 +0300 Don't trim excess whitespace in pg #columns_for_distinct Fixes #16623 introduced by https://github.com/rails/rails/commit/3d5a2019bcccc6fb01bee4811ca669f4383edb51 M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 10db166 refs/heads/master Author: Rashmi Yadav Date: 2014-08-24 01:31:37 +0200 [ci skip] document truncate_words M guides/source/active_support_core_extensions.md commit 078cc10 refs/heads/master Author: Rashmi Yadav Date: 2014-08-23 21:44:03 +0200 [ci skip ]Document transform_values && transform_values! M guides/source/active_support_core_extensions.md commit e811e7d refs/remotes/origin/4-0-stable Author: Sam Ruby Date: 2014-08-23 15:37:12 -0400 Use latest 2.1 version of sprockets-rails M railties/lib/rails/generators/app_base.rb commit e927cc2 refs/remotes/origin/4-1-stable Author: Sam Ruby Date: 2014-08-23 15:31:09 -0400 Use latest 2.1 version of sprockets-rails M railties/lib/rails/generators/app_base.rb commit ed7e875 refs/heads/master Author: Mikhail Dieterle Date: 2014-08-23 22:13:22 +0300 recount files quantity M guides/source/getting_started.md commit e57ad6d refs/heads/master Author: edogawaconan Date: 2014-08-24 00:04:07 +0900 Update documentation to match change in #5942 [ci skip] M activemodel/lib/active_model/validations/confirmation.rb commit 33c0536 refs/heads/master Merge: b918bf9 ec1c608 Author: Vijay Dev Date: 2014-08-23 18:42:31 +0530 Merge pull request #16659 from y-yagi/patch-4 Fix example code in Active Job guide [ci skip] commit ec1c608 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-23 22:07:49 +0900 Fix example code in Active Job guide [ci skip] M guides/source/active_job_basics.md commit b918bf9 refs/heads/master Merge: 01de50e 3c8c9c1 Author: Zachary Scott Date: 2014-08-23 00:09:05 -0700 Merge pull request #16655 from brocktimus/20140823_doco_change Correct AR::RecordNotFound in AJ guide rescue example [ci skip] commit 3c8c9c1 refs/heads/master Author: Brock Trappitt Date: 2014-08-23 13:40:49 +0800 Properly referencing AR::RecordNotFound in AJ guide rescuing example M guides/source/active_job_basics.md commit 01de50e refs/heads/master Merge: e12aa1b 9bf2e5e Author: Zachary Scott Date: 2014-08-22 19:33:31 -0700 Merge pull request #16650 from zzak/fix-precision-number_to_rounded_converter Use zero-padding for number_to_rounded_converter commit 9bf2e5e refs/heads/master Author: Zachary Scott Date: 2014-08-22 18:27:30 -0700 Use zero-padding for number_to_rounded_converter M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb commit e12aa1b refs/heads/master Merge: 9cc7426 0387591 Author: Rafael Mendonça França Date: 2014-08-22 21:05:53 -0300 Merge pull request #16647 from tjschuck/form_for_doc_options Documentation update for form_for options commit 9cc7426 refs/heads/master Merge: 7df8a0d 9b319a5 Author: Rafael Mendonça França Date: 2014-08-22 17:11:31 -0300 Merge pull request #16602 from thetron/active_job_que_enqueue_at_support Added enqueue_at support for QueAdapter in ActiveJob commit 7df8a0d refs/heads/master Merge: b47d8de e63a02c Author: Rafael Mendonça França Date: 2014-08-22 17:09:42 -0300 Merge pull request #16648 from seuros/master [ActiveJob] Add hook for test_framework commit e63a02c refs/heads/master Author: Abdelkader Boudih Date: 2014-08-22 19:30:36 +0000 [ActiveJob] Add hook for test_framework and test templates M activejob/lib/rails/generators/job/job_generator.rb A railties/lib/rails/generators/test_unit/job/job_generator.rb A railties/lib/rails/generators/test_unit/job/templates/unit_test.rb.erb commit 0387591 refs/heads/master Author: T.J. Schuck Date: 2014-08-22 15:22:59 -0400 Remove erroneous form_tag option docs This is true of the first param (url_for_options), not of the second options param which is being documented here. [ci skip] M actionview/lib/action_view/helpers/form_tag_helper.rb commit 60da337 refs/heads/master Author: T.J. Schuck Date: 2014-08-22 15:19:57 -0400 Clarify that unknown keys will become HTML attrs Docs for all the other form tag helpers in this file already clarify this. [ci skip] M actionview/lib/action_view/helpers/form_tag_helper.rb commit b7ab73a refs/heads/master Author: Agis- Date: 2014-08-22 21:55:50 +0300 Use system /tmp when testing actionpack https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364 added support and enabled parallel execution of the actionpack tests. However it introduced https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364 since one cannot connect to a socket file that's inside a Vagrant synced folder due to security restrictions, and DRb tries to. Also rename the temporary files to make it obvious that they're rails-related, since now they're placed outside the project's directory. Fixes https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364 M actionpack/test/abstract_unit.rb commit 9384fa4 refs/heads/master Author: Sean Griffin Date: 2014-08-22 11:24:00 -0700 Cache the value of `changed_attributes` when calling `changes_applied` `changes_applied` calles `changes`, which will call `changed_attributes` multiple times in a loop. This method actually performs work now, so we should cache the results while looping over it when we know it cannot change. M activerecord/lib/active_record/attribute_methods/dirty.rb commit b47d8de refs/heads/master Merge: 91bd612 39704bb Author: Matthew Draper Date: 2014-08-23 03:45:47 +0930 Merge pull request #16598 from seuros/master [ActionMailer] require activejob railtie commit 91bd612 refs/heads/master Merge: 50e47a3 af16fd5 Author: Rafael Mendonça França Date: 2014-08-22 14:54:45 -0300 Merge pull request #15932 from joseluistorres/issue-11957-uuids adding the exception RecordNotFound to UUID find #11957 commit 39704bb refs/heads/master Author: Abdelkader Boudih Date: 2014-08-20 21:41:37 +0000 [ActionMailer] require activejob railtie M actionmailer/lib/action_mailer/railtie.rb commit 50e47a3 refs/heads/master Merge: ab00b24 35bbf09 Author: Rafael Mendonça França Date: 2014-08-22 14:31:09 -0300 Merge pull request #16645 from sgrif/sg-perf-regression Don't calculate in-place changes twice commit 35bbf09 refs/heads/master Author: Sean Griffin Date: 2014-08-22 10:01:10 -0700 Don't calculate in-place changes twice Now that `changed_attributes` includes in place changes, we don't need to override these methods in Active Record. Partially fixes the performance regression caused by #16189 M activerecord/lib/active_record/attribute_methods/dirty.rb commit ab00b24 refs/heads/master Merge: 4a5ea81 e084d5b Author: Rafael Mendonça França Date: 2014-08-22 14:23:30 -0300 Merge pull request #16641 from cristianbica/aj-backburner-enqueue-later Implemented enqueue_at for ActiveJob's Backburner adapter commit 4a5ea81 refs/heads/master Merge: 2602a49 94a7a86 Author: Zachary Scott Date: 2014-08-22 09:51:13 -0700 Merge pull request #16642 from cristianbica/aj-doc-queue-name-prefix Active Job Guide: Example of config queue_name_prefix [ci skip] commit 2602a49 refs/heads/master Merge: 5d7c105 523e279 Author: Matthew Draper Date: 2014-08-23 00:28:32 +0930 Merge pull request #16622 from matthewd/default-debug Don't fight against ourselves for the default log level commit 997a621 refs/heads/master Author: Chris Hanks Date: 2014-01-09 23:21:41 +0000 Roll back open transactions when the running thread is killed. M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transactions_test.rb commit 94a7a86 refs/heads/master Author: Cristian Bica Date: 2014-08-22 17:53:31 +0300 Active Job guide: Add info about queue_name prefix and clarity supporter features M guides/source/active_job_basics.md commit e084d5b refs/heads/master Author: Cristian Bica Date: 2014-08-22 17:44:48 +0300 Implemented enqueue_at for ActiveJob's Backburner adapter M activejob/lib/active_job/queue_adapters/backburner_adapter.rb M guides/source/active_job_basics.md commit 5d7c105 refs/heads/master Merge: 9b61a7e 1079bb6 Author: Santiago Pastorino Date: 2014-08-22 11:41:07 -0300 Merge pull request #16626 from adomokos/replacing-each-with-reduce Replacing an each with reduce commit 9b61a7e refs/heads/master Merge: f020f30 eb73d7d Author: Rafael Mendonça França Date: 2014-08-22 11:07:26 -0300 Merge pull request #16560 from robin850/rbx-duration-eql Define the Duration#instance_of? method commit f99e62e refs/heads/master Author: Alex Robbin Date: 2014-08-22 09:54:54 -0400 just use the placeholder tag value if it is passed as a String M actionview/lib/action_view/helpers/tags/placeholderable.rb M actionview/test/template/form_helper_test.rb commit fea7fe1 refs/heads/master Author: Alex Robbin Date: 2014-08-09 00:10:54 -0400 add I18n support for `:placeholder` HTML option is passed to form fields M actionview/CHANGELOG.md A actionview/lib/action_view/helpers/tags/placeholderable.rb M actionview/lib/action_view/helpers/tags/text_area.rb M actionview/lib/action_view/helpers/tags/text_field.rb M actionview/test/template/form_helper_test.rb commit 1079bb6 refs/heads/master Author: Attila Domokos Date: 2014-08-22 08:08:12 -0500 Using `each_with_object` instead of `reduce` This way no new object allocation is taking place. Thanks @jeremy for the suggestion! M activemodel/lib/active_model/errors.rb commit f020f30 refs/heads/master Merge: 6fa5f85 fb74023 Author: Yves Senn Date: 2014-08-22 12:09:32 +0200 Merge pull request #16633 from tgxworld/prefer_log_message_through_block Pass logging message through block. commit 6fa5f85 refs/heads/master Merge: 880a1d8 2dd22ea Author: Zachary Scott Date: 2014-08-22 03:06:53 -0700 Merge pull request #16634 from tgxworld/missing_space Missing space. [CI SKIP] commit 2dd22ea refs/heads/master Author: Guo Xiang Tan Date: 2014-08-22 17:51:47 +0800 Missing space. [CI SKIP] M guides/source/debugging_rails_applications.md commit fb74023 refs/heads/master Author: Guo Xiang Tan Date: 2014-08-22 17:47:13 +0800 Pass logging message through block. This follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance M activejob/lib/active_job/logging.rb commit 880a1d8 refs/heads/master Merge: 58d9888 b4a9f00 Author: Zachary Scott Date: 2014-08-22 01:58:12 -0700 Merge pull request #11859 from zzak/nested_model_forms_guide See AR::Associations for greater detail in Nested Model Forms Guide [ci skip] commit b4a9f00 refs/heads/master Author: Zachary Scott Date: 2013-08-12 16:14:01 -0400 add nested_model_forms to guides/documents.yaml [wip] [ci skip] M guides/source/nested_model_forms.md commit 58d9888 refs/heads/master Merge: 777c39c 95b7824 Author: Zachary Scott Date: 2014-08-22 00:50:20 -0700 Merge branch 'jonatack-patch-8' commit 95b7824 refs/heads/master Author: Jon Atack Date: 2014-08-15 16:00:52 +0200 Follow up on #16408 [skip ci] M guides/source/generators.md commit 777c39c refs/heads/master Author: Zachary Scott Date: 2014-08-22 00:45:25 -0700 [ci skip] Running AR tests guide [Fixes GH-15891] Patch by @bcjordan M activerecord/RUNNING_UNIT_TESTS.rdoc commit 3202b62 refs/heads/master Merge: 0697b7c 525cbd4 Author: Zachary Scott Date: 2014-08-22 00:36:26 -0700 Merge pull request #16630 from tomkadwill/added_has_and_belongs_to_many_scope_documentation [ci skip] Added documentation for has_and_belongs_to_many scope parameter commit 525cbd4 refs/heads/master Author: Tom Kadwill Date: 2014-08-22 08:07:07 +0100 [ci skip] Added documentation for has_and_belongs_to_many scope parameter M activerecord/lib/active_record/associations.rb commit 0697b7c refs/heads/master Merge: 7fce216 81b14b7 Author: Jeremy Kemper Date: 2014-08-21 22:08:20 -0700 Merge pull request #16629 from rails/revert-16438-input-placeholder-i18n Revert "Add I18n support for `:placeholder` HTML option is passed to for... commit 81b14b7 refs/heads/master Author: Jeremy Kemper Date: 2014-08-21 22:07:33 -0700 Revert "Add I18n support for `:placeholder` HTML option is passed to form fields" M actionview/CHANGELOG.md D actionview/lib/action_view/helpers/tags/placeholderable.rb M actionview/lib/action_view/helpers/tags/text_area.rb M actionview/lib/action_view/helpers/tags/text_field.rb M actionview/test/template/form_helper_test.rb commit 7fce216 refs/heads/master Merge: 0e4b217 f9a84bb Author: Jeremy Kemper Date: 2014-08-21 21:37:58 -0700 Merge pull request #16604 from saarons/clean-remote-ip-middleware ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies commit 0e4b217 refs/heads/master Author: Vijay Dev Date: 2014-08-22 09:45:16 +0530 fix grammar [ci skip] M railties/lib/rails/commands/console.rb commit 285a9f0 refs/heads/master Author: Vijay Dev Date: 2014-08-22 09:43:45 +0530 fix server names [ci skip] Per feedback in https://github.com/rails/rails/commit/af63e4a2546629c3fb2d53cffb7d4ea0e8663f68#commitcomment-7477636 M railties/lib/rails/commands/server.rb commit 36895bd refs/heads/master Author: Attila Domokos Date: 2014-08-21 23:07:03 -0500 Replacing an each with reduce The functionality has not changed, but the code is more elegant by using `reduce` instead of `each`. This way no accumulator needs to be declared, no explicit return is needed. M activemodel/lib/active_model/errors.rb commit f9a84bb refs/heads/master Author: Sam Aarons Date: 2014-08-20 15:42:32 -0700 Refactor ActionDispatch::RemoteIp Refactored IP address checking in ActionDispatch::RemoteIp to rely on the IPAddr class instead of the unwieldly regular expression to match IP addresses. This commit keeps the same api but allows users to pass IPAddr objects to config.action_dispatch.trusted_proxies in addition to passing strings and regular expressions. Example: # config/environments/production.rb config.action_dispatch.trusted_proxies = IPAddr.new('4.8.15.0/16') M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/remote_ip.rb M railties/test/application/middleware/remote_ip_test.rb commit a57f7b5 refs/heads/master Author: Xavier Noria Date: 2014-08-21 23:27:40 +0200 ActiveJob -> Active Job [ci skip] See http://guides.rubyonrails.org/api_documentation_guidelines.html#wording M activejob/lib/active_job/gem_version.rb M activejob/lib/active_job/version.rb M guides/source/active_job_basics.md commit b6ccaee refs/heads/master Author: Xavier Noria Date: 2014-08-21 23:24:22 +0200 applies API guidelines to new AM docs M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/message_delivery.rb commit 523e279 refs/heads/master Author: Matthew Draper Date: 2014-08-22 05:47:30 +0930 Don't fight against ourselves for the default log level If we want to always default to :debug, let's just do that. At which point the production.rb entry can become an "uncomment to change" instead. M railties/lib/rails/application/configuration.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit b55e7e3 refs/heads/master Merge: 6d3cf01 657cbd6 Author: Rafael Mendonça França Date: 2014-08-21 17:11:25 -0300 Merge pull request #16621 from Calyhre/patch-1 Update documentation, Add change to ActionView Notable changes commit 657cbd6 refs/heads/master Author: Charley D Date: 2014-08-21 21:57:19 +0200 Add change to ActionView Notable changes [ci skip] M guides/source/4_2_release_notes.md commit 6d3cf01 refs/heads/master Merge: 44ed38b 5c29265 Author: Vijay Dev Date: 2014-08-22 00:08:39 +0530 Merge pull request #16271 from alol/action-view-overview-guide-tweaks Small Action View Overview guide grammar and readability tweaks commit 44ed38b refs/heads/master Merge: 572c03e 20f7c76 Author: Vijay Dev Date: 2014-08-21 23:58:15 +0530 Merge pull request #16204 from jonatack/patch-7 Fix minor typos and improve grammar and code formatting commit 572c03e refs/heads/master Merge: ddb2d57 af3b2c4 Author: Zachary Scott Date: 2014-08-21 10:05:04 -0700 Merge pull request #16617 from tomkadwill/added_has_one_scope_documentation [ci skip] Added documentation for has_one scope parameter commit ddb2d57 refs/heads/master Merge: af63e4a ce392d9 Author: Zachary Scott Date: 2014-08-21 09:52:33 -0700 Merge pull request #16615 from tgxworld/guide_fix [ci skip] Grammar fixes for upgrade guide from 4.0 to 4.1 commit af3b2c4 refs/heads/master Author: Tom Kadwill Date: 2014-08-21 17:51:47 +0100 [ci skip] Added documentation for has_one scope parameter M activerecord/lib/active_record/associations.rb commit af16fd5 refs/heads/master Author: JoseLuis Torres Date: 2014-06-26 22:52:01 -0500 adding the exception RecordNotFound to UUID find M activerecord/lib/active_record/connection_adapters/postgresql/oid/uuid.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/test/cases/helper.rb commit ce392d9 refs/heads/master Author: Guo Xiang Tan Date: 2014-08-22 00:27:29 +0800 Guide fix. [CI SKIP] Related: https://github.com/rails/rails/pull/16607 M guides/source/upgrading_ruby_on_rails.md commit af63e4a refs/heads/master Author: Vijay Dev Date: 2014-08-21 16:22:54 +0000 Make text consistent in help text of rails server and console commands. M railties/lib/rails/commands/console.rb M railties/lib/rails/commands/server.rb commit 54cf7c5 refs/heads/master Merge: 45463c4 3941b8d Author: Zachary Scott Date: 2014-08-21 08:44:50 -0700 Merge pull request #16612 from loganhasson/master [ci skip] Clarify Action Mailer/Active Job usage note commit 3941b8d refs/heads/master Author: Logan Hasson Date: 2014-08-21 08:18:56 -0400 [ci skip] Clarify Action Mailer/Active Job usage note M guides/source/action_mailer_basics.md commit 45463c4 refs/heads/master Merge: f603480 13d4a9b Author: Santiago Pastorino Date: 2014-08-21 10:52:27 -0300 Merge pull request #16607 from tgxworld/upgrading_guide_pass Upgrade guide pass. [CI SKIP] commit f603480 refs/heads/master Merge: 93606e5 96e483a Author: Yves Senn Date: 2014-08-21 11:53:18 +0200 Merge pull request #16608 from GRoguelon/fix_issues_in_4_2_release_notes Fix some issues in 4.2 release notes. [ci skip] commit 96e483a refs/heads/master Author: Geoffrey ROGUELON Date: 2014-08-21 10:53:30 +0200 Fix some issues in 4.2 release notes. Remove duplicate line in Railties. [ci skip] M guides/source/4_2_release_notes.md commit 93606e5 refs/heads/master Merge: d3b0bb2 9212042 Author: Andrew White Date: 2014-08-21 10:08:48 +0100 Merge pull request #15443 from tgxworld/preload_head_routes Map HEAD requests to GET routes instead of duplicating GET routes. commit 9212042 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-04 12:04:52 -0700 Improve router test. We should assert that routes will not be recognized if the verbs do not match. M actionpack/test/journey/router_test.rb commit d3eb92d refs/heads/master Author: Guo Xiang Tan Date: 2014-07-03 21:32:14 -0700 Avoid duplicating routes for HEAD requests. Follow up to rails#15321 Instead of duplicating the routes, we will first match the HEAD request to HEAD routes. If no match is found, we will then map the HEAD request to GET routes. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/dispatch/request_test.rb M actionpack/test/journey/router_test.rb commit 13d4a9b refs/heads/master Author: Guo Xiang Tan Date: 2014-08-21 16:22:16 +0800 Upgrade guide pass. [CI SKIP] M guides/source/upgrading_ruby_on_rails.md commit d3b0bb2 refs/heads/master Merge: 90006ac a7a358c Author: Zachary Scott Date: 2014-08-20 23:39:47 -0700 Merge pull request #16603 from jwworth/task/fix_grammar [ci skip] 4.2 release notes grammar fix commit a7a358c refs/heads/master Author: Jake Worth Date: 2014-08-21 01:12:35 -0500 Change 'does' to 'do' M guides/source/4_2_release_notes.md commit 9b319a5 refs/heads/master Author: Nicholas Bruning Date: 2014-08-21 04:19:40 +0000 Added enqueue_at support for QueAdapter in ActiveJob * Added inline job runner for Que in test/support * Updated QueAdapter to support enqueue_at M activejob/lib/active_job/queue_adapters/que_adapter.rb M activejob/test/adapters/que.rb A activejob/test/support/que/inline.rb commit 90006ac refs/heads/master Merge: 2e355fe cfaaacd Author: Guillermo Iguaran Date: 2014-08-20 22:57:43 -0500 Merge pull request #16466 from schneems/schneems/gzip-action-dispatch Enable gzip compression by default commit cfaaacd refs/heads/master Author: schneems Date: 2014-08-11 13:29:25 -0500 Enable gzip compression by default If someone is using ActionDispatch::Static to serve assets and makes it past the `match?` then the file exists on disk and it will be served. This PR adds in logic that checks to see if the file being served is already compressed (via gzip) and on disk, if it is it will be served as long as the client can handle gzip encoding. If not, then a non gzip file will be served. This additional logic slows down an individual asset request but should speed up the consumer experience as compressed files are served and production applications should be delivered with a CDN. This PR allows a CDN to cache a gzip file by setting the `Vary` header appropriately. In net this should speed up a production application that are using Rails as an origin for a CDN. Non-asset request speed is not affected in this PR. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/dispatch/static_test.rb A actionpack/test/fixtures/public/gzip/application-a71b3024f80aea3181c09774ca17e712.js A actionpack/test/fixtures/public/gzip/application-a71b3024f80aea3181c09774ca17e712.js.gz A "actionpack/test/fixtures/\345\205\254\345\205\261/gzip/application-a71b3024f80aea3181c09774ca17e712.js" A "actionpack/test/fixtures/\345\205\254\345\205\261/gzip/application-a71b3024f80aea3181c09774ca17e712.js.gz" commit 2e355fe refs/heads/master Merge: f02c972 d4f0f83 Author: Zachary Scott Date: 2014-08-20 16:55:02 -0700 Merge pull request #16600 from bradly/spelling-fix-in-testing-guide [ci skip] Fixing spelling typo in testing guide. commit d4f0f83 refs/heads/master Author: Bradly Feeley Date: 2014-08-20 16:21:56 -0700 [ci skip] Fixing spelling typo in testing guide. M guides/source/testing.md commit f02c972 refs/heads/master Author: Akira Matsuda Date: 2014-08-21 06:52:54 +0900 "warning: assigned but unused variable" M activerecord/test/cases/relation/merging_test.rb commit 31abbe5 refs/heads/master Author: Akira Matsuda Date: 2014-08-21 06:40:00 +0900 Fix SyntaxError M actionmailer/test/message_delivery_test.rb commit 1e09a1d refs/heads/master Merge: f7851c6 f077259 Author: Zachary Scott Date: 2014-08-20 14:08:34 -0700 Merge pull request #16597 from teeparham/master Remove cached attributes from Configuring guide [ci skip] This was removed in #15429 commit f077259 refs/heads/master Author: Tee Parham Date: 2014-08-20 14:56:30 -0600 Update configuring.md [ci skip] Remove ActiveRecord config instructions for active_record.attribute_types_cached_by_default, which was removed in https://github.com/rails/rails/commit/66736c8e50585 M guides/source/configuring.md commit f7851c6 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-20 16:51:17 -0300 Make the explicit the Active Job dependency of Action Mailer M actionmailer/actionmailer.gemspec commit 212fde6 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-20 16:50:06 -0300 Remove timestamp type from generator usage It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be M railties/lib/rails/generators/rails/model/USAGE commit 537b859 refs/heads/master Merge: 9f575cc d694ea2 Author: Zachary Scott Date: 2014-08-20 12:40:46 -0700 Merge pull request #16594 from loganhasson/master [ci skip] Fix Active Job grammar in api docs commit d694ea2 refs/heads/master Author: Logan Hasson Date: 2014-08-20 15:36:58 -0400 [ci skip] Fix Active Job grammar in api docs M activejob/README.md M activejob/lib/active_job/callbacks.rb commit 9f575cc refs/heads/master Merge: 6ef0dd9 eb9f1ef Author: Zachary Scott Date: 2014-08-20 12:33:45 -0700 Merge pull request #16593 from aditya-kapoor/add-doc-for-step [ci skip] add doc for STEP in migration commit 6ef0dd9 refs/heads/master Merge: 2b7d67d b64cfac Author: Zachary Scott Date: 2014-08-20 12:32:53 -0700 Merge pull request #16575 from tomkadwill/added_has_many_scope_documentation [ci skip] Added documentation for has_many scope parameter commit eb9f1ef refs/heads/master Author: Aditya Kapoor Date: 2014-08-21 01:01:45 +0530 [ci skip] add doc for STEP in migration M activerecord/lib/active_record/migration.rb commit 2b7d67d refs/heads/master Merge: cd1a045 2858e31 Author: Santiago Pastorino Date: 2014-08-20 16:26:31 -0300 Merge pull request #16592 from aditya-kapoor/fix-migration-docs [ci skip] correct docs about the migration generation commit 2858e31 refs/heads/master Author: Aditya Kapoor Date: 2014-08-21 00:53:26 +0530 [ci skip] correct docs about the migration generation M activerecord/lib/active_record/migration.rb commit cd1a045 refs/heads/master Merge: 2f19466 e569e12 Author: Zachary Scott Date: 2014-08-20 12:19:33 -0700 Merge pull request #16590 from loganhasson/master [ci skip] Fix typos/grammar in Active Job guide commit e569e12 refs/heads/master Author: Logan Hasson Date: 2014-08-20 15:08:19 -0400 Fix a few typos/some grammar in Active Job Basics M guides/source/active_job_basics.md commit b64cfac refs/heads/master Author: Tom Kadwill Date: 2014-08-20 07:58:59 +0100 [ci skip] Added documentation for has_many scope parameter M activerecord/lib/active_record/associations.rb commit 2d8886e refs/remotes/origin/4-0-stable Author: Zachary Scott Date: 2014-08-20 10:33:48 -0700 Same as f39cb2b except backport friendly Point release notes to stable branch for list of commits. [ci skip] M guides/source/4_0_release_notes.md commit 90b70cd refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-08-20 10:31:38 -0700 Same as f39cb2b except backport friendly Point release notes to stable branch for list of commits. [ci skip] M guides/source/4_1_release_notes.md commit 2f19466 refs/heads/master Author: Zachary Scott Date: 2014-08-20 10:33:48 -0700 Same as f39cb2b except backport friendly Point release notes to stable branch for list of commits. [ci skip] M guides/source/4_0_release_notes.md commit 0cc9848 refs/heads/master Author: Zachary Scott Date: 2014-08-20 10:31:38 -0700 Same as f39cb2b except backport friendly Point release notes to stable branch for list of commits. [ci skip] M guides/source/4_1_release_notes.md commit f39cb2b refs/heads/master Author: Zachary Scott Date: 2014-08-20 10:29:27 -0700 Point release notes to stable branch for list of commits. [ci skip] M guides/source/2_2_release_notes.md M guides/source/2_3_release_notes.md M guides/source/3_0_release_notes.md M guides/source/3_1_release_notes.md M guides/source/3_2_release_notes.md M guides/source/4_2_release_notes.md commit b1c1b5d refs/tags/v4.1.6.rc2 Author: Xavier Noria Date: 2014-08-20 16:10:37 +0200 Fixes the digits counter of AS's NumberToRoundedConverter Zero has one digit, but Math.log10(0) returns -Infinity. The method needs to special-case zero. The patch adds a regression test that is not clearly related to the underlying issue because digit_count is private and has no coverage. Gray area. This bug was uncovered by 60062cf. M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit f39aaa4 refs/heads/master Merge: 79bcab7 6e75e7e Author: Rafael Mendonça França Date: 2014-08-20 13:43:50 -0300 Merge pull request #16587 from seuros/master [Rdoc] Make clear that we are sending an AR object [ci skip] commit 6e75e7e refs/heads/master Author: Abdelkader Boudih Date: 2014-08-20 16:41:00 +0000 [Rdoc] Make clear that we are sending an AR object [ci skip] M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/message_delivery.rb commit 379ad76 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-08-20 13:38:06 -0300 Merge pull request #16172 from Agis-/hmt_scope_arity has_many :through with dynamic condition merging Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/through_association.rb M activerecord/test/cases/relation/merging_test.rb M activerecord/test/models/comment.rb M activerecord/test/models/developer.rb M activerecord/test/schema/schema.rb commit 79bcab7 refs/heads/master Merge: b66bb42 431f8e0 Author: Rafael Mendonça França Date: 2014-08-20 13:38:06 -0300 Merge pull request #16172 from Agis-/hmt_scope_arity has_many :through with dynamic condition merging commit b66bb42 refs/heads/master Merge: 0baed94 d162934 Author: Rafael Mendonça França Date: 2014-08-20 13:31:21 -0300 Merge pull request #16586 from seuros/master Fix typo in rdoc [ci skip] commit d162934 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-20 16:22:41 +0000 Fix typo in rdoc [ci skip] M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/message_delivery.rb commit 0baed94 refs/heads/master Merge: b03e048 9e7f4a9 Author: Rafael Mendonça França Date: 2014-08-20 13:15:16 -0300 Merge pull request #16582 from cristianbica/actionmailer-deprecate-deliver Deprecated ActionMailer .deliver and updated ActionMailer / ActiveJob docs/guide commit b03e048 refs/heads/master Merge: 3553816 2eacdb0 Author: Rafael Mendonça França Date: 2014-08-20 13:12:05 -0300 Merge pull request #16585 from nicolasblanco/require_active_job Require ActiveJob in case a skip_xxx option is given commit 2eacdb0 refs/heads/master Author: slainer68 Date: 2014-08-20 17:28:23 +0200 Require ActiveJob in case a skip_xxx option is given Change position of require active_job M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/test/generators/app_generator_test.rb commit 3553816 refs/heads/master Merge: 500deec 5833163 Author: Rafael Mendonça França Date: 2014-08-20 11:58:26 -0300 Merge pull request #16583 from JuanitoFatas/doc/patch-1 [ci skip] Format pass of Active Job Basics guide. commit 9e7f4a9 refs/heads/master Author: Cristian Bica Date: 2014-08-20 15:34:37 +0300 Updated rdoc / guides / release notes related to ActiveJob / ActionMailer M actionmailer/CHANGELOG.md M actionmailer/README.rdoc M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/delivery_job.rb M actionmailer/lib/action_mailer/message_delivery.rb M actionmailer/lib/action_mailer/test_helper.rb M guides/source/4_2_release_notes.md M guides/source/action_mailer_basics.md M guides/source/active_job_basics.md M guides/source/active_record_querying.md M guides/source/testing.md commit f4ee114 refs/heads/master Author: Cristian Bica Date: 2014-08-20 11:34:57 +0300 Deprecated .deliver / .deliver! to .deliver_now / .deliver_now! M actionmailer/lib/action_mailer/message_delivery.rb M actionmailer/test/assert_select_email_test.rb M actionmailer/test/base_test.rb M actionmailer/test/delivery_methods_test.rb M actionmailer/test/i18n_with_controller_test.rb M actionmailer/test/log_subscriber_test.rb M actionmailer/test/message_delivery_test.rb M actionmailer/test/test_helper_test.rb M actionmailer/test/url_test.rb commit 204ea85 refs/remotes/origin/4-1-stable Author: Xavier Noria Date: 2014-08-20 16:10:37 +0200 Fixes the digits counter of AS's NumberToRoundedConverter Zero has one digit, but Math.log10(0) returns -Infinity. The method needs to special-case zero. The patch adds a regression test that is not clearly related to the underlying issue because digit_count is private and has no coverage. Gray area. This bug was uncovered by 60062cf. M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit 500deec refs/heads/master Author: Xavier Noria Date: 2014-08-20 16:10:37 +0200 Fixes the digits counter of AS's NumberToRoundedConverter Zero has one digit, but Math.log10(0) returns -Infinity. The method needs to special-case zero. The patch adds a regression test that is not clearly related to the underlying issue because digit_count is private and has no coverage. Gray area. This bug was uncovered by 60062cf. M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit f67d143 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-08-20 11:06:09 -0300 Merge pull request #16145 from phoet/patch-2 don't log errors when all is fine M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/fixtures_test.rb commit 3a1edcf refs/heads/master Merge: b6f5b48 2e6b798 Author: Rafael Mendonça França Date: 2014-08-20 11:06:09 -0300 Merge pull request #16145 from phoet/patch-2 don't log errors when all is fine commit ce8e4a4 refs/heads/master Author: Alex Robbin Date: 2014-08-12 23:43:24 -0400 provide a builder for form labels to customize wrapping around I18n content M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/tags/label.rb M actionview/test/template/form_helper_test.rb commit 5833163 refs/heads/master Author: Juanito Fatas Date: 2014-08-20 21:33:06 +0800 [ci skip] Format pass of Active Job Basics guide. M guides/source/active_job_basics.md commit b6f5b48 refs/heads/master Merge: 591da21 5efcf38 Author: Santiago Pastorino Date: 2014-08-20 09:57:51 -0300 Merge pull request #16573 from zzak/test_test_to_test_case_test Move as/test_test to as/test_case_test commit 591da21 refs/heads/master Merge: ac5b546 597a666 Author: Xavier Noria Date: 2014-08-20 13:54:13 +0200 Merge pull request #16581 from JuanitoFatas/guides-anchor-link Revert "Do not gsub non ASCII characters in header anchor.". commit 597a666 refs/heads/master Author: Juanito Fatas Date: 2014-08-20 19:18:10 +0800 Revert "Do not gsub non ASCII characters in header anchor.". This reverts commit 699babe. Also change the upgrading_ruby_on_rails link back to original in 4_2_release_notes. M guides/rails_guides/markdown.rb M guides/source/4_2_release_notes.md commit ac5b546 refs/heads/master Merge: 0df2a83 df773ca Author: Matthew Draper Date: 2014-08-20 19:47:19 +0930 Merge pull request #16577 from cristianbica/update-deprecation-to-5.0 Updated the deprecation warnings to 5.0 commit 0df2a83 refs/heads/master Author: Akira Matsuda Date: 2014-08-20 19:07:03 +0900 Clear deliveries in order not to affect other tests M actionmailer/test/message_delivery_test.rb commit d49a79f refs/heads/master Merge: 9ea8028 31c98ec Author: Xavier Noria Date: 2014-08-20 11:29:36 +0200 Merge pull request #16579 from nsinenko/master Remove end-of-line spacing in development.rb, production.rb commit 31c98ec refs/heads/master Author: Nick Sinenko Date: 2014-08-20 19:21:58 +1000 remove end-of-line spacing in development.rb, production.rb M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 9ea8028 refs/heads/master Author: Akira Matsuda Date: 2014-08-20 17:49:03 +0900 Ignore Postgresql "SELECT tablename FROM pg_tables" when counting queries M activerecord/test/cases/test_case.rb commit df773ca refs/heads/master Author: Cristian Bica Date: 2014-08-20 11:02:10 +0300 Updated the deprecation warnings to 5.0 M activesupport/lib/active_support/deprecation.rb commit 24a9bc4 refs/heads/master Author: Zachary Scott Date: 2014-08-19 23:45:43 -0700 Add documentation intro to example for `Object#itself`. Also moved comment for removal above `unless()` to not confuse RDoc with the documentation for this method. M activesupport/lib/active_support/core_ext/object/itself.rb commit 5efcf38 refs/heads/master Author: Zachary Scott Date: 2014-08-19 23:40:42 -0700 Move as/test_test to as/test_case_test A activesupport/test/test_case_test.rb D activesupport/test/test_test.rb commit 161382f refs/heads/master Author: Zachary Scott Date: 2014-08-19 23:35:52 -0700 [ci skip] "..enables interrorgating of [thing].." would be correct M activerecord/lib/active_record/reflection.rb commit 4b7ac2e refs/heads/master Author: Akira Matsuda Date: 2014-08-20 14:26:22 +0900 Drop schema_migrations table only when exists M activerecord/test/cases/migration_test.rb commit 431f8e0 refs/heads/master Author: Agis- Date: 2014-07-15 03:25:18 +0300 Only merge scopes with zero arity in has_many through with dynamic conditions. Fixes #16128 This bug was introduced in https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d so it's present from 4.1.2-rc1 and after. https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d merges any relation scopes passed as proc objects to the relation, but does *not* take into account the arity of the lambda. To reproduce: https://gist.github.com/Agis-/5f1f0d664d2cd08dfb9b M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/through_association.rb M activerecord/test/cases/relation/merging_test.rb M activerecord/test/models/comment.rb M activerecord/test/models/developer.rb M activerecord/test/schema/schema.rb commit 7422d21 refs/heads/master Merge: 78728af 63f7b22 Author: Rafael Mendonça França Date: 2014-08-19 23:57:52 -0300 Merge pull request #16572 from lucasmazza/lm-remove-actionmailer-global-helpers Remove global helpers from the ActionMailer test suite. commit 63f7b22 refs/heads/master Author: Lucas Mazza Date: 2014-08-19 23:53:19 -0300 Remove global helpers from the ActionMailer test suite. M actionmailer/test/abstract_unit.rb M actionmailer/test/asset_host_test.rb commit 6a23bf0 refs/tags/v4.2.0.beta1 (tag: v4.2.0.beta1) Author: David Heinemeier Hansson Date: 2014-08-19 19:32:51 -0700 Preparing for 4.2.0.beta1 release M RAILS_VERSION M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/lib/action_view/gem_version.rb M activejob/lib/active_job/gem_version.rb M activemodel/lib/active_model/gem_version.rb M activerecord/lib/active_record/gem_version.rb M activesupport/lib/active_support/gem_version.rb M railties/lib/rails/gem_version.rb M version.rb commit 78728af refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-19 17:06:43 -0700 Extra space M actionmailer/CHANGELOG.md commit c8041ab refs/heads/master Merge: 5d81a7d 04db4c2 Author: Rafael Mendonça França Date: 2014-08-19 23:28:51 -0300 Merge pull request #16571 from lucasmazza/lm-fix-actionmailer-test-case Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::TestCase. commit 04db4c2 refs/heads/master Author: Lucas Mazza Date: 2014-08-19 23:26:45 -0300 Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::TestCase`. This way these methods are available outside the ActionMailer test suite, but they are still duplicated inside `test/abstract_unit` for test cases that don't inherit from the `ActionMailer::TestCase` class. M actionmailer/lib/action_mailer/test_case.rb commit 5d81a7d refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 23:21:39 -0300 Create a group to active job gems M Gemfile commit 75fafc7 refs/heads/master Author: Godfrey Chan Date: 2014-08-19 19:13:08 -0700 Copy & paste fail [ci skip] M guides/source/4_2_release_notes.md commit 71c8a85 refs/heads/master Author: Godfrey Chan Date: 2014-08-19 19:06:12 -0700 :nail_care: The note doesn't look good on the blue background [ci skip] M guides/source/4_2_release_notes.md commit 657436d refs/heads/master Author: Godfrey Chan Date: 2014-08-19 19:03:43 -0700 :bomb: oops, it should be 4.2 that's WIP [ci skip] M guides/source/4_1_release_notes.md M guides/source/4_2_release_notes.md commit 1a1f2e1 refs/heads/master Author: Godfrey Chan Date: 2014-08-19 18:58:20 -0700 Some placeholders for the 4.2 upgrade guide [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 2d24eb4 refs/heads/master Author: Godfrey Chan Date: 2014-08-19 18:50:13 -0700 Clearly mark these as WIP, and invite people to contribute. [ci skip] M guides/source/4_1_release_notes.md M guides/source/upgrading_ruby_on_rails.md commit a568260 refs/heads/master Author: Godfrey Chan Date: 2014-08-19 18:44:37 -0700 List the 4.2 release notes in the index, mark it as WIP [ci skip] M guides/source/documents.yaml commit d8db05f refs/heads/master Author: Godfrey Chan Date: 2014-08-19 18:39:41 -0700 Major features in 4.2 release notes [ci skip] M guides/source/4_2_release_notes.md commit e432714 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-19 22:37:18 -0300 Fix failing railties tests A combination of two commits led into these failures: * The addition of a new active_record config in 24bb8347b6ff0da90059314d9aece7a2c94a272c * The revert of the config to use config.x as options holder in 43073b393d234acd094ac7c220163f4e419d11f5 These tests remove activerecord from the load path, however the configuration is still in the application file, and they blow up. M railties/test/isolation/abstract_unit.rb commit 6e420aa refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-19 22:18:21 -0300 Fix blank link on config/application.rb app template [ci skip] M railties/lib/rails/generators/rails/app/templates/config/application.rb commit f288533 refs/heads/master Author: Godfrey Chan Date: 2014-08-19 18:20:05 -0700 Synced AR release notes [ci-skip] M guides/source/4_2_release_notes.md commit 79d50ce refs/heads/master Merge: e40872f 69fc0e1 Author: Jeremy Kemper Date: 2014-08-19 18:17:07 -0700 Merge pull request #16570 from bradleybuda/breach-mitigation-mask-csrf-token CSRF token mask from breach-mitigation-rails gem commit e40872f refs/heads/master Author: Godfrey Chan Date: 2014-08-19 18:01:19 -0700 Synced Active Support release notes [ci skip] [Godfrey Chan, Genadi Samokovarov] M guides/source/4_2_release_notes.md commit 156ba1b refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-19 21:40:33 -0300 Use the released turbolinks gem M Gemfile commit 2f7ac9c refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-19 20:07:39 -0300 Fix setting simple values to the new config.x Previously setting simple values to the config.x object resulted in the following: config.x.super_debugger = true config.x.super_debugger #=> {} Which was against the examples showed in the changelog/release notes. M guides/source/4_2_release_notes.md M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb M railties/test/application/configuration/custom_test.rb commit e206681 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 21:58:05 -0300 Point to right sass-rails version M railties/lib/rails/generators/app_base.rb commit 9733dc5 refs/heads/master Author: Godfrey Chan Date: 2014-08-19 17:44:08 -0700 Synced Active Model changelogs [ci skip] Godfrey Chan, Genadi Samokovarov M guides/source/4_2_release_notes.md commit 35b2d3f refs/heads/master Author: Guillermo Iguaran Date: 2014-08-19 19:39:29 -0500 Use web-console 2.0.0.beta2 on new apps M railties/lib/rails/generators/rails/app/templates/Gemfile commit d4f018f refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 19:57:55 -0300 Require sprockets-rails 3.0.0.beta1 M Gemfile M rails.gemspec commit 43073b3 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 19:41:15 -0300 Revert "Improve custom configuration" This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336. Conflicts: railties/lib/rails/railtie/configuration.rb It added regression. Will be back after the beta M guides/source/4_2_release_notes.md M guides/source/configuring.md M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb M railties/lib/rails/railtie/configuration.rb M railties/test/application/configuration/base_test.rb M railties/test/application/configuration/custom_test.rb M railties/test/railties/engine_test.rb commit 69fc0e1 refs/heads/master Author: Bradley Buda Date: 2014-08-19 14:29:26 -0700 Auth token mask from breach-mitigation-rails gem This merges in the code from the breach-mitigation-rails gem that masks authenticity tokens on each request by XORing them with a random set of bytes. The masking is used to make it impossible for an attacker to steal a CSRF token from an SSL session by using techniques like the BREACH attack. The patch is pretty simple - I've copied over the [relevant code](https://github.com/meldium/breach-mitigation-rails/blob/master/lib/breach_mitigation/masking_secrets.rb) and updated the tests to pass, mostly by adjusting stubs and mocks. M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/test/controller/request_forgery_protection_test.rb commit 867631f refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 19:24:41 -0300 Require rack/utils M activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb commit b9700c1 refs/heads/master Merge: 6b66ec3 5407084 Author: Guillermo Iguaran Date: 2014-08-19 16:20:53 -0500 Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelog Mention web-console in 4.2 release notes commit 6b66ec3 refs/heads/master Merge: 299c264 5855717 Author: Zachary Scott Date: 2014-08-19 14:02:30 -0700 Merge pull request #16475 from tomkadwill/has_many_scope_documentation [ci skip] Added documentation for belongs_to scope parameter commit 5407084 refs/heads/master Author: Genadi Samokovarov Date: 2014-08-19 19:41:48 +0300 Mention web-console in 4.2 release notes Mention the web-console inclusion in the default Gemfile in the Release notes and the railties changelog. We can eventually mention it in the upgrade guide, if needed. [ci skip] M guides/source/4_2_release_notes.md M railties/CHANGELOG.md commit 5855717 refs/heads/master Author: Tom Kadwill Date: 2014-08-12 12:31:59 +0100 [ci skip] Added documentation for belongs_to scope parameter M activerecord/lib/active_record/associations.rb commit c5310be refs/tags/v4.1.6.rc1 (tag: v4.1.6.rc1) Author: Rafael Mendonça França Date: 2014-08-19 15:55:15 -0300 Merge pull request #16349 from jmcnevin/master Correctly determine if migration is needed. M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb commit 299c264 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 17:38:29 -0300 We always get the value so no need to check nil or Hash M railties/lib/rails/railtie/configuration.rb commit a5d50ac refs/heads/master Author: Zachary Scott Date: 2014-08-19 13:17:23 -0700 Move date and time requires to time_travel_test, also include 'abstract_unit'. cc #16564 M activesupport/test/test_test.rb M activesupport/test/time_travel_test.rb commit 6986535 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 16:50:29 -0300 Add TODO note about the gems missing release M Gemfile commit edfc36d refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 16:49:04 -0300 Remove git dependecies M Gemfile commit 0916451 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 16:47:26 -0300 Use released rails-html-sanitizer M Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile commit 08f2096 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 16:45:11 -0300 Use released rails-deprecated_sanitizer M Gemfile M actionpack/actionpack.gemspec M actionview/actionview.gemspec commit 9bea72b refs/heads/master Author: Jeremy Kemper Date: 2014-08-19 12:44:54 -0700 Bump ActiveJob's GlobalID dep to 0.2.3+ to fix Railties tests M activejob/activejob.gemspec commit e9bc3ef refs/heads/master Merge: fad9e72 ab291e8 Author: Jeremy Kemper Date: 2014-08-19 12:44:14 -0700 Merge pull request #16564 from zzak/move_time_travel_test Move TimeHelperTest to TimeTravelTest from `as/test_test.rb` commit fad9e72 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 16:32:12 -0300 Fix the rails-dom-testing dependecy M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M actionview/actionview.gemspec commit 24bb834 refs/heads/master Merge: b8ef1d8 c7c2df2 Author: Rafael Mendonça França Date: 2014-08-19 16:19:36 -0300 Merge pull request #16563 from arthurnn/add_ar_raise_trans_option Add default .raise_in_transactional_callbacks option to template commit b8ef1d8 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 16:15:41 -0300 loofah require dependecy is not needed anymore M Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile commit 76b141b refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-08-19 15:55:15 -0300 Merge pull request #16349 from jmcnevin/master Correctly determine if migration is needed. M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb commit 315de6e refs/heads/master Merge: 48e2b86 838e183 Author: Rafael Mendonça França Date: 2014-08-19 15:55:15 -0300 Merge pull request #16349 from jmcnevin/master Correctly determine if migration is needed. commit 48e2b86 refs/heads/master Merge: d59a24d de48913 Author: Rafael Mendonça França Date: 2014-08-19 15:52:04 -0300 Merge pull request #16536 from rails/improve-custom-configuration Improve custom configuration commit d59a24d refs/heads/master Author: Rafael Mendonça França Date: 2014-08-19 15:32:16 -0300 Protect against error when parsing parameters with Bad Request Related with #11795. M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb M activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb commit 4d1d81d refs/heads/master Merge: cc160fe 3fcbbc8 Author: Jeremy Kemper Date: 2014-08-19 11:31:38 -0700 Merge pull request #16299 from sikachu/ps-safer-ac-params Update `ActionController::Parameters` to be more secure on parameters handling commit ab291e8 refs/heads/master Author: Zachary Scott Date: 2014-08-19 11:29:26 -0700 Move TimeHelperTest to TimeTravelTest from `as/test_test.rb` M activesupport/test/test_test.rb A activesupport/test/time_travel_test.rb commit c7c2df2 refs/heads/master Author: Arthur Neves Date: 2014-08-19 13:56:55 -0400 Add default .raise_in_transactional_callbacks option to template M railties/lib/rails/generators/rails/app/templates/config/application.rb commit cc160fe refs/heads/master Merge: 41231ef a7ac7b3 Author: Rafael Mendonça França Date: 2014-08-19 14:55:42 -0300 Merge pull request #16562 from arthurnn/missing_string_require Add missing AS require commit c3f578c refs/tags/v4.1.6.rc1 Author: Rafael Mendonça França Date: 2014-08-19 14:45:44 -0300 Preparing for 4.1.6.rc1 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 77b60a2 refs/tags/v4.0.10.rc1 (tag: v4.0.10.rc1) Author: Rafael Mendonça França Date: 2014-08-19 14:41:00 -0300 Preparing for 4.0.10.rc1 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit a7ac7b3 refs/heads/master Author: Arthur Neves Date: 2014-08-19 13:05:40 -0400 Add missing AS require `strip_heredoc` method is defined on active_support/core_ext/string M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit de48913 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 00:22:34 -0300 Improve custom configuration 1. Hashes can be assigned 2. We don't need a special level anymore The method chain only works in the top level. If users need a second level they need to assign a OrderedOptions to the key: config.resque.server = ActiveSupport::OrderedOptions.new config.resque.server.url = "http://localhost" config.resque.server.port = 3000 [Rafael Mendonça França + Carlos Antonio da Silva] M guides/source/4_2_release_notes.md M guides/source/configuring.md M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb M railties/lib/rails/railtie/configuration.rb M railties/test/application/configuration/base_test.rb M railties/test/application/configuration/custom_test.rb M railties/test/railties/engine_test.rb commit 41231ef refs/heads/master Merge: 0cb3bdb bc70448 Author: Vijay Dev Date: 2014-08-19 16:28:53 +0000 Merge branch 'master' of github.com:rails/docrails Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb activerecord/lib/active_record/type/value.rb commit 0cb3bdb refs/heads/master Author: Vijay Dev Date: 2014-08-19 21:42:51 +0530 minor copy editing [ci skip] M guides/source/generators.md commit 29a9478 refs/heads/master Merge: 5dca980 b494e94 Author: Rafael Mendonça França Date: 2014-08-19 11:58:45 -0300 Merge pull request #16487 from jayshepherd/patch-1 Small grammar fix in pluck description commit 5dca980 refs/heads/master Merge: c89c37d 01604c6 Author: Rafael Mendonça França Date: 2014-08-19 11:32:48 -0300 Merge pull request #16559 from splattael/jruby-queue_classic Do not depend on queue_classic on JRuby commit c89c37d refs/heads/master Merge: 31b3ae8 0513d78 Author: Robin Dupret Date: 2014-08-19 15:48:03 +0200 Merge pull request #16556 from jonatack/patch-9 4.2 Release Notes pass [ci skip] commit 01604c6 refs/heads/master Author: Peter Suschlik Date: 2014-08-19 15:40:45 +0200 Skip adapter queue_classic for JRuby M activejob/Rakefile commit 6cfb9bf refs/heads/master Author: Peter Suschlik Date: 2014-08-19 14:59:26 +0200 Gem `queue_classic` does not support JRuby M Gemfile commit 31b3ae8 refs/heads/master Merge: db7b280 7a796b4 Author: Arthur Nogueira Neves Date: 2014-08-19 08:30:28 -0400 Merge pull request #16554 from y-yagi/patch-2 [ci skip] config.active_record.errors_in_transactional_callbacks -> config.active_record.raise_in_transactional_callbacks commit db7b280 refs/heads/master Author: Akira Matsuda Date: 2014-08-19 19:31:03 +0900 "warning: assigned but unused variable" M activesupport/test/multibyte_chars_test.rb commit 1aa0550 refs/heads/master Author: Yves Senn Date: 2014-08-19 12:29:39 +0200 use same idiom to define class method as in every other adapter. M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb commit c4dc0cf refs/heads/master Merge: abbf7bf 629bb0e Author: Yves Senn Date: 2014-08-19 11:49:08 +0200 Merge pull request #16552 from untidy-hair/update_plugin_guide [ci skip] Update plugin doc with the latest rails commit 0513d78 refs/heads/master Author: Jon Atack Date: 2014-08-19 10:22:43 +0200 4.2 Release Notes pass [skip ci] M guides/source/4_2_release_notes.md commit abbf7bf refs/heads/master Author: Akira Matsuda Date: 2014-08-19 15:12:57 +0900 http://gembundler.com/ => http://bundler.io/ M guides/source/development_dependencies_install.md commit e906840 refs/heads/master Merge: f2dda9f 4756569 Author: Zachary Scott Date: 2014-08-19 00:40:28 -0700 Merge pull request #16553 from tomkadwill/removed_word [ci skip] Removed unnecessary word from Getting Started commit 7a796b4 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-19 15:58:56 +0900 [ci skip] config.active_record.errors_in_transactional_callbacks -> config.active_record.raise_in_transactional_callbacks M activerecord/CHANGELOG.md commit 06b185c refs/remotes/origin/4-1-stable Author: Abdelkader Boudih Date: 2014-08-14 10:50:46 +0000 Make ActionMailer::Previews methods class methods. Conflicts: actionmailer/CHANGELOG.md M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/preview.rb commit 4756569 refs/heads/master Author: Tom Kadwill Date: 2014-08-19 07:46:58 +0100 Removed unnecessary word M guides/source/getting_started.md commit f2dda9f refs/heads/master Author: Godfrey Chan Date: 2014-08-18 22:22:46 -0700 Sync Action Mailer release notes [ci skip] M guides/source/4_2_release_notes.md commit b082418 refs/heads/master Author: Godfrey Chan Date: 2014-08-18 21:50:59 -0700 Sync Action View release notes [ci skip] M guides/source/4_2_release_notes.md commit 96b58bb refs/heads/master Author: Godfrey Chan Date: 2014-08-18 21:36:45 -0700 Mention deprecation of assert_select and friends in the release notes [ci skip] M guides/source/4_2_release_notes.md commit 0d4d52a refs/heads/master Author: Godfrey Chan Date: 2014-08-18 21:32:17 -0700 Add missing require M actionpack/lib/action_dispatch/testing/assertions/tag.rb commit 629bb0e refs/heads/master Author: Yukio Mizuta Date: 2014-08-18 21:07:01 -0700 [ci skip] Update plugin doc with the latest rails M guides/source/plugins.md commit 79d8fb7 refs/heads/master Author: Sean Griffin Date: 2014-08-18 22:04:10 -0600 require 'test_help' -> require 'rails/test_help' M guides/source/upgrading_ruby_on_rails.md commit 3fcbbc8 refs/heads/master Author: Prem Sichanugrist Date: 2014-08-18 23:42:42 -0400 User `#to_hash` instead of calling `super` Ruby 1.9.3 does not implement Hash#to_h, so we can't call `super` on it. M actionpack/lib/action_controller/metal/strong_parameters.rb commit 3591dd5 refs/heads/master Author: Prem Sichanugrist Date: 2014-08-18 20:39:00 -0400 Fix failing test on several methods on Parameter * `each` * `each_pair` * `delete` * `select!` M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/accessors_test.rb M actionpack/test/controller/parameters/mutators_test.rb commit 0663e8f refs/heads/master Author: Prem Sichanugrist Date: 2014-08-18 17:02:56 -0400 Seperate Parameters accessors and mutators tests A actionpack/test/controller/parameters/accessors_test.rb A actionpack/test/controller/parameters/mutators_test.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 9704379 refs/heads/master Author: Prem Sichanugrist Date: 2014-07-25 16:23:38 -0400 Refactor code to reduce duplicate `self.class.new` M actionpack/lib/action_controller/metal/strong_parameters.rb commit bd7f471 refs/heads/master Author: Prem Sichanugrist Date: 2014-07-25 16:16:58 -0400 Add missing `Hash` methods to `AC::Parameters` This is to make sure that `permitted` status is maintained on the resulting object. I found these methods that needs to be redefined by looking for `self.class.new` in the code. * extract! * transform_keys * transform_values M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 5109740 refs/heads/master Author: Prem Sichanugrist Date: 2014-07-25 12:00:14 -0400 Make `AC::Params#to_h` return Hash with safe keys `ActionController::Parameters#to_h` now returns a `Hash` with unpermitted keys removed. This change is to reflect on a security concern where some method performed on an `ActionController::Parameters` may yield a `Hash` object which does not maintain `permitted?` status. If you would like to get a `Hash` with all the keys intact, duplicate and mark it as permitted before calling `#to_h`. params = ActionController::Parameters.new(name: 'Senjougahara Hitagi') params.to_h # => {} unsafe_params = params.dup.permit! unsafe_params.to_h # => {"name"=>"Senjougahara Hitagi"} safe_params = params.permit(:name) safe_params.to_h # => {"name"=>"Senjougahara Hitagi"} This change is consider a stopgap as we cannot chage the code to stop `ActionController::Parameters` to inherit from `HashWithIndifferentAccess` in the next minor release. Also, adding a CHANGELOG entry to mention that `ActionController::Parameters` will not inheriting from `HashWithIndifferentAccess` in the next major version. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit dfeeecd refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 21:12:42 -0300 Merge pull request #16542 from seamusabshere/numerify-pool-checkout-timeout-from-urls-4-1-stable Make sure :checkout_timeout and :dead_connection_timeout are numbers Conflicts: activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit e1f358d refs/remotes/origin/4-1-stable Merge: fdbfb4b cff9608 Author: Rafael Mendonça França Date: 2014-08-18 21:12:42 -0300 Merge pull request #16542 from seamusabshere/numerify-pool-checkout-timeout-from-urls-4-1-stable Make sure :checkout_timeout and :dead_connection_timeout are numbers commit 57cf426 refs/heads/master Merge: 6956dfc 0e0e0db Author: Rafael Mendonça França Date: 2014-08-18 21:09:28 -0300 Merge pull request #16550 from eileencodes/remove-unnecessary-to_s-from-add_constraints-method Remove to_s from reflection.type in add_constraints commit 0e0e0db refs/heads/master Author: eileencodes Date: 2014-08-18 20:02:51 -0400 Remove to_s from reflection.type in add_constraints The instance var is already saved as a string in the initialization method of AssociationReflection. See https://github.com/rails/rails/blob/master/activerecord/lib/active_record/reflection.rb#L273 M activerecord/lib/active_record/associations/association_scope.rb commit 6956dfc refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 20:46:35 -0300 Point to unreleased deprecated_sanitizer M Gemfile commit 5e6c45a refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 20:41:03 -0300 Removed warning M actionview/test/activerecord/controller_runtime_test.rb commit 9cb4d3e refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 20:20:41 -0300 Deprecate TagAssertion instead of removing M actionpack/CHANGELOG.md A actionpack/lib/action_dispatch/testing/assertions/tag.rb commit 79a05c4 refs/heads/master Merge: 321d4cb 98c3f55 Author: David Heinemeier Hansson Date: 2014-08-18 15:42:11 -0700 Merge pull request #16548 from arthurnn/fix_warn_message Fix after_commit warning message commit 98c3f55 refs/heads/master Author: Arthur Neves Date: 2014-08-18 18:41:25 -0400 Fix after_commit warning message M activerecord/lib/active_record/transactions.rb commit 20f7c76 refs/heads/master Author: Jon Atack Date: 2014-07-17 11:36:17 +0200 Grammar pass [ci skip] Add improvements from @eileencodes [skip ci] M activerecord/lib/active_record/associations.rb commit 321d4cb refs/heads/master Merge: 7aeca50 746ab3c Author: Zachary Scott Date: 2014-08-18 15:26:23 -0700 Merge pull request #16545 from jonatack/patch-9 Fix broken link to Upgrading Ruby on Rails Guide [ci skip] commit 746ab3c refs/heads/master Author: Jon Atack Date: 2014-08-18 20:51:06 +0200 Fix broken link to Upgrading Ruby on Rails Guide in the 4.2 Release Notes [skip ci] Change to link suggested by @zzak [skip ci] M guides/source/4_2_release_notes.md commit 7aeca50 refs/heads/master Author: Kassio Borges Date: 2014-08-18 18:18:34 -0300 Fixes the `Relation#exists?` to work with polymorphic associations. Fixes #15821. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb M activerecord/test/models/post.rb commit 986dee5 refs/heads/master Merge: 77de1d6 529282b Author: Rafael Mendonça França Date: 2014-08-18 17:29:10 -0300 Merge pull request #16547 from cristianbica/add-active-job-guide-links Add activejob guide to documents.yml [ci skip] commit 77de1d6 refs/heads/master Merge: abeaf51 68c643f Author: Jeremy Kemper Date: 2014-08-18 13:26:49 -0700 Merge pull request #16539 from seuros/activejob [ActiveJob] Add queue_name_prefix commit 529282b refs/heads/master Author: Cristian Bica Date: 2014-08-18 23:22:25 +0300 Add activejob guide to documents.yml [ci skip] M guides/source/documents.yaml commit fdbfb4b refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-08-18 17:05:11 -0300 Merge pull request #16546 from aditya-kapoor/remove-broken-link fix broken link to rails blog [ci skip] M guides/source/upgrading_ruby_on_rails.md commit abeaf51 refs/heads/master Merge: 879dde9 8644690 Author: Rafael Mendonça França Date: 2014-08-18 17:05:11 -0300 Merge pull request #16546 from aditya-kapoor/remove-broken-link fix broken link to rails blog [ci skip] commit 68c643f refs/heads/master Author: Abdelkader Boudih Date: 2014-08-18 08:17:36 +0000 [ActiveJob] Add queue_name_prefix so all queue are prefixed . We can split queues on a per environement basis as well as seggregate per application so we can split queues on a per env basis ActiveJob::Base.queue_name_prefix = 'foo' M activejob/lib/active_job/queue_name.rb M activejob/test/cases/queue_naming_test.rb commit 8644690 refs/heads/master Author: Aditya Kapoor Date: 2014-08-19 01:26:54 +0530 fix broken link [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 879dde9 refs/heads/master Merge: ec7a8b0 b11b1e8 Author: Godfrey Chan Date: 2014-08-18 12:20:36 -0700 Merge pull request #16537 from arthurnn/stop_swallowing_errors_2 Add option to stop swallowing errors on callbacks. commit ec7a8b0 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 16:14:01 -0300 Rack is released too M railties/lib/rails/generators/app_base.rb commit 6b32a4f refs/heads/master Author: Santiago Pastorino Date: 2014-08-18 16:10:58 -0300 Bump rack dependency M actionpack/actionpack.gemspec commit 8d0d051 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 16:04:45 -0300 Fix assertion to map the behaviour of the old sanitizer M actionview/test/template/sanitize_helper_test.rb commit 8292cdb refs/heads/master Author: Rafael Mendonça França Date: 2014-08-18 15:59:03 -0300 No need to point to arel and i18n master anymore M railties/lib/rails/generators/app_base.rb commit b11b1e8 refs/heads/master Author: Arthur Neves Date: 2014-08-18 00:34:20 -0400 Add option to stop swallowing errors on callbacks. Currently, Active Record will rescue any errors raised within after_rollback/after_create callbacks and print them to the logs. Next versions of rails will not rescue those errors anymore, and just bubble them up, as the other callbacks. This adds a opt-in flag to enable that behaviour, of not rescuing the errors. Example: # For not swallow errors in after_commit/after_rollback config.active_record.errors_in_transactional_callbacks = true [fixes #13460] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/helper.rb M activerecord/test/cases/transaction_callbacks_test.rb commit c9cd532 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-18 14:00:32 -0300 Use the released beta of i18n M Gemfile M activesupport/activesupport.gemspec commit d424df0 refs/heads/master Author: Godfrey Chan Date: 2014-08-18 10:07:56 -0700 :nail_care: [ci skip] M guides/source/4_2_release_notes.md commit be69024 refs/heads/master Author: Godfrey Chan Date: 2014-08-18 10:06:00 -0700 Sync action pack release notes [ci skip] M guides/source/4_2_release_notes.md commit 306dc1a refs/heads/master Author: Rafael Mendonça França Date: 2014-08-06 21:17:19 -0300 Check attributes passed to create_with and where If the request parameters are passed to create_with and where they can be used to do mass assignment when used in combination with Relation#create. Fixes CVE-2014-3514 Conflicts: activerecord/lib/active_record/relation/query_methods.rb M activemodel/lib/active_model/forbidden_attributes_protection.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/forbidden_attributes_protection_test.rb commit 9c297ce refs/remotes/origin/4-1-stable Merge: 28c1a81 9bb7626 Author: Rafael Mendonça França Date: 2014-08-18 14:05:48 -0300 Merge branch '4-1-5' into 4-1-stable Conflicts: actionmailer/CHANGELOG.md actionview/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md commit d01651a36 refs/remotes/origin/4-0-stable Merge: ca152fc b792566 Author: Rafael Mendonça França Date: 2014-08-18 14:04:47 -0300 Merge branch '4-0-9' into 4-0-stable Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md commit 9bb7626 refs/tags/v4.1.5 (tag: v4.1.5) Author: Rafael Mendonça França Date: 2014-08-18 13:50:06 -0300 Preparing for 4.1.5 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 9456990 refs/tags/v4.1.5 Author: Rafael Mendonça França Date: 2014-08-06 21:17:19 -0300 Check attributes passed to create_with and where If the request parameters are passed to create_with and where they can be used to do mass assignment when used in combination with Relation#create. Fixes CVE-2014-3514 M activemodel/lib/active_model/forbidden_attributes_protection.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/forbidden_attributes_protection_test.rb commit b792566 refs/tags/v4.0.9 (tag: v4.0.9) Author: Rafael Mendonça França Date: 2014-08-18 13:46:51 -0300 Preparing for 4.0.9 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit e759b52 refs/heads/master Author: Godfrey Chan Date: 2014-08-18 09:46:28 -0700 Sync railties release notes [ci skip] M guides/source/4_2_release_notes.md commit d4d0018 refs/tags/v4.0.9 Author: Rafael Mendonça França Date: 2014-08-06 21:17:19 -0300 Check attributes passed to create_with and where If the request parameters are passed to create_with and where they can be used to do mass assignment when used in combination with Relation#create. Fixes CVE-2014-3514 M activemodel/lib/active_model/forbidden_attributes_protection.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/forbidden_attributes_protection_test.rb commit 7074981 refs/heads/master Merge: 6d92dcc 6fdf516 Author: Santiago Pastorino Date: 2014-08-18 11:29:58 -0300 Merge pull request #16528 from byroot/add-test-case-for-nested-array-in-where-conditions Add a test case of nested empty array values in conditions commit eb73d7d refs/heads/master Author: Robin Dupret Date: 2014-08-17 16:31:00 +0200 Define the Duration#instance_of? method Since Duration is extending from ProxyObject which extends itself from BasicObject, the Duration object doesn't respond to the #instance_of? method. Thus, the #method_missing hook get triggered, delegating the method to its `value` attribute. However, Rubinius' #eql? definition relies on #instance_of?, thus this will equal to true with a Fixnum (since its `value` attribute is a Fixnum) while it should not. The previous behavior was wrong anyway, no matter the implementation. M activesupport/CHANGELOG.md M activesupport/lib/active_support/duration.rb M activesupport/test/core_ext/duration_test.rb commit 6d92dcc refs/heads/master Author: Akira Matsuda Date: 2014-08-18 22:09:04 +0900 "warning: `*' interpreted as argument prefix" M activejob/lib/active_job/queue_adapters/backburner_adapter.rb M activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb M activejob/lib/active_job/queue_adapters/inline_adapter.rb M activejob/lib/active_job/queue_adapters/qu_adapter.rb M activejob/lib/active_job/queue_adapters/que_adapter.rb M activejob/lib/active_job/queue_adapters/queue_classic_adapter.rb M activejob/lib/active_job/queue_adapters/resque_adapter.rb M activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb M activejob/lib/active_job/queue_adapters/sneakers_adapter.rb M activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb commit cff9608 refs/remotes/origin/4-1-stable Author: Seamus Abshere Date: 2014-08-18 08:11:27 -0500 Just like :pool, make sure :checkout_timeout and :dead_connection_timeout are numbers Using #to_f instead of #to_i because they are specified in seconds instead of milliseconds M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit 3efe204 refs/heads/master Merge: b30b99c ff39a97 Author: Eileen M. Uchitelle Date: 2014-08-18 08:31:25 -0400 Merge pull request #16540 from jonatack/patch-9 Fix rails-html_sanitizer in Gemfile template commit ff39a97 refs/heads/master Author: Jon Atack Date: 2014-08-18 11:03:37 +0200 Fix rails-html_sanitizer in Gemfile template [skip ci] M railties/lib/rails/generators/rails/app/templates/Gemfile commit b30b99c refs/heads/master Author: Akira Matsuda Date: 2014-08-18 15:29:21 +0900 Expectations first M actionpack/test/controller/action_pack_assertions_test.rb M actionpack/test/controller/base_test.rb M actionpack/test/controller/url_for_test.rb M actionpack/test/dispatch/cookies_test.rb M actionpack/test/dispatch/debug_exceptions_test.rb M actionpack/test/dispatch/mime_type_test.rb M actionpack/test/dispatch/session/cookie_store_test.rb commit 87228a2 refs/heads/master Author: Akira Matsuda Date: 2014-08-18 13:50:01 +0900 Expectations first M activesupport/test/core_ext/string_ext_test.rb commit e9197ef refs/heads/master Merge: 8742bc9 2f9179b Author: Rafael Mendonça França Date: 2014-08-17 23:18:50 -0300 Merge pull request #16534 from lucasmazza/lm-fix-rescue-test Fix ActiveJob isolation tests. commit 2f9179b refs/heads/master Author: Lucas Mazza Date: 2014-08-17 23:16:34 -0300 Fix ActiveJob isolation tests. M activejob/test/cases/rescue_test.rb commit 8742bc9 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-17 23:02:27 -0300 No need to check model_name anymore M activemodel/lib/active_model/naming.rb commit d2d8098 refs/heads/master Merge: 76883f9 6b0e834 Author: Rafael Mendonça França Date: 2014-08-17 23:01:13 -0300 Merge pull request #15889 from carnesmedia/model-name Use #model_name on instances instead of classes commit 76883f9 refs/heads/master Merge: cdc00ab fdfc0fc Author: Rafael Mendonça França Date: 2014-08-17 22:57:21 -0300 Merge pull request #16062 from sgrif/sg-required-generators Add a `required` option to the model generator commit cdc00ab refs/heads/master Merge: cc9091c c78da4d Author: Rafael Mendonça França Date: 2014-08-17 22:51:13 -0300 Merge branch 'loofah' Conflicts: Gemfile commit cc9091c refs/heads/master Author: Rafael Mendonça França Date: 2014-08-17 22:50:06 -0300 Use released arel M Gemfile M activerecord/activerecord.gemspec commit 37a298d refs/heads/master Merge: 7ee0550 9ee64f0 Author: Rafael Mendonça França Date: 2014-08-17 22:47:52 -0300 Merge pull request #16533 from lucasmazza/lm-named-routes-helper Deprecate NamedRouteCollection#helpers. commit c78da4d refs/heads/master Merge: 4e49134 7ee0550 Author: Rafael Mendonça França Date: 2014-08-17 22:38:22 -0300 Merge branch 'master' into loofah Conflicts: actionpack/CHANGELOG.md commit 9ee64f0 refs/heads/master Author: Lucas Mazza Date: 2014-08-17 22:36:22 -0300 Deprecate NamedRouteCollection#helpers. This method was removed at 210b338db20b1cdd0684f40bd78b52ed16148b99 but it is used by third party gems to check if a named route was defined. To help on the upgrade path on 4.2.0 we bring it back and emit a deprecation warning. M actionpack/lib/action_dispatch/routing/route_set.rb commit 4e49134 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-17 22:33:51 -0300 Use the release gems and point application gemfile to right loofah M Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile commit 7ee0550 refs/heads/master Merge: eced6f8 ea3ba34 Author: David Heinemeier Hansson Date: 2014-08-17 18:12:52 -0700 Merge pull request #16481 from sgrif/sg-change-default-timestamps Change the default `null` value for timestamps commit eced6f8 refs/heads/master Merge: 6e6ebeb 91d1992 Author: Rafael Mendonça França Date: 2014-08-17 22:12:23 -0300 Merge pull request #16294 from bf4/code_tools Update, unify, encapsulate, and fix various code tools in Rails commit 2042598 refs/heads/master Merge: a240030 1e2ffe7 Author: Rafael Mendonça França Date: 2014-08-17 21:22:00 -0300 Merge pull request #16525 from kaspth/partial-release-prep Prepare for partial release. commit 6e6ebeb refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-17 16:57:57 -0700 Add CHANGELOG entry for #deliver_later M actionmailer/CHANGELOG.md commit 5d2de5c refs/heads/master Merge: c20c86e 49c9f85 Author: David Heinemeier Hansson Date: 2014-08-17 16:54:26 -0700 Merge branch 'master' of github.com:rails/rails commit 49c9f85 refs/heads/master Merge: b2708a6 080296b Author: David Heinemeier Hansson Date: 2014-08-17 16:44:30 -0700 Merge pull request #16485 from seuros/activejob Integrate ActiveJob / DeliverLater / GlobalID with Rails commit c20c86e refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-17 16:40:41 -0700 Dont encourage people to run without autoflush in production M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 080296b refs/heads/master Author: Abdelkader Boudih Date: 2014-08-17 23:17:38 +0000 [ActiveJob] require global_id/railtie M activejob/lib/active_job/railtie.rb commit b2708a6 refs/heads/master Merge: 8f15565 07ca1d3 Author: David Heinemeier Hansson Date: 2014-08-17 16:17:18 -0700 Merge pull request #16532 from gsamokovarov/lock-web-console-for-4.2.0.beta1 Lock web-console to 2.0.0.beta1 for the first 4.2 beta commit 3faa61e refs/heads/master Author: Cristian Bica Date: 2014-08-17 23:48:44 +0300 [ActiveJob] raise DeserializationError when got an error deserializing M activejob/lib/active_job/arguments.rb M activejob/test/cases/rescue_test.rb M activejob/test/jobs/rescue_job.rb M activejob/test/models/person.rb commit 9a34262 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-17 19:16:43 +0000 [ActiveJob] Add deserialize_arguments method to job M activejob/lib/active_job/execution.rb commit 931cfc4 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-17 13:23:24 +0000 [ActiveJob] Fix tests for sucker_punch M activejob/test/cases/job_serialization_test.rb M activejob/test/cases/logging_test.rb M activejob/test/cases/queuing_test.rb M activejob/test/cases/rescue_test.rb M activejob/test/helper.rb M activejob/test/jobs/gid_job.rb M activejob/test/jobs/hello_job.rb M activejob/test/jobs/rescue_job.rb commit 2f7b239 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-17 01:06:30 +0000 [ActiveJob] Use globalid gem M Gemfile M actionmailer/test/base_test.rb M activejob/README.md M activejob/activejob.gemspec M activejob/lib/active_job.rb M activejob/lib/active_job/arguments.rb M activejob/lib/active_job/enqueuing.rb M activejob/test/helper.rb M activejob/test/models/person.rb commit 59221cc refs/heads/master Author: Cristian Bica Date: 2014-08-16 15:49:03 +0300 [ActiveJob] make the resque-scheduler optional M activejob/lib/active_job/queue_adapters/resque_adapter.rb commit b06d919 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-15 10:11:58 +0000 [ActiveJob] remove ruby warnings M activejob/lib/active_job/enqueuing.rb M activejob/lib/active_job/execution.rb commit 3954fdf refs/heads/master Author: Abdelkader Boudih Date: 2014-08-15 10:04:06 +0000 [ActiveJob] Convert ActiveJob::Arguments into module M activejob/lib/active_job/arguments.rb commit fdc7dbc refs/heads/master Author: Abdelkader Boudih Date: 2014-08-15 09:50:45 +0000 [ActiveJob] require files in logging.rb M activejob/lib/active_job/logging.rb commit 299d1f2 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-14 23:47:38 +0000 [ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ActionMailer::DeliveryJob M actionmailer/lib/action_mailer.rb D actionmailer/lib/action_mailer/delayed_delivery_job.rb A actionmailer/lib/action_mailer/delivery_job.rb M actionmailer/lib/action_mailer/message_delivery.rb M actionmailer/test/message_delivery_test.rb commit 6a2ca14 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-14 23:33:40 +0000 [ActiveJob] Fix test syntax M actionmailer/test/message_delivery_test.rb commit 07ca1d3 refs/heads/master Author: Genadi Samokovarov Date: 2014-08-18 02:03:58 +0300 Lock web-console to 2.0.0.beta1 for the first 4.2 beta The console on exception code isn't available on the stable releases yet. Lock it for now, so the beta users get a sneak peak of the console features. M railties/lib/rails/generators/rails/app/templates/Gemfile commit 8f15565 refs/heads/master Merge: 9f6e82e e158ee5 Author: David Heinemeier Hansson Date: 2014-08-17 12:53:15 -0700 Merge branch 'master' of github.com:rails/rails commit 9f6e82e refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-17 12:52:54 -0700 Fix rounding errors with #travel_to by resetting the usec on any passed time to zero, so we only travel with per-second precision, not anything deeper than that. M activesupport/CHANGELOG.md M activesupport/lib/active_support/testing/time_helpers.rb M activesupport/test/test_test.rb commit e158ee5 refs/heads/master Author: Godfrey Chan Date: 2014-08-17 12:40:24 -0700 Use AS::JSON for (de)serializing cookies Use the Active Support JSON encoder for cookie jars using the `:json` or `:hybrid` serializer. This allows you to serialize custom Ruby objects into cookies by defining the `#as_json` hook on such objects. Fixes #16520. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb commit 393e19e refs/heads/master Author: Akira Matsuda Date: 2014-08-18 04:13:18 +0900 Preload UnicodeDatabase outside the loop This fixes random multibyte_chars_test fail under Ruby 1.9.3. I don't know why the tests fail. And I really don't know why this fixes. Maybe we need some more investigation... M activesupport/lib/active_support/multibyte/unicode.rb commit 80ceb0b refs/heads/master Author: Akira Matsuda Date: 2014-08-18 04:13:09 +0900 format M activesupport/lib/active_support/multibyte/unicode.rb commit a485633 refs/heads/master Author: Godfrey Chan Date: 2014-08-17 12:19:06 -0700 `responders` 1.x won't do it. Told you to RTFM for details! M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/test/controller/mime/responders_test.rb commit 28c1a81 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-08-17 11:59:46 -0700 Merge pull request #16458 from chancancode/ar_fix_reserved_inheritance Fixed issue w/custom accessors + reserved name + inheritance Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb commit a5e2d2e refs/heads/master Merge: b662273 2638d5c Author: Godfrey Chan Date: 2014-08-17 11:59:46 -0700 Merge pull request #16458 from chancancode/ar_fix_reserved_inheritance Fixed issue w/custom accessors + reserved name + inheritance Conflicts: activerecord/CHANGELOG.md commit b662273 refs/heads/master Author: Godfrey Chan Date: 2014-08-17 11:58:17 -0700 The gem is called 'responders' M actionpack/lib/action_controller/metal/mime_responds.rb D actionpack/test/controller/mime/responder_test.rb A actionpack/test/controller/mime/responders_test.rb commit 24226c5 refs/heads/master Author: Godfrey Chan Date: 2014-08-17 11:54:09 -0700 Raise a more helpful error for people who are using these extracted features M actionpack/lib/action_controller/metal/mime_responds.rb A actionpack/test/controller/mime/responder_test.rb commit 69ed422 refs/heads/master Author: Godfrey Chan Date: 2014-08-17 11:44:31 -0700 Fixed broken reference caused by 14965ba M actionpack/test/dispatch/cookies_test.rb commit 27c9a23 refs/heads/master Author: Jack Danger Canty Date: 2014-08-02 18:24:44 -0700 Updating Associations::Preloader docs Much of the previous documentation introduced features new in 2011. This commit refreshes it to provide clearer code examples and spends more time describing the normal case (preloaded associations) and less time describing the fallback. [ci skip] M activerecord/lib/active_record/associations/preloader.rb commit beff925 refs/heads/master Merge: 14965ba 29be3f5 Author: Godfrey Chan Date: 2014-08-17 11:23:14 -0700 Merge pull request #16467 from strzalek/cookies-digest-config-option2 Cookies digest config option (pt. 2) Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/middleware/cookies.rb commit 14965ba refs/heads/master Merge: bf5b696 1a6ca03 Author: Godfrey Chan Date: 2014-08-17 11:07:00 -0700 Merge pull request #16484 from strzalek/remove-redundant-null-serializer Remove redundant NullSerializer commit 1e2ffe7 refs/heads/master Author: Kasper Timm Hansen Date: 2014-08-16 21:16:24 +0200 Prepare for partial release. - Default to Rails::DeprecatedSanitizer in ActionView::Helpers::SanitizeHelper. - Add upgrade notes. - Add sanitizer to new applications Gemfiles. - Remove 'rails-dom-testing' as a dependency. M actionpack/CHANGELOG.md M actionpack/actionpack.gemspec M actionview/CHANGELOG.md M actionview/actionview.gemspec M actionview/lib/action_view/helpers/sanitize_helper.rb M guides/source/upgrading_ruby_on_rails.md M railties/lib/rails/generators/rails/app/templates/Gemfile commit bf5b696 refs/heads/master Merge: aee1ba4 57f5b00 Author: José Valim Date: 2014-08-17 13:21:28 -0400 Merge pull request #16526 from rails/jv-no-responders Move respond_with to the responders gem commit 57f5b00 refs/heads/master Author: José Valim Date: 2014-08-16 17:04:26 -0400 Remove more references to respond_with D actionpack/test/fixtures/respond_with/edit.html.erb D actionpack/test/fixtures/respond_with/new.html.erb D actionpack/test/fixtures/respond_with/respond_with_additional_params.html.erb D actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb D actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb D actionpack/test/fixtures/respond_with/using_resource.js.erb D actionpack/test/fixtures/respond_with/using_resource_with_block.html.erb M guides/source/caching_with_rails.md M guides/source/contributing_to_ruby_on_rails.md commit 2b0c602 refs/heads/master Author: José Valim Date: 2014-08-16 16:45:11 -0400 Remove usafe of respond_to in ActionView tests M actionview/test/activerecord/controller_runtime_test.rb commit ee77770 refs/heads/master Author: José Valim Date: 2014-08-16 16:24:08 -0400 Move respond_with to the responders gem respond_with (and consequently the class-level respond_to) are being removed from Rails. Instead of moving it to a 3rd library, the functionality will be moved to responders gem (at github.com/plataformatec/responders) which already provides some responders extensions. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/mime_responds.rb D actionpack/lib/action_controller/metal/responder.rb D actionpack/test/controller/mime/respond_with_test.rb commit aee1ba4 refs/heads/master Merge: eb714d4 2ba1670 Author: Zachary Scott Date: 2014-08-17 09:53:59 -0700 Merge pull request #16529 from y-yagi/patch-1 [ci skip] Fix sample code in Layouts and Rendering guide commit eb714d4 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-17 13:16:01 -0300 Allow usage of bundle local config for rack by specifying the branch [ci skip] M Gemfile commit 898bdc5 refs/heads/master Merge: a08ca4a 7a41295 Author: Matthew Draper Date: 2014-08-18 00:04:46 +0930 Merge pull request #16338 from robin850/rbx-safe-constantize Avoid relying on error messages when rescuing commit a08ca4a refs/heads/master Merge: d202706 6c96602 Author: Jeremy Kemper Date: 2014-08-17 06:59:03 -0700 Merge pull request #16527 from jeremy/etag_with_template_digest When your templates change, browser caches bust automatically. commit 6c96602 refs/heads/master Author: Jeremy Kemper Date: 2014-08-16 15:06:20 -0700 When your templates change, browser caches bust automatically. New default: the template digest is automatically included in your ETags. When you call `fresh_when @post`, the digest for `posts/show.html.erb` is mixed in so future changes to the HTML will blow HTTP caches for you. This makes it easy to HTTP-cache many more of your actions. If you render a different template, you can now pass the `:template` option to include its digest instead: fresh_when @post, template: 'widgets/show' Pass `template: false` to skip the lookup. To turn this off entirely, set: config.action_controller.etag_with_template_digest = false M actionpack/CHANGELOG.md M actionpack/lib/action_controller.rb M actionpack/lib/action_controller/base.rb M actionpack/lib/action_controller/metal/conditional_get.rb A actionpack/lib/action_controller/metal/etag_with_template_digest.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/controller/render_test.rb commit 2ba1670 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-17 22:42:03 +0900 [ci skip] Fix sample code in Layouts and Rendering guide M guides/source/layouts_and_rendering.md commit 6fdf516 refs/heads/master Author: Jean Boussier Date: 2014-08-17 07:55:42 -0400 Add a test case of nested empty array values in conditions Post.where(id: [[]]).to_a Used to fail with a SQL syntax error (until 4.1): SELECT ... WHERE id in (); It now properly generate: SELECT ... WHERE 1=0; M activerecord/test/cases/relation/where_test.rb commit d202706 refs/heads/master Merge: 88d27ae 008f3da Author: Godfrey Chan Date: 2014-08-16 23:09:33 -0700 Merge pull request #16189 from sgrif/sg-attribute-was-in-place Implement `_was` and `changes` for in-place mutations of AR attributes commit 008f3da refs/heads/master Author: Godfrey Chan Date: 2014-08-16 22:55:01 -0700 Don't expose these new APIs yet (added in 877ea78 / #16189) WARNING: don't use them! They might change or go away between future beta/RC/ patch releases! Also added a CHANGELOG entry for this. M activemodel/lib/active_model/dirty.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_association.rb commit 877ea78 refs/heads/master Author: Sean Griffin Date: 2014-07-12 18:30:49 -0600 Implement `_was` and `changes` for in-place mutations of AR attributes M activemodel/lib/active_model/dirty.rb M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/enum.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/dirty_test.rb commit 88d27ae refs/heads/master Merge: b97204c bc153cf Author: Rafael Mendonça França Date: 2014-08-16 14:29:16 -0300 Merge pull request #16517 from sgrif/sg-comparable-attributes Implement `==` on `Type::Value` and `Attribute` commit b97204c refs/heads/master Merge: cc9d1c5 5e0f9e4 Author: Rafael Mendonça França Date: 2014-08-16 14:26:28 -0300 Merge pull request #16523 from tomkadwill/cookie_store_rewording [ci skip] re-worded section on CookieStore to make it more readable. commit 5e0f9e4 refs/heads/master Author: Tom Kadwill Date: 2014-08-16 17:10:40 +0100 [ci skip] re-worded section on CookieStore to make it more readable. M guides/source/security.md commit cf75464 refs/heads/master Author: Cristian Bica Date: 2014-08-16 15:28:09 +0300 ActiveJob guides improvements [ci skip] M guides/source/active_job_basics.md commit bc70448 refs/heads/master Author: Juanito Fatas Date: 2014-08-16 15:45:36 +0800 [ci skip] Update links in getting_started guide. M guides/source/getting_started.md commit cc9d1c5 refs/heads/master Author: Akira Matsuda Date: 2014-08-16 10:19:42 +0900 Avoid mutating the constants in a test case M activesupport/test/multibyte_chars_test.rb M activesupport/test/multibyte_test_helpers.rb commit 5643cac refs/heads/master Author: Akira Matsuda Date: 2014-08-16 07:51:13 +0900 Avoid polluting String class globally in a test case M activesupport/test/multibyte_chars_test.rb commit de2fab5 refs/heads/master Author: Akira Matsuda Date: 2014-08-16 07:29:19 +0900 Unused ivar in a test suite M activesupport/test/multibyte_chars_test.rb commit b2cabb7 refs/heads/master Author: Cristian Bica Date: 2014-08-16 01:31:39 +0300 Added docs for AJ::Callbacks; Added AJ to docs build map M activejob/lib/active_job/callbacks.rb M railties/lib/rails/api/task.rb commit 0e4e496 refs/heads/master Author: Cristian Bica Date: 2014-08-16 00:30:20 +0300 Fixed indentation M actionmailer/lib/action_mailer/base.rb commit 788aee5 refs/heads/master Author: Cristian Bica Date: 2014-08-16 00:02:06 +0300 Moved AR testing from using global variable to thread variable M activejob/test/cases/job_serialization_test.rb M activejob/test/cases/logging_test.rb M activejob/test/cases/queuing_test.rb M activejob/test/cases/rescue_test.rb M activejob/test/jobs/gid_job.rb M activejob/test/jobs/hello_job.rb M activejob/test/jobs/rescue_job.rb commit c2f1eca refs/heads/master Author: Cristian Bica Date: 2014-08-15 23:35:06 +0300 Suggest the perform method can take arguments when generating an ActiveJob job M activejob/lib/rails/generators/job/templates/job.rb commit 94ae25e refs/heads/master Author: Cristian Bica Date: 2014-08-15 23:32:08 +0300 ActiveJob: Reworked queue_base_name as default_queue_name + Allow configure ActiveJob from app.config.active_job M activejob/lib/active_job/queue_name.rb M activejob/lib/active_job/railtie.rb M activejob/test/cases/queue_naming_test.rb M guides/source/active_job_basics.md commit 2faacbd refs/heads/master Merge: a59b9e2 2e90fe7 Author: Godfrey Chan Date: 2014-08-15 13:23:55 -0700 Merge pull request #16435 from arthurnn/after_commit_run_on_top_level_trans_master Fix regression on after_commit in nested transactions. (master) commit e034ac3 refs/heads/master Author: Cristian Bica Date: 2014-08-15 23:20:55 +0300 Removed method missing from ActionMailer::MessageDelivery M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/message_delivery.rb commit 2e90fe7 refs/heads/master Author: Arthur Neves Date: 2014-08-08 15:46:00 -0400 Fix regression on after_commit in nested transactions. after_commit should not run in nested transactions, however they should run once the outermost transaction gets committed. This patch fixes the problem copying the records from the Savepoint to its parent. So the RealTransaction will have all records that needs to run callbacks on it. [fixes #16425] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transaction_callbacks_test.rb commit 0002954 refs/heads/master Author: Arthur Neves Date: 2014-08-08 15:37:38 -0400 Use *_transaction methods in TransactionManager Use `commit_transaction`/`rollback_transaction` on `within_new_transaction` method, so they make sure they `pop` the transaction from the stack before calling the methods `commit`/`rollback`. M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transactions_test.rb commit bc153cf refs/heads/master Author: Sean Griffin Date: 2014-08-15 13:37:53 -0600 Implement `==` on `Type::Value` and `Attribute` This was a small self contained piece of the refactoring that I am working on, which required these objects to be comparable. M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/type/value.rb M activerecord/test/cases/attribute_test.rb M activerecord/test/cases/types_test.rb commit 151e5b6 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-08-15 10:43:55 -0300 Point to rubygems instead of Rails GitHub. [ci skip] The rails repository is not the official plugin anymore M guides/source/security.md commit deb0e17 refs/remotes/origin/4-1-stable Author: Arun Agrawal Date: 2014-08-15 15:43:21 +0200 Fixed link for in_place_editor [ci skip] closes #16512 M guides/source/security.md commit a59b9e2 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-15 10:43:55 -0300 Point to rubygems instead of Rails GitHub. [ci skip] The rails repository is not the official plugin anymore M guides/source/security.md commit 967a2ff refs/heads/master Author: Arun Agrawal Date: 2014-08-15 15:43:21 +0200 Fixed link for in_place_editor [ci skip] closes #16512 M guides/source/security.md commit 9ab12cb refs/remotes/origin/4-1-stable Merge: a075ef3 5c1a362 Author: Santiago Pastorino Date: 2014-08-15 10:08:12 -0300 Merge pull request #16503 from bogdan/where-hash-nested-relation-4-1-stable Fixed AR::Relation#where edge case with Hash and other Relation commit 60b2d29 refs/heads/master Author: Yves Senn Date: 2014-08-15 14:17:56 +0200 fix typo in method name (broken build :sweat:) M activerecord/test/cases/attribute_methods_test.rb commit 78f2ee5 refs/heads/master Author: Yves Senn Date: 2014-08-15 14:13:11 +0200 prefer `has_attribute?` over `attributes.key?`. Follow up to the discussion on #16505. M activerecord/test/cases/attribute_methods_test.rb commit c595a4f refs/heads/master Merge: 4954de6 a3ee030 Author: Yves Senn Date: 2014-08-15 14:09:48 +0200 Merge pull request #16505 from sgrif/sg-attribute-internals Use the method for determining attribute methods rather than duplicating commit a3ee030 refs/heads/master Author: Sean Griffin Date: 2014-08-14 12:43:57 -0600 Use the method for determining attribute methods rather than duplicating I've been trying to reduce the number of places that care about `attributes`, and its existence. We have a method for this check, let's use it instead. M activerecord/lib/active_record/timestamp.rb commit 4954de6 refs/heads/master Author: Akira Matsuda Date: 2014-08-15 20:10:42 +0900 create_table + transactional_fixtures = :bomb: M activerecord/test/cases/schema_dumper_test.rb commit a075ef3 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-08-15 10:03:17 +0200 unify CHANGELOG format. M activerecord/CHANGELOG.md commit 127749c refs/remotes/origin/4-1-stable Merge: 1211159 257d65e Author: Yves Senn Date: 2014-08-15 10:01:31 +0200 Merge pull request #16403 from Peeja/baseclass-becomes-subclass-for-4-1 Backport "Fix Baseclass becomes! subclass." for 4.1 Conflicts: activerecord/CHANGELOG.md commit 2cc1a64 refs/heads/master Author: Akira Matsuda Date: 2014-08-15 13:59:05 +0900 s/Dont'/Don't/ M railties/lib/rails/generators/rails/controller/controller_generator.rb commit f84f7eb refs/heads/master Merge: 4751a8c 20f32bb Author: Sean Griffin Date: 2014-08-14 19:48:14 -0600 Merge pull request #16508 from jbsmith86/master Spelling errors commit 20f32bb refs/heads/master Author: jbsmith86 Date: 2014-08-14 17:46:50 -0700 Spelling errors M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb commit 8147e22 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-14 22:54:56 +0000 Update resque_adapter.rb M activejob/lib/active_job/queue_adapters/resque_adapter.rb commit 4751a8c refs/heads/master Merge: c8ede23 4d47220 Author: Aaron Patterson Date: 2014-08-14 10:51:28 -0700 Merge pull request #16504 from schneems/schneems/fix_url_for Perf optimization for `url_for` called w/ Hash commit 4d47220 refs/heads/master Author: schneems Date: 2014-08-14 12:29:25 -0500 Perf optimization for `url_for` called w/ Hash Benchmarking the existing code: ```ruby { :only_path => options[:host].nil? }.merge!(options.symbolize_keys)) ``` Against optimized code, that does not require a new hash or a merge: ```ruby options = options.symbolize_keys options[:only_path] = options[:host].nil? unless options.key?(:only_path) options ``` We see a statistically significant performance gain: ![](https://www.dropbox.com/s/onocpc0zfw4kjxl/Screenshot%202014-08-14%2012.45.30.png?dl=1) Updated to not mutate incoming parameters M actionview/lib/action_view/routing_url_for.rb commit c8ede23 refs/heads/master Author: Akira Matsuda Date: 2014-08-15 02:41:17 +0900 Ignore MySQL "SHOW VARIABLES" when counting queries M activerecord/test/cases/test_case.rb commit 6c51cc8 refs/heads/master Author: Aaron Patterson Date: 2014-08-14 10:23:14 -0700 extract methods and metaprogram less. M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit cf38bda refs/heads/master Author: Akira Matsuda Date: 2014-08-15 01:27:50 +0900 Be sure to reset PK name renamed in the test M activerecord/test/cases/migration/columns_test.rb commit fdd4b73 refs/heads/master Author: Zachary Scott Date: 2014-08-14 08:57:19 -0700 Use string for order argument, fixed from #16501 [ci skip] M activerecord/lib/active_record/associations.rb commit b131978 refs/heads/master Merge: 9a7d762 006225b Author: Zachary Scott Date: 2014-08-14 08:56:14 -0700 Merge pull request #16501 from tomkadwill/update_delete_to_new_style [ci skip] updated 'where' in association documention to new style syntax commit 5c1a362 refs/remotes/origin/4-1-stable Author: Bogdan Gusiev Date: 2014-08-14 13:44:29 +0300 Fixed AR::Relation#where edge case with Hash and other Relation Example: Author.where(posts: { author_id: Author.where(country_id: 1) }).joins(:posts) Conflicts: activerecord/lib/active_record/relation/query_methods.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_test.rb commit 9a7d762 refs/heads/master Author: Akira Matsuda Date: 2014-08-15 00:08:47 +0900 Warm up Symbols with where method Looks like #first wasn't warm enough... M activerecord/test/cases/finder_test.rb commit 71e8f19 refs/heads/master Merge: dfc3f88 fe67dfb Author: Santiago Pastorino Date: 2014-08-14 11:08:25 -0300 Merge pull request #16502 from bogdan/where-hash-nested-relation [Regression 4.0 -> 4.1] Fixed AR::Relation#where edge case with Hash and other Relation commit dfc3f88 refs/heads/master Merge: b5c4c50 8b02832 Author: Jeremy Kemper Date: 2014-08-14 06:46:17 -0700 Merge pull request #16438 from agrobbin/input-placeholder-i18n Add I18n support for `:placeholder` HTML option is passed to form fields commit 7a1dcfc refs/heads/master Author: Cristian Bica Date: 2014-08-14 14:52:02 +0300 Added ActiveJob configuration for travis M .travis.yml M ci/travis.rb commit 18303f6 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-13 21:50:38 +0000 Refactor DeliverLater into MessageDelivery M actionmailer/lib/action_mailer.rb M actionmailer/lib/action_mailer/base.rb A actionmailer/lib/action_mailer/delayed_delivery_job.rb D actionmailer/lib/action_mailer/deliver_later.rb D actionmailer/lib/action_mailer/deliver_later/job.rb D actionmailer/lib/action_mailer/deliver_later/mail_message_wrapper.rb A actionmailer/lib/action_mailer/message_delivery.rb M actionmailer/test/base_test.rb D actionmailer/test/deliver_later_test.rb A actionmailer/test/message_delivery_test.rb commit b937ea8 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-14 10:50:46 +0000 Make ActionMailer::Previews methods class methods. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/preview.rb commit fe67dfb refs/heads/master Author: Bogdan Gusiev Date: 2014-08-14 13:44:29 +0300 Fixed AR::Relation#where edge case with Hash and other Relation Example: Author.where(posts: { author_id: Author.where(country_id: 1) }).joins(:posts) M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_test.rb commit b5c4c50 refs/heads/master Author: Akira Matsuda Date: 2014-08-14 19:15:58 +0900 Ignore SCHEMA queries in some habtm tests M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 76b5878 refs/heads/master Merge: 76ea9f9 b892d20 Author: Yves Senn Date: 2014-08-14 12:11:44 +0200 Merge pull request #8813 from greyblake/dont_write_timestamps_if_they_are_not_attributes Write timestamps only if there are timestamps columns Conflicts: activerecord/CHANGELOG.md commit 006225b refs/heads/master Author: Tom Kadwill Date: 2014-08-14 09:05:10 +0100 [ci skip] updated 'where' in association documention to new style syntax M activerecord/lib/active_record/associations.rb commit 76ea9f9 refs/heads/master Author: Akira Matsuda Date: 2014-08-14 17:08:20 +0900 Make sure that fixtures are loaded before finding M activerecord/test/cases/scoping/relation_scoping_test.rb commit 4bb823b refs/heads/master Author: Akira Matsuda Date: 2014-08-14 16:37:08 +0900 Format M activerecord/test/cases/scoping/relation_scoping_test.rb commit 37cae67 refs/heads/master Author: Yves Senn Date: 2014-08-14 10:00:22 +0200 ಠ_ಠ now that the commit sha is known I can add it to the relese guide. M guides/source/4_2_release_notes.md commit a1ddde1 refs/heads/master Author: Yves Senn Date: 2014-08-14 09:35:32 +0200 remove deprecated `MissingHelperError` proxy. The error was moved outside of the `ClassMethods` module. M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/helpers.rb M guides/source/4_2_release_notes.md commit e76379b refs/heads/master Author: Akira Matsuda Date: 2014-08-14 16:10:29 +0900 Clear validators before and after each test Or some tests fail when run in random order M activerecord/test/cases/validations/i18n_validation_test.rb M activerecord/test/cases/validations_repair_helper.rb commit 9c91c16 refs/heads/master Merge: 43ce6e2 b1ba333 Author: Yves Senn Date: 2014-08-14 08:38:35 +0200 Merge pull request #16027 from tgxworld/template_assertions Fixes to ActionController::TemplateAssertions commit 43ce6e2 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:47:26 -0700 ask the scope object if it is a resource_method_scope M actionpack/lib/action_dispatch/routing/mapper.rb commit e4cb381 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:44:05 -0700 ask the scope for the action name M actionpack/lib/action_dispatch/routing/mapper.rb commit 374d66b refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:40:57 -0700 reduce calls to scope_level this will help us to encapsulate magical symbols so hopefully we can eliminate hardcoded magic symbols M actionpack/lib/action_dispatch/routing/mapper.rb commit 047af8d refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:29:39 -0700 change to attr_reader M actionpack/lib/action_dispatch/routing/mapper.rb commit 677bc21 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:29:24 -0700 scope_level is no longer a hash key, just use the ivar M actionpack/lib/action_dispatch/routing/mapper.rb commit 19bb677 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:24:40 -0700 move the scope level key fully inside the scope object M actionpack/lib/action_dispatch/routing/mapper.rb commit 911ef97 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:22:30 -0700 move scope_level to a method on the scope object now we don't have to have a hard coded key M actionpack/lib/action_dispatch/routing/mapper.rb commit 2440933 refs/heads/master Author: Akira Matsuda Date: 2014-08-14 11:21:15 +0900 Finally! None of our tests are order_dependent! M activerecord/test/cases/helper.rb commit 0127f02 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 19:13:58 -0700 only look up scope level once avoid hash lookups and remove depency on the instance M actionpack/lib/action_dispatch/routing/mapper.rb commit 91608dc refs/heads/master Author: Aaron Patterson Date: 2014-08-13 18:47:16 -0700 only test `prefix` once we don't need to repeat if statements M actionpack/lib/action_dispatch/routing/mapper.rb commit 318eea0 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 18:42:26 -0700 pass consistent parameters to canonical_action? now we only have to look up @scope[:scope_level] once per call to canonical_action? and we don't have a variable named "flag" M actionpack/lib/action_dispatch/routing/mapper.rb commit 3b908cb refs/heads/master Author: Aaron Patterson Date: 2014-08-13 18:34:21 -0700 fewer operations on the options hash since we pass `as` down, then we won't have to do an insert / delete dance with the options hash M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/mapper_test.rb commit d4981c3 refs/heads/master Author: Aaron Patterson Date: 2014-08-13 14:31:55 -0700 this should be accessing the hash, not calling a method M actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.text.erb commit efb835c refs/heads/master Author: Aaron Patterson Date: 2014-08-13 14:22:29 -0700 UnexpectedErrors may reference exceptions that can't be dumped UnexpectedError exceptions wrap the original exception, and the original exception may contain a reference to something that can't be marshal dumped which will cause the process to die. M actionpack/test/abstract_unit.rb commit 1a6ca03 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-08-13 22:51:53 +0200 Remove redundant NullSerializer Use one from ActiveSupport::MessageEncryptor module. M actionpack/lib/action_dispatch/middleware/cookies.rb commit c6af3ba refs/heads/master Merge: 2750cc4 32e1848 Author: Zachary Scott Date: 2014-08-13 14:07:25 -0700 Merge pull request #16408 from aditya-kapoor/add-doc-ERB-escape [ci skip] add note about the ERB escape in generator docs commit 32e1848 refs/heads/master Author: Aditya Kapoor Date: 2014-08-14 02:33:35 +0530 [ci skip] add note about the ERB escape in generator docs M guides/source/generators.md commit b649671 refs/heads/master Author: Cristian Bica Date: 2014-08-13 23:05:21 +0300 Update ActiveJob guide [ci skip] M guides/source/active_job_basics.md commit 06908e6 refs/heads/master Merge: 95b79c1 2750cc4 Author: Cristian Bica Date: 2014-08-13 22:55:32 +0300 Merge branch 'master' into activejob commit 95b79c1 refs/heads/master Author: Cristian Bica Date: 2014-08-13 13:10:59 +0300 [ci skip] First version of the Active Job guide A guides/source/active_job_basics.md commit c39ea40 refs/heads/master Author: Vipul A M Date: 2014-08-13 23:38:29 +0530 `overriden` => `overridden` M activerecord/lib/active_record/type/value.rb commit 2750cc4 refs/heads/master Merge: 1a299b6 2c87145 Author: Santiago Pastorino Date: 2014-08-13 15:02:31 -0300 Merge pull request #16493 from aditya-kapoor/correct-cache-store-doc [ci skip] correct default cache store class commit 1a299b6 refs/heads/master Author: Akira Matsuda Date: 2014-08-14 01:06:34 +0900 Missing ActiveSupport require for calling String#first M actionview/lib/action_view/helpers/translation_helper.rb commit b1ba333 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-02 15:36:23 -0700 Fix assert_template for files. The test was not failing for `assert_template file: nil` when a file has been rendered. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb commit 838e183 refs/heads/master Author: Jeremy McNevin Date: 2014-07-30 14:10:28 -0500 Correctly determine if migration is needed. This method would assume that if last migration in the migrations directory matched the current schema version, that the database was up to date, but this does not account for new migrations with older timestamps that may be pending. M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb commit e9ce987 refs/heads/master Author: Yves Senn Date: 2014-08-13 16:00:19 +0200 use :test delivery method for `base_test.rb` This solves errors like: ``` BaseTest#test_you_can_register_multiple_observers_to_the_mail_object_that_both_get_informed_on_email_delivery: Errno::ECONNREFUSED: Connection refused - connect(2) for "localhost" port 25 /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `initialize' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `open' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:541:in `tcp_socket' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:551:in `block in do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:91:in `block in timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `call' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/timeout.rb:101:in `timeout' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:550:in `do_start' /Users/senny/.rbenv/versions/2.1.2/lib/ruby/2.1.0/net/smtp.rb:520:in `start' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/network/delivery_methods/smtp.rb:112:in `deliver!' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:2136:in `do_delivery' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `block in deliver' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:528:in `block in deliver_mail' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `block in instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications/instrumenter.rb:20:in `instrument' /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:164:in `instrument' /Users/senny/Projects/rails/actionmailer/lib/action_mailer/base.rb:526:in `deliver_mail' /Users/senny/Projects/rails/.bundle/gems/mail-2.6.1/lib/mail/message.rb:232:in `deliver' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:598:in `block (2 levels) in ' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:801:in `mail_side_effects' /Users/senny/Projects/rails/actionmailer/test/base_test.rb:593:in `block in ' ``` where the `:smtp` delivery method was leaked over to other test cases. M actionmailer/test/abstract_unit.rb M actionmailer/test/base_test.rb commit 9b20960 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-13 12:57:23 +0000 Clean adapter_test.rb and skip test for sidekiq in unsupported rubies M Gemfile M activejob/test/cases/adapter_test.rb M activejob/test/helper.rb commit 2ef0d3b refs/heads/master Author: Akira Matsuda Date: 2014-08-13 22:29:30 +0900 actionmailer_tests_are_order_dependent! M actionmailer/test/abstract_unit.rb commit 2c87145 refs/heads/master Author: Aditya Kapoor Date: 2014-08-13 18:56:03 +0530 [ci skip] correct default cache store class M actionpack/lib/action_controller/caching.rb commit 80cee18 refs/heads/master Merge: bf0a679 12ce5b1 Author: Yves Senn Date: 2014-08-13 14:42:51 +0200 Merge pull request #16491 from akshay-vishnoi/doc-changes [ci skip] fix spelling of overridden commit bf0a679 refs/heads/master Author: Akira Matsuda Date: 2014-08-13 21:21:22 +0900 Railties tests are order_independent! Hopefully. M railties/test/abstract_unit.rb commit 655c2c8 refs/heads/master Author: Akira Matsuda Date: 2014-08-13 20:59:31 +0900 Fix Railties tests that were order dependent M railties/test/generators_test.rb commit cbde413 refs/heads/master Author: Akira Matsuda Date: 2014-08-13 19:44:50 +0900 AS tests are now order_independent! M activesupport/test/abstract_unit.rb commit 6e440a0 refs/heads/master Author: Akira Matsuda Date: 2014-08-13 19:37:12 +0900 Reset ActiveSupport::Dependencies.mechanism to make tests order independent M activesupport/test/dependencies_test.rb commit fe873df refs/heads/master Author: Akira Matsuda Date: 2014-08-13 19:08:50 +0900 Duplicated method in the test helper M activesupport/test/dependencies_test.rb commit bc116a5 refs/heads/master Author: Akira Matsuda Date: 2014-08-13 18:26:41 +0900 AM, AP, AV, and AMo tests are already order_independent! M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionview/test/abstract_unit.rb M activemodel/test/cases/helper.rb commit 67f8b6b refs/heads/master Author: Abdelkader Boudih Date: 2014-08-12 18:24:19 +0000 Added ActionMailer::DeliverLater M actionmailer/lib/action_mailer.rb M actionmailer/lib/action_mailer/base.rb A actionmailer/lib/action_mailer/deliver_later.rb A actionmailer/lib/action_mailer/deliver_later/job.rb A actionmailer/lib/action_mailer/deliver_later/mail_message_wrapper.rb A actionmailer/test/deliver_later_test.rb A actionmailer/test/mailers/delayed_mailer.rb M activejob/lib/active_job.rb M activejob/lib/active_job/logging.rb D activejob/lib/activejob.rb M activejob/test/helper.rb commit 12ce5b1 refs/heads/master Author: Akshay Vishnoi Date: 2014-08-13 16:47:28 +0530 [ci skip] fix spelling of override M actionpack/test/dispatch/request_test.rb M activerecord/lib/active_record/type/value.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit ca152fc refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-08-13 11:50:38 +0200 Merge pull request #16489 from tomkadwill/updating_options_to_new_style [ci skip] Updated where scope documentation to conform to new style M activerecord/lib/active_record/associations.rb commit 1211159 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-08-13 11:50:38 +0200 Merge pull request #16489 from tomkadwill/updating_options_to_new_style [ci skip] Updated where scope documentation to conform to new style M activerecord/lib/active_record/associations.rb commit cbb94a3 refs/heads/master Merge: ecfce56 8f4e24c Author: Yves Senn Date: 2014-08-13 11:50:38 +0200 Merge pull request #16489 from tomkadwill/updating_options_to_new_style [ci skip] Updated where scope documentation to conform to new style commit ecfce56 refs/heads/master Author: Yves Senn Date: 2014-08-13 11:44:58 +0200 `index_exists?` with `:name` checks specified columns. [Yves Senn & Matthew Draper] The column check was embodied in the defaul index name. If the :name option was used, the specified columns were not verified at all. Given: ``` assert connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_yo_momma) ``` That index could have been defined on any field, not necessarily on `:foo_id`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration/index_test.rb commit 8f4e24c refs/heads/master Author: Tom Kadwill Date: 2014-08-13 07:36:43 +0100 [ci skip] Updated where scope to conform to new style M activerecord/lib/active_record/associations.rb commit b494e94 refs/heads/master Author: Jay Shepherd Date: 2014-08-12 23:32:25 -0400 Small grammar fix in pluck description M guides/source/active_record_querying.md commit 8b02832 refs/heads/master Author: Alex Robbin Date: 2014-08-09 00:10:54 -0400 add I18n support for `:placeholder` HTML option is passed to form fields M actionview/CHANGELOG.md A actionview/lib/action_view/helpers/tags/placeholderable.rb M actionview/lib/action_view/helpers/tags/text_area.rb M actionview/lib/action_view/helpers/tags/text_field.rb M actionview/test/template/form_helper_test.rb commit 1cbeb61 refs/remotes/origin/4-1-stable Author: Yasuo Honda Date: 2014-08-13 09:41:06 +0900 Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode" This reverts commit babc24c1b07c1fd58b9b3249b0256f9b0d45c0f0. Conflicts: activerecord/test/cases/adapters/mysql/connection_test.rb activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit ea3ba34 refs/heads/master Author: Sean Griffin Date: 2014-08-12 14:23:14 -0600 Change the default `null` value for timestamps As per discussion, this changes the model generators to specify `null: false` for timestamp columns. A warning is now emitted if `timestamps` is called without a `null` option specified, so we can safely change the behavior when no option is specified in Rails 5. M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb M activerecord/test/cases/adapters/postgresql/timestamp_test.rb M activerecord/test/cases/ar_schema_test.rb M activerecord/test/cases/migration/change_schema_test.rb M activerecord/test/cases/migration/change_table_test.rb M activerecord/test/cases/migration/helper.rb M activerecord/test/cases/migration_test.rb M activerecord/test/schema/schema.rb M railties/test/generators/model_generator_test.rb commit 29be3f5 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-08-12 21:57:51 +0200 Add config option for cookies digest You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = 'SHA256' M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb M activesupport/lib/active_support/message_encryptor.rb M railties/lib/rails/application.rb commit a240030 refs/heads/master Merge: 045d717 82e2849 Author: Rafael Mendonça França Date: 2014-08-12 11:10:42 -0300 Merge branch 'master' into loofah Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/integration_test.rb actionview/CHANGELOG.md commit 82e2849 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-12 10:59:09 -0300 :bomb: M activerecord/test/cases/helper.rb commit cee28d0 refs/heads/master Merge: e81f3c2 51a759a Author: Rafael Mendonça França Date: 2014-08-12 10:58:00 -0300 Merge pull request #16476 from akshay-vishnoi/doc-changes [ci skip] use "based on" or "based off of" commit e81f3c2 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-12 10:51:41 -0300 Nobody sucks so nobody should call this awful method name M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionview/test/abstract_unit.rb M activemodel/test/cases/helper.rb M activerecord/test/cases/helper.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/test_case.rb M activesupport/test/abstract_unit.rb M railties/test/abstract_unit.rb commit 51a759a refs/heads/master Author: Akshay Vishnoi Date: 2014-08-12 18:40:14 +0530 use 'based on' instead of 'based off' [ci skip] M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/middleware/request_id.rb commit 22ee993 refs/heads/master Author: Cristian Bica Date: 2014-08-12 15:57:57 +0300 Modified activejob.gemspec to match other rails gems format M activejob/activejob.gemspec commit 7c84dfb refs/heads/master Author: Cristian Bica Date: 2014-08-12 15:43:43 +0300 Update activejob's README M activejob/README.md commit 2e2d9f9 refs/heads/master Author: Cristian Bica Date: 2014-08-12 15:37:18 +0300 Added activejob to install.rb M install.rb commit 9424b48 refs/heads/master Author: Akira Matsuda Date: 2014-08-12 19:52:34 +0900 CHANGELOG entry for TestCase.i_suck_and_my_tests_are_order_dependent! fix M activesupport/CHANGELOG.md commit 3ed69cd refs/heads/master Author: Cristian Bica Date: 2014-08-12 13:53:46 +0300 Fixed failing tests; Load active_job in railtie; Renamed generator to job M activejob/lib/active_job/railtie.rb D activejob/lib/rails/generators/active_job/job_generator.rb D activejob/lib/rails/generators/active_job/templates/job.rb A activejob/lib/rails/generators/job/job_generator.rb A activejob/lib/rails/generators/job/templates/job.rb M activejob/test/cases/logging_test.rb M activejob/test/cases/queue_naming_test.rb commit 9074589 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-12 07:48:59 -0300 Remove old setup from AS test case This was added back in Rails 3 on c4a6109286909c394e8c5bfc471a1eb9de245d2b, and is not being used anymore. M activesupport/lib/active_support/test_case.rb commit 6ffb29d refs/heads/master Author: Akira Matsuda Date: 2014-08-12 19:30:05 +0900 users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent! Calling ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent! in AS::TestCase makes everyone's tests order dependent, which should never be done by the framework. M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionview/test/abstract_unit.rb M activemodel/test/cases/helper.rb M activerecord/test/cases/helper.rb M activesupport/lib/active_support/test_case.rb M activesupport/test/abstract_unit.rb M railties/test/abstract_unit.rb commit c27883c refs/heads/master Merge: b45b998 784f2c5 Author: Carlos Antonio da Silva Date: 2014-08-12 07:22:22 -0300 Merge pull request #16472 from y-yagi/patch-1 [ci skip] Fix broken url in plugins guide commit 0c23277 refs/heads/master Author: Abdelkader Boudih Date: 2014-08-12 09:29:21 +0000 Remove activejob integration tests M Gemfile M Rakefile D activejob/.gitignore D activejob/.travis.yml D activejob/Gemfile D activejob/Gemfile.lock M activejob/Rakefile M activejob/test/cases/logging_test.rb D activejob/test/dummy/Rakefile D activejob/test/dummy/app/assets/images/.keep D activejob/test/dummy/app/controllers/application_controller.rb D activejob/test/dummy/app/controllers/concerns/.keep D activejob/test/dummy/app/helpers/application_helper.rb D activejob/test/dummy/app/jobs/test_job.rb D activejob/test/dummy/app/mailers/.keep D activejob/test/dummy/app/models/.keep D activejob/test/dummy/app/models/concerns/.keep D activejob/test/dummy/config.ru D activejob/test/dummy/config/application.rb D activejob/test/dummy/config/boot.rb D activejob/test/dummy/config/database.yml D activejob/test/dummy/config/environment.rb D activejob/test/dummy/config/environments/test.rb D activejob/test/dummy/config/initializers/activejob.rb D activejob/test/dummy/config/initializers/session_store.rb D activejob/test/dummy/config/routes.rb D activejob/test/dummy/config/secrets.yml D activejob/test/dummy/db/migrate/20140804200445_create_delayed_jobs.rb D activejob/test/dummy/db/schema.rb D activejob/test/dummy/db/test.sqlite3 D activejob/test/dummy/lib/assets/.keep D activejob/test/dummy/log/.keep D activejob/test/dummy/tmp/.keep M activejob/test/helper.rb D activejob/test/integration/queuing_test.rb D activejob/test/support/integration/adapters/backburner.rb D activejob/test/support/integration/adapters/delayed_job.rb D activejob/test/support/integration/adapters/qu.rb D activejob/test/support/integration/adapters/que.rb D activejob/test/support/integration/adapters/queue_classic.rb D activejob/test/support/integration/adapters/resque.rb D activejob/test/support/integration/adapters/sidekiq.rb D activejob/test/support/integration/adapters/sneakers.rb D activejob/test/support/integration/adapters/sucker_punch.rb D activejob/test/support/integration/helper.rb D activejob/test/support/integration/jobs_manager.rb D activejob/test/support/integration/test_case_helpers.rb M rails.gemspec M railties/lib/rails/all.rb M tasks/release.rb commit a75f085 refs/heads/master Merge: b45b998 14f74a8 Author: Abdelkader Boudih Date: 2014-08-12 09:17:19 +0000 Add 'activejob/' from commit '14f74a8331f94150dfee653224de8fc837797709' git-subtree-dir: activejob git-subtree-mainline: b45b99894a60eda434abec94d133a1cfd8de2dda git-subtree-split: 14f74a8331f94150dfee653224de8fc837797709 commit 784f2c5 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-12 18:07:07 +0900 [ci skip] Fix broken url in plugins guide M guides/source/plugins.md commit dbb7257 refs/remotes/origin/4-0-stable Author: Godfrey Chan Date: 2014-08-11 21:05:24 -0700 Merge pull request #16432 from arthurnn/after_commit_run_on_top_level_trans Fix regression on after_commit in nested transactions. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transaction_callbacks_test.rb commit b31c49c refs/remotes/origin/4-1-stable Merge: 6af6ff4 d0993d9 Author: Godfrey Chan Date: 2014-08-11 21:05:24 -0700 Merge pull request #16432 from arthurnn/after_commit_run_on_top_level_trans Fix regression on after_commit in nested transactions. commit d0993d9 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-08-08 10:30:40 -0400 Fix regression on after_commit in nested transactions. after_commit should not run in nested transactions, however they should run once the outermost transaction gets committed. This patch fixes the problem copying the records from the Savepoint to its parent. So the RealTransaction will have all records that needs to run callbacks on it. [fixes #16425] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transaction_callbacks_test.rb commit 1df925d refs/heads/master Author: Aditya Kapoor Date: 2014-08-11 17:51:20 +0530 [ci skip] add guide for ActiveModel::SecurePassword M guides/source/active_model_basics.md commit b45b998 refs/heads/master Merge: 49798b5 0f99aa6 Author: Santiago Pastorino Date: 2014-08-11 09:11:31 -0300 Merge pull request #16456 from lsylvester/improve-active-record-error-message-on-update_columns-for-destroyed-records Change error message in update_columns for destroyed objects commit 0f99aa6 refs/heads/master Author: lsylvester Date: 2014-08-11 13:31:31 +1000 update error message to reflect that the record could have been destroyed M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb commit 2638d5c refs/heads/master Author: Godfrey Chan Date: 2014-08-11 00:00:23 -0700 Fixed issue w/custom accessors + reserved name + inheritance Fixed an issue where custom accessor methods (such as those generated by `enum`) with the same name as a global method are incorrectly overridden when subclassing. This was partially fixed in 4155431 then broken again by e5f15a8. Fixes #16288. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb commit a4a420c refs/remotes/origin/4-0-stable Author: Vasily Polovnyov Date: 2014-07-25 23:44:05 +0400 [ci skip] Mention the change in nil handling for serialized attributes in "Upgrading from Rails 3.2 to Rails 4.0" Conflicts: guides/source/upgrading_ruby_on_rails.md M guides/source/upgrading_ruby_on_rails.md commit 6af6ff4 refs/remotes/origin/4-1-stable Author: Vasily Polovnyov Date: 2014-07-25 23:44:05 +0400 [ci skip] Mention the change in nil handling for serialized attributes in "Upgrading from Rails 3.2 to Rails 4.0" M guides/source/upgrading_ruby_on_rails.md commit 49798b5 refs/heads/master Merge: 7bd9c87 4bfd0ce Author: Godfrey Chan Date: 2014-08-10 20:31:10 -0700 Merge pull request #16300 from vast/mention-changes-to-nil-serialization-in-upgrading-from-3.2 Mention changes to `nil` handling in serialized attributes commit 7bd9c87 refs/heads/master Merge: d0cdc96 d71433d Author: Zachary Scott Date: 2014-08-10 19:52:59 -0700 Merge pull request #16453 from reshleman/re-cleanup-guides-guidelines Cleanup Guides Guidelines [ci skip] commit d71433d refs/heads/master Author: Robert Eshleman Date: 2014-08-10 19:45:42 -0400 Cleanup Guides Guidelines [ci skip] * Copy editing for clarity in several locations * Rename "Titles" section to "Headings" * Fix incorrect anchor in link to API Documentation Guidelines for filenames M guides/source/ruby_on_rails_guides_guidelines.md commit d0cdc96 refs/heads/master Merge: ff24041 38e8bb8 Author: Zachary Scott Date: 2014-08-10 10:24:51 -0700 Merge pull request #16451 from y-yagi/patch-2 [ci skip] Fix sample code in engines guide commit 38e8bb8 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-10 22:10:15 +0900 [ci skip] Fix sample code in engines guide M guides/source/engines.md commit ff24041 refs/heads/master Merge: 9c6c5aa b7176ab Author: Santiago Pastorino Date: 2014-08-09 10:43:13 -0300 Merge pull request #16441 from tomkadwill/activerecord_associations_options_param [ci skip] Changed options to +options+ for rdoc commit 9c6c5aa refs/heads/master Merge: 7bb5a8f bc53543 Author: Santiago Pastorino Date: 2014-08-09 10:42:45 -0300 Merge pull request #16440 from tgxworld/pass_log_in_block Pass block for logging. commit 7bb5a8f refs/heads/master Merge: fb9d9da 8e49082 Author: Santiago Pastorino Date: 2014-08-09 10:41:22 -0300 Merge pull request #16439 from voxxit/patch-1 Using delegated connection method commit fb9d9da refs/heads/master Merge: ebcbcf9 d9b1c9b Author: Vijay Dev Date: 2014-08-09 15:52:13 +0530 Merge pull request #16443 from duccioarmenise/patch-1 Rails Tutorial link updated commit d9b1c9b refs/heads/master Author: Duccio Armenise Date: 2014-08-09 10:25:40 +0200 Update README.md Ruby on Rails Tutorial link updated. M README.md commit b7176ab refs/heads/master Author: Tom Kadwill Date: 2014-08-09 08:52:15 +0100 [ci skip] Changed options to +options+ for rdoc M activerecord/lib/active_record/associations.rb commit bc53543 refs/heads/master Author: Guo Xiang Tan Date: 2014-08-09 13:47:24 +0800 Pass block for logging. This follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance. M actionpack/lib/action_controller/metal/live.rb commit 8e49082 refs/heads/master Author: Joshua Delsman Date: 2014-08-08 22:16:28 -0700 Using delegated connection method M activerecord/lib/active_record/tasks/postgresql_database_tasks.rb commit ebcbcf9 refs/heads/master Merge: d70ba48 a8863fb Author: Richard Schneeman Date: 2014-08-08 21:17:37 -0500 Merge pull request #16437 from mscoutermarsh/master Docs: grammar fix for fetch. [ci skip] commit a8863fb refs/heads/master Author: Mike Coutermarsh Date: 2014-08-08 21:10:20 -0400 Docs: grammar fix for fetch. [ci skip] M activesupport/lib/active_support/cache.rb commit 71c7fd1 refs/heads/master Author: Hendy Tanata Date: 2014-08-08 14:25:18 -0700 Uppercase HTML in docs. [skip ci] M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/lib/action_dispatch/middleware/public_exceptions.rb M actionview/lib/action_view/helpers/asset_tag_helper.rb M actionview/lib/action_view/helpers/date_helper.rb M actionview/lib/action_view/helpers/form_helper.rb M actionview/lib/action_view/helpers/form_options_helper.rb M actionview/lib/action_view/helpers/output_safety_helper.rb M actionview/lib/action_view/helpers/rendering_helper.rb M actionview/lib/action_view/helpers/sanitize_helper.rb M actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb M guides/rails_guides/markdown/renderer.rb M guides/source/action_view_overview.md M guides/source/layouts_and_rendering.md commit d70ba48 refs/heads/master Author: Santiago Pastorino Date: 2014-08-08 18:20:17 -0300 Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option" This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699. IT BROKE THE BUILD!!! M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb M railties/CHANGELOG.md M railties/lib/rails/application.rb commit 7059776 refs/heads/master Merge: dde91e9 629f4e0 Author: Santiago Pastorino Date: 2014-08-08 18:05:53 -0300 Merge pull request #16434 from strzalek/cookies-digest-config-option Add digest config option for SignedCookiesJar commit 629f4e0 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-08-08 21:24:02 +0200 Return preconfigured AS::MessageVerifier M railties/CHANGELOG.md M railties/lib/rails/application.rb commit cfbedd3 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-08-08 21:18:30 +0200 Add config option for cookies digest You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = \SHA256' M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb M railties/lib/rails/application.rb commit dde91e9 refs/heads/master Author: Aaron Patterson Date: 2014-08-08 11:41:54 -0700 save a hash allocation per request. M railties/lib/rails/engine.rb commit 5b27f1e refs/heads/master Author: Aaron Patterson Date: 2014-08-08 11:41:11 -0700 add a test for prepending SCRIPT_NAME to generated urls A railties/test/path_generation_test.rb commit 763d54b refs/heads/master Merge: c69e21d 301b5fd Author: Santiago Pastorino Date: 2014-08-08 15:06:10 -0300 Merge pull request #16429 from arunagw/aa-build-fix-gemfile-spring Fixes test for Gemfile entry changes commit 301b5fd refs/heads/master Author: Arun Agrawal Date: 2014-08-08 13:28:06 +0200 Fixes test for Gemfile entry changes Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/plugin/templates/Gemfile M railties/test/generators/app_generator_test.rb commit fdfc0fc refs/heads/master Author: Sean Griffin Date: 2014-07-04 15:16:00 -0600 Add a `required` option to the model generator Syntax was chosen to follow the passing of multiple options to decimal/numeric types. Curly braces, and allowing any of `,`, `.`, or `-` to be used as a separator to avoid the need for shell quoting. (I'm intending to expand this to all columns, but that's another PR. The `required` option will cause 2 things to change. `required: true` will be added to the association. `null: false` will be added to the column in the migration. M activerecord/lib/rails/generators/active_record/migration/migration_generator.rb M activerecord/lib/rails/generators/active_record/model/templates/model.rb M railties/CHANGELOG.md M railties/lib/rails/generators/generated_attribute.rb M railties/test/generators/migration_generator_test.rb M railties/test/generators/model_generator_test.rb commit 14f74a8 refs/heads/master Merge: 06ccd5f 664546c Author: David Heinemeier Hansson Date: 2014-08-08 09:15:30 -0700 Merge pull request #102 from cristianbica/integration_tests Integration testing commit c69e21d refs/heads/master Merge: 7a3d8e2 28595e0 Author: Guillermo Iguaran Date: 2014-08-08 10:00:18 -0500 Merge pull request #16427 from ryandao/full_stack_source_extract Full stack source extract commit 7a3d8e2 refs/heads/master Merge: f4c8ce9 aaef6a3 Author: Santiago Pastorino Date: 2014-08-08 11:33:10 -0300 Merge pull request #16426 from tgxworld/fix_false_positive Fixes to TestCaseTest. commit f4c8ce9 refs/heads/master Author: Robin Dupret Date: 2014-08-08 16:10:06 +0200 Fix the #const_regexp's documentation [ci skip] Originally introduced in f9086d63, the documentation of this method is wrong as #const_regexp returns a string to easy the interpolation inside regular expressions. M activesupport/lib/active_support/inflector/methods.rb commit ca9851a refs/heads/master Merge: 700968e b20d111 Author: Rafael Mendonça França Date: 2014-08-08 11:05:02 -0300 Merge pull request #16430 from guillermo/patch-1 Fix typo in plugins doc commit 7a41295 refs/heads/master Author: Robin Dupret Date: 2014-07-26 20:10:43 +0200 Avoid relying on error messages when rescuing When we are rescuing from an error, it's a brittle approach to do checks with regular expressions on the raised message because it may change in in the future and error messages are different across implementations. The NameError API could be improved at the MRI level but for now we need to rely on its #name. A #== check will only pass for top level constants or only when the last constant of the path is missing so we need to rely on #include? instead. For instance: begin Namespace::Foo rescue NameError => e e.name # => :Namespace end However, if the name-space already exists, only the name of the first missing constant in the path is returned (e.g. for Math::PHI, the name would be :PHI). JRuby will return a fully qualified name (:"Math::PHI"). We need to keep the == check for 1.9 compatibility since const_get will raise a NameError with a name attribute set to the given string if it's one of "::" or "". See http://git.io/jnSN7g for further information. M activesupport/lib/active_support/inflector/methods.rb commit b20d111 refs/heads/master Author: Guillermo Álvarez Fernández Date: 2014-08-08 15:13:40 +0200 Fix typo in plugins doc M guides/source/plugins.md commit 700968e refs/heads/master Merge: 30529dc 9ef0f0f Author: Carlos Antonio da Silva Date: 2014-08-08 08:35:57 -0300 Merge pull request #16428 from tomkadwill/activerecord_associations_name_param [ci skip] Changed 'first argument' to '+name+ argument' commit 9ef0f0f refs/heads/master Author: Tom Kadwill Date: 2014-08-08 10:00:23 +0100 [ci skip] Changed 'first argument' to '+name+ argument' M activerecord/lib/active_record/associations.rb commit 28595e0 refs/heads/master Author: Ryan Dao Date: 2014-07-30 21:54:03 +0700 Update actionpack CHANGELOG M actionpack/CHANGELOG.md commit 1ed264b refs/heads/master Author: Ryan Dao Date: 2014-07-30 15:35:47 +0700 Retrieve source code for the entire stack trace Provide the ability to extract the source code of the entire exception stack trace, not just the frame raising the error. This improves debugging capability of the error page, especially for framework-related errors. M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.text.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.text.erb commit 664546c refs/heads/master Author: Cristian Bica Date: 2014-08-05 09:05:14 +0300 Integration testing A .gitignore M .travis.yml M Gemfile M Gemfile.lock M Rakefile M lib/active_job/queue_adapters/sneakers_adapter.rb A test/dummy/Rakefile A test/dummy/app/assets/images/.keep A test/dummy/app/controllers/application_controller.rb A test/dummy/app/controllers/concerns/.keep A test/dummy/app/helpers/application_helper.rb A test/dummy/app/jobs/test_job.rb A test/dummy/app/mailers/.keep A test/dummy/app/models/.keep A test/dummy/app/models/concerns/.keep A test/dummy/config.ru A test/dummy/config/application.rb A test/dummy/config/boot.rb A test/dummy/config/database.yml A test/dummy/config/environment.rb A test/dummy/config/environments/test.rb A test/dummy/config/initializers/activejob.rb A test/dummy/config/initializers/session_store.rb A test/dummy/config/routes.rb A test/dummy/config/secrets.yml A test/dummy/db/migrate/20140804200445_create_delayed_jobs.rb A test/dummy/db/schema.rb A test/dummy/db/test.sqlite3 A test/dummy/lib/assets/.keep A test/dummy/log/.keep A test/dummy/tmp/.keep M test/helper.rb A test/integration/queuing_test.rb A test/support/integration/adapters/backburner.rb A test/support/integration/adapters/delayed_job.rb A test/support/integration/adapters/qu.rb A test/support/integration/adapters/que.rb A test/support/integration/adapters/queue_classic.rb A test/support/integration/adapters/resque.rb A test/support/integration/adapters/sidekiq.rb A test/support/integration/adapters/sneakers.rb A test/support/integration/adapters/sucker_punch.rb A test/support/integration/helper.rb A test/support/integration/jobs_manager.rb A test/support/integration/test_case_helpers.rb commit aaef6a3 refs/heads/master Author: Guo Xiang Tan Date: 2014-08-08 12:29:52 +0800 Fixes to TestCaseTest. M actionpack/test/controller/test_case_test.rb commit 30529dc refs/heads/master Author: Zachary Scott Date: 2014-08-07 19:05:21 -0700 Rephrase how we explain RecordInvalid exception in the context of `#create!` regarding validations in contrast to the behavior of `#create`. Also describe creating multiple objects using an array of hashes as the +attributes+ parameter. [ci skip] /cc #16384 M activerecord/lib/active_record/persistence.rb commit f18552a refs/heads/master Merge: fbe38c9 38b6b5d Author: Zachary Scott Date: 2014-08-07 19:01:45 -0700 Merge pull request #16384 from tomkadwill/improved_create_documentation [ci skip] Added +object+ and +attributes+ to create! description for rdoc commit fbe38c9 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-07 16:34:27 -0700 Pull spring gem entry into the Gemfile template instead of gemfile_entries so it can be grouped with the other development tools M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/templates/Gemfile commit 089661b refs/heads/master Merge: cc1de71 e81453e Author: David Heinemeier Hansson Date: 2014-08-07 16:10:20 -0700 Merge branch 'master' of github.com:rails/rails commit cc1de71 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-07 16:10:14 -0700 Stop using padding in the generated Gemfile -- it looks shit M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/templates/Gemfile commit e81453e refs/heads/master Author: Aaron Patterson Date: 2014-08-07 16:03:09 -0700 need to call super M railties/test/engine_test.rb commit 8121eef refs/heads/master Author: Aaron Patterson Date: 2014-08-07 15:50:46 -0700 add a new constructor that runs load hooks M railties/lib/rails/application.rb M railties/test/application/multiple_applications_test.rb commit 2296989 refs/heads/master Author: Aaron Patterson Date: 2014-08-07 15:28:31 -0700 defer running after_config hooks until after the object is allocated M railties/lib/rails/application.rb commit 42c569e refs/heads/master Merge: 399f5f6 6c9669e Author: Rafael Mendonça França Date: 2014-08-07 19:01:46 -0300 Merge pull request #16424 from gregors/remove_dead_code remove dead file_watcher code commit 6c9669e refs/heads/master Author: Gregory Ostermayr Date: 2014-08-07 16:19:20 -0400 remove dead file_watcher code D activesupport/lib/active_support/file_watcher.rb commit 399f5f6 refs/heads/master Author: Aaron Patterson Date: 2014-08-07 12:10:31 -0700 use the uri parser so that newer version of Ruby work M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 69adfc9 refs/heads/master Merge: 12cf864 4e83815 Author: Aaron Patterson Date: 2014-08-07 09:40:53 -0700 Merge pull request #16421 from tsukasaoishi/prevant_manycall_showtables Tables existence check query is executed in large quantities commit 4e83815 refs/heads/master Author: tsukasaoishi Date: 2014-08-08 01:03:09 +0900 change to empty? from blank? M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit 12cf864 refs/heads/master Merge: 9a0e059 4c30b4f Author: Yves Senn Date: 2014-08-07 17:27:18 +0200 Merge pull request #16422 from tgxworld/fix_spelling Closes #16422 commit 4c30b4f refs/heads/master Author: Guo Xiang Tan Date: 2014-08-07 23:09:29 +0800 Fix spelling. M actionpack/test/controller/test_case_test.rb commit 8aead81 refs/heads/master Author: tsukasaoishi Date: 2014-08-07 22:41:23 +0900 Tables existence check query is executed in large quantities When Rails starts, tables existence check query is executed number of models. In case of mysql, SHOW TABLES LIKE 'table1'; SHOW TABLES LIKE 'table2'; SHOW TABLES LIKE 'table3'; ... SHOW TABLES LIKE 'table999'; Add process to get the names of all tables by one query. M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit 9a0e059 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-07 09:17:12 -0300 Fix typo [ci skip] M activemodel/CHANGELOG.md commit e2689d1 refs/heads/master Merge: f0fdba8 f8dcb36 Author: Santiago Pastorino Date: 2014-08-07 09:13:24 -0300 Merge pull request #16412 from yevhene/master Fix in has_secure_password for passwords containing only spaces. commit f0fdba8 refs/heads/master Merge: e6e81f8 14508ae Author: Santiago Pastorino Date: 2014-08-07 09:10:30 -0300 Merge pull request #16419 from tgxworld/remove_legacy_code Remove ActionController::RaiseActionExceptions. commit 14508ae refs/heads/master Author: Guo Xiang Tan Date: 2014-08-07 17:20:17 +0800 Remove ActionController::RaiseActionExceptions. The latest modification to the code was done in https://github.com/rails/rails/commit/5e3517ea. In Rails 3.2, `ActionController#rescue_action` was deprecated and `rescue_action_without_handler` is no longer being used. M actionpack/lib/action_controller/test_case.rb commit 38b6b5d refs/heads/master Author: Tom Kadwill Date: 2014-08-06 18:52:48 +0100 [ci skip] Updated create! documentation description and added +attributes+ for rdoc M activerecord/lib/active_record/persistence.rb commit 85028ce refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-08-06 23:57:48 -0300 Merge pull request #16411 from calebthompson/backport-param-changes Fix undefined method to_query for Hash Conflicts: activesupport/lib/active_support/core_ext/object/to_param.rb activesupport/test/core_ext/object/to_query_test.rb M activesupport/lib/active_support/core_ext/object/to_param.rb M activesupport/lib/active_support/core_ext/object/to_query.rb M activesupport/test/core_ext/object/to_param_test.rb M activesupport/test/core_ext/object/to_query_test.rb commit c8d54cd refs/remotes/origin/4-1-stable Merge: 6f2ed6d 0dcd98d Author: Rafael Mendonça França Date: 2014-08-06 23:57:48 -0300 Merge pull request #16411 from calebthompson/backport-param-changes Fix undefined method to_query for Hash commit 0dcd98d refs/remotes/origin/4-1-stable Author: Caleb Thompson Date: 2014-08-06 07:23:48 -0500 Fix undefined method to_query for Hash When cherry-picking `active_support/core_ext/object/to_param` in 4.1.*, we still see an undefined method to_query for hash unless we also pull in `.../to_query`. This was resolved on master in c420a8da, so this is exclusively a backport of "Move to_param to to_query, also Improve tests" based on the Active Support Core Extensions guide's [Cherry-picking a Definition] section. [Cherry-picking a Definition]: http://guides.rubyonrails.org/active_support_core_extensions.html#cherry-picking-a-definition M activesupport/lib/active_support/core_ext/object/to_param.rb M activesupport/lib/active_support/core_ext/object/to_query.rb M activesupport/test/core_ext/object/to_param_test.rb M activesupport/test/core_ext/object/to_query_test.rb commit 3614123 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-08-06 23:44:00 -0300 Define id_was to get the previous value of the primary key Currently when we call id_was and we have a custom primary key name Active Record will return the current value of the primary key. This make impossible to correctly do an update operation if you change the id. Fixes #16413 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/test/cases/primary_keys_test.rb commit 6f2ed6d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-08-06 23:44:00 -0300 Define id_was to get the previous value of the primary key Currently when we call id_was and we have a custom primary key name Active Record will return the current value of the primary key. This make impossible to correctly do an update operation if you change the id. Fixes #16413 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/test/cases/primary_keys_test.rb commit e6e81f8 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-06 23:44:00 -0300 Define id_was to get the previous value of the primary key Currently when we call id_was and we have a custom primary key name Active Record will return the current value of the primary key. This make impossible to correctly do an update operation if you change the id. Fixes #16413 M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/test/cases/primary_keys_test.rb commit 9733cab refs/remotes/origin/4-1-stable Author: Santiago Pastorino Date: 2014-08-06 10:48:52 -0300 Merge pull request #16402 from bogdan/select_with_empty_block Fixed #select form builder helper to support block without html output M actionview/lib/action_view/helpers/tags/select.rb M actionview/test/template/form_options_helper_test.rb commit ee25579 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-06 22:48:22 -0300 Test using turbolinks master See https://github.com/rails/turbolinks/commit/153f1b0f04c718442cfd73365a2778dfe1a1c5c7 M Gemfile commit 17db438 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2013-01-14 03:32:34 -0800 Fix DateTime comparison with DateTime::Infinity object Fixes #16406 Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/test/core_ext/range_ext_test.rb commit a64763b refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2013-01-14 03:32:34 -0800 Fix DateTime comparison with DateTime::Infinity object Fixes #16406 Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/test/core_ext/range_ext_test.rb commit ca9736e refs/heads/master Author: Rafael Mendonça França Date: 2013-01-14 03:32:34 -0800 Fix DateTime comparison with DateTime::Infinity object Fixes #16406 M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/test/core_ext/range_ext_test.rb commit d25fe31 refs/heads/master Author: Aaron Patterson Date: 2014-08-06 18:27:16 -0700 lazily instantiate application subclasses this means we can meaningfully override methods in the subclass M railties/lib/rails.rb M railties/lib/rails/application.rb M railties/test/engine_test.rb commit 06ccd5f refs/heads/master Merge: 38ee4fd 6ff5972 Author: David Heinemeier Hansson Date: 2014-08-06 15:11:22 -0700 Merge pull request #103 from cristianbica/adapter-fixes Fixed qu, queue_classic, sneakers adapters commit 2090615 refs/heads/master Author: Aaron Patterson Date: 2014-08-06 14:17:57 -0700 refactor Redirecting so we do not need a controller instance M actionpack/lib/action_controller/metal/redirecting.rb M actionpack/lib/action_dispatch/testing/assertions/response.rb commit 6ff5972 refs/heads/master Author: Cristian Bica Date: 2014-08-07 00:09:28 +0300 Fixed qu, queue_classic, sneakers adapters M lib/active_job/queue_adapters/qu_adapter.rb M lib/active_job/queue_adapters/queue_classic_adapter.rb M lib/active_job/queue_adapters/sneakers_adapter.rb commit f8dcb36 refs/heads/master Author: Yevhene Shemet Date: 2014-08-06 17:41:36 +0300 Allow password to contain spaces only. M activemodel/CHANGELOG.md M activemodel/lib/active_model/secure_password.rb M activemodel/test/cases/secure_password_test.rb commit 3dfcae6 refs/heads/master Author: Akira Matsuda Date: 2014-08-07 01:57:55 +0900 defined? should actually work in current implementation So this trick is not needed to be documented anymore. M actionview/lib/action_view/base.rb commit d5be083 refs/heads/master Merge: a819211 7a0c2ba Author: Santiago Pastorino Date: 2014-08-06 10:48:52 -0300 Merge pull request #16402 from bogdan/select_with_empty_block Fixed #select form builder helper to support block without html output commit a819211 refs/heads/master Merge: ec54acd c294e91 Author: Yves Senn Date: 2014-08-06 08:49:00 +0200 Merge pull request #16359 from skanev/after-bundle-in-rails-templates Add an after_bundle callback in Rails templates Conflicts: railties/CHANGELOG.md commit ec54acd refs/heads/master Merge: acb371c f15cef6 Author: Yves Senn Date: 2014-08-06 08:26:13 +0200 Merge pull request #16316 from rails/senny/purge_schema_maintenance purge database before loading schema, take 2 commit f15cef6 refs/heads/master Author: Yves Senn Date: 2014-07-25 17:49:27 +0200 schema rake tasks are specific about the configuration to act on. The rake tasks and the `DatabaseTakss` adapter classes used to assume a configuration at some places. This forced the rake tasks to establish a specific connection before calling into `load_schema`. After #15394 this started to cause issues because it could `purge` the wrong database before loading the schema. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb commit 53dba73 refs/heads/master Author: Yves Senn Date: 2014-07-24 14:46:25 +0200 Revert "Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format"" This reverts commit 5c87b5c5248154cf8aa76cce9a24a88769de022d. M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb M railties/test/application/test_test.rb commit acb371c refs/heads/master Author: Aaron Patterson Date: 2014-08-05 16:50:50 -0700 call the routes method on engines if we access the instance, we can free up lots of codes M actionpack/test/dispatch/prefix_generation_test.rb commit 9a36fac refs/heads/master Author: Aaron Patterson Date: 2014-08-05 16:30:08 -0700 a rails application should be an engine subclass M actionpack/test/dispatch/prefix_generation_test.rb commit 7067375 refs/heads/master Author: Aaron Patterson Date: 2014-08-05 16:28:43 -0700 no reason to lazily instantiate the routes especially if you're just going to add a call two lines down that populates the cache. common. M actionpack/test/dispatch/prefix_generation_test.rb commit 2bb0abb refs/heads/master Author: Justin Weiss Date: 2014-08-05 13:13:40 -0700 Add a note on custom validation contexts. The documentation on `:on` for validations was inconsistent, and most only referenced the `:create` and `:update` contexts. I fixed those to be consistent with the documentation on `AM::Validations.validates`, which seemed to have the best docs. [ci skip] M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validations/validates.rb M activemodel/lib/active_model/validations/with.rb M activerecord/lib/active_record/validations/associated.rb M activerecord/lib/active_record/validations/presence.rb commit a9a6423 refs/heads/master Author: schneems Date: 2014-08-05 12:17:03 -0500 [ci skip] Document ActionDispatch::Static M actionpack/lib/action_dispatch/middleware/static.rb commit 658b40e refs/heads/master Author: schneems Date: 2014-08-05 12:16:46 -0500 [ci skip] document ActionDispatch::FileHandler M actionpack/lib/action_dispatch/middleware/static.rb commit b89c5a0 refs/heads/master Merge: ed180ee 8298d3a Author: Jeremy Kemper Date: 2014-08-05 10:05:10 -0700 Merge pull request #16364 from arthurnn/make_transaction_one_class Clarify Transaction responsibilities by breaking unneeded inheritance hierarchy. commit ed180ee refs/heads/master Author: Aaron Patterson Date: 2014-08-05 09:45:21 -0700 just assign the instance variables on the test M actionpack/test/dispatch/prefix_generation_test.rb commit ab54ec7 refs/heads/master Author: Guillermo Iguaran Date: 2014-08-05 11:51:12 -0500 We don't need parenthesis for this M railties/test/application/middleware_test.rb commit e460e7c refs/heads/master Author: schneems Date: 2014-08-05 11:45:44 -0500 [ci skip] Document PublicExceptions middleware M actionpack/lib/action_dispatch/middleware/public_exceptions.rb commit 7583aa2 refs/heads/master Merge: 82f6061 a7060a6 Author: Guillermo Iguaran Date: 2014-08-05 11:43:13 -0500 Merge pull request #16405 from arthurnn/fix_digest_etag_test Fix digest ETAG test. commit a7060a6 refs/heads/master Author: Arthur Neves Date: 2014-08-05 12:40:54 -0400 Fix digest ETAG test. After https://github.com/rack/rack/commit/12528d4567d8e6c1c7e9422fee6cd8b43c4389bf ETag will include a `W/` before the digest. M railties/test/application/middleware_test.rb commit c294e91 refs/heads/master Author: Stefan Kanev Date: 2014-08-05 19:38:20 +0300 Add after_bundle to the release notes and upgrade guide M guides/source/4_2_release_notes.md M guides/source/upgrading_ruby_on_rails.md commit 82f6061 refs/heads/master Merge: ab2a358 977a489 Author: Carlos Antonio da Silva Date: 2014-08-05 13:34:57 -0300 Merge pull request #16404 from bogdan/move-create-with-bang Moved #create! method from Validations to Persistence module commit 257d65e refs/remotes/origin/4-1-stable Author: Edo Balvers Date: 2014-05-04 15:29:17 +0200 Fix Baseclass becomes! subclass. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation.rb M activerecord/test/cases/persistence_test.rb commit 977a489 refs/heads/master Author: Bogdan Gusiev Date: 2014-08-05 18:36:29 +0300 Moved #create! method from Validations to Persistence module M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/validations.rb commit 8298d3a refs/heads/master Author: Arthur Neves Date: 2014-07-31 16:44:55 -0400 Cleanup Transaction inheritance. Transaction class doesnt need to encapsulate the transaction state using inheritance. This removes all Transaction subclasses, and let the Transaction object controls different actions based on its own state. Basically the only actions would behave differently are `being`,`commit`,`rollback` as they could act in a savepoint or in a real transaction. M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transactions_test.rb commit 7a0c2ba refs/heads/master Author: Bogdan Gusiev Date: 2014-08-05 17:23:00 +0300 Fixed #select form builder helper to support block with html output M actionview/lib/action_view/helpers/tags/select.rb M actionview/test/template/form_options_helper_test.rb commit ab2a358 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-05 10:16:34 -0300 Fix AS docs / changelog with wrong method [ci skip] M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/itself.rb commit e5e4d08 refs/heads/master Author: José Valim Date: 2014-08-05 13:59:41 +0200 Bring back the helpers tests Also keep the hook as other tools may rely on it, we just don't do anything by default on Rails. M railties/lib/rails/generators/rails/helper/helper_generator.rb A railties/lib/rails/generators/test_unit/helper/helper_generator.rb A railties/test/generators/helper_generator_test.rb commit d44702e refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-05 08:22:11 -0300 Remove unused text? predicate method and delegation The method has been removed in 09206716f8695f6b8467f15c1befa5a4c3c10978 (PR #16074), but the delegation was apparently missed, and one instance of the method was added back with the addition of OID::Xml in 336be2bdf7dfa1b31879d0ab27e5f3101b351923 (PR #16072), so we can safely rm both. M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/xml.rb commit 28f6b89 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-08-01 19:43:59 -0300 Call public methods rather than class_eval'ing M activemodel/lib/active_model/naming.rb commit 3300fde refs/heads/master Author: Aaron Patterson Date: 2014-08-04 18:20:07 -0700 avoid testing only_path we know that this call only wants the path returned, so lets call a method that returns the path. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit caadbd8 refs/heads/master Merge: cfb8d4a 80af2a4 Author: Rafael Mendonça França Date: 2014-08-04 20:48:54 -0300 Merge pull request #16396 from eileencodes/dont-delegate-chain-to-through-association Don't delegate Reflection#chain to ThroughAssociation commit 80af2a4 refs/heads/master Author: eileencodes Date: 2014-08-04 19:39:07 -0400 Don't delegate Reflection#chain to ThroughAssociation We shouldn't be delegating chain to ThroughAssociation since the only place that needs to call it is `target_scope`. Instead we can call `reflecion.chain`. M activerecord/lib/active_record/associations/through_association.rb commit cfb8d4a refs/heads/master Merge: aa7d537 7562c76 Author: Rafael Mendonça França Date: 2014-08-04 19:09:32 -0300 Merge pull request #16395 from jonatack/patch-8 Update itself.rb [ci skip] commit 7562c76 refs/heads/master Author: Jon Atack Date: 2014-08-05 00:05:23 +0200 Update itself.rb [ci skip] M activesupport/lib/active_support/core_ext/object/itself.rb commit aa7d537 refs/heads/master Merge: 23f902c edfc7b9 Author: Richard Schneeman Date: 2014-08-04 15:51:36 -0500 Merge pull request #16375 from johnnyshields/guides Guides: Add definition of `config.assets.manifest` option to configuring.md commit edfc7b9 refs/heads/master Author: Johnny Shields Date: 2014-08-03 06:51:58 +0900 [ci skip] Guides: Add definition of `config.assets.manifest` option to configuring.md M guides/source/configuring.md commit 23f902c refs/heads/master Author: Rafael Mendonça França Date: 2014-08-04 16:23:22 -0300 Only define Objetc#itself when it is not defined Ruby 2.2 will include Kernel#itself so we don't need to define again. See https://github.com/ruby/ruby/commit/0a0160d6b659f6131a525fe1579e7c463d4c197e M activesupport/lib/active_support/core_ext/object/itself.rb commit 7521b8e refs/heads/master Merge: 930110b 9794e74 Author: Rafael Mendonça França Date: 2014-08-04 14:22:26 -0300 Merge pull request #16393 from jonatack/patch-8 Fix typo [ci skip] commit 9794e74 refs/heads/master Author: Jon Atack Date: 2014-08-04 19:19:26 +0200 Fix typo [ci skip] M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 11fd052 refs/remotes/origin/3-2-stable (origin/3-2-stable) Author: Santiago Pastorino Date: 2014-07-09 21:49:37 -0300 Regenerate sid when sbdy tries to fixate the session Fixed broken test. Thanks Stephen Richards for reporting. M actionpack/lib/action_dispatch/middleware/session/cache_store.rb M actionpack/test/dispatch/session/cache_store_test.rb commit 6d95e04 refs/remotes/origin/4-0-stable Author: Santiago Pastorino Date: 2014-07-09 21:49:37 -0300 Regenerate sid when sbdy tries to fixate the session Fixed broken test. Thanks Stephen Richards for reporting. M actionpack/lib/action_dispatch/middleware/session/cache_store.rb M actionpack/test/dispatch/session/cache_store_test.rb commit 999bed0 refs/remotes/origin/4-1-stable Author: Santiago Pastorino Date: 2014-07-09 21:49:37 -0300 Regenerate sid when sbdy tries to fixate the session Fixed broken test. Thanks Stephen Richards for reporting. M actionpack/lib/action_dispatch/middleware/session/cache_store.rb M actionpack/test/dispatch/session/cache_store_test.rb commit 930110b refs/heads/master Author: Santiago Pastorino Date: 2014-07-09 21:49:37 -0300 Regenerate sid when sbdy tries to fixate the session Fixed broken test. Thanks Stephen Richards for reporting. M actionpack/lib/action_dispatch/middleware/session/cache_store.rb M actionpack/test/dispatch/session/cache_store_test.rb commit e741d4d refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-07-29 09:21:47 +0200 Raise an exception when attachments are added after `mail` was called. Closes #16163 Adding attachments after a call to `mail` will result in invalid emails. This is related to the fact, that `mail` is making the required preparations before the email is ready to be sent. These change depending on your added attachments. Conflicts: actionmailer/CHANGELOG.md M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb commit b2e8804 refs/heads/master Merge: 3d70f07 1d6a877 Author: Yves Senn Date: 2014-08-04 13:09:13 +0200 Merge pull request #16333 from joker1007/fix_decimal_cast_from_float_with_large_precision Fix type casting to Decimal from Float with large precision Conflicts: activerecord/CHANGELOG.md commit 3d70f07 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 16:02:32 -0700 Explain why we use asset digests, not what a setter does M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 5132f83 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 15:55:22 -0700 Add suggestion as to how you can app the the assets load path M railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt commit fc6b533 refs/heads/master Merge: 6118497 f0b8060 Author: David Heinemeier Hansson Date: 2014-08-03 15:48:26 -0700 Merge branch 'master' of github.com:rails/rails commit 6118497 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 15:48:14 -0700 Pull in the custom configuration concept from dhh/custom_configuration M guides/source/configuring.md M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb A railties/test/application/configuration/base_test.rb A railties/test/application/configuration/custom_test.rb commit f0b8060 refs/heads/master Merge: e5632f3 0b8f35d Author: Guillermo Iguaran Date: 2014-08-03 17:35:33 -0500 Merge pull request #16386 from JackDanger/journey-no-result-var Using no_result_var in Journey's parser generator commit 0b8f35d refs/heads/master Author: Jack Danger Canty Date: 2014-08-03 15:23:56 -0700 Using no_result_var in Journey's parser generator Previously the generated parser had an intermediate local variable `result` that really useful if you're building up a stateful object but Journey always discards the result argument to the reduce functions. This produces a simpler parser for anybody who actually wants to read the thing. Sadly, there's no real performance speedup with this change. M actionpack/lib/action_dispatch/journey/parser.rb M actionpack/lib/action_dispatch/journey/parser.y commit e5632f3 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 15:12:27 -0700 A few more tests asserting the presence of helper test stubs M railties/lib/rails/generators/rails/controller/USAGE M railties/lib/rails/generators/rails/helper/USAGE M railties/test/generators/controller_generator_test.rb M railties/test/generators/namespaced_generators_test.rb M railties/test/generators/resource_generator_test.rb M railties/test/generators/scaffold_controller_generator_test.rb commit 206347f refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 15:12:05 -0700 Update docs to reflect that helper stubs are no longer generated M guides/source/command_line.md M guides/source/engines.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/testing.md commit a1ede5a refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 14:59:24 -0700 Stubs are no longer generated for helpers, so dont test for it M railties/test/generators/scaffold_generator_test.rb commit 58ce115 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 14:57:43 -0700 Change the production log level default from :info to :debug. All production apps I have ever worked with has done this. Let us reflect that default. You often want those SQL quieries to be able to debug issues in production M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit a34b664 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-03 14:50:50 -0700 Generating stubs for helper tests is overly specific. Most helpers should simply be tested as part of the view thats using them. If you need something beyond that, you can add a test yourself for them M railties/lib/rails/generators/rails/helper/helper_generator.rb D railties/lib/rails/generators/test_unit/helper/helper_generator.rb D railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb D railties/test/generators/helper_generator_test.rb commit cadc8a0 refs/heads/master Merge: 8188b33 1f72ab3 Author: Zachary Scott Date: 2014-08-02 23:10:34 -0700 Merge pull request #16306 from aditya-kapoor/add-docs-for-uglifier [ci skip] add tip for uglifier in execjs error commit 1f72ab3 refs/heads/master Author: Aditya Kapoor Date: 2014-08-03 10:13:38 +0530 [ci skip] add tip for uglifier in execjs error M guides/source/getting_started.md commit 8188b33 refs/heads/master Merge: f57cd78 c9469c0 Author: Richard Schneeman Date: 2014-08-02 22:43:01 -0500 Merge pull request #16380 from y-yagi/patch-1 [ci skip] Remove "Machinist" from testing guide commit c9469c0 refs/heads/master Author: yuuji.yaginuma Date: 2014-08-03 10:32:04 +0900 [ci skip] Remove "Machinist" from testing guide M guides/source/testing.md commit f57cd78 refs/heads/master Merge: 78ca462 eb98168 Author: Rafael Mendonça França Date: 2014-08-02 22:15:25 -0300 Merge pull request #16378 from JackDanger/doc-fix-in-join-association-build_constraint [doc] updating documented parameter for build_constraint commit eb98168 refs/heads/master Author: Jack Danger Canty Date: 2014-08-02 16:58:05 -0700 updating documented parameter for build_constraint Updates documentation in line with changes made in 743b67508e2027e1d086142ccbec47a19fc943f6 M activerecord/lib/active_record/associations/join_dependency/join_association.rb commit 78ca462 refs/heads/master Merge: dc1a661 30af858 Author: Eileen M. Uchitelle Date: 2014-08-02 19:30:44 -0400 Merge pull request #16377 from JackDanger/doc-fix-in-association-reflection Fixes small error in ActiveRecord::Reflection docs commit 097b210 refs/heads/master Author: Stefan Kanev Date: 2014-07-31 12:05:07 +0200 Add an after_bundle callback in Rails templates The template runs before the generation of binstubs – this does not allow to write one, that makes an initial commit to version control. It is solvable by adding an after_bundle callback. M guides/source/rails_application_templates.md M railties/CHANGELOG.md M railties/lib/rails/generators/actions.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/test/generators/app_generator_test.rb commit dc1a661 refs/heads/master Author: schneems Date: 2014-08-02 15:48:37 -0500 [ci skip] fix markdown M guides/source/configuring.md commit ffd5ec8 refs/heads/master Merge: 8dda066 e67a2f2 Author: Rafael Mendonça França Date: 2014-08-02 14:16:30 -0300 Merge pull request #16374 from rajcybage/consistency_minitest rename MiniTest to Minitest commit 8dda066 refs/heads/master Merge: 3bf2a4c 01c80a1 Author: Rafael Mendonça França Date: 2014-08-02 14:11:04 -0300 Merge pull request #16373 from eileencodes/deprecate-reflection-source_macro Deprecate source_macro commit e67a2f2 refs/heads/master Author: Rajarshi Das Date: 2014-08-02 21:30:28 +0530 rename MiniTest to Minitest M activerecord/test/cases/attribute_test.rb M activerecord/test/cases/migration/pending_migrations_test.rb commit 01c80a1 refs/heads/master Author: eileencodes Date: 2014-07-30 21:02:57 -0400 Deprecate source_macro `source_macro` is no longer used in any ActiveRecord code. I've chosen to deprecate it because it was not marked as nodoc and may be in use outside of rails source. M activerecord/CHANGELOG.md M activerecord/lib/active_record/reflection.rb commit 3bf2a4c refs/heads/master Merge: ea7fc2e d9bd75a Author: Vijay Dev Date: 2014-08-02 12:09:07 +0000 Merge branch 'master' of github.com:rails/docrails Conflicts: guides/source/testing.md commit d9bd75a refs/heads/master Author: Vijay Dev Date: 2014-08-02 12:05:26 +0000 copy edits[ci skip] M actionpack/lib/action_controller/metal.rb commit 38ee4fd refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-01 16:56:38 -0700 Fix the test requirement of resque_scheduler M lib/active_job/queue_adapters/resque_adapter.rb commit fcc2cd5 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-01 13:55:16 -0700 Improve the error message when resque-scheduler is not available M lib/active_job/queue_adapters/resque_adapter.rb commit ea7fc2e refs/heads/master Author: Aaron Patterson Date: 2014-08-01 11:55:47 -0700 just set the host, no need for another hash allocation / merge! M actionpack/lib/action_controller/metal/force_ssl.rb commit 8cbcd19 refs/heads/master Author: Aaron Patterson Date: 2014-08-01 11:45:52 -0700 always return a string from find_script_name this allows us to avoid nil checks on the return value M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit cfbb5a2 refs/heads/master Author: Rafael Mendonça França Date: 2014-08-01 14:32:50 -0300 Rename tests too M activesupport/test/core_ext/object/itself_test.rb commit 64d9112 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-01 10:30:13 -0700 Rename Object#self to Object#itself to have parity with matz sanctioned method name for Ruby 2.2 M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object.rb A activesupport/lib/active_support/core_ext/object/itself.rb D activesupport/lib/active_support/core_ext/object/self.rb A activesupport/test/core_ext/object/itself_test.rb D activesupport/test/core_ext/object/self_test.rb commit 702ad71 refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-01 10:07:38 -0700 Added Object#self which returns the object itself M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object.rb A activesupport/lib/active_support/core_ext/object/self.rb A activesupport/test/core_ext/object/self_test.rb commit 7a9493f refs/heads/master Author: David Heinemeier Hansson Date: 2014-08-01 09:01:52 -0700 Update README.md M README.md commit 30af858 refs/heads/master Author: Jack Danger Canty Date: 2014-07-31 21:01:00 -0700 Fixes small error in ActiveRecord::Reflection docs [ci skip] M activerecord/lib/active_record/reflection.rb commit 20405e5 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 23:10:47 -0300 Use available method rather than macro name checking M activerecord/lib/active_record/associations/through_association.rb commit fe24ba8 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 18:31:19 -0300 Rename method for clarity Ruby generally does not use the is_* prefix on predicate methods. M activerecord/lib/active_record/type/serialized.rb commit e9bbe4a refs/heads/master Author: Aaron Patterson Date: 2014-07-31 15:26:42 -0700 use `get` instead of accessing the named routes internals M actionpack/lib/action_dispatch/routing/mapper.rb commit c8317cd refs/heads/master Merge: 8888296 057c237 Author: Rafael Mendonça França Date: 2014-07-31 17:39:22 -0300 Merge pull request #16363 from arthurnn/null_transaction Null transaction commit 057c237 refs/heads/master Author: Arthur Neves Date: 2014-07-31 16:31:33 -0400 Replace ClosedTransaction with NullTransaction M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 62c75f4 refs/heads/master Author: Arthur Neves Date: 2014-07-31 16:25:51 -0400 Move TransactionManager to bottom of class M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb commit 8888296 refs/heads/master Merge: ed9b23d 4140797 Author: Rafael Mendonça França Date: 2014-07-31 16:52:37 -0300 Merge pull request #16341 from arthurnn/transactions_remove_begin Transactions refactoring - 2 commit 4140797 refs/heads/master Author: Arthur Neves Date: 2014-07-30 14:32:56 -0400 Make ClosedTransaction a null object M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb commit dac9c92 refs/heads/master Author: Arthur Neves Date: 2014-07-28 13:07:47 -0400 Remove parent on Transaction object M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb commit 91e4b65 refs/heads/master Author: Arthur Neves Date: 2014-07-28 14:26:27 -0400 Remove being/number methods from transaction class M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transactions_test.rb commit ed9b23d refs/heads/master Author: Aaron Patterson Date: 2014-07-31 11:25:01 -0700 invert check so we fail faster there's no reason to to_sym the string if it doesn't match the regexp anyway M actionpack/lib/action_dispatch/routing/mapper.rb commit 3e9158b refs/heads/master Author: Aaron Patterson Date: 2014-07-31 11:21:53 -0700 do a hash lookup for collision detection hash lookup should be faster than searching an array. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit 71fac05 refs/heads/master Merge: 0361a6a d66ed3b Author: Rafael Mendonça França Date: 2014-07-31 15:00:05 -0300 Merge pull request #16350 from JackDanger/test-rake-db-migrate-task Add ActiveRecord::Tasks::DatabaseTasks.migrate commit 0361a6a refs/heads/master Merge: 639a2e7 38be633 Author: Rafael Mendonça França Date: 2014-07-31 14:46:34 -0300 Merge pull request #16361 from JackDanger/clearer-connection-pool-documentation [doc] Clarify how the ConnectionHandler works commit 38be633 refs/heads/master Author: Jack Danger Canty Date: 2014-07-30 21:57:30 -0700 Clarify how the ConnectionHandler works This makes the implicit description of how connection pooling works a little more explicit. It converts the examples of a model hierarchy into actual Ruby code and demonstrates how the key structure of the database.yml relates to the `establish_connection` method. M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit d66ed3b refs/heads/master Author: Jack Danger Canty Date: 2014-07-30 14:51:17 -0700 Add ActiveRecord::Tasks::DatabaseTasks.migrate This extracts the logic that was embedded in a Rake task into a static method. Bonus: the first test for `rake db:migrate` M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/test/cases/tasks/database_tasks_test.rb commit 639a2e7 refs/heads/master Merge: ddb0d4b 377bece Author: Rafael Mendonça França Date: 2014-07-31 14:04:41 -0300 Merge pull request #16353 from eileencodes/refactor-join_keys-usage-in-reflection Refactor join_keys to remove complex conditionals commit ddb0d4b refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 13:18:51 -0300 Realign assignments :scissors: M actionpack/lib/action_dispatch/http/url.rb commit 0b859df refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 13:14:14 -0300 Do not reassign variable when mutation is happening These methods mutate the path variable/argument so there is no need to reassign it every time. M actionpack/lib/action_dispatch/http/url.rb commit 091a593 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 13:12:04 -0300 Only concatenate path if it was given rather than converting blindly M actionpack/lib/action_dispatch/http/url.rb commit fafff35 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 13:09:32 -0300 Rename variable to better show its intent M actionpack/lib/action_dispatch/http/url.rb commit 2772471 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 13:08:58 -0300 Simplify conditional M actionpack/lib/action_dispatch/http/url.rb commit 8d61463 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 13:05:56 -0300 Push options check up so we can simplify internal methods M actionpack/lib/action_dispatch/http/url.rb commit 1d6a877 refs/heads/master Author: joker1007 Date: 2014-07-29 20:16:10 +0900 Fix type casting to Decimal from Float with ... When I defines large precision column at RDBMS, I assigns float value, raise ArgumentError (precision too large). M activerecord/CHANGELOG.md M activerecord/lib/active_record/type/decimal.rb M activerecord/test/cases/type/decimal_test.rb commit 377bece refs/heads/master Author: eileencodes Date: 2014-07-29 13:56:39 -0400 Refactor join_keys to remove complex conditionals Pushing conditionals down to through reflection Only the through association needs the part of this conditional that deals with belongs to and polymorphic? so that can be pushed down into the ThroughReflection reducing the conditionals. Remove conditional because we can delegate join keys to source reflection Remove need for source_macro checking By adding join_id_for to the other reflections we remove the need to cehck against the source_macro and can reduce the conditioanl from the original join_id_for(owner) Using polymorphism instead of testing the source_macro This case statement in join_association is almost exactly the same as the original join_keys code. Testing taht theory by creating a new join_dependency_keys(assoc_klass) method. Refactor join_keys further to be more concise Fixed format of "#:nodoc:" to "# :nodoc:" where I added them to this file. M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/reflection.rb commit 84093c6 refs/heads/master Merge: dccdee7 8d7dea7 Author: Rafael Mendonça França Date: 2014-07-31 11:25:41 -0300 Merge pull request #16351 from eileencodes/finish-refactoring-macro-to-eliminate-checking-against-symbols Redefine macro checks for reflections commit dccdee7 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 09:47:46 -0300 Simplify code branch, remove #tap M actionpack/lib/action_controller/metal/url_for.rb commit a9c0eb4 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 09:43:02 -0300 Avoid a new hash object M actionpack/lib/action_controller/metal/url_for.rb commit 4e09c50 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 08:56:22 -0300 Fix assertion arguments order M activesupport/test/subscriber_test.rb commit c1dadf3 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-31 08:07:32 -0300 Avoid creating an extra hash M activesupport/lib/active_support/hash_with_indifferent_access.rb commit d97ba0d refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 23:48:22 -0300 Remove unnecessary call to #tap This is not storying the RouteSet instance anywhere as the other examples in the file, so no need to use #tap. M actionpack/test/dispatch/routing_test.rb commit 7dd452c refs/heads/master Merge: 316b32d 787d5b1 Author: Yves Senn Date: 2014-07-31 12:38:29 +0200 Merge pull request #16356 from gchan/add-hwia-tests Add tests to ensure default proc is used when `HashWithIndifferentAccess' is initialized with a block commit 787d5b1 refs/heads/master Author: Gordon Chan Date: 2014-07-31 17:59:00 +1200 Add tests to ensure default proc is used when `HashWithIndifferentAccess' is initialized with a block M activesupport/test/core_ext/hash_ext_test.rb commit 316b32d refs/heads/master Merge: 29a6a17 acac631 Author: Aaron Patterson Date: 2014-07-30 22:48:09 -0700 Merge pull request #16355 from xaviershay/validate-in-groups-of-args Raise a descriptive error if non-positive integer passed to in_groups_of commit acac631 refs/heads/master Author: Xavier Shay Date: 2014-07-30 20:00:31 -0700 Raise a descriptive error if non-positive integer passed to in_groups_of. This is more consistent than the current behaviour of raising a `ZeroDivisionError: divided by 0` error when 0 is given, which can be non-obvious especially if `in_groups_of` is part of a longer chain of methods. The negative case was ok - "ArgumentError: invalid slice size" - but this error is clearer still. M activesupport/lib/active_support/core_ext/array/grouping.rb M activesupport/test/core_ext/array/grouping_test.rb commit 29a6a17 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 23:35:30 -0300 Properly assert for the expected messages The message passed to Minitest's assert_raise is used as output in case the assertion fails, but we can test against the exact message by using the actual exception object that is returned from the assert_raise call. M actionview/test/activerecord/polymorphic_routes_test.rb commit 811604f refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 23:16:41 -0300 Avoid defining the test if it does not need to when not on JRuby M railties/test/generators/app_generator_test.rb commit 72c96de refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 23:13:59 -0300 Use default argument when testing generators without the need for extra args M railties/test/generators/app_generator_test.rb M railties/test/generators/plugin_generator_test.rb commit bfc2b23 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 23:09:17 -0300 Simplify path setup M railties/test/generators/generators_test_helper.rb commit 9023e3b refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 23:06:30 -0300 Simplify plugin tests a bit, leave the regexp work for minitest M railties/test/generators/plugin_generator_test.rb commit c8c8fe9 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 23:00:48 -0300 Invert unless..else conditions on JRuby checks M railties/test/generators/app_generator_test.rb M railties/test/generators/plugin_generator_test.rb commit dc9a682 refs/heads/master Merge: 5d4fce6 d952a7a Author: Carlos Antonio da Silva Date: 2014-07-30 22:57:17 -0300 Merge pull request #16352 from gchan/remove-unnecessary-convert-key Removed unnecessary call to 'convert_key' in 'HashWithIndifferentAccess#to_hash' commit 5d4fce6 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 19:57:20 -0300 Remove some more globals from tests We are using blocks here so we have access to the environment around them, no need for globals. M railties/test/application/multiple_applications_test.rb commit 32f4961 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 19:52:51 -0300 Fix / improve some assertions M railties/test/application/configuration_test.rb commit 5fc5665 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-30 19:49:20 -0300 Remove some globals from configuration tests M railties/test/application/configuration_test.rb commit 3429b0c refs/heads/master Author: Aaron Patterson Date: 2014-07-30 18:11:24 -0700 remove useless deup every call to default_resources_path_names allocates a new hash, no need to dup M actionpack/lib/action_dispatch/routing/route_set.rb commit 20ec0d2 refs/heads/master Author: Aaron Patterson Date: 2014-07-30 17:20:37 -0700 push options inside the scope object M actionpack/lib/action_dispatch/routing/mapper.rb commit dc3f25c refs/heads/master Author: Aaron Patterson Date: 2014-07-30 17:19:00 -0700 turn scope in to a linked list this makes scope rollback much easier M actionpack/lib/action_dispatch/routing/mapper.rb commit d952a7a refs/heads/master Author: Gordon Chan Date: 2014-07-31 12:12:32 +1200 Removed unnecessary call to 'convert_key' in 'HashWithIndifferentAccess#to_hash' All the keys are already Strings by virtue of being a HashWithIndifferentAccess. M activesupport/lib/active_support/hash_with_indifferent_access.rb commit 8d7dea7 refs/heads/master Author: eileencodes Date: 2014-07-21 17:50:31 -0400 Redefine macro checks for reflections Now that we define the macro on the reflection type we no longer need to check `macro == :what` on each type for `belongs_to?` or `has_one?` etc. These now default to false unless it's defined in the reflection class. Reuse existing belongs_to? method to check macros We don't need to do `:belongs_to == macro` anymore becasue we have a `belongs_to?` method. I didn't find this being used anywhere for `has_one?` or `collection?` since they were already fixed. M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/reflection.rb commit 20a277c refs/heads/master Author: Aaron Patterson Date: 2014-07-30 15:27:20 -0700 don't access named routes internals just ask whether or not the route is defined M actionview/lib/action_view/test_case.rb commit 68aea29 refs/heads/master Author: Aaron Patterson Date: 2014-07-30 14:53:28 -0700 remove alias_method_chain we can `super` in to the previous implementation. M actionpack/lib/action_dispatch/routing/route_set.rb commit 0960327 refs/heads/master Author: Aaron Patterson Date: 2014-07-30 14:51:28 -0700 avoid instrospection on the module we already know what helpers are path helpers, so just iterate through that list and define the helpers with warnings M actionpack/lib/action_dispatch/routing/route_set.rb commit d9108ab refs/heads/master Author: Aaron Patterson Date: 2014-07-30 14:46:45 -0700 fix variable name M actionpack/lib/action_dispatch/routing/route_set.rb commit 210b338 refs/heads/master Author: Aaron Patterson Date: 2014-07-30 14:46:07 -0700 split path_helpers and url_helpers this lets us avoid hard coding a regexp for separating path and url helpers in the clear! method. M actionpack/lib/action_dispatch/routing/route_set.rb commit cf6658c refs/heads/master Author: Aaron Patterson Date: 2014-07-30 14:38:50 -0700 `add` will remove the method if it exists already M actionpack/lib/action_dispatch/routing/route_set.rb commit bd944e0 refs/heads/master Merge: 30194a5 2bbcca0 Author: Xavier Noria Date: 2014-07-30 23:08:59 +0200 Merge pull request #15840 from schneems/schneems/deprecate-mailer_path_methods Deprecate `*_path` methods in mailers commit 30194a5 refs/heads/master Merge: 7657a03 cf62988 Author: Rafael Mendonça França Date: 2014-07-30 15:31:39 -0300 Merge pull request #16346 from JackDanger/remove_redundant_self_in_class_method_calls Remove redundant `self.` in class method calls commit cf62988 refs/heads/master Author: Jack Danger Canty Date: 2014-07-30 11:29:12 -0700 Remove redundant `self.` in class method calls These are the only instances of this in the whole code base. M activerecord/lib/active_record/migration.rb commit 7657a03 refs/heads/master Merge: 4efb36e 29e8957 Author: Rafael Mendonça França Date: 2014-07-30 15:25:39 -0300 Merge pull request #16345 from robin850/rbx-tidy-bytes Prevent using String#scrub on Rubinius commit 29e8957 refs/heads/master Author: Robin Dupret Date: 2014-07-30 20:18:03 +0200 Prevent using String#scrub on Rubinius Rubinius' has built-in support for String#scrub but it doesn't have yet support for ASCII-incompatible chars so for now, we should rely on the old implementation of #tidy_bytes. M activesupport/lib/active_support/multibyte/unicode.rb commit 2bbcca0 refs/heads/master Author: @schneems and @sgrif Date: 2014-06-19 17:26:29 -0500 Deprecate `*_path` methods in mailers Email does not support relative links since there is no implicit host. Therefore all links inside of emails must be fully qualified URLs. All path helpers are now deprecated. When removed, the error will give early indication to developers to use `*_url` methods instead. Currently if a developer uses a `*_path` helper, their tests and `mail_view` will not catch the mistake. The only way to see the error is by sending emails in production. Preventing sending out emails with non-working path's is the desired end goal of this PR. Currently path helpers are mixed-in to controllers (the ActionMailer::Base acts as a controller). All `*_url` and `*_path` helpers are made available through the same module. This PR separates this behavior into two modules so we can extend the `*_path` methods to add a Deprecation to them. Once deprecated we can use this same area to raise a NoMethodError and add an informative message directing the developer to use `*_url` instead. The module with warnings is only mixed in when a controller returns false from the newly added `supports_relative_path?`. Paired @sgrif & @schneems M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/railtie.rb M actionpack/lib/abstract_controller/base.rb M actionpack/lib/abstract_controller/railties/routes_helpers.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/routing/helper_test.rb M actionview/lib/action_view/rendering.rb M guides/source/action_mailer_basics.md M railties/lib/rails/engine.rb M railties/test/application/initializers/frameworks_test.rb M railties/test/application/mailer_previews_test.rb commit 4efb36e refs/heads/master Author: Santiago Pastorino Date: 2014-07-30 09:46:08 -0300 Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require" This reverts commit f632f79b8dcd144408c66a544984b2ba9cf52f87, reversing changes made to 98c7fe87690ca4de6c46e8f69806e82e3f8af42d. Closes #16343 M actionpack/lib/action_dispatch/testing/integration.rb M activesupport/lib/active_support/test_case.rb M railties/test/generators/argv_scrubber_test.rb M railties/test/generators/generator_test.rb commit 53b07ea refs/heads/master Merge: 63f92c0 d1f9b08 Author: David Heinemeier Hansson Date: 2014-07-29 17:05:07 -0700 Merge pull request #101 from DouweM/patch-9 Rename variables for consistency. commit 74c31ac refs/heads/master Merge: c56997e 94b6207 Author: Rafael Mendonça França Date: 2014-07-29 18:08:07 -0300 Merge pull request #15959 from aditya-kapoor/remove-unneeded-cases remove unneeded test model for ActiveModel test cases. commit c56997e refs/heads/master Merge: 160cc69 0cb3cc4 Author: David Heinemeier Hansson Date: 2014-07-29 13:38:24 -0700 Merge pull request #16339 from rwz/with_options_implicit Add implicit receiver support to `Object#with_options` commit 0cb3cc4 refs/heads/master Author: Pavel Pravosud Date: 2014-07-29 13:50:56 -0400 Add implicit receiver support to `Object#with_options` M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/with_options.rb M activesupport/test/option_merger_test.rb commit 160cc69 refs/heads/master Merge: d7b726b dd9829a Author: Rafael Mendonça França Date: 2014-07-29 16:24:17 -0300 Merge pull request #16335 from arthurnn/rm_parent_state_trasaction Remove @state.parent assignment on commit commit d7b726b refs/heads/master Author: Aaron Patterson Date: 2014-07-29 12:15:52 -0700 oops! :bomb: use helpers.include? so we don't get any false positives M actionpack/lib/action_dispatch/routing/route_set.rb commit f889831 refs/heads/master Author: Aaron Patterson Date: 2014-07-29 12:15:04 -0700 ask the named routes collection if the route is defined we should not be accessing internals to figure out if a method is defined. M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/lib/action_dispatch/testing/assertions/routing.rb commit 0088b08 refs/heads/master Author: Aaron Patterson Date: 2014-07-29 11:48:14 -0700 helpers should be a Set so it doesn't grow unbounded since helpers is a set, we can be confident about when to remove methods from the module. M actionpack/lib/action_dispatch/routing/route_set.rb commit 41931b8 refs/heads/master Author: Aaron Patterson Date: 2014-07-29 11:32:17 -0700 pass the module to define_named_route_methods after this, we can disconnect @module from the instance M actionpack/lib/action_dispatch/routing/route_set.rb commit a2e9266 refs/heads/master Author: Aaron Patterson Date: 2014-07-29 11:28:45 -0700 only ask for the routes module once we can cache the module on the stack, then reuse it M actionpack/lib/action_dispatch/routing/route_set.rb commit d2d3376 refs/heads/master Author: Aaron Patterson Date: 2014-07-29 11:07:36 -0700 eval_block should be private M actionpack/lib/action_dispatch/routing/route_set.rb commit a240ad0 refs/heads/master Author: Zachary Scott Date: 2014-07-29 10:28:56 -0700 :nail_care: from #16329 [ci skip] M guides/source/routing.md commit 89ad1d8 refs/heads/master Merge: d035124 3d42330 Author: Zachary Scott Date: 2014-07-29 10:27:33 -0700 Merge pull request #16329 from deependersingla/master GET request should not write to database note added. [ci skip] commit 3d42330 refs/heads/master Author: Deepender Singla Date: 2014-07-29 22:48:50 +0530 Get request should not write to database note added. [skip ci] M guides/source/routing.md commit d035124 refs/heads/master Merge: 8426897 6bc7e27 Author: Rafael Mendonça França Date: 2014-07-29 11:48:46 -0300 Merge pull request #16336 from akshay-vishnoi/fix-tests Add missing test case for Array#to_sentence, collect all test cases for Object#to_param at one place and avoid repitition commit dd9829a refs/heads/master Author: Arthur Neves Date: 2014-07-29 10:09:06 -0400 Remove @state.parent assignment on commit This piece of code was introduced on 67d8bb963d5d51fc644d6b1ca20164efb4cee6d7 , which was calling `committed?` in the `transaction_state` before calling the `committed!` method. However on 7386ffc781fca07a0c656db49fdb54678caef809, the `committed?` check was removed and replaced by a `finalized?`, which only checks if the state is not nil. Thus we can remove that line. M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb commit 6bc7e27 refs/heads/master Author: Akshay Vishnoi Date: 2014-07-29 20:05:36 +0530 Add missing test case for Array#to_sentence, collect all test cases for Object#to_param at one place and avoid repitition M activesupport/test/core_ext/array/conversions_test.rb M activesupport/test/core_ext/object/to_param_test.rb commit 8426897 refs/heads/master Merge: aade0a0 00979fd Author: Rafael Mendonça França Date: 2014-07-29 10:59:53 -0300 Merge pull request #16334 from akshay-vishnoi/array-tests Move array test files under array commit 3ea18d6 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-07-29 14:52:36 +0200 docs, cleanup mixed indents within `form_options_helper.rb` RDoc. [ci skip] This fixes the broken code block rendering and indents the examples within the parameter list. M actionview/lib/action_view/helpers/form_options_helper.rb commit aade0a0 refs/heads/master Author: Yves Senn Date: 2014-07-29 14:52:36 +0200 docs, cleanup mixed indents within `form_options_helper.rb` RDoc. [ci skip] This fixes the broken code block rendering and indents the examples within the parameter list. M actionview/lib/action_view/helpers/form_options_helper.rb commit 00979fd refs/heads/master Author: Akshay Vishnoi Date: 2014-07-29 18:13:52 +0530 Move array test files under array A activesupport/test/core_ext/array/access_test.rb A activesupport/test/core_ext/array/conversions_test.rb A activesupport/test/core_ext/array/extract_options_test.rb A activesupport/test/core_ext/array/grouping_test.rb A activesupport/test/core_ext/array/prepend_append_test.rb A activesupport/test/core_ext/array/wrap_test.rb D activesupport/test/core_ext/array_ext_test.rb commit c5fc7b5 refs/heads/master Merge: 94abb92 7413eee Author: Robin Dupret Date: 2014-07-29 13:24:16 +0200 Merge pull request #16332 from shizm/fix-docs-validates-uniqueness-of [ci skip] fix doc typo for validates_uniqueness_of commit 7413eee refs/heads/master Author: Satoru Yamasaki Date: 2014-07-29 20:07:17 +0900 [ci skip] fix doc typo for validates_uniqueness_of M activerecord/lib/active_record/validations/uniqueness.rb commit cb5d889 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-07-29 12:20:35 +0200 Merge pull request #16328 from noinkling/template_password_confirmation_fix Give password_confirmation div the "field" class in the scaffold generator "_form" partial Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb commit a553554 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-07-29 12:20:35 +0200 Merge pull request #16328 from noinkling/template_password_confirmation_fix Give password_confirmation div the "field" class in the scaffold generator "_form" partial Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb commit 94abb92 refs/heads/master Merge: 540bc3d ed29c0a Author: Yves Senn Date: 2014-07-29 12:20:35 +0200 Merge pull request #16328 from noinkling/template_password_confirmation_fix Give password_confirmation div the "field" class in the scaffold generator "_form" partial commit d1f9b08 refs/heads/master Author: Douwe Maan Date: 2014-07-29 11:00:26 +0200 Rename variables for consistency. M lib/active_job/queue_adapters/que_adapter.rb commit 818b5ec refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-07-29 01:38:43 -0700 Fixed CHANGELOG formating [ci skip] M activesupport/CHANGELOG.md commit e26c571 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-07-29 01:35:49 -0700 Merge pull request #16148 from rails/fix_json_autoload Fix json autoload Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/json.rb A activesupport/test/core_ext/object/json_cherry_pick_test.rb commit 540bc3d refs/heads/master Merge: b8120ab bf7fbe6 Author: Godfrey Chan Date: 2014-07-29 01:35:49 -0700 Merge pull request #16148 from rails/fix_json_autoload Fix json autoload commit b8120ab refs/heads/master Author: Yves Senn Date: 2014-07-29 09:21:47 +0200 Raise an exception when attachments are added after `mail` was called. Closes #16163 Adding attachments after a call to `mail` will result in invalid emails. This is related to the fact, that `mail` is making the required preparations before the email is ready to be sent. These change depending on your added attachments. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb commit bf7fbe6 refs/heads/master Author: Godfrey Chan Date: 2014-07-12 03:03:35 -0700 Fixed a compatibility issue with the `Oj` gem `Time#as_json`, `Date#as_json` and `DateTime#as_json` incorrectly depends on a delegation that is set up in `active_support/json/encoding`. We cannot simply require that file in `core_ext/object/json` because it would cause a circular dependency problem (see #12203 for background). We should instead rely on AS's autoload to load that file for us on-demand. To trigger autoload correctly, we need to reference the `AS::JSON::Encoding` constant instead of using the delegated version. Fixes #16131. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/json.rb commit 5de072c refs/heads/master Author: Godfrey Chan Date: 2014-07-12 02:58:43 -0700 Added failing test case for #16131 A activesupport/test/core_ext/object/json_cherry_pick_test.rb commit ed29c0a refs/heads/master Author: noinkling Date: 2014-07-29 16:16:31 +1200 Give password_confirmation div the "field" class in erb form template M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb commit 63f92c0 refs/heads/master Merge: 2c31b18 21730de Author: David Heinemeier Hansson Date: 2014-07-28 20:33:03 -0700 Merge pull request #100 from timriley/fix-que-class-serialization Fix database serialization of job class names with Que commit 21730de refs/heads/master Author: Tim Riley Date: 2014-07-29 09:58:13 +1000 Fix database serialization of job class names with Que When passing a class constant as a job argument, Que’s stored procedures serialize it to JSON in the database as `{}`. This means that when the job (the ActiveJob “wrapper”) is deserialized from the database, it can’t find the original job class to run again. Changing the Que adapter to serialize the job class as a string fixes this behaviour. This change makes the adapter consistent with other adapters too (which constantize a class string in their JobWrapper#perform methods. M lib/active_job/queue_adapters/que_adapter.rb commit 6924f84 refs/heads/master Merge: 3ac731c c420a8d Author: Rafael Mendonça França Date: 2014-07-28 20:51:21 -0300 Merge pull request #15629 from akshay-vishnoi/test-to_param Define Hash#to_query and set Hash#to_param as alias to it; with test cases commit 3ac731c refs/heads/master Merge: 55cedf2 a45d1f6 Author: Rafael Mendonça França Date: 2014-07-28 20:42:27 -0300 Merge pull request #15658 from akshay-vishnoi/object-tests Move object test files under object commit a45d1f6 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-12 07:54:41 +0530 Move object test files under object A activesupport/test/core_ext/object/acts_like_test.rb A activesupport/test/core_ext/object/instance_variables_test.rb A activesupport/test/core_ext/object/try_test.rb D activesupport/test/core_ext/object_and_class_ext_test.rb commit 55cedf2 refs/heads/master Merge: 9f63a78 2a7cf24 Author: Rafael Mendonça França Date: 2014-07-28 20:15:52 -0300 Merge pull request #16326 from itsNikolay/remove_blank_lines remove blank lines at the start of the ActiveRecord files commit 2a7cf24 refs/heads/master Author: Ponomarev Nikolay Date: 2014-07-29 02:51:08 +0400 remove blank lines in the start of the ActiveRecord files M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/associations/has_one_association.rb M activerecord/lib/active_record/connection_adapters/schema_cache.rb M activerecord/lib/active_record/query_cache.rb M activerecord/lib/active_record/readonly_attributes.rb M activerecord/lib/active_record/relation/batches.rb M activerecord/lib/active_record/schema.rb M activerecord/lib/active_record/timestamp.rb commit 9f63a78 refs/heads/master Author: Aaron Patterson Date: 2014-07-28 14:07:53 -0700 remove the mounted? method we know the routes should not be "optimized" when mounting an application M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit 099fd0e refs/heads/master Author: Aaron Patterson Date: 2014-07-28 13:57:05 -0700 remove some caching this caching doesn't increase performance, but does increase complexity. remove it for now and find better ways to speed up this code. M actionpack/lib/action_dispatch/routing/url_for.rb commit 6f66e73 refs/heads/master Merge: f5cec76 9fb2fdc Author: Rafael Mendonça França Date: 2014-07-28 15:07:30 -0300 Merge pull request #16305 from tomkadwill/documented_change_table Added documentation for change_table commit f5cec76 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-28 15:04:31 -0300 Extract the transaction class to a local variable M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb commit 6501aeb refs/heads/master Merge: 4e116c5 d37bcc1 Author: Rafael Mendonça França Date: 2014-07-28 15:02:28 -0300 Merge pull request #16284 from arthurnn/transactions Transactions refactoring commit d37bcc1 refs/heads/master Author: Arthur Neves Date: 2014-07-28 13:25:19 -0400 savepoint_name should return nil for non-savepoint transactions Also add test to assets the savepoint name M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/test/cases/transactions_test.rb commit 97bb76d refs/heads/master Author: Arthur Neves Date: 2014-07-24 13:37:49 -0400 Transactions refactoring Add a transaction manager per connection, so it can controls the connection responsibilities. Delegate transaction methods to transaction_manager M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 4e116c5 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-28 13:44:37 -0300 Fix typo and remove code block since present is not a method. M activerecord/lib/active_record/base.rb commit a09f025 refs/heads/master Author: Yves Senn Date: 2014-07-28 17:30:43 +0200 docs, clarify attribute query methods on numeric columns. Closes #16246. [ci skip] M activerecord/lib/active_record/base.rb commit 171818c refs/heads/master Merge: 64e2e81 f6a52f1 Author: Yves Senn Date: 2014-07-28 17:22:11 +0200 Merge pull request #16303 from rajcybage/removing_master remove empty unused method commit 9fb2fdc refs/heads/master Author: Tom Kadwill Date: 2014-07-28 15:46:57 +0100 Added nodoc to change_table M activerecord/lib/active_record/migration/command_recorder.rb commit 64e2e81 refs/heads/master Merge: 7bd0af4 75f3584 Author: Rafael Mendonça França Date: 2014-07-28 10:58:23 -0300 Merge pull request #16297 from calebthompson/extract-iterator-method Extract iterator method in AR::SchemaDumper commit 7bd0af4 refs/heads/master Merge: 4738199 2ee8419 Author: Rafael Mendonça França Date: 2014-07-28 10:40:58 -0300 Merge pull request #16295 from kenn/no_stacktrace_drop_task No verbose backtrace by db:drop when database does not exist. commit e025cad refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-07-28 14:00:40 +0200 Merge pull request #16319 from Domon/fix-each-validator-example Fix example code of EachValidator [ci skip] M activemodel/lib/active_model/validator.rb commit a7da19a refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-07-28 14:00:40 +0200 Merge pull request #16319 from Domon/fix-each-validator-example Fix example code of EachValidator [ci skip] M activemodel/lib/active_model/validator.rb commit 4738199 refs/heads/master Merge: 362cbab be58912 Author: Yves Senn Date: 2014-07-28 15:12:02 +0200 Merge pull request #16318 from zuhao/refactor_activerecord_adapter_test make `adapter_test` run order independently. commit be58912 refs/heads/master Author: Zuhao Wan Date: 2014-07-28 17:49:56 +0800 Add where condition so select_one returns the correct record. M activerecord/test/cases/adapter_test.rb commit 362cbab refs/heads/master Merge: d94a0fe 524f7b4 Author: Yves Senn Date: 2014-07-28 14:00:40 +0200 Merge pull request #16319 from Domon/fix-each-validator-example Fix example code of EachValidator [ci skip] commit 524f7b4 refs/heads/master Author: Chun-wei Kuo Date: 2014-07-28 18:21:33 +0800 Fix example code of `EachValidator` [ci skip] We have to specify the `:title` option to really use the `TitleValidator` defined above. M activemodel/lib/active_model/validator.rb commit d94a0fe refs/heads/master Merge: 69133a4 bd54e19 Author: Jeremy Kemper Date: 2014-07-27 18:09:30 -0700 Merge pull request #16315 from eileencodes/fix-documentation-that-mentions-macro-instance-var Fix documentation for `@macro` and reflection types commit bd54e19 refs/heads/master Author: eileencodes Date: 2014-07-27 19:35:00 -0400 [ci skip] Fix documentation for @macro and reflection types Since `@macro` doesn't exist anymore and these reflections are no longer AssociationReflections but their own types of reflections based on macro I updated the documentation to match the changes I made in #16089 and #16198. An `AssociationReflection` that had a `@macro` of `:has_many` now is a `HasManyReflection` M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/reflection.rb commit 2ee8419 refs/heads/master Author: Kenn Ejima Date: 2014-07-25 11:40:28 -0700 No verbose backtrace by db:drop when database does not exist. M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb commit 69133a4 refs/heads/master Merge: da1b8a7 dce49f8 Author: Guillermo Iguaran Date: 2014-07-27 12:41:01 -0500 Merge pull request #16282 from davidbalbert/patch-1 Fix protect_from_forgery docs [ci-skip] commit dce49f8 refs/heads/master Author: David Albert Date: 2014-07-24 12:57:13 -0400 Fix protect_from_forgery docs M actionpack/lib/action_controller/metal/request_forgery_protection.rb commit 4bfd0ce refs/heads/master Author: Vasily Polovnyov Date: 2014-07-26 22:34:56 +0400 [ci skip] Clarify the "Serialized Attributes" section Mention that the change in nil handling for serialized attributes affects custom coders. M guides/source/upgrading_ruby_on_rails.md commit 9c8826b refs/heads/master Author: Vasily Polovnyov Date: 2014-07-25 23:44:05 +0400 [ci skip] Mention the change in nil handling for serialized attributes in "Upgrading from Rails 3.2 to Rails 4.0" M guides/source/upgrading_ruby_on_rails.md commit f6a52f1 refs/heads/master Author: Rajarshi Das Date: 2014-07-26 10:23:35 +0530 add comment to the empty each method for not removing it in future M actionpack/test/dispatch/debug_exceptions_test.rb commit da1b8a7 refs/heads/master Author: David Heinemeier Hansson Date: 2014-07-25 16:35:16 -0700 Fix that render layout should also be picked up by the template dependency tracker, but only half-ways. You can add that layout option on the same render call, and both templates should be added to the dependency tree. But thats going to require a more serious rework of the tracker. Please do help fix this part of it too. For now, render layout needs to be on its own line. M actionview/CHANGELOG.md M actionview/lib/action_view/dependency_tracker.rb M actionview/test/template/dependency_tracker_test.rb commit 42c5d81 refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-07-25 16:35:16 -0700 Fix that render layout should also be picked up by the template dependency tracker, but only half-ways. You can add that layout option on the same render call, and both templates should be added to the dependency tree. But thats going to require a more serious rework of the tracker. Please do help fix this part of it too. For now, render layout needs to be on its own line. M actionview/CHANGELOG.md M actionview/lib/action_view/dependency_tracker.rb M actionview/test/template/dependency_tracker_test.rb commit 75f3584 refs/heads/master Author: Caleb Thompson Date: 2014-07-25 13:30:23 -0500 Extract iterator method in AR::SchemaDumper Gems which wish to tie into ActiveRecord::SchemaDumper need to duplicate this logic currently. [Foreigner] is one such example, as is a library I'm currently working on but which hasn't been released yet: def tables_with_foreign_keys(stream) tables_without_foreign_keys(stream) @connection.tables.sort.each do |table| next if ['schema_migrations', ignore_tables].flatten.any? do |ignored| case ignored when String; table == ignored when Regexp; table =~ ignored else raise StandardError, 'ActiveRecord::SchemaDumper.ignore_tables accepts an array of String and / or Regexp values.' end end foreign_keys(table, stream) end end [Foreigner]: https://github.com/matthuhiggins/foreigner/blob/master/lib/foreigner/schema_dumper.rb#L36-L43 Extract the skip logic to a method, making it much simpler to follow this same behavior in gems that are tying into the migration flow and let them dump only tables that aren't skipped without copying this block of code. The above code could then be simplified to: def tables_with_foreign_keys(stream) tables_without_foreign_keys(stream) @connection.tables.sort.each do |table| foreign_keys(table, stream) unless ignored?(table) end end It also, in my opinion, simplifies the logic on ActiveRecord's side, and clarifies the intent of the skip logic. M activerecord/lib/active_record/schema_dumper.rb commit a851f13 refs/heads/master Merge: 48cd7d3 775cc7d Author: Zachary Scott Date: 2014-07-25 15:04:37 -0400 Merge pull request #16290 from a3gis/master [ci skip] Fix documentation of SQLite3Adapter.columns where SQLite3Column was removed in e781aa31fc52a7c696115302ef4d4e02bfd1533b commit 91d1992 refs/heads/master Author: Benjamin Fleischer Date: 2013-06-27 23:18:30 -0500 Encapsulate rake lines from ActiveRecord/ActionPack as CodeTools::LineStatistics [ci skip] M actionpack/Rakefile M activerecord/Rakefile A tools/line_statistics commit 3cbeb8d refs/heads/master Author: Benjamin Fleischer Date: 2014-07-25 13:23:54 -0500 Fail profiler fast when input is not a ruby file [ci skip] M tools/profile commit 54a4065 refs/heads/master Author: Benjamin Fleischer Date: 2014-07-25 13:06:22 -0500 Optionally add String extensions for ruby-prof printer option [ci skip] M tools/profile commit f36c467 refs/heads/master Author: Benjamin Fleischer Date: 2014-07-25 12:09:49 -0500 Encapsulate tools/profile functionality in CodeTools::Profiler Fix bug in path expansion of input filepath [ci skip] M tools/profile commit 65a227b refs/heads/master Author: Benjamin Fleischer Date: 2014-07-25 12:02:09 -0500 Correct tools/profile usage example [ci skip] M tools/profile commit 780fd61 refs/heads/master Author: Benjamin Fleischer Date: 2013-08-14 09:35:14 -0500 Remove unused, broken, legacy ruby-prof extension from 2005 [ci skip] D railties/lib/rails/rubyprof_ext.rb commit 48cd7d3 refs/heads/master Merge: 6d87b78 31d3782 Author: Rafael Mendonça França Date: 2014-07-25 13:39:59 -0300 Merge pull request #16285 from noinkling/password_digest_docs Add password:digest information to scaffold generator help text commit 775cc7d refs/heads/master Author: a3gis Date: 2014-07-25 18:32:04 +0200 Remove references to SQLite3Column from documentation M activerecord/lib/active_record/attribute_methods.rb commit 8f32ddb refs/heads/master Author: a3gis Date: 2014-07-25 18:03:17 +0200 Fix documentation of SQlite3Adapter.columns As of https://github.com/rails/rails/commit/e781aa31fc52a7c696115302ef4d4e02bfd1533b SQLite3Column has been dropped. M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 6d87b78 refs/heads/master Author: Yves Senn Date: 2014-07-25 15:30:38 +0200 docs, add ref where to find valid `head` status symbols. [ci skip] M actionpack/lib/action_controller/metal/head.rb commit 38c2fec refs/heads/master Merge: 1ec601b 0f9118a Author: Yves Senn Date: 2014-07-25 11:26:04 +0200 Merge pull request #16258 from mattwarrenrnp/master adding indexes on tables in migration scripts [ci skip] commit 1ec601b refs/heads/master Merge: 75eddfb 99b82fd Author: Yves Senn Date: 2014-07-25 11:16:20 +0200 Merge pull request #16220 from pcreux/postgresql-jsonb-support Add support for Postgresql JSONB commit 75eddfb refs/heads/master Merge: 3f4e97f e6f2d4f Author: Matthew Draper Date: 2014-07-25 17:14:53 +0930 Merge pull request #16272 from tgxworld/fix_template_assertion_when_opening_a_session Fix template assertion when opening a session. commit 31d3782 refs/heads/master Author: noinkling Date: 2014-07-25 17:59:53 +1200 Additional clarification on password:digest in scaffold and model generator help [ci skip] M railties/lib/rails/generators/rails/model/USAGE M railties/lib/rails/generators/rails/scaffold/USAGE commit 2a7fcc8 refs/heads/master Author: noinkling Date: 2014-07-25 15:55:55 +1200 Add password:digest information to scaffold generator help text [ci skip] M railties/lib/rails/generators/rails/scaffold/USAGE commit 0f9118a refs/heads/master Author: Matt Warren Date: 2014-07-22 09:27:57 -0600 adding indexes on tables in migration scripts missed one migration script in last commit remove some empty lines using the belongs_to index option to be more concise M guides/source/association_basics.md commit 368525a refs/heads/master Author: Arthur Neves Date: 2014-07-24 16:25:34 -0400 Remove finishing? method from transaction. The finishing variable on the transaction object was a work-around for the savepoint name, so after a rollback/commit the savepoint could be released with the previous name. related: 9296e6939bcc786149a07dac334267c4035b623a 60c88e64e26682a954f7c8cd6669d409ffffcc8b M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 5c29265 refs/heads/master Author: Alan Oliver Date: 2014-07-24 00:16:03 +0100 Small Action View Overview edits [ci skip] Some small grammar and readability edits M guides/source/action_view_overview.md commit 99b82fd refs/heads/master Author: Philippe Creux Date: 2014-07-24 10:39:39 -0700 Add support for Postgresql JSONB [Philippe Creux, Chris Teague] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 3f4e97f refs/heads/master Merge: 5f25435 c17c262 Author: Santiago Pastorino Date: 2014-07-24 13:51:51 -0300 Merge pull request #16281 from arthurnn/copy_default_proc_hwia Make HWIA copy the default proc too. commit e6f2d4f refs/heads/master Author: Guo Xiang Tan Date: 2014-07-25 00:43:45 +0800 Improve description of tests. M actionpack/test/dispatch/template_assertions_test.rb commit cc10288 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-24 10:59:29 +0800 Bug fix for assert_template when opening a new session. See https://github.com/rails/rails/pull/16234#commitcomment-7115670. M actionpack/lib/action_controller/test_case.rb M actionpack/test/dispatch/template_assertions_test.rb commit c17c262 refs/heads/master Author: Arthur Neves Date: 2014-07-24 11:48:24 -0400 Make HWIA copy the default proc too. [fixes #16279] M activesupport/CHANGELOG.md M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit 5f25435 refs/heads/master Author: Yves Senn Date: 2014-07-24 17:19:43 +0200 tests, run adapter specific rake tests only for the right adapter. M activerecord/test/cases/tasks/mysql_rake_test.rb M activerecord/test/cases/tasks/postgresql_rake_test.rb M activerecord/test/cases/tasks/sqlite_rake_test.rb commit e63ae63 refs/heads/master Author: Yves Senn Date: 2014-07-24 17:00:14 +0200 build fix, fix error introduced with 091b246bb0111357edbb9703ea342a944b04deb6 Fixes the following issue: 1) Failure: ActiveRecord::MySQLPurgeTest#test_establishes_connection_to_test_database [test/cases/tasks/mysql_rake_test.rb:200]: not all expectations were satisfied unsatisfied expectations: - expected exactly once, not yet invoked: ActiveRecord::Base.establish_connection(:test) satisfied expectations: - allowed any number of times, invoked once: #.recreate_database(any_parameters) - allowed any number of times, invoked once: ActiveRecord::Base.establish_connection(any_parameters) - allowed any number of times, invoked once: ActiveRecord::Base.connection(any_parameters) M activerecord/test/cases/tasks/mysql_rake_test.rb commit 091b246 refs/heads/master Author: Yves Senn Date: 2014-07-24 16:38:41 +0200 fix, mysql `db:purge` respects `Rails.env`. Previously this method always established a connection to the test database. This resulted in buggy behavior when combined with other tasks like `bin/rake db:schema:load`. This was one of the reasons why #15394 (22e9a91189af2c4e6217a888e77f22a23d3247d1) was reverted: > I’ve replicated it on a new app by the following commands: 1) rails generate model post:title, 2) rake db:migrate, 3) rake db:schema:load, 4) rails runner ‘puts Post.first’. The last command goes boom. Problem is that rake db:schema:load wipes the database, and then doesn’t actually restore it. This is all on MySQL. There’s no problem with SQLite. -- DHH https://github.com/rails/rails/commit/22e9a91189af2c4e6217a888e77f22a23d3247d1#commitcomment-6834245 M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/mysql_database_tasks.rb commit c093216 refs/heads/master Author: a3gis Date: 2014-07-24 14:23:36 +0100 Fix documentation typo in ConnectionSpecification::Resolve.spec M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 98d2421 refs/heads/master Author: a3gis Date: 2014-07-24 14:21:55 +0100 Fixes #16265 M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit a208fb7 refs/heads/master Author: Yves Senn Date: 2014-07-24 14:52:51 +0200 clenaup, unify CHANGELOG format. [ci skip] M activerecord/CHANGELOG.md commit fa78378 refs/heads/master Merge: 2a67e12 c093216 Author: Matthew Draper Date: 2014-07-24 22:08:16 +0930 Merge pull request #16280 from a3gis/master Fixes #16265 and correct documentation typo commit 2a67e12 refs/heads/master Author: Yves Senn Date: 2014-07-24 14:27:41 +0200 pg, `change_column_default, :table, :column, nil` issues `DROP DEFAULT`. Closes #16261. [Matthew Draper, Yves Senn] Using `DEFAULT NULL` results in the same behavior as `DROP DEFAULT`. However, PostgreSQL will cast the default to the columns type, which leaves us with a default like "default NULL::character varying". /cc @matthewd M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit f3478f8 refs/heads/master Merge: 7e20b94 ea88b8e Author: Matthew Draper Date: 2014-07-24 20:36:34 +0930 Merge pull request #16276 from y-yagi/bug_report_templates [ci skip]Add i18n master to the Gemfile commit ea88b8e refs/heads/master Author: yuuji.yaginuma Date: 2014-07-24 17:08:11 +0900 [ci skip]Add i18n master to the Gemfile M guides/bug_report_templates/action_controller_master.rb M guides/bug_report_templates/active_record_master.rb commit 7e20b94 refs/heads/master Merge: b17330c 2e679ac Author: Matthew Draper Date: 2014-07-24 17:30:22 +0930 Merge pull request #16260 from akshay-vishnoi/doc-change Calling require_self twice in css raises Sprockets::ArgumentError exception [ci skip] commit 2e679ac refs/heads/master Author: Akshay Vishnoi Date: 2014-07-24 11:39:41 +0530 Calling require_self twice in css raises Sprockets::ArgumentError exception [ci skip] M guides/source/asset_pipeline.md commit b17330c refs/heads/master Author: Rafael Mendonça França Date: 2014-07-23 19:01:44 -0300 Remove mocha usage M railties/test/commands/console_test.rb commit 23cb26c refs/heads/master Author: Rafael Mendonça França Date: 2014-07-23 18:30:27 -0300 Fix syntax error M railties/lib/rails/generators/app_base.rb commit ecef177 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-23 18:05:18 -0300 Dev and edge application and plugins need to include i18n master M railties/lib/rails/generators/app_base.rb commit bec08e7 refs/heads/master Merge: cd7d414 558f8aa Author: Rafael Mendonça França Date: 2014-07-23 17:45:15 -0300 Merge pull request #16267 from robin850/rbx-yaml Set Psych as the YAML engine for Rubinius commit cd7d414 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-23 17:40:44 -0300 Do not set enforce_available_locales to i18n 0.7 Now the default is always true. Users still can set it using config.i18n.enforce_available_locales. M activesupport/activesupport.gemspec M activesupport/lib/active_support/i18n_railtie.rb M railties/test/application/initializers/i18n_test.rb commit 558f8aa refs/heads/master Author: Robin Dupret Date: 2014-07-23 19:24:16 +0200 Set Psych as the YAML engine for Rubinius Since the rubysl-yaml gem doesn't ship with Psych by default because of its dependency on libyaml, on Rubinius, the default engine is Syck. However, if we want to be able to run the application safely on different rubies, we need to make people using Rubinius rely on Psych. See http://git.io/uuLVag for further information. M Gemfile M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit af216b7 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-23 14:58:59 -0300 Split Action Pack tests in a new job on travis This will make easier to compare run time between Ruby 2.1 and trunk M .travis.yml commit decb83b refs/heads/master Author: Rafael Mendonça França Date: 2014-07-23 14:40:43 -0300 Use PROCESS_COUNT to define the number of parallel executors M actionpack/test/abstract_unit.rb commit 0b773c3 refs/heads/master Author: Aaron Patterson Date: 2014-07-23 10:38:41 -0700 specify N=0 to prevent parallel tests (just run tests on the main process) M actionpack/test/abstract_unit.rb commit 8c48a70 refs/heads/master Merge: 74a157a d0af905 Author: Arthur Nogueira Neves Date: 2014-07-23 13:02:12 -0400 Merge pull request #16237 from tonytonyjan/patch `create` method returns an active record object with errors instead of false when validation fails. [skip ci] commit d0af905 refs/heads/master Author: Tony Jian Date: 2014-07-21 16:48:37 +0800 `create` return an active record object with erros instead of false when validation fails. [skip ci] M guides/source/active_record_basics.md commit 330df51 refs/heads/master Author: Zuhao Wan Date: 2014-07-23 12:28:19 +0800 reset_column_infomation shouldn't be part of the assertion. M activerecord/test/cases/serialized_attribute_test.rb commit 74a157a refs/heads/master Merge: 1db0069 d14f646 Author: Yves Senn Date: 2014-07-22 22:19:17 +0200 Merge pull request #16234 from tgxworld/fix_template_assertion_for_integration_test Fix AC::TemplateAssertions instance variables not resetting. commit 1db0069 refs/heads/master Merge: aa3740e 28b3180 Author: Rafael Mendonça França Date: 2014-07-22 11:27:31 -0300 Merge pull request #16256 from akshay-vishnoi/doc-change Fixes #16255 [ci skip] commit 28b3180 refs/heads/master Author: Akshay Vishnoi Date: 2014-07-22 19:19:32 +0530 Fixes #16255 [ci skip] M guides/source/getting_started.md commit aa3740e refs/heads/master Merge: bb3b2d0 6d327db Author: Yves Senn Date: 2014-07-22 15:04:29 +0200 Merge pull request #16231 from Envek/type_in_references * Allow to specify a type for foreign key column in migrations * unified the docs * some cleanup in CHANGELOG commit 6d327db refs/heads/master Author: Andrey Novikov Date: 2014-07-19 23:38:38 +0400 Allow to specify a type for foreign key column in migrations [Andrey Novikov & Łukasz Sarnacki] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/test/cases/migration/change_table_test.rb M activerecord/test/cases/migration/references_statements_test.rb commit bb3b2d0 refs/heads/master Merge: 16fe198 c40bfc8 Author: Yves Senn Date: 2014-07-22 11:55:47 +0200 Merge pull request #16253 from zuhao/refactor_activerecord_nested_through_associations_test Make sure assertion passes for postgresql. commit 16fe198 refs/heads/master Merge: 4c81c8c 4dfe213 Author: Yves Senn Date: 2014-07-22 11:33:53 +0200 Merge pull request #16254 from zuhao/refactor_activerecord_attribute_decorators_test Remove redundant reset that already happened in teardown. commit 4dfe213 refs/heads/master Author: Zuhao Wan Date: 2014-07-22 17:24:31 +0800 Remove redundant that already happened in teardown. M activerecord/test/cases/attribute_decorators_test.rb commit c40bfc8 refs/heads/master Author: Zuhao Wan Date: 2014-07-22 17:03:26 +0800 Make sure assertion passes for postgresql. M activerecord/test/cases/associations/nested_through_associations_test.rb commit 4c81c8c refs/heads/master Author: Yves Senn Date: 2014-07-22 09:05:33 +0200 build fix, remove not null constraint. The fixtures are still in play, adding a new column without a default and `null: true` is not possible. This reverts back to leaking global state, as our `schema.rb` adds the `null: false` constraint on this field. A future solution would be to make the `migration_test.rb` run independent of fixture tables. This way we can simply drop the state after test execution, without worrying about side effects. /cc @zuhao M activerecord/test/cases/migration_test.rb commit 30a3818 refs/heads/master Merge: ce14ebe 8e30a63 Author: Yves Senn Date: 2014-07-22 08:45:51 +0200 Merge pull request #16250 from zuhao/refactor_activerecord_migration_test Remove length limit that results failure in other tests. commit 8e30a63 refs/heads/master Author: Zuhao Wan Date: 2014-07-22 11:22:05 +0800 Remove length limit that results failure in other tests. M activerecord/test/cases/migration_test.rb commit ce14ebe refs/heads/master Author: Yves Senn Date: 2014-07-22 08:41:25 +0200 docs, add example for running a single test against core adapters. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit fc7a849 refs/heads/master Merge: cee2c85 18cc712 Author: Yves Senn Date: 2014-07-22 08:32:05 +0200 Merge pull request #16248 from zuhao/refactor_activerecord_presence_validation_test Remove the side-effects of validates_presence_of. commit 18cc712 refs/heads/master Author: Zuhao Wan Date: 2014-07-22 10:09:05 +0800 Remove the side-effects of validates_presence_of. M activerecord/test/cases/validations/presence_validation_test.rb commit cee2c85 refs/heads/master Merge: fae9185 3b9cc0a Author: Rafael Mendonça França Date: 2014-07-21 14:25:51 -0300 Merge pull request #16232 from egilburg/activesupport_coverage Added some missing activesupport test coverage commit fae9185 refs/heads/master Merge: 2cb862a35 4b2eb17 Author: Rafael Mendonça França Date: 2014-07-21 13:12:55 -0300 Merge pull request #16239 from akshay-vishnoi/remove-require Remove not-required file class/subclasses commit 2cb862a35 refs/heads/master Merge: 9393068 3b0430f Author: Arthur Nogueira Neves Date: 2014-07-21 11:41:12 -0400 Merge pull request #16242 from vadivelan-k/content_verifier Touch option description grammatical error fixed [ci skip] commit 3b0430f refs/heads/master Author: vadivelan Date: 2014-07-21 20:55:53 +0530 Touch option description grammatical error fixed [ci skip] M activerecord/lib/active_record/associations.rb commit 9393068 refs/heads/master Merge: b849180 7021e66 Author: Eileen M. Uchitelle Date: 2014-07-21 08:19:58 -0400 Merge pull request #16240 from siddharthbhagwan/master Generators guide grammatical error fixed [ci skip] commit 7021e66 refs/heads/master Author: Siddharth Bhagwan Date: 2014-07-21 17:39:20 +0530 Generator guide grammatical error fixed [ci skip] M guides/source/generators.md commit 4b2eb17 refs/heads/master Author: Akshay Vishnoi Date: 2014-07-21 15:46:53 +0530 Remove not-required file class/subclasses M activesupport/test/core_ext/object_and_class_ext_test.rb commit b849180 refs/heads/master Merge: 08754f1 7464d00 Author: Yves Senn Date: 2014-07-21 09:16:52 +0200 Merge pull request #16236 from y-yagi/patch-1 [ci skip] Fix code in Routing Guide commit 7464d00 refs/heads/master Author: yuuji.yaginuma Date: 2014-07-21 11:27:20 +0900 [ci skip] Fix code in Routing Guide M guides/source/routing.md commit d14f646 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-20 22:51:39 +0800 Fix AC::TemplateAssertions instance variables not resetting. Fixes https://github.com/rails/rails/issues/16119. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/testing/integration.rb A actionpack/test/dispatch/template_assertions_test.rb commit 132e3fd refs/heads/master Author: Juanito Fatas Date: 2014-07-20 18:30:27 +0800 [ci skip] Normalize all localhost linking. M guides/source/getting_started.md commit 3b9cc0a refs/heads/master Author: Eugene Gilburg Date: 2014-07-19 12:49:52 -0700 missing activesupport test coverage M activesupport/test/clean_backtrace_test.rb M activesupport/test/core_ext/duration_test.rb M activesupport/test/core_ext/hash_ext_test.rb M activesupport/test/core_ext/load_error_test.rb M activesupport/test/core_ext/object/to_query_test.rb M activesupport/test/core_ext/range_ext_test.rb M activesupport/test/core_ext/string_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb M activesupport/test/core_ext/uri_ext_test.rb M activesupport/test/key_generator_test.rb A activesupport/test/multibyte_proxy_test.rb commit 08754f1 refs/heads/master Merge: 0533893 fd6aaaa Author: Rafael Mendonça França Date: 2014-07-19 18:17:13 -0300 Merge branch 'rm-remove-mocha' Conflicts: actionpack/test/abstract_unit.rb commit fd6aaaa refs/heads/master Author: Rafael Mendonça França Date: 2014-07-19 17:35:12 -0300 Stop requiring mocha automatically We are planning to remove mocha from our test suite because of performance problems. To make this possible we should stop require mocha on ActionSupport::TestCase. This should not affect applications since users still need to add mocha to Gemfile and this already load mocha. Added FIXME notes to place that still need mocha removal M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionview/test/abstract_unit.rb M activemodel/test/cases/helper.rb M activerecord/test/cases/helper.rb M activesupport/lib/active_support/test_case.rb M activesupport/test/abstract_unit.rb M railties/test/generators/actions_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/named_base_test.rb M railties/test/generators/plugin_generator_test.rb M railties/test/generators_test.rb M railties/test/paths_test.rb M railties/test/rails_info_controller_test.rb commit 0533893 refs/heads/master Merge: e89ef3c afc9284 Author: Rafael Mendonça França Date: 2014-07-19 17:25:50 -0300 Merge pull request #16230 from egilburg/before_type_cast_coverage Missing test for form values before type cast commit afc9284 refs/heads/master Author: Eugene Gilburg Date: 2014-07-18 21:34:23 -0700 adding missing test for text area value before type cast M actionview/test/template/form_helper_test.rb commit e89ef3c refs/heads/master Merge: 433c528 080c2ba Author: Rafael Mendonça França Date: 2014-07-19 14:22:00 -0300 Merge pull request #16224 from egilburg/renderer_refactors Some ActionView renderer refactors commit 78788ad refs/heads/master Author: Gaurish Sharma Date: 2014-07-19 20:06:59 +0530 Performed Returns true if redirect/render has happened M actionpack/lib/action_controller/metal.rb commit 433c528 refs/heads/master Merge: 2c60a17 44bf33c Author: Yves Senn Date: 2014-07-19 14:13:25 +0200 Merge pull request #16227 from Aguynamedsteve/typo_correction Fixed typo in comment [ci skip] commit 2c60a17 refs/heads/master Merge: fe6f436 a013b08 Author: Yves Senn Date: 2014-07-19 09:53:35 +0200 Merge pull request #16219 from skanev/fix-create-join-table-with-common-prefix Make create_join_table use the same logic as HABTM reflections commit 44bf33c refs/heads/master Author: Steve Date: 2014-07-19 00:20:41 -0700 Fixed typo in comment M activerecord/lib/active_record/explain.rb commit 080c2ba refs/heads/master Author: Eugene Gilburg Date: 2014-07-18 20:55:22 -0700 adding missing test coverage M actionview/test/template/render_test.rb commit 348de3a refs/heads/master Author: Eugene Gilburg Date: 2014-07-18 20:37:17 -0700 marking private methods which dont work if called on their own anyways M actionview/lib/action_view/renderer/partial_renderer.rb M actionview/lib/action_view/renderer/template_renderer.rb commit 38117ad refs/heads/master Author: Eugene Gilburg Date: 2014-07-18 20:54:03 -0700 small refactors to actionview renderers M actionview/lib/action_view/renderer/abstract_renderer.rb M actionview/lib/action_view/renderer/partial_renderer.rb M actionview/lib/action_view/renderer/template_renderer.rb commit fe6f436 refs/heads/master Merge: 533c035 533472d Author: Rafael Mendonça França Date: 2014-07-18 19:20:31 -0300 Merge pull request #16098 from tgxworld/fixes_to_request_test Fixes to request method test. commit 533c035 refs/heads/master Merge: dc59a08 cc1ad78 Author: Rafael Mendonça França Date: 2014-07-18 18:21:53 -0300 Merge pull request #16212 from aantix/additional_migration_conflict_help_messaging Additional help messaging to help the user resolve a conflicted migration commit dc59a08 refs/heads/master Merge: 843b8c0 86433b8 Author: Godfrey Chan Date: 2014-07-18 10:48:18 -0700 Merge pull request #16221 from arthurnn/14886_pr Cleanup + CHANGELOG for pr #14886 commit 86433b8 refs/heads/master Author: Arthur Neves Date: 2014-07-18 13:27:43 -0400 Add CHANGELOG for #14886 Also cleanup test a bit [related #14886] [related #14743] M actionpack/CHANGELOG.md M actionpack/test/dispatch/request_test.rb commit 9ff18e4 refs/heads/master Author: Earl J St Sauver Date: 2014-04-27 16:41:25 -0700 LOCALHOST definition should match any 127.0.0.0/8 address The entire 127.0.0.0/8 range is assigned to the loopback address, not only 127.0.0.0/24. This patch allows ActionDispatch::Request::LOCALHOST to match any IPv4 127.0.0.0/8 loopback address. The only place that the #local? method was previously under test was in the show_expectations_test.rb file. I don't particularly like that that's implicitly where this code is under test, and I feel like I should move some of that testing code into the test/dispatch/request_test.rb file, but I wanted some feedback first. Credit goes to @sriedel for discovering the issue and adding the patch. M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/controller/show_exceptions_test.rb M actionpack/test/dispatch/request_test.rb commit a013b08 refs/heads/master Author: Stefan Kanev Date: 2014-07-18 19:46:53 +0300 create_join_table uses same logic as HABTM reflections Before this change, create_join_table would not remove the common prefix in the join table name, unlike ActiveRecord::Reflections. A HABTM between Music::Artist and Music::Record would use a table music_artists_records, while create_join table would create music_artists_music_records. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration/join_table.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/migration/create_join_table_test.rb commit cc1ad78 refs/heads/master Author: Jim Jones Date: 2014-07-18 08:51:36 -0700 Modified migration conflict message to remove the string concatenation. M railties/lib/rails/generators/actions/create_migration.rb commit 843b8c0 refs/heads/master Merge: ba9fe6c c965de3 Author: Matthew Draper Date: 2014-07-18 23:42:31 +0930 Merge pull request #15762 from arthurnn/better_error_on_bad_alias_method Dont swallow errors when bad alias_method commit ba9fe6c refs/heads/master Author: Robin Dupret Date: 2014-07-18 11:51:36 +0200 Follow-up to #16097 [ci skip] Even if this is not exactly the same, let's add a new-line character instead of two spaces. While it's specified in the Markdown specs that adding spaces at the end of the line creates a break-line tag, this is a brittle approach as people may remove them saving the file on certain editors. M CONTRIBUTING.md M guides/source/asset_pipeline.md commit e44cb39 refs/heads/master Merge: d4c8068 ee35b79 Author: Yves Senn Date: 2014-07-18 09:09:05 +0200 Merge pull request #16099 from tgxworld/pass_log_as_block Prefer to pass block when logging. commit ee35b79 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-18 14:27:08 +0800 Prefer to pass block when logging. The Logger by default includes a guard which checks for the logging level. By removing the custom logging guards, we can decouple the logging guard from the logging action to be done. This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance. M actionmailer/lib/action_mailer/log_subscriber.rb M actionpack/lib/action_controller/log_subscriber.rb M actionview/lib/action_view/log_subscriber.rb M activesupport/lib/active_support/testing/tagged_logging.rb M railties/lib/rails/rack/logger.rb commit 533472d refs/heads/master Author: Guo Xiang Tan Date: 2014-07-09 08:50:51 +0800 Remove redundant test. Since we're stubbing the request, the test is actually just asserting that `@method = env['REQUEST_METHOD']`. In order to the test against the methodoverride middleware, we should test it against an actual request. However, Rack is already covering this scenario so we can remove this test. M actionpack/test/dispatch/request_test.rb commit 095a545 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-08 23:42:40 +0800 Fix duplicated test. There is already another test covering Request#request_method. This test should cover Request#method. M actionpack/test/dispatch/request_test.rb commit 5e11e41 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-08 23:39:08 +0800 Update test to clearly reflect what it is testing for. M actionpack/test/dispatch/request_test.rb commit 6c5f169 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-08 23:27:59 +0800 Update outdated test. The current test is asserting against an outdated version of Request#method where HEAD requests are treated as GET requests. M actionpack/test/dispatch/request_test.rb commit af3cf61 refs/heads/master Author: Jim Jones Date: 2014-07-17 21:19:07 -0700 Added additional help messaging when there's scaffolding being generated and a migration already exists for the resource. The user is now alerted that they are able to skip the conflicted migration file via the --skip option. M railties/lib/rails/generators/actions/create_migration.rb commit d4c8068 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 18:43:46 -0700 reporting is only done in one thread, so we can safely remove the lock (I think) M actionpack/test/abstract_unit.rb commit be9f868 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 16:08:38 -0700 %i doesn't work on 1.9 M activemodel/lib/active_model/validations.rb commit 2e6b798 refs/heads/master Author: Peter Schröder Date: 2014-07-11 19:42:09 -0400 don't log errors when all is fine M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/fixtures_test.rb commit 5737c8e refs/heads/master Author: Aaron Patterson Date: 2014-07-17 15:36:42 -0700 fix thread safety issues this test case had a race condition where it could download data multiple times. We'll download the data once at class load. M activesupport/test/multibyte_conformance_test.rb commit 5751b7e refs/heads/master Author: Aaron Patterson Date: 2014-07-17 14:43:58 -0700 pass the test reporter by reference this prevents the array from being dumped as a DRbObject so we can reduce communication with the server. the reporter should always exist on the server side, so we don't have to worry about GC M actionpack/test/abstract_unit.rb commit e213b37 refs/heads/master Merge: abd7430 0950d40 Author: Matthew Draper Date: 2014-07-18 07:07:03 +0930 Merge pull request #16210 from sonnym/assert_valid_keys_in_validate Check for valid options in validate method commit 0950d40 refs/heads/master Author: sonnym Date: 2014-07-17 17:02:54 -0400 check for valid options in validate method This change prevents a certain class of user error which results when mistakenly using the `validate` class method instead of the `validates` class method. Only apply when all arguments are symbols, because some validations use the `validate` method and pass in additional options, namely the `LenghValidator` via the `ActiveMode::Validations::validates_with` method. M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations.rb M activemodel/test/cases/validations_test.rb commit abd7430 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 14:04:43 -0700 fix filesystem race condition M actionpack/test/controller/log_subscriber_test.rb commit 8d126c9 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 14:04:25 -0700 do not restart the service, just stop it M actionpack/test/abstract_unit.rb commit d548a36 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 13:10:08 -0700 only parallelize on forking systems M actionpack/test/abstract_unit.rb commit 15fd96a refs/heads/master Author: Rafael Mendonça França Date: 2014-07-17 17:47:58 -0300 Disable some tests on SQLite These tests were passing before because the precision were not using to cast the value. Not it is being used so it would fail on sqlite3 M activerecord/test/cases/migration/column_attributes_test.rb commit f57bafe refs/heads/master Author: Rafael Mendonça França Date: 2014-07-17 17:47:03 -0300 Prefer if/else for this case One of the branches is using a proc to check if the value respond_to a method so it is better to not do case comparations M activerecord/lib/active_record/type/decimal.rb commit 8e3d943 refs/heads/master Merge: c64bff2 dd02463 Author: Rafael Mendonça França Date: 2014-07-17 17:38:59 -0300 Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_cast Fix rational to decimal on type_cast_from_user commit c64bff2 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 12:08:41 -0700 [EXPERIMENTAL] run actionpack tests in parallel only on forking systems though. Feel free to revert this if it causes problems. M actionpack/test/abstract_unit.rb commit 932386b refs/heads/master Author: Aaron Patterson Date: 2014-07-17 11:26:59 -0700 `recall` should be `path_parameters`, also make it required "recall" is a terrible name. This variable contains the parameters that we got from the path (e.g. for "/posts/1" it has :controller => "posts", :id => "1"). Since it contains the parameters we got from the path, "path_parameters" is a better name. We always pass path_parameters to `generate`, so lets make it required. M actionpack/lib/action_dispatch/journey/formatter.rb commit 212057b refs/heads/master Author: Aaron Patterson Date: 2014-07-17 11:21:06 -0700 pass the route name to define_url_helper this allows us to avoid 2 hash allocations per named helper definition, also we can avoid a `merge` and `delete`. M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/lib/action_dispatch/routing/url_for.rb M actionpack/test/abstract_unit.rb commit 1a300b6 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-17 14:53:41 -0300 Make restore_attributes public Also make it accept a list of attributes to be changed. This will make possible to restore only a subset of the changed attributes. Closes #16203 M activemodel/lib/active_model/dirty.rb M activemodel/test/cases/dirty_test.rb commit 2888f86 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 10:47:58 -0700 use a strategy object for generating urls in named helpers since we know that the route should be a path or fully qualified, we can pass a strategy object that handles generation. This allows us to eliminate an "if only_path" branch when generating urls. M actionpack/lib/action_dispatch/http/url.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit a9765c5 refs/heads/master Author: Aaron Patterson Date: 2014-07-17 10:04:52 -0700 helper methods are public, so we can just call them also if you want a path from a named helper, you should call helper_path, not helper_url(:only_path => true). M actionpack/test/controller/url_for_test.rb commit e8709ae refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-07-17 17:23:47 +0200 docs, `select` and friends with `multiple=true` include a blank string. [Jonas Baumann & Yves Senn] The submitted params from a select with `multiple: true` look as follows: ``` {post: {category: [""]}} {post: {category: ["", "Category 1", "Category 2"]}} ``` This is a follow up to #1552. M actionview/lib/action_view/helpers/form_options_helper.rb commit 246f07c refs/heads/master Author: Yves Senn Date: 2014-07-17 17:23:47 +0200 docs, `select` and friends with `multiple=true` include a blank string. [Jonas Baumann & Yves Senn] The submitted params from a select with `multiple: true` look as follows: ``` {post: {category: [""]}} {post: {category: ["", "Category 1", "Category 2"]}} ``` This is a follow up to #1552. M actionview/lib/action_view/helpers/form_options_helper.rb commit 58427d9 refs/heads/master Merge: 719701d 8c263d5 Author: Matthew Draper Date: 2014-07-18 00:49:57 +0930 Merge pull request #16198 from eileencodes/remove-need-for-macro-instance-var Remove need for macro instance var commit 719701d refs/heads/master Merge: b062d5d f032ba5 Author: Matthew Draper Date: 2014-07-17 23:41:00 +0930 Merge pull request #16205 from davejachimiak/remove_profile_and_benchmark_point Remove "profile and benchmark" line from command line guide commit f032ba5 refs/heads/master Author: Dave Jachimiak Date: 2014-07-17 09:07:08 -0400 Remove "profile and benchmark" line from command line guide The profiling and benchmarking commands are no longer built into Rails. M guides/source/command_line.md commit 8c263d5 refs/heads/master Author: eileencodes Date: 2014-07-14 18:37:59 -0400 Remove need for macro instance var Same as we did for collection, removed the `@macro` instance var and it is now set in each association. Unfortunately it can't be left undefined in AssociationReflection so it has to be set there. For now I am setting it to NotImplementedError since there is no default macro and it changes based on the reflection type. M activerecord/lib/active_record/reflection.rb commit b062d5d refs/heads/master Merge: c6a97b8 f5d79d7 Author: Godfrey Chan Date: 2014-07-16 22:58:15 -0700 Merge pull request #16201 from noinkling/master Fix broken list formatting in API docs [ci skip] commit c6a97b8 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 21:48:26 -0700 subclass Rails::Engine M actionview/test/template/test_case_test.rb commit f5d79d7 refs/heads/master Author: noinkling Date: 2014-07-17 15:24:52 +1200 Fix broken list formatting [ci skip] M actionview/lib/action_view/helpers/rendering_helper.rb commit 0e26271 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 18:15:15 -0700 extract path building to a method M actionpack/lib/action_dispatch/http/url.rb commit 69799ed refs/heads/master Author: Aaron Patterson Date: 2014-07-16 18:13:22 -0700 break out path building logic to methods M actionpack/lib/action_dispatch/http/url.rb commit f875331 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 17:27:03 -0700 only extract :params from the options hash once M actionpack/lib/action_dispatch/http/url.rb commit 1e930e7 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 16:31:07 -0700 we do not need to dup the options hash, it is private and a new object each call M actionpack/lib/action_dispatch/routing/route_set.rb commit 9b15828 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 16:13:08 -0700 push rails app testing up this way we only have to test for whether it is a rails app once. M actionpack/lib/action_dispatch/routing/mapper.rb commit 4a7b959 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 15:41:47 -0700 Rails-ish apps should descend from Rails::Railtie Use an is_a check to ensure it's a Railsish app so we can avoid respond_to calls everywhere. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/controller/integration_test.rb M actionpack/test/dispatch/mount_test.rb M actionpack/test/dispatch/prefix_generation_test.rb commit d66536d refs/heads/master Author: Aaron Patterson Date: 2014-07-16 15:08:55 -0700 app should always be a class (I suppose) M actionpack/lib/action_dispatch/routing/mapper.rb commit 832d2c4 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 14:47:45 -0700 we should be checking if the app is a class Hopefully `object.class` always returns something that is_a?(Class), so the previous logic didn't really make sense. M actionpack/lib/action_dispatch/routing/mapper.rb commit 6feb2aa refs/heads/master Merge: 0a5be1d bdd4d9f Author: Rafael Mendonça França Date: 2014-07-16 17:51:03 -0300 Merge pull request #16197 from cgriego/patch-1 Remove unused 1:1 association :remote option commit bdd4d9f refs/heads/master Author: Chris Griego Date: 2014-07-16 15:46:08 -0500 Remove unused 1:1 association :remote option This option is unused, left over from pre-1.0 Rails to internally distinguish the location of the foreign key. M activerecord/lib/active_record/associations/builder/singular_association.rb commit 0a5be1d refs/heads/master Merge: e361996 599d138 Author: Matthew Draper Date: 2014-07-17 06:14:43 +0930 Merge pull request #16196 from yahonda/mysql_restrict_test Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode" commit e361996 refs/heads/master Merge: 5284bbb fc2ecbb Author: Matthew Draper Date: 2014-07-17 05:45:06 +0930 Merge pull request #16195 from jonatack/patch-7 Fix typos in string_ext_test.rb commit fc2ecbb refs/heads/master Author: Jon Atack Date: 2014-07-16 22:02:36 +0200 Fix typos in string_ext_test.rb [ci skip] M activesupport/test/core_ext/string_ext_test.rb commit 5284bbb refs/heads/master Merge: 9bbb3ca 41679b2 Author: Rafael Mendonça França Date: 2014-07-16 16:44:02 -0300 Merge remote-tracking branch 'origin/master' commit 9bbb3ca refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 16:24:57 -0300 Use &= instead of select with include? The performance is almost the same with both implementations but this is clear. Before this patch: Calculating ------------------------------------- small erb template 1452 i/100ms ------------------------------------------------- small erb template 17462.1 (±13.3%) i/s - 85668 in 5.031395s .Calculating ------------------------------------- small erb template with 1 partial 887 i/100ms ------------------------------------------------- small erb template with 1 partial 8899.6 (±18.8%) i/s - 42576 in 5.009453s .Calculating ------------------------------------- small erb template with 2 partials 666 i/100ms ------------------------------------------------- small erb template with 2 partials 6821.5 (±8.8%) i/s - 33966 in 5.020791s After the patch: Calculating ------------------------------------- small erb template 1479 i/100ms ------------------------------------------------- small erb template 15956.6 (±7.6%) i/s - 79866 in 5.036001s .Calculating ------------------------------------- small erb template with 1 partial 841 i/100ms ------------------------------------------------- small erb template with 1 partial 9242.2 (±6.9%) i/s - 46255 in 5.029497s .Calculating ------------------------------------- small erb template with 2 partials 615 i/100ms ------------------------------------------------- small erb template with 2 partials 6524.7 (±6.8%) i/s - 32595 in 5.020456s You can find the benchmark code at https://gist.github.com/rafaelfranca/dee31120cfdb1ddc3b56 M actionview/lib/action_view/lookup_context.rb commit b5fbcc5 refs/heads/master Merge: d12b30f 4955c04 Author: Rafael Mendonça França Date: 2014-07-16 16:14:42 -0300 Merge pull request #15917 from luke-gru/actionview_perf remove Set.new from DetailsKey::get, impacts rendering overhead commit 41679b2 refs/heads/master Merge: f636652 a9d3b77 Author: Matthew Draper Date: 2014-07-17 04:31:18 +0930 Merge pull request #16190 from oss92/word_truncation Word truncation commit f636652 refs/heads/master Author: Aaron Patterson Date: 2014-07-16 11:54:53 -0700 extract inner options before delegating to the helper If we extract the options from the user facing method call ASAP, then we can simplify internal logic. M actionpack/lib/action_dispatch/routing/route_set.rb commit d12b30f refs/heads/master Merge: df8b021 f378f23 Author: Rafael Mendonça França Date: 2014-07-16 15:51:47 -0300 Merge pull request #15944 from seuros/uuid Treat invalid uuid as nil Conflicts: activerecord/CHANGELOG.md commit df8b021 refs/heads/master Merge: 90f0cdc ef8cae6 Author: Rafael Mendonça França Date: 2014-07-16 15:44:01 -0300 Merge pull request #16183 from goddamnhippie/fix-psych-warning Implement required #encode_with commit 90f0cdc refs/heads/master Author: Aaron Patterson Date: 2014-07-16 11:35:27 -0700 always transcode the file to utf-8 people may be passing filenames to the constructor that are not utf-8, but they will assome that calling `original_filename` returns utf-8 (because that's what it used to do). M actionpack/lib/action_dispatch/http/upload.rb M actionpack/test/dispatch/uploaded_file_test.rb commit a00f547 refs/heads/master Merge: d4df7ce dd1ec62 Author: Godfrey Chan Date: 2014-07-16 11:32:42 -0700 Merge pull request #15718 from chancancode/regression_from_15694 Fixed a regression introduced in 84cf156 commit d4df7ce refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 14:59:55 -0300 Fix typo on the variable name M actionview/lib/action_view/renderer/partial_renderer.rb commit 1515569 refs/heads/master Merge: 6947e3a 03d7750 Author: Rafael Mendonça França Date: 2014-07-16 14:56:35 -0300 Merge branch 'joeljunstrom-local-iterator-for-partial-collections' Squash and merge #7698 doing some improvements to the original implementation. commit 03d7750 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 14:40:50 -0300 Add CHANGELOG entry for PartialIteration. Closes #7698. M actionview/CHANGELOG.md commit 7dc0f3f refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 14:38:07 -0300 Document the PartialIteration object M actionview/lib/action_view/renderer/partial_renderer.rb commit 9290fc5 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 14:28:39 -0300 Build only one PartialIteration object for loop M actionview/lib/action_view/renderer/partial_renderer.rb M actionview/test/template/partial_iteration_test.rb commit 9830ebb refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 14:13:42 -0300 No need to have a file to PartialIteration class This class is only used on the PartialRenderer. D actionpack/lib/action_view/partial_iteration.rb M actionview/lib/action_view/renderer/partial_renderer.rb M actionview/test/template/partial_iteration_test.rb commit 1f5b360 refs/heads/master Author: Joel Junström Date: 2012-09-16 22:45:08 +0200 Added PartialIteration class used when rendering collections The iteration object is available as the local variable "template_name_iteration" when rendering partials with collections. It gives access to the +size+ of the collection beeing iterated over, the current +index+ and two convinicence methods +first?+ and +last?+ "template_name_counter" variable is kept but is deprecated. [Joel Junström + Lucas Uyezu] A actionpack/lib/action_view/partial_iteration.rb M actionview/lib/action_view/renderer/partial_renderer.rb M actionview/test/actionpack/controller/render_test.rb A actionview/test/fixtures/actionpack/test/_customer_iteration.erb A actionview/test/fixtures/actionpack/test/_customer_iteration_with_as.erb A actionview/test/template/partial_iteration_test.rb M actionview/test/template/render_test.rb commit 6947e3a refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 14:09:01 -0300 Remove unused fixtures These fixtures are not used in actionpack tests. D actionpack/test/fixtures/test/_changing_priority.html.erb D actionpack/test/fixtures/test/_changing_priority.json.erb D actionpack/test/fixtures/test/_counter.html.erb D actionpack/test/fixtures/test/_customer.erb D actionpack/test/fixtures/test/_customer_counter.erb D actionpack/test/fixtures/test/_customer_counter_with_as.erb D actionpack/test/fixtures/test/_customer_greeting.erb D actionpack/test/fixtures/test/_customer_with_var.erb D actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb D actionpack/test/fixtures/test/_first_json_partial.json.erb D actionpack/test/fixtures/test/_form.erb D actionpack/test/fixtures/test/_hash_greeting.erb D actionpack/test/fixtures/test/_hash_object.erb D actionpack/test/fixtures/test/_hello.builder D actionpack/test/fixtures/test/_json_change_priority.json.erb D actionpack/test/fixtures/test/_labelling_form.erb D actionpack/test/fixtures/test/_layout_for_partial.html.erb D actionpack/test/fixtures/test/_partial_for_use_in_layout.html.erb D actionpack/test/fixtures/test/_partial_html_erb.html.erb D actionpack/test/fixtures/test/_partial_name_local_variable.erb D actionpack/test/fixtures/test/_partial_only.erb D actionpack/test/fixtures/test/_partial_only_html.html D actionpack/test/fixtures/test/_partial_with_partial.erb D actionpack/test/fixtures/test/_person.erb D actionpack/test/fixtures/test/_raise_indentation.html.erb D actionpack/test/fixtures/test/_second_json_partial.json.erb D actionpack/test/fixtures/test/action_talk_to_layout.erb D actionpack/test/fixtures/test/calling_partial_with_layout.html.erb D actionpack/test/fixtures/test/capturing.erb D actionpack/test/fixtures/test/change_priority.html.erb D actionpack/test/fixtures/test/content_for.erb D actionpack/test/fixtures/test/content_for_concatenated.erb D actionpack/test/fixtures/test/content_for_with_parameter.erb D actionpack/test/fixtures/test/formatted_html_erb.html.erb D actionpack/test/fixtures/test/greeting.html.erb D actionpack/test/fixtures/test/greeting.xml.erb D actionpack/test/fixtures/test/hello,world.erb D actionpack/test/fixtures/test/hello.builder D actionpack/test/fixtures/test/hello_world_container.builder D actionpack/test/fixtures/test/hello_world_from_rxml.builder D actionpack/test/fixtures/test/hello_world_with_layout_false.erb D actionpack/test/fixtures/test/html_template.html.erb D actionpack/test/fixtures/test/hyphen-ated.erb D actionpack/test/fixtures/test/list.erb D actionpack/test/fixtures/test/non_erb_block_content_for.builder D actionpack/test/fixtures/test/potential_conflicts.erb D actionpack/test/fixtures/test/proper_block_detection.erb D actionpack/test/fixtures/test/render_file_from_template.html.erb D actionpack/test/fixtures/test/render_file_with_locals_and_default.erb D actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb D actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb D actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb D actionpack/test/fixtures/test/render_partial_inside_directory.html.erb D actionpack/test/fixtures/test/render_to_string_test.erb D actionpack/test/fixtures/test/render_two_partials.html.erb D actionpack/test/fixtures/test/using_layout_around_block.html.erb D actionpack/test/fixtures/test/with_html_partial.html.erb D actionpack/test/fixtures/test/with_partial.html.erb D actionpack/test/fixtures/test/with_partial.text.erb D actionpack/test/fixtures/test/with_xml_template.html.erb commit a9d3b77 refs/heads/master Author: root Date: 2014-07-16 19:48:07 +0200 Added truncate_words method to activesupport strings M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/filters.rb M activesupport/test/core_ext/string_ext_test.rb commit 599d138 refs/heads/master Author: Yasuo Honda Date: 2014-07-17 02:48:00 +0900 Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode" This reverts commit babc24c1b07c1fd58b9b3249b0256f9b0d45c0f0. Conflicts: activerecord/test/cases/adapters/mysql/connection_test.rb activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit 5d2b1e9 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-07-16 14:44:41 -0300 nodoc enum hooks [ci skip] M activerecord/lib/active_record/enum.rb commit d3ebc02 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-16 14:44:41 -0300 nodoc enum hooks [ci skip] M activerecord/lib/active_record/enum.rb commit 973490a refs/remotes/origin/4-0-stable Author: Santiago Pastorino Date: 2014-07-16 12:21:46 -0300 Don't accept parameters as argument for redirect to [via @homakov] Closes #16170 M actionpack/lib/action_controller/metal/redirecting.rb M actionpack/test/controller/redirect_test.rb commit 3e006d5 refs/remotes/origin/4-1-stable Author: Santiago Pastorino Date: 2014-07-16 12:21:46 -0300 Don't accept parameters as argument for redirect to [via @homakov] Closes #16170 M actionpack/lib/action_controller/metal/redirecting.rb M actionpack/test/controller/redirect_test.rb commit 341698e refs/heads/master Author: Santiago Pastorino Date: 2014-07-16 12:21:46 -0300 Don't accept parameters as argument for redirect to [via @homakov] Closes #16170 M actionpack/lib/action_controller/metal/redirecting.rb M actionpack/test/controller/redirect_test.rb commit dd02463 refs/heads/master Author: Mariano Valles Date: 2014-07-16 17:17:31 +0200 Fix decimal_test module and add new test for object responding to to_d M activerecord/lib/active_record/type/decimal.rb M activerecord/test/cases/type/decimal_test.rb commit 59b93df refs/heads/master Author: Juanito Fatas Date: 2014-07-16 23:12:13 +0800 [ci skip] Remove duplicated last! section. Reference: https://github.com/rails/rails/commit/d4fd0bd17709735ac91e434c94fe99429f078c6e cc @schneems M guides/source/active_record_querying.md commit 758ae37 refs/heads/master Author: Juanito Fatas Date: 2014-07-16 22:45:58 +0800 [ci skip] Use appropriate mailer syntax. Reference: https://github.com/rails/rails/commit/f7e4362011ceb1317fd401125d48d7ccb9a1079c M guides/source/active_record_querying.md commit 431b4b4 refs/heads/master Author: Mariano Valles Date: 2014-07-16 16:23:54 +0200 Fix case statement to use ::Numeric and ::String M activerecord/lib/active_record/type/decimal.rb A activerecord/test/cases/type/decimal_test.rb M activerecord/test/cases/types_test.rb commit 2f93aa0 refs/heads/master Author: Yves Senn Date: 2014-07-16 16:15:16 +0200 we intend to keep the `capture` helper for Active Record tests. This is a follow up to f8f5cdc M activerecord/test/cases/test_case.rb commit 7098c90 refs/heads/master Author: Mariano Valles Date: 2014-07-16 16:08:35 +0200 Change class evaluation for Rationals in cast_value M activerecord/lib/active_record/type/decimal.rb M activerecord/test/cases/types_test.rb commit f8f5cdc refs/heads/master Author: Yves Senn Date: 2014-07-16 14:13:07 +0200 Active Record tests still depend on `capture`. Let's keep it for now. This is a follow-up to 3121412 /cc @rafaelfranca This will remove deprecation warnings from the PostgreSQL suite: ``` DEPRECATION WARNING: #capture(stream) is deprecated and will be removed in the next release. (called from capture at /Users/senny/Projects/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb:89) /Users/senny/Projects/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb:89:in `capture' /Users/senny/Projects/rails/activerecord/test/cases/adapters/postgresql/composite_test.rb:73:in `ensure_warning_is_issued' /Users/senny/Projects/rails/activerecord/test/cases/adapters/postgresql/composite_test.rb:48:in `test_column' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:106:in `block (3 levels) in run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:204:in `capture_exceptions' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:103:in `block (2 levels) in run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:256:in `time_it' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:102:in `block in run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:317:in `on_signal' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:276:in `with_info_handler' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:101:in `run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:759:in `run_one_method' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:293:in `run_one_method' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:287:in `block (2 levels) in run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:286:in `each' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:286:in `block in run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:317:in `on_signal' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:306:in `with_info_handler' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:285:in `run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `block in __run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `map' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `__run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:126:in `run' /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:55:in `block in autorun' ``` M activerecord/test/cases/tasks/mysql_rake_test.rb M activerecord/test/cases/test_case.rb commit a4802e2 refs/heads/master Author: Mariano Valles Date: 2014-07-16 13:20:53 +0200 Fix rational to decimal on type_cast_from_user M activerecord/lib/active_record/type/decimal.rb M activerecord/test/cases/types_test.rb commit 7876ac8 refs/heads/master Merge: 3eca062 e96e840 Author: Yves Senn Date: 2014-07-16 12:37:04 +0200 Merge pull request #16187 from jone/testing-guide-assertions Update assertion methods in testing guide [ci skip] commit e96e840 refs/heads/master Author: Jonas Baumann Date: 2014-07-16 12:00:58 +0200 link minitest assertions documentation. M guides/source/testing.md commit cbc0c18 refs/heads/master Author: Jonas Baumann Date: 2014-07-16 11:41:25 +0200 document assert[_not]_empty, assert[_not]_includes, assert[_not]_predicate in testing guide. M guides/source/testing.md commit 2bba2e1 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-07-16 11:04:33 +0200 docs, remove unneeded `\` and remove trailing whitespace. [ci skip] M guides/source/debugging_rails_applications.md commit 3eca062 refs/heads/master Author: Yves Senn Date: 2014-07-16 10:06:55 +0200 use foreign key DSL in our tests. M activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb M activerecord/test/schema/schema.rb commit 6f15762 refs/heads/master Merge: 7880f39 9c83e84 Author: Yves Senn Date: 2014-07-16 08:48:16 +0200 Merge pull request #16138 from sgrif/sg-attribute-set-key AttributeSet#include? -> AttributeSet#key? commit fcc2231 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 23:36:45 -0300 Stop using mocha on dbconsole_test M railties/test/commands/dbconsole_test.rb commit 7880f39 refs/heads/master Author: Aaron Patterson Date: 2014-07-15 18:43:47 -0700 Fix 1.9. uggghhhhhh get it together @tenderlove :bomb: M actionpack/test/abstract_unit.rb commit 993ca82 refs/heads/master Author: Aaron Patterson Date: 2014-07-15 18:20:27 -0700 fix for 1.9 kwargs syntax M actionpack/test/abstract_unit.rb commit 1ae9f05 refs/heads/master Author: Aaron Patterson Date: 2014-07-15 18:19:11 -0700 routed applications will respond to these methods M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/testing/integration.rb commit 045d717 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 14:57:22 -0300 Use the plugin API to the getter and setters To avoid having to redefine these methods on the deprecated plugin we should be using the sanitizer_vendor API. M actionview/lib/action_view/helpers/sanitize_helper.rb commit ef8cae6 refs/heads/master Author: Gustavo Beathyate Date: 2014-07-15 18:01:16 -0500 Move #encode_with to Relation M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/delegation.rb commit 002cf5f refs/heads/master Merge: f3c1832 19fae86 Author: Rafael Mendonça França Date: 2014-07-15 19:53:20 -0300 Merge branch 'rm-uuid' commit f3c1832 refs/heads/master Author: Aaron Patterson Date: 2014-07-02 15:55:25 -0700 stop passing recall to url_for M actionpack/test/abstract_unit.rb M actionpack/test/controller/url_for_integration_test.rb commit 19fae86 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 19:51:33 -0300 Move uuid_v5 and uuid_v3 to Digest::UUID These methods are not random so they should not belings to SecureRandom module. M activerecord/lib/active_record/fixtures.rb M activesupport/CHANGELOG.md A activesupport/lib/active_support/core_ext/digest/uuid.rb D activesupport/lib/active_support/core_ext/securerandom.rb A activesupport/test/core_ext/digest/uuid_test.rb D activesupport/test/core_ext/securerandom_test.rb commit 8e105a5 refs/heads/master Author: Aaron Patterson Date: 2014-07-15 15:31:31 -0700 rack 1.6 encodes the filenames in posts correctly now M actionpack/lib/action_dispatch/http/upload.rb commit 3ef98a1 refs/heads/master Author: Aaron Patterson Date: 2014-07-15 15:24:23 -0700 fix warnings M actionpack/test/abstract_unit.rb commit 8eb7bcb refs/heads/master Author: Aaron Patterson Date: 2014-07-02 15:02:36 -0700 stop calling url_for with recall parameters and actually use a request M actionpack/test/abstract_unit.rb M actionpack/test/controller/routing_test.rb commit a3ca700 refs/heads/master Author: Aaron Patterson Date: 2014-07-01 16:28:05 -0700 execute a request and check the path_parameters This actually runs a request through the system, using the actual routing methods as we would use in production, then tests the path_parameters set on the request object. The `recognize_path` method isn't actually used in production, so testing what it returns isn't useful. M actionpack/test/controller/routing_test.rb commit ab1e322 refs/heads/master Author: Aaron Patterson Date: 2014-07-01 15:41:13 -0700 set `set` in the setup method M actionpack/test/controller/routing_test.rb commit 07f7f3a refs/heads/master Author: Aaron Patterson Date: 2014-07-01 15:39:45 -0700 remove useless ivar set M actionpack/test/controller/routing_test.rb commit 0777b17 refs/heads/master Author: Aaron Patterson Date: 2014-07-01 15:33:30 -0700 RouteSet should be in charge of constructing the dispather Now we can override how requests are dispatched in the routeset object M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/mapper_test.rb commit 93e09f5 refs/heads/master Merge: 2b2e041 41fb06f Author: Rafael Mendonça França Date: 2014-07-15 18:45:15 -0300 Merge pull request #16180 from rafaelfranca/rm-dirty Improve Active Model Dirty API. commit 41fb06f refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 16:12:23 -0300 Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`. These methods may cause confusion with the `reset_changes` that behaves differently of them. Also rename undo_changes to restore_changes to match this new set of methods. M activemodel/CHANGELOG.md M activemodel/lib/active_model/dirty.rb M activemodel/test/cases/dirty_test.rb M activerecord/test/cases/dirty_test.rb M guides/source/active_model_basics.md commit 2b2e041 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 18:03:12 -0300 Add CHANGELOG entry for #13392 [ci skip] M activesupport/CHANGELOG.md commit 3121412 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 17:56:27 -0300 Keep quietly and capture undeprecated on your suite M activerecord/test/cases/migration_test.rb M activerecord/test/cases/tasks/mysql_rake_test.rb M activesupport/test/core_ext/kernel_test.rb M activesupport/test/deprecation_test.rb M railties/lib/rails/generators/testing/behaviour.rb M railties/test/abstract_unit.rb M railties/test/generators/actions_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/generators_test_helper.rb M railties/test/isolation/abstract_unit.rb commit b8e8096 refs/heads/master Author: Gustavo Beathyate Date: 2014-07-15 15:50:29 -0500 Implement required #encode_with While running the spec `ARCONN=mysql2 ruby -v -Itest test/cases/yaml_serialization_test.rb` the following warning shows up: `implementing to_yaml is deprecated, please implement "encode_with"` M activerecord/lib/active_record/relation/delegation.rb M activerecord/test/cases/yaml_serialization_test.rb commit af2ffa8 refs/heads/master Author: Tom Meier Date: 2013-12-19 13:26:47 +1100 Deprecate reporting methods for silencing output as they aren't thread safe M activesupport/lib/active_support/core_ext/kernel/reporting.rb commit 9e5cab2 refs/remotes/origin/4-1-stable Merge: 08e528d c5ab350 Author: Rafael Mendonça França Date: 2014-07-15 16:26:44 -0300 Merge pull request #16181 from yahonda/ora972_faces_41 Address ORA-00972: identifier is too long when tested with Oracle commit 66d0a01 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 16:00:50 -0300 Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes_information This method name is causing confusion with the `reset_#{attribute}` methods. While `reset_name` set the value of the name attribute for the previous value the `reset_changes` only discard the changes and previous changes. M activemodel/CHANGELOG.md M activemodel/lib/active_model/dirty.rb M activemodel/test/cases/dirty_test.rb M activerecord/lib/active_record/attribute_methods/dirty.rb commit 1fbb5c1 refs/heads/master Merge: dc0d303 9629dea Author: Rafael Mendonça França Date: 2014-07-15 15:36:26 -0300 Merge pull request #16129 from rafaelfranca/config_for Add Rails::Application#config_for commit 9629dea refs/heads/master Author: Rafael Mendonça França Date: 2014-07-10 16:40:07 -0300 Add Rails::Application#config_for This is a convenience for loading configuration for the current Rails environment. M railties/CHANGELOG.md M railties/lib/rails/application.rb M railties/test/application/configuration_test.rb commit de274c5 refs/remotes/origin/rm-use-plugin-interface (origin/rm-use-plugin-interface) Author: Rafael Mendonça França Date: 2014-07-15 14:57:22 -0300 Use the plugin API to the getter and setters To avoid having to redefine these methods on the deprecated plugin we should be using the sanitizer_vendor API. M actionview/lib/action_view/helpers/sanitize_helper.rb commit c5ab350 refs/remotes/origin/4-1-stable Author: Yasuo Honda Date: 2014-07-12 05:42:49 +0900 Address ORA-00972: identifier is too long when tested with Oracle by using shorter attribute names. M activerecord/test/models/face.rb M activerecord/test/models/man.rb M activerecord/test/schema/schema.rb commit 82e4788 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 14:42:36 -0300 Use regexp instead exact match for atom test There are two xml namespaces in the response body and the xhtml namespace is not registered in the root node. This create an invalid XML and nokogiri can't navigate using xpath on that node. M actionview/test/template/atom_feed_helper_test.rb commit f542631 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 13:59:10 -0300 All these tests are passing now M actionview/test/template/date_helper_test.rb M actionview/test/template/form_helper_test.rb M actionview/test/template/text_helper_test.rb commit c0026d5 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 13:44:41 -0300 Remove more unneeded include M actionpack/test/abstract_unit.rb commit a8c667e refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 13:35:29 -0300 Defining the right dependencies M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M actionview/actionview.gemspec commit 158a6df refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 13:30:28 -0300 We don't need loofah for the assertions We can just use nokogiri M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/testing/assertions.rb M actionpack/test/controller/integration_test.rb M actionview/lib/action_view/test_case.rb M actionview/test/template/form_tag_helper_test.rb commit 126a15e refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 13:20:14 -0300 Include the selector assertions on the test case We don't need to require users to include this module on ActionMailer::TestCase M actionmailer/lib/action_mailer/test_case.rb M actionmailer/test/assert_select_email_test.rb M actionview/test/template/atom_feed_helper_test.rb commit dc0d303 refs/heads/master Merge: da6472c 101cf68 Author: Godfrey Chan Date: 2014-07-15 09:10:47 -0700 Merge branch 'master' of git://github.com/rails/rails Conflicts: activerecord/CHANGELOG.md commit da6472c refs/heads/master Author: Godfrey Chan Date: 2014-07-15 09:08:31 -0700 Document the change in `nil` handling for serialized attributes Also updated the test case to reflect that M activerecord/test/cases/serialized_attribute_test.rb M guides/source/upgrading_ruby_on_rails.md commit 75fe384 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 13:02:22 -0300 Rails is a module not a class M actionmailer/test/abstract_unit.rb commit 101cf68 refs/heads/master Merge: dffc6a4 6512202 Author: Rafael Mendonça França Date: 2014-07-15 12:45:35 -0300 Merge branch 'jbrowning-fix_mariadb_rename_index' Closes #15936 commit cd809fd refs/heads/master Author: Godfrey Chan Date: 2014-07-14 11:11:59 -0700 Fixed SQL syntax for postgresql M activerecord/test/cases/serialized_attribute_test.rb commit f4c8a4b refs/heads/master Author: Godfrey Chan Date: 2014-07-14 10:38:14 -0700 Merge pull request #16162 from chancancode/fix_json_coder Fixed JSON coder when loading NULL from DB M activerecord/lib/active_record/coders/json.rb M activerecord/test/cases/serialized_attribute_test.rb commit 6512202 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-15 12:43:19 -0300 Predicate methods don't need to return `true` / `false` M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit a66aeb8 refs/heads/master Author: Godfrey Chan Date: 2014-07-15 08:43:18 -0700 Revert "Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"" This reverts commit 6f3c64eeb1dc8288dae49f114aaf619adc7dcb7f. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record.rb M activerecord/lib/active_record/attribute_methods/serialization.rb A activerecord/lib/active_record/coders/json.rb M activerecord/test/cases/serialized_attribute_test.rb commit 1133818 refs/heads/master Author: Jeff Browning Date: 2014-06-27 10:04:18 -0400 Fix version detection for RENAME INDEX support. Fixes #15931. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit dffc6a4 refs/heads/master Author: Godfrey Chan Date: 2014-07-15 08:40:15 -0700 Add CHANGELOG entry for #15266 M activerecord/CHANGELOG.md commit 473b09f refs/heads/master Merge: ebb9501 63fd88c Author: Godfrey Chan Date: 2014-07-15 08:34:44 -0700 Merge pull request #15266 from dv/use_counter_cache_for_empty_call If a counter_cache exists, use it for #empty? commit ebb9501 refs/heads/master Merge: 04e7ea3 b3a34cd Author: Rafael Mendonça França Date: 2014-07-15 11:27:03 -0300 Merge pull request #16142 from andreychernih/extend-server-options Add ability to extend `rails server` command options parser commit 04e7ea3 refs/heads/master Merge: c3f4d6c d92ade3 Author: Rafael Mendonça França Date: 2014-07-15 11:12:27 -0300 Merge pull request #16175 from skorks/log_digestor_as_debug Log digest as :debug instead of :info commit 0997ceb refs/remotes/origin/4-0-stable Author: Jolyon Pawlyn Date: 2014-07-12 17:00:09 +0100 Return an absolute instead of relative path from an asset url in the case of the `asset_host` proc returning nil (cherry picked from commit d005777469b7182b1a8f657a5b94363b321bef5d) Conflicts: actionpack/lib/action_view/helpers/asset_url_helper.rb actionview/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit 08e528d refs/remotes/origin/4-1-stable Author: Jolyon Pawlyn Date: 2014-07-12 17:00:09 +0100 Return an absolute instead of relative path from an asset url in the case of the `asset_host` proc returning nil (cherry picked from commit d005777469b7182b1a8f657a5b94363b321bef5d) Conflicts: actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit c3f4d6c refs/heads/master Merge: 942b3a2 d005777 Author: Andrew White Date: 2014-07-15 09:32:01 +0100 Merge pull request #16161 from jpawlyn/master Fix empty host for an asset url when asset_host proc returns nil commit d005777 refs/heads/master Author: Jolyon Pawlyn Date: 2014-07-12 17:00:09 +0100 Return an absolute instead of relative path from an asset url in the case of the `asset_host` proc returning nil M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit 942b3a2 refs/heads/master Merge: 85343d9 390a45e Author: Zachary Scott Date: 2014-07-14 22:09:53 -0700 Merge pull request #16174 from tgxworld/doc_fix [ci skip] Fix grammar of eager loading for ActiveRecord::Associations commit d92ade3 refs/heads/master Author: Alan Skorkin Date: 2014-07-15 14:18:32 +1000 Log digest as :debug instead of :info M actionview/lib/action_view/digestor.rb commit 390a45e refs/heads/master Author: Guo Xiang Tan Date: 2014-07-15 11:44:04 +0800 [CI SKIP] Doc fix. M activerecord/lib/active_record/associations.rb commit 85343d9 refs/heads/master Merge: 7b52a26 f8d2899 Author: Aaron Patterson Date: 2014-07-14 11:24:28 -0700 Merge pull request #16089 from eileencodes/refactor-reflections-from-sub-classes-to-delegates Refactor reflections from sub classes to delegates commit eca2625 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-07-14 11:11:59 -0700 Fixed SQL syntax for postgresql M activerecord/test/cases/serialized_attribute_test.rb commit 5de6ef8 refs/remotes/origin/4-1-stable Merge: 136cbca 5b1f2e9 Author: Godfrey Chan Date: 2014-07-14 10:38:14 -0700 Merge pull request #16162 from chancancode/fix_json_coder Fixed JSON coder when loading NULL from DB commit 5b1f2e9 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-07-14 01:01:15 -0700 Fixed JSON coder when loading NULL from DB M activerecord/lib/active_record/coders/json.rb M activerecord/test/cases/serialized_attribute_test.rb commit 136cbca refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-07-14 19:50:27 +0930 Merge pull request #16127 from Envek/fix_16111 Dump PostgreSQL primary key with custom function as a default. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/test/cases/schema_dumper_test.rb commit 7b52a26 refs/heads/master Merge: 55c1b1d f49d20e Author: Matthew Draper Date: 2014-07-14 23:33:48 +0930 Merge pull request #16168 from greysteil/stash-path-info Stash original path in `ShowExceptions` middleware commit 55c1b1d refs/heads/master Merge: defc680 fc46804 Author: Matthew Draper Date: 2014-07-14 23:27:57 +0930 Merge pull request #16167 from yahonda/ora972_faces Address ORA-00972: identifier is too long when tested with Oracle commit fc46804 refs/heads/master Author: Yasuo Honda Date: 2014-07-12 05:42:49 +0900 Address ORA-00972: identifier is too long when tested with Oracle by using shorter attribute names. M activerecord/test/models/face.rb M activerecord/test/models/man.rb M activerecord/test/schema/schema.rb commit f49d20e refs/heads/master Author: Grey Baker Date: 2014-07-13 17:58:20 +0100 Stash original path in `ShowExceptions` middleware `ActionDispatch::ShowExceptions` overwrites `PATH_INFO` with the status code for the exception defined in `ExceptionWrapper`, so the path the user was visiting when an exception occurred was not previously available to any custom exceptions_app. The original `PATH_INFO` is now stashed in `env["action_dispatch.original_path"]`. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/show_exceptions.rb M actionpack/test/dispatch/show_exceptions_test.rb commit f378f23 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-29 07:45:56 +0000 Treat invalid uuid as nil M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid/uuid.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit defc680 refs/heads/master Merge: 2fc8239 584fc8b Author: Matthew Draper Date: 2014-07-14 19:50:27 +0930 Merge pull request #16127 from Envek/fix_16111 Dump PostgreSQL primary key with custom function as a default. commit 2fc8239 refs/heads/master Merge: 9386ddf c890f4f Author: Zachary Scott Date: 2014-07-13 22:23:27 -0700 Merge pull request #16156 from mechanicles/document-improvement [ci skip] Improve documentation consistency for ActiveModel::Errors commit c890f4f refs/heads/master Author: Santosh Wadghule Date: 2014-07-14 01:42:18 +0530 [ci skip] Little bit doc code improvement. M activemodel/lib/active_model/errors.rb commit 9386ddf refs/heads/master Author: Godfrey Chan Date: 2014-07-13 17:23:32 -0700 Format pass on 4.2 release notes [ci skip] * Leave two blank lines between sections/packages for readibility. * Always indent bullet points with four spaces. This allows multi-paragraph points to align properly (see #16103), and it is the same as the format we already use in CHANGELOGs. Doing this consistently sets an easy precedent for future contributors to follow. * Always put the PR/commit link on its own line in the source. If the bullet point spans multiple paragraphs, put it on its own paragraph at the end. [Godfrey Chan & Juanito Fatas] M guides/source/4_2_release_notes.md commit 9ce01db refs/heads/master Merge: ccac608 dfee032 Author: Zachary Scott Date: 2014-07-13 11:48:38 -0700 Merge pull request #16155 from mechanicles/fix-typos [ci skip] Fix typos like `a html` to `an html` and 'an mail' to 'an email'. commit dfee032 refs/heads/master Author: Santosh Wadghule Date: 2014-07-14 00:05:00 +0530 Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip] M actionmailer/lib/action_mailer/base.rb M actionpack/test/controller/new_base/render_template_test.rb M actionview/lib/action_view/helpers/output_safety_helper.rb commit 04e1281 refs/heads/master Author: Gaurish Sharma Date: 2014-07-13 02:28:25 +0530 Add link to minitest rdoc & github M guides/source/testing.md commit ccac608 refs/heads/master Merge: 84b4260 f0fc49d Author: Matthew Draper Date: 2014-07-13 03:08:37 +0930 Merge pull request #16150 from sferik/fix-tests Fix tests broken in #16149 commit f0fc49d refs/heads/master Author: Erik Michaels-Ober Date: 2014-07-12 19:05:39 +0200 Fix tests broken in https://github.com/rails/rails/pull/16149 M activesupport/test/core_ext/hash/transform_keys_test.rb commit 84b4260 refs/heads/master Merge: 073397c f1bad13 Author: Guillermo Iguaran Date: 2014-07-12 12:25:27 -0400 Merge pull request #16149 from sferik/refactor-transform_values Refactor Hash#transform_values and Hash#transform_values! commit f1bad13 refs/heads/master Author: Erik Michaels-Ober Date: 2014-07-12 18:22:43 +0200 Return an Enumerator if no block is given M activesupport/lib/active_support/core_ext/hash/keys.rb M activesupport/lib/active_support/core_ext/hash/transform_values.rb A activesupport/test/core_ext/hash/transform_keys_test.rb M activesupport/test/core_ext/hash/transform_values_test.rb commit e167389 refs/heads/master Author: Erik Michaels-Ober Date: 2014-07-12 16:44:25 +0200 Don't construct a Proc if no block is given M activesupport/lib/active_support/core_ext/hash/transform_values.rb commit 073397c refs/heads/master Merge: 46d2a51 d966ee0 Author: Matthew Draper Date: 2014-07-12 20:38:13 +0930 Merge pull request #16147 from seuros/templates [Bug report templates] Added rack master to the Gemfile [ci skip] commit d966ee0 refs/heads/master Author: Abdelkader Boudih Date: 2014-07-12 10:36:57 +0000 [Bug report templates] Added rack master to the Gemfile M guides/bug_report_templates/action_controller_master.rb M guides/bug_report_templates/active_record_master.rb commit 46d2a51 refs/heads/master Merge: 4248785 d97d837 Author: Vijay Dev Date: 2014-07-12 10:24:49 +0000 Merge branch 'master' of github.com:rails/docrails Conflicts: activerecord/lib/active_record/base.rb commit d97d837 refs/heads/master Author: Vijay Dev Date: 2014-07-12 10:21:00 +0000 fix mismatched example call [ci skip] M guides/source/active_record_querying.md commit 85f463f refs/heads/master Author: Vijay Dev Date: 2014-07-12 10:14:29 +0000 Revert "[ci skip] Fix doc for except" This reverts commit 0f6b101e09d210cea2494c5d4225760f1951ea67. Reason: It's better to let `unscope` be documented. We can add a separate section for `except`. M guides/source/active_record_querying.md commit 4248785 refs/heads/master Author: Matthew Draper Date: 2014-07-12 18:52:40 +0930 Assert the nature of the original exception Just so it's clearer what's going on in the following assertion. /cc #11993 @robin850 M actionview/test/template/render_test.rb commit ba62fa5 refs/heads/master Merge: 2c98f1e a563f01 Author: Rafael Mendonça França Date: 2014-07-11 20:39:02 -0300 Merge pull request #16143 from robin850/silence-downloading-output Silence Downloader's output commit 2c98f1e refs/heads/master Merge: e454a3d a37741a Author: Richard Schneeman Date: 2014-07-11 18:13:30 -0500 Merge pull request #16144 from grekko/patch-1 Fixing typo in comment commit a37741a refs/heads/master Author: Gregory Igelmund Date: 2014-07-12 01:03:07 +0200 Fixing typo in comment M activerecord/lib/active_record/attribute_methods.rb commit e454a3d refs/heads/master Merge: 132d400 5f6b7c9 Author: Guillermo Iguaran Date: 2014-07-11 16:41:19 -0400 Merge pull request #11993 from razielgn/actionview-use-name-to-inspect-error Use NameError#name to assert raised error. commit a563f01 refs/heads/master Author: Robin Dupret Date: 2014-07-11 22:02:16 +0200 Silence the output downloading a file This output isn't used anywhere for assertions so we can simply remove it. The introducing commit was f238d495. M activesupport/test/multibyte_conformance_test.rb commit b3a34cd refs/heads/master Author: Andrey Chernih Date: 2014-07-11 23:26:33 +0400 Add ability to extend `rails server` command options parser With this change it will be possible to add additional options to the `option_parser` like this: require 'rails/commands/server' module Rails class Server < ::Rack::Server class Options def option_parser_with_open(options) parser = option_parser_without_open options parser.on('-o', '--open', 'Open in default browser') { options[:open] = true } parser end alias_method_chain :option_parser, :open end def start_with_open start_without_open do `open http://localhost:3000` if options[:open] end end alias_method_chain :start, :open end end M railties/lib/rails/commands/server.rb commit 132d400 refs/heads/master Merge: dc4945d d5411fb Author: Matthew Draper Date: 2014-07-12 01:27:50 +0930 Merge pull request #16136 from sgrif/sg-pg-bit-string Don't rely on the column SQL type for bit string quoting commit dc4945d refs/heads/master Merge: fe6715e d739dd1 Author: Matthew Draper Date: 2014-07-12 01:16:08 +0930 Merge pull request #16055 from sgrif/sg-refactor-sqlite3-strings Use a type object for type casting behavior on SQLite3 commit 9c83e84 refs/heads/master Author: Sean Griffin Date: 2014-07-11 07:50:16 -0600 AttributeSet#include? -> AttributeSet#key? https://github.com/rails/rails/pull/15868/files#r14135210 M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_set.rb M activerecord/test/cases/attribute_set_test.rb commit d5411fb refs/heads/master Author: Sean Griffin Date: 2014-07-11 07:36:03 -0600 Don't rely on the column SQL type for bit string quoting M activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit d739dd1 refs/heads/master Author: Sean Griffin Date: 2014-07-01 08:11:59 -0600 Use a type object for type casting behavior on SQLite3 M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb commit fe6715e refs/heads/master Merge: 6e23c82 b76269a Author: Xavier Noria Date: 2014-07-11 15:21:31 +0200 Merge pull request #16135 from mgoldWork/validator-guide-sentence-break [Guides] Sentence break for clarity [ci-skip] commit b76269a refs/heads/master Author: Max Goldstein Date: 2014-07-11 09:07:34 -0400 [Guides] Sentence break for clarity [ci-skip] M guides/source/active_record_validations.md commit 6e23c82 refs/heads/master Merge: d294ef0 d9396a0 Author: Santiago Pastorino Date: 2014-07-11 08:14:55 -0300 Merge pull request #16132 from tgxworld/fix_test_not_unsubscribing Fix incorrect unsubscription. commit d294ef0 refs/heads/master Merge: 00aae7c e67f001 Author: Santiago Pastorino Date: 2014-07-11 08:11:41 -0300 Merge pull request #16133 from Agis-/cookie_overflow_check Use `#bytesize` instead of `#size` when checking for cookie overflow commit e67f001 refs/heads/master Author: Agis- Date: 2014-07-11 13:24:49 +0300 Use `#bytesize` instead of `#size` when checking for cookie overflow Although the cookie values happens to be ASCII strings because they are Base64 encoded, it is semantically incorrect to check for the number of the characters in the cookie, when we actually want to check for the number of the bytes it consists of. Furthermore it is unecessary coupling with the current implementation that uses Base64 for encoding the values. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb commit 00aae7c refs/heads/master Author: Godfrey Chan Date: 2014-07-11 02:15:00 -0700 Synced 4.2 release notes with the latest commits. Also reordered some of the items to put newer ones on top (same order as CHANGELOGs), which makes it easier to diff while we are still working on it. M actionpack/CHANGELOG.md M actionview/CHANGELOG.md M activerecord/CHANGELOG.md M guides/source/4_2_release_notes.md M railties/CHANGELOG.md commit d9396a0 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-11 16:38:26 +0800 Fix incorrect unsubscription. M railties/test/rack_logger_test.rb commit f6007d6 refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-07-10 10:20:16 -0700 Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcampbell-rosetta_flash * 'rosetta_flash' of https://github.com/gcampbell/rails: Address CVE-2014-4671 (JSONP Flash exploit) Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_to_test.rb actionpack/test/controller/render_json_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/renderers.rb M actionpack/test/controller/mime_responds_test.rb M actionpack/test/controller/render_json_test.rb commit 695af7d refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-07-10 10:20:16 -0700 Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcampbell-rosetta_flash * 'rosetta_flash' of https://github.com/gcampbell/rails: Address CVE-2014-4671 (JSONP Flash exploit) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/renderers.rb M actionpack/test/controller/mime/respond_to_test.rb M actionpack/test/controller/render_json_test.rb commit e22e1c0 refs/heads/master Author: Godfrey Chan Date: 2014-07-10 17:10:20 -0700 Fixed borken tests in AV caused by 013c74d M actionview/test/actionpack/controller/render_test.rb commit 0d676d1 refs/heads/master Merge: 6e76031 013c74d Author: Guillermo Iguaran Date: 2014-07-10 19:38:20 -0400 Merge pull request #14883 from chancancode/rm-single-space Removed the single space character for Safari commit 013c74d refs/heads/master Author: Godfrey Chan Date: 2014-07-10 16:33:22 -0700 Removed single space padding from empty response body. `render nothing: true` or rendering a `nil` body no longer add a single space to the response body. The old behavior was added as a workaround for a bug in an early version of Safari, where the HTTP headers are not returned correctly if the response body has a 0-length. This is been fixed since and the workaround is no longer necessary. Use `render body: ' '` if the old behavior is desired. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/rendering.rb M actionpack/test/controller/new_base/render_body_test.rb M actionpack/test/controller/new_base/render_html_test.rb M actionpack/test/controller/new_base/render_plain_test.rb M actionpack/test/controller/new_base/render_text_test.rb commit 584fc8b refs/heads/master Author: Andrey Novikov Date: 2014-07-10 21:00:46 +0400 Dump PostgreSQL primary key with custom function as a default. For example, if use pgcrypto extension in PostgreSQL 9.4 beta 1, where uuid-ossp extension isn't available for moment of writing, and thus to use a gen_random_uuid() method as a primary key default. In this case schema dumper wasn't able to correctly reconstruct create_table statement and lost primary key constraint on schema load. Fixes #16111. M activerecord/CHANGELOG.md M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit 3229eda refs/heads/master Merge: 6e76031 ff1b7e7 Author: Rafael Mendonça França Date: 2014-07-10 16:52:00 -0300 Merge pull request #11218 from kaspth/loofah-integration Loofah-integration Conflicts: actionpack/CHANGELOG.md actionview/CHANGELOG.md commit 6e76031 refs/heads/master Merge: 6b6832e 93fb4c1 Author: Aaron Patterson Date: 2014-07-10 10:20:25 -0700 * gcampbell-rosetta_flash: Address CVE-2014-4671 (JSONP Flash exploit) commit 93fb4c1 refs/heads/master Merge: 6b6832e 4003a5b Author: Aaron Patterson Date: 2014-07-10 10:20:16 -0700 Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcampbell-rosetta_flash * 'rosetta_flash' of https://github.com/gcampbell/rails: Address CVE-2014-4671 (JSONP Flash exploit) Conflicts: actionpack/CHANGELOG.md commit 4c809df refs/remotes/origin/4-1-stable Author: Karl Entwistle Date: 2014-07-10 09:58:46 +0100 Force encoding of US-ASCII to UTF-8 in unescape_uri. Because URI paths may contain non US-ASCII characters we need to force the encoding of any unescaped URIs to UTF-8 if they are US-ASCII. This essentially replicates the functionality of the monkey patch to URI.parser.unescape in active_support/core_ext/uri.rb. Fixes #16104. (cherry picked from commit 8a297131349bf4e0ade4a0941e5da0c987396d89) M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/router/utils.rb M actionpack/test/journey/router/utils_test.rb commit 6b6832e refs/heads/master Merge: b9ffae8 8a29713 Author: Andrew White Date: 2014-07-10 10:47:56 +0100 Merge pull request #16123 from karlentwistle/issues/9299 Force encoding of US-ASCII to UTF-8 in unescape_uri. commit 8a29713 refs/heads/master Author: Karl Entwistle Date: 2014-07-10 09:58:46 +0100 Force encoding of US-ASCII to UTF-8 in unescape_uri. Because URI paths may contain non US-ASCII characters we need to force the encoding of any unescaped URIs to UTF-8 if they are US-ASCII. This essentially replicates the functionality of the monkey patch to URI.parser.unescape in active_support/core_ext/uri.rb. Fixes #16104. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/router/utils.rb M actionpack/test/journey/router/utils_test.rb commit b9ffae8 refs/heads/master Merge: f149e71 50555f3 Author: Zachary Scott Date: 2014-07-09 20:19:44 -0700 Merge pull request #16118 from JayK31/strong_params_link [ci skip] Fixed link to strong params in Getting Started section 5.6. commit 50555f3 refs/heads/master Author: JayK31 Date: 2014-07-09 23:00:51 -0400 [ci skip] Fixed link to strong params in Getting Started section 5.6. M guides/source/getting_started.md commit 8ba3744 refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-07-09 16:44:44 -0700 Merge pull request #16113 from egilburg/rails_4_1_upgrade_guide_json_time_with_zone_precision [ci skip] Document millisecond precision change in ActiveSupport::TimeWithZone#as_json Conflicts: guides/source/upgrading_ruby_on_rails.md M guides/source/upgrading_ruby_on_rails.md commit f149e71 refs/heads/master Merge: cb37745 d703fe5 Author: Zachary Scott Date: 2014-07-09 16:44:44 -0700 Merge pull request #16113 from egilburg/rails_4_1_upgrade_guide_json_time_with_zone_precision [ci skip] Document millisecond precision change in ActiveSupport::TimeWithZone#as_json commit cb37745 refs/heads/master Merge: 05fde24 b925074 Author: Santiago Pastorino Date: 2014-07-09 19:05:13 -0300 Merge pull request #16091 from tgxworld/reduce_creation_of_subscribers Reduce number of subscriptions created. commit 05fde24 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-07-09 18:44:53 -0300 Include missing module in tag_helper Since 6857415187810f1289068a448268264d0cf0844f we are using #safe_join to join the content when an Array is given, so we must include the dependent module here to make sure it's available when this module is used alone. This was making Simple Form tests to fail with current master due to the missing dependency. M actionview/lib/action_view/helpers/tag_helper.rb commit d703fe5 refs/heads/master Author: Eugene Gilburg Date: 2014-07-09 13:47:17 -0700 [ci skip] Document millisecond precision change in ActiveSupport::TimeWithZone#as_json M guides/source/upgrading_ruby_on_rails.md commit 4003a5b refs/heads/master Author: Greg Campbell Date: 2014-07-09 11:33:09 -0700 Address CVE-2014-4671 (JSONP Flash exploit) Adds a comment before JSONP callbacks. See http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/ for more details on the exploit in question. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/renderers.rb M actionpack/test/controller/mime/respond_to_test.rb M actionpack/test/controller/render_json_test.rb commit 4c34ad3 refs/heads/master Merge: a6affcc 9ffeb0f Author: Matthew Draper Date: 2014-07-09 17:56:03 +0930 Merge pull request #16103 from JuanitoFatas/doc/patch-001 [ci skip] Fix 4.2 release notes list items. [Matthew Draper & Juanito Fatas] commit 9ffeb0f refs/heads/master Author: Juanito Fatas Date: 2014-07-09 16:21:23 +0800 [ci skip] Fix 4.2 release notes list items. [Matthew Draper & Juanito Fatas] M guides/source/4_2_release_notes.md commit a6affcc refs/heads/master Merge: ccc21d0 904aede Author: Zachary Scott Date: 2014-07-09 00:37:52 -0700 Merge pull request #16102 from JuanitoFatas/format-fixes [ci skip] Fix 4.2 release notes rendered display. commit ccc21d0 refs/heads/master Merge: 7a3192e eeed9d5 Author: Zachary Scott Date: 2014-07-09 00:14:43 -0700 Merge pull request #16100 from tgxworld/fix_comment Use proper possessive punctuation [ci skip] commit 904aede refs/heads/master Author: Juanito Fatas Date: 2014-07-09 15:12:51 +0800 [ci skip] Fix 4.2 release notes rendered display. M guides/source/4_2_release_notes.md commit eeed9d5 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-09 13:19:57 +0800 Fix weird comment. [CI SKIP] M actionpack/lib/action_dispatch/middleware/cookies.rb commit 7a3192e refs/heads/master Merge: 97d62a3 da5ac71 Author: Zachary Scott Date: 2014-07-08 14:57:44 -0700 Merge pull request #16097 from nishantmodak/correct_md correct markdown usage [ci skip] commit da5ac71 refs/heads/master Author: Nishant Modak Date: 2014-07-09 01:32:44 +0530 correct markdown usage [ci skip] M CONTRIBUTING.md M guides/source/active_record_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/security.md M guides/source/testing.md commit 97d62a3 refs/heads/master Merge: 3116dac 46890ad Author: Aaron Patterson Date: 2014-07-08 11:46:56 -0700 Merge pull request #13999 from jamox/update_rack This updates rails to use edge rack commit 3116dac refs/heads/master Merge: 6f8cc2e 5a8aa8f Author: Rafael Mendonça França Date: 2014-07-08 15:00:00 -0300 Merge pull request #16095 from eileencodes/update-changelog-for-pr-14899 Add changelog for PR #14899 commit 5a8aa8f refs/heads/master Author: eileencodes Date: 2014-07-08 13:57:01 -0400 [ci skip] Add changelog for PR #14899 The changelog entry for #14899 was missing. M activerecord/CHANGELOG.md commit 6f8cc2e refs/heads/master Merge: 84b9cc0 a843d54 Author: Rafael Mendonça França Date: 2014-07-08 13:13:54 -0300 Merge pull request #16094 from zuhao/refactor_activerecord_belongs_to_associations_test Include fixtures to prevent foreign key violation. commit a843d54 refs/heads/master Author: Zuhao Wan Date: 2014-07-09 00:04:14 +0800 Include fixtures to prevent foreign key violation. M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 84b9cc0 refs/heads/master Merge: 0792d3e 9ccf4d1 Author: Rafael Mendonça França Date: 2014-07-08 11:00:29 -0300 Merge pull request #16093 from zuhao/refactor_activerecord_nested_through_associations_test Warm up cache to prevent assertion failure. commit 9ccf4d1 refs/heads/master Author: Zuhao Wan Date: 2014-07-08 21:47:55 +0800 Warm up cache to prevent assertion failure. M activerecord/test/cases/associations/nested_through_associations_test.rb commit f8d2899 refs/heads/master Author: eileencodes Date: 2014-06-09 18:45:29 -0400 Begin refactoring ThroughReflection This allows us to decouple AssociationReflection and ThroughReflection making ThroughReflection it's own Reflection bucket in a way. The benefit of this is to be able to remove checks against the macro's symbol for exmaple `macro == :belongs_to`. Get all tests passing again Some of the methods that used to be inherited from MacroReflection through AssociationReflection were no longer getting passed through. They needed to be duplicated into the ThroughReflection. I will extract these out into a separate class. Refactor shared methods into strategy object Now that we've separated ThroughReflection and AssociationReflection we can combine shared methods into one class to avoid duplication. Break out class for each type of reflection This creates a class for each reflection type (has_many, has_one, belongs_to and habtm). We then can remove the need to set the macro symbol in each initialization. Tests were updated to reflect these changes because creation of these reflections is now different. Remove need for @collection instance var We now define `collection?` as `false` by default and set it to `true` in `has_and_belongs_to_many` and `has_many` reflections. This removes the need for the `@collection` instance variable. Raise exception on unknown macro types We shouldn't accept just any macro when creating reflections. An unrecongnized AssociationReflection raises an error. Tests in `reflection_test` were updated to reflect these new changes. `:has_and_belongs_to_many` macro tests were removed because we no longer internally return HABTM. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/reflection_test.rb commit 0792d3e refs/heads/master Merge: 336be2b 57beeba Author: Rafael Mendonça França Date: 2014-07-08 09:43:42 -0300 Merge pull request #16071 from sgrif/sg-pg-type-cast Remove PG's definition of `type_cast` commit 336be2b refs/heads/master Merge: e0c6b35 f6968bd Author: Rafael Mendonça França Date: 2014-07-08 09:42:54 -0300 Merge pull request #16072 from sgrif/sg-xml-quoting Don't rely on the sql type to quote XML columns in PG commit b925074 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-08 14:48:36 +0800 Reduce number of subscriptions created. M actionpack/lib/action_controller/test_case.rb commit a83efa4 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-07 23:39:18 -0300 Stop using mocha on console_test M railties/test/commands/console_test.rb commit 57e298f refs/heads/master Author: Rafael Mendonça França Date: 2014-07-07 22:57:55 -0300 Set the application logger using configuration M railties/test/application/rack/logger_test.rb commit d3af622 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-07 22:46:39 -0300 Stop using mocha on configuration_test M railties/test/application/configuration_test.rb commit fb9eb70 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-07 22:05:30 -0300 Stop using mocha on app_rails_loader_test M railties/lib/rails/app_rails_loader.rb M railties/test/app_rails_loader_test.rb commit e0c6b35 refs/heads/master Author: Aaron Patterson Date: 2014-07-07 15:08:12 -0700 test i18n against a routed app M actionmailer/test/i18n_with_controller_test.rb commit 1e7f28c refs/heads/master Author: Aaron Patterson Date: 2014-07-07 10:29:19 -0700 remove the mounted_helpers respond_to check It always responds to mounted_helpers now M actionpack/lib/action_dispatch/testing/integration.rb commit 09eeb3f refs/heads/master Author: Aaron Patterson Date: 2014-07-07 10:21:57 -0700 always test against a routed rack app so there are always url_helpers M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/dispatch/mount_test.rb M actionpack/test/dispatch/routing/concerns_test.rb M actionpack/test/dispatch/routing_test.rb M actionpack/test/dispatch/url_generation_test.rb commit bfcdc40 refs/heads/master Merge: 0920671 a93c384 Author: Rafael Mendonça França Date: 2014-07-07 13:01:33 -0300 Merge pull request #16078 from tgxworld/retreive_connection_once Avoid retrieving connection in ActiveRecord::QueryCache multiple times. commit 0920671 refs/heads/master Merge: 1869788 3559230 Author: Rafael Mendonça França Date: 2014-07-07 11:12:50 -0300 Merge pull request #16074 from sgrif/sg-remove-text-predicate Remove the `text?` predicate from the type objects commit 0dc6ebc refs/remotes/origin/4-1-stable Author: Robin Dupret Date: 2014-07-07 14:53:12 +0200 Partial back-port of c2d96d14 [ci skip] [Juanito Fatas + Robin Dupret] M guides/source/_welcome.html.erb M guides/source/command_line.md M guides/source/debugging_rails_applications.md M guides/source/i18n.md commit 1869788 refs/heads/master Merge: c2d96d1 9c3cb75 Author: Eileen M. Uchitelle Date: 2014-07-07 08:33:48 -0400 Merge pull request #16086 from nickpellant/master Add callbacks documentation for upgrading to 4.1. commit 9c3cb75 refs/heads/master Author: Nick Pellant Date: 2014-07-07 13:24:26 +0100 [ci skip] Improve callback code example for 4.1 upgrade docs. The previous code example for the new explicit block requirement when setting callbacks was a little confusing. This commit makes the example more obvious. M guides/source/upgrading_ruby_on_rails.md commit c2d96d1 refs/heads/master Author: Robin Dupret Date: 2014-07-07 14:22:25 +0200 Update Rails versions [ci skip] As discussed in #15304, we need to automate this process but for now, having out-of-date versions is not ideal. Since master targets 4.2.0, let's also update references to the last 4.1 version to 4.2.0. Finally, let's remove mentions to versions when this is not needed. The guides cover the features of the current version anyway. [Juanito Fatas + Robin Dupret] M guides/source/_welcome.html.erb M guides/source/command_line.md M guides/source/debugging_rails_applications.md M guides/source/getting_started.md M guides/source/i18n.md commit 489e531 refs/heads/master Author: Nick Pellant Date: 2014-07-07 12:02:26 +0100 Add callbacks documentation for upgrading to 4.1. It is now expected in 4.1 to use an explicit block rather than implicit when setting callbacks through ActiveSupport::Callbacks. This commit highlights this new expectation as part of the upgrading documentation. M guides/source/upgrading_ruby_on_rails.md commit f699a69 refs/remotes/origin/4-1-stable Merge: 1d94fa0 86746d8 Author: Robin Dupret Date: 2014-07-07 10:30:50 +0200 Merge pull request #16082 from JuanitoFatas/4-1-stable [ci skip] Remove reference to getting started sample code. (4-1-stable) commit 02580fe refs/remotes/origin/4-0-stable Merge: 67436b1 6d75b1e Author: Robin Dupret Date: 2014-07-07 10:30:16 +0200 Merge pull request #16083 from JuanitoFatas/4-0-stable [ci skip] Remove reference to getting started sample code. (4-0-stable) commit 6d75b1e refs/remotes/origin/4-0-stable Author: Juanito Fatas Date: 2014-07-07 16:04:38 +0800 [ci skip] Remove reference to getting started sample code. M guides/source/getting_started.md commit 86746d8 refs/remotes/origin/4-1-stable Author: Juanito Fatas Date: 2014-07-07 16:02:51 +0800 [ci skip] Remove reference to getting started sample code. M guides/source/getting_started.md commit 4d3f43f refs/heads/master Author: Gaurish Sharma Date: 2014-07-07 11:59:54 +0530 Prefer find_by over where.first for record M activerecord/lib/active_record/base.rb commit a93c384 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-07 11:10:32 +0800 Avoid retrieving connection in ActiveRecord::QueryCache multiple times. M activerecord/lib/active_record/query_cache.rb commit 0e7744e refs/heads/master Merge: 2f71669 b64d887 Author: Sean Griffin Date: 2014-07-06 20:34:46 -0600 Merge pull request #16075 from nickpellant/master Fix ActiveSupport::Callbacks #set_callback docs. commit b64d887 refs/heads/master Author: Nick Pellant Date: 2014-07-07 00:10:45 +0100 Fix ActiveSupport::Callbacks #set_callback docs. A minor version breakage due to a rewrite of the callbacks code now requires an explicit block to be passed to #set_callback. This amends the documentation. M activesupport/lib/active_support/callbacks.rb commit 3559230 refs/heads/master Author: Sean Griffin Date: 2014-07-06 16:04:14 -0600 Remove the `text?` predicate from the type objects This was only used for uniqueness validations. The first usage was in conjunction with `limit`. Types which cast to string, but are not considered text cannot have a limit. The second case was only with an explicit `:case_sensitive => true` option given by the user. M activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb M activerecord/lib/active_record/type/string.rb M activerecord/lib/active_record/type/value.rb M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bit_string_test.rb M activerecord/test/cases/adapters/postgresql/citext_test.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb M activerecord/test/cases/adapters/postgresql/domain_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/full_text_test.rb M activerecord/test/cases/adapters/postgresql/geometric_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/ltree_test.rb M activerecord/test/cases/adapters/postgresql/money_test.rb M activerecord/test/cases/adapters/postgresql/network_test.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit f6968bd refs/heads/master Author: Sean Griffin Date: 2014-07-06 14:53:43 -0600 Don't rely on the sql type to quote XML columns in PG M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/xml.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/xml_test.rb commit 57beeba refs/heads/master Author: Sean Griffin Date: 2014-07-06 13:43:33 -0600 Remove PG's definition of `type_cast` All cases except for `nil` in an array have been removed. `nil` in an array is handled by the Array type object. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 2f71669 refs/heads/master Author: Zachary Scott Date: 2014-07-06 11:47:16 -0700 Change back occurrences of SQLite(3) to sqlite3 when referring to the adapter, fixed from #16057 [ci skip] M actionview/test/active_record_unit.rb M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M railties/CHANGELOG.md commit 2cda0af refs/heads/master Merge: faf7e39 ddad329 Author: Zachary Scott Date: 2014-07-06 11:41:31 -0700 Merge pull request #16057 from akshay-vishnoi/doc_change [ci skip] /sqlite/i --> SQLite commit faf7e39 refs/heads/master Merge: e972d34 8c8e5be Author: Robin Dupret Date: 2014-07-06 16:44:34 +0200 Merge pull request #15958 from aditya-kapoor/active-model-naming-guide [ci skip] add guide for ActiveModel::Naming commit ddad329 refs/heads/master Author: Akshay Vishnoi Date: 2014-07-06 15:23:12 +0530 [ci skip] /sqlite/i --> SQLite M actionview/RUNNING_UNIT_TESTS.rdoc M actionview/test/active_record_unit.rb M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M railties/CHANGELOG.md commit 67436b1 refs/remotes/origin/4-0-stable Author: Seb Jacobs Date: 2014-07-01 23:56:20 +0100 Generate shallow paths for all children of shallow resources. Prior to this commit shallow resources would only generate paths for non-direct children (with a nested depth greater than 1). Take the following routes file. resources :blogs do resources :posts, shallow: true do resources :comments do resources :tags end end end This would generate shallow paths for `tags` nested under `posts`, e.g `/posts/:id/tags/`, however it would not generate shallow paths for `comments` nested under `posts`, e.g `/posts/:id/comments/new`. This commit changes the behaviour of the route mapper so that it generate paths for direct children of shallow resources, for example if you take the previous routes file, this will now generate shallow paths for `comments` nested under `posts`, .e.g `posts/:id/comments/new`. This was the behaviour in Rails `4.0.4` however this was broken in @jcoglan's fix for another routes related issue[1]. This also fixes an issue[2] reported by @smdern. [1] https://github.com/rails/rails/commit/d0e5963 [2] https://github.com/rails/rails/issues/15783 (cherry picked from commit e972d341209f64d1599e30a36b82eee2aa4cd553) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 1d94fa0 refs/remotes/origin/4-1-stable Author: Seb Jacobs Date: 2014-07-01 23:56:20 +0100 Generate shallow paths for all children of shallow resources. Prior to this commit shallow resources would only generate paths for non-direct children (with a nested depth greater than 1). Take the following routes file. resources :blogs do resources :posts, shallow: true do resources :comments do resources :tags end end end This would generate shallow paths for `tags` nested under `posts`, e.g `/posts/:id/tags/`, however it would not generate shallow paths for `comments` nested under `posts`, e.g `/posts/:id/comments/new`. This commit changes the behaviour of the route mapper so that it generate paths for direct children of shallow resources, for example if you take the previous routes file, this will now generate shallow paths for `comments` nested under `posts`, .e.g `posts/:id/comments/new`. This was the behaviour in Rails `4.0.4` however this was broken in @jcoglan's fix for another routes related issue[1]. This also fixes an issue[2] reported by @smdern. [1] https://github.com/rails/rails/commit/d0e5963 [2] https://github.com/rails/rails/issues/15783 (cherry picked from commit e972d341209f64d1599e30a36b82eee2aa4cd553) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit e972d34 refs/heads/master Author: Seb Jacobs Date: 2014-07-01 23:56:20 +0100 Generate shallow paths for all children of shallow resources. Prior to this commit shallow resources would only generate paths for non-direct children (with a nested depth greater than 1). Take the following routes file. resources :blogs do resources :posts, shallow: true do resources :comments do resources :tags end end end This would generate shallow paths for `tags` nested under `posts`, e.g `/posts/:id/tags/`, however it would not generate shallow paths for `comments` nested under `posts`, e.g `/posts/:id/comments/new`. This commit changes the behaviour of the route mapper so that it generate paths for direct children of shallow resources, for example if you take the previous routes file, this will now generate shallow paths for `comments` nested under `posts`, .e.g `posts/:id/comments/new`. This was the behaviour in Rails `4.0.4` however this was broken in @jcoglan's fix for another routes related issue[1]. This also fixes an issue[2] reported by @smdern. [1] https://github.com/rails/rails/commit/d0e5963 [2] https://github.com/rails/rails/issues/15783 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit b974033 refs/heads/master Merge: 93e24de 42be84b Author: Matthew Draper Date: 2014-07-06 16:50:54 +0930 Merge pull request #16069 from dylanahsmith/mysql-quote-bool active_record: Type cast booleans and durations for string columns. commit 42be84b refs/heads/master Author: Dylan Thacker-Smith Date: 2014-07-06 01:49:19 -0400 active_record: Type cast booleans and durations for string columns. M activerecord/CHANGELOG.md M activerecord/lib/active_record/type/binary.rb M activerecord/lib/active_record/type/string.rb M activerecord/test/cases/adapters/mysql2/boolean_test.rb M activerecord/test/cases/relation/where_test.rb commit 39a67ce refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-07-05 22:39:43 -0700 Merge pull request #16044 from jjb/patch-1 [ci skip] link directly to ActionMailer Previews documentation M guides/source/4_1_release_notes.md commit 93e24de refs/heads/master Merge: 6055202 0c5efb4 Author: Zachary Scott Date: 2014-07-05 22:39:43 -0700 Merge pull request #16044 from jjb/patch-1 [ci skip] link directly to ActionMailer Previews documentation commit 6055202 refs/heads/master Merge: 6f3c64e c275b2e Author: Zachary Scott Date: 2014-07-05 21:30:46 -0700 Merge pull request #16068 from JuanitoFatas/4-2-changelogs [ci skip] Concludes changelog links in the bottom. commit c275b2e refs/heads/master Author: Juanito Fatas Date: 2014-07-06 12:15:33 +0800 [ci skip] Concludes changelog links in the bottom. This way when we do next release notes, this would be easier to copy and change. M guides/source/4_2_release_notes.md commit 6f3c64e refs/heads/master Author: Godfrey Chan Date: 2014-07-05 15:29:15 -0700 Revert "Merge pull request #16059 from jenncoop/json-serialized-attr" This reverts commit a03097759bd7103bb9db253e7ba095f011453f75. This needs more work before it would work correctly on master. M activerecord/CHANGELOG.md M activerecord/lib/active_record.rb M activerecord/lib/active_record/attribute_methods/serialization.rb D activerecord/lib/active_record/coders/json.rb M activerecord/test/cases/serialized_attribute_test.rb commit a030977 refs/heads/master Author: Godfrey Chan Date: 2014-07-05 14:23:01 -0700 Merge pull request #16059 from jenncoop/json-serialized-attr Fixed issue with ActiveRecord serialize object as JSON Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record.rb M activerecord/lib/active_record/attribute_methods/serialization.rb A activerecord/lib/active_record/coders/json.rb M activerecord/test/cases/serialized_attribute_test.rb commit 27f89ec refs/remotes/origin/4-1-stable Merge: 1a9d267 b1e30b3 Author: Godfrey Chan Date: 2014-07-05 14:23:01 -0700 Merge pull request #16059 from jenncoop/json-serialized-attr Fixed issue with ActiveRecord serialize object as JSON commit d667c43 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-07-06 06:36:10 +0930 Merge pull request #16065 from matthewd/mysql-explicit-non-strict If our connection is explicitly non-strict, tell MySQL M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 1a9d267 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-07-06 06:36:10 +0930 Merge pull request #16065 from matthewd/mysql-explicit-non-strict If our connection is explicitly non-strict, tell MySQL M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit acec038 refs/heads/master Merge: c031016 a4c2624 Author: Matthew Draper Date: 2014-07-06 06:36:10 +0930 Merge pull request #16065 from matthewd/mysql-explicit-non-strict If our connection is explicitly non-strict, tell MySQL commit c031016 refs/heads/master Author: Godfrey Chan Date: 2014-07-05 13:24:24 -0700 Fix mysql/mysql2 failing with FK constraint errors One of the author fixture we have ("david") references an author address by ID. Since we disable FK checks when inserting fixtures, this is all fine until we try to update it, at which point MySQL would complain about the missing row referenced by the `author_address_id`. [Godfrey Chan, Matthew Draper] M activerecord/test/cases/persistence_test.rb commit a4c2624 refs/heads/master Author: Matthew Draper Date: 2014-07-06 05:40:16 +0930 If our connection is explicitly non-strict, tell MySQL We default to making the connection strict, but have historically relied on the MySQL default when we want it to be non-strict. On some (recent?) versions of MySQL, new connections default to being strict, so if we've been told 'strict:false', we're obliged to pass that on. This fixes a test failure that we've seen turn up on relatively-new development machines, so we do already have a test covering it. M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit b1e30b3 refs/remotes/origin/4-1-stable Author: Jenn Cooper Date: 2014-07-04 08:33:35 -0700 fixed issue with ActiveRecord serialize object as JSON fixes #15594 M activerecord/CHANGELOG.md M activerecord/lib/active_record.rb M activerecord/lib/active_record/attribute_methods/serialization.rb A activerecord/lib/active_record/coders/json.rb M activerecord/test/cases/serialized_attribute_test.rb commit 6787507 refs/heads/master Author: Godfrey Chan Date: 2014-07-05 11:50:55 -0700 Re-enable foriegn key tests on MySQL This reverts commit e84799d, e31104c and e6ca8e2 M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/schema/schema.rb commit 1ad84bf refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-07-02 15:50:47 -0700 Add CHANGELOG for c803b90 Conflicts: actionview/CHANGELOG.md M actionview/CHANGELOG.md commit 49447a3 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-07-02 15:48:23 -0700 The hex escape sequence can be of any length M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 11365dc refs/remotes/origin/4-1-stable Author: John F. Douthat Date: 2013-01-28 16:26:12 -0600 Fix escape_once double-escaping hex-encoded entities (This is a manual merge of #9102) M actionview/test/template/erb_util_test.rb M actionview/test/template/tag_helper_test.rb M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 5780b96 refs/heads/master Merge: 64e3d1d 02579b5 Author: Rafael Mendonça França Date: 2014-07-05 13:53:32 -0300 Merge pull request #16035 from sgrif/sg-range-types Use the type object for quoting PG Ranges commit 8c8e5be refs/heads/master Author: Aditya Kapoor Date: 2014-07-05 22:14:03 +0530 [ci skip] add guide for ActiveModel::Naming M guides/source/active_model_basics.md commit 64e3d1d refs/heads/master Author: Sean Griffin Date: 2014-07-05 08:39:30 -0600 Only reference time specific methods in the time section [ci skip] M guides/source/active_support_core_extensions.md commit 0994851 refs/heads/master Author: Sean Griffin Date: 2014-07-05 08:34:20 -0600 Remove *all* references to `Time.yesterday` [ci skip] M guides/source/active_support_core_extensions.md commit 8856ab0 refs/heads/master Author: Sean Griffin Date: 2014-07-05 08:15:05 -0600 `Time.today` -> `Date.today` in guides. [ci skip] Removed mentions of non-existent methods, also added a mention for `Date.current`, which is analagous to `Time.current`. Closes #16061. M guides/source/active_support_core_extensions.md commit 02579b5 refs/heads/master Author: Sean Griffin Date: 2014-07-03 07:16:06 -0600 Use the type object for quoting PG Ranges D activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/range.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit 082d1e3 refs/heads/master Author: Sean Griffin Date: 2014-07-04 18:54:33 -0600 Add release notes entry for #15819 [ci skip] M guides/source/4_2_release_notes.md commit 0c4f3af refs/heads/master Author: Sean Griffin Date: 2014-07-04 18:47:00 -0600 CHANGELOG and release notes entry for #16056 M activerecord/CHANGELOG.md M guides/source/4_2_release_notes.md commit 3ac8118 refs/heads/master Merge: a6cc7b0 00f5551 Author: David Heinemeier Hansson Date: 2014-07-04 19:43:53 -0500 Merge pull request #16056 from sgrif/sg-required-associations Add a `required` option to singular associations commit 00f5551 refs/heads/master Author: Sean Griffin Date: 2014-07-04 14:51:12 -0600 Add a `required` option to singular associations In addition to defining the association, a `required` association will also have its presence validated. Before: ```ruby belongs_to :account validates_presence_of :account ``` After: ```ruby belongs_to :account, required: true ``` This helps to draw a distinction between types of validations, since validations on associations are generally for data integrity purposes, and aren't usually set through form inputs. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/builder/association.rb M activerecord/lib/active_record/associations/builder/singular_association.rb A activerecord/test/cases/associations/required_test.rb commit a6cc7b0 refs/heads/master Merge: 3f2ec19 2ad1dd2 Author: Matthew Draper Date: 2014-07-05 04:13:04 +0930 Merge pull request #16054 from rails/revert-16003-sg-refactor-sqlite3-strings Revert "Use a type object for type casting behavior on SQLite3" commit 2ad1dd2 refs/heads/master Author: Matthew Draper Date: 2014-07-05 04:10:40 +0930 Revert "Use a type object for type casting behavior on SQLite3" M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 3f2ec19 refs/heads/master Author: Matthew Draper Date: 2014-07-05 03:56:19 +0930 Don't fail if unicode.org isn't talking to us M activesupport/test/multibyte_conformance_test.rb commit d02794e refs/heads/master Author: Rafael Mendonça França Date: 2014-07-04 14:22:00 -0300 Fix typo M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit 540a0ba refs/heads/master Merge: c59c091 cb5f2d3 Author: Rafael Mendonça França Date: 2014-07-04 14:17:34 -0300 Merge pull request #16013 from tgxworld/remove_symbolized_path_parameters Remove symbolized_path_parameters. commit 2063a6a refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-07-04 14:15:54 -0300 Remove some warnings M activerecord/test/cases/adapters/sqlite3/sqlite3_create_folder_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/finder_test.rb commit b4dfc0a refs/remotes/origin/4-0-stable Author: Matthias Zirnstein Date: 2014-01-05 17:55:39 +0100 Remove method redefined warnings for test suite has_many definitions with "name" as singular and as plural e.g. has_many :welcome_posts_with_comment has_many :welcome_posts_with_comments Ruby mentions it with: lib/active_record/associations/builder/collection_association.rb:65: warning: method redefined; discarding old welcome_posts_with_comment_ids lib/active_record/associations/builder/collection_association.rb:65: warning: previous definition of welcome_posts_with_comment_ids was here lib/active_record/associations/builder/collection_association.rb:75: warning: method redefined; discarding old welcome_posts_with_comment_ids= lib/active_record/associations/builder/collection_association.rb:75: warning: previous definition of welcome_posts_with_comment_ids= was here M activerecord/test/cases/associations/inner_join_association_test.rb M activerecord/test/models/author.rb commit 6f30c55 refs/remotes/origin/4-0-stable Author: Matthias Zirnstein Date: 2014-01-06 16:40:32 +0100 Remove warnings in test suite lib/active_record/store.rb:79: warning: method redefined; discarding old color= lib/active_record/store.rb:79: warning: previous definition of color= was here lib/active_record/store.rb:83: warning: method redefined; discarding old color lib/active_record/store.rb:83: warning: previous definition of color was here M activerecord/test/models/admin/user.rb commit 97f2a58 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-07-04 14:08:43 -0300 Merge pull request #16028 from cade/fix_counter_cache_count_with_association_selects Add `:all` argument to `count` in `reset_counters` Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/lib/active_record/counter_cache.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/counter_cache.rb M activerecord/test/cases/counter_cache_test.rb commit 2082bc7 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-07-04 14:08:43 -0300 Merge pull request #16028 from cade/fix_counter_cache_count_with_association_selects Add `:all` argument to `count` in `reset_counters` Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/lib/active_record/counter_cache.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/counter_cache.rb M activerecord/test/cases/counter_cache_test.rb commit c59c091 refs/heads/master Merge: 6636df3 0ada76c Author: Matthew Draper Date: 2014-07-05 02:39:30 +0930 Merge pull request #16003 from sgrif/sg-refactor-sqlite3-strings Use a type object for type casting behavior on SQLite3 commit 6636df3 refs/heads/master Merge: 2fd8dd7 c8e48f0 Author: Rafael Mendonça França Date: 2014-07-04 14:08:43 -0300 Merge pull request #16028 from cade/fix_counter_cache_count_with_association_selects Add `:all` argument to `count` in `reset_counters` Conflicts: activerecord/CHANGELOG.md commit 2fd8dd7 refs/heads/master Merge: 42de620 b39a344 Author: Rafael Mendonça França Date: 2014-07-04 14:02:21 -0300 Merge pull request #16011 from xjlu/token_and_options Improve token_and_options regex and test commit 42de620 refs/heads/master Merge: 23e35f1 f367f2e Author: Matthew Draper Date: 2014-07-05 02:24:00 +0930 Merge pull request #16040 from seuros/patch-1 Add arel to the controller template [ci skip] commit 23e35f1 refs/heads/master Merge: bcd1b9c 99f8d4f Author: Rafael Mendonça França Date: 2014-07-04 13:50:57 -0300 Merge pull request #14005 from dmitry/test_coverage_for_actionmailer Add test coverage for the action mailer commit bcd1b9c refs/heads/master Merge: 9cf9944 3ac3760 Author: Matthew Draper Date: 2014-07-05 02:19:32 +0930 Merge pull request #16042 from akshay-vishnoi/doc_change [ci skip] /javascript/ -> JavaScript - cover whole app commit 021a8f7 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-07-05 01:17:54 +0930 Merge pull request #16049 from matthewd/find-via-reload After find-via-reload, the record is not new Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/persistence.rb activerecord/test/cases/persistence_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 3e88b9e refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-07-05 01:17:54 +0930 Merge pull request #16049 from matthewd/find-via-reload After find-via-reload, the record is not new Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/persistence.rb activerecord/test/cases/persistence_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 9cf9944 refs/heads/master Merge: 871af91 de03c29 Author: Matthew Draper Date: 2014-07-05 01:17:54 +0930 Merge pull request #16049 from matthewd/find-via-reload After find-via-reload, the record is not new commit 871af91 refs/heads/master Merge: 295f2bd 8572fcd Author: Rafael Mendonça França Date: 2014-07-04 12:35:46 -0300 Merge pull request #16046 from grosser/grosser/cleangen Do not load rails without loading bundler commit 295f2bd refs/heads/master Merge: a8e1538 efc436d Author: Rafael Mendonça França Date: 2014-07-04 12:32:44 -0300 Merge pull request #16037 from sgrif/sg-money-quoting Remove unneccessary special case for money in quoting commit 99f8d4f refs/heads/master Author: Dmitry Polushkin Date: 2014-02-10 13:24:27 +0000 add test coverage for the action mailer M actionmailer/test/abstract_unit.rb M actionmailer/test/asset_host_test.rb M actionmailer/test/delivery_methods_test.rb A actionmailer/test/fixtures/test_helper_mailer/welcome M actionmailer/test/i18n_with_controller_test.rb M actionmailer/test/test_helper_test.rb commit de03c29 refs/heads/master Author: Matthew Draper Date: 2014-07-05 00:15:04 +0930 After find-via-reload, the record is not new M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit a8e1538 refs/heads/master Merge: cce376c e197fd7 Author: Rafael Mendonça França Date: 2014-07-04 11:36:46 -0300 Merge pull request #16048 from arunagw/aa-added-notice-index-page Display notice in index.html pages in scaffolded generated views commit e197fd7 refs/heads/master Author: Arun Agrawal Date: 2014-07-04 16:18:34 +0200 Display notice in index.html pages in scaffolded generated views As we are setting notice in destroy action we should display that For more information see https://github.com/rails/rails/pull/14044 And https://github.com/rails/jbuilder/pull/191 closes #14044 M railties/lib/rails/generators/erb/scaffold/templates/index.html.erb M railties/test/generators/controller_generator_test.rb M railties/test/generators/scaffold_controller_generator_test.rb commit 8572fcd refs/heads/master Author: grosser Date: 2014-07-03 17:27:39 -0700 remove bundler magic M railties/lib/rails/generators/rails/app/templates/config/boot.rb commit 0c5efb4 refs/heads/master Author: John Bachir Date: 2014-07-03 18:25:55 -0400 link directory to ActionMailer Previews documentation M guides/source/4_1_release_notes.md commit cce376c refs/heads/master Author: Godfrey Chan Date: 2014-07-03 14:52:03 -0700 :fire: these are lambdas now [ci skip] This has changed since around 2b1500d6 M activesupport/lib/active_support/callbacks.rb commit 3ac3760 refs/heads/master Author: Akshay Vishnoi Date: 2014-07-04 03:00:09 +0530 [ci skip] /javascript/ -> JavaScript - cover whole app M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M actionview/lib/action_view/helpers/asset_url_helper.rb M guides/source/generators.md commit f367f2e refs/heads/master Author: Abdelkader Boudih Date: 2014-07-03 19:35:53 +0000 Add arel to the controller template M guides/bug_report_templates/action_controller_master.rb commit efc436d refs/heads/master Author: Sean Griffin Date: 2014-07-03 07:40:14 -0600 Remove unneccessary special case for money in quoting M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/type/string.rb M activerecord/test/cases/adapters/postgresql/money_test.rb commit 2c31b18 refs/heads/master Merge: b24b7b9 261e51b Author: David Heinemeier Hansson Date: 2014-07-03 13:57:51 -0500 Merge pull request #96 from miyagawa/seiralize_globalid Call #to_s when serializing GlobalID. Fix #95 commit b24b7b9 refs/heads/master Merge: fdbfe97 392c482 Author: David Heinemeier Hansson Date: 2014-07-03 11:56:42 -0500 Merge pull request #99 from seuros/resque require both variant of resque-scheduler file commit 392c482 refs/heads/master Author: Abdelkader Boudih Date: 2014-07-03 16:44:01 +0000 require both variant of resque-scheduler M lib/active_job/queue_adapters/resque_adapter.rb commit fdbfe97 refs/heads/master Merge: c15d24e c5c7497 Author: David Heinemeier Hansson Date: 2014-07-03 11:37:00 -0500 Merge pull request #98 from seuros/resque Require correct file for resque scheduler commit c5c7497 refs/heads/master Author: Abdelkader Boudih Date: 2014-07-03 16:26:06 +0000 require 'resque-scheduler' fix #97 M lib/active_job/queue_adapters/resque_adapter.rb commit 3893190 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-07-03 12:12:17 -0300 Merge pull request #16038 from tbpgr/fix_guide_active_record_validations Fix guide. sample code syntax error.[ci skip] M guides/source/active_record_validations.md commit 9bcf0f0 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-07-03 12:12:17 -0300 Merge pull request #16038 from tbpgr/fix_guide_active_record_validations Fix guide. sample code syntax error.[ci skip] M guides/source/active_record_validations.md commit d4422c3 refs/heads/master Merge: 0691810 d262347 Author: Rafael Mendonça França Date: 2014-07-03 12:12:17 -0300 Merge pull request #16038 from tbpgr/fix_guide_active_record_validations Fix guide. sample code syntax error.[ci skip] commit d262347 refs/heads/master Author: tbpgr Date: 2014-07-03 23:58:23 +0900 Fix guide. sample code syntax error.[ci skip] M guides/source/active_record_validations.md commit 0691810 refs/heads/master Merge: be543ef 81b7187 Author: Rafael Mendonça França Date: 2014-07-03 11:55:34 -0300 Merge pull request #16036 from sgrif/sg-datetime-infinity Do not rely on the column type when quoting infinity commit be543ef refs/heads/master Merge: 03c9c0e e2763b4 Author: Rafael Mendonça França Date: 2014-07-03 11:54:41 -0300 Merge pull request #16034 from sgrif/sg-hstore-type-object Use the type object for type casting HStore columns commit 81b7187 refs/heads/master Author: Sean Griffin Date: 2014-07-03 07:33:54 -0600 Do not rely on the column type when quoting infinity M activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb A activerecord/test/cases/adapters/postgresql/infinity_test.rb commit e2763b4 refs/heads/master Author: Sean Griffin Date: 2014-07-03 07:07:27 -0600 Use the type object for type casting HStore columns M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit 03c9c0e refs/heads/master Merge: 590091b 266e8db Author: Vijay Dev Date: 2014-07-03 15:56:53 +0530 Merge pull request #15941 from variousred/docrails-changes [ci skip] Changes some wording to better foreshadow what is coming up later commit 590091b refs/heads/master Merge: beab403 3c917dd Author: Vijay Dev Date: 2014-07-03 10:41:16 +0530 Merge pull request #16029 from cade/fix_typo_in_comment Fix typo in comment commit 261e51b refs/heads/master Author: Tatsuhiko Miyagawa Date: 2014-07-02 19:32:40 -0700 Explicitly call #to_s when serializing GlobalID. Addresses #95 M lib/active_job/arguments.rb M test/cases/parameters_test.rb commit 3c917dd refs/heads/master Author: Cade Truitt Date: 2014-07-02 20:24:55 -0500 Fix typo in comment M activerecord/lib/active_record/relation/calculations.rb commit c8e48f0 refs/heads/master Author: Cade Truitt Date: 2014-07-02 20:09:05 -0500 Add `:all` argument to `count` in `reset_counters` Prior to this fix, if an association had a scope with a `select`, calls to `reset_counters` would generate invalid SQL and throw: ActiveRecord::StatementInvalid: [$DB_ADAPTER]: wrong number of arguments to function COUNT() References #10710, #13648 M activerecord/CHANGELOG.md M activerecord/lib/active_record/counter_cache.rb M activerecord/test/cases/counter_cache_test.rb commit 3f233ae refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-07-02 20:23:42 -0300 Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fix Change the JSON renderer to enforce the 'JS' Content Type Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_to_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/renderers.rb M actionpack/test/controller/mime_responds_test.rb commit 59bf23c refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-07-02 20:23:42 -0300 Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fix Change the JSON renderer to enforce the 'JS' Content Type Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/renderers.rb M actionpack/test/controller/mime/respond_to_test.rb commit beab403 refs/heads/master Merge: f2fc314 b00b638 Author: Rafael Mendonça França Date: 2014-07-02 20:23:42 -0300 Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fix Change the JSON renderer to enforce the 'JS' Content Type commit cb5f2d3 refs/heads/master Author: Guo Xiang Tan Date: 2014-07-01 23:42:41 -0700 Remove symbolized_path_parameters. This pull request is a continuation of https://github.com/rails/rails/commit/925bd975 and https://github.com/rails/rails/commit/8d8ebe3d. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/lib/action_dispatch/testing/test_request.rb M actionpack/test/controller/test_case_test.rb M actionpack/test/dispatch/routing_test.rb commit b00b638 refs/heads/master Author: Lucas Mazza Date: 2014-07-02 18:48:04 -0300 Change the JSON renderer to enforce the 'JS' Content Type The controller can set the response format as 'JSON' before the renderer code be evaluated, so we must replace it when necessary. Fixes #15081 M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/renderers.rb M actionpack/test/controller/mime/respond_to_test.rb commit f2fc314 refs/heads/master Author: Godfrey Chan Date: 2014-07-02 15:50:47 -0700 Add CHANGELOG for c803b90 M actionview/CHANGELOG.md commit 268a29d refs/heads/master Author: Godfrey Chan Date: 2014-07-02 15:48:23 -0700 The hex escape sequence can be of any length M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 41de23e refs/heads/master Author: John F. Douthat Date: 2013-01-28 16:26:12 -0600 Fix escape_once double-escaping hex-encoded entities (This is a manual merge of #9102) M actionview/test/template/erb_util_test.rb M actionview/test/template/tag_helper_test.rb M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 9eb15ed refs/heads/master Author: Godfrey Chan Date: 2014-07-02 14:39:41 -0700 Only automatically include validations when enabled This is a follow up to #16024. M activemodel/lib/active_model/secure_password.rb M activemodel/test/cases/secure_password_test.rb commit 6ee1796 refs/heads/master Merge: a410427 d75992b Author: Godfrey Chan Date: 2014-07-02 15:02:22 -0700 Merge pull request #16001 from johnpaulashenfelter/jp_fix_datetime_to_f `DateTime#to_f` now preserves fractional seconds. commit d75992b refs/heads/master Author: John Paul Ashenfelter Date: 2014-07-01 09:43:46 -0400 `DateTime#to_f` now preserves fractional seconds. Previously this method always returns `.0` in the fractional part. This commit changes it to preserve the fractional seconds instead. Fixes #15994. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/conversions.rb M activesupport/test/core_ext/date_time_ext_test.rb commit a410427 refs/heads/master Merge: f625b68 7b1a42c Author: Rafael Mendonça França Date: 2014-07-02 18:26:55 -0300 Merge pull request #16024 from aditya-kapoor/include-validations automatically include ActiveModel::Validations when include ActiveModel::SecurePassword commit 7b1a42c refs/heads/master Author: Aditya Kapoor Date: 2014-07-03 02:51:12 +0530 automatically include ActiveModel::Validations when include ActiveModel::SecurePassword M activemodel/lib/active_model/secure_password.rb M activemodel/test/cases/secure_password_test.rb M activemodel/test/models/user.rb M activemodel/test/models/visitor.rb commit f625b68 refs/heads/master Merge: c8f0176 b79593f Author: Rafael Mendonça França Date: 2014-07-02 18:17:54 -0300 Merge pull request #16015 from sgrif/sg-ensure-initialized Move pk initialization logic onto `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb commit cae2229 refs/remotes/origin/4-0-stable Merge: e207636 31e9229 Author: Rafael Mendonça França Date: 2014-07-02 17:04:23 -0300 Merge branch '4-0-8' into 4-0-stable Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md commit aefa699 refs/remotes/origin/4-1-stable Merge: 7b6bab0 7c4bfe1 Author: Rafael Mendonça França Date: 2014-07-02 17:03:23 -0300 Merge branch '4-1-4' into 4-1-stable Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md actionview/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md commit 7c4bfe1 refs/tags/v4.1.4 (tag: v4.1.4) Author: Rafael Mendonça França Date: 2014-07-02 15:30:18 -0300 Preparing for 4.1.4 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 31e9229 refs/tags/v4.0.8 (tag: v4.0.8) Author: Rafael Mendonça França Date: 2014-07-02 15:28:16 -0300 Preparing for 4.0.8 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit 958be0e refs/tags/v4.1.4 Author: Rafael Mendonça França Date: 2014-07-02 15:24:11 -0300 Make sure range strings are quoted after we quote the range. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit c1156bf refs/tags/v4.0.8 Author: Rafael Mendonça França Date: 2014-07-02 15:15:21 -0300 Make sure range strings are quoted after we quote the range. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb A activerecord/test/cases/adapters/postgresql/range_test.rb commit c8f0176 refs/heads/master Merge: 7df68a3 664feb2 Author: Rafael Mendonça França Date: 2014-07-02 15:06:13 -0300 Merge pull request #16022 from sgrif/sg-range-quoting Quote range strings when quoting PG ranges commit 7b6bab0 refs/remotes/origin/4-1-stable Merge: abb1c9b 5c2f77f Author: Rafael Mendonça França Date: 2014-07-02 15:05:25 -0300 Merge pull request #16021 from sgrif/sg-range-quotes-4-1 Quote range strings when quoting PG ranges (4-1-stable) commit 664feb2 refs/heads/master Author: Sean Griffin Date: 2014-07-02 11:55:52 -0600 Quote range strings when quoting PG ranges The test case for CVE-2014-3483 doesn't actually send the generated SQL to the database. The generated SQL is actually invalid for real inputs. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit 5c2f77f refs/remotes/origin/4-1-stable Author: Sean Griffin Date: 2014-07-02 11:55:52 -0600 Quote range strings when quoting PG ranges The test case for CVE-2014-3483 doesn't actually send the generated SQL to the database. The generated SQL is actually invalid for real inputs. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit e207636 refs/remotes/origin/4-0-stable Merge: 60bf402 094d49c Author: Rafael Mendonça França Date: 2014-07-02 14:57:27 -0300 Merge pull request #16020 from sgrif/sg-range-quotes-4-0 Quote range strings when quoting PG ranges (4-0-stable) commit 094d49c refs/remotes/origin/4-0-stable Author: Sean Griffin Date: 2014-07-02 11:43:56 -0600 Quote range strings when quoting PG ranges The test case for CVE-2014-3483 doesn't actually send the generated SQL to the database. The generated SQL is actually invalid for real inputs. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb A activerecord/test/cases/adapters/postgresql/range_test.rb commit 7df68a3 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-05 14:08:40 -0300 Fix SQL injection when querying against ranges and bitstrings Fix CVE-2014-3483 and protect against CVE-2014-3482. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit abb1c9b refs/remotes/origin/4-1-stable Merge: 31f674a dfa7a76 Author: Rafael Mendonça França Date: 2014-07-02 14:21:44 -0300 Merge branch '4-1-sec' into 4-1-stable Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md actionview/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md commit 60bf402 refs/remotes/origin/4-0-stable Merge: 9f08041 f17b04a Author: Rafael Mendonça França Date: 2014-07-02 14:20:24 -0300 Merge branch '4-0-sec' into 4-0-stable Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md commit c43f20a refs/remotes/origin/3-2-stable Merge: 3622858 53c845c Author: Rafael Mendonça França Date: 2014-07-02 14:18:47 -0300 Merge branch '3-2-sec' into 3-2-stable commit 266e8db refs/heads/master Author: Michael Mitchell Date: 2014-06-27 10:54:58 -0700 [ci skip] Changes some wording to better foreshadow what is coming up later. This should prevent some anxiety readers may experience when the doc goes into something different than what it just explained. Also clarifies a statement about priority in engines and application environments [ci skip] fixes double `the` [ci skip] more clarifications [ci skip] changes from tics to quotes M guides/source/engines.md commit dfa7a76 refs/tags/v4.1.3 (tag: v4.1.3) Author: Rafael Mendonça França Date: 2014-07-02 13:00:25 -0300 Preparing for 4.1.3 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 27a0c13 refs/tags/v4.1.3 Author: Rafael Mendonça França Date: 2014-06-05 14:08:40 -0300 Fix SQL injection when querying against ranges and bitstrings Fix CVE-2014-3483 and protect against CVE-2014-3482. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit f17b04a refs/tags/v4.0.7 (tag: v4.0.7) Author: Rafael Mendonça França Date: 2014-07-02 12:58:10 -0300 Preparing for 4.0.7 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit c4598b9 refs/tags/v4.0.7 Author: Rafael Mendonça França Date: 2014-06-05 14:08:40 -0300 Fix SQL injection when querying against ranges and bitstrings Fix CVE-2014-3483 and protect against CVE-2014-3482. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit 53c845c refs/tags/v3.2.19 (tag: v3.2.19) Author: Rafael Mendonça França Date: 2014-07-02 12:55:09 -0300 Preparing for 3.2.19 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activeresource/CHANGELOG.md M activeresource/lib/active_resource/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit 1f2192e refs/tags/v3.2.19 Author: Rafael Mendonça França Date: 2014-06-05 12:34:07 -0300 Check against bit string values using multiline regexp Fix CVE-2014-3482. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit f838caf refs/heads/master Author: Rafael Mendonça França Date: 2014-07-02 12:02:03 -0300 Fix typo M actionpack/test/dispatch/request_test.rb commit 7442f5a refs/heads/master Merge: b1e4c59 b6e15f9 Author: Rafael Mendonça França Date: 2014-07-02 11:04:46 -0300 Merge pull request #16016 from sgrif/sg-dup Don't error when `dup`ing a record with no PK commit b1e4c59 refs/heads/master Merge: 5c87b5c 59ad995 Author: Rafael Mendonça França Date: 2014-07-02 11:01:29 -0300 Merge pull request #16007 from nishantmodak/flash_msg_as_string flash doesn't pass objects #15522 [ci skip] commit b6e15f9 refs/heads/master Author: Sean Griffin Date: 2014-07-02 07:00:26 -0600 Don't error when `dup`ing a record with no PK M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/dup_test.rb commit b79593f refs/heads/master Author: Sean Griffin Date: 2014-07-02 06:54:32 -0600 Move pk initialization logic onto `AttributeSet` Better encapsulates its internals from `ActiveRecord::Base`. M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/core.rb commit 5c87b5c refs/heads/master Author: Rafael Mendonça França Date: 2014-07-02 09:41:52 -0300 Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format" This reverts commit 46139d33c06715e74ad450428ece3ee84da98579, reversing changes made to 8f247871bb18b2e3036a05df5f62cbfe3b402586. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb M railties/test/application/test_test.rb commit 4cb4e87 refs/heads/master Author: Robin Dupret Date: 2014-07-02 14:22:24 +0200 Tiny follow-up to #15987 and 088b4c3e [ci skip] M activerecord/lib/active_record/inheritance.rb commit 9d599ab refs/heads/master Author: Aaron Patterson Date: 2014-07-01 17:59:43 -0700 do not hold on to a stale connection object. fixes #15998 M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration/pending_migrations_test.rb commit b39a344 refs/heads/master Author: Xinjiang Lu Date: 2014-06-11 00:11:27 -0700 Improve token_and_options regex and test add a test case to test the regex for the helper method raw_params M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_token_authentication_test.rb commit ad778bc refs/heads/master Merge: 7bd6206 bc7030c Author: Rafael Mendonça França Date: 2014-07-01 15:21:39 -0300 Merge pull request #15999 from eileencodes/add-regression-tests-for-keys-on-nested-associations Add regression tests for keys on nested associations commit bc7030c refs/heads/master Author: eileencodes Date: 2014-07-01 08:19:04 -0400 Add regression tests for keys on nested associations This adds the regressions tests from issue #15893 to master. It's checking that both strings and symbols are accepted as keys for nested associations. M activerecord/test/cases/reflection_test.rb commit 59ad995 refs/heads/master Author: Nishant Modak Date: 2014-07-01 23:06:13 +0530 flash doesn't pass objects #15522 [ci skip] M actionpack/lib/action_dispatch/middleware/flash.rb commit 7bd6206 refs/heads/master Merge: 72f58b0 cac2451 Author: Rafael Mendonça França Date: 2014-07-01 13:59:34 -0300 Merge pull request #16006 from ShunsukeAida/xml_http_request_comment_change [ci skip] Fixed the documentation of xml_http_request? (aka xhr?) commit 72f58b0 refs/heads/master Author: Rafael Mendonça França Date: 2014-07-01 13:09:24 -0300 Rename preview_enabled option to show_previews M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/preview.rb M actionmailer/lib/action_mailer/railtie.rb M guides/source/configuring.md M railties/test/application/configuration_test.rb M railties/test/application/mailer_previews_test.rb commit 4d3eb70 refs/heads/master Merge: 5de61cc 84ed7b8 Author: Rafael Mendonça França Date: 2014-07-01 13:04:53 -0300 Merge pull request #15970 from lengarvey/add_configuration_option_for_mail_preview Add configuration to enable mail previews commit cac2451 refs/heads/master Author: ShunsukeAida Date: 2014-07-01 20:02:47 +0900 makes it sound less misleading M actionpack/lib/action_dispatch/http/request.rb commit 5de61cc refs/heads/master Merge: d15d1a0 fa03fa7 Author: Matthew Draper Date: 2014-07-02 00:18:14 +0930 Merge pull request #16000 from sgrif/sg-silence-warning Silence warning emitted in tests commit 9f08041 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-07-01 11:40:25 -0300 Merge pull request #16004 from JuanitoFatas/doc/patch-1 [ci skip] Add missing prologue section of upgrading ruby on rails guide. M guides/source/upgrading_ruby_on_rails.md commit 31f674a refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-07-01 11:40:25 -0300 Merge pull request #16004 from JuanitoFatas/doc/patch-1 [ci skip] Add missing prologue section of upgrading ruby on rails guide. M guides/source/upgrading_ruby_on_rails.md commit d15d1a0 refs/heads/master Merge: 898bc73 e9700d6 Author: Rafael Mendonça França Date: 2014-07-01 11:40:25 -0300 Merge pull request #16004 from JuanitoFatas/doc/patch-1 [ci skip] Add missing prologue section of upgrading ruby on rails guide. commit e9700d6 refs/heads/master Author: Juanito Fatas Date: 2014-07-01 22:35:20 +0800 [ci skip] Add missing prologue section of upgrading ruby on rails guide. M guides/source/upgrading_ruby_on_rails.md commit 0ada76c refs/heads/master Author: Sean Griffin Date: 2014-07-01 08:11:59 -0600 Use a type object for type casting behavior on SQLite3 Note: I'm not sure we actually need to be logging when this happens. This code would be a fair bit cleaner if we didn't need to log it. M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit fa03fa7 refs/heads/master Author: Sean Griffin Date: 2014-07-01 07:46:56 -0600 Silence warning emitted in tests The instance method `model_name` was being defined multiple times, causing a redefinition warning. M activemodel/lib/active_model/naming.rb commit 898bc73 refs/heads/master Merge: da57d0b fbb0447 Author: Eileen M. Uchitelle Date: 2014-07-01 08:21:34 -0400 Merge pull request #15997 from cirosantilli/typo Fix doc unwanted dl Admin:: [ci skip] commit fbb0447 refs/heads/master Author: Ciro Santilli Date: 2014-07-01 11:46:41 +0200 Fix doc unwanted dl Admin:: [ci skip] M actionpack/lib/action_dispatch/routing/mapper.rb commit 84ed7b8 refs/heads/master Author: Leonard Garvey Date: 2014-06-30 00:12:25 +1000 Add configuration to enable mail previews Adds `config.action_mailer.preview_enabled` This allows mail previewing to be enabled easily in non-development environments such as staging. The default is set to true for development so no changes should be required to existing Rails applications. The mail preview path can still be configured using the existing `config.action_mailer.preview_path` configuration option. Adding this avoids devs from having to do stuff like: https://gist.github.com/lengarvey/fa2c9bd6cdbeba96526a Update actionmailer/CHANGELOG with new configuration. Update configuring guide with new configuratation. Add `config.action_mailer.preview_path` to configuring guide. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/preview.rb M actionmailer/lib/action_mailer/railtie.rb M guides/source/configuring.md M railties/lib/rails/application/finisher.rb M railties/test/application/configuration_test.rb M railties/test/application/mailer_previews_test.rb commit da57d0b refs/heads/master Author: Aaron Patterson Date: 2014-06-30 15:37:12 -0700 push host / port / protocol extraction up Then we only need to extract host once. M actionpack/lib/action_dispatch/http/url.rb commit 41a7c44 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-30 17:42:56 -0300 Add CHANGELOG entry for #15214 Closes #15214 M actionview/CHANGELOG.md commit 2546610 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-30 17:41:50 -0300 Use if/else Since we are using both branches of the code is preferable to use if/else over the early return. M actionview/lib/action_view/helpers/tags/datetime_field.rb commit f39595a refs/heads/master Merge: dc67d3d ac44345 Author: Rafael Mendonça França Date: 2014-06-30 17:40:07 -0300 Merge pull request #15214 from todd/date_field_docs Added String support for min and max properties for date field helpers commit ac44345 refs/heads/master Author: Todd Bealmear Date: 2014-05-20 18:51:00 -0700 Add String support for min/max attributes on DatetimeField M actionview/lib/action_view/helpers/form_helper.rb M actionview/lib/action_view/helpers/tags/datetime_field.rb M actionview/test/template/form_helper_test.rb commit dc67d3d refs/heads/master Author: Rafael Mendonça França Date: 2014-06-30 16:55:01 -0300 Rename rollback_changes to undo_changes To avoid overload with database rollback M activemodel/CHANGELOG.md M activemodel/lib/active_model/dirty.rb M activemodel/test/cases/dirty_test.rb commit b34f7c1 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-30 15:41:41 -0300 Add CHANGELOG entry for #14861 and document private methods on the API M activemodel/CHANGELOG.md M activemodel/lib/active_model/dirty.rb commit bada1d3 refs/heads/master Merge: 66d6c87 552d4d8 Author: Rafael Mendonça França Date: 2014-06-30 15:37:06 -0300 Merge pull request #14861 from igor04/dirty-rollback Added rollback method to ActiveModel::Dirty commit 66d6c87 refs/heads/master Merge: 58a5c84 b90c85d Author: Rafael Mendonça França Date: 2014-06-30 14:55:52 -0300 Merge pull request #15991 from sgrif/sg-has-attribute Don't add a second method for attribute existence commit b90c85d refs/heads/master Author: Sean Griffin Date: 2014-06-30 11:43:34 -0600 Don't add a second method for attribute existence We already had one in the public API that people can use more easily for the transition M activerecord/lib/active_record/attribute_methods.rb commit 58a5c84 refs/heads/master Merge: 088b4c3 a3a73d1 Author: Rafael Mendonça França Date: 2014-06-30 13:39:08 -0300 Merge pull request #15989 from nickpellant/master Fix 10.3 invite_email.body assert_match documentation example. commit c15d24e refs/heads/master Merge: 29d4672 fc9267e Author: Rafael Mendonça França Date: 2014-06-30 13:38:21 -0300 Merge pull request #92 from cristianbica/master Require global_identification in serialisations commit a3a73d1 refs/heads/master Author: Nick Pellant Date: 2014-06-30 16:46:31 +0100 Fix 10.3 invite_email.body assert_match example. Currently there is no implicit conversion for Mail::Body to string therefore .to_s must be applied. This is exampled in 10.2.2. M guides/source/testing.md commit 29d4672 refs/heads/master Merge: 47dd241 ba49be1 Author: Rafael Mendonça França Date: 2014-06-30 12:42:20 -0300 Merge pull request #93 from seuros/generator [feature] ActiveJob generator commit ba49be1 refs/heads/master Author: Abdelkader Boudih Date: 2014-06-29 15:59:38 +0000 [feature] ActiveJob generator A lib/rails/generators/active_job/job_generator.rb A lib/rails/generators/active_job/templates/job.rb commit 088b4c3 refs/heads/master Author: Sean Griffin Date: 2014-06-30 09:29:32 -0600 Move STI docs off of the main Base document, leaving a note M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/inheritance.rb commit 3b9d2b8 refs/heads/master Merge: 1f190b7 9ca98b5 Author: Sean Griffin Date: 2014-06-30 09:15:21 -0600 Merge pull request #15987 from jamesprior/patch-2 Update documentation on STI change handling commit 9ca98b5 refs/heads/master Author: jamesprior Date: 2014-06-30 09:36:45 -0400 Update documentation on STI change handling Documenting a potential source of confusion about how STI classes handle changes. M activerecord/lib/active_record/base.rb commit 1f190b7 refs/heads/master Merge: 74cec95 9e368a5 Author: Rafael Mendonça França Date: 2014-06-29 22:50:12 -0300 Merge pull request #15981 from sgrif/sg-simplify-defaults Simplify creation of default attributes on AR instance commit 74cec95 refs/heads/master Merge: e4ad47f 228aa4f Author: Godfrey Chan Date: 2014-06-29 14:57:40 -0700 Merge pull request #15977 from sgrif/sg-remove-array-hack Remove array workaround in PG quoting commit e4ad47f refs/heads/master Merge: 7a52d6b 167201b Author: Godfrey Chan Date: 2014-06-29 14:56:09 -0700 Merge pull request #15978 from sgrif/sg-pg-array-member Remove unused `array_member` from PG quoting for HStore columns commit 167201b refs/heads/master Author: Sean Griffin Date: 2014-06-29 13:07:53 -0600 Remove unused `array_member` from PG quoting for HStore columns Hstore no longer needs additional quoting to be used in an array, the array type handles it sufficiently. M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 228aa4f refs/heads/master Author: Sean Griffin Date: 2014-06-29 13:02:49 -0600 Remove array workaround in PG quoting We no longer need to do fancy legwork to make sure arrays use a type object, now that schema methods use a real type object. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 7a52d6b refs/heads/master Merge: 374958b 314d557 Author: Godfrey Chan Date: 2014-06-29 14:49:24 -0700 Merge pull request #15983 from sgrif/sg-inline-point Use the type object when sending point columns to the DB commit 374958b refs/heads/master Merge: d9827ca 7a3d76b Author: Godfrey Chan Date: 2014-06-29 14:46:57 -0700 Merge pull request #15976 from sgrif/sg-attribute-exists Don't encourage usage of `columns_hash` commit 314d557 refs/heads/master Author: Sean Griffin Date: 2014-06-29 15:44:41 -0600 Use the type object when sending point columns to the DB M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit d9827ca refs/heads/master Merge: a607fd2 972d9be Author: Godfrey Chan Date: 2014-06-29 14:32:46 -0700 Merge pull request #15982 from sgrif/sg-attr-set-map-values Use `Hash#transform_values` to clean up `AttributeSet` commit 972d9be refs/heads/master Author: Sean Griffin Date: 2014-06-29 15:31:35 -0600 Use `Hash#transform_values` to clean up `AttributeSet` M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/base.rb commit a607fd2 refs/heads/master Merge: f123da5 fb8ac4f Author: Godfrey Chan Date: 2014-06-29 14:30:02 -0700 Merge pull request #15979 from sgrif/sg-json-quoting Use the type object for sending JSON to the database commit 9e368a5 refs/heads/master Author: Sean Griffin Date: 2014-06-29 15:09:11 -0600 Simplify creation of default attributes on AR instance `AttributeSet#dup` has all the behavior we need. M activerecord/lib/active_record/attributes.rb M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/model_schema.rb commit f123da5 refs/heads/master Merge: 9ca0f8d b2cf8b2 Author: Guillermo Iguaran Date: 2014-06-29 15:01:52 -0500 Merge pull request #15819 from sgrif/sg-hash-map-values Add `Hash#map_values` to ActiveSupport to simplify a common pattern commit b2cf8b2 refs/heads/master Author: Sean Griffin Date: 2014-06-19 12:01:03 -0600 Add `Hash#map_values` to ActiveSupport Didn't get a chance to convert existing code, I'll skim through the code base to make use of this later this afternoon. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash.rb A activesupport/lib/active_support/core_ext/hash/transform_values.rb A activesupport/test/core_ext/hash/transform_values_test.rb commit fb8ac4f refs/heads/master Author: Sean Griffin Date: 2014-06-29 13:17:47 -0600 Use the type object for sending JSON to the database M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 7a3d76b refs/heads/master Author: Sean Griffin Date: 2014-06-29 12:51:42 -0600 Don't encourage usage of `columns_hash` As discussed in https://github.com/plataformatec/simple_form/pull/1094, we should not encourage usage of `columns_hash`, and instead provide an alternate method to determine whether or not an attribute exists. The language `attribute` was chosen over `column` since these are in the `AttributeMethods` module. M activerecord/lib/active_record/attribute_methods.rb commit 9ca0f8d refs/heads/master Author: Robin Dupret Date: 2014-06-29 20:14:40 +0200 Tiny documentation fixes [ci skip] M actionview/lib/action_view/helpers/form_helper.rb M activesupport/lib/active_support/callbacks.rb M guides/source/initialization.md commit d93ae4f refs/heads/master Author: Robin Dupret Date: 2014-06-29 20:13:49 +0200 Quick pass through Active Support and guides CHANGELOG [ci skip] M activesupport/CHANGELOG.md M guides/CHANGELOG.md commit 60e1aea refs/heads/master Merge: 85cfc10 4e1dc11 Author: Rafael Mendonça França Date: 2014-06-29 12:36:11 -0300 Merge pull request #15961 from mckramer/patch-1 Rename options param of #time_ago_in_words to match API change commit 85cfc10 refs/heads/master Merge: b4b6248 b404613 Author: Rafael Mendonça França Date: 2014-06-29 11:57:46 -0300 Merge pull request #15962 from sgrif/sg-types-for-defaults Always pass a column with a cast_type to quote commit b4b6248 refs/heads/master Merge: 539ff7d 13ee4e1 Author: Sean Griffin Date: 2014-06-28 22:18:47 -0600 Merge pull request #15963 from roryokane/getting-started-guide-fix-grammar Add punctuation and fix capitalization in Getting Started guide commit 539ff7d refs/heads/master Merge: b44174f 1c4f775 Author: Sean Griffin Date: 2014-06-28 22:17:02 -0600 Merge pull request #15964 from JuanitoFatas/doc/patch-01 [ci skip] Fix router option reference in 4.2 release notes. commit 1c4f775 refs/heads/master Author: Juanito Fatas Date: 2014-06-29 11:05:14 +0800 [ci skip] Fix router option reference in 4.2 release notes. M guides/source/4_2_release_notes.md commit 13ee4e1 refs/heads/master Author: Rory O’Kane Date: 2014-06-28 22:26:35 -0400 Add punctuation and fix capitalization in Getting Started guide Fix more small grammar mistakes in the [Getting Started guide](http://edgeguides.rubyonrails.org/getting_started.html#security), in sections 9 and 10. Specifically, within sections 9.1 “Basic Authentication”, 9.2 “Other Security Considerations”, and 10 “What's Next?”. “Rails Guides” is generally capitalized on the site, including on the linked page and in the title of the site, so I capitalized it. “The” is not part of the name of the Ruby on Rails Security Guide – “The” is not in the title on that page. And I added a missing period and a missing colon at the ends of two sentences. M guides/source/getting_started.md commit 4556785 refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-06-28 20:13:24 -0500 Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format" This reverts commit 22e9a91189af2c4e6217a888e77f22a23d3247d1. See discussion on https://github.com/rails/rails/commit/22e9a91189af2c4e6217a888e77f22a23d3247d1 for details. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb M railties/test/application/test_test.rb commit 9d74a29 refs/heads/master Author: schneems Date: 2014-06-28 15:05:05 -0500 [ci skip] remove invalid code from docs M guides/source/active_record_querying.md commit 0f6b101 refs/heads/master Author: schneems Date: 2014-06-28 14:57:10 -0500 [ci skip] Fix doc for except The example showed is `except`, however the method "documented" is `unstop`. Fix to align the docs to the example. M guides/source/active_record_querying.md commit f7e4362 refs/heads/master Author: schneems Date: 2014-06-28 14:46:33 -0500 [ci skip] Doc ability to chain in `find_each` Also use appropriate mailer syntax in the `find_each` block. M guides/source/active_record_querying.md commit 63f4155 refs/heads/master Author: schneems Date: 2014-06-28 14:38:16 -0500 [ci skip] Consolidate docs for `find` Put all options for overloading `find` in one section M guides/source/active_record_querying.md commit d4fd0bd refs/heads/master Author: schneems Date: 2014-06-28 14:30:52 -0500 [ci skip] Consolidate docs for `last` Add docs on what happens when a numerical argument is provided to last. Since `last!` behaves exactly the same way but can raise an argument we can consolidate it in the `last` section. M guides/source/active_record_querying.md commit d319ef8 refs/heads/master Author: schneems Date: 2014-06-28 14:16:49 -0500 [ci skip] Consolidate docs for `take` Add docs on what happens when a numerical argument is provided to take. Since `take!` behaves exactly the same way but can raise an argument we can consolidate it in the `take` section. M guides/source/active_record_querying.md commit 7d9c3ff refs/heads/master Author: schneems Date: 2014-06-28 14:07:25 -0500 [ci skip] Consolidate docs for `find_by` Since `find_by!` behaves exactly the same way but can raise an argument we can consolidate it in the `find_by` section. M guides/source/active_record_querying.md commit caa25e9 refs/heads/master Author: schneems Date: 2014-06-28 14:03:00 -0500 [ci skip] Consolidate docs for `first` Add docs for `first` when provided a numerical argument. Since `first!` behaves exactly the same way but can raise an argument we can consolidate it in the `first` section. M guides/source/active_record_querying.md commit e9f04cd refs/heads/master Author: schneems Date: 2014-06-28 13:54:24 -0500 [ci skip] Add return values to examples M guides/source/active_record_querying.md commit b404613 refs/heads/master Author: Sean Griffin Date: 2014-06-28 14:44:49 -0600 Always pass a column with a type object to quote The only case where we got a column that was not `nil`, but did not respond to `cast_type` was when type casting the default value during schema creation. We can look up the cast type, and add that object to the column definition. Will allow us to consistently rely on the type objects for type casting in all directions. M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb M activerecord/test/cases/quoting_test.rb commit 4e1dc11 refs/heads/master Author: Max Kramer Date: 2014-06-28 14:30:16 -0400 Rename options param of #time_ago_in_words to match API change Rename `include_seconds_or_options` to `options` to match 6b9356a (which removed the deprecation introduced by #6077). This has no functional impact because the parameter is passed directly through, but makes it clearer that the parameter no longer supports a boolean as input. M actionview/lib/action_view/helpers/date_helper.rb commit 64a2cbf refs/remotes/origin/4-1-stable Author: Marcel Morgan Date: 2014-04-12 08:31:00 -0500 Update documentation to use Rails.application instead References to ``AppName::Application` removed in favour of ``Rails.application`` as generated with a new rails 4.1 app. Refs #15914 [ci skip] M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M actionpack/lib/action_dispatch/routing.rb M actionview/lib/action_view/helpers/atom_feed_helper.rb M guides/code/getting_started/Rakefile M guides/code/getting_started/config.ru M guides/code/getting_started/config/environment.rb M guides/code/getting_started/config/environments/development.rb M guides/code/getting_started/config/environments/production.rb M guides/code/getting_started/config/environments/test.rb M guides/code/getting_started/config/initializers/secret_token.rb M guides/code/getting_started/config/initializers/session_store.rb M guides/code/getting_started/config/routes.rb M guides/source/action_controller_overview.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/rails_on_rack.md M guides/source/routing.md commit b44174f refs/heads/master Merge: 1377058 35591d3 Author: Yves Senn Date: 2014-06-28 19:27:14 +0200 Merge pull request #15957 from seuros/duplicate [Postgresql tests] remove duplicate helper commit 94b6207 refs/heads/master Author: Aditya Kapoor Date: 2014-06-28 22:27:06 +0530 remove unneeded test model for ActiveModel test cases. M activemodel/test/cases/validations_test.rb D activemodel/test/models/automobile.rb commit 1377058 refs/heads/master Merge: cad584e 092f53e Author: Vijay Dev Date: 2014-06-28 15:40:15 +0000 Merge branch 'master' of github.com:rails/docrails commit 35591d3 refs/heads/master Author: Abdelkader Boudih Date: 2014-06-28 15:08:13 +0000 [Postgresql tests] remove duplicate helper M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit cad584e refs/heads/master Merge: dcacaf2 d740b58 Author: Guillermo Iguaran Date: 2014-06-28 09:06:30 -0500 Merge pull request #15955 from JuanitoFatas/levenshtein-guide Update the levenshtein distance method in guides. commit dcacaf2 refs/heads/master Merge: e6ca8e2 25a4995 Author: Sean Griffin Date: 2014-06-28 06:28:59 -0600 Merge pull request #15954 from roryokane/getting-started-guide-add-period Add missing period in Getting Started guide commit d740b58 refs/heads/master Author: Juanito Fatas Date: 2014-06-28 15:19:46 +0800 Update the levenshtein distance method in guides. M guides/rails_guides/levenshtein.rb commit 25a4995 refs/heads/master Author: Rory O’Kane Date: 2014-06-28 01:54:41 -0400 Add missing period in Getting Started guide Within section 5.10 Adding Some Validation M guides/source/getting_started.md commit e6ca8e2 refs/heads/master Merge: 6a1af00 e31104c Author: Godfrey Chan Date: 2014-06-27 17:40:23 -0700 Merge pull request #15951 from pcreux/fix-mysql-test-fk MySQL doesn't work with foreign keys commit e31104c refs/heads/master Author: Philippe Creux Date: 2014-06-27 17:36:43 -0700 MySQL doesn't work with foreign keys This was previously fixed in e84799d but broken in 3f596f8. This commit reintroduced the conditional that prevents the foreign keys from being added to MySQL databases. M activerecord/test/schema/schema.rb commit 6a1af00 refs/heads/master Merge: 0aeb490 0418633 Author: Godfrey Chan Date: 2014-06-27 15:44:03 -0700 Merge pull request #15949 from pcreux/fix-add-foreign-key-in-test Fix test with `add_foreign_key` DSL commit 0418633 refs/heads/master Author: Philippe Creux Date: 2014-06-27 15:38:45 -0700 Fix test with add_foreign_key DSL in 9d21ef9 M activerecord/test/schema/schema.rb commit 0aeb490 refs/heads/master Merge: 3c19402 b58ec66 Author: Rafael Mendonça França Date: 2014-06-27 18:28:55 -0300 Merge pull request #15934 from seuros/rename rename primary key sequence only if it exists commit 3c19402 refs/heads/master Merge: ebdedae acee114 Author: Rafael Mendonça França Date: 2014-06-27 18:21:30 -0300 Merge pull request #15943 from wagenet/cache-instrumentation Always instrument ActiveSupport::Cache commit ebdedae refs/heads/master Merge: 67d7dfd 58399e1 Author: Rafael Mendonça França Date: 2014-06-27 18:11:31 -0300 Merge pull request #15933 from rafael/master Add always permitted parameters as a configurable option. [Rafael Mendonça França + Gary S. Weaver] commit acee114 refs/heads/master Author: Peter Wagenet Date: 2014-06-27 12:07:06 -0700 Always instrument ActiveSupport::Cache The current approach is broken because it uses a thread local value which means on multi-threaded environments it has to be turned on per thread. Secondly, ActiveSupport::Notifications does not instrument items when there are not subscribers so this flag is unnecessary. M activesupport/lib/active_support/cache.rb commit 67d7dfd refs/heads/master Merge: 3f596f8 c97b18a Author: Rafael Mendonça França Date: 2014-06-27 17:38:45 -0300 Merge pull request #15946 from jamesprior/patch-1 Update documentation for run_callbacks commit 3f596f8 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-27 17:32:38 -0300 Do not change the global state of the test suite M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/schema/schema.rb commit c97b18a refs/heads/master Author: jamesprior Date: 2014-06-27 16:23:32 -0400 Update documentation for run_callbacks In some cases run_callbacks will return nil. I'm attempting to update the documentation for the method to clarify. M activesupport/lib/active_support/callbacks.rb commit 58399e1 refs/heads/master Author: Rafael Chacón Date: 2014-06-27 13:08:40 -0700 Improvements per code review. * General style fixes. * Add changes to configuration guide. * Add missing tests. M actionpack/lib/action_controller/metal/strong_parameters.rb A actionpack/test/controller/parameters/always_permitted_parameters_test.rb M guides/source/configuring.md M railties/test/application/configuration_test.rb commit 9d21ef9 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-27 16:53:07 -0300 Improve tests to use add_foreign_key DSL M activerecord/test/cases/associations/belongs_to_associations_test.rb commit b58ec66 refs/heads/master Author: Abdelkader Boudih Date: 2014-06-27 08:46:07 +0000 rename sequence only if it exists M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/migration/rename_table_test.rb commit e84799d refs/heads/master Author: Rafael Mendonça França Date: 2014-06-27 16:41:38 -0300 MySQL doesn't works with foreign key M activerecord/test/cases/associations/belongs_to_associations_test.rb commit c8b8443 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-27 16:29:59 -0300 Fix typo [ci skip] :bomb: M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 36a3897 refs/heads/master Author: Sean Griffin Date: 2014-06-27 13:10:58 -0600 We are talking about the libraries, not the constants M activemodel/lib/active_model/dirty.rb commit e04c4c0 refs/heads/master Author: Sean Griffin Date: 2014-06-27 13:07:25 -0600 Note that `_will_change!` is no longer needed for AR instances Leave the note for `ActiveModel`, since it can't yet detect mutations (hopefully we can change this in time for 4.2). However, we now detect mutations on all supported types in `ActiveRecord`, so we can note that `_will_change!` is no longer needed there. M activemodel/lib/active_model/dirty.rb commit 31b7882 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-27 16:01:53 -0300 Remove duplicated configuration and talk about config.assets.version move Closes #15942 M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 30b5608 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-27 15:59:22 -0300 Talk about config.assts.version move too Closes #15942 M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit b22edc6 refs/heads/master Merge: eb6e3e3 87d1aba Author: Rafael Mendonça França Date: 2014-06-27 15:39:48 -0300 Merge pull request #12450 from iantropov/master Fix bug, when ':dependent => :destroy' violates foreign key constraints Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/has_one.rb commit eb6e3e3 refs/heads/master Merge: a87573d c7802dc Author: Rafael Mendonça França Date: 2014-06-27 15:14:47 -0300 Merge pull request #15788 from sgrif/sg-mutable-strings Detect in-place modifications on Strings commit a87573d refs/heads/master Merge: 35a9f7a 0fa4c95 Author: Rafael Mendonça França Date: 2014-06-27 14:49:43 -0300 Merge pull request #8639 from bogdan/valid-with-bang Add AR::Base#valid! method commit 35a9f7a refs/heads/master Merge: 644719b 3852f2d Author: Rafael Mendonça França Date: 2014-06-27 14:43:12 -0300 Merge pull request #15940 from DNNX/databases-rake-refactoring databases.rake refactoring commit 644719b refs/heads/master Merge: 11ac0ca ccc1d3d Author: Rafael Mendonça França Date: 2014-06-27 14:34:54 -0300 Merge pull request #15938 from sgrif/sg-stop-instance-execing Stop using instance exec for type decorators commit ccc1d3d refs/heads/master Author: Sean Griffin & Sean Doyle Date: 2014-06-27 10:23:43 -0600 Stop using instance exec for type decorators We are moving this behavior out to an object that we would like to keep separated from `ActiveRecord::Base`, which means not passing the class object to it. As such, we need to stop using `instance_exec`, and instead close over the subclass on global type decorators that are applied in `Base`. M activerecord/lib/active_record/attribute_decorators.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/locking/optimistic.rb commit 3852f2d refs/heads/master Author: Viktar Basharymau Date: 2014-06-27 20:24:38 +0300 Use AR::SchemaMigration.table_exists? call instead of longish AR::Base...etc,etc M activerecord/lib/active_record/railties/databases.rake commit 68b7e7a refs/heads/master Author: Viktar Basharymau Date: 2014-06-27 20:16:21 +0300 Extract AR::SchemaMigration.normalized_versions method M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/schema_migration.rb commit 0813607 refs/heads/master Author: Viktar Basharymau Date: 2014-06-27 18:28:12 +0300 Add a test for db:migrate:status to check missing file scenario M railties/test/application/rake/migrations_test.rb commit 11ac0ca refs/heads/master Author: Robin Dupret Date: 2014-06-27 16:50:41 +0200 Follow-up to #15215 [ci skip] M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/testing.md commit e75bdcb refs/heads/master Author: Viktar Basharymau Date: 2014-06-26 20:08:19 +0300 db:migrate:status refactoring: Rewrite hand-crafted SQL query with ActiveRecord#pluck M activerecord/lib/active_record/railties/databases.rake commit c4918ee refs/heads/master Author: Viktar Basharymau Date: 2014-06-26 14:03:54 +0300 Use Array#flat_map and Array#grep in db:migrate:status task It allows the code to be more declarative and elegant. M activerecord/lib/active_record/railties/databases.rake commit 5dbf37d refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 16:44:54 +0300 Add explaining variables to db:migrate:status M activerecord/lib/active_record/railties/databases.rake commit 482fdad refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 13:02:23 +0300 Replace String index juggling with Pathname goodness in db:fixtures:load M activerecord/lib/active_record/railties/databases.rake commit d20b869 refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 12:57:03 +0300 db:fixtures:load refactoring: remove unnecessary loop `ActiveRecord::FixtureSet.create_fixtures` can accept an array of fixture_files. M activerecord/lib/active_record/railties/databases.rake commit 5a4df80 refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 12:53:03 +0300 Extract `fixture_files` variable in fixtures:load rake task M activerecord/lib/active_record/railties/databases.rake commit 41fb066 refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 12:51:30 +0300 Replace a bit of cryptic code in fixtures:load rake task with plain stupid Ruby M activerecord/lib/active_record/railties/databases.rake commit 0526fad refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 12:40:02 +0300 Get rid of duplication in db:fixtures:{identify,load} M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb commit 13ff102 refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 12:34:21 +0300 db:fixtures:{identify,load} tasks respect AR::Tasks::DatabaseTasks.root Before this commit, if `ENV['FIXTURES_PATH']` was set, then `Rails.root` was used, otherwise the app used `ActiveRecord::Tasks::DatabaseTasks.root`. Now it is consistent. M activerecord/lib/active_record/railties/databases.rake commit 8d541fc refs/heads/master Author: Viktar Basharymau Date: 2014-06-25 12:29:32 +0300 Simplify complex code in databases.rake M activerecord/lib/active_record/railties/databases.rake commit 2053e1f refs/heads/master Author: Yves Senn Date: 2014-06-27 16:17:52 +0200 credit Matthew Higgins for the integration of foreign keys. [ci skip] M activerecord/CHANGELOG.md commit 7a07b22 refs/heads/master Author: Robin Dupret Date: 2014-06-27 15:09:10 +0200 Tiny follow-up to 1a69112 Wrap list items to 80 chars and avoid relying on NOTE inside an item since they are meant to be parsed in paragraphs, not lists. [ci skip] M guides/source/active_record_migrations.md commit c197a7d refs/heads/master Author: Rafael Chacón Date: 2014-06-26 23:01:30 -0700 Add always_permitted_parameters as an option. * This commit adds back the always_permitted_parameters configuration option to strong paramaters. * The initial pull requests where this feature was added are the following: - https://github.com/rails/rails/pull/12682 - https://github.com/rails/strong_parameters/pull/174 M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/railtie.rb M railties/test/application/configuration_test.rb commit 3622858 refs/remotes/origin/3-2-stable Author: Rafael Mendonça França Date: 2014-06-26 22:10:32 -0300 Use a version of execjs compatible with Ruby 1.8 M Gemfile commit 297bff7 refs/tags/v3.2.19 Author: Rafael Mendonça França Date: 2014-06-26 18:37:48 -0300 Make sure Active Support configurations are applied correctly Before this patch configuration set using config.active_support would not be set. Closes #15364 M activesupport/lib/active_support/railtie.rb M railties/test/application/configuration_test.rb commit d04763f refs/heads/master Merge: 600aaf4 643409d Author: Rafael Mendonça França Date: 2014-06-26 18:14:47 -0300 Merge pull request #14247 from robin850/inflections-with-uncountables Make the apply_inflections method case-sensitive commit 3be7f29 refs/remotes/origin/4-0-stable Merge: 5652922 2d3a3ff Author: Rafael Mendonça França Date: 2014-06-26 17:47:41 -0300 Merge pull request #15915 from strzalek/backport-av-raise-missing-translations Rails config for raise on missing translations commit 600aaf4 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-26 17:23:13 -0300 Change method visibility M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit c153503 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-26 17:22:59 -0300 Add nodoc to internal class [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit ea93a15 refs/heads/master Merge: 5add8b8 a5b3f37 Author: Rafael Mendonça França Date: 2014-06-26 17:12:46 -0300 Merge pull request #15606 from senny/ar/foreign_key_support Basic support for adding and removing foreign keys commit a5b3f37 refs/heads/master Author: Yves Senn Date: 2014-06-12 08:42:00 +0200 fk: add docs M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M guides/source/4_2_release_notes.md M guides/source/active_record_migrations.md commit 24e1aef refs/heads/master Author: Yves Senn Date: 2014-06-26 13:09:45 +0200 fk: review corrections: indent, visibility, syntax, wording. M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/migration/command_recorder.rb commit 8768305 refs/heads/master Author: Yves Senn Date: 2014-06-20 11:54:17 +0200 fk: use random digest names The name of the foreign key is not relevant from a users perspective. Using random names resolves the urge to rename the foreign key when the respective table or column is renamed. M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/migration/foreign_key_test.rb M activerecord/test/fixtures/fk_test_has_pk.yml M activerecord/test/schema/schema.rb M activerecord/test/schema/sqlite_specific_schema.rb commit 8550ba3 refs/heads/master Author: Yves Senn Date: 2014-06-20 08:56:30 +0200 fk: raise for invalid :on_update / :on_delete values M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 31e4c19 refs/heads/master Author: Yves Senn Date: 2014-06-11 17:26:51 +0200 fk: `add/remove_foreign_key` are noop for adapters that don't support fk M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 0938d53 refs/heads/master Author: Yves Senn Date: 2014-06-11 11:35:26 +0200 fk: dump foreign keys at the bottom to make sure tables exist. M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/schema_dumper_test.rb commit 9ae1a2c refs/heads/master Author: Yves Senn Date: 2014-06-11 11:16:31 +0200 fk: raise when identifiers are longer than `allowed_index_name_length`. M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration/foreign_key_test.rb commit acd0287 refs/heads/master Author: Yves Senn Date: 2014-06-11 08:47:53 +0200 fk: support for on_update M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 6955d86 refs/heads/master Author: Yves Senn Date: 2014-06-11 08:23:17 +0200 fk: rename `dependent` to `on_delete` M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/migration/foreign_key_test.rb commit d074b82 refs/heads/master Author: Yves Senn Date: 2014-06-10 15:29:19 +0200 fk: infere column name from table names. This allows to create and remove foreign keys without specifying a column. M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/command_recorder_test.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 6073d7c refs/heads/master Author: Yves Senn Date: 2014-06-10 15:00:59 +0200 fk: make `add_foreign_key` reversible. M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/command_recorder_test.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 402f303 refs/heads/master Author: Yves Senn Date: 2014-06-10 14:26:50 +0200 fk: support dependent option (:delete, :nullify and :restrict). M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 69c711f refs/heads/master Author: Yves Senn Date: 2014-06-10 13:28:38 +0200 fk: dump foreign keys to schema.rb respect `table_name_prefix` and `table_name_suffix`. M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/migration/foreign_key_test.rb M activerecord/test/cases/schema_dumper_test.rb commit a48b675 refs/heads/master Author: Yves Senn Date: 2014-06-10 12:09:58 +0200 fk: `:primary_key` option for non-standard pk's. M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration/foreign_key_test.rb M activerecord/test/support/ddl_helper.rb commit 1c170fd refs/heads/master Author: Yves Senn Date: 2014-06-10 11:50:37 +0200 fk: generalize using `AlterTable` and `SchemaCreation`. M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 74b2fe4 refs/heads/master Author: Yves Senn Date: 2014-06-10 11:10:54 +0200 fk: `foreign_keys`, `add_foreign_key` and `remove_foreign_key` for MySQL M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/migration/foreign_key_test.rb commit 09b3a28 refs/heads/master Author: Yves Senn Date: 2014-06-10 10:59:18 +0200 fk: add `foreign_keys` for PostgreSQL adapter. M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/migration/foreign_key_test.rb commit e2ef257 refs/heads/master Author: Yves Senn Date: 2014-06-06 17:24:46 +0200 fk: `add_foreign_key` and `remove_foreign_key` for PostgreSQL adapter. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb A activerecord/test/cases/migration/foreign_key_test.rb commit fc9267e refs/heads/master Author: Cristian Bica Date: 2014-06-26 22:29:21 +0300 Require global_identification in serialisations M lib/active_job/arguments.rb commit 5add8b8 refs/heads/master Author: Godfrey Chan Date: 2014-06-26 10:55:58 -0700 :nodoc: our SecureRandom patches [ci skip] These methods shouldn't be added to `SecureRandom`, as they are neither secure nor random. The more appropriate place for this seems to be `Digest`, so we should move them there. (Pull request welcomed!) Marking this `:nodoc:` for now, so we don't accidentally ship it as public API. See https://github.com/rails/rails/pull/15306/files#r13055862 for details. M activesupport/lib/active_support/core_ext/securerandom.rb commit f437f11 refs/heads/master Merge: 8b0753b 3bc314e Author: Rafael Mendonça França Date: 2014-06-26 14:50:18 -0300 Merge pull request #15924 from sgrif/sg-write-unknown-column Move writing unknown column exception to null attribute commit 8b0753b refs/heads/master Merge: 031588e 58d38d6 Author: Rafael Mendonça França Date: 2014-06-26 13:44:47 -0300 Merge pull request #15916 from sgrif/sg-test-update-all Consolidate testing of update_all type casting commit eeabe79 refs/remotes/origin/4-1-stable Merge: 890cfcf 0690f6f Author: Rafael Mendonça França Date: 2014-06-26 13:38:14 -0300 Merge branch '4-1-2' into 4-1-stable Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md actionview/CHANGELOG.md activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb activesupport/CHANGELOG.md railties/CHANGELOG.md commit 5652922 refs/remotes/origin/4-0-stable Merge: 29ac566 276b72c Author: Rafael Mendonça França Date: 2014-06-26 13:32:04 -0300 Merge branch '4-0-6' into 4-0-stable Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb activesupport/CHANGELOG.md commit 3bc314e refs/heads/master Author: Sean Griffin Date: 2014-06-26 09:36:40 -0600 Move writing unknown column exception to null attribute Making this change revealed several subtle bugs related to models with no primary key, and anonymous classes. These have been fixed as well, with regression tests added. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/models/contact.rb commit 0690f6f refs/tags/v4.1.2 (tag: v4.1.2) Author: Rafael Mendonça França Date: 2014-06-26 11:09:22 -0300 Point to the newest version [ci skip] M guides/source/_welcome.html.erb commit 58d38d6 refs/heads/master Author: Sean Griffin Date: 2014-06-25 19:32:14 -0600 Consolidate testing of update_all type casting We have several test cases on "tricky" types that are essentially testing that `update_all` goes through the same type casting behavior as a normal assignment + save. We recently had another case to add this test for another type in https://github.com/rails/rails/pull/12742. Rather than testing this separately for every type which is "tricky" when round tripping, let's instead have a fairly exhaustive test that ensures we're getting the correct values at every step for `update_all`. Given the structure of the code now, we can be confident that if the type is correct, and `update_all` is type casting correctly, we're going to get the right behavior for all types. M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/relation_test.rb commit 276b72c refs/tags/v4.0.6 (tag: v4.0.6) Author: Rafael Mendonça França Date: 2014-06-26 10:37:37 -0300 Preparing for 4.0.6 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit 14f635a refs/tags/v4.1.2 Author: Rafael Mendonça França Date: 2014-06-26 10:34:44 -0300 Preparing for 4.1.2 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 031588e refs/heads/master Merge: e8003c7 d730e37 Author: Rafael Mendonça França Date: 2014-06-26 10:27:13 -0300 Merge pull request #15754 from sgrif/sg-deprecate-hmt-counter-cache Deprecate automatic counter caches on has_many :through commit d730e37 refs/heads/master Author: Sean Griffin Date: 2014-06-15 09:19:54 -0600 Deprecate automatic counter caches on has_many :through Reliant on https://github.com/rails/rails/pull/15747 but pulled to a separate PR to reduce noise. `has_many :through` associations have the undocumented behavior of automatically detecting counter caches. However, the way in which it does so is inconsistent with counter caches everywhere else, and doesn't actually work consistently. As with normal `has_many` associations, the user should specify the counter cache on the `belongs_to`, if they'd like it updated. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/associations/cascaded_eager_loading_test.rb A activerecord/test/cases/associations/deprecated_counter_cache_on_has_many_through_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/associations/join_model_test.rb M activerecord/test/cases/connection_adapters/schema_cache_test.rb M activerecord/test/cases/finder_test.rb M activerecord/test/fixtures/posts.yml M activerecord/test/models/post.rb M activerecord/test/models/tagging.rb M activerecord/test/schema/schema.rb M guides/source/4_2_release_notes.md commit e8003c7 refs/heads/master Merge: 6bcedea bb7bc49 Author: Rafael Mendonça França Date: 2014-06-26 10:20:15 -0300 Merge pull request #15870 from sgrif/sg-attribute-name `Attribute` should know about its name commit bb7bc49 refs/heads/master Author: Sean Griffin Date: 2014-06-22 16:57:40 -0600 `Attribute` should know about its name This allows using polymorphism for the uninitialized attributes raising an exception behavior. M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/attribute_set/builder.rb M activerecord/test/cases/attribute_set_test.rb M activerecord/test/cases/attribute_test.rb commit 6bcedea refs/heads/master Merge: 6099b64 3136388 Author: Rafael Mendonça França Date: 2014-06-26 09:56:00 -0300 Merge pull request #15845 from robin850/jruby-isolation Make the isolated tests run on JRuby commit 643409d refs/heads/master Author: Robin Dupret Date: 2014-03-02 18:30:54 +0100 Make the apply_inflections method case-sensitive Since d3071db1, the apply_inflections method check if the downcased version of a string is contained inside the "whitelist" of uncountable words. However, if the word is composed of capital letters, it won't be matched in the list while it should. We can't simply revert to the previous behavior as there is a performance concern (benchmarked over /usr/share/dict/words): Before d3071db1 135.610000 0.290000 135.900000 (137.807081) Since d3071db1 22.170000 0.020000 22.190000 ( 22.530005) With the patch 22.060000 0.020000 22.080000 ( 22.125771) Benchmarked with http://git.io/aFnWig This way, the solution is to put the down-case version of words inside the @uncountables array. M activesupport/CHANGELOG.md M activesupport/lib/active_support/inflector/inflections.rb M activesupport/test/inflector_test.rb commit 890cfcf refs/remotes/origin/4-1-stable Merge: abec22e 7caceee Author: Rafael Mendonça França Date: 2014-06-26 07:22:29 -0300 Merge pull request #15893 from eileencodes/4-1-allow-string-based-keys-for-nested-associations 4-1-stable allow string based keys for nested associations commit abec22e refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-26 06:55:18 -0300 Require shellwords since it is dependecy of this file Closes #15919 M railties/lib/rails/generators/testing/assertions.rb commit 6099b64 refs/heads/master Merge: d625af2 64a05a9 Author: Rafael Mendonça França Date: 2014-06-26 07:03:31 -0300 Merge pull request #15834 from rmehner/allow_proc_and_symbol_for_only_integer Allow proc and symbol as values for `only_integer` of `NumericalityValidator` commit d625af2 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-26 06:55:18 -0300 Require shellwords since it is dependecy of this file Closes #15919 M railties/lib/rails/generators/testing/assertions.rb commit 14b1208 refs/heads/master Author: Sean Griffin Date: 2014-06-22 16:25:40 -0600 Encapsulate the creation of `Attribute` objects This will make it less painful to add additional properties, which should persist across writes, such as `name`. Conflicts: activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/attribute_set/builder.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/attribute_set_test.rb M activerecord/test/cases/attribute_test.rb commit 2571c3f refs/heads/master Merge: 7813709 a89f8a9 Author: Rafael Mendonça França Date: 2014-06-26 06:40:08 -0300 Merge pull request #15868 from sgrif/sg-uninitialized-attributes Move behavior of `read_attribute` to `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb activerecord/test/cases/attribute_set_test.rb commit 7813709 refs/heads/master Merge: e1ad3ed c083ce6 Author: Rafael Mendonça França Date: 2014-06-26 06:33:18 -0300 Merge pull request #15847 from sgrif/sg-encapsulate-result-types Encapsulate knowledge of type objects on `ActiveRecord::Result` commit e1ad3ed refs/heads/master Merge: 18def15 3ea9a88 Author: Rafael Mendonça França Date: 2014-06-26 06:26:26 -0300 Merge pull request #15846 from sgrif/sg-attributes-before-type-cast Move `attributes_before_type_cast` to `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb activerecord/test/cases/attribute_set_test.rb commit 4955c04 refs/heads/master Author: Luke Gruber Date: 2014-06-25 23:18:33 -0400 remove Set.new from DetailsKey::get, impacts rendering overhead performance Using ruby-prof, I noticed that Set#add had the largest 'self time' percentage (5% of the overall time spent rendering) when benchmarking the rendering of a small cached ERB template that was 3 lines long. It turns out it was from this line. I don't believe the Set is necessary, either. Removing this line increases the rendering ips using Benchmark::ips accordingly. M actionview/lib/action_view/lookup_context.rb commit 2d3a3ff refs/remotes/origin/4-0-stable Author: Kassio Borges Date: 2014-01-26 20:05:34 -0200 Rails config for raise on missing translations Add a config to setup whether raise exception for missing translation or not. Conflicts: actionview/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_view/base.rb M actionpack/lib/action_view/helpers/translation_helper.rb M actionpack/test/template/translation_helper_test.rb M guides/source/configuring.md M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt commit 18def15 refs/heads/master Author: Yves Senn Date: 2014-06-25 19:47:10 +0200 docs, fix BacktraceCleaner code example. Closes #15911. [ci skip] M activesupport/lib/active_support/backtrace_cleaner.rb commit fa12d22 refs/heads/master Author: Yves Senn Date: 2014-06-25 19:39:19 +0200 sync deprecations and removals with 4.2 release notes. [ci skip] Noticed that there was no section about Action View and added the heading. Notable changes need to be compiled. /cc @chancancode @zzak M guides/source/4_2_release_notes.md commit d708b5c refs/heads/master Author: Yves Senn Date: 2014-06-25 18:43:32 +0200 synchronize Active Record deprecations / removals with 4.2 release notes [ci skip] /cc @chancancode @zzak M activerecord/CHANGELOG.md M guides/source/4_2_release_notes.md commit a89f8a9 refs/heads/master Author: Sean Griffin Date: 2014-06-22 15:38:55 -0600 Move behavior of `read_attribute` to `AttributeSet` Moved `Builder` to its own file, as it started looking very weird once I added private methods to the `AttributeSet` class and the `Builder` class started to grow. Would like to refactor `fetch_value` to change to ```ruby self[name].value(&block) ``` But that requires the attributes to know about their name, which they currently do not. M activerecord/lib/active_record.rb M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_set.rb A activerecord/lib/active_record/attribute_set/builder.rb M activerecord/test/cases/attribute_set_test.rb commit 5706d29 refs/heads/master Author: Yves Senn Date: 2014-06-22 14:48:28 +0200 `preload` preserves readonly flag on associations. #15853 This is a partial fix for #15853. It only works when a `preload` is issued and not an `eager_load`. I've added a skipped failing test-case to keep in mind that we need to deal with `eager_load`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/test/cases/associations/eager_test.rb commit 092f53e refs/heads/master Author: Juanito Fatas Date: 2014-06-25 11:15:57 +0800 [ci skip] Add missing colon and period in initialization.md. M guides/source/initialization.md commit 29ac566 refs/remotes/origin/4-0-stable Merge: af8035d 61a73c2 Author: Rafael Mendonça França Date: 2014-06-24 23:51:44 -0300 Merge pull request #15910 from yuki24/fix-name-error-name-bug-4-0 Backport of #15764 and #15902 to 4-0-stable commit dde8d7b refs/remotes/origin/4-1-stable Merge: 5472080 4588b62 Author: Rafael Mendonça França Date: 2014-06-24 23:51:30 -0300 Merge pull request #15909 from yuki24/fix-name-error-name-bug-4-1 Backport of #15764 and #15902 to 4-1-stable commit 61a73c2 refs/remotes/origin/4-0-stable Author: Yuki Nishijima Date: 2014-06-24 19:17:30 -0700 Make dependencies.rb add a name to NameError M activesupport/CHANGELOG.md M activesupport/lib/active_support/dependencies.rb M activesupport/test/dependencies_test.rb commit 4588b62 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-06-16 23:13:42 -0400 Make dependencies.rb add a name to NameError M activesupport/CHANGELOG.md M activesupport/lib/active_support/dependencies.rb M activesupport/test/dependencies_test.rb commit 6b0e834 refs/heads/master Author: Amiel Martin Date: 2014-06-20 15:49:27 -0700 Use #model_name on instances instead of classes This allows rails code to be more confdent when asking for a model name, instead of having to ask for the class. Rails core discussion here: https://groups.google.com/forum/#!topic/rubyonrails-core/ThSaXw9y1F8 M actionpack/lib/action_controller/model_naming.rb M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/lib/action_view/helpers/form_helper.rb M actionview/lib/action_view/helpers/tags/label.rb M actionview/lib/action_view/model_naming.rb M actionview/test/activerecord/polymorphic_routes_test.rb M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/lint.rb M activemodel/lib/active_model/naming.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 activerecord/lib/active_record/integration.rb commit 09f4965 refs/tags/v4.0.6 Author: Rafael Mendonça França Date: 2014-06-24 19:05:41 -0300 inheritance_column need to be symbol to be removed from this hash We put it with a symbol as name when building the default scope so we have to use symbol to remove it. M activerecord/lib/active_record/associations/has_many_through_association.rb commit af8035d refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-24 19:05:41 -0300 inheritance_column need to be symbol to be removed from this hash We put it with a symbol as name when building the default scope so we have to use symbol to remove it. M activerecord/lib/active_record/associations/has_many_through_association.rb commit 4893354 refs/heads/master Merge: 5b23e31 98f0cab Author: Rafael Mendonça França Date: 2014-06-24 15:35:46 -0300 Merge pull request #15902 from yuki24/fix-name-error-bug Fix a bug where NameError#name returns a qualified name in string commit 5b23e31 refs/heads/master Merge: 5ee8777 8ee785a Author: Rafael Mendonça França Date: 2014-06-24 14:26:29 -0300 Merge pull request #15836 from DNNX/router-swap-select-sort Replace x.sort_by!.select! with x.select!.sort_by! commit 98f0cab refs/heads/master Author: Yuki Nishijima Date: 2014-06-24 10:07:29 -0700 Fix a bug where NameError#name returns a qualified name in string Ruby's original behaviour is that : * It only returns a const name, not a qualified aname * It returns a symbol, not a string M activesupport/lib/active_support/dependencies.rb M activesupport/test/dependencies_test.rb commit 5ee8777 refs/heads/master Merge: 44c9489 4b173b8 Author: Rafael Mendonça França Date: 2014-06-24 14:12:44 -0300 Merge pull request #15885 from lucasmazza/lm-skip-routes Add a '--skip-routes' flag for the Controller generator. commit 4b173b8 refs/heads/master Author: Lucas Mazza Date: 2014-06-19 18:42:52 -0300 Add a '--skip-routes' flag for the Controller generator. This way it is possible to skip the addition of the 'get "foo/bar"' routes when generating a controller. M railties/lib/rails/generators/rails/controller/controller_generator.rb M railties/test/generators/controller_generator_test.rb commit 44c9489 refs/heads/master Merge: 6bee389 124f88e Author: Rafael Mendonça França Date: 2014-06-24 13:08:54 -0300 Merge pull request #15899 from garethrees/gr-texthelper Deal with regex match groups in excerpt commit 124f88e refs/heads/master Author: Gareth Rees Date: 2014-06-09 17:56:05 +0100 Deal with regex match groups in excerpt Original implementation has bugs if the regex contains a match group. Example: excerpt('This is a beautiful? morning', /\b(beau\w*)\b/i, :radius => 5) Expected: "...is a beautiful? mor..." Actual: "...is a beautifulbeaut..." The original phrase was being converted to a regex and returning the text either side of the phrase as expected: 'This is a beautiful? morning'.split(/beautiful/i, 2) # => ["This is a ", "? morning"] When we have a match with groups the match is returned in the array. Quoting the ruby docs: "If pattern is a Regexp, str is divided where the pattern matches. [...] If pattern contains groups, the respective matches will be returned in the array as well." 'This is a beautiful? morning'.split(/\b(beau\w*)\b/iu, 2) # => ["This is a ", "beautiful", "? morning"] If we assume we want to split on the first match – this fix makes that assumption – we can pass the already assigned `phrase` variable as the place to split (because we already know that a match exists from line 168). Originally spotted by Louise Crow (@crowbot) at https://github.com/mysociety/alaveteli/pull/1557 M actionview/lib/action_view/helpers/text_helper.rb M actionview/test/template/text_helper_test.rb commit 9c35f70 refs/remotes/origin/4-0-stable Merge: 82139b9 703452c Author: Rafael Mendonça França Date: 2014-06-24 12:59:57 -0300 Merge pull request #15898 from arthurnn/backport_11912 Backport #11912 fix to 4-0-stable commit 7caceee refs/remotes/origin/4-1-stable Author: eileencodes Date: 2014-06-22 14:50:49 -0400 Fixes issue #15671 This allows both strings and symbols to be accepted as keys in a nested association. Originally we attempted to fix this issue the same as it was "fixed" on master, but that led to other issues of backwards compatibility. We decided to fix this problem on 4-1-stable by using symbols and not strings. add tests for string and symbol keys for associations These tests ensure that both strings and symbols are accepted to retreive the association. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/reflection_test.rb commit 6bee389 refs/heads/master Merge: a1bd00d ba11da1 Author: Arthur Nogueira Neves Date: 2014-06-24 10:51:58 -0500 Merge pull request #15887 from RudyOnRails/patch-1 Improves readability of this line... commit 703452c refs/remotes/origin/4-0-stable Author: Jon Kessler Date: 2013-08-16 08:22:08 -0700 update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/dispatch/response_test.rb M railties/lib/rails/railtie/configuration.rb M railties/test/application/configuration_test.rb commit c965de3 refs/heads/master Author: Arthur Neves Date: 2014-06-16 18:25:09 -0400 Dont swallow errors when bad alias_method M activerecord/CHANGELOG.md M activerecord/lib/active_record/inheritance.rb M activerecord/test/cases/base_test.rb commit ba11da1 refs/heads/master Author: Kevin Musiorski Date: 2014-06-23 17:57:26 -0500 Improves readability... [ci skip] M guides/source/asset_pipeline.md commit a1bd00d refs/heads/master Merge: 174d73a 3fab50a Author: Sean Griffin Date: 2014-06-24 09:09:14 -0600 Merge pull request #15828 from yuki24/add-warning-about-rescue-from-exception Add warning section for `rescue_from Exception` in Guides commit 174d73a refs/heads/master Author: Sean Griffin Date: 2014-06-24 08:51:42 -0600 Doc pass for `Type::Value` [ci skip] M activerecord/lib/active_record/type/mutable.rb M activerecord/lib/active_record/type/value.rb commit c2b02d0 refs/heads/master Merge: 1a299f1 50fa366 Author: Yves Senn Date: 2014-06-24 16:33:17 +0200 Merge pull request #15895 from sgrif/sg-numeric-changes Always assume strings with non-numeric characters change numeric types commit 50fa366 refs/heads/master Author: Sean Griffin Date: 2014-06-24 06:55:24 -0600 Always assume strings with non-numeric characters change numeric types We previously only did this if the old value was zero, to make sure numericality validations run and failed if the user gave 'wibble' as the value, which would be type cast to 0. However, numericality validations will fail if there are any non-numeric characters in the string, so 5 -> '5wibble' should also be marked as changed. M activerecord/CHANGELOG.md M activerecord/lib/active_record/type/numeric.rb M activerecord/test/cases/types_test.rb commit 1a299f1 refs/heads/master Merge: 9ac1ce1 40e33ff Author: Yves Senn Date: 2014-06-24 15:13:35 +0200 Merge pull request #15894 from sgrif/sg-silence-warning-in-test Silence warning in test commit 40e33ff refs/heads/master Author: Sean Griffin Date: 2014-06-24 06:43:03 -0600 Silence warning in test We still had one file using `column_for_attribute` when it could return nil, causing deprecation warnings in the tests. M activerecord/lib/active_record/attribute_assignment.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb commit 9ac1ce1 refs/heads/master Author: Yves Senn Date: 2014-06-24 14:16:29 +0200 `:nodoc: all` does not remove the constants from the API. [ci skip] Need to add individual `:nodoc:` for nested classes / modules to completely remove the constants from the API. M actionpack/lib/action_controller/metal/live.rb M railties/lib/rails/test_unit/sub_test_task.rb commit 0bb8dfd refs/heads/master Author: Yves Senn Date: 2014-06-24 13:52:21 +0200 add missing `:nodoc:` to `store.rb`. [ci skip] M activerecord/lib/active_record/store.rb commit d5d94a7 refs/heads/master Merge: b27e856 10adc2e Author: David Heinemeier Hansson Date: 2014-06-24 13:54:58 +0200 Merge pull request #15871 from yuki24/add-model-name-instance-method Add #model_name instance method to ActiveModel::Naming commit b27e856 refs/heads/master Author: Yves Senn Date: 2014-06-24 12:30:21 +0200 add missing `:nodoc:` for recent refactorings. [ci skip] Adding `# :nodoc:` to the parent `class` / `module` is not going to ignore nested classes or modules. There is a modifier `# :nodoc: all` but sadly the containing class or module will continue to be in the docs. /cc @sgrif M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_decorators.rb M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/attributes.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/bytea.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/date.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/date_time.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/decimal.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/enum.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/inet.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/infinity.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/integer.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/range.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/time.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/uuid.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/vector.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/type/binary.rb M activerecord/lib/active_record/type/mutable.rb commit b0594a7 refs/heads/master Merge: 72c1abc 469264f Author: Yves Senn Date: 2014-06-24 09:57:47 +0200 Merge pull request #15810 from maurogeorge/guides-rails-update Add rails:update to the upgrading guides commit 72c1abc refs/heads/master Merge: d43ef0d 4367d2f Author: Rafael Mendonça França Date: 2014-06-23 23:45:07 -0300 Merge pull request #15881 from mmozuras/remove_unused_params Remove unused params commit d43ef0d refs/heads/master Merge: 64c62d3 0d9e58f Author: Zachary Scott Date: 2014-06-23 15:57:12 -0700 Merge pull request #15886 from JuanitoFatas/disable-autolink Disable autolink in example code blocks in guides. [ci skip] commit 0d9e58f refs/heads/master Author: Juanito Fatas Date: 2014-06-24 06:27:04 +0800 Disable autolink in example code blocks in guides. /cc @chancancode @robin850 configuration reference: http://alexgorbatchev.com/SyntaxHighlighter/manual/configuration/ Related issues: * https://github.com/vmg/redcarpet/issues/334 * https://github.com/docrails-tw/guides/issues/62 M guides/assets/javascripts/guides.js commit 552d4d8 refs/heads/master Author: igor04 Date: 2014-04-24 16:06:26 +0300 Added rollback method to ActiveModel::Dirty M activemodel/lib/active_model/dirty.rb M activemodel/test/cases/dirty_test.rb commit 4367d2f refs/heads/master Author: Mindaugas Mozūras Date: 2014-06-23 20:55:40 +0300 Remove unused param 'conn' from ConnectionPool#release M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit e45d972 refs/heads/master Author: Mindaugas Mozūras Date: 2014-06-23 20:54:55 +0300 Remove unused param 'klass' from AttributeAssignment#read_other M activerecord/lib/active_record/attribute_assignment.rb commit 64c62d3 refs/heads/master Merge: ce54f67 d770ec0 Author: Rafael Mendonça França Date: 2014-06-23 16:51:43 -0300 Merge pull request #15882 from aditya-kapoor/remove-unnecessary-require remove unnecessary require from json serialization test cases commit d770ec0 refs/heads/master Author: Aditya Kapoor Date: 2014-06-24 00:03:02 +0530 remove unnecessary require for json serialization test cases M activemodel/test/cases/serializers/json_serialization_test.rb commit ce54f67 refs/heads/master Merge: 0e09875 b3c3e59 Author: Rafael Mendonça França Date: 2014-06-23 14:43:58 -0300 Merge pull request #14113 from murb/patch-1 Moved explanation of `--mountable` option up commit 0e09875 refs/heads/master Merge: 679626e 4db09e6 Author: Rafael Mendonça França Date: 2014-06-23 14:41:40 -0300 Merge pull request #15732 from kuldeepaggarwal/correct-assets-ouput [ci skip] correct output for asset_helper methods commit 679626e refs/heads/master Merge: c73f97b ae96f22 Author: Rafael Mendonça França Date: 2014-06-23 14:37:05 -0300 Merge pull request #15878 from sgrif/sg-null-column Revert #15502, and add a deprecation warning instead. commit 6ed0f63 refs/tags/v4.1.2.rc3 (tag: v4.1.2.rc3) Author: Rafael Mendonça França Date: 2014-06-23 14:26:31 -0300 Preparing for 4.1.2.rc3 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit c73f97b refs/heads/master Merge: 936fd4c e2960fb Author: Zachary Scott Date: 2014-06-23 10:23:11 -0700 Merge pull request #15880 from davetoxa/patch-1 s/overriden/overridden [ci skip] commit 9649cb4 refs/tags/v4.0.6.rc3 (tag: v4.0.6.rc3) Author: Rafael Mendonça França Date: 2014-06-23 14:21:34 -0300 Preparing for 4.0.6.rc3 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit e2960fb refs/heads/master Author: Anton Cherepanov Date: 2014-06-23 22:50:21 +0600 Small typo M activerecord/lib/active_record/attributes.rb M activerecord/lib/active_record/type/value.rb M guides/source/layouts_and_rendering.md M guides/source/upgrading_ruby_on_rails.md commit ae96f22 refs/heads/master Author: Sean Griffin Date: 2014-06-23 09:48:47 -0600 Add a deprecation cycle for `NullColumn` from `column_for_attribute` This is public API, and `simple_form` depends on the `nil` return value. We need to go through a deprecation cycle to return a null object. If people want hash access, they can access the hash. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/reflection_test.rb commit 936fd4c refs/heads/master Merge: 8a6b8c8 a4aa95e Author: Rafael Mendonça França Date: 2014-06-23 11:17:15 -0300 Merge pull request #15852 from SyntaxBlitz/master Change double quotes to single quotes in guide commit 0fa4c95 refs/heads/master Author: Bogdan Gusiev Date: 2014-06-23 16:09:40 +0300 Add AR::Base#validate! method Acts same as valid? but raises AR::RecordInvalid exception if validation fails M activerecord/lib/active_record/validations.rb M activerecord/test/cases/validations_test.rb commit 8a6b8c8 refs/heads/master Merge: 04b6ae4 821adfa Author: Yves Senn Date: 2014-06-23 14:32:18 +0200 Merge pull request #15867 from sgrif/sg-rm-column-types Remove unneeded `@column_types` instance variable commit 10adc2e refs/heads/master Author: Yuki Nishijima Date: 2014-06-22 19:06:44 -0700 Delegate #model_name method to self.class M activemodel/lib/active_model/naming.rb M activemodel/test/cases/naming_test.rb commit 04b6ae4 refs/heads/master Author: Yves Senn Date: 2014-06-22 23:04:58 +0200 changelog entries for #15866 and #15848 /cc @sgrif M activerecord/CHANGELOG.md commit f0f0174 refs/heads/master Merge: b663869 31911a4 Author: Yves Senn Date: 2014-06-22 22:57:34 +0200 Merge pull request #15848 from sgrif/sg-remove-deprecation Remove old deprecation warning commit 821adfa refs/heads/master Author: Sean Griffin Date: 2014-06-22 14:48:30 -0600 Remove unneeded `@column_types` instance variable This was used more previously, but other uses have been removed. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/store.rb commit b663869 refs/heads/master Merge: 7035a20 ba692a5 Author: Yves Senn Date: 2014-06-22 22:53:47 +0200 Merge pull request #15865 from sgrif/sg-missing-test Add missing test cases for `attribute_names` instance method commit 7035a20 refs/heads/master Merge: 22da898 3529bbd Author: Yves Senn Date: 2014-06-22 22:53:03 +0200 Merge pull request #15866 from sgrif/sg-reload-attributes `reload` should fully reload attributes commit ba692a5 refs/heads/master Author: Sean Griffin Date: 2014-06-22 14:16:34 -0600 Add missing test cases for `attribute_names` instance method There is a class method with the same name that is tested, but not the instance method. M activerecord/test/cases/attribute_methods_test.rb commit 3529bbd refs/heads/master Author: Sean Griffin Date: 2014-06-22 14:34:31 -0600 `reload` should fully reload attributes `reload` is meant to put a record in the same state it would be if you were to do `Post.find(post.id)`. This means we should fully replace the attributes hash. M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit c083ce6 refs/heads/master Author: Sean Griffin Date: 2014-06-21 11:31:57 -0600 Encapsulate knowledge of type objects on `ActiveRecord::Result` Attempting to reduce the number of places that care about the details of how type casting occurs. We remove the type casting of the primary key in `JoinDependecy`, rather than encapsulating it. It was originally added for consistency with https://github.com/rails/rails/commit/40898c8c19fa04442fc5f8fb5daf3a8bdb9a1e03#diff-06059df8d3dee3101718fb2c01151ad0R211, but that conditional was later removed in https://github.com/rails/rails/commit/d7ddaa530fd1b94e22d745cbaf2e8a5a34ee9734. What is important is that the same row twice will have the same value for the primary key, which it will. M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/result.rb M activerecord/test/cases/result_test.rb commit 31911a4 refs/heads/master Author: Sean Griffin Date: 2014-06-21 13:03:59 -0600 Remove old deprecation warning This has been around for a couple of versions now, a `NoMethodError` should suffice at this point. M activerecord/lib/active_record/querying.rb commit 5472080 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-22 16:37:59 +0200 Merge pull request #15860 from aidanharan/docrails-assets-manifest-typo [ci skip] Added missing colon in asset manifest JSON M guides/source/asset_pipeline.md commit 22da898 refs/heads/master Merge: 281c92a 6f25115 Author: Yves Senn Date: 2014-06-22 16:37:59 +0200 Merge pull request #15860 from aidanharan/docrails-assets-manifest-typo [ci skip] Added missing colon in asset manifest JSON commit 281c92a refs/heads/master Merge: 5686fd0 023d14e Author: Yves Senn Date: 2014-06-22 14:34:23 +0200 Merge pull request #15859 from zuhao/refactor_activesupport_caching_test Create with_env helper for tests. commit 023d14e refs/heads/master Author: Zuhao Wan Date: 2014-06-22 20:31:34 +0800 Create with_env helper for tests. M activesupport/test/caching_test.rb commit 5686fd0 refs/heads/master Merge: ebf552b 6d7ac31 Author: Yves Senn Date: 2014-06-22 13:59:27 +0200 Merge pull request #15839 from sgrif/sg-attr-set-null Return a null object from `AttributeSet#[]` commit ebf552b refs/heads/master Merge: 1e122ff 3e422e2 Author: Yves Senn Date: 2014-06-22 13:55:59 +0200 Merge pull request #15849 from sgrif/sg-move-attributes Move `attributes` to the `AttributeSet` object. commit 1e122ff refs/heads/master Merge: e32dade 1c4fa54 Author: Yves Senn Date: 2014-06-22 13:52:59 +0200 Merge pull request #15850 from sgrif/sg-missing-tests Add missing test cases for `attribute_method?` commit e32dade refs/heads/master Merge: 213e73d 17ad556 Author: Yves Senn Date: 2014-06-22 13:47:25 +0200 Merge pull request #15856 from zuhao/refactor_activesupport_decoding_test Use with_parse_json_times helper in tests. commit 213e73d refs/heads/master Merge: 0e9a705 42b3359 Author: Yves Senn Date: 2014-06-22 13:38:18 +0200 Merge pull request #15857 from zuhao/refactor_activesupport_encoding_test Avoid hardcoded magic number in test teardown. commit 42b3359 refs/heads/master Author: Zuhao Wan Date: 2014-06-22 18:36:07 +0800 Avoid hardcoded magic number in test teardown. M activesupport/test/json/encoding_test.rb commit 17ad556 refs/heads/master Author: Zuhao Wan Date: 2014-06-22 18:30:44 +0800 Use with_parse_json_times helper in tests. M activesupport/test/json/decoding_test.rb commit 64a05a9 refs/heads/master Author: Robin Mehner Date: 2014-06-22 12:22:27 +0200 `only_integer` of `NumericalityValidator` now allows procs and symbols M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations/numericality.rb M activemodel/test/cases/validations/numericality_validation_test.rb commit a4aa95e refs/heads/master Author: Timothy Aveni Date: 2014-06-21 21:23:48 -0400 Change double quotes to single quotes in guide Improve consistency M guides/source/getting_started.md commit 1c4fa54 refs/heads/master Author: Sean Griffin Date: 2014-06-21 13:30:33 -0600 Add missing test cases for `attribute_method?` M activerecord/test/cases/attribute_methods_test.rb commit 3e422e2 refs/heads/master Author: Sean Griffin Date: 2014-06-21 13:09:48 -0600 Move `attributes` to the `AttributeSet` object. M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_set.rb M activerecord/test/cases/attribute_set_test.rb commit 3ea9a88 refs/heads/master Author: Sean Griffin Date: 2014-06-21 10:52:19 -0600 Move `attributes_before_type_cast` to `AttributeSet` M activerecord/lib/active_record/attribute_methods/before_type_cast.rb M activerecord/lib/active_record/attribute_set.rb M activerecord/test/cases/attribute_set_test.rb commit 3136388 refs/heads/master Author: Robin Dupret Date: 2014-06-09 18:13:47 +0200 Make the isolated tests run on JRuby As there is no forking on JRuby, we need to spawn sub-processes to make the tests run in isolation. Previously, we were defining globally env variables and running the test file through backticks and delete these variables once the test ran. Now, we simply rely on IO.popen as this is cross-platform and the env variables are available during the child-process execution only so there are no race conditions. [Ben Browning & Robin Dupret] M activesupport/lib/active_support/testing/isolation.rb commit 0e9a705 refs/heads/master Author: Zachary Scott Date: 2014-06-20 12:59:56 -0700 :nail_care: wrap the tip from #15624 at 80 chars [ci skip] M guides/source/active_record_migrations.md commit afa449c refs/heads/master Merge: 081eec4 876908d Author: Zachary Scott Date: 2014-06-20 12:57:23 -0700 Merge pull request #15624 from aditya-kapoor/add-warnings-on-guides [ci skip] Add Tip for change_column_null and change_column_default in guides commit 876908d refs/heads/master Author: Aditya Kapoor Date: 2014-06-21 01:22:31 +0530 [ci skip] Add Tip for change_column_null and change_column_default in guides M guides/source/active_record_migrations.md commit 6d7ac31 refs/heads/master Author: Sean Griffin Date: 2014-06-20 11:36:23 -0600 Return a null object from `AttributeSet#[]` M activerecord/lib/active_record/attribute_methods/before_type_cast.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/attribute_set_test.rb commit 081eec4 refs/heads/master Merge: c2d5b31 bd3fde0 Author: Matthew Draper Date: 2014-06-21 00:09:45 +0930 Merge pull request #15764 from arthurnn/dependencies_name_error Make dependencies.rb add a name to NameError commit 8ee785a refs/heads/master Author: Viktar Basharymau Date: 2014-06-20 17:16:11 +0300 Replace x.sort_by!.select! with x.select!.sort_by! The latter has the same speed as the former in the worst case and faster in general, because it is always better to sort less items. Unfortunately, `routes.select!{...}.sort_by!{...}` is not possible here because `select!` returns `nil`, so select! and sort! must be done in two steps. M actionpack/lib/action_dispatch/journey/router.rb commit bd3fde0 refs/heads/master Author: Arthur Neves Date: 2014-06-20 09:55:41 -0400 Add regression test for NameError#name M activesupport/lib/active_support/dependencies.rb M activesupport/test/dependencies_test.rb commit b36df0f refs/heads/master Author: Arthur Neves Date: 2014-06-16 23:13:42 -0400 Make dependencies.rb add a name to NameError M activesupport/CHANGELOG.md M activesupport/lib/active_support/dependencies.rb commit c2d5b31 refs/heads/master Author: Yves Senn Date: 2014-06-20 15:18:14 +0200 docs, configurations method is listed in the docs. [ci skip] The :singleton-method: directive is printed in the docs. This directive is not necessary as the method is documentable just fine. M activerecord/lib/active_record/core.rb commit 75e4d09 refs/heads/master Merge: edc0f27 4251af5 Author: Yves Senn Date: 2014-06-20 12:42:38 +0200 Merge pull request #15809 from maurogeorge/guides-console-app Add to guides app and helper objects on command line commit edc0f27 refs/heads/master Merge: eeb9a7c 5cc7899 Author: Matthew Draper Date: 2014-06-20 14:53:20 +0930 Merge pull request #15537 from tgxworld/fix_state_leak Fix state leak. commit 3fab50a refs/heads/master Author: Yuki Nishijima Date: 2014-06-19 18:09:28 -0700 Add warning for `rescue_from Exception` and `rescue_from StandardError` [ci skip] M guides/source/action_controller_overview.md commit eeb9a7c refs/heads/master Merge: ef686a6 43bdd72 Author: Sean Griffin Date: 2014-06-19 17:49:05 -0600 Merge pull request #15824 from bhicks/remove-extra-list-item-element Remove extra list item element in engine guide commit 43bdd72 refs/heads/master Author: Ben Hicks Date: 2014-06-19 17:58:29 -0500 Remove extra list item element Cleaning up the list items that detail what an engines `--full` option generates. Joining a multiline multi list item into a multiline single list item. [ci skip] M guides/source/engines.md commit c420a8d refs/heads/master Author: Akshay Vishnoi Date: 2014-06-20 03:46:18 +0530 Move to_param to to_query, also Improve tests M activesupport/lib/active_support/core_ext/object/to_param.rb M activesupport/lib/active_support/core_ext/object/to_query.rb M activesupport/test/core_ext/object/to_param_test.rb M activesupport/test/core_ext/object/to_query_test.rb commit f3a2b61 refs/tags/v4.0.6.rc3 Author: Rafael Mendonça França Date: 2014-06-19 18:36:59 -0300 Add missing model M activerecord/test/models/membership.rb commit 82139b9 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-19 18:36:59 -0300 Add missing model M activerecord/test/models/membership.rb commit ef686a6 refs/heads/master Author: Aaron Patterson Date: 2014-06-12 11:45:10 -0700 add both branches to the only_path conditional M actionpack/lib/action_dispatch/http/url.rb commit 469264f refs/heads/master Author: Mauro George Date: 2014-06-19 11:22:40 -0300 Add rails:update to the upgrading guides [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 3673d7f refs/remotes/origin/4-0-stable Merge: d926997 69eaac9 Author: Rafael Mendonça França Date: 2014-06-19 17:25:20 -0300 Merge pull request #15731 from sgrif/sg-double-save-hm-t-4-0-stable Don't save through associations twice (4-0-stable) Conflicts: activerecord/test/cases/associations/has_many_through_associations_test.rb commit ae0d952 refs/remotes/origin/4-1-stable Merge: 8f76511 c6a8e09 Author: Rafael Mendonça França Date: 2014-06-19 17:23:28 -0300 Merge pull request #15729 from sgrif/sg-double-save-hm-t-4-1-stable Don't save through records twice (4-1-stable) Conflicts: activerecord/test/cases/associations/has_many_through_associations_test.rb commit efb41c6 refs/heads/master Merge: 1fa3a24 068f092 Author: Rafael Mendonça França Date: 2014-06-19 17:21:06 -0300 Merge pull request #15728 from sgrif/sg-double-save-hm-t Don't save through records twice Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb commit 1fa3a24 refs/heads/master Merge: 9ce59f6 3a98877 Author: Rafael Mendonça França Date: 2014-06-19 17:11:32 -0300 Merge pull request #15823 from yuki24/better-docmentation-for-dynamic-error-pages ErrorsController shouldn't inherit ApplicationController, but ActionController commit 9ce59f6 refs/heads/master Merge: 8418151 e6690d3 Author: Rafael Mendonça França Date: 2014-06-19 17:10:06 -0300 Merge pull request #15747 from sgrif/sg-trolololol-this-is-so-broken Always update counter caches in memory when adding records commit 3a98877 refs/heads/master Author: Yuki Nishijima Date: 2014-06-19 13:00:46 -0700 ErrorsController shouldn't inherit ApplicationController, but ActionController::Base Inheriting `ApplicationController` often causes an issue as it always has before/after actions. It should encourage to use `ActionController::Base` instead. [ci skip] M guides/source/action_controller_overview.md commit 8418151 refs/heads/master Merge: 357672c 36bd52b Author: Rafael Mendonça França Date: 2014-06-19 17:01:08 -0300 Merge pull request #15800 from sgrif/sg-column-in-calculation Don't use `Column` for type casting in Relation calculations commit 357672c refs/heads/master Merge: 8996fc3 a854383 Author: Rafael Mendonça França Date: 2014-06-19 16:59:30 -0300 Merge pull request #15801 from sgrif/sg-column-defaults Don't use column object when calculating type cast defaults commit 8996fc3 refs/heads/master Merge: 197364f 0336efa Author: Rafael Mendonça França Date: 2014-06-19 16:57:25 -0300 Merge pull request #15802 from sgrif/sg-column-quoting Don't use column object for type casting in `quoting` commit 197364f refs/heads/master Merge: 8f42372 ab6bea7 Author: Rafael Mendonça França Date: 2014-06-19 16:55:42 -0300 Merge pull request #15803 from sgrif/sg-column-in-associations Don't rely on the column for type casting reflections commit 8f42372 refs/heads/master Merge: d4ca0a4 0aecb47 Author: Rafael Mendonça França Date: 2014-06-19 16:53:44 -0300 Merge pull request #15814 from sgrif/sg-number-changed Further simplify `changed?` conditional for numeric types commit d4ca0a4 refs/heads/master Merge: 70de7dd c782641 Author: Rafael Mendonça França Date: 2014-06-19 16:43:47 -0300 Merge pull request #15450 from aditya-kapoor/remove-nbsp-debug remove unnecessary gsub for space in ActionView::Helpers#debug commit 70de7dd refs/heads/master Merge: c36e77a 099af48 Author: Rafael Mendonça França Date: 2014-06-19 16:14:55 -0300 Merge pull request #15818 from sgrif/sg-attribute-set Introduce an object to aid in creation and management of `@attributes` commit 099af48 refs/heads/master Author: Sean Griffin Date: 2014-06-19 11:13:19 -0600 Introduce an object to aid in creation and management of `@attributes` Mostly delegation to start, but we can start moving a lot of behavior in bulk to this object. M activerecord/lib/active_record.rb M activerecord/lib/active_record/attribute_methods.rb A activerecord/lib/active_record/attribute_set.rb M activerecord/lib/active_record/attributes.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/persistence.rb A activerecord/test/cases/attribute_set_test.rb commit 4251af5 refs/heads/master Author: Mauro George Date: 2014-06-19 10:50:10 -0300 Add to guides app and helper objects on command line [ci skip] M guides/source/command_line.md commit c36e77a refs/heads/master Merge: 27953bc 32e83e7 Author: Eileen M. Uchitelle Date: 2014-06-19 14:39:23 -0400 Merge pull request #15808 from maurogeorge/guides-custom-errors-page Create custom errors page on ActionController guides commit 27953bc refs/heads/master Merge: 9ac81b9 9f27e10 Author: Rafael Mendonça França Date: 2014-06-19 15:32:16 -0300 Merge pull request #15820 from lucasmazza/lm-except-highlight-tweaks highlight/except support for regular expressions and blocks. commit 9f27e10 refs/heads/master Author: Lucas Mazza Date: 2014-06-19 14:58:36 -0300 'TextHelper#highlight' now accepts a block to highlight the matched words. The helper will yield each matched word, and you can use this instead of the ':highlighter' option for more complex replacing logic: highlight('My email is me@work.com', EMAIL_REGEXP) { |m| mail_to(m) } # => 'My email is me@work.com' M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/text_helper.rb M actionview/test/template/text_helper_test.rb commit b4c30d8 refs/tags/v4.0.6.rc3 Author: Rafael Mendonça França Date: 2014-06-19 15:04:39 -0300 Merge pull request #15772 from nbudin/sti_through_bug Don't include inheritance column in the through_scope_attributes Conflicts: activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/models/club.rb commit d926997 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-19 15:04:39 -0300 Merge pull request #15772 from nbudin/sti_through_bug Don't include inheritance column in the through_scope_attributes Conflicts: activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/models/club.rb commit a44feed refs/tags/v4.1.2.rc3 Author: Rafael Mendonça França Date: 2014-06-19 15:04:39 -0300 Merge pull request #15772 from nbudin/sti_through_bug Don't include inheritance column in the through_scope_attributes M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/models/club.rb commit 8f76511 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-19 15:04:39 -0300 Merge pull request #15772 from nbudin/sti_through_bug Don't include inheritance column in the through_scope_attributes M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/models/club.rb commit 9ac81b9 refs/heads/master Merge: 008870e 30b76e5 Author: Rafael Mendonça França Date: 2014-06-19 15:04:39 -0300 Merge pull request #15772 from nbudin/sti_through_bug Don't include inheritance column in the through_scope_attributes commit 1a12bee refs/tags/v4.1.2.rc3 Author: Rafael Mendonça França Date: 2014-06-19 14:57:51 -0300 Fix has_and_belongs_to_many in a namespaced model pointing to a non namespaced model Now the following case will work fine class Tag < ActiveRecord::Base end class Publisher::Article < ActiveRecord::Base has_and_belongs_to_many :tags end Fixes #15761 M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/publisher/article.rb M activerecord/test/schema/schema.rb commit 0769465 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-19 14:57:51 -0300 Fix has_and_belongs_to_many in a namespaced model pointing to a non namespaced model Now the following case will work fine class Tag < ActiveRecord::Base end class Publisher::Article < ActiveRecord::Base has_and_belongs_to_many :tags end Fixes #15761 M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/publisher/article.rb M activerecord/test/schema/schema.rb commit 008870e refs/heads/master Author: Rafael Mendonça França Date: 2014-06-19 15:00:09 -0300 Use a better test description M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 76d6ec2 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-19 14:57:51 -0300 Fix has_and_belongs_to_many in a namespaced model pointing to a non namespaced model Now the following case will work fine class Tag < ActiveRecord::Base end class Publisher::Article < ActiveRecord::Base has_and_belongs_to_many :tags end Fixes #15761 M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/publisher/article.rb M activerecord/test/schema/schema.rb commit 490f250 refs/heads/master Author: Jan Szumiec Date: 2013-08-07 13:34:24 +0100 highlight() now accepts regular expressions as well. M actionview/lib/action_view/helpers/text_helper.rb M actionview/test/template/text_helper_test.rb commit 2b61778 refs/heads/master Author: Jan Szumiec Date: 2013-08-07 13:14:28 +0100 excerpt() now accepts regular expression instances as phrases. M actionview/lib/action_view/helpers/text_helper.rb M actionview/test/template/text_helper_test.rb commit 4983734 refs/heads/master Merge: b435841 69b54fc Author: Rafael Mendonça França Date: 2014-06-19 13:43:39 -0300 Merge pull request #15817 from zoombody/patch-1 Fix typo in 4.1 upgrade/flash structure commit 69b54fc refs/heads/master Author: Dan Rice Date: 2014-06-19 12:40:03 -0400 [ci skip] Fix typo in 4.1 upgrade/flash structure M guides/source/upgrading_ruby_on_rails.md commit ed389be refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-19 13:29:14 -0300 Merge pull request #15813 from DNNX/valid-action-name-refactoring Relpace `=~ Regexp.new str` with `.include? str` in `_valid_action_name?` Conflicts: actionpack/lib/abstract_controller/base.rb M actionpack/lib/abstract_controller/base.rb commit 6413eb4 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-19 13:29:14 -0300 Merge pull request #15813 from DNNX/valid-action-name-refactoring Relpace `=~ Regexp.new str` with `.include? str` in `_valid_action_name?` Conflicts: actionpack/lib/abstract_controller/base.rb M actionpack/lib/abstract_controller/base.rb commit b435841 refs/heads/master Merge: 6a682e3 453cd7b Author: Rafael Mendonça França Date: 2014-06-19 13:29:14 -0300 Merge pull request #15813 from DNNX/valid-action-name-refactoring Relpace `=~ Regexp.new str` with `.include? str` in `_valid_action_name?` commit 6a682e3 refs/heads/master Merge: 21a49ff e60c85b Author: Rafael Mendonça França Date: 2014-06-19 13:27:03 -0300 Merge pull request #15815 from DNNX/mail-helper-refactoring Remove unused block parameter from #gsub call in AM::MailHelper#block_format commit 21a49ff refs/heads/master Merge: 67f1fe9 9f6a796 Author: Rafael Mendonça França Date: 2014-06-19 13:25:35 -0300 Merge pull request #15816 from DNNX/log-subscriber-add-debug-check Add `logger.debug?` guard to `ActionMailer::LogSubscriber#process` commit 9f6a796 refs/heads/master Author: Viktar Basharymau Date: 2014-06-19 14:29:16 +0300 Add `logger.debug?` guard to `ActionMailer::LogSubscriber#process` *TLDR*: The method is 4 times faster when log level is higher than DEBUG. Also, the other two methods, `#deliver` and `#receive` have similar guard statements, so this commit adds some symmetry to the code. This is probably not the most critical part of ActionMailer in terms of performance, but here are some benchmarks: ``` require 'benchmark/ips' require 'action_mailer' event = ActiveSupport::Notifications::Event.new( 'process.action_mailer', Time.now, Time.now, 'bf4e2b36ce085fd35b24', { mailer: "UserMailer", action: :welcome } ) ActionMailer::Base.logger = ActiveSupport::Logger.new '/dev/null' subscriber = ActionMailer::LogSubscriber.new def subscriber.process_with_guard(event) return unless logger.debug? mailer = event.payload[:mailer] action = event.payload[:action] debug("\n#{mailer}##{action}: processed outbound mail in #{event.duration.round(1)}ms") end Benchmark.ips do |r| ActionMailer::Base.logger.level = ::Logger::Severity::INFO r.report('no guard') { subscriber.process(event) } r.report(' guard') { subscriber.process_with_guard(event) } end __END__ Calculating ------------------------------------- no guard 9640 i/100ms guard 38381 i/100ms ------------------------------------------------- no guard 169166.9 (±10.2%) i/s - 838680 in 5.007262s guard 728184.9 (±9.6%) i/s - 3607814 in 4.999218s ``` When log level is DEBUG, the _guarded_ method is a bit slower. This is a good tradeoff for 4x improvement in production mode. ``` Benchmark.ips do |r| ActionMailer::Base.logger.level = ::Logger::Severity::DEBUG r.report('no guard') { subscriber.process(event) } r.report(' guard') { subscriber.process_with_guard(event) } end __END__ Calculating ------------------------------------- no guard 4970 i/100ms guard 4564 i/100ms ------------------------------------------------- no guard 55617.4 (±3.5%) i/s - 278320 in 5.010523s guard 49452.1 (±5.6%) i/s - 251020 in 5.093358s ``` M actionmailer/lib/action_mailer/log_subscriber.rb commit 0aecb47 refs/heads/master Author: Sean Griffin Date: 2014-06-19 09:47:40 -0600 Further simplify `changed?` conditional for numeric types `Type::Integer.new.type_cast('') # => nil`, we do not need a special case to handle this, `nil => ''` already returns false. The only case we need to handle is `0 => 'wibble'` should be changed, while `0 => '0'` should not. M activerecord/lib/active_record/type/numeric.rb commit 453cd7b refs/heads/master Author: Viktar Basharymau Date: 2014-06-19 18:17:42 +0300 Relpace `=~ Regexp.new str` with `.include? str` in AC::Base#_valid_action_name? Because it is more natural way to test substring inclusion. Also, in this particular case it is much faster. In general, using `Regexp.new str` for such kind of things is dangerous. The string must be escaped, unless you know what you're doing. Example: Regexp.new "\\" # HELLO WINDOWS # RegexpError: too short escape sequence: /\/ The right way to do this is escape the string Regexp.new Regexp.escape "\\" # => /\\/ Here is the benchmark showing how faster `include?` call is. ``` require 'benchmark/ips' Benchmark.ips do |x| x.report('include?') { !"index".to_s.include? File::SEPARATOR } x.report(' !~ ') { "index" !~ Regexp.new(File::SEPARATOR) } end __END__ Calculating ------------------------------------- include? 75754 i/100ms !~ 21089 i/100ms ------------------------------------------------- include? 3172882.3 (±4.5%) i/s - 15832586 in 5.000659s !~ 322918.8 (±8.6%) i/s - 1602764 in 4.999509s ``` Extra `.to_s` call is needed to handle the case when `action_name` is `nil`. If it is omitted, some tests fail. M actionpack/lib/abstract_controller/base.rb commit 67f1fe9 refs/heads/master Merge: 96f28b6 6494f67 Author: Rafael Mendonça França Date: 2014-06-19 12:15:42 -0300 Merge pull request #15812 from crankharder/remove_postgres_adapter_method remove unused method from Postgresql::Adapter commit e60c85b refs/heads/master Author: Viktar Basharymau Date: 2014-06-19 17:40:37 +0300 Remove unused block parameter from #gsub call in AM::MailHelper#block_format M actionmailer/lib/action_mailer/mail_helper.rb commit 6494f67 refs/heads/master Author: Josh Sharpe Date: 2014-06-19 10:08:45 -0400 this method is no longer being used M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 32e83e7 refs/heads/master Author: Mauro George Date: 2014-06-19 10:13:25 -0300 Create custom errors page on ActionController guides [ci skip] M guides/source/action_controller_overview.md commit 6f25115 refs/heads/master Author: Aidan Haran Date: 2014-06-18 20:25:17 +0100 Added missing colon in asset manifest JSON. M guides/source/asset_pipeline.md commit 174bf46 refs/tags/v4.1.2.rc3 Merge: ffdc7ab e5220a6 Author: Zachary Scott Date: 2014-06-18 11:17:03 -0700 Merge pull request #15796 from jonatack/patch-7 4.1.2 ActionView CHANGELOG pass [ci skip] commit 96f28b6 refs/heads/master Merge: 911b282 de7c61b Author: Rafael Mendonça França Date: 2014-06-18 10:40:33 -0300 Merge pull request #15795 from amitsuryavanshi/master Titling the model name in views generated by scaffold. commit ab6bea7 refs/heads/master Author: Sean Griffin Date: 2014-06-18 06:29:17 -0600 Don't rely on the column for type casting reflections M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/validations/uniqueness.rb commit 0336efa refs/heads/master Author: Sean Griffin Date: 2014-06-18 05:55:36 -0600 Don't use column object for type casting in `quoting` We're never going to be able to use the attribute object here, however, so let's just accept the ugly demeter violation here for now. Remove test cases which were either redundant with other tests in the file, or were actually testing the type objects (which are tested elsewhere) M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/quoting_test.rb commit 911b282 refs/heads/master Merge: dccf6da 9c49288 Author: Yves Senn Date: 2014-06-18 13:59:57 +0200 Merge pull request #15799 from zuhao/refactor_activesupport_time_zone_test_helpers Extract out with_env_tz helper method. commit a854383 refs/heads/master Author: Sean Griffin Date: 2014-06-18 05:54:55 -0600 Don't use column object when calculating type cast defaults Moves towards removing type casting knowledge from the column entirely M activerecord/lib/active_record/model_schema.rb commit 36bd52b refs/heads/master Author: Sean Griffin Date: 2014-06-18 05:49:36 -0600 Don't use `Column` for type casting in Relation calculations M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 9c49288 refs/heads/master Author: Zuhao Wan Date: 2014-06-18 19:46:04 +0800 Extract out with_env_tz helper method. It’s used at so many places that extracting it out into a helper file is worth doing. M activesupport/test/core_ext/date_ext_test.rb M activesupport/test/core_ext/date_time_ext_test.rb M activesupport/test/core_ext/duration_test.rb M activesupport/test/core_ext/numeric_ext_test.rb M activesupport/test/core_ext/string_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb M activesupport/test/json/encoding_test.rb M activesupport/test/time_zone_test.rb A activesupport/test/time_zone_test_helpers.rb commit dccf6da refs/heads/master Merge: ce425e4 c085078 Author: Yves Senn Date: 2014-06-18 08:39:13 +0200 Merge pull request #15709 from zuhao/refactor_actionview_compiled_templates_test Move cleanup into teardown, delete obsolete code. commit de7c61b refs/heads/master Author: Amit Suryavanshi Date: 2014-06-18 11:32:02 +0530 Titling the model name in views generated by scaffold. eg. rails g scaffold UserProfile will have in index.html.erb "Listing User Profiles" rather than Listing user_profiles. M railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb M railties/lib/rails/generators/erb/scaffold/templates/index.html.erb M railties/lib/rails/generators/erb/scaffold/templates/new.html.erb commit bc90ea6 refs/tags/v3.2.19 Author: Guillermo Iguaran Date: 2014-06-18 00:37:46 -0500 Revert "Merge pull request #15794 from vishalzambre/patch-1" This reverts commit 6d800a909e24465ca6f3fa5206222fa7d78967f6, reversing changes made to 6a051299f98ee43864326c6c0a4f7d169d22b3f8. We don't apply non-security fixes to 3-2-stable branch!!! M activesupport/lib/active_support/file_update_checker.rb commit 6d800a9 refs/tags/v3.2.19 Merge: 6a05129 fca3cc2 Author: Guillermo Iguaran Date: 2014-06-18 00:33:00 -0500 Merge pull request #15794 from vishalzambre/patch-1 File.exists? is a deprecated name, use File.exist? commit fca3cc2 refs/tags/v3.2.19 Author: Vishal Zambre Date: 2014-06-18 10:51:27 +0530 File.exists? is a deprecated name, use File.exist? File.exists? is a deprecated name, use File.exist? M activesupport/lib/active_support/file_update_checker.rb commit ce425e4 refs/heads/master Author: Matthew Draper Date: 2014-06-18 14:45:10 +0930 Reconnect after possibly enabling hstore M activerecord/test/cases/adapters/postgresql/array_test.rb commit 51b6670 refs/heads/master Merge: bdc3989 4d3e88f Author: Matthew Draper Date: 2014-06-18 13:36:43 +0930 Merge pull request #15782 from sgrif/sg-column-defaults Don't type cast the default on the column commit 2ea51a1 refs/heads/master Author: Zev Blut Date: 2014-06-18 11:44:00 +0900 Update RecordNotFound exception cases to include a message with the Model that the Record was not found in. M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb commit c7802dc refs/heads/master Author: Sean Griffin Date: 2014-06-17 18:51:38 -0600 Detect in-place modifications on Strings M activerecord/lib/active_record/type/string.rb M activerecord/test/cases/dirty_test.rb A activerecord/test/cases/type/string_test.rb M activerecord/test/cases/types_test.rb commit bdc3989 refs/heads/master Merge: 84a13e0 455c692 Author: Rafael Mendonça França Date: 2014-06-17 22:59:12 -0300 Merge pull request #15790 from sgrif/sg-mutable-points Detect in-place changes on point types commit 455c692 refs/heads/master Author: Sean Griffin Date: 2014-06-17 19:55:59 -0600 Detect in-place changes on point types M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb M activerecord/test/cases/adapters/postgresql/geometric_test.rb commit 84a13e0 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-17 22:48:28 -0300 Deprecate Rails::Rack::LogTailer It was being used by Rails for show the development logs but since Rails 4 it is not being used anymore on the framework. This class seems to be private but it were part of the public API we are deprecating before removing. M railties/CHANGELOG.md M railties/lib/rails/rack/log_tailer.rb commit 3999f9c refs/heads/master Merge: 9dcdf3e 6e2d3d8 Author: Rafael Mendonça França Date: 2014-06-17 22:38:18 -0300 Merge pull request #15789 from sgrif/sg-enable-hstore Enable hstore in array tests commit 6e2d3d8 refs/heads/master Author: Sean Griffin Date: 2014-06-17 19:37:29 -0600 Enable hstore in array tests M activerecord/test/cases/adapters/postgresql/array_test.rb commit e5220a6 refs/tags/v4.1.2.rc3 Author: Jon Atack Date: 2014-06-18 02:44:20 +0200 4.1.2 ActionView CHANGELOG grammar pass [ci skip] M actionview/CHANGELOG.md commit 9dcdf3e refs/heads/master Merge: 7f7e2f1 ba29c28 Author: Rafael Mendonça França Date: 2014-06-17 21:03:47 -0300 Merge pull request #15786 from sgrif/sg-in-place-array-mutation Detect mutations of arrays and array members commit ba29c28 refs/heads/master Author: Sean Griffin Date: 2014-06-17 17:05:34 -0600 Detect mutations of arrays and array members M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 7f7e2f1 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-17 20:39:49 -0300 initialize the right variable M railties/test/railties/railtie_test.rb commit 8de4d61 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-17 20:16:04 -0300 :scissors: M railties/lib/rails/generators/app_base.rb commit 1056589 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-17 20:02:46 -0300 Add a generic --skip-gems options to generator Also remove --skip-turbolinks. This option is useful if users want to remove some gems like jbuilder, turbolinks, coffee-rails, etc that don't have specific options on the generator. rails new my_app --skip-gems turbolinks coffee-rails M railties/CHANGELOG.md M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit 43262ea refs/heads/master Merge: 838c3d2 c462c2b Author: Rafael Mendonça França Date: 2014-06-17 20:19:39 -0300 Merge pull request #15784 from sgrif/sg-delimiter Ensure `OID::Array#type_cast_for_database` matches PG's quoting behavior commit ffdc7ab refs/tags/v4.1.2.rc3 Merge: 5006b63 7874548 Author: Sean Griffin Date: 2014-06-17 17:16:55 -0600 Merge pull request #15785 from jonatack/patch-7 4.1.2 ActionPack CHANGELOG grammar pass [ci skip] commit c462c2b refs/heads/master Author: Sean Griffin Date: 2014-06-17 16:37:08 -0600 Ensure `OID::Array#type_cast_for_database` matches PG's quoting behavior Also takes a step towards supporting types which use a character other than ',' for the delimiter (`box` is the only built in type for which this is the case) M activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb M activerecord/test/cases/adapters/postgresql/array_test.rb A activerecord/test/cases/adapters/postgresql/type_lookup_test.rb commit 838c3d2 refs/heads/master Merge: 0724706 d5d7349 Author: Matthew Draper Date: 2014-06-18 08:24:02 +0930 Merge pull request #15778 from sgrif/sg-pg-mutable-arrays Move pg array database type casting to the Array type commit 7874548 refs/tags/v4.1.2.rc3 Author: Jon Atack Date: 2014-06-18 00:50:31 +0200 4.1.2 ActionPack CHANGELOG grammar pass [ci skip] Sprucing it up a bit for the release. M actionpack/CHANGELOG.md commit 0724706 refs/heads/master Merge: 5a7784a e3dca3a Author: Rafael Mendonça França Date: 2014-06-17 19:47:25 -0300 Merge pull request #15716 from schuetzm/skip-turbolinks Add an option to skip installation of Turbolinks commit 5a7784a refs/heads/master Merge: 9f86780 c195317 Author: Matthew Draper Date: 2014-06-18 07:38:32 +0930 Merge pull request #15727 from aditya-kapoor/add-tests-for-migration Add test cases for Migration#inverse_of commit 4d3e88f refs/heads/master Author: Sean Griffin Date: 2014-06-17 15:39:13 -0600 Don't type cast the default on the column If we want to have type decorators mess with the attribute, but not the column, we need to stop type casting on the column. Where possible, we changed the tests to test the value of `column_defaults`, which is public API. `Column#default` is not. M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bit_string_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/geometric_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/money_test.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/attribute_decorators_test.rb M activerecord/test/cases/defaults_test.rb M activerecord/test/cases/migration/change_schema_test.rb M activerecord/test/cases/migration/columns_test.rb M activerecord/test/cases/migration_test.rb commit d5d7349 refs/heads/master Author: Sean Griffin Date: 2014-06-17 12:19:27 -0600 Move array database type casting to the Array type The case where we have a column object, but don't have a type cast method involves type casting the default value when changing the schema. We get one of the column definition structs instead. That is a case that I'm trying to remove overall, but in the short term, we can achieve the same behavior without needing to pass the adapter to the array type by creating a fake type that proxies to the adapter. M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/type/date_time.rb commit 9f86780 refs/heads/master Author: Zachary Scott Date: 2014-06-17 14:13:02 -0700 Fix documentation from #15669 [ci skip] M activesupport/lib/active_support/core_ext/hash/keys.rb commit b81f364 refs/heads/master Author: Aditya Kapoor Date: 2014-06-13 11:56:45 +0530 [ci skip] fix doc for the Hash#assert_valid_keys M activesupport/lib/active_support/core_ext/hash/keys.rb commit f42f603 refs/heads/master Merge: f55ea89 d981272 Author: Rafael Mendonça França Date: 2014-06-17 18:08:59 -0300 Merge pull request #15780 from sgrif/sg-dont-always-save-mutable-types Don't assume that Hstore columns have always changed commit d981272 refs/heads/master Author: Sean Griffin Date: 2014-06-17 14:16:21 -0600 Don't assume that Hstore columns have always changed HStore columns come back from the database separated by a comma and a space, not just a comma. We need to mirror that behavior since we compare the two values. Also adds a regression test against JSON to ensure we don't have the same bug there. M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit e9ba03e refs/tags/v4.0.6.rc3 Author: Robin Dupret Date: 2014-06-17 22:05:27 +0200 Fix a tiny typo in Action Pack's changelog [ci skip] M actionpack/CHANGELOG.md commit 37b4c13 refs/tags/v4.0.6.rc3 Merge: 13c6bac e51e48d Author: Rafael Mendonça França Date: 2014-06-17 16:57:36 -0300 Merge pull request #15776 from jonatack/patch-7 4.0.6 ActionPack CHANGELOG grammar pass [ci skip] commit e51e48d refs/tags/v4.0.6.rc3 Author: Jon Atack Date: 2014-06-17 21:21:12 +0200 4.0.6 ActionPack CHANGELOG grammar pass [ci skip] 'cos it looked like it could use a little more <3 M actionpack/CHANGELOG.md commit f55ea89 refs/heads/master Merge: 63b347d b301c40 Author: Rafael Mendonça França Date: 2014-06-17 15:06:18 -0300 Merge pull request #15775 from sgrif/sg-use-column-defaults-in-dirty Use `column_defaults` in dirty for checking changed defaults commit b301c40 refs/heads/master Author: Sean Griffin Date: 2014-06-17 10:03:34 -0600 Use `column_defaults` in dirty for checking changed defaults We no longer need to "init changed attributes" from the initializer, either, as there is no longer a case where a given value would differ from the default, but would not already be marked as changed. M activerecord/lib/active_record/attribute_methods/dirty.rb commit 63b347d refs/heads/master Merge: e7a8fda e30d701 Author: Rafael Mendonça França Date: 2014-06-17 14:57:55 -0300 Merge pull request #15771 from sgrif/sg-stop-messing-with-column-defaults Don't mess with `column_defaults` when optimistic locking is enabled commit c195317 refs/heads/master Author: Aditya Kapoor Date: 2014-06-17 22:56:01 +0530 Add test cases for Migration#inverse_of M activerecord/test/cases/migration/command_recorder_test.rb commit 30b76e5 refs/heads/master Author: Nat Budin Date: 2014-06-17 10:11:22 -0700 Don't include inheritance column in the through_scope_attributes M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/models/club.rb commit 068f092 refs/heads/master Author: Sean Griffin Date: 2014-06-14 09:21:31 -0600 Don't save through records twice If the through record gets created in an `after_create` hook that is defined before the association is defined (therefore after its `after_create` hook) get saved twice. This ensures that the through records are created only once, regardless of the order of the hooks. M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit e30d701 refs/heads/master Author: Sean Griffin Date: 2014-06-17 09:41:06 -0600 Don't mess with `column_defaults` when optimistic locking is enabled M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/test/cases/locking_test.rb commit e7a8fda refs/heads/master Merge: e2f232a 0c2fbc5 Author: Yves Senn Date: 2014-06-17 14:59:07 +0200 Merge pull request #15768 from zuhao/refactor_activesupport_concern_test Move test teardown into `ensure` block. commit 0c2fbc5 refs/heads/master Author: Zuhao Wan Date: 2014-06-17 20:55:18 +0800 Move test teardown into `ensure` block. M activesupport/test/core_ext/kernel/concern_test.rb commit 47dd241 refs/heads/master Merge: add626e bab64e6 Author: David Heinemeier Hansson Date: 2014-06-17 11:21:03 +0200 Merge pull request #90 from itolosa/master closes #89. fix delayed job adapter timestamp commit e2f232a refs/heads/master Author: Yves Senn Date: 2014-06-16 19:28:38 +0200 add `bin/rake db:purge` task to empty the current database. M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/test/cases/tasks/database_tasks_test.rb commit b4b5af0 refs/heads/master Author: Yves Senn Date: 2014-06-16 22:01:45 +0200 fix typo in test method names. [ci skip] M activerecord/test/cases/tasks/database_tasks_test.rb commit 35c3243 refs/heads/master Merge: 2c515b3 17668f3 Author: Yves Senn Date: 2014-06-17 08:46:39 +0200 Merge pull request #15765 from rahul100885/master [ci skip] doc corrected : ActiveRecord::Base.connections to ActiveRecord::Base.configurations commit 17668f3 refs/heads/master Author: Rahul P. Chaudhari Date: 2014-06-17 12:12:26 +0530 [ci skip] doc corrected : ActiveRecord::Base.connections to ActiveRecord::Base.configurations M guides/source/configuring.md commit 2c515b3 refs/heads/master Author: Juanjo Bazán Date: 2014-06-16 22:34:40 +0200 Formatting fix in AS changelog [ci skip] M activesupport/CHANGELOG.md commit 34573df refs/heads/master Author: Rafael Mendonça França Date: 2014-06-16 20:28:53 -0300 Revert "Formatting fix in AS changelog [ci skip]" This reverts commit cede0363830e28e73feafc662eccae7d1db526bb. Reason: CHANGELOG should not be updated on docrails M activesupport/CHANGELOG.md commit 0728d3b refs/heads/master Merge: 88714de 74af9f7 Author: Rafael Mendonça França Date: 2014-06-16 18:36:50 -0300 Merge pull request #15760 from sgrif/sg-decorate-matching Promote time zone aware attributes to a first class type decorator commit 74af9f7 refs/heads/master Author: Sean Griffin Date: 2014-06-16 14:55:01 -0600 Promote time zone aware attributes to a first class type decorator This refactoring revealed the need for another form of decoration, which takes a proc to select which it applies to (There's a *lot* of cases where this form can be used). To avoid duplication, we can re-implement the old decoration in terms of the proc-based decoration. The reason we're `instance_exec`ing the matcher is for cases such as time zone aware attributes, where a decorator is defined in a parent class, and a method called in the matcher is overridden by a child class. The matcher will close over the parent, and evaluate in its context, which is not the behavior we want. M activerecord/lib/active_record/attribute_decorators.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/attribute_decorators_test.rb M activerecord/test/cases/attribute_methods/read_test.rb commit 88714de refs/heads/master Merge: 9153273 63bbaaa Author: Rafael Mendonça França Date: 2014-06-16 17:57:48 -0300 Merge pull request #15759 from sgrif/sg-extract-type-decorator Refactor application of type decorators into an object commit 63bbaaa refs/heads/master Author: Sean Griffin Date: 2014-06-16 14:52:05 -0600 Refactor application of type decorators into an object M activerecord/lib/active_record/attribute_decorators.rb commit 9153273 refs/heads/master Merge: c730ae9 7ddaf10 Author: Rafael Mendonça França Date: 2014-06-16 17:40:25 -0300 Merge pull request #15758 from aditya-kapoor/replace-keyword [ci skip] /javascript/ ~> JavaScript commit 7ddaf10 refs/heads/master Author: Aditya Kapoor Date: 2014-06-17 02:07:07 +0530 [ci skip] /javascript/ ~> JavaScript M actionpack/lib/action_controller/metal/mime_responds.rb M actionview/lib/action_view/helpers/asset_tag_helper.rb commit cede036 refs/heads/master Author: Juanjo Bazán Date: 2014-06-16 22:34:40 +0200 Formatting fix in AS changelog [ci skip] M activesupport/CHANGELOG.md commit c730ae9 refs/heads/master Merge: 5b36801 ae1b42c Author: Zachary Scott Date: 2014-06-16 12:53:37 -0700 Merge pull request #15756 from aditya-kapoor/add-api-doc-for-querying [ci skip] add API doc for AR Group. commit ae1b42c refs/heads/master Author: Aditya Kapoor Date: 2014-06-17 01:20:36 +0530 [ci skip] add API doc for AR Group. M activerecord/lib/active_record/relation/calculations.rb commit ff1b7e7 refs/heads/master Author: Timm Date: 2014-05-28 12:55:01 +0200 Restore delivery method on teardowns. M actionmailer/lib/action_mailer/test_case.rb commit 9c9875b refs/heads/master Author: Timm Date: 2014-05-28 11:38:22 +0200 Inline Assertion reference. M actionmailer/test/assert_select_email_test.rb commit b276108 refs/heads/master Author: Timm Date: 2014-05-28 11:20:38 +0200 Remove response faking. M actionmailer/test/assert_select_email_test.rb commit 1a8ca9f refs/heads/master Author: Timm Date: 2014-05-28 11:20:15 +0200 Use 1.9 syntax. M actionmailer/test/assert_select_email_test.rb commit 5ffc36d refs/heads/master Author: Timm Date: 2014-05-28 09:51:41 +0200 Add document_root_element to ActionDispatch::IntegrationTest so assert_select can be called without specifying a root. M actionpack/lib/action_dispatch/testing/integration.rb commit 6cb6290 refs/heads/master Author: Timm Date: 2014-05-27 22:22:06 +0200 Make output_buffers used in tests be utf-8 encoded. Fixing unknown encoding ASCII-8BIT test errors. M actionview/lib/action_view/test_case.rb commit cdf2f28 refs/heads/master Author: Timm Date: 2014-05-27 22:17:51 +0200 Change date helper tests to expect attributes with double quoted strings. M actionview/test/template/date_helper_test.rb commit 01ff0f3 refs/heads/master Author: Timm Date: 2014-05-27 16:27:52 +0200 Fix invalid css selectors in form_collections_helper_test.rb. M actionview/test/template/form_collections_helper_test.rb commit bcd71b4 refs/heads/master Author: Timm Date: 2014-05-27 14:22:48 +0200 Don't splat arguments to allowed tags or attributes. M actionview/lib/action_view/helpers/sanitize_helper.rb commit e438c09 refs/heads/master Author: Timm Date: 2014-05-27 13:55:00 +0200 Change sanitizer_vendor to just be a method and reword documentation. M actionview/lib/action_view/helpers/sanitize_helper.rb commit d4cd7e2 refs/heads/master Author: Timm Date: 2014-05-24 00:03:48 +0200 Revert some stuff to use the new sanitizers. M actionview/lib/action_view/helpers/sanitize_helper.rb commit 33c8bfc refs/heads/master Author: Timm Date: 2014-05-23 23:42:20 +0200 Point gems to all the right places. M Gemfile commit 33019a3 refs/heads/master Author: Timm Date: 2014-05-23 23:34:46 +0200 Remove html-scanner and its tests. D actionview/lib/action_view/vendor/html-scanner.rb D actionview/lib/action_view/vendor/html-scanner/html/document.rb D actionview/lib/action_view/vendor/html-scanner/html/node.rb D actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb D actionview/lib/action_view/vendor/html-scanner/html/selector.rb D actionview/lib/action_view/vendor/html-scanner/html/tokenizer.rb D actionview/lib/action_view/vendor/html-scanner/html/version.rb D actionview/test/template/html-scanner/cdata_node_test.rb D actionview/test/template/html-scanner/document_test.rb D actionview/test/template/html-scanner/node_test.rb D actionview/test/template/html-scanner/tag_node_test.rb D actionview/test/template/html-scanner/text_node_test.rb D actionview/test/template/html-scanner/tokenizer_test.rb commit 017ddc6 refs/heads/master Author: Timm Date: 2014-05-23 23:21:27 +0200 Remove deprecation notice. M actionview/lib/action_view/vendor/html-scanner.rb commit 427f3f9 refs/heads/master Author: Timm Date: 2014-05-23 23:21:01 +0200 Add a layer of indirection making sanitizers pluggable. M actionview/lib/action_view/helpers/sanitize_helper.rb M actionview/lib/action_view/vendor/html-scanner.rb M actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb commit 5d3a292 refs/heads/master Author: Timm Date: 2014-05-23 23:20:21 +0200 Delegate allowed tags and attributes setting to HTML::WhiteListSanitizer. M actionview/lib/action_view/helpers/sanitize_helper.rb commit 7587632 refs/heads/master Author: Timm Date: 2014-02-11 21:01:41 +0100 Changed configuration documentation to no longer state it replaces a Set. M actionview/lib/action_view/helpers/sanitize_helper.rb commit 13da278 refs/heads/master Author: Timm Date: 2014-02-10 12:07:52 +0100 Deprecate configurations and use allowed_tags and allowed_attributes on WhiteListSanitizer. M actionview/lib/action_view/helpers/sanitize_helper.rb commit c0e1b20 refs/heads/master Author: Timm Date: 2013-10-13 22:08:13 +0200 Remove include of rails-dom-testing in rails_info_controller_test.rb as it is included in ActionController::TestCase. M railties/test/rails_info_controller_test.rb commit dd48b0a refs/heads/master Author: Timm Date: 2013-10-13 21:56:29 +0200 Migrated test away from escaped quotes. M actionview/test/template/form_collections_helper_test.rb commit 2a7f13e refs/heads/master Author: Timm Date: 2013-10-13 21:39:16 +0200 Made deprecation messages in sanitize_helper more clear. M actionview/lib/action_view/helpers/sanitize_helper.rb commit 65d0443 refs/heads/master Author: Timm Date: 2013-10-13 21:34:04 +0200 Remove unneeded comment in test. M actionpack/test/controller/request_forgery_protection_test.rb commit 5913a09 refs/heads/master Author: Timm Date: 2013-10-13 21:28:57 +0200 Remove some whitespace in actionpack.gemspec. M actionpack/actionpack.gemspec commit 0926fa5 refs/heads/master Author: Timm Date: 2013-10-13 21:23:15 +0200 Updated CHANGELOG message to include info about rails-html-sanitizer. M actionview/CHANGELOG.md commit 51c1986 refs/heads/master Author: Timm Date: 2013-10-13 21:20:39 +0200 Updated CHANGELOG message about rails-dom-testing. M actionview/CHANGELOG.md commit 38620e1 refs/heads/master Author: Timm Date: 2013-10-12 23:09:50 +0200 Completed integration of rails-html-sanitizer in SanitizeHelper. Deprecated protocol_separator accessors and bad_tags=. M actionview/lib/action_view/helpers/sanitize_helper.rb D actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb D actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 9efdffe refs/heads/master Author: Timm Date: 2013-10-12 22:58:51 +0200 Moved html_document to ActionDispatch::Assertions. Included the Rails::Dom::Testing::Assertions there as well. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/testing/assertions.rb commit 50347b1 refs/heads/master Author: Timm Date: 2013-10-12 12:41:09 +0200 Updated html-scanner deprecation message. M actionview/lib/action_view/vendor/html-scanner.rb commit 83f1563 refs/heads/master Author: Timm Date: 2013-10-11 23:29:08 +0200 Support for changes in SelectorAssertions. M actionpack/lib/action_controller/test_case.rb M actionview/lib/action_view/test_case.rb commit 28fd5eb refs/heads/master Author: Timm Date: 2013-10-11 13:50:43 +0200 Included rails-dom-testing in rails_info_controller_test.rb M railties/test/rails_info_controller_test.rb commit 648f748 refs/heads/master Author: Timm Date: 2013-10-11 13:16:57 +0200 Fixed deprecated selector in form_collections_helper_test.rb with from catch_invalid_selector. Sweet. M actionview/test/template/form_collections_helper_test.rb commit 82e0705 refs/heads/master Author: Timm Date: 2013-10-11 13:13:57 +0200 Removed sanitizers- and scrubbers_test.rb. They are in rails-html-sanitizer. D actionview/test/template/sanitizers_test.rb D actionview/test/template/scrubbers/scrubbers_test.rb commit 93f2cd8 refs/heads/master Author: Timm Date: 2013-10-11 13:12:30 +0200 Included DomAssertions in url_helper- and atom_feed_helper_test.rb. M actionview/test/template/atom_feed_helper_test.rb M actionview/test/template/url_helper_test.rb commit 72ce9a4 refs/heads/master Author: Timm Date: 2013-10-11 13:03:32 +0200 Removed assert_select test file, since it has been moved to rails-dom-testing. D actionview/test/template/assert_select_test.rb commit 5dc57db refs/heads/master Author: Timm Date: 2013-10-11 13:02:59 +0200 Required rails-dom-testing in test_case.rb M actionview/lib/action_view/test_case.rb commit 6061472 refs/heads/master Author: Timm Date: 2013-10-11 12:57:36 +0200 Changed deprecation message in dom and selector assertions in Action Dispatch. M actionpack/lib/action_dispatch/testing/assertions/dom.rb M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 5ac99b0 refs/heads/master Author: Timm Date: 2013-10-11 12:55:21 +0200 Exchanged requiring of action view assertions with rails dom testing assertions. M actionpack/test/abstract_unit.rb commit c287572 refs/heads/master Author: Timm Date: 2013-10-11 12:48:43 +0200 Removed ActionView::Assertions. Getting ready to exchange with Rails::Dom::Testing::Assertions. D actionview/lib/action_view/testing/assertions.rb D actionview/lib/action_view/testing/assertions/dom.rb D actionview/lib/action_view/testing/assertions/selector.rb commit 94ca27b refs/heads/master Author: Timm Date: 2013-10-10 22:11:44 +0200 Added rails-dom-testing and rails-html-sanitizer to Gemfile. Added tests for assert_select_email. M Gemfile A actionmailer/test/assert_select_email_test.rb commit fa916af refs/heads/master Author: Timm Date: 2013-09-24 21:21:01 +0200 Removed tag.rb, since it is actually removed, not just deprecated. [ci skip] D actionpack/lib/action_dispatch/testing/assertions/tag.rb commit a766a02 refs/heads/master Author: Timm Date: 2013-09-24 19:09:22 +0200 Moved ActionView::Assertions dependency from Action Pack's lib to abstract_unit.rb. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/abstract_unit.rb commit 2e81324 refs/heads/master Author: Timm Date: 2013-09-23 18:03:41 +0200 Changed ActiveSupport::Derprecation.silence to assert_deprecated. M actionview/test/template/assert_select_test.rb commit 68e08fe refs/heads/master Author: Timm Date: 2013-09-23 14:49:14 +0200 Silenced deprecation warnings in the tests. Documentation uses present tense. Changed deprecation message to not use you. Also returning from rescue block in catch_invalid_selector to abort reraising the exception. M actionview/lib/action_view/testing/assertions/selector.rb M actionview/test/template/assert_select_test.rb commit 9ef95a7 refs/heads/master Author: Timm Date: 2013-09-22 21:08:30 +0200 Added deprecation warning for invalid selectors and skipping assertions. M actionview/lib/action_view/testing/assertions/selector.rb M actionview/test/template/assert_select_test.rb commit 535a3b6 refs/heads/master Author: Timm Date: 2013-09-20 20:51:08 +0200 Nokogiri leaves '<' unescaped, so the assert_select looking for '<' will never work. Switched to assert_matching the reponse body. M actionpack/test/controller/request_forgery_protection_test.rb commit af05b01 refs/heads/master Author: Timm Date: 2013-09-14 14:32:10 +0200 Added tests for TargetScrubber. M actionview/test/template/scrubbers/scrubbers_test.rb commit 15382e9 refs/heads/master Author: Timm Date: 2013-09-14 14:18:19 +0200 Rounded out PermitScrubber tests. Extracted helper methods to a ScrubberTest class. M actionview/test/template/scrubbers/scrubbers_test.rb commit b4cfb59 refs/heads/master Author: Timm Date: 2013-09-14 13:03:51 +0200 Moved some tests to scrubbers_test.rb. Added better testing of accessor validation. M actionview/test/template/sanitizers_test.rb M actionview/test/template/scrubbers/scrubbers_test.rb commit facc4f3 refs/heads/master Author: Timm Date: 2013-09-13 22:38:09 +0200 Added some test coverage for PermitScrubber. A actionview/test/template/scrubbers/scrubbers_test.rb commit ddc24fd refs/heads/master Author: Timm Date: 2013-09-13 22:37:44 +0200 Changed PermitScrubber's direction to bottom up to align better with Loofah's strip scrubber. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 7f9106d refs/heads/master Author: Timm Date: 2013-09-13 17:24:15 +0200 Now only requiring Loofah in the places where it is needed. M actionview/lib/action_view.rb M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/lib/action_view/testing/assertions.rb commit 19406da refs/heads/master Author: Timm Date: 2013-09-13 17:00:02 +0200 Minor rewording in TargetScrubber documentation. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 7cd2eb5 refs/heads/master Author: Timm Date: 2013-09-13 16:35:40 +0200 Added deprecation notice to actionpack changelog. M actionpack/CHANGELOG.md commit 240ac66 refs/heads/master Author: Timm Date: 2013-09-13 16:29:47 +0200 Updated Action View changelog entries with more information about the changes in the API. Removed mention of mentor (at his request). M actionview/CHANGELOG.md commit dd19557 refs/heads/master Author: Timm Date: 2013-09-13 15:56:07 +0200 Stylistic improvements in ActionView::Assertions::DomAssertions. M actionview/lib/action_view/testing/assertions/dom.rb commit 0a0d151 refs/heads/master Author: Timm Date: 2013-09-13 15:52:39 +0200 Now returning html if html is blank? in FullSanitizer and WhiteListSanitizer. This means it'll return false if called with false, however that is not a valid use case. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/test/template/sanitizers_test.rb commit 5430487 refs/heads/master Author: Timm Date: 2013-09-13 15:45:44 +0200 Stylistic improvements. Some light documentation for remove_xpaths. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 170f414 refs/heads/master Author: Timm Date: 2013-09-09 18:45:13 +0200 Removed require's for html-scanner. M actionpack/test/controller/action_pack_assertions_test.rb M actionpack/test/controller/integration_test.rb M actionview/lib/action_view/vendor/html-scanner.rb commit 229092f refs/heads/master Author: Timm Date: 2013-09-04 20:43:00 +0200 Changed test expectation from '<<' to '' with string to sanitize '<<' in sanitizers_test. M actionview/test/template/sanitizers_test.rb commit 4e97d75 refs/heads/master Author: Timm Date: 2013-09-03 09:30:37 +0200 Added deprecation warning to ActionDispatch::Assertions::TagAssertions. A actionpack/lib/action_dispatch/testing/assertions/tag.rb commit cb865e1 refs/heads/master Author: Timm Date: 2013-08-28 20:07:47 +0200 Removed dom_assertion method since it created bugs. M actionview/lib/action_view/testing/assertions/dom.rb commit 01e6e1d refs/heads/master Author: Timm Date: 2013-08-27 10:09:10 +0200 Fixed uninitialized constant ActionView::HTML error entered after recent git rebase. M actionview/lib/action_view.rb commit 2563c2c refs/heads/master Author: Timm Date: 2013-08-17 14:10:29 +0200 Removed a bunch of duplicated tests in SanitizeHelperTest. M actionview/test/template/sanitize_helper_test.rb commit 7f7a1b5 refs/heads/master Author: Timm Date: 2013-08-17 12:50:12 +0200 Removed unnecessary documentation in DomAssertions. M actionview/lib/action_view/testing/assertions/dom.rb commit 97d20b1 refs/heads/master Author: Timm Date: 2013-08-17 12:46:14 +0200 Removed case statement in equal_children? used child.element? instead. M actionview/lib/action_view/testing/assertions/dom.rb commit 905d2bc refs/heads/master Author: Timm Date: 2013-08-17 12:43:12 +0200 Reworked some internal documentation for equal_attribute_nodes?. M actionview/lib/action_view/testing/assertions/dom.rb commit d6067e8 refs/heads/master Author: Timm Date: 2013-08-17 12:39:19 +0200 Changed attributes_are_equal? to equal_attribute_nodes? which takes attribute_nodes instead of nodes. M actionview/lib/action_view/testing/assertions/dom.rb commit 73c690d refs/heads/master Author: Timm Date: 2013-08-17 11:40:40 +0200 Removed html_strings variable, no splat operator needed. M actionview/lib/action_view/testing/assertions/dom.rb commit bab54e4 refs/heads/master Author: Timm Date: 2013-08-17 11:24:40 +0200 Changed back to =~ or == comparison in HTMLSelector filter. M actionview/lib/action_view/testing/assertions/selector.rb commit 6217178 refs/heads/master Author: Timm Date: 2013-08-17 11:02:09 +0200 Simplified the removal of xpaths in remove_xpaths. Added more tests for remove_xpaths. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/test/template/sanitizers_test.rb commit c1a7864 refs/heads/master Author: Timm Date: 2013-08-17 10:36:23 +0200 Fixed: added apostrophe to possessive noun. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 5169b00 refs/heads/master Author: Timm Date: 2013-08-16 22:22:22 +0200 Extracted: create Regexp from match_with and use =~ to compare instead of checking .is_a? Regexp every time through the loop. M actionview/lib/action_view/testing/assertions/selector.rb commit e600b3a refs/heads/master Author: Timm Date: 2013-08-16 21:56:39 +0200 Changed conditional check in filter. Removed weird comments. M actionview/lib/action_view/testing/assertions/selector.rb commit 4b55c0a refs/heads/master Author: Timm Date: 2013-08-16 20:53:55 +0200 Moved: initial assignment of @selector_is_second_argument is now in initialize. M actionview/lib/action_view/testing/assertions/selector.rb commit cabef14 refs/heads/master Author: Timm Date: 2013-08-16 20:52:34 +0200 Changed: using duck typing instead of requiring subclasses of Node and NodeSet. M actionview/lib/action_view/testing/assertions/selector.rb commit 65ed2b6 refs/heads/master Author: Timm Date: 2013-08-16 20:23:55 +0200 Renamed: HTMLSelector css_selector to selector. M actionview/lib/action_view/testing/assertions/selector.rb commit 9a536bc refs/heads/master Author: Timm Date: 2013-08-16 20:21:51 +0200 Removed unnecessary lines from HTMLSelector initialize. M actionview/lib/action_view/testing/assertions/selector.rb commit ce4396b refs/heads/master Author: Timm Date: 2013-08-16 20:15:25 +0200 Changed: put selector extraction into selector_from, which is renamed to extract_selector. M actionview/lib/action_view/testing/assertions/selector.rb commit 20615ec refs/heads/master Author: Timm Date: 2013-08-16 19:47:53 +0200 Changed: HTMLSelector comparisons renamed to equality_tests. M actionview/lib/action_view/testing/assertions/selector.rb commit 71aaddb refs/heads/master Author: Timm Date: 2013-08-16 19:41:24 +0200 Changed: removed @selected and @page variables from HTMLSelector since one method used them. Passed the values directly to there instead. M actionview/lib/action_view/testing/assertions/selector.rb commit 75789d5 refs/heads/master Author: Timm Date: 2013-08-16 18:56:35 +0200 Changed: return early from compare_doms if the two doms don't have the same number of children. M actionview/lib/action_view/testing/assertions/dom.rb commit 1825edc refs/heads/master Author: Timm Date: 2013-08-16 16:49:55 +0200 Renamed: remove_xpaths tests no longer prefixed with sanitizer. M actionview/test/template/sanitizers_test.rb commit 97c5e6f refs/heads/master Author: Timm Date: 2013-08-16 16:49:05 +0200 Changed: remove_xpaths called with String returns String, while called with Loofah fragment returns Loofah fragment. Added tests for this. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/test/template/sanitizers_test.rb commit 9a3a59e refs/heads/master Author: Timm Date: 2013-08-16 16:31:24 +0200 Fixed: spelling mistake in SanitizeHelperTest. M actionview/test/template/sanitize_helper_test.rb commit 9dac1e8 refs/heads/master Author: Timm Date: 2013-08-16 16:17:44 +0200 Removed duplication in assert_dom_equal and assert_dom_not_equal. M actionview/lib/action_view/testing/assertions/dom.rb commit 86c6f5b refs/heads/master Author: Timm Date: 2013-08-14 17:21:01 +0200 Changed wording of missing selector argument exception message in css_select. M actionview/lib/action_view/testing/assertions/selector.rb commit bffa646 refs/heads/master Author: Timm Date: 2013-08-14 17:18:15 +0200 Reworked root and selector conditional assignment in css_select. M actionview/lib/action_view/testing/assertions/selector.rb commit 5a14dbf refs/heads/master Author: Timm Date: 2013-08-13 21:25:55 +0200 Added related Nokogiri issue link to tests that fail with unknown encoding ASCII-8BIT. M actionview/test/template/date_helper_test.rb M actionview/test/template/form_helper_test.rb commit 63e0fa7 refs/heads/master Author: Timm Date: 2013-08-13 11:00:10 +0200 Moved Action Pack changelog message to Action View. Clarified Dom and Selector assertions changes in there. M actionview/CHANGELOG.md commit dddf86a refs/heads/master Author: Timm Date: 2013-08-13 10:52:58 +0200 Trimmed deprecation message for ActionDispatch::Assertions::SelectorAssertions. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 53f25ae3 refs/heads/master Author: Timm Date: 2013-08-12 19:00:41 +0200 Removed :nodoc: from PermitScrubber. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit d6a6d42 refs/heads/master Author: Timm Date: 2013-08-12 18:54:54 +0200 Reworked documentation for PermitScrubber and TargetScrubber. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 349230e refs/heads/master Author: Timm Date: 2013-08-12 17:15:32 +0200 Fixed: spelling error. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit b13d22b refs/heads/master Author: Timm Date: 2013-08-10 12:57:19 +0200 Initialized tags and attributes to nil. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 39df402 refs/heads/master Author: Timm Date: 2013-08-10 12:54:44 +0200 Refactored scrub to keep_node? instead of scrub_node calling it. Also added ability to stop traversing by returning STOP from scrub_node. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 557806f refs/heads/master Author: Timm Date: 2013-08-10 11:23:57 +0200 Changed PermitScrubber to be even more extensible. Updated TargetScrubber to be compliant. Updated documentation for PermitScrubber and TargetScrubber for clarity. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit ea57c7c refs/heads/master Author: Timm Date: 2013-08-09 23:45:40 +0200 Changed PermitScrubbers documentation to list override points for subclasses. Renamed should_remove_attributes? to should_scrub_attributes?. M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit ac0d778 refs/heads/master Author: Timm Date: 2013-08-09 23:38:14 +0200 Already killed off LinkScrubber. Changed it instead to be TargetScrubber, which is more general, while still allowing maximum code reuse. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 1cdc511 refs/heads/master Author: Timm Date: 2013-08-09 23:18:37 +0200 Added LinkScrubber to remove duplication in LinkSanitizer. As such made PermitScrubber easier to subclass. D actionview/lib/action_view/helpers/sanitize_helper/permit_scrubber.rb M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb A actionview/lib/action_view/helpers/sanitize_helper/scrubbers.rb commit 739ecdf refs/heads/master Author: Timm Date: 2013-08-09 22:13:05 +0200 Changed FullSanitizer sanitize to use tap method instead of temporary variable. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit d1de087 refs/heads/master Author: Timm Date: 2013-08-09 22:10:28 +0200 Extracted the common xpaths to remove into XPATHS_TO_REMOVE. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 945e7f5 refs/heads/master Author: Timm Date: 2013-08-09 18:20:31 +0200 Refactored remove_xpaths to use duck typing and read better. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit f428aea refs/heads/master Author: Timm Date: 2013-08-09 18:12:25 +0200 Changed explanation for no duck typing of custom scrubbers. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 3ca1061 refs/heads/master Author: Timm Date: 2013-08-07 20:28:40 +0200 Added correct requires in html-scanner tests. Sanitizers are not based on html-scanner anymore, so sanitizer_test.rb is removed. M actionview/test/template/html-scanner/cdata_node_test.rb M actionview/test/template/html-scanner/document_test.rb M actionview/test/template/html-scanner/node_test.rb D actionview/test/template/html-scanner/sanitizer_test.rb M actionview/test/template/html-scanner/tag_node_test.rb M actionview/test/template/html-scanner/text_node_test.rb M actionview/test/template/html-scanner/tokenizer_test.rb commit 748f281 refs/heads/master Author: Timm Date: 2013-08-07 16:42:17 +0200 Require ActionView::Assertions in ActionController test_case.rb. M actionpack/lib/action_controller/test_case.rb commit 7b2e753 refs/heads/master Author: Timm Date: 2013-08-06 13:42:16 +0200 Marked test_feed_xhtml as pending. See description in the test. M actionview/test/template/atom_feed_helper_test.rb commit dea8ddb refs/heads/master Author: Timm Date: 2013-08-02 17:06:48 +0200 Removed copyright notice since we aren't relying on html-scanner anymore. M actionview/lib/action_view/testing/assertions/selector.rb commit 09454dc refs/heads/master Author: Timm Date: 2013-08-02 17:04:34 +0200 Removed require for active_support/core_ext/object/inclusion since in? isn't used anywhere. M actionview/lib/action_view/testing/assertions/selector.rb commit 95c517b refs/heads/master Author: Timm Date: 2013-08-02 17:01:54 +0200 Moved Dom and Selector assertions from ActionDispatch to ActionView. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/testing/assertions.rb M actionpack/lib/action_dispatch/testing/assertions/dom.rb M actionpack/lib/action_dispatch/testing/assertions/selector.rb M actionpack/lib/action_dispatch/testing/integration.rb D actionpack/test/controller/assert_select_test.rb M actionview/lib/action_view/test_case.rb A actionview/lib/action_view/testing/assertions.rb A actionview/lib/action_view/testing/assertions/dom.rb A actionview/lib/action_view/testing/assertions/selector.rb A actionview/test/template/assert_select_test.rb M actionview/test/template/url_helper_test.rb commit 9f73f9f refs/heads/master Author: Timm Date: 2013-08-02 16:05:55 +0200 Fixed: assert_select_encoded finds the right content. No longer uses a wrapper. Updated tests to reflect this. M actionpack/lib/action_dispatch/testing/assertions/selector.rb M actionpack/test/controller/assert_select_test.rb commit 1bc0bec refs/heads/master Author: Timm Date: 2013-08-01 23:18:18 +0200 Removed mention of css_select supporting substitution values. It is not tested anywhere. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 6fd74dc refs/heads/master Author: Timm Date: 2013-08-01 22:41:12 +0200 Updated documentation to state more things about css selectors with substitution values. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 9020abe refs/heads/master Author: Timm Date: 2013-08-01 22:22:32 +0200 Reworked the wrapping root in NodeSet implementation in css_select. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 77d0333 refs/heads/master Author: Timm Date: 2013-08-01 21:11:48 +0200 Wrapped element to search in NodeSet. Changed selectors to selector. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit ea5f3ba refs/heads/master Author: Timm Date: 2013-08-01 19:36:39 +0200 Moved around alias line. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit f2c9734 refs/heads/master Author: Timm Date: 2013-08-01 19:26:53 +0200 Returning from filter if matches are empty. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 91650dd refs/heads/master Author: Timm Date: 2013-07-31 22:21:22 +0200 Fixed: no longer wrapped @selected in fragment, since .css works fine without it. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit f103122 refs/heads/master Author: Timm Date: 2013-07-31 19:48:35 +0200 Reverted to using documents instead of document fragments, since searching via default xml namespaces didn't work. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit a45ee9e refs/heads/master Author: Timm Date: 2013-07-31 16:14:00 +0200 add_regex returns inspected value for non Regexp objects. Workaround, so users don't have to care about enclosing values in double quotes. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 3ac4c62 refs/heads/master Author: Timm Date: 2013-07-31 15:54:24 +0200 Added test case for non-comment. Removed pending assertion that passed. M actionview/test/template/sanitizers_test.rb commit 4f19614 refs/heads/master Author: Timm Date: 2013-07-30 20:14:33 +0200 Fixed: test_nested_assert_select selects from elements instead of elements[0] and elements[1]. M actionpack/test/controller/assert_select_test.rb commit 3c6ce74 refs/heads/master Author: Timm Date: 2013-07-30 15:20:46 +0200 Fixed: inadvertently called message method in MiniTest instead of selector.message. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 22aa73b refs/heads/master Author: Timm Date: 2013-07-30 14:45:12 +0200 Cleaned up SubstitutionContext class. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 99ac0cd refs/heads/master Author: Timm Date: 2013-07-30 12:31:58 +0200 Simplified assert_select further by moving match filtering into HTMLSelector select. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 4ed7841 refs/heads/master Author: Timm Date: 2013-07-30 12:04:37 +0200 Fixed: now only compares html of children in filter_matches. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 7e7e191 refs/heads/master Author: Timm Date: 2013-07-25 20:04:27 +0200 Added NodeSet comparison to possible root element in determine_root_from. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 2cc4f42 refs/heads/master Author: Timm Date: 2013-07-25 20:03:28 +0200 Changed html_document to use fragments. Changed response_from_page to be an alias of html_document. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit a5eeec4 refs/heads/master Author: Timm Date: 2013-07-24 22:02:27 +0200 Changed xml_namespace test to correct syntax. However, Nokogiri won't recognize the namespace. M actionpack/test/controller/assert_select_test.rb commit 5670bbe refs/heads/master Author: Timm Date: 2013-07-24 20:09:06 +0200 Fixed bug by switching to Loofah fragment instead of document. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 6f61cf6 refs/heads/master Author: Timm Date: 2013-07-24 18:17:26 +0200 Changed test methods to use new substitution syntax more in line with css selectors. M actionpack/test/controller/assert_select_test.rb commit 1b0a4b9 refs/heads/master Author: Timm Date: 2013-07-24 18:16:11 +0200 Changed css_select to not count on multiple selectors. Fixed bug in determine_root_from where @selected was an Array. Changed assert_select_encoded to use a fragment instead of a document. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 5f756e3 refs/heads/master Author: Timm Date: 2013-07-24 16:45:58 +0200 Added a proper substitution context class. Changed ArgumentFilter to be a selector. It is now called HTMLSelector. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 8d6c92c refs/heads/master Author: Timm Date: 2013-07-24 16:03:14 +0200 Fixed nested assert_select bug. Trying to create a full document for a nested call that already had a document. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 1e4f1ab refs/heads/master Author: Timm Date: 2013-07-24 16:01:36 +0200 Added implementation for substitution values via Nokogiri's custom pseudo classes. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 9eada2d refs/heads/master Author: Timm Date: 2013-07-24 13:12:27 +0200 Readded some documentation about substitution values. M actionpack/lib/action_dispatch/testing/assertions/selector.rb M guides/source/testing.md commit 5b36801 refs/heads/master Author: Zachary Scott Date: 2014-06-16 11:35:43 -0700 :scissors: and :nail_care: from d60c405 [ci skip] M activemodel/lib/active_model/serialization.rb commit d60c405 refs/heads/master Merge: 78ae3a3 eb5d802 Author: Zachary Scott Date: 2014-06-16 11:32:34 -0700 Merge pull request #15751 from aditya-kapoor/correct-serialization-doc [ci skip] correct doc for serialization in accordance with API Doc Guide commit bab64e6 refs/heads/master Author: Ignacio Tolosa Date: 2014-06-16 13:45:29 -0400 fix delayed job adapter timestamp M lib/active_job/queue_adapters/delayed_job_adapter.rb commit 4db09e6 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-16 23:05:11 +0530 [ci skip] correct output for asset_helper methods see cc255d3 M actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/lib/action_view/helpers/form_tag_helper.rb commit 78ae3a3 refs/heads/master Merge: 1aa059c 218105f Author: Rafael Mendonça França Date: 2014-06-16 14:28:32 -0300 Merge pull request #15755 from sgrif/sg-dirty-refactor Refactor in-place dirty checking to use the attribute object commit 1aa059c refs/heads/master Author: Rafael Mendonça França Date: 2014-06-16 14:26:23 -0300 Add important plugins as one of the tasks of the release [ci skip] M RELEASING_RAILS.rdoc commit 218105f refs/heads/master Author: Sean Griffin Date: 2014-06-16 11:20:55 -0600 Refactor in-place dirty checking to use the attribute object M activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/read.rb commit eb5d802 refs/heads/master Author: Aditya Kapoor Date: 2014-06-16 22:26:55 +0530 [ci skip] correct doc for serialization in accordance with API Doc Guide M activemodel/lib/active_model/serialization.rb commit 5006b63 refs/tags/v4.1.2.rc2 (tag: v4.1.2.rc2) Author: Rafael Mendonça França Date: 2014-06-16 13:28:15 -0300 Preparing for 4.1.2.rc2 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit d8569bd refs/heads/master Merge: 4dc6b64 fedb16a Author: Rafael Mendonça França Date: 2014-06-16 13:27:59 -0300 Merge pull request #15684 from aditya-kapoor/add-tests-for-assert-valid-keys Add test cases for Hash#asset_valid_keys commit 4dc6b64 refs/heads/master Merge: 92de6d4 8de5f7e Author: Rafael Mendonça França Date: 2014-06-16 13:15:38 -0300 Merge pull request #13963 from lucas-clemente/pending_migrations Skip migration check if adapter doesn't support it commit 13c6bac refs/tags/v4.0.6.rc2 (tag: v4.0.6.rc2) Author: Rafael Mendonça França Date: 2014-06-16 13:14:03 -0300 Preparing for 4.0.6.rc2 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit e6690d3 refs/heads/master Author: Sean Griffin Date: 2014-06-15 19:16:30 -0600 Always update counter caches in memory when adding records Before, calling `size` would only work if it skipped the cache, and would return a different result from the cache, but only if: - The association was previously loaded - Or you called size previously - But only if the size was 0 when you called it This ensures that the counter is appropriately updated in memory. M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 92de6d4 refs/heads/master Merge: 4ce99ae e312381 Author: Yves Senn Date: 2014-06-16 08:35:00 +0200 Merge pull request #15744 from mmozuras/special_keys_set Change Http::Cache::SPECIAL_KEYS from Array to Set commit 4ce99ae refs/heads/master Merge: 01c109a 70312d2 Author: Yves Senn Date: 2014-06-16 08:32:59 +0200 Merge pull request #15743 from tgxworld/remove_unused_parameters Remove unused parameter. commit 01c109a refs/heads/master Merge: 38d4ea7 889e65e Author: Zachary Scott Date: 2014-06-15 22:41:15 -0700 Merge pull request #15722 from akshay-vishnoi/spell-correct [ci skip] /mysql/i -> MySQL, Spell correct in continuation to #15555 commit 38d4ea7 refs/heads/master Merge: 6a25ddd 513c69c Author: Zachary Scott Date: 2014-06-15 22:26:26 -0700 Merge pull request #15723 from akshay-vishnoi/sql-correction [ci skip] Use `an` for SQL commit 6a25ddd refs/heads/master Merge: 952d0f8 73dc6d7 Author: Rafael Mendonça França Date: 2014-06-15 23:53:27 -0300 Merge pull request #15748 from akshay-vishnoi/activemodel Correct typo, add test for validates_absence_of commit 73dc6d7 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-16 08:22:11 +0530 Correct typo, add test for validates_absence_of, correct method names M activemodel/test/cases/validations/absence_validation_test.rb commit e4772cc refs/heads/master Author: Timm Date: 2013-07-24 13:01:21 +0200 Fixed typo in method name. Fixed Nokogiri::CSS::SyntaxError. M actionpack/test/controller/assert_select_test.rb commit 1bc3438 refs/heads/master Author: Timm Date: 2013-07-23 20:48:58 +0200 Updated testing guide to reflect changes in ActionDispatch::SelectorAssertions. M guides/source/testing.md commit bc1363e refs/heads/master Author: Timm Date: 2013-07-23 20:42:08 +0200 Updated documentation to remove mention of HTML::Selector and clarify what is expected of a selector now. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 0a7fac5 refs/heads/master Author: Timm Date: 2013-07-23 19:32:07 +0200 Changed tests to assert_kind_of Loofah::HTML::Document. M actionpack/test/controller/integration_test.rb commit 63fc9f1 refs/heads/master Author: Timm Date: 2013-07-23 19:31:24 +0200 Readded html_document method since it is used integration tests. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit ab3a236 refs/heads/master Author: Timm Date: 2013-07-23 16:49:04 +0200 Removed selector_test.rb since HTML::Selector will be removed. Soon. D actionpack/test/controller/selector_test.rb commit 6aea3bc refs/heads/master Author: Timm Date: 2013-07-23 16:36:15 +0200 Changed filter_matches to return a new NodeSet instead of Array. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 37ff080 refs/heads/master Author: Timm Date: 2013-07-23 16:35:07 +0200 Fixed Nokogiri::CSS::SyntaxErrors. Fixed a Nokogiri::CSS::SyntaxError by using its expected format for unicode characters. M actionpack/test/controller/request_forgery_protection_test.rb M actionview/test/template/form_collections_helper_test.rb commit 37ac1c4 refs/heads/master Author: Timm Date: 2013-07-23 16:34:32 +0200 Replaced html-scanner with Loofah. M actionview/lib/action_view/test_case.rb M actionview/test/template/form_tag_helper_test.rb commit 11fc26b refs/heads/master Author: Timm Date: 2013-07-23 15:20:15 +0200 Initialized @css_selector_is_second_argument in determine_root_from. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 240ce95 refs/heads/master Author: Timm Date: 2013-07-22 22:25:54 +0200 Fixed Nokogiri::CSS::SyntaxErrors in test file. M actionview/test/template/atom_feed_helper_test.rb commit 9893a28 refs/heads/master Author: Timm Date: 2013-07-22 22:25:23 +0200 Changed early return for filter_matches as well as reassigning matches. Meddled with initialize in ArgumentFilter. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 7ef141a refs/heads/master Author: Timm Date: 2013-07-21 10:28:27 +0200 Removed redundant comments from assert_select. Cleaned up a comment. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 332ccb3 refs/heads/master Author: Timm Date: 2013-07-20 20:07:04 +0200 Added assert_size_match! with the assertions for assert_select. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 95afa79 refs/heads/master Author: Timm Date: 2013-07-20 19:51:12 +0200 Changed some documentation for css_select. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit b4258f8 refs/heads/master Author: Timm Date: 2013-07-20 19:50:32 +0200 Replaced fragment calls with document, since we assume the responses are complete documents. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit ff0939a refs/heads/master Author: Timm Date: 2013-07-20 15:11:25 +0200 Added filter_matches to reduce line count in assert_select. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 63938f6 refs/heads/master Author: Timm Date: 2013-07-20 14:19:47 +0200 Renamed Selector to ArgumentFilter. Put code from HTMLSelector to ArgumentFilter. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 744cba7 refs/heads/master Author: Timm Date: 2013-07-20 14:13:22 +0200 Removed the custom selected proc. It's no longer needed. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit afa4caf refs/heads/master Author: Timm Date: 2013-07-20 14:09:21 +0200 Updated selector to not have reponse_from_page. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 205bfe9 refs/heads/master Author: Timm Date: 2013-07-20 13:43:58 +0200 Changed css_select and pulled out response_from_page from Selector. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 0538d26 refs/heads/master Author: Timm Date: 2013-07-20 13:14:23 +0200 Changed comparison from HTML::Node to Nokogiri::XML::Node in assert_select_encoded. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 3b942d3 refs/heads/master Author: Timm Date: 2013-07-20 13:06:23 +0200 Removed more redundant lines. Removed fix_content block that circumvented a bug in html-scanner. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 6fa3af8 refs/heads/master Author: Timm Date: 2013-07-20 13:00:36 +0200 Removed more lines of code in assert_select. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit cb215c9 refs/heads/master Author: Timm Date: 2013-07-20 12:47:10 +0200 Simplified the first delete_if loop in assert_select to use Loofah's text method. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 328512e refs/heads/master Author: Timm Date: 2013-07-20 12:25:13 +0200 Removed argument and root variable in assert_select proc. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit a38c759 refs/heads/master Author: Timm Date: 2013-07-19 21:31:47 +0200 Changed name to selector. And a bunch of other things. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 8c0536c refs/heads/master Author: Timm Date: 2013-07-19 19:19:13 +0200 The first attempt at abstracting argument parsing from selection methods. M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 2ff60e8 refs/heads/master Author: Timm Date: 2013-07-17 18:27:00 +0200 Removed tag.rb since it has been deprecated. M actionpack/lib/action_dispatch/testing/assertions.rb D actionpack/lib/action_dispatch/testing/assertions/tag.rb M actionpack/test/controller/action_pack_assertions_test.rb M actionpack/test/controller/test_case_test.rb commit 8f5547f refs/heads/master Author: Timm Date: 2013-07-15 22:40:46 +0200 Corrected documentation bug. M actionpack/lib/action_dispatch/testing/assertions/dom.rb commit c63b75a refs/heads/master Author: Timm Date: 2013-07-15 22:39:28 +0200 Removed whitespace between dependencies. M actionpack/actionpack.gemspec commit 42f0198 refs/heads/master Author: Timm Date: 2013-07-17 18:44:29 +0200 Updated documentation to tell that a custom scrubber takes precedence. M actionview/lib/action_view/helpers/sanitize_helper.rb commit dad96ef refs/heads/master Author: Timm Date: 2013-07-15 22:10:03 +0200 Updated the documentation to reflect the scrubber option. M actionview/lib/action_view/helpers/sanitize_helper.rb commit 8fdf86c refs/heads/master Author: Timm Date: 2013-07-15 22:02:32 +0200 Marked the private API as not needing code documentation. M actionview/lib/action_view/helpers/sanitize_helper/permit_scrubber.rb M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 6241bb8 refs/heads/master Author: Timm Date: 2013-07-15 21:54:43 +0200 Added ability to pass a custom scrubber to sanitize. Includes test coverage. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/test/template/sanitizers_test.rb commit c88d573 refs/heads/master Author: Timm Date: 2013-07-10 20:15:22 +0200 Moved requiring of Loofah from sanitizers.rb to action_view.rb. M actionview/lib/action_view.rb M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 7e2f7da refs/heads/master Author: Timm Date: 2013-07-10 17:54:26 +0200 Marked tests in sanitize_helper_test.rb as pending. M actionview/test/template/sanitize_helper_test.rb commit 32850b5 refs/heads/master Author: Timm Date: 2013-07-10 17:44:22 +0200 Marked a test in form_helper_test.rb as pending because of unknown encoding ASCII-8BIT output error. M actionview/test/template/form_helper_test.rb commit 561fbe0 refs/heads/master Author: Timm Date: 2013-07-10 17:41:07 +0200 Marked some tests as pending in date_helper_test.rb. M actionview/test/template/date_helper_test.rb commit d631b37 refs/heads/master Author: Timm Date: 2013-07-10 17:36:57 +0200 Added some tests for ActionView::Sanitizer. M actionview/test/template/sanitizers_test.rb commit 4fbec83 refs/heads/master Author: Timm Date: 2013-07-10 16:55:38 +0200 Added ActionView::Sanitizer and moved remove_xpaths to there. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 4f67398 refs/heads/master Author: Timm Date: 2013-07-10 16:38:56 +0200 Changed the description of some pending tests. Changed the expected output of a script test. M actionview/test/template/sanitizers_test.rb commit c80da23 refs/heads/master Author: Timm Date: 2013-07-10 16:29:15 +0200 Extracted one highlight test method and marked it as pending. M actionview/test/template/text_helper_test.rb commit 40bbb49 refs/heads/master Author: Timm Date: 2013-07-10 16:27:39 +0200 Added comment removal. Changed definitation of remove_xpaths to not use a splat operator. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 68f75b9 refs/heads/master Author: Timm Date: 2013-07-10 16:00:36 +0200 Extracted the xpath removals into some new API that allows users to remove xpath subtrees. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 55b453f refs/heads/master Author: Timm Date: 2013-07-10 15:57:01 +0200 Added removal of script tags to WhiteListSanitizer. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 5282518 refs/heads/master Author: Timm Date: 2013-07-09 19:27:47 +0200 Renamed the SanitizerTest class to SanitersTest, to remove the conflict with the old SanitizerTest for html-scanner. M actionview/test/template/sanitizers_test.rb commit 6a05cb6 refs/heads/master Author: Timm Date: 2013-07-07 11:30:05 +0200 Added video poster sanitization testing (from @vipulnsward). M actionview/test/template/sanitizers_test.rb commit 2e8c536 refs/heads/master Author: Timm Date: 2013-07-07 10:37:44 +0200 Extracted failing tests in santiizers_test.rb into their own methods and marked them as pending. M actionview/test/template/sanitizers_test.rb commit 5dfd394 refs/heads/master Author: Timm Date: 2013-07-07 10:35:52 +0200 Added guard clauses to FullSanitizer. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit 91712cc refs/heads/master Author: Timm Date: 2013-07-04 16:55:42 +0200 bad_tags include form since we remove it. Also to prevent a should_allow_form_tag test creation. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit d3d979e refs/heads/master Author: Timm Date: 2013-07-04 16:40:27 +0200 Changed expected value from '' to empty string. M actionview/test/template/sanitizers_test.rb commit 167e998 refs/heads/master Author: Timm Date: 2013-07-03 19:55:52 +0200 Removed the contains_bad_protocols? method as well as the tests for it. Loofah already deals with this. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/test/template/sanitizers_test.rb commit 3e4ae8e refs/heads/master Author: Timm Date: 2013-07-02 21:54:34 +0200 Reordered form removal with stripping. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb M actionview/test/template/sanitize_helper_test.rb commit 2622da1 refs/heads/master Author: Timm Date: 2013-07-02 20:16:10 +0200 Added PermitScrubber which allows you to permit elements for sanitization. A actionview/lib/action_view/helpers/sanitize_helper/permit_scrubber.rb M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit d4d1392 refs/heads/master Author: Timm Date: 2013-07-02 13:47:24 +0200 Removed duplication in the deprecated methods. M actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb commit e312381 refs/heads/master Author: Mindaugas Mozūras Date: 2014-06-15 21:47:37 +0300 Change Http::Cache::SPECIAL_KEYS from Array to Set Slightly improves performance, for example, a simple benchmark: ```ruby require 'benchmark/ips' require 'set' SPECIAL_KEYS = %w[extras no-cache max-age public must-revalidate] SPECIAL_KEYS_SET = Set.new(SPECIAL_KEYS) directive = 'must-revalidate' Benchmark.ips do |x| x.report('array') { SPECIAL_KEYS.include?(directive) } x.report('set') { SPECIAL_KEYS_SET.include?(directive) } end ``` Output: ``` ------------------------------------- array 67926 i/100ms set 74054 i/100ms ------------------------------------- array 2318423.4 (±2.8%) i/s - 11615346 in 5.014899s set 3387981.8 (±4.7%) i/s - 16958366 in 5.019355s ``` M actionpack/lib/action_dispatch/http/cache.rb commit 952d0f8 refs/heads/master Merge: 3268a04 aaa7b6b Author: Rafael Mendonça França Date: 2014-06-15 16:24:34 -0300 Merge pull request #15745 from mmozuras/remove_unused_separators_param Remove unused param 'separators' from RouteSet#build_path commit aaa7b6b refs/heads/master Author: Mindaugas Mozūras Date: 2014-06-15 22:01:34 +0300 Remove unused param 'separators' from RouteSet#build_path M actionpack/lib/action_dispatch/routing/route_set.rb commit 70312d2 refs/heads/master Author: Guo Xiang Tan Date: 2014-06-14 16:29:34 -0700 Remove unused parameter. M actionpack/lib/action_dispatch/testing/integration.rb commit 3268a04 refs/heads/master Merge: f59ed56 b069ab6 Author: Yves Senn Date: 2014-06-15 16:48:59 +0200 Merge pull request #15741 from sgrif/sg-update-deprecation-message Change the deprecation warning on `serialized_attributes` commit b069ab6 refs/heads/master Author: Sean Griffin Date: 2014-06-15 08:44:58 -0600 Change the deprecation warning on `serialized_attributes` to "without replacement" M activerecord/lib/active_record/attribute_methods/serialization.rb commit 0a2ddea refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-15 14:13:34 +0200 allow preview interceptors to be registered through `config.action_mailer`. This was partially broken because `preview_interceptors=` just assigned the raw values, whithout going through `register_preview_interceptor`. Now the Action Mailer railtie takes care of the `preview_interceptors` option. This commit is a partial revert of: Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base" This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be. /cc @kuldeepaggarwal @y-yagi Conflicts: actionmailer/CHANGELOG.md M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/railtie.rb M railties/test/application/configuration_test.rb commit f59ed56 refs/heads/master Author: Yves Senn Date: 2014-06-15 14:13:34 +0200 allow preview interceptors to be registered through `config.action_mailer`. This was partially broken because `preview_interceptors=` just assigned the raw values, whithout going through `register_preview_interceptor`. Now the Action Mailer railtie takes care of the `preview_interceptors` option. This commit is a partial revert of: Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base" This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be. /cc @kuldeepaggarwal @y-yagi M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/railtie.rb M railties/test/application/configuration_test.rb commit 276a0e3 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-15 12:50:23 +0200 Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base [ci skip] correct doc for `register_preview_interceptor` M actionmailer/lib/action_mailer/base.rb commit a15704d refs/heads/master Merge: 1bd12a8 71da4b0 Author: Yves Senn Date: 2014-06-15 12:50:23 +0200 Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base [ci skip] correct doc for `register_preview_interceptor` commit 1bd12a8 refs/heads/master Merge: 247cc22 8807214 Author: Yves Senn Date: 2014-06-15 12:44:10 +0200 Merge pull request #15738 from kuldeepaggarwal/remove-unwanted-code remove unnecessary calling of `I18n.backend.store_translations('empty', {})` commit 8807214 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-15 01:43:15 +0530 remove unnecessary calling of `I18n.backend.store_translations(empty, {})` Clean up I18n stored translations after test continuation with #15714 M activesupport/test/i18n_test.rb M activesupport/test/number_helper_i18n_test.rb commit 71da4b0 refs/heads/master Author: yuuji.yaginuma Date: 2014-06-15 09:31:28 +0900 [ci skip] correct doc for `register_preview_interceptor` M actionmailer/lib/action_mailer/base.rb commit 247cc22 refs/heads/master Merge: fd4bb5a cffbcee Author: Yves Senn Date: 2014-06-14 21:52:13 +0200 Merge pull request #15737 from kuldeepaggarwal/fix-build reload I18n as we are defining `:ts` locale in `test_number_to_human_with_custom_translation_scope` commit cffbcee refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-15 01:11:13 +0530 reload I18n as we are defining `:ts` locale fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913. M actionview/test/template/number_helper_test.rb commit fd4bb5a refs/heads/master Merge: 2d3cfcc 57fe5fd Author: Zachary Scott Date: 2014-06-14 11:50:14 -0700 Merge pull request #15735 from aditya-kapoor/update-wiki-md [ci skip] update wiki link for MVC in README commit 57fe5fd refs/heads/master Author: Aditya Kapoor Date: 2014-06-15 00:03:01 +0530 [ci skip] update wiki link for MVC M README.md commit 2d3cfcc refs/heads/master Merge: 0ab163d 1505f8b Author: Zachary Scott Date: 2014-06-14 11:12:23 -0700 Merge pull request #15734 from aditya-kapoor/correct-link [ci-skip] correct wikipedia MVC link commit 0ab163d refs/heads/master Author: Godfrey Chan Date: 2014-06-14 11:05:39 -0700 Edit pass on `has_secure_password` documentation [ci skip] M activemodel/lib/active_model/secure_password.rb commit 1505f8b refs/heads/master Author: Aditya Kapoor Date: 2014-06-14 23:34:08 +0530 [ci-skip] correct wikipedia MVC link M railties/RDOC_MAIN.rdoc commit 69eaac9 refs/remotes/origin/4-0-stable Author: Sean Griffin Date: 2014-06-14 09:35:37 -0600 Don't save through associations twice (4-0-stable) If the through record gets created in an after_create hook that is defined before the association is defined (therefore after its after_create hook) get saved twice. This ensures that the through records are created only once, regardless of the order of the hooks. Backports the fix for #3798 to 4.1. Slightly more conservative on the callback order since it's a patch version, and required an additional special case for HABTM M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit c6a8e09 refs/remotes/origin/4-1-stable Author: Sean Griffin Date: 2014-06-14 09:27:17 -0600 Don't save through records twice (4-1-stable) If the through record gets created in an after_create hook that is defined before the association is defined (therefore after its after_create hook) get saved twice. This ensures that the through records are created only once, regardless of the order of the hooks. M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 69807af refs/heads/master Merge: 64220a1 2df1540 Author: Yves Senn Date: 2014-06-14 16:34:58 +0200 Merge pull request #15704 from sgrif/sg-deprecate-serialized Deprecate `serialized_attributes` without replacement commit 64220a1 refs/heads/master Merge: 5223bad 48d1185 Author: Yves Senn Date: 2014-06-14 16:31:50 +0200 Merge pull request #15715 from zuhao/refactor_actionview_cleanup_I18n_translations Clean up I18n stored translations after test. commit 5223bad refs/heads/master Author: Yves Senn Date: 2014-06-14 16:18:22 +0200 docs, remove getting started guide sample application. [ci skip] This application always gets out of sync and doesn't add much value. Closes #15721 /cc @rafaelfranca D guides/code/getting_started/.gitignore D guides/code/getting_started/Gemfile D guides/code/getting_started/Gemfile.lock D guides/code/getting_started/README.rdoc D guides/code/getting_started/Rakefile D guides/code/getting_started/app/assets/javascripts/application.js D guides/code/getting_started/app/assets/javascripts/articles.js.coffee D guides/code/getting_started/app/assets/javascripts/comments.js.coffee D guides/code/getting_started/app/assets/javascripts/welcome.js.coffee D guides/code/getting_started/app/assets/stylesheets/application.css D guides/code/getting_started/app/assets/stylesheets/articles.css.scss D guides/code/getting_started/app/assets/stylesheets/comments.css.scss D guides/code/getting_started/app/assets/stylesheets/welcome.css.scss D guides/code/getting_started/app/controllers/application_controller.rb D guides/code/getting_started/app/controllers/articles_controller.rb D guides/code/getting_started/app/controllers/comments_controller.rb D guides/code/getting_started/app/controllers/concerns/.keep D guides/code/getting_started/app/controllers/welcome_controller.rb D guides/code/getting_started/app/helpers/application_helper.rb D guides/code/getting_started/app/helpers/articles_helper.rb D guides/code/getting_started/app/helpers/comments_helper.rb D guides/code/getting_started/app/helpers/welcome_helper.rb D guides/code/getting_started/app/mailers/.keep D guides/code/getting_started/app/models/.keep D guides/code/getting_started/app/models/article.rb D guides/code/getting_started/app/models/comment.rb D guides/code/getting_started/app/models/concerns/.keep D guides/code/getting_started/app/views/articles/_form.html.erb D guides/code/getting_started/app/views/articles/edit.html.erb D guides/code/getting_started/app/views/articles/index.html.erb D guides/code/getting_started/app/views/articles/new.html.erb D guides/code/getting_started/app/views/articles/show.html.erb D guides/code/getting_started/app/views/comments/_comment.html.erb D guides/code/getting_started/app/views/comments/_form.html.erb D guides/code/getting_started/app/views/layouts/application.html.erb D guides/code/getting_started/app/views/welcome/index.html.erb D guides/code/getting_started/bin/bundle D guides/code/getting_started/bin/rails D guides/code/getting_started/bin/rake D guides/code/getting_started/config.ru D guides/code/getting_started/config/application.rb D guides/code/getting_started/config/boot.rb D guides/code/getting_started/config/database.yml D guides/code/getting_started/config/environment.rb D guides/code/getting_started/config/environments/development.rb D guides/code/getting_started/config/environments/production.rb D guides/code/getting_started/config/environments/test.rb D guides/code/getting_started/config/initializers/backtrace_silencers.rb D guides/code/getting_started/config/initializers/filter_parameter_logging.rb D guides/code/getting_started/config/initializers/inflections.rb D guides/code/getting_started/config/initializers/locale.rb D guides/code/getting_started/config/initializers/mime_types.rb D guides/code/getting_started/config/initializers/secret_token.rb D guides/code/getting_started/config/initializers/session_store.rb D guides/code/getting_started/config/initializers/wrap_parameters.rb D guides/code/getting_started/config/locales/en.yml D guides/code/getting_started/config/routes.rb D guides/code/getting_started/db/migrate/20130122042648_create_articles.rb D guides/code/getting_started/db/migrate/20130122045842_create_comments.rb D guides/code/getting_started/db/schema.rb D guides/code/getting_started/db/seeds.rb D guides/code/getting_started/lib/assets/.keep D guides/code/getting_started/lib/tasks/.keep D guides/code/getting_started/log/.keep D guides/code/getting_started/public/404.html D guides/code/getting_started/public/422.html D guides/code/getting_started/public/500.html D guides/code/getting_started/public/favicon.ico D guides/code/getting_started/public/robots.txt D guides/code/getting_started/test/controllers/.keep D guides/code/getting_started/test/controllers/articles_controller_test.rb D guides/code/getting_started/test/controllers/comments_controller_test.rb D guides/code/getting_started/test/controllers/welcome_controller_test.rb D guides/code/getting_started/test/fixtures/.keep D guides/code/getting_started/test/fixtures/articles.yml D guides/code/getting_started/test/fixtures/comments.yml D guides/code/getting_started/test/helpers/.keep D guides/code/getting_started/test/helpers/articles_helper_test.rb D guides/code/getting_started/test/helpers/comments_helper_test.rb D guides/code/getting_started/test/helpers/welcome_helper_test.rb D guides/code/getting_started/test/integration/.keep D guides/code/getting_started/test/mailers/.keep D guides/code/getting_started/test/models/.keep D guides/code/getting_started/test/models/article_test.rb D guides/code/getting_started/test/models/comment_test.rb D guides/code/getting_started/test/test_helper.rb D guides/code/getting_started/vendor/assets/javascripts/.keep D guides/code/getting_started/vendor/assets/stylesheets/.keep M guides/source/getting_started.md commit b31a576 refs/heads/master Merge: 34221cd fb48fcc Author: Eileen M. Uchitelle Date: 2014-06-14 10:18:02 -0400 Merge pull request #15724 from akshay-vishnoi/secure_password_docs [ci skip] Update #has_secure_password docs commit fb48fcc refs/heads/master Author: Akshay Vishnoi Date: 2014-06-14 19:18:24 +0530 [ci skip] Update #has_secure_password docs M activemodel/lib/active_model/secure_password.rb commit 2df1540 refs/heads/master Author: Sean Griffin Date: 2014-06-13 19:37:10 -0600 Deprecate `serialized_attributes` without replacement We've stopped using it internally, in favor of polymorphism. So should you! M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/test/cases/serialized_attribute_test.rb commit 513c69c refs/heads/master Author: Akshay Vishnoi Date: 2014-06-14 17:18:48 +0530 [ci skip] Use `an` for SQL M activerecord/CHANGELOG.md M activerecord/lib/active_record/sanitization.rb commit 889e65e refs/heads/master Author: Akshay Vishnoi Date: 2014-06-14 17:11:08 +0530 /mysql/i -> MySQL, Spell correct in continuation to #15555 M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/binary_test.rb M activerecord/test/cases/migration/column_attributes_test.rb M activerecord/test/cases/migration/logger_test.rb commit e3dca3a refs/heads/master Author: Marc Schütz Date: 2014-06-14 11:06:18 +0200 Add an option to skip installation of Turbolinks M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit c782641 refs/heads/master Author: Aditya Kapoor Date: 2014-06-14 15:22:09 +0530 remove unnecessary substitution for space in ActionView::Helpers#debug M actionview/lib/action_view/helpers/debug_helper.rb M actionview/test/template/debug_helper_test.rb commit 34221cd refs/heads/master Merge: eb87074 9bc9126 Author: Godfrey Chan Date: 2014-06-14 02:41:49 -0700 Merge pull request #15717 from akshay-vishnoi/test-cases Use `@existing_user` while updating existing user, fixing - ee4e86 commit dd1ec62 refs/heads/master Author: Godfrey Chan Date: 2014-06-14 02:18:36 -0700 Fixed a regression introduced in 84cf156 84cf156 (PR #15694) introduced a subtle regression. There are actually three distinct entry points to creating an AR object – via .new (i.e. #initialize), via #init_with (e.g. from YAML or database queries) and via .allocate. With the patch in 84cf156, attribute methods and respond_to? will not work correctly when objects are allocated directly, without going through either The reason this test case didn't catch the regression was that the `Topic` class is shared between test cases, so by the time this test case is ran the attribute methods are very likely to be defined. Switching to use a fresh anonymous class in the test to ensure we surface this problem in the future. M activerecord/lib/active_record/core.rb M activerecord/test/cases/attribute_methods_test.rb commit eb87074 refs/heads/master Author: Yves Senn Date: 2014-06-14 11:20:58 +0200 pg guide, use the term `database views` to be specific. [ci skip] M guides/source/active_record_postgresql.md commit 22e9a91 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-12 15:29:20 +0200 Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format ActiveRecord::Migration.maintain_test_schema! doesn't work with structure.sql Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb M railties/test/application/test_test.rb commit 9bc9126 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-14 14:42:52 +0530 Use `@existing_user` while updating existing user, fixing - #ee4e86 M activemodel/test/cases/secure_password_test.rb commit 534e1e1 refs/heads/master Merge: a041107 0da1c80 Author: Yves Senn Date: 2014-06-14 11:09:33 +0200 Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_test Avoid hard-coded value in test setup and teardown. commit fedb16a refs/heads/master Author: Aditya Kapoor Date: 2014-06-14 14:13:06 +0530 Add test cases for Hash#asset_valid_keys M activesupport/test/core_ext/hash_ext_test.rb commit 48d1185 refs/heads/master Author: Zuhao Wan Date: 2014-06-14 16:32:36 +0800 Clean up I18n stored translations after test. M actionview/test/template/form_helper_test.rb M actionview/test/template/render_test.rb M actionview/test/template/translation_helper_test.rb commit 0da1c80 refs/heads/master Author: Zuhao Wan Date: 2014-06-14 16:12:44 +0800 Avoid hard-coded value in test setup and teardown. M actionview/test/template/javascript_helper_test.rb commit a041107 refs/heads/master Merge: ee4e86f 0c58eb0 Author: Matthew Draper Date: 2014-06-14 17:29:04 +0930 Merge pull request #15710 from zuhao/refactor_actionview_digestor_test Make sure restoration always happen. commit 0c58eb0 refs/heads/master Author: Zuhao Wan Date: 2014-06-14 15:55:52 +0800 Make sure restoration always happen. M actionview/test/template/digestor_test.rb commit ee4e86f refs/heads/master Author: Godfrey Chan Date: 2014-06-14 00:39:43 -0700 Cleaned up the `has_secure_password` test cases * Grouped the valid test cases in one place * Make the length of the generated password obvious * Removed two wrong (copy-and-pasted) test cases M activemodel/test/cases/secure_password_test.rb commit c085078 refs/heads/master Author: Zuhao Wan Date: 2014-06-14 15:42:51 +0800 Move cleanup into teardown, delete obsolete code. M actionview/test/template/compiled_templates_test.rb commit c416bb87 refs/heads/master Author: Godfrey Chan Date: 2014-06-14 00:32:31 -0700 Added changelog for #15708 [ci skip] M activemodel/CHANGELOG.md commit 6fa7726 refs/heads/master Merge: cf67031 cabbc8f Author: Godfrey Chan Date: 2014-06-14 00:29:30 -0700 Merge pull request #15708 from akshay-vishnoi/secure_password SecurePassword - Validate password must be less than or equal to 72 commit cabbc8f refs/heads/master Author: Akshay Vishnoi Date: 2014-06-14 12:35:31 +0530 SecurePassword - Validate password must be less than or equal to 72 See #14591, Reason - BCrypt hash function can handle maximum 72 characters. M activemodel/lib/active_model/secure_password.rb M activemodel/test/cases/secure_password_test.rb commit 1c2f521 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-06-14 15:04:34 +0930 Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6 Fixes #15705. Conflicts: activerecord/lib/active_record/connection_adapters/connection_specification.rb activerecord/test/cases/connection_adapters/connection_handler_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 98237e5 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-06-14 15:04:34 +0930 Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6 Fixes #15705. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit cf67031 refs/heads/master Author: Matthew Draper Date: 2014-06-14 15:04:34 +0930 Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6 Fixes #15705. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb commit 7244e57 refs/heads/master Merge: c0ba022 f61d975 Author: Rafael Mendonça França Date: 2014-06-13 20:09:45 -0300 Merge pull request #15702 from sgrif/sg-rm-serialized Remove `serialized?` from the type interface commit 8a3895b refs/tags/v4.0.6.rc2 Author: Rafael Mendonça França Date: 2014-06-13 19:34:20 -0300 Merge pull request #15701 from zzak/issue_15496 Open extension point for defining options in build_through_record M activerecord/lib/active_record/associations/has_many_through_association.rb commit 277be1e refs/tags/v4.1.2.rc2 Author: Rafael Mendonça França Date: 2014-06-13 19:34:20 -0300 Merge pull request #15701 from zzak/issue_15496 Open extension point for defining options in build_through_record M activerecord/lib/active_record/associations/has_many_through_association.rb commit cda64c8 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-13 19:56:01 -0300 Merge pull request #15660 from larrylv/fix-mount-at-root-path Fix request's path_info when a rack app mounted at '/'. Conflicts: actionpack/lib/action_dispatch/journey/router.rb M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/dispatch/mount_test.rb commit f61d975 refs/heads/master Author: Sean Griffin Date: 2014-06-13 17:04:04 -0600 Remove `serialized?` from the type interface M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/serializers/xml_serializer.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb commit c0ba022 refs/heads/master Merge: 9f0cd30 4a9d4c8 Author: Rafael Mendonça França Date: 2014-06-13 19:56:01 -0300 Merge pull request #15660 from larrylv/fix-mount-at-root-path Fix request's path_info when a rack app mounted at '/'. commit d0e7f33 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-13 19:34:20 -0300 Merge pull request #15701 from zzak/issue_15496 Open extension point for defining options in build_through_record M activerecord/lib/active_record/associations/has_many_through_association.rb commit 1772fb6 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-13 19:34:20 -0300 Merge pull request #15701 from zzak/issue_15496 Open extension point for defining options in build_through_record M activerecord/lib/active_record/associations/has_many_through_association.rb commit 9f0cd30 refs/heads/master Merge: 2324495 7154899 Author: Rafael Mendonça França Date: 2014-06-13 19:34:20 -0300 Merge pull request #15701 from zzak/issue_15496 Open extension point for defining options in build_through_record commit 2324495 refs/heads/master Merge: bcb0b99 84cf156 Author: Rafael Mendonça França Date: 2014-06-13 19:33:24 -0300 Merge pull request #15694 from sgrif/sg-method-missing Remove unused `method_missing` definition commit 7154899 refs/heads/master Author: Zachary Scott Date: 2014-06-13 15:30:40 -0700 Open extension point for defining options in build_through_record This fixes #15496 M activerecord/lib/active_record/associations/has_many_through_association.rb commit c361123 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-06-14 07:07:11 +0930 Merge pull request #15699 from sgrif/sg-4-1-custom-types User defined types should not raise an error Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb A activerecord/test/cases/adapters/postgresql/custom_domain_test.rb commit bcb0b99 refs/heads/master Merge: 4c0a102 bb5c132 Author: Rafael Mendonça França Date: 2014-06-13 18:40:29 -0300 Merge pull request #15679 from akshay-vishnoi/test-cases Add missing test cases for #assert_no_difference commit a288afa refs/remotes/origin/4-1-stable Merge: 8133c03 b1cae73 Author: Matthew Draper Date: 2014-06-14 07:07:11 +0930 Merge pull request #15699 from sgrif/sg-4-1-custom-types User defined types should not raise an error commit b1cae73 refs/remotes/origin/4-1-stable Author: Sean Griffin Date: 2014-06-13 15:11:49 -0600 User defined types should not raise an error Fixes #15697 on 4-1-stable. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb A activerecord/test/cases/adapters/postgresql/custom_domain_test.rb commit 8133c03 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-13 18:19:18 -0300 Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_of prevent bad automatic inverse_of association M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/associations/inverse_associations_test.rb M activerecord/test/models/face.rb M activerecord/test/models/man.rb M activerecord/test/schema/schema.rb commit 4c0a102 refs/heads/master Merge: c28e436 9feadc1 Author: Rafael Mendonça França Date: 2014-06-13 18:19:18 -0300 Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_of prevent bad automatic inverse_of association commit 7545b27 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-06-14 05:53:45 +0930 Merge pull request #15692 from sromano/falseClass ActionController::Parameters#require now accepts FalseClass values Conflicts: actionpack/test/controller/required_params_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/required_params_test.rb commit c7d93fb refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-06-14 05:53:45 +0930 Merge pull request #15692 from sromano/falseClass ActionController::Parameters#require now accepts FalseClass values M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/required_params_test.rb commit c28e436 refs/heads/master Merge: b0f07ab 19af434 Author: Matthew Draper Date: 2014-06-14 06:29:10 +0930 Merge pull request #15693 from pdg137/enforce_utf8 In actionview, eliminate calls to tag that use html_safe parameter values. commit 4a9d4c8 refs/heads/master Author: Larry Lv Date: 2014-06-12 14:15:29 +0800 Fix request's path_info when a rack app mounted at '/'. Fixes issue #15511. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/dispatch/mount_test.rb commit 24adeff refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-13 17:45:51 -0300 Merge pull request #15579 from sgrif/sg-through-associations Through associations should set both parent ids on join models Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/associations/through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/associations/has_one_through_associations_test.rb commit b0f07ab refs/heads/master Merge: 497def8 0a4e3f4 Author: Rafael Mendonça França Date: 2014-06-13 17:45:51 -0300 Merge pull request #15579 from sgrif/sg-through-associations Through associations should set both parent ids on join models commit 497def8 refs/heads/master Merge: 49fee3d 540d153 Author: Matthew Draper Date: 2014-06-14 05:53:45 +0930 Merge pull request #15692 from sromano/falseClass ActionController::Parameters#require now accepts FalseClass values commit 0a4e3f4 refs/heads/master Author: Sean Griffin Date: 2014-06-08 16:04:03 -0600 Through associations should set both parent ids on join models member = Member.new(club: Club.new) member.save! Before: member.current_membership.club_id # => nil After: member.current_membership.club_id # => club's id M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/associations/through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/associations/has_one_through_associations_test.rb commit 49fee3d refs/heads/master Merge: 1dcb8e9 4bf8ffc Author: Matthew Draper Date: 2014-06-14 05:51:13 +0930 Merge pull request #15674 from sgrif/sg-mutable-attributes Detect in-place changes on mutable AR attributes commit 4bf8ffc refs/heads/master Author: Sean Griffin Date: 2014-06-12 15:13:28 -0600 Detect in-place changes on mutable AR attributes We have several mutable types on Active Record now. (Serialized, JSON, HStore). We need to be able to detect if these have been modified in place. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb M activerecord/lib/active_record/type.rb A activerecord/lib/active_record/type/mutable.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/dirty_test.rb commit 1dcb8e9 refs/heads/master Merge: 1e45fbc ea6f28c Author: Rafael Mendonça França Date: 2014-06-13 17:02:52 -0300 Merge pull request #15695 from sgrif/sg-rm-column-types-override Remove unused column types override commit 84cf156 refs/heads/master Author: Sean Griffin Date: 2014-06-13 13:29:05 -0600 Remove unused `method_missing` definition We always define attribute methods in the constructor or in `init_with`. M activerecord/lib/active_record/attribute_methods.rb commit 1e45fbc refs/heads/master Merge: f5ae87f 0c9287d Author: Rafael Mendonça França Date: 2014-06-13 17:00:55 -0300 Merge pull request #15696 from sgrif/sg-bad-test Reorder test which does not represent real world usage commit f5ae87f refs/heads/master Author: Zachary Scott Date: 2014-06-13 13:00:13 -0700 s/variable supplied/value supplied [ci skip] M activerecord/lib/active_record/errors.rb commit 0ece596 refs/heads/master Author: Zachary Scott Date: 2014-06-13 12:58:03 -0700 Reword PreparedStatementInvalid example, and use values instead of variables [ci skip] Thanks to @matthewd for the excellent feedback! :heart: M activerecord/lib/active_record/errors.rb commit 19af434 refs/heads/master Author: Paul Grayson Date: 2014-06-13 11:08:11 -0700 In actionview, eliminate calls to tag that use html_safe parameter values. This is generally unnecessary, since tag handles string quoting, except in one case (utf8_enforcer_tag) where we want to specify the encoding ourselves. M actionview/lib/action_view/helpers/form_tag_helper.rb M actionview/lib/action_view/helpers/tags/text_field.rb M actionview/lib/action_view/helpers/url_helper.rb commit 0c9287d refs/heads/master Author: Sean Griffin Date: 2014-06-13 13:50:24 -0600 Reorder test which does not represent real world usage We don't generally modify our classes at runtime like this. Let's create the instance after the class is created. Original commit doesn't imply that this was intentional behavior. M activerecord/test/cases/attribute_methods_test.rb commit 41c8cc6 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-13 16:47:15 -0300 Revert code changes at "Copy edits and code font wrap for Active Record [ci skip]" This partially reverts commit 1a203d5e07f639332880099fab610b886b1742fc. Reason: It was committed by accident M activerecord/lib/active_record/fixtures.rb commit ea6f28c refs/heads/master Author: Sean Griffin Date: 2014-06-10 11:17:09 -0600 Remove unused column types override M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/persistence.rb commit 4e1da58 refs/heads/master Merge: 584498a 1ed19fc Author: Zachary Scott Date: 2014-06-13 12:31:35 -0700 Merge pull request #15306 from rails/4-2-release_notes Rails 4.2 release notes [ci skip] commit 1ed19fc refs/heads/master Author: Godfrey Chan Date: 2014-06-06 18:44:30 -0700 First pass at Rails 4.2 release notes [ci skip] M guides/source/4_2_release_notes.md commit 584498a refs/heads/master Merge: e61e1b3 6ea1481 Author: Matthew Draper Date: 2014-06-14 04:46:05 +0930 Merge pull request #15689 from sgrif/sg-attribute-methods Ensure we always define attribute methods commit 88421bd refs/heads/master Author: Zachary Scott Date: 2014-05-24 14:03:53 -0700 Create 4.2 release notes guide scaffold [ci skip] Point to future 4-2-stable branch for detailed changes. [ci skip] Sync Active Support changelogs with release notes [ci skip] 4.2 Release Notes is a work in progress [ci skip] Assorted fixes for AS release notes [ci skip] * `Hash#deep_transform_keys` has already been backported * Mentioning `ActiveSupport::SafeBuffer#prepend` in the "Deprecations" section would be enough * Fix syntax in `Kernel#concern` example Sync AS release notes with the latest commits [ci skip] Synced 4.2 release notes with commits in railties [ci skip] Sync AP Deprecations and Notable changes from CHANGELOG [ci skip] Removed 4.2 release notes from the index [ci skip] This deprecation was reverted in 489a8f2 [ci skip] Synced Active Record changelogs for 4.2 release notes [ci skip] Synced Active Model changelog with the release notes [ci skip] Added cc26b6b as a 'Removal' item in AP release notes [ci skip] Use 'character' instead of 'symbol' to avoid confusion [ci skip] Edit pass on 4.2 release notes [ci skip] :memo: :lipstick: Use `.xyz` and `#xyz` appropiately [ci skip] A guides/source/4_2_release_notes.md M guides/source/upgrading_ruby_on_rails.md commit e61e1b3 refs/heads/master Merge: cc255d3 6f08db0 Author: Rafael Mendonça França Date: 2014-06-13 15:45:49 -0300 Merge pull request #15593 from sgrif/sg-attribute Introduce an Attribute object to handle the type casting dance commit cc255d3 refs/heads/master Author: Zachary Scott Date: 2014-06-13 11:38:02 -0700 Copy edits from e0f3f1a [ci skip] - image_tag is an instance method - explain possible results when asset pipeline is used M guides/source/api_documentation_guidelines.md commit 1a203d5 refs/heads/master Author: Zachary Scott Date: 2014-06-13 11:06:05 -0700 Copy edits and code font wrap for Active Record [ci skip] M activerecord/lib/active_record/errors.rb M activerecord/lib/active_record/fixtures.rb commit 540d153 refs/heads/master Author: Sergio Romano Date: 2014-06-13 14:42:38 -0300 ActionController::Parameters#require now accepts FalseClass values Fixes #15685. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/required_params_test.rb commit e0f3f1a refs/heads/master Author: Zachary Scott Date: 2014-06-13 10:40:09 -0700 Document behavior concerns regarding the full Rails stack [ci skip] Related to a discussion on #15508 M guides/source/api_documentation_guidelines.md commit 6071d62 refs/heads/master Merge: 1ecc010 8a1468e Author: Arthur Nogueira Neves Date: 2014-06-13 12:21:46 -0500 Merge pull request #15690 from deeeki/activemodel_model_doc [ci skip] Clarify ActiveModel::Model docs commit 8a1468e refs/heads/master Author: deeeki Date: 2014-06-14 01:56:55 +0900 [ci skip] Clarify ActiveModel::Model docs ActiveModel attributes initialized with String return String values M activemodel/lib/active_model/model.rb commit 1ecc010 refs/heads/master Author: Zachary Scott Date: 2014-06-13 10:12:20 -0700 Builder source code is still available on github [ci skip] This was also removed from #15542 M actionview/lib/action_view/base.rb commit f12d636 refs/heads/master Author: Zachary Scott Date: 2014-06-13 10:10:43 -0700 Add links to RDoc back into API documentation guidelines [ci skip] These were removed from #15542 unfortunately :( M guides/source/api_documentation_guidelines.md commit faf0a93 refs/heads/master Author: Zachary Scott Date: 2014-06-13 09:55:00 -0700 Specifically talking about Rake the library [ci skip] M activerecord/lib/active_record/tasks/database_tasks.rb commit 6ea1481 refs/heads/master Author: Sean Griffin Date: 2014-06-13 10:52:39 -0600 Ensure we always define attribute methods M activerecord/lib/active_record/core.rb M activerecord/test/cases/serialization_test.rb commit 6f08db0 refs/heads/master Author: Sean Griffin Date: 2014-06-07 13:46:22 -0600 Introduce an Attribute object to handle the type casting dance There's a lot more that can be moved to these, but this felt like a good place to introduce the object. Plans are: - Remove all knowledge of type casting from the columns, beyond a reference to the cast_type - Move type_cast_for_database to these objects - Potentially make them mutable, introduce a state machine, and have dirty checking handled here as well - Move `attribute`, `decorate_attribute`, and anything else that modifies types to mess with this object, not the columns hash - Introduce a collection object to manage these, reduce allocations, and not require serializing the types M activerecord/lib/active_record.rb A activerecord/lib/active_record/attribute.rb M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/before_type_cast.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/bytea.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/result.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb A activerecord/test/cases/attribute_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/persistence_test.rb M activerecord/test/cases/serialized_attribute_test.rb M activerecord/test/cases/store_test.rb commit b9efc57 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-06-13 23:47:21 +0930 Merge pull request #15683 from larrylv/fix-token-with-empty-value Fix parsed token value with header `Authorization token=`. Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_token_authentication_test.rb commit 60d0aec refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-06-13 23:47:21 +0930 Merge pull request #15683 from larrylv/fix-token-with-empty-value Fix parsed token value with header `Authorization token=`. Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_token_authentication_test.rb commit 0bfdf40 refs/heads/master Merge: b71d46a be46586 Author: Rafael Mendonça França Date: 2014-06-13 11:24:03 -0300 Merge pull request #15682 from tgxworld/controller_test_process Set flash in test session when necessary. commit b71d46a refs/heads/master Merge: 1c41d3b fdb1059 Author: Matthew Draper Date: 2014-06-13 23:47:21 +0930 Merge pull request #15683 from larrylv/fix-token-with-empty-value Fix parsed token value with header `Authorization token=`. commit 1c41d3b refs/heads/master Merge: 9a0c2e5 d569d0b Author: Rafael Mendonça França Date: 2014-06-13 10:54:30 -0300 Merge pull request #15686 from sgrif/sg-pg-int-arrays PG arrays should type cast user input commit 3ea9cae refs/remotes/origin/4-1-stable Merge: 4b128f9 d043f91 Author: Rafael Mendonça França Date: 2014-06-13 10:20:46 -0300 Merge pull request #15675 from sgrif/sg-4-1-id-perf Fix performance regression on preloading HABTM associations commit d569d0b refs/heads/master Author: Sean Griffin Date: 2014-06-13 07:16:15 -0600 PG arrays should type cast user input We guarantee that `model.value` does not change after `model.save && model.reload`. This requires type casting user input for non-string types. M activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit fdb1059 refs/heads/master Author: Larry Lv Date: 2014-06-13 14:19:53 +0800 Fix parsed token value with header `Authorization token=`. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_token_authentication_test.rb commit 9a0c2e5 refs/heads/master Author: Yves Senn Date: 2014-06-06 16:50:10 +0200 pg guide, minor copy edits M guides/source/active_record_postgresql.md commit 4b128f9 refs/remotes/origin/4-1-stable Author: Guillermo Iguaran Date: 2014-06-13 02:23:16 -0500 Set the status before of setting the response body The 401 status should be set first because setting the response body in a live controller also closes the response to further changes. Fixes #14229. M actionpack/lib/action_controller/metal/http_authentication.rb commit c1c32ae refs/remotes/origin/4-0-stable Author: Guillermo Iguaran Date: 2014-06-13 02:23:16 -0500 Set the status before of setting the response body The 401 status should be set first because setting the response body in a live controller also closes the response to further changes. Fixes #14229. M actionpack/lib/action_controller/metal/http_authentication.rb commit a62001c refs/heads/master Author: Guillermo Iguaran Date: 2014-06-13 02:23:16 -0500 Set the status before of setting the response body The 401 status should be set first because setting the response body in a live controller also closes the response to further changes. Fixes #14229. M actionpack/lib/action_controller/metal/http_authentication.rb commit be46586 refs/heads/master Author: Guo Xiang Tan Date: 2014-06-12 20:48:21 -0700 Set flash in test session when necessary. `to_session_value` returns nil when empty. M actionpack/lib/action_controller/test_case.rb commit d6bb789 refs/heads/master Merge: b4b3228 7a979b2 Author: Sean Griffin Date: 2014-06-12 19:49:04 -0600 Merge pull request #15680 from akshay-vishnoi/doc_changes [ci skip] BigDecimal#duplicable? returns false in 1.9.x commit 7a979b2 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-13 07:12:26 +0530 [ci skip] BigDecimal#duplicable? returns false in 1.9.x M activesupport/lib/active_support/core_ext/object/duplicable.rb commit bb5c132 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-13 06:52:58 +0530 Add missing test cases for #assert_no_difference M activesupport/test/test_test.rb commit b4b3228 refs/heads/master Merge: 7eb110f 150f1c8 Author: Matthew Draper Date: 2014-06-13 10:11:54 +0930 Merge pull request #15678 from sgrif/sg-test-hash Add a test to ensure we don't get a performance regression on #hash commit 150f1c8 refs/heads/master Author: Sean Griffin Date: 2014-06-12 18:36:55 -0600 Add a test to ensure we don't get a performance regression on #hash M activerecord/test/cases/base_test.rb commit 7eb110f refs/heads/master Merge: 86bbfbc 607e335 Author: Matthew Draper Date: 2014-06-13 09:59:56 +0930 Merge pull request #15677 from sgrif/sg-less-imperative-pk Use a conditional rather than early return in `id` commit 86bbfbc refs/heads/master Merge: 1cec61f 930c330 Author: Matthew Draper Date: 2014-06-13 09:59:32 +0930 Merge pull request #15676 from sgrif/sg-object-hash Defer to super, rather than re-implementing Object#hash commit 607e335 refs/heads/master Author: Sean Griffin Date: 2014-06-12 18:21:01 -0600 Use a conditional rather than early return in `id` M activerecord/lib/active_record/attribute_methods/primary_key.rb commit 930c330 refs/heads/master Author: Sean Griffin Date: 2014-06-12 18:15:11 -0600 Defer to super, rather than re-implementing Object#hash M activerecord/lib/active_record/core.rb commit 1cec61f refs/heads/master Merge: 6857415 d82dafe Author: Sean Griffin Date: 2014-06-12 17:43:41 -0600 Merge pull request #15665 from sgrif/sg-id-perf Fix performance regression on preloading HABTM associations commit d043f91 refs/remotes/origin/4-1-stable Author: Sean Griffin Date: 2014-06-12 09:00:03 -0600 Fix performance regression on preloading HABTM associations We'd spend a lot of time calling `hash` and `eql?` on the join model, which has no primary key. Calling `id` with no primary key is a really slow way to get back `nil`, so we can improve the performance there. However, even with the escape clause, we *still* weren't getting high enough performance, as we were checking the primary key too much. `hash` will always return `nil.hash` for records with no id, and `==` will always return `false`. We can optimize those cases in the HABTM join model. M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/lib/active_record/attribute_methods/primary_key.rb commit d82dafe refs/heads/master Author: Sean Griffin Date: 2014-06-12 09:00:03 -0600 Fix performance regression on preloading HABTM associations We'd spend a lot of time calling `hash` and `eql?` on the join model, which has no primary key. Calling `id` with no primary key is a really slow way to get back `nil`, so we can improve the performance there. However, even with the escape clause, we *still* weren't getting high enough performance, as we were checking the primary key too much. `hash` will always return `nil.hash` for records with no id, and `==` will always return `false`. We can optimize those cases in the HABTM join model. M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/lib/active_record/core.rb commit 6857415 refs/heads/master Merge: 4e009ee bcab3f2 Author: Matthew Draper Date: 2014-06-13 08:45:23 +0930 Merge pull request #15654 from pdg137/master In tag helper, honor html_safe on arrays; also make safe_join more similar to Array.join commit 4e009ee refs/heads/master Merge: ae1b451 fd984e8 Author: Sean Griffin Date: 2014-06-12 17:04:00 -0600 Merge pull request #15667 from samdec/mailer_doc_bug_fix fix bug in email with name example code commit ae1b451 refs/heads/master Merge: 8a30461 48af90f Author: Sean Griffin Date: 2014-06-12 17:00:31 -0600 Merge pull request #15666 from akshay-vishnoi/doc_changes Correct output of #assert_not commit 8a30461 refs/heads/master Merge: d7f780c 8019ca7 Author: Matthew Draper Date: 2014-06-13 08:10:08 +0930 Merge pull request #15672 from sgrif/sg-topics-content Update test data which doesn't reflect expected usage commit bcab3f2 refs/heads/master Author: Paul Grayson Date: 2014-06-10 17:33:34 -0700 In tag helper, honor html_safe on array parameters; also make safe_join more similar to Array.join by first calling flatten. M actionview/lib/action_view/helpers/output_safety_helper.rb M actionview/lib/action_view/helpers/tag_helper.rb M actionview/test/template/output_safety_helper_test.rb M actionview/test/template/tag_helper_test.rb commit 8019ca7 refs/heads/master Author: Sean Griffin Date: 2014-06-12 15:33:25 -0600 Update test data which doesn't reflect expected usage Topics call `serialize :content`, which means that the values in the database should be YAML encoded, and we would only expect to receive YAML strings to `update_column` and `update_columns`. M activerecord/test/cases/persistence_test.rb M activerecord/test/fixtures/topics.yml commit d7f780c refs/heads/master Author: Aaron Patterson Date: 2014-06-12 11:22:38 -0700 only check named_host? once in normalize_host M actionpack/lib/action_dispatch/http/url.rb commit 48af90f refs/heads/master Author: Akshay Vishnoi Date: 2014-06-12 22:46:39 +0530 [ci skip] Correct output of #assert_not M activesupport/lib/active_support/testing/assertions.rb commit 977a2f3 refs/heads/master Author: Aaron Patterson Date: 2014-06-12 10:10:31 -0700 lookup subdomain from the options hash once, defaulting to true if the subdomain wasn't specified, it's the same as if specifying :subdomain as `true`, so we can default the value to `true` safely. M actionpack/lib/action_dispatch/http/url.rb commit 160f56c refs/heads/master Author: Aaron Patterson Date: 2014-06-12 10:05:26 -0700 only extract domain from the options hash once M actionpack/lib/action_dispatch/http/url.rb commit 21c6261 refs/heads/master Author: Aaron Patterson Date: 2014-06-12 10:01:35 -0700 reduce calls to `named_host?` `normalize_host` already calls `named_host?`, so there is no reason to test `named_host?` again in the `extract_domain` method. M actionpack/lib/action_dispatch/http/url.rb commit caf1bfc refs/heads/master Author: Aaron Patterson Date: 2014-06-12 09:19:49 -0700 use Ruby for mocking M actionpack/test/controller/url_for_test.rb commit 46139d3 refs/heads/master Merge: 8f24787 ad42aae Author: Yves Senn Date: 2014-06-12 15:29:20 +0200 Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format ActiveRecord::Migration.maintain_test_schema! doesn't work with structure.sql Conflicts: activerecord/CHANGELOG.md commit 8f24787 refs/heads/master Merge: 2a7580e a1dbb4e Author: Yves Senn Date: 2014-06-12 14:06:59 +0200 Merge pull request #15590 from zuhao/refactor_actionview_register_template_handler Add unregister_template_handler to prevent leaks. Conflicts: actionview/CHANGELOG.md commit add626e refs/heads/master Merge: 4ac8dc2 68f25a4 Author: David Heinemeier Hansson Date: 2014-06-12 13:43:49 +0200 Merge pull request #78 from cristianbica/master Persist JOB-ID commit 68f25a4 refs/heads/master Author: Cristian Bica Date: 2014-06-12 14:30:53 +0300 Fixed failing test M test/cases/rescue_test.rb commit ad42aae refs/heads/master Author: Wojciech Wnętrzak Date: 2014-06-01 17:41:04 +0200 Fixed automatic maintaining test schema to properly handle sql structure schema format. Additionally: * It changes `purge` task on `sqlite3` adapter to recreate database file, to be consistent with other adapters. * Adds `purge` step when loading from `schema.rb` M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb M railties/test/application/test_test.rb commit 243d74e refs/heads/master Author: Cristian Bica Date: 2014-05-31 02:19:30 +0300 Persist job_id M lib/active_job/enqueuing.rb M lib/active_job/execution.rb M lib/active_job/logging.rb M lib/active_job/queue_adapters/resque_adapter.rb A lib/activejob.rb M test/cases/callbacks_test.rb M test/cases/logging_test.rb M test/cases/rescue_test.rb commit a1dbb4e refs/heads/master Author: Zuhao Wan Date: 2014-06-09 22:45:46 +0800 Add unregister_template_handler to prevent leaks. M actionmailer/test/abstract_unit.rb M actionview/CHANGELOG.md M actionview/lib/action_view/template/handlers.rb M actionview/test/actionpack/controller/layout_test.rb A actionview/test/support/template_handler_helper.rb M actionview/test/template/dependency_tracker_test.rb M actionview/test/template/render_test.rb commit 4ac8dc2 refs/heads/master Merge: 4eae97a c0f5b73 Author: David Heinemeier Hansson Date: 2014-06-12 12:20:39 +0200 Merge pull request #83 from DouweM/patch-8 Clean up Arguments somewhat commit 4eae97a refs/heads/master Merge: 62c5ea5 da6a86f Author: David Heinemeier Hansson Date: 2014-06-12 12:11:36 +0200 Merge pull request #85 from DouweM/queue_name Have .queue_as only set queue name for job in question. commit 62c5ea5 refs/heads/master Merge: 694b562 b36d4da Author: David Heinemeier Hansson Date: 2014-06-12 11:50:52 +0200 Merge pull request #86 from cristianbica/qu_adapter Implemented :qu adapter commit b36d4da refs/heads/master Author: Cristian Bica Date: 2014-06-12 11:14:42 +0300 Implemented :qu adapter M Gemfile M Gemfile.lock M README.md M Rakefile A lib/active_job/queue_adapters/qu_adapter.rb A test/adapters/qu.rb M test/cases/adapter_test.rb commit 2a7580e refs/heads/master Merge: 5f9a2be 26ef4fc Author: Yves Senn Date: 2014-06-12 08:56:27 +0200 Merge pull request #15662 from JuanitoFatas/patch/remove-warning Removed variable shawdowing warning in actionpack url.rb commit 26ef4fc refs/heads/master Author: Juanito Fatas Date: 2014-06-12 14:45:37 +0800 Removed warning actionpack url.rb Before: /Users/Juan/dev/rails/actionpack/lib/action_dispatch/http/url.rb:95: warning: shadowing outer local variable - port After: No warning M actionpack/lib/action_dispatch/http/url.rb commit 5f9a2be refs/heads/master Merge: 119dddb 4b4f5f2 Author: Yves Senn Date: 2014-06-12 08:34:11 +0200 Merge pull request #15647 from sgrif/sg-unused-require Remove unused require commit 119dddb refs/heads/master Merge: 2ef44ff f374720 Author: Yves Senn Date: 2014-06-12 08:29:51 +0200 Merge pull request #15655 from fabianrbz/remove-unused-method-in-test remove unnused method from test commit fd984e8 refs/heads/master Author: Sam DeCesare Date: 2014-06-11 17:41:06 -0700 fix bug in email with name example code The display name in the email "to" field needs to be quoted otherwise your email-sending service will fail when trying to deliver mail to user's with commas in their name (i.e. John Smith, M.D.). M guides/source/action_mailer_basics.md commit 2ef44ff refs/heads/master Merge: 6e44fd5 c43abb1 Author: Zachary Scott Date: 2014-06-11 17:21:14 -0700 Merge pull request #15657 from JohnRiv/guides_asset_pipeline_local [ci skip] There are 3 caveats to Local Precompilation including 1 config change commit 6e44fd5 refs/heads/master Merge: df3c782 53d05d5 Author: Zachary Scott Date: 2014-06-11 17:20:17 -0700 Merge pull request #15656 from JohnRiv/guides_asset_pipeline_precompiling [ci skip] Updating argument names in default matcher for compiling files commit f374720 refs/heads/master Author: Fabian Rodriguez Date: 2014-06-08 15:23:18 -0300 remove unnused method from test M railties/test/rails_info_test.rb commit df3c782 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 15:32:52 -0700 remove useless to_param call extract_subdomain always returns a string, and to_param calls to_s on a string M actionpack/lib/action_dispatch/http/url.rb commit ba1c685 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 15:30:12 -0700 only look up the subdomain once M actionpack/lib/action_dispatch/http/url.rb commit 3327dd4 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 15:28:04 -0700 scheme should contain one or more characters M actionpack/lib/action_dispatch/http/url.rb commit a64914d refs/heads/master Author: Aaron Patterson Date: 2014-06-11 15:01:30 -0700 pull the port out of the options hash once M actionpack/lib/action_dispatch/http/url.rb commit c43abb1 refs/heads/master Author: John Riviello Date: 2014-06-11 17:47:13 -0400 There are 3 caveats to Local Precompilation including 1 config change not 2 caveats with one of them being 2 config changes [ci skip] M guides/source/asset_pipeline.md commit ed37698 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 14:40:45 -0700 remove useless nil check irb(main):004:0> /foo/ !~ nil => true irb(main):005:0> /foo/ !~ 'bar' => true irb(main):006:0> /foo/ !~ 'foo' => false M actionpack/lib/action_dispatch/http/url.rb commit 53d05d5 refs/heads/master Author: John Riviello Date: 2014-06-11 17:39:35 -0400 Updating argument names in default matcher for compiling files to match arguments used in sprockets-rails [ci skip] M guides/source/asset_pipeline.md commit 3aabac5 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 14:32:18 -0700 these methods are always called with a tld_parameter remove the default parameter since the methods are always called with a parameter M actionpack/lib/action_dispatch/http/url.rb commit 5a7b187 refs/remotes/origin/4-1-stable Merge: c6d8ccb 0ef8a24 Author: Rafael Mendonça França Date: 2014-06-11 18:14:12 -0300 Merge pull request #15653 from sgrif/sg-pluck-columns-4-1-stable Pluck should work with columns of the same name from different tables commit 1ed2c3c refs/heads/master Merge: 1b14bff fef044c Author: Rafael Mendonça França Date: 2014-06-11 18:13:50 -0300 Merge pull request #15652 from sgrif/pluck-multiple-named-columns Pluck should work with columns of the same name from different tables commit fef044c refs/heads/master Author: Sean Griffin Date: 2014-06-11 14:32:00 -0600 Pluck should work with columns of the same name from different tables The column name given by the adapter doesn't include the table namespace, so going through the hashed version of the result set causes overridden keys. Fixes #15649 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 0ef8a24 refs/remotes/origin/4-1-stable Author: Sean Griffin Date: 2014-06-11 14:32:00 -0600 Pluck should work with columns of the same name from different tables The column name given by the adapter doesn't include the table namespace, so going through the hashed version of the result set causes overridden keys. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 1b14bff refs/heads/master Author: Aaron Patterson Date: 2014-06-11 13:55:46 -0700 rm `same_host?`. The same conditional is two lines down. M actionpack/lib/action_dispatch/http/url.rb commit 3654f1b refs/heads/master Author: Aaron Patterson Date: 2014-06-11 14:05:04 -0700 Revert "rm `same_host?`. The same conditional is two lines down." This reverts commit 79469b4b0c05a50e19699bc9b568042add2d4987. M actionpack/lib/action_dispatch/http/url.rb commit 79469b4 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 13:55:46 -0700 rm `same_host?`. The same conditional is two lines down. M actionpack/lib/action_dispatch/http/url.rb commit 15c2a5b refs/heads/master Author: Rafael Mendonça França Date: 2014-06-11 17:10:26 -0300 Revert "remove unnecssary require of `to_param`, as `to_query` is already require `to_param`" Revert "No need to require to_param, it is already required in to_query.rb" This reverts commits ccdd97662e1fb00c23c90d59f65c091904959561 and d697ee14264a90a39cdbe87857656d8b314ac9b7. Reason by @jeremy: These requires are not for implementation dependency. They ensure that requiring array conversions provides to_query, to_param, and other array conversion behaviors. The fact that to_query is implemented in terms of to_param is just a coincidence. If to_query removed its to_param require, then someone requiring array conversions would no longer have to_param available. This change removes these intentional dependencies on to_param in favor of implementation side effects—an undesirable move that's susceptible to regression. M activesupport/lib/active_support/core_ext/array/conversions.rb M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/lib/active_support/core_ext/object.rb M activesupport/lib/active_support/core_ext/object/conversions.rb commit 168dc19 refs/heads/master Merge: e7580db d697ee1 Author: Rafael Mendonça França Date: 2014-06-11 16:43:49 -0300 Merge pull request #15650 from kuldeepaggarwal/remove-unecessary-require remove unnecssary require of `to_param`, as `to_query` is already require `to_param` commit d697ee1 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-12 01:00:45 +0530 remove unnecssary require of `to_param`, as `to_query` is already require `to_param` M activesupport/lib/active_support/core_ext/array/conversions.rb M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/lib/active_support/core_ext/object.rb commit e7580db refs/heads/master Merge: 85ba47e fca73ee Author: Rafael Mendonça França Date: 2014-06-11 16:02:59 -0300 Merge pull request #15648 from kuldeepaggarwal/fix-warnings remove warnings commit fca73ee refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-12 00:27:58 +0530 remove warnings warning: assigned but unused variable - scope_called, path and strexp M actionpack/test/controller/routing_test.rb M actionpack/test/journey/router_test.rb commit 85ba47e refs/heads/master Author: Aaron Patterson Date: 2014-06-11 11:48:39 -0700 cache host on the stack so we only look it up once M actionpack/lib/action_dispatch/http/url.rb commit ec1cadd refs/heads/master Author: Aaron Patterson Date: 2014-06-11 11:42:49 -0700 only pull :protocol from the options hash once M actionpack/lib/action_dispatch/http/url.rb commit aaaff36 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 11:36:50 -0700 cache protocol on the stack to reduce options hash lookups M actionpack/lib/action_dispatch/http/url.rb commit 4b4f5f2 refs/heads/master Author: Sean Griffin Date: 2014-06-11 12:34:01 -0600 Remove unused require We're not longer using `ipaddr` in schema dumper M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb commit 1c432d1 refs/heads/master Author: Aaron Patterson Date: 2014-06-11 11:33:22 -0700 eliminate nil checks in normalize_port M actionpack/lib/action_dispatch/http/url.rb commit a6f30be refs/heads/master Author: Aaron Patterson Date: 2014-06-11 11:27:07 -0700 reduce hash lookups and disconnect normalize_port from the options hash M actionpack/lib/action_dispatch/http/url.rb commit eec571f refs/heads/master Merge: 0a77b46 bb075e3 Author: Zachary Scott Date: 2014-06-11 11:32:50 -0700 Merge pull request #15646 from aditya-kapoor/correct-conversion-docs [ci skip] correct docs for conversion commit bb075e3 refs/heads/master Author: Aditya Kapoor Date: 2014-06-11 23:29:23 +0530 [ci skip] correct docs for conversion M activemodel/lib/active_model/conversion.rb commit 0a77b46 refs/heads/master Merge: e006327 ccdd976 Author: Rafael Mendonça França Date: 2014-06-11 14:56:27 -0300 Merge pull request #15644 from akshay-vishnoi/activesupport No need to require to_param, it is already required in object/to_query.rb commit ccdd976 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-11 23:23:00 +0530 No need to require to_param, it is already required in to_query.rb M activesupport/lib/active_support/core_ext/object/conversions.rb commit e006327 refs/heads/master Merge: b6d3fa1 2399207 Author: Rafael Mendonça França Date: 2014-06-11 14:51:45 -0300 Merge pull request #15643 from aditya-kapoor/add-test [ci skip] add test for ActionModel::Conversion commit 2399207 refs/heads/master Author: Aditya Kapoor Date: 2014-06-11 23:18:47 +0530 [ci skip] add tests for ActionModel::Conversion M activemodel/test/cases/conversion_test.rb commit b6d3fa1 refs/heads/master Merge: f3b87be 5505131 Author: Rafael Mendonça França Date: 2014-06-11 14:26:58 -0300 Merge pull request #15642 from akshay-vishnoi/activesupport Move tests for blank.rb under Object commit 5505131 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-11 22:53:05 +0530 Move test for blank.rb under object D activesupport/test/core_ext/blank_test.rb A activesupport/test/core_ext/object/blank_test.rb commit f3b87be refs/heads/master Merge: e520339 82820ef Author: Rafael Mendonça França Date: 2014-06-11 13:50:38 -0300 Merge pull request #15582 from sgrif/sg-timestamps Refactor determination of max updated timestamp commit e520339 refs/heads/master Merge: 70b931f 5823e42 Author: Matthew Draper Date: 2014-06-12 01:52:15 +0930 Merge pull request #15630 from eileencodes/refactor-join-keys-on-add_constraints begin refactoring add_constraints by moving join keys commit 70b931f refs/heads/master Merge: 321f25f 66736c8 Author: Rafael Mendonça França Date: 2014-06-11 12:54:58 -0300 Merge pull request #15429 from sgrif/sg-rm-cached-attributes rm cached attributes commit c94e24f refs/heads/master Author: Timm Date: 2013-06-12 15:59:34 +0200 Added Loofah as a dependency in actionview.gemspec. Implemented ActionView: FullSanitizer, LinkSanitizer and WhiteListSanitizer in sanitizers.rb. Deprecated protocol_separator and bad_tags. Added new tests in sanitizers_test.rb and reimplemented assert_dom_equal with Loofah. M Gemfile M actionpack/actionpack.gemspec M actionpack/lib/action_dispatch/testing/assertions/dom.rb M actionview/actionview.gemspec M actionview/lib/action_view/helpers/sanitize_helper.rb A actionview/lib/action_view/helpers/sanitize_helper/sanitizers.rb A actionview/test/template/sanitizers_test.rb commit 321f25f refs/heads/master Merge: 47baab0 4a15c53 Author: Rafael Mendonça França Date: 2014-06-11 12:52:39 -0300 Merge pull request #15641 from arthurnn/small_doc_add Add has_one? docs commit 4a15c53 refs/heads/master Author: Arthur Neves Date: 2014-06-11 11:26:24 -0400 Add has_one? docs [skip ci] M activerecord/lib/active_record/reflection.rb commit 47baab0 refs/heads/master Merge: cd7cd9b f648195 Author: Yves Senn Date: 2014-06-11 17:25:36 +0200 Merge pull request #15628 from akshay-vishnoi/test-cases Add test cases for #in? and #presence_in commit cd7cd9b refs/heads/master Merge: ea3455d 75e3464 Author: Santiago Pastorino Date: 2014-06-11 11:42:23 -0300 Merge pull request #15637 from akshay-vishnoi/delete-deprecated-method Remove deprecation warning commit ea3455d refs/heads/master Merge: 08edb3d 09dd29e Author: Rafael Mendonça França Date: 2014-06-11 11:23:26 -0300 Merge pull request #15638 from sgrif/sg-column-types Ensure `column_types` returns a type object, and not a column commit 08edb3d refs/heads/master Merge: ef4e078 4a2be83 Author: Rafael Mendonça França Date: 2014-06-11 11:21:37 -0300 Merge pull request #15639 from sgrif/sg-column-serialization Remove YAML serialization workaround for columns commit 66736c8 refs/heads/master Author: Sean Griffin Date: 2014-05-30 11:38:55 -0700 rm cached attributes The original patch that added this concept can be found [here](https://web.archive.org/web/20090601022739/http://dev.rubyonrails.org/ticket/9767). The current default behavior is to cache everything except serialized columns, unless the user specified otherwise. If anyone were to specify otherwise, many types would actually be completely broken. Still, the method is left in place with a deprecation warning in case anyone is actually still calling this method. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/test/cases/attribute_methods_test.rb commit 4a2be83 refs/heads/master Author: Sean Griffin Date: 2014-06-11 07:59:29 -0600 Remove YAML serialization workaround for columns We are no longer including column objects in YAML serialization, thanks to https://github.com/rails/rails/pull/15621 M activerecord/lib/active_record/connection_adapters/column.rb commit 09dd29e refs/heads/master Author: Sean Griffin Date: 2014-06-11 07:54:39 -0600 Ensure `column_types` returns a type object, and not a column M activerecord/lib/active_record/model_schema.rb commit 75e3464 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-11 19:19:46 +0530 Remove deprecation warning M activerecord/lib/active_record/fixtures.rb commit c6d8ccb refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-11 13:56:15 +0200 cleanup, get rid of trailing whitespace. [ci skip] M guides/source/asset_pipeline.md commit ef4e078 refs/heads/master Author: Yves Senn Date: 2014-06-11 13:55:18 +0200 cleanup, get rid of trailing whitespace. [ci skip] Follow up to #15636. /cc @hundredwatt M guides/source/asset_pipeline.md commit 68b1dad refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-11 13:53:28 +0200 Merge pull request #15636 from hundredwatt/patch-1 Fix Apache Directives [ci skip] M guides/source/asset_pipeline.md commit b3b0110 refs/heads/master Merge: 4aa25d4 02ef031 Author: Yves Senn Date: 2014-06-11 13:53:28 +0200 Merge pull request #15636 from hundredwatt/patch-1 Fix Apache Directives [ci skip] commit 02ef031 refs/heads/master Author: Jason Nochlin Date: 2014-06-11 07:01:42 -0400 Fix Apache Directives [ci skip] Directives need to be placed on their own lines in order to work. Tested on: `Server version: Apache/2.2.22 (Ubuntu); Server built: Mar 19 2014 21:11:15` M guides/source/asset_pipeline.md commit 4aa25d4 refs/heads/master Author: Vijay Dev Date: 2014-06-11 15:01:28 +0530 fix typo in changelog [ci skip] M activemodel/CHANGELOG.md commit daaf62c refs/heads/master Merge: a5ab38c aec4127 Author: Yves Senn Date: 2014-06-11 09:02:07 +0200 Merge pull request #15635 from kuldeepaggarwal/add-missing-changelog add missing changelog entry. refer [#16db90d] [ci skip] commit aec4127 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-11 11:38:06 +0530 add missing changelog entry. refer [#16db90d] [ci skip] M activemodel/CHANGELOG.md commit 9feadc1 refs/heads/master Author: Andrew S. Brown Date: 2014-05-26 11:52:46 -0700 use name specified by 'as' for automatic inverse association to avoid reflecting on wrong association M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/associations/inverse_associations_test.rb M activerecord/test/models/face.rb M activerecord/test/models/man.rb M activerecord/test/schema/schema.rb commit 5823e42 refs/heads/master Author: eileencodes Date: 2014-06-10 16:13:23 -0400 begin refactoring add_constraints by moving join keys add_constraints is complicated and difficult to read. This is the beginning of a long process of refactoring this code. First step: moved the join keys out of AssociationScope and into reflection. We then don't need to call `reflection` because now reflection is `self`. `foreign_key` must be named something else because reflection already has a `foreign_key` method and when passed into `JoinKeys` it was getting the wrong assignment. `reflection_foreign_key` seemed to be an appropriate name. I also named `key` `reflection_key` to match `reflection_foreign_key`. M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/reflection.rb commit f648195 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-11 06:50:18 +0530 Add test cases for #in? and #presence_in M activesupport/test/core_ext/object/inclusion_test.rb commit a5ab38c refs/heads/master Author: Aaron Patterson Date: 2014-06-10 17:14:50 -0700 remove deprecated code. Rely on `describe` provided by minitest M activesupport/lib/active_support/testing/declarative.rb commit 80b4fe2 refs/heads/master Merge: 57dba02 da3b4b6 Author: Rafael Mendonça França Date: 2014-06-10 19:14:37 -0300 Merge pull request #15621 from sgrif/sg-column-type-decorations No need to decorate columns twice commit 57dba02 refs/heads/master Merge: 042f185 9505a21 Author: Rafael Mendonça França Date: 2014-06-10 18:19:25 -0300 Merge pull request #15619 from aditya-kapoor/fix-js-doc [ci skip] Fix doc for javascript_helper commit da3b4b6 refs/heads/master Author: Sean Griffin Date: 2014-06-10 14:50:36 -0600 No need to decorate columns twice We never want result types to override column types, and `decorate_columns` can only affect column types. No need to go through the decoration multiple times, we can just exclude the column types from the result types instead. M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/querying.rb commit 042f185 refs/heads/master Merge: 3c60da7 f651d35 Author: Zachary Scott Date: 2014-06-10 13:26:50 -0700 Merge pull request #15620 from aditya-kapoor/correct-bundler-link Correct Bundler link [ci skip] commit f651d35 refs/heads/master Author: Aditya Kapoor Date: 2014-06-11 01:45:55 +0530 Correct Bundler link [ci skip] M guides/source/getting_started.md commit 9505a21 refs/heads/master Author: Aditya Kapoor Date: 2014-06-11 01:29:17 +0530 [ci skip] Fix doc for javascript_helper M actionview/lib/action_view/helpers/javascript_helper.rb commit 3c60da7 refs/heads/master Merge: 98575c6 2e19038 Author: Rafael Mendonça França Date: 2014-06-10 16:18:35 -0300 Merge pull request #15618 from JuanitoFatas/doc/action-mailer-guide [ci skip] Refine Action Mailer guide. commit 2e19038 refs/heads/master Author: Juanito Fatas Date: 2014-06-11 03:03:10 +0800 [ci skip] Refine Action Mailer guide. * Wrap 80 words if possible. * Make attachment hash options more readable. (L239-L243) Before: ![screenshot 2014-06-11 02 59 54](https://cloud.githubusercontent.com/assets/1000669/3235432/a91d0464-f0d2-11e3-9e4a-6af2b2a83f1a.png) After: ![screenshot 2014-06-11 02 59 36](https://cloud.githubusercontent.com/assets/1000669/3235428/a47b28dc-f0d2-11e3-806c-cfaedd3f15df.png) * L619 Wrap "location" in code: `"location"`. * L628 Use actual section name. * L697 Remove unnecessary `./` when refer to other guide. M guides/source/action_mailer_basics.md commit 98575c6 refs/heads/master Merge: 6cef56f 16db90d Author: Rafael Mendonça França Date: 2014-06-10 15:44:48 -0300 Merge pull request #15617 from kuldeepaggarwal/remove-deprecate-method remove deprecation call while initializing `ClassCache` object commit 16db90d refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-11 00:08:19 +0530 remove deprecation call while initializing `ClassCache` object M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/fixtures_test.rb commit 6cef56f refs/heads/master Merge: ab98ada 9010274 Author: Rafael Mendonça França Date: 2014-06-10 15:07:23 -0300 Merge pull request #15616 from apanzerj/fix_long_key_paths fix error with long keys in ActiveSupport::Cache::FileStore commit ab98ada refs/heads/master Merge: 0014bc8 6a781b9 Author: Rafael Mendonça França Date: 2014-06-10 15:03:33 -0300 Merge pull request #15615 from JuanitoFatas/doc/action-mailer [ci skip] Improve enable_starttls_auto documentation (Action Mailer). commit 0014bc8 refs/heads/master Merge: 63e7f07 294ddff Author: Richard Schneeman Date: 2014-06-10 12:57:10 -0500 Merge pull request #15614 from akshay-vishnoi/doc_changes [ci skip] Add Docs for strip_insignificant_zeros option in number_to_human commit 9010274 refs/heads/master Author: Adam Panzer Date: 2014-06-10 10:53:48 -0700 fix error with long keys in ActiveSupport::Cache::FileStore M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache/file_store.rb M activesupport/test/caching_test.rb commit 6a781b9 refs/heads/master Author: Juanito Fatas Date: 2014-06-11 01:49:08 +0800 [ci skip] Improve enable_starttls_auto documentation. M actionmailer/lib/action_mailer/base.rb commit 63e7f07 refs/heads/master Merge: 3681e1a bd43203 Author: Rafael Mendonça França Date: 2014-06-10 14:49:40 -0300 Merge pull request #15612 from akshay-vishnoi/delete-deprecated-method Remove deprecated method ActiveRecord::Base.quoted_locking_column commit 294ddff refs/heads/master Author: Akshay Vishnoi Date: 2014-06-10 23:07:49 +0530 [ci skip] Add Docs for strip_insignificant_zeros option in number helpers M actionview/lib/action_view/helpers/number_helper.rb M activesupport/lib/active_support/number_helper.rb commit 3681e1a refs/heads/master Merge: 4d209b5 9bb0f1e Author: Arthur Nogueira Neves Date: 2014-06-10 12:07:34 -0500 Merge pull request #15611 from akshay-vishnoi/doc_changes [ci skip] Correct output and use valid options of number helpers commit bd43203 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-10 22:36:00 +0530 Remove deprecated method ActiveRecord::Base.quoted_locking_column M activerecord/CHANGELOG.md M activerecord/lib/active_record/locking/optimistic.rb M activerecord/test/cases/locking_test.rb commit 9bb0f1e refs/heads/master Author: Akshay Vishnoi Date: 2014-06-10 22:16:13 +0530 [ci skip] Correct output and use valid options of number helpers M actionview/lib/action_view/helpers/number_helper.rb M activesupport/lib/active_support/number_helper.rb commit da6a86f refs/heads/master Author: Douwe Maan Date: 2014-06-09 18:49:14 +0200 Have .queue_as only set queue name for job in question. M lib/active_job/base.rb M lib/active_job/queue_name.rb M test/cases/queue_naming_test.rb commit 4d209b5 refs/heads/master Merge: 4bd2a50 8a072fc Author: Rafael Mendonça França Date: 2014-06-10 11:50:29 -0300 Merge pull request #15610 from sgrif/silence-warnings Fix warnings in tests commit 8a072fc refs/heads/master Author: Sean Griffin Date: 2014-06-10 08:48:57 -0600 Silence warnings in tests. ``` activerecord/test/cases/adapters/postgresql/range_test.rb:159: warning: (...) interpreted as grouped expression activerecord/test/cases/finder_test.rb:38: warning: shadowing outer local variable - e activerecord/test/cases/finder_test.rb:43: warning: shadowing outer local variable - e ``` M activerecord/test/cases/adapters/postgresql/range_test.rb M activerecord/test/cases/finder_test.rb commit 4bd2a50 refs/heads/master Merge: d5f480c 47f1c10 Author: Rafael Mendonça França Date: 2014-06-10 11:47:25 -0300 Merge pull request #15609 from sgrif/sg-yaml-virtual-columns Keep the types of virtual columns after yaml serialization commit d5f480c refs/heads/master Merge: be5d648 e5cc892 Author: Rafael Mendonça França Date: 2014-06-10 11:43:53 -0300 Merge pull request #15603 from kuldeepaggarwal/remove-deprecation-method remove depricated Validatior#setup commit 47f1c10 refs/heads/master Author: Sean Griffin Date: 2014-06-10 08:42:47 -0600 Keep the types of virtual columns after yaml serialization On MySQL and PostgreSQL, the adapter does not type cast virtual columns for us. M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/test/cases/yaml_serialization_test.rb commit c7d816a refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-10 11:26:57 -0300 Merge pull request #15605 from mekishizufu/fix_cache_digests_rake_tasks Fix cache_digest rake tasks Conflicts: actionview/CHANGELOG.md M actionview/CHANGELOG.md M actionview/lib/action_view/tasks/dependencies.rake commit be5d648 refs/heads/master Merge: bfb8b13 f62ec6c Author: Rafael Mendonça França Date: 2014-06-10 11:26:57 -0300 Merge pull request #15605 from mekishizufu/fix_cache_digests_rake_tasks Fix cache_digest rake tasks commit bfb8b13 refs/heads/master Merge: 4b8d0b8 b5aa210 Author: Rafael Mendonça França Date: 2014-06-10 11:06:55 -0300 Merge pull request #15607 from sgrif/sg-array-type-cast Inline PG array type casting helper commit b5aa210 refs/heads/master Author: Sean Griffin Date: 2014-06-10 08:01:39 -0600 Inline PG array type casting helper M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb commit f62ec6c refs/heads/master Author: Jiri Pospisil Date: 2014-06-10 13:34:14 +0200 Fix cache_digest rake tasks Bring cache_digests:* rake tasks up-to-date with the API changes introduced in 637bb726cac60aaa1f7e482836458aa73e17fbb7 M actionview/CHANGELOG.md M actionview/lib/action_view/tasks/dependencies.rake commit 4b8d0b8 refs/heads/master Author: Yves Senn Date: 2014-06-10 13:36:17 +0200 test, fix typo, `create_index` does not exist. M activerecord/test/cases/schema_dumper_test.rb commit 72dc6d8 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-10 10:29:45 +0200 docs, backport "Changing Columns" section in migration guide. [ci skip] M guides/source/migrations.md commit 3e1373a refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-10 10:21:15 +0200 docs, refactor docs about column modifiers. [ci skip] [Matthew Draper & Yves Senn] This is a follow up to #15602 which rendered the guides in a weird state: > You can also specify some options just after the field type between curly braces. You can use the following modifiers: > `null` Allows or disallows `NULL` values in the column. > NOTE: `null` and `default` cannot be specified via command line. The modifiers are now moved into a separate section. The generator simply referes to that section. Related to #15583. /cc @JuanitoFatas Conflicts: guides/source/migrations.md M guides/source/migrations.md commit fcd0ac0 refs/heads/master Author: Yves Senn Date: 2014-06-10 10:21:15 +0200 docs, refactor docs about column modifiers. [ci skip] [Matthew Draper & Yves Senn] This is a follow up to #15602 which rendered the guides in a weird state: > You can also specify some options just after the field type between curly braces. You can use the following modifiers: > `null` Allows or disallows `NULL` values in the column. > NOTE: `null` and `default` cannot be specified via command line. The modifiers are now moved into a separate section. The generator simply referes to that section. Related to #15583. /cc @JuanitoFatas M guides/source/active_record_migrations.md commit 63fd88c refs/heads/master Author: David Verhasselt Date: 2014-05-23 13:46:03 +0300 If a counter_cache exists, use it for #empty? M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 90fb179 refs/heads/master Merge: 44b7d6c c4c3a44 Author: Xavier Noria Date: 2014-06-10 00:54:47 -0700 Merge pull request #15604 from JuanitoFatas/doc/migration [ci skip] Rename: Rails Database Migration to Active Record Migration. commit c4c3a44 refs/heads/master Author: Juanito Fatas Date: 2014-06-10 15:41:15 +0800 [ci skip] Rename: Rails Database Migration to Active Record Migration. This will need to setup permanent redirect for the old guide. A guides/source/active_record_migrations.md M guides/source/documents.yaml D guides/source/migrations.md commit 438a1bd refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-06-10 08:47:49 +0200 Merge pull request #15584 from jamesyang124/issue_15382 ActiveRecord::FinderMethods.find doesn't pass proc parameter to array Manual merge of #15584. Closes #15584. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/finder_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb commit f244d8f refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-10 08:47:49 +0200 Merge pull request #15584 from jamesyang124/issue_15382 ActiveRecord::FinderMethods.find doesn't pass proc parameter to array Manual merge of #15584. Closes #15584. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/finder_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb commit e5cc892 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-10 12:27:17 +0530 remove depricated Validatior#setup M activemodel/lib/active_model/validator.rb M activemodel/test/cases/validations_test.rb commit 44b7d6c refs/heads/master Merge: 8ed1dec 9feb4a8 Author: Yves Senn Date: 2014-06-10 08:47:49 +0200 Merge pull request #15584 from jamesyang124/issue_15382 ActiveRecord::FinderMethods.find doesn't pass proc parameter to array Manual merge of #15584. Closes #15584. commit 9feb4a8 refs/heads/master Author: James Yang Date: 2014-06-09 01:18:43 -0700 ActiveRecord::FinderMethods.find passes proc parameter #15382 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb commit 8c9dfe5 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-10 08:17:24 +0200 Merge pull request #15602 from JuanitoFatas/doc/type-modifier [ci skip] Add note about type modifiers that cannot be specified in command line. M guides/source/migrations.md commit 8ed1dec refs/heads/master Merge: b64c057 0d63513 Author: Yves Senn Date: 2014-06-10 08:17:24 +0200 Merge pull request #15602 from JuanitoFatas/doc/type-modifier [ci skip] Add note about type modifiers that cannot be specified in command line. commit 0d63513 refs/heads/master Author: Juanito Fatas Date: 2014-06-10 13:38:08 +0800 [ci skip] Add note about type modifiers that cannot be specified in command line. M guides/source/migrations.md commit b64c057 refs/heads/master Merge: bcbc4f4 34c77bc Author: Rafael Mendonça França Date: 2014-06-10 00:00:03 -0300 Merge pull request #15599 from arthurnn/HABTMAssociation Use HasAndBelongsToMany instead of HABTM commit 34c77bc refs/heads/master Author: Arthur Neves Date: 2014-06-09 22:58:28 -0400 Use HasAndBelongsToMany instead of HABTM M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/reflection.rb commit bcbc4f4 refs/heads/master Merge: e1175d9 bfd0159 Author: Rafael Mendonça França Date: 2014-06-09 23:34:06 -0300 Merge pull request #15597 from eileencodes/reuse-available-collection-methods reuse available collection? check instead of macro commit bfd0159 refs/heads/master Author: eileencodes Date: 2014-06-01 09:30:40 -0400 reuse available collection? check instead of macro Reflection has an available method that is used to check if the reflection is a collection. Any :has_many macro is considered a collection and `collection?` should be used instead of `macro == :has_many`. M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/reflection.rb commit e1175d9 refs/heads/master Merge: 32b6873 5a0b184 Author: Rafael Mendonça França Date: 2014-06-09 20:21:58 -0300 Merge pull request #15596 from eileencodes/add-has_one-method-and-reuse add has_one? method and reuse instead of checking macro commit 32b6873 refs/heads/master Merge: 3fe33a3 9eb87fb Author: Aaron Patterson Date: 2014-06-09 16:19:07 -0700 Merge pull request #15595 from eileencodes/abstract-away-habtm-macro Abstract away use of HABTM macro commit 9eb87fb refs/heads/master Author: eileencodes Date: 2014-06-09 13:53:41 -0400 Abstract away use of HABTM macro By having the `:has_and_belongs_to_many` macro in the `@collection` we are punishing `:has_many` associations because it has to allocate the array and check the macro. @collection is returned to `macro == :has_many` and a new reflection class `HABTMReflection` is created to handle this case instead. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/reflection.rb commit 5a0b184 refs/heads/master Author: eileencodes Date: 2014-06-05 15:27:07 -0400 add has_one? method and reuse instead of checking macro Instead of checking for `macro == :has_one` throughout the codebase we can create a `has_one?` method to match the `belongs_to?`, `polymorphic?` and other methods. M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/belongs_to_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/reflection.rb commit 565522f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-09 18:30:05 -0300 Add test to make sure HashWithIndifferentAccess works like Hash M activesupport/test/core_ext/hash_ext_test.rb commit f8ba353 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-09 18:30:05 -0300 Add test to make sure HashWithIndifferentAccess works like Hash M activesupport/test/core_ext/hash_ext_test.rb commit 3fe33a3 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-09 18:30:05 -0300 Fix bug that make HashWithIndifferentAccess work differently of Hash Before HashWithIndifferentAccess were doing deep_dup of the inner hashes when Hash doesn't do. Now both are behaving in the same way. M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit 1d56f05 refs/tags/v4.0.6.rc2 Author: Rafael Mendonça França Date: 2014-06-09 17:25:20 -0300 Timestamp values should be present on callbacks This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a regression test. Fixes #15418 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb M activerecord/test/schema/schema.rb commit 073a398 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-09 17:25:20 -0300 Timestamp values should be present on callbacks This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a regression test. Fixes #15418 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb M activerecord/test/schema/schema.rb commit e9c8d28 refs/tags/v4.1.2.rc2 Author: Rafael Mendonça França Date: 2014-06-09 17:25:20 -0300 Timestamp values should be present on callbacks This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a regression test. Fixes #15418 M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb M activerecord/test/schema/schema.rb commit 89e494e refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-09 17:25:20 -0300 Timestamp values should be present on callbacks This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a regression test. Fixes #15418 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb M activerecord/test/schema/schema.rb commit dddbccb refs/heads/master Author: Rafael Mendonça França Date: 2014-06-09 17:25:20 -0300 Timestamp values should be present on callbacks This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a regression test. Fixes #15418 M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb M activerecord/test/schema/schema.rb commit 9664661 refs/heads/master Merge: 254efb7 d24e640 Author: Rafael Mendonça França Date: 2014-06-09 16:49:26 -0300 Merge pull request #15592 from sgrif/sg-type-cast-from-database Rename `type_cast` to `type_cast_from_database` commit d24e640 refs/heads/master Author: Sean Griffin Date: 2014-06-09 13:27:15 -0600 Rename `type_cast` to `type_cast_from_database` In some cases there is a difference between the two, we should always be doing one or the other. For convenience, `type_cast` is still a private method on type, so new types that do not need different behavior don't need to implement two methods, but it has been moved to private so it cannot be used accidentally. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/range.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bytea_test.rb M activerecord/test/cases/adapters/postgresql/connection_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/money_test.rb M activerecord/test/cases/attribute_decorators_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/connection_adapters/type_lookup_test.rb M activerecord/test/cases/reflection_test.rb M activerecord/test/cases/types_test.rb commit 254efb7 refs/heads/master Merge: 14ecc5e 2742162 Author: Rafael Mendonça França Date: 2014-06-09 16:31:25 -0300 Merge pull request #15586 from sgrif/sg-identity-type Use an actual identity type in AR::Result#identity_type commit 2742162 refs/heads/master Author: Sean Griffin Date: 2014-06-09 07:56:36 -0600 Use an actual identity type in AR::Result#identity_type We should be able to rely on this object implenting the full type interface. M activerecord/lib/active_record/result.rb commit 14ecc5e refs/heads/master Merge: ddb0b4a bc76958 Author: Rafael Mendonça França Date: 2014-06-09 16:22:06 -0300 Merge pull request #15587 from sgrif/sg-remove-workaround Remove workaround for non-lazy serialize in tests commit ddb0b4a refs/heads/master Merge: 19f1cfb c93dbfe Author: Rafael Mendonça França Date: 2014-06-09 16:13:48 -0300 Merge pull request #15591 from sgrif/sg-rm-write-attribute Make `_before_type_cast` actually be before type cast commit d3dc083 refs/tags/v4.0.6.rc2 Author: Rafael Mendonça França Date: 2014-06-09 15:40:57 -0300 Do not try to set the foreign_key again on has_many through Integration tests are inside protected_attributes test suite. Fixes #15496 Fixes rails/protected_attributes#35 M activerecord/lib/active_record/associations/has_many_through_association.rb commit 4bcdf8e refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-09 15:40:57 -0300 Do not try to set the foreign_key again on has_many through Integration tests are inside protected_attributes test suite. Fixes #15496 Fixes rails/protected_attributes#35 M activerecord/lib/active_record/associations/has_many_through_association.rb commit 839c124 refs/tags/v4.1.2.rc2 Author: Rafael Mendonça França Date: 2014-06-09 15:40:57 -0300 Do not try to set the foreign_key again on has_many through Integration tests are inside protected_attributes test suite. Fixes #15496 Fixes rails/protected_attributes#35 M activerecord/lib/active_record/associations/has_many_through_association.rb commit 43d17bc refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-09 15:40:57 -0300 Do not try to set the foreign_key again on has_many through Integration tests are inside protected_attributes test suite. Fixes #15496 Fixes rails/protected_attributes#35 M activerecord/lib/active_record/associations/has_many_through_association.rb commit 19f1cfb refs/heads/master Author: Rafael Mendonça França Date: 2014-06-09 15:40:57 -0300 Do not try to set the foreign_key again on has_many through Integration tests are inside protected_attributes test suite. Fixes #15496 Fixes rails/protected_attributes#35 M activerecord/lib/active_record/associations/has_many_through_association.rb commit c93dbfe refs/heads/master Author: Sean Griffin Date: 2014-06-09 12:30:12 -0600 Make `_before_type_cast` actually be before type cast - The following is now true for all types, all the time - `model.attribute_before_type_cast == given_value` - `model.attribute == model.save_and_reload.attribute` - `model.attribute == model.dup.attribute` - `model.attribute == YAML.load(YAML.dump(model)).attribute` - Removes the remaining types implementing `type_cast_for_write` - Simplifies the implementation of time zone aware attributes - Brings tz aware attributes closer to being implemented as an attribute decorator - Adds additional point of control for custom types M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/type/binary.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/attribute_decorators_test.rb M activerecord/test/cases/dirty_test.rb M activerecord/test/cases/reflection_test.rb commit 66eb847 refs/heads/master Merge: a5c12cb 57a2c0d Author: Rafael Mendonça França Date: 2014-06-09 12:40:34 -0300 Merge pull request #15588 from thedarkone/remove-has-one-order-option Remove a long gone :order option from has_one's valid_options commit 82820ef refs/heads/master Author: Sean Griffin Date: 2014-06-08 18:00:21 -0600 Refactor determination of max updated timestamp `[].max # => nil` M activerecord/lib/active_record/timestamp.rb commit 57a2c0d refs/heads/master Author: thedarkone Date: 2014-06-09 16:29:41 +0200 Remove a long gone :order option from has_one's valid_options. M activerecord/lib/active_record/associations/builder/has_one.rb commit bc76958 refs/heads/master Author: Sean Griffin Date: 2014-06-09 08:27:23 -0600 Remove workaround for non-lazy serialize in tests `serialize` is now lazy, so the workaround is no longer needed. M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit a5c12cb refs/heads/master Author: Yves Senn Date: 2014-06-09 12:58:36 +0200 pg guide, add index to PostgreSQL array example. [ci skip] M guides/source/active_record_postgresql.md commit 4b19683 refs/remotes/origin/4-0-stable Merge: f5a24be 83f1220 Author: Rafael Mendonça França Date: 2014-06-08 12:54:58 -0300 Merge pull request #15575 from bf4/4-0-stable Mail 2.6.1 silences excessive warnings; remove Gemfile hack commit 3576f95 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-08 12:34:52 -0300 Merge pull request #15573 from bf4/mail_2_6_1_released Mail 2.6.1 silences excessive warnings; remove Gemfile hack Conflicts: Gemfile M Gemfile commit 97ca813 refs/heads/master Merge: e385b85 2af2696 Author: Rafael Mendonça França Date: 2014-06-08 12:34:52 -0300 Merge pull request #15573 from bf4/mail_2_6_1_released Mail 2.6.1 silences excessive warnings; remove Gemfile hack commit 83f1220 refs/remotes/origin/4-0-stable Author: Benjamin Fleischer Date: 2014-06-08 10:12:11 -0500 Mail 2.6.1 silences excessive warnings; remove Gemfile hack Completes https://github.com/rails/rails/pull/15493 Revert "For our build, stick with mail 2.5.x for now" This reverts commit bea0d10222567d2c930f2a5005d32354b70ac415. M Gemfile commit 2af2696 refs/heads/master Author: Benjamin Fleischer Date: 2014-06-08 10:07:08 -0500 Mail 2.6.1 silences excessive warnings; remove Gemfile hack Completes https://github.com/rails/rails/pull/15493 Revert "For our build, stick with mail 2.5.x for now" This reverts commit b8f586a094c104006d29a87fee0d8b48d0af2d14. M Gemfile commit e385b85 refs/heads/master Merge: c9a4312 1a69112 Author: Richard Schneeman Date: 2014-06-08 09:56:31 -0500 Merge pull request #15571 from kalmanh/patch-1 Update migrations.md commit 1a69112 refs/heads/master Author: Kalman Hazins Date: 2014-06-08 10:29:57 -0400 Update migrations.md default column type modifier M guides/source/migrations.md commit c9a4312 refs/heads/master Author: Matthew Draper Date: 2014-06-08 23:42:01 +0930 Ignore distressingly-frequent segfaults on this build Not sure what's causing them suddenly, but it seems unlikely there's much we can do about it. For the small amount of coverage this particular job gains us, it's hurting us more, by making CI failures unremarkable. M .travis.yml commit 71f99be refs/heads/master Merge: 376eefa 64edb6c Author: Yves Senn Date: 2014-06-08 15:55:20 +0200 Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_test Restore test deliveries for ActionMailer. commit 376eefa refs/heads/master Merge: a235105 6a89850 Author: Matthew Draper Date: 2014-06-08 22:53:00 +0930 Merge pull request #15452 from matthewd/live-abort Handle client disconnect during live streaming commit 6a89850 refs/heads/master Author: Matthew Draper Date: 2014-06-01 10:35:00 +0930 Handle client disconnect during live streaming .. even when the producer is blocked for a write. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/live_stream_test.rb commit a235105 refs/heads/master Merge: 1d96915 885ebda Author: Rafael Mendonça França Date: 2014-06-07 17:55:43 -0300 Merge pull request #15567 from aditya-kapoor/add-cases Add Additional Test Cases for the constantize commit 885ebda refs/heads/master Author: Aditya Kapoor Date: 2014-06-07 23:58:38 +0530 Add Missing Test Cases for the constantize M activesupport/test/constantize_test_cases.rb commit 1d96915 refs/heads/master Merge: cf94a55 3d4ca49 Author: Rafael Mendonça França Date: 2014-06-07 15:27:39 -0300 Merge pull request #15566 from kuldeepaggarwal/fix-build fix test cases after #15558 merge to master. commit 3d4ca49 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-06-07 23:52:51 +0530 fix test cases after #15558 merge to master. M activerecord/test/cases/attribute_decorators_test.rb commit cf94a55 refs/heads/master Merge: 4cf63ce 3fab9d8 Author: Rafael Mendonça França Date: 2014-06-07 15:12:24 -0300 Merge pull request #15558 from sgrif/sg-rename-property Rename `property` to `attribute` Conflicts: activerecord/lib/active_record/attribute_methods/serialization.rb activerecord/lib/active_record/base.rb commit 4cf63ce refs/heads/master Merge: dc73e39 2dca1ba Author: Rafael Mendonça França Date: 2014-06-07 15:09:23 -0300 Merge pull request #15546 from sgrif/sg-lazy-decorators Don't query the database schema when calling `serialize` commit dc73e39 refs/heads/master Merge: c6e166b 3b22df2 Author: Rafael Mendonça França Date: 2014-06-07 14:57:04 -0300 Merge pull request #15561 from sgrif/sg-time-zone-aware-arrays Ensure time zones don't change after round trip with array columns commit c6e166b refs/heads/master Merge: d95bcc9 368cca5 Author: Rafael Mendonça França Date: 2014-06-07 14:52:30 -0300 Merge pull request #15562 from sgrif/sg-double-type-cast-dirty Do not type cast twice on attribute assignment commit 368cca5 refs/heads/master Author: Sean Griffin Date: 2014-06-07 08:56:27 -0600 Do not type cast twice on attribute assignment The definition of `write_attribute` in dirty checking ultimately leads to the columns calling `type_cast` on the value to perform the comparison. However, this is a potentially expensive computation that we cache when it occurs in `read_attribute`. The only case that we need the non-type-cast form is for numeric, so we pass that through as well (something I'm looking to remove in the future). This also reduces the number of places that manually access various stages in an attribute's type casting lifecycle, which will aid in one of the larger refactorings that I'm working on. M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/enum.rb M activerecord/lib/active_record/type/numeric.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb commit d95bcc9 refs/heads/master Merge: 263774f 269ad13 Author: Rafael Mendonça França Date: 2014-06-07 14:42:40 -0300 Merge pull request #15560 from aditya-kapoor/guide-fixes Correct Example output in Rails guides [ci skip] commit 263774f refs/heads/master Merge: db5415d 3516409 Author: Rafael Mendonça França Date: 2014-06-07 14:33:59 -0300 Merge pull request #15564 from sgrif/sg-remove-dead-code Remove dead branch when restoring ID within a transaction Conflicts: activerecord/lib/active_record/transactions.rb commit db5415d refs/heads/master Merge: 287e926 105e030 Author: Rafael Mendonça França Date: 2014-06-07 14:09:31 -0300 Merge pull request #15565 from sgrif/sg-no-unfreezing Move conditionals about freezing closer to the definition of `freeze` commit 105e030 refs/heads/master Author: Sean Griffin Date: 2014-06-07 11:03:36 -0600 Move conditionals about freezing closer to the definition of `freeze` Reduces the number of places that care about the internals of how we store and type cast attributes. We do not need to go through the dup/freeze dance, as you couldn't have saved a frozen new record anyway, and that is the only time we would end up modifying the frozen hash. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/transactions.rb commit 3516409 refs/heads/master Author: Sean Griffin Date: 2014-06-07 10:23:25 -0600 Remove dead branch when restoring ID within a transaction There is no way to have an instance of an Active Record model where `has_attribute?(self.class.primary_key)` returns false. The record is always initialized in such a way that `@raw_attributes` will have an id key with nil for the value. M activerecord/lib/active_record/transactions.rb commit 287e926 refs/heads/master Merge: 2f5fab8 e1f3311 Author: Rafael Mendonça França Date: 2014-06-07 13:05:46 -0300 Merge pull request #15563 from sgrif/sg-raw-attributes-access Remove duplicated `@raw_attributes.keys` commit e1f3311 refs/heads/master Author: Sean Griffin Date: 2014-06-07 09:55:28 -0600 Remove duplicated `@raw_attributes.keys` Reduces the number of things outside of attribute methods that cares about the details of how we store and type cast attributes M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/persistence.rb commit 3b22df2 refs/heads/master Author: Sean Griffin Date: 2014-06-07 09:38:15 -0600 Ensure time zones don't change after round trip with array columns The times would be equivalent, even if they were in different time zones. E.g. 12:00 UTC == 5:00 PDT M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 2f5fab8 refs/heads/master Merge: 16f595f da9ed15 Author: Matthew Draper Date: 2014-06-08 01:03:06 +0930 Merge pull request #15557 from sgrif/sg-specify-time-zone Specify a time zone when testing TZ aware attributes commit da9ed15 refs/heads/master Author: Sean Griffin Date: 2014-06-07 07:14:37 -0600 Don't rely on `Time.current` in tests Millisecond inequality causes failures on Travis M activerecord/test/cases/adapters/postgresql/array_test.rb commit 269ad13 refs/heads/master Author: Aditya Kapoor Date: 2014-06-07 20:58:29 +0530 Correct Example output in Rails guides [ci skip] M guides/source/command_line.md commit 16f595f refs/heads/master Author: Yves Senn Date: 2014-06-07 16:26:28 +0200 changelog for #15556 and credit @kuldeepaggarwal [Kuldeep Aggarwal] This is a follow up to #15556 @kuldeepaggarwal did submit this patch way back (#13624). M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb commit 3fab9d8 refs/heads/master Author: Sean Griffin Date: 2014-06-07 07:09:45 -0600 Rename `property` to `attribute` For consistency with https://github.com/rails/rails/pull/15557 M activerecord/lib/active_record/attribute_methods/serialization.rb A activerecord/lib/active_record/attributes.rb M activerecord/lib/active_record/base.rb D activerecord/lib/active_record/properties.rb A activerecord/test/cases/attributes_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/calculations_test.rb D activerecord/test/cases/custom_properties_test.rb M activerecord/test/cases/dirty_test.rb M activerecord/test/cases/migration_test.rb commit 2dca1ba refs/heads/master Author: Sean Griffin Date: 2014-06-06 09:43:09 -0600 Don't query the database schema when calling `serialize` We need to decorate the types lazily. This is extracted to a separate API, as there are other refactorings that will be able to make use of it, and to allow unit testing the finer points more granularly. A activerecord/lib/active_record/attribute_decorators.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb A activerecord/test/cases/attribute_decorators_test.rb M activerecord/test/cases/serialized_attribute_test.rb commit 23a751c refs/heads/master Merge: f84d081 1c181c2 Author: Yves Senn Date: 2014-06-07 14:44:12 +0200 Merge pull request #15556 from sgrif/sg-time-zone-aware-arrays Add array support when time zone aware attributes are enabled commit 1c181c2 refs/heads/master Author: Sean Griffin Date: 2014-06-07 06:39:27 -0600 Add array support when time zone aware attributes are enabled M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit f84d081 refs/heads/master Author: Xavier Noria Date: 2014-06-07 13:30:03 +0200 adds some details to the rationale of converted_arrays [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit f712f89 refs/heads/master Author: Xavier Noria Date: 2014-06-07 13:17:50 +0200 adds a regression test for the strong params converted arrays cache This is a regression test for 29844dd. M actionpack/test/controller/parameters/parameters_permit_test.rb commit 1ecada2 refs/heads/master Author: Xavier Noria Date: 2014-06-07 13:04:40 +0200 Revert "Convert StrongParameters cache to a hash. This fixes an unbounded" We cannot cache keys because arrays are mutable. We rather want to cache the arrays. This behaviour is tailor-made for the usage pattern strongs params is designed for. In a forthcoming commit I am going to add a test that covers why we need to cache by value. Every strong params instance has a live span of a request, the cache goes away with the object. Since strong params have such a concrete intention, it would be interesting to see if there are actually any real-world use cases that are an actual leak, one that practically may matter. I am not convinced that the theoretical leak has any practical consequences, but if it can be shown there are, then I believe we should either get rid of the cache (which is an optimization), or else wipe it in the mutating API. This reverts commit e63be2769c039e4e9ada523a8497ce3206cc8a9b. M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit a39c88b refs/heads/master Author: Vijay Dev Date: 2014-06-07 10:53:25 +0000 copy edits [ci skip] M guides/source/3_0_release_notes.md M guides/source/api_documentation_guidelines.md commit b9ea1d3 refs/heads/master Merge: ad539dc 69107a7 Author: Vijay Dev Date: 2014-06-07 10:05:23 +0000 Merge branch 'master' of github.com:rails/docrails commit ad539dc refs/heads/master Merge: a6c8cde b6760d8 Author: Xavier Noria Date: 2014-06-07 02:17:25 -0700 Merge pull request #15555 from akshay-vishnoi/doc_changes Fix capitalization commit b6760d8 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-07 14:23:27 +0530 [ci skip] Fix capitalization M actionpack/lib/action_controller/metal/streaming.rb M actionpack/lib/action_dispatch/middleware/remote_ip.rb M guides/code/getting_started/config/environments/production.rb M guides/source/3_1_release_notes.md M guides/source/asset_pipeline.md M guides/source/caching_with_rails.md M guides/source/configuring.md M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit a6c8cde refs/heads/master Merge: fadbc7c 19ef270 Author: Arthur Nogueira Neves Date: 2014-06-06 19:50:54 -0500 Merge pull request #15542 from Gaurav2728/gaurav-remove_shutdown_link remove rubyforge.org that was shut down [ci skip] commit fadbc7c refs/heads/master Author: Matthew Draper Date: 2014-06-07 10:13:00 +0930 Unwrap another html_escape /cc @tenderlove M actionview/lib/action_view/helpers/output_safety_helper.rb commit 2cdf730 refs/heads/master Merge: 17fc6f1 8a6e763 Author: Rafael Mendonça França Date: 2014-06-06 21:11:37 -0300 Merge pull request #15554 from sgrif/sg-klass Removed unused `klass` definitions from types commit 8a6e763 refs/heads/master Author: Sean Griffin Date: 2014-06-06 17:33:13 -0600 Removed unused `klass` definitions from types Only `Date` and `Time` are handled. M activerecord/lib/active_record/type/binary.rb M activerecord/lib/active_record/type/decimal.rb M activerecord/lib/active_record/type/float.rb M activerecord/lib/active_record/type/integer.rb M activerecord/lib/active_record/type/string.rb M activerecord/lib/active_record/type/value.rb commit 17fc6f1 refs/heads/master Author: Aaron Patterson Date: 2014-06-06 15:28:55 -0700 eliminate more wasteful allocations M actionview/lib/action_view/helpers/url_helper.rb commit a8a6f85 refs/heads/master Merge: 43697f4 36e9be8 Author: Rafael Mendonça França Date: 2014-06-06 18:38:16 -0300 Merge pull request #15552 from sgrif/sg-remove-klass-special-case Remove composed_of special case from multi-parameter attributes commit 43697f4 refs/heads/master Merge: 092f740 332d6c9 Author: Rafael Mendonça França Date: 2014-06-06 17:33:08 -0300 Merge pull request #15551 from sgrif/sg-numeric-types Don't mess with `_before_type_cast` for numeric types commit 36e9be8 refs/heads/master Author: Sean Griffin Date: 2014-06-06 14:18:01 -0600 Remove composed_of special case from multi-parameter attributes As we move towards removing the `klass` method from `column`, the else clause as it stands right now will become the only case. M activerecord/lib/active_record/aggregations.rb M activerecord/lib/active_record/attribute_assignment.rb commit 332d6c9 refs/heads/master Author: Sean Griffin Date: 2014-06-06 12:28:22 -0600 Don't mess with `_before_type_cast` for numeric types M activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb M activerecord/lib/active_record/type/numeric.rb commit 092f740 refs/heads/master Author: Aaron Patterson Date: 2014-06-06 12:06:58 -0700 remove another wasteful AS::SafeBuffer allocation M actionpack/lib/action_dispatch/routing/redirection.rb commit e9f215d refs/heads/master Author: Aaron Patterson Date: 2014-06-06 12:05:52 -0700 eliminate wasteful AS::SafeBuffer allocation M actionpack/lib/action_controller/metal/redirecting.rb commit a0aebc0 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-06 16:02:39 -0300 Revert "Merge pull request #15550 from sgrif/sg-numeric-types" This reverts commit be1db9946616a4005bb7be45656cc0f84d75d915, reversing changes made to 6680ee9427ae2639e404cd3b9538f54e136057c6. Reason: This changed a behavior where numeric attributes when receiving blank values didn't change its value. M activerecord/lib/active_record/type/numeric.rb commit be1db99 refs/heads/master Merge: 6680ee9 ff7c015 Author: Rafael Mendonça França Date: 2014-06-06 15:30:49 -0300 Merge pull request #15550 from sgrif/sg-numeric-types Don't mess with `_before_type_cast` for numeric types commit ff7c015 refs/heads/master Author: Sean Griffin Date: 2014-06-06 12:28:22 -0600 Don't mess with `_before_type_cast` for numeric types M activerecord/lib/active_record/type/numeric.rb commit 6680ee9 refs/heads/master Merge: 0502189 573a842 Author: Yves Senn Date: 2014-06-06 19:23:18 +0200 Merge pull request #15548 from zuhao/refactor_actionmailer_i18n_with_controller_test Restore I18n.locale to default after test. commit 19ef270 refs/heads/master Author: Gaurav Sharma Date: 2014-06-06 17:10:36 +0530 remove rubyforge.org that was shut down [ci skip] M actionview/lib/action_view/base.rb M activerecord/lib/active_record/aggregations.rb M guides/source/2_3_release_notes.md M guides/source/3_0_release_notes.md M guides/source/api_documentation_guidelines.md M guides/source/rails_on_rack.md M guides/source/security.md M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml commit 573a842 refs/heads/master Author: Zuhao Wan Date: 2014-06-07 00:52:24 +0800 Restore I18n.locale to default after test. If i18n_with_controller_test.rb were to run first, the I18n.locale will be changed to :de, and the following tests in base_test.rb will fail: "subject gets default from I18n" “default subject can have interpolations” "translations are scoped properly" "implicit multipart with default locale" M actionmailer/test/i18n_with_controller_test.rb commit 0502189 refs/heads/master Merge: ecd4151 c4f4123 Author: Santiago Pastorino Date: 2014-06-06 13:30:30 -0300 Merge pull request #15544 from zuhao/refactor_actionmailer_test_case Restore test deliveries properly in ActionMailer. commit 64edb6c refs/heads/master Author: Zuhao Wan Date: 2014-06-07 00:18:50 +0800 Restore test deliveries for ActionMailer. M actionpack/test/controller/assert_select_test.rb commit c4f4123 refs/heads/master Author: Zuhao Wan Date: 2014-06-07 00:11:24 +0800 Restore test deliveries properly in ActionMailer. `ActionMailer::Base.delivery_method` and `ActionMailer::Base.perform_deliveries` have leaked states. "delivery method can be customized per instance" and "delivery method can be customized in subclasses not changing the parent" in delivery_methods_test.rb will fail if test_helper_test.rb (in which TestHelperMailerTest is inherited from ActionMailer::TestCase) runs before it. M actionmailer/lib/action_mailer/test_case.rb commit ecd4151 refs/heads/master Merge: ac8ff90 c52cb16 Author: Yves Senn Date: 2014-06-06 16:32:13 +0200 Merge pull request #15533 from sgrif/sg-missing-schema-tests Add missing test cases for schema dumping defaults commit c52cb16 refs/heads/master Author: Sean Griffin Date: 2014-06-05 07:06:09 -0600 Add missing test cases for schema dumping defaults M activerecord/test/cases/schema_dumper_test.rb commit ac8ff90 refs/heads/master Author: Yves Senn Date: 2014-06-06 16:03:13 +0200 credit JoseLuis Torres for #15051. [JoseLuis Torres] [ci skip] M activerecord/CHANGELOG.md commit f5a24be refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-06-06 15:53:33 +0200 `ActiveRecord::SchemaMigration` has no primary key. Before this patch, using `ActiveRecord::Base.primary_key_prefix_type` with `:table_name_with_underscore` would change the `SchemaMigration` model to have a primary key. This resulted in broken queries for PG because it tried to return the inserted PK (which does not exist). Closes #15051. Closes #15419. Conflicts: activerecord/lib/active_record/schema_migration.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb commit 5655fce refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-06 15:53:33 +0200 `ActiveRecord::SchemaMigration` has no primary key. Before this patch, using `ActiveRecord::Base.primary_key_prefix_type` with `:table_name_with_underscore` would change the `SchemaMigration` model to have a primary key. This resulted in broken queries for PG because it tried to return the inserted PK (which does not exist). Closes #15051. Closes #15419. M activerecord/CHANGELOG.md M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb commit 8fa8b71 refs/heads/master Author: Yves Senn Date: 2014-06-06 15:53:33 +0200 `ActiveRecord::SchemaMigration` has no primary key. Before this patch, using `ActiveRecord::Base.primary_key_prefix_type` with `:table_name_with_underscore` would change the `SchemaMigration` model to have a primary key. This resulted in broken queries for PG because it tried to return the inserted PK (which does not exist). Closes #15051. Closes #15419. M activerecord/CHANGELOG.md M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb commit d23cbbb refs/heads/master Author: Yves Senn Date: 2014-06-06 15:47:57 +0200 test refactor, don't hardcode default for `table_name_prefix`. M activerecord/test/cases/ar_schema_test.rb commit 89845ff refs/heads/master Author: Yves Senn Date: 2014-06-06 15:38:14 +0200 test refactor, don't hardcode `primary_key_prefix_type` default. /cc @zuhao M activerecord/test/cases/primary_keys_test.rb commit 69274ce refs/heads/master Author: Yves Senn Date: 2014-06-06 15:08:28 +0200 serialized Type should delegate `type_cast_for_write` to underlying Type This adds a regression test for #14411, which was fixed by #15503. Closes #14411 Closes #14595 M activerecord/lib/active_record/type/serialized.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit 485dab4 refs/heads/master Merge: 8d77436 c3bd7b5 Author: Yves Senn Date: 2014-06-06 14:11:54 +0200 Merge pull request #15503 from sgrif/sg-json-hstore-storage Bring type casting behavior of hstore/json in line with serialized commit a9b9b01 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-05-27 04:45:53 +0930 Skip individual tests upon Dalli::RingError Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem. M actionpack/test/dispatch/session/mem_cache_store_test.rb commit 96882f8 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-05-27 04:45:53 +0930 Skip individual tests upon Dalli::RingError Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem. M actionpack/test/dispatch/session/mem_cache_store_test.rb commit 8d77436 refs/heads/master Merge: e3cd80b e7b0947 Author: Yves Senn Date: 2014-06-06 12:39:23 +0200 Merge pull request #15540 from nbibler/http-headers-set Use a frozen Set instance for CGI_VARIABLES. commit 5839571 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-06-06 12:16:48 +0200 `bin/rake db:migrate:status` works with legacy migration numbers. The migration numbers were normalized different ways. This left the task output in an inconsistent state. Closes #15538. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb commit 128ad1b refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-06 12:16:48 +0200 `bin/rake db:migrate:status` works with legacy migration numbers. The migration numbers were normalized different ways. This left the task output in an inconsistent state. Closes #15538. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb commit e3cd80b refs/heads/master Author: Yves Senn Date: 2014-06-06 12:16:48 +0200 `bin/rake db:migrate:status` works with legacy migration numbers. The migration numbers were normalized different ways. This left the task output in an inconsistent state. Closes #15538. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb commit 6c6f335 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-06 09:21:38 +0200 docs, fix type in foreign key. Example uses Post not Article. [ci skip] M guides/source/active_record_querying.md commit b0f221b refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-06-06 09:16:12 +0200 docs, update `includes` + `where` example in AR guide. [ci skip] Closes #15541. Conflicts: guides/source/active_record_querying.md M guides/source/active_record_querying.md commit 92f9ada refs/heads/master Author: Yves Senn Date: 2014-06-06 09:16:12 +0200 docs, update `includes` + `where` example in AR guide. [ci skip] Closes #15541. M guides/source/active_record_querying.md commit 0177707 refs/heads/master Merge: aa54c91 71c5d56 Author: Yves Senn Date: 2014-06-06 08:55:25 +0200 Merge pull request #14971 from versioncontrol/#14785 Baseclass becomes! subclass commit e7b0947 refs/heads/master Author: Nathaniel Bibler Date: 2014-06-05 22:05:02 -0400 Use a frozen Set instance for CGI_VARIABLES. Also expand the CGI_VARIABLE name listing to multiple lines for cleaner diffs and legibility. M actionpack/lib/action_dispatch/http/headers.rb commit 5cc7899 refs/heads/master Author: Guo Xiang Tan Date: 2014-06-05 12:33:09 -0700 Remove redundant code. M actionpack/test/controller/render_test.rb commit f81bd7c refs/heads/master Author: Guo Xiang Tan Date: 2014-06-05 12:31:35 -0700 Prevent state leak. M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/new_base/bare_metal_test.rb M actionpack/test/controller/render_test.rb M actionpack/test/controller/send_file_test.rb commit c0f5b73 refs/heads/master Author: Douwe Maan Date: 2014-06-05 22:10:41 +0200 Clean up Arguments somewhat M lib/active_job/arguments.rb commit 694b562 refs/heads/master Merge: f4b42e5 a4a7f02 Author: David Heinemeier Hansson Date: 2014-06-05 21:42:22 +0200 Merge pull request #79 from cristianbica/deep-serialization Deep serialization commit aa54c91 refs/heads/master Merge: 7cd4db0 6470e47 Author: Rafael Mendonça França Date: 2014-06-05 16:26:51 -0300 Merge pull request #15536 from sgrif/sg-remove-whiny-nil-thing Remove optimization that was required with whiny nils commit 6470e47 refs/heads/master Author: Sean Griffin Date: 2014-06-05 13:21:48 -0600 Remove optimization that was required with whiny nils Whiny nils is no longer a thing, so we no longer need this optimization M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 7cd4db0 refs/heads/master Merge: 141e6e8 a076b8c Author: Rafael Mendonça França Date: 2014-06-05 16:20:54 -0300 Merge pull request #15535 from coreyward/patch-1 Avoid misuse of underscore argument commit a076b8c refs/heads/master Author: Corey Ward Date: 2014-06-05 14:17:11 -0500 Avoid misuse of underscore argument Per convention, underscore-only argument names should be used for unused parameters. M actionpack/lib/action_controller/metal/strong_parameters.rb commit 141e6e8 refs/heads/master Merge: 805c31d 5faf77f Author: Matthew Draper Date: 2014-06-06 03:24:48 +0930 Merge pull request #15530 from zuhao/refactor_actionpack_reloader_test Reset callbacks after test. commit 805c31d refs/heads/master Merge: 7ea384b 479c7ca Author: Aaron Patterson Date: 2014-06-05 10:05:53 -0700 Merge pull request #15513 from zenspider/remove_flush_output_buffer Removed CaptureHelper#flush_output_buffer as it is only used in tests. commit 7ea384b refs/heads/master Merge: 4f58b90 fd6df51 Author: Zachary Scott Date: 2014-06-05 10:25:20 -0500 Merge pull request #15523 from gregmolnar/doc_fix document include_blank's usage with a string [ci skip] commit 4f58b90 refs/heads/master Merge: 1b0c214 e767be0 Author: Yves Senn Date: 2014-06-05 16:55:17 +0200 Merge pull request #15532 from zuhao/refactor_actionpack_response_test Restore Response.default_headers after test. commit 1b0c214 refs/heads/master Merge: da19e0d d9be7ad Author: Yves Senn Date: 2014-06-05 16:54:47 +0200 Merge pull request #15531 from zuhao/refactor_actionpack_request_test Avoid hard-coded value in test setup/teardown. commit e767be0 refs/heads/master Author: Zuhao Wan Date: 2014-06-05 22:52:13 +0800 Restore Response.default_headers after test. M actionpack/test/dispatch/response_test.rb commit d9be7ad refs/heads/master Author: Zuhao Wan Date: 2014-06-05 22:39:03 +0800 Avoid hard-coded value in test setup/teardown. M actionpack/test/dispatch/request_test.rb commit 5faf77f refs/heads/master Author: Zuhao Wan Date: 2014-06-05 22:30:53 +0800 Reset callbacks after test. Otherwise the state of callback chain is leaked. M actionpack/test/dispatch/reloader_test.rb commit da19e0d refs/heads/master Merge: e496a25 1bcde3a Author: Yves Senn Date: 2014-06-05 16:08:22 +0200 Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_test Make sure Mime::Type is not altered after tests. commit e496a25 refs/heads/master Merge: 1c39310 f4bd67b Author: Matthew Draper Date: 2014-06-05 23:35:14 +0930 Merge pull request #15521 from edogawaconan/fix_bc_postgres_master Fix BC year handling in postgres commit 1bcde3a refs/heads/master Author: Zuhao Wan Date: 2014-06-05 21:45:13 +0800 Mime::PNG is already defined. M actionpack/test/controller/send_file_test.rb M actionpack/test/dispatch/mime_type_test.rb commit 1c39310 refs/heads/master Merge: bb8b214 6a75e2c Author: Yves Senn Date: 2014-06-05 15:11:44 +0200 Merge pull request #15525 from zuhao/refactor_actionpack_query_string_parsing_test Avoid hardcoded value in test setup/teardown. commit 6a75e2c refs/heads/master Author: Zuhao Wan Date: 2014-06-05 20:12:44 +0800 Avoid hardcoded value in test setup/teardown. M actionpack/test/dispatch/request/query_string_parsing_test.rb commit fd6df51 refs/heads/master Author: Greg Molnar Date: 2014-06-05 13:53:39 +0100 document include_blank's usage with a string [ci skip] M actionview/lib/action_view/helpers/form_tag_helper.rb commit f4bd67b refs/heads/master Author: edogawaconan Date: 2014-06-05 18:31:39 +0900 Fix behavior of handling BC era dates. BC era year is (astronomical year + 1) and starts from 1 BC. M activerecord/lib/active_record/connection_adapters/postgresql/oid/date_time.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/timestamp_test.rb commit bb8b214 refs/heads/master Merge: b2d070d 6da0072 Author: Yves Senn Date: 2014-06-05 11:30:29 +0200 Merge pull request #15512 from akshay-vishnoi/delete-deprecated-method Remove deprecated method ActiveRecord::Migrator.proper_table_name commit 6da0072 refs/heads/master Author: Akshay Vishnoi Date: 2014-06-05 14:48:58 +0530 Remove deprecated method ActiveRecord::Migrator.proper_table_name M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb commit b2d070d refs/heads/master Merge: b4c021e c69baff Author: Matthew Draper Date: 2014-06-05 16:23:47 +0930 Merge pull request #15421 from gchan/time_with_zone_precision Fixed `ActiveSupport::TimeWithZone#-` so precision is not unnecessarily lost commit b4c021e refs/heads/master Merge: 2071a18 d99172e Author: Guillermo Iguaran Date: 2014-06-05 01:35:28 -0500 Merge pull request #15518 from jonathancadepowers/master Added Two Clarification "Tips" [ci skip] commit 2071a18 refs/heads/master Merge: 92cf133 5b66fba Author: Matthew Draper Date: 2014-06-05 15:07:50 +0930 Merge pull request #15515 from leafac/fix-inverse-associations-block-test Fix inverse associations test commit d99172e refs/heads/master Author: Jonathan Powers Date: 2014-06-05 00:26:56 -0500 Update getting_started.md It's not very clear exactly what the "params" method is and does, as the current description in the guide is somewhat vague and brief. An example is helpful, especially considering this method is referenced over 30 times in this guide. [ci skip] M guides/source/getting_started.md commit 4316f2a refs/heads/master Author: Jonathan Powers Date: 2014-06-05 00:25:41 -0500 Update getting_started.md It may be confusing to a Rails newbie why "Article" is suddenly being referred to with the "A" being capitalized. Thus far in the guide, the "a" has always been in lowercase. I think it is helpful to point out the reason for this change (especially since not using the capital "A" will result in an error). [ci skip] M guides/source/getting_started.md commit 5b66fba refs/heads/master Author: Leandro Facchinetti Date: 2014-06-04 23:17:16 -0300 Fix inverse associations test `InverseHasManyTests#test_parent_instance_should_be_shared_within_create_block_of_new_child` was mistakenly the same as `InverseHasManyTests#test_parent_instance_should_be_shared_within_build_block_of_new_child`. M activerecord/test/cases/associations/inverse_associations_test.rb commit 479c7ca refs/heads/master Author: Ryan Davis Date: 2014-06-04 16:30:36 -0700 Removed CaptureHelper#flush_output_buffer as it is only used in tests. reviewed: @tenderlove M actionview/lib/action_view/helpers/capture_helper.rb M actionview/test/template/capture_helper_test.rb D actionview/test/template/output_buffer_test.rb commit 92cf133 refs/heads/master Merge: 3036c40 72f45ba Author: Rafael Mendonça França Date: 2014-06-04 18:33:00 -0300 Merge pull request #15497 from schneems/schneems/levenshtein-generator-failure-messages Emit suggested generator names when not found commit 69107a7 refs/heads/master Author: schneems Date: 2014-06-04 16:30:48 -0500 [ci skip] remove double "in your" M activerecord/lib/active_record/fixtures.rb commit 72f45ba refs/heads/master Author: schneems Date: 2014-06-03 18:22:45 -0500 Emit suggested generator names when not found When someone types in a generator command it currently outputs all generators. Instead we can attempt to find a subtle mis-spelling by running all generator names through a levenshtein_distance algorithm provided by rubygems. So now a failure looks like this: ```ruby $ rails generate migratioooons Could not find generator 'migratioooons'. Maybe you meant 'migration' or 'integration_test' or 'generator' Run `rails generate --help` for more options. ``` If the suggestions are bad we leave the user with the hint to run `rails generate --help` to see all commands. M railties/CHANGELOG.md M railties/lib/rails/generators.rb M railties/test/generators_test.rb commit 3036c40 refs/heads/master Author: Yves Senn Date: 2014-06-04 22:20:59 +0200 have an actual `NullColumn` object and update docs accordingly. Follow up to #15438 and #15502. /cc @sgrif M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/reflection_test.rb commit 31737e0 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-04 17:06:37 -0300 Revert "Correct Documentation for asset_tag_helpers" This reverts commit c22a253d1a72602331db1eba3e91bc945eff2346. Reason: Our documentation assumes the assets are in the proper place and we are using the default Rails stack. With the default Rails stack and the assets being in the correct place the assets helpers uses the `/assets` prefix. M actionview/lib/action_view/helpers/asset_tag_helper.rb commit e2e308b refs/heads/master Merge: 1ce0cc0 e8375a6 Author: Yves Senn Date: 2014-06-04 22:02:25 +0200 Merge pull request #15502 from sgrif/sg-use-null-column Use null column for association key types commit 1ce0cc0 refs/heads/master Merge: 3f7e482 b8f586a Author: Aaron Patterson Date: 2014-06-04 11:45:53 -0700 Merge branch 'master' of github.com:rails/rails * 'master' of github.com:rails/rails: For our build, stick with mail 2.5.x for now Correct result, previously showing wrong result Collapse PG default extractoin of most types to single regex Change wording of explanation about precision & scale of decimal numbers [ci skip] Cleaned up duplicated CHANGELOG entry [ci skip] reuse available belongs_to? method Convert StrongParameters cache to a hash. This fixes an unbounded memory leak demonstrated on @tenderlove's latest blog post: Partially revert deprecation of *_filter Pluralize params Add default_i18n_subject to the guides Fix regression on eager loading association based on SQL query rather than existing column. Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4 Keep column defaults in type cast form Return a null column when no column exists for an attribute Refactor XML serializer to not depend on `serialized_attributes` Test the serialized types of virtual columns in XML implement ActiveRecord::Base#pretty_print + changelog Remove duplicated HashWithIndifferentAccess#with_indifferent_access. commit bea0d10 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-06-05 03:32:42 +0930 For our build, stick with mail 2.5.x for now 2.6 currently has many warnings, which are failing the Travis build. Conflicts: Gemfile M Gemfile commit 54c2d15 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-06-05 03:32:42 +0930 For our build, stick with mail 2.5.x for now 2.6 currently has many warnings, which are failing the Travis build. Conflicts: Gemfile M Gemfile commit b8f586a refs/heads/master Author: Matthew Draper Date: 2014-06-05 03:32:42 +0930 For our build, stick with mail 2.5.x for now 2.6 currently has many warnings, which are failing the Travis build. M Gemfile commit 672864e refs/heads/master Merge: fb5331f 405fd22 Author: Rafael Mendonça França Date: 2014-06-04 14:25:52 -0300 Merge pull request #15504 from sgrif/sg-postgres-defaults Collapse PG default extractoin of most types to single regex commit fb5331f refs/heads/master Merge: 361b68f d5e691a Author: Rafael Mendonça França Date: 2014-06-04 14:18:44 -0300 Merge pull request #15495 from maurogeorge/action-mailer-subject-guides Add default_i18n_subject to the guides commit 361b68f refs/heads/master Merge: ed38c5a f02346b Author: Santiago Pastorino Date: 2014-06-04 13:55:07 -0300 Merge pull request #15505 from akshay-vishnoi/doc_changes Correct result, previously showing wrong result commit f02346b refs/heads/master Author: Akshay Vishnoi Date: 2014-06-04 21:43:41 +0530 Correct result, previously showing wrong result M activesupport/lib/active_support/core_ext/hash/indifferent_access.rb commit ed38c5a refs/heads/master Merge: 0329d59 04919c7 Author: Rafael Mendonça França Date: 2014-06-04 11:03:28 -0300 Merge pull request #15463 from geopet/refactor_xml_compute_type Refactor XML serializer to not depend on `serialized_attributes` commit 405fd22 refs/heads/master Author: Sean Griffin Date: 2014-06-04 07:41:28 -0600 Collapse PG default extractoin of most types to single regex For any type that is represented as a string and then type cast, we do not need separate regular expressions for the various types. No function will match this regex. User defined types *should* match this, so that the type object can decide what to do with the value. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/defaults_test.rb commit c3bd7b5 refs/heads/master Author: Sean Griffin Date: 2014-06-04 06:43:30 -0600 Bring type casting behavior of hstore/json in line with serialized `@raw_attributes` should not contain the type-cast, mutable version of the value. M activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/persistence_test.rb M activerecord/test/cases/serialized_attribute_test.rb commit e8375a6 refs/heads/master Author: Sean Griffin Date: 2014-06-04 06:26:03 -0600 Use null column for association key types M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/lib/active_record/attribute_methods.rb commit 0329d59 refs/heads/master Merge: c5c0bad 4513f35 Author: Yves Senn Date: 2014-06-04 13:32:27 +0200 Merge pull request #15500 from prathamesh-sonpatki/change-wording-of-explanation-about-precision-and-scale-of-decimal-numbers Change wording of explanation about precision & scale of decimal numbers [ci skip] commit c8c58b1 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 09:52:43 -0500 Remove unused variable M activerecord/test/cases/associations/has_many_associations_test.rb commit a3216405 refs/tags/v4.1.2.rc2 Author: Carlos Antonio da Silva Date: 2014-06-04 07:55:59 -0300 Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load Fix regression on eager loading association based on SQL query rather than existing column. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/models/owner.rb commit 1090466 refs/remotes/origin/4-1-stable Author: Carlos Antonio da Silva Date: 2014-06-04 07:55:59 -0300 Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load Fix regression on eager loading association based on SQL query rather than existing column. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/models/owner.rb commit c5c0bad refs/heads/master Merge: 2a6f428 2c555ec Author: Carlos Antonio da Silva Date: 2014-06-04 07:55:59 -0300 Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load Fix regression on eager loading association based on SQL query rather than existing column. Conflicts: activerecord/CHANGELOG.md commit 4513f35 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-06-04 15:37:25 +0530 Change wording of explanation about precision & scale of decimal numbers [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 2a6f428 refs/heads/master Author: Godfrey Chan Date: 2014-06-03 20:13:31 -0700 Cleaned up duplicated CHANGELOG entry [ci skip] M activerecord/CHANGELOG.md commit 4818bb3 refs/heads/master Merge: e4efa18 e63be27 Author: Guillermo Iguaran Date: 2014-06-03 21:48:17 -0500 Merge pull request #15498 from zenspider/fix_memory_leak Convert StrongParameters cache to a hash. This fixes an unbounded memory leak commit e4efa18 refs/heads/master Merge: 489a8f2 3ef8d53 Author: Rafael Mendonça França Date: 2014-06-03 23:24:10 -0300 Merge pull request #15499 from eileencodes/reuse-available-belongs_to-method reuse available belongs_to? method commit 3ef8d53 refs/heads/master Author: eileencodes Date: 2014-06-03 21:56:09 -0400 reuse available belongs_to? method Reflection has a `belongs_to?` method. Instead of checking for `macro == :belongs_to` throughout the source reuse existing method. I also bumped `foreign_key_present?` method onto on line because the `belongs_to?` makes it shorter than other longer lines in the same class. M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/associations/through_association.rb M activerecord/lib/active_record/relation/calculations.rb commit e63be27 refs/heads/master Author: Ryan Davis Date: 2014-06-03 16:57:22 -0700 Convert StrongParameters cache to a hash. This fixes an unbounded memory leak demonstrated on @tenderlove's latest blog post: http://tenderlovemaking.com/2014/06/02/yagni-methods-are-killing-me.html M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 3f7e482 refs/heads/master Author: Aaron Patterson Date: 2014-06-03 16:23:39 -0700 push splitting "to" up the callstack M actionpack/lib/action_dispatch/routing/mapper.rb commit f4b42e5 refs/heads/master Merge: 8a3b137 eaacb88 Author: Rafael Mendonça França Date: 2014-06-03 19:56:34 -0300 Merge pull request #82 from cristianbica/disable-schedule-on-inline-adapter Raise exception for scheduling jobs in the inline adapter commit 489a8f2 refs/heads/master Author: Rafael Mendonça França Date: 2014-06-03 19:53:28 -0300 Partially revert deprecation of *_filter We are going to deprecate only on Rails 5 to make easier plugin maintainers support different Rails versions. Right now we are only discouraging their usage. This reverts commit 6c5f43bab8206747a8591435b2aa0ff7051ad3de. Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/callbacks.rb M actionpack/test/abstract/callbacks_test.rb commit 1c6bb0e refs/heads/master Merge: 18d19bf fb2a1c4 Author: Rafael Mendonça França Date: 2014-06-03 19:30:34 -0300 Merge pull request #15438 from sgrif/sg-null-column Return a null column when no column exists for an attribute Conflicts: activerecord/CHANGELOG.md commit 18d19bf refs/heads/master Merge: 5146f3a 223e118 Author: Rafael Mendonça França Date: 2014-06-03 19:10:33 -0300 Merge pull request #15349 from tgxworld/remove_duplicated_method_call Remove duplicated HashWithIndifferentAccess#with_indifferent_access. commit 5146f3a refs/heads/master Merge: a58dfea 35983ea Author: Rafael Mendonça França Date: 2014-06-03 19:02:28 -0300 Merge pull request #15172 from notEthan/active_record_pretty_print implement ActiveRecord::Base#pretty_print Conflicts: activerecord/CHANGELOG.md commit c3f6899 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-06-03 18:42:57 -0300 Merge pull request #15493 from bf4/relax_mail_dep Relax mail gem constraint from ~> 2.5.4 to ~> 2.5 M actionmailer/actionmailer.gemspec commit 3d2f340 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-03 18:42:57 -0300 Merge pull request #15493 from bf4/relax_mail_dep Relax mail gem constraint from ~> 2.5.4 to ~> 2.5 M actionmailer/actionmailer.gemspec commit d5e691a refs/heads/master Author: Mauro George Date: 2014-06-03 18:58:16 -0300 Pluralize params M guides/source/i18n.md commit a58dfea refs/heads/master Merge: fcd4d8a ed559d4 Author: Rafael Mendonça França Date: 2014-06-03 18:49:50 -0300 Merge pull request #15492 from sgrif/sg-dirty-defaults Keep column defaults in type cast form commit fcd4d8a refs/heads/master Merge: f39fad0 bb0890d Author: Rafael Mendonça França Date: 2014-06-03 18:42:57 -0300 Merge pull request #15493 from bf4/relax_mail_dep Relax mail gem constraint from ~> 2.5.4 to ~> 2.5 commit f39fad0 refs/heads/master Author: Aaron Patterson Date: 2014-06-03 14:40:41 -0700 force table creation M activerecord/test/cases/adapters/postgresql/bit_string_test.rb commit f5ae493 refs/heads/master Author: Mauro George Date: 2014-06-03 18:39:39 -0300 Add default_i18n_subject to the guides [ci skip] M guides/source/i18n.md commit d516971 refs/heads/master Merge: df8e89e 6976c72 Author: Rafael Mendonça França Date: 2014-06-03 18:38:00 -0300 Merge pull request #15447 from akshay-vishnoi/test-cases Test `except!` in other cases too commit df8e89e refs/heads/master Author: Aaron Patterson Date: 2014-06-03 14:07:20 -0700 oops! :bomb: D actionpack/aaron_path.dot D actionpack/ebi_path.dot commit cc26b6b refs/heads/master Author: Aaron Patterson Date: 2014-06-03 14:05:16 -0700 Routes specifying 'to:' must be a string that contains a "#" or a rack application. Use of a symbol should be replaced with `action: symbol`. Use of a string without a "#" should be replaced with `controller: string`. M actionpack/CHANGELOG.md A actionpack/aaron_path.dot A actionpack/ebi_path.dot M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/request/multipart_params_parsing_test.rb M actionpack/test/dispatch/routing_test.rb commit 9b09e60 refs/heads/master Author: Yves Senn Date: 2014-06-03 22:30:55 +0200 Revert "test pg, we don't care about the internal state of `column#default`." Revert "test pg, remove unused column assignments. Follow up to 254cdf47" Related to #15492 This reverts commit 254cdf4728291277f3fbaa854f34495030e476b4. This reverts commit 4bcf9029452e0c760af04faab6b549710401e8cf. There are public methods that assume `Column#default` is type casted. The return value of `Column#default` is publicly relevant and should not change. /cc @sgrif M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bit_string_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/geometric_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/money_test.rb commit 2c555ec refs/heads/master Author: Lauro Caetano Date: 2014-06-02 23:07:02 -0300 Fix regression on eager loading association based on SQL query rather than existing column. Fixes #15480. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/models/owner.rb commit 4097ff5 refs/heads/master Author: Aaron Patterson Date: 2014-06-03 11:42:45 -0700 use the factory method to construct the mapping M actionpack/test/dispatch/mapper_test.rb commit e3df1dd refs/heads/master Author: Aaron Patterson Date: 2014-06-03 11:36:32 -0700 add tests for mixing :to and controller / action M actionpack/test/dispatch/routing_test.rb commit af1c866 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 16:05:27 -0700 push some options munging to an alternate constructor M actionpack/lib/action_dispatch/routing/mapper.rb commit a217071 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 15:54:56 -0700 add tests for nested lambda constraints M actionpack/test/controller/routing_test.rb commit 522038a refs/heads/master Author: Aaron Patterson Date: 2014-05-30 15:21:38 -0700 move options_constraints tests next to each other M actionpack/lib/action_dispatch/routing/mapper.rb commit 5029c37 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 15:14:04 -0700 only do is_a checks on `formatted` once M actionpack/lib/action_dispatch/routing/mapper.rb commit 10c1787 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 15:10:41 -0700 push options_constraints processing up this lets us reduce is_a checks on the options_constraints and push "callable constraints" verification to the right place. M actionpack/lib/action_dispatch/routing/mapper.rb commit eaaf899 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 14:37:20 -0700 remove options as an ivar M actionpack/lib/action_dispatch/routing/mapper.rb commit 981029b refs/heads/master Author: Aaron Patterson Date: 2014-05-30 14:24:22 -0700 only do Regexp === option once M actionpack/lib/action_dispatch/routing/mapper.rb commit 404feeb refs/heads/master Author: Aaron Patterson Date: 2014-05-30 14:20:55 -0700 return early from add_request_method M actionpack/lib/action_dispatch/routing/mapper.rb commit 92d16ec refs/heads/master Author: Aaron Patterson Date: 2014-05-30 14:20:20 -0700 only loop over `options` once (hopefully) M actionpack/lib/action_dispatch/routing/mapper.rb commit c0fc116 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 14:12:50 -0700 only loop through constraints once M actionpack/lib/action_dispatch/routing/mapper.rb commit 4d3955a refs/heads/master Author: Aaron Patterson Date: 2014-05-30 13:58:00 -0700 change defaults allocation to a one-liner M actionpack/lib/action_dispatch/routing/mapper.rb commit d00bbe6 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 12:08:32 -0700 no longer need the scope ivar M actionpack/lib/action_dispatch/routing/mapper.rb commit 03de3a0 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 12:04:24 -0700 only look up scope[:module] once M actionpack/lib/action_dispatch/routing/mapper.rb commit 43d2105 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 12:00:33 -0700 remove IGNORE_OPTIONS M actionpack/lib/action_dispatch/routing/mapper.rb commit 5b71006 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:55:36 -0700 :only is never used in Mapping, so rm the key M actionpack/lib/action_dispatch/routing/mapper.rb commit c94504c refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:46:54 -0700 remove :defaults from the IGNORE_OPTIONS list M actionpack/lib/action_dispatch/routing/mapper.rb commit 82f1157 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:42:31 -0700 remove :constraints from IGNORE_OPTIONS M actionpack/lib/action_dispatch/routing/mapper.rb commit 3346d52 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:40:17 -0700 disconnect normalize_defaults! from options[:constraints] M actionpack/lib/action_dispatch/routing/mapper.rb commit 496e25a refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:36:12 -0700 disconnect options and scope from the `blocks` method M actionpack/lib/action_dispatch/routing/mapper.rb commit e975b7d refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:29:37 -0700 disconnect the constraints method from the options and scope hashes M actionpack/lib/action_dispatch/routing/mapper.rb commit 4bc441c refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:19:57 -0700 :on is removed from options before the Mapping is instantiated, so remove it from IGNORE_OPTIONS M actionpack/lib/action_dispatch/routing/mapper.rb commit fb9f01b refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:16:20 -0700 pull up via extraction and remove it from options / IGNORE_OPTIONS M actionpack/lib/action_dispatch/routing/mapper.rb commit 2c32e94 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:12:57 -0700 always make :via a list M actionpack/lib/action_dispatch/routing/mapper.rb commit 6a3cbac refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:12:01 -0700 always pull out a via variable and simplify logic M actionpack/lib/action_dispatch/routing/mapper.rb commit 16e2107 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:01:00 -0700 test with an empty via M actionpack/test/dispatch/routing_test.rb commit 57d0da8 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 11:00:00 -0700 add a test for missing "via" parameter M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit c91648b refs/heads/master Author: Aaron Patterson Date: 2014-05-30 10:50:58 -0700 remove :as and :anchor from IGNORE_OPTIONS M actionpack/lib/action_dispatch/routing/mapper.rb commit 5491710 refs/heads/master Author: Aaron Patterson Date: 2014-05-30 10:48:20 -0700 remove another value from IGNORE_OPTIONS M actionpack/lib/action_dispatch/routing/mapper.rb commit a04767d refs/heads/master Author: Aaron Patterson Date: 2014-05-30 10:46:00 -0700 shorten up IGNORE_OPTIONS since we are now passing the format value around, we can remove it from the options hash, which means we don't need to consult as many values from IGNORE_OPTIONS M actionpack/lib/action_dispatch/routing/mapper.rb commit f28788b refs/heads/master Author: Aaron Patterson Date: 2014-05-30 10:44:07 -0700 only look up the format option from the hash once M actionpack/lib/action_dispatch/routing/mapper.rb commit 7a25444 refs/heads/master Merge: 4bcf902 74a756a Author: Matthew Draper Date: 2014-06-04 02:54:40 +0930 Merge pull request #15486 from sgrif/sg-binary-quoting Refactor quoting of binary data to not be based on the column type commit bb0890d refs/heads/master Author: Benjamin Fleischer Date: 2014-06-03 11:35:38 -0500 Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4 This allows Rails users to install mail 2.6 which relaxes the mime-types dependency, which is a big win for a lot of people. Previously, the mail gem restricted mime-types to ~> 1.16 but now it has expanded to [">= 1.16", "< 3"] And the mime-types maintainer will also be checking that 2.x releases don't break mail. See https://github.com/mikel/mail/pull/713 https://rubygems.org/gems/mail/versions/2.6.0 M actionmailer/actionmailer.gemspec commit ed559d4 refs/heads/master Author: Sean Griffin Date: 2014-06-03 08:23:30 -0600 Keep column defaults in type cast form The contract of `_field_changed?` assumes that the old value is always type cast. That is not the case for the value in `Column#default` as things are today. It appears there are other public methods that assume that `Column#default` is type cast, as well. The reason for this change originally was because the value gets put into `@raw_attributes` in initialize. This reverts to the old behavior on `Column`, and updates `initialize` to make sure that the values are in the right format. M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/properties.rb M activerecord/test/cases/dirty_test.rb commit 4bcf902 refs/heads/master Author: Yves Senn Date: 2014-06-03 17:56:57 +0200 test pg, remove unused column assignments. Follow up to 254cdf47 M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bit_string_test.rb M activerecord/test/cases/adapters/postgresql/geometric_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 9e86428 refs/heads/master Author: Yves Senn Date: 2014-06-03 17:54:25 +0200 pg, preserve money type when dumping schema and extract money default. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/bit_string_test.rb M activerecord/test/cases/adapters/postgresql/money_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 0690250 refs/heads/master Author: Yves Senn Date: 2014-06-03 17:38:50 +0200 test pg, rm unused requires. M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bytea_test.rb M activerecord/test/cases/adapters/postgresql/citext_test.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb M activerecord/test/cases/adapters/postgresql/domain_test.rb M activerecord/test/cases/adapters/postgresql/extension_migration_test.rb M activerecord/test/cases/adapters/postgresql/full_text_test.rb M activerecord/test/cases/adapters/postgresql/ltree_test.rb M activerecord/test/cases/adapters/postgresql/network_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb M activerecord/test/cases/adapters/postgresql/xml_test.rb commit fb2a1c4 refs/heads/master Author: Sean Griffin Date: 2014-05-30 15:57:42 -0700 Return a null column when no column exists for an attribute M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/test/cases/reflection_test.rb commit 74a756a refs/heads/master Author: Sean Griffin Date: 2014-06-03 08:08:50 -0600 Refactor quoting of binary data to not be based on the column type M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/type/binary.rb commit 5e15edf refs/heads/master Merge: aea8cd4 3bc4e9e Author: Yves Senn Date: 2014-06-03 16:41:20 +0200 Merge pull request #15487 from sgrif/sg-bit-limit Respect limit for PG bit strings commit 3bc4e9e refs/heads/master Author: Sean Griffin Date: 2014-06-03 08:39:29 -0600 Respect limit for PG bit strings M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/bit_string_test.rb commit aea8cd4 refs/heads/master Merge: fcd5e56 cf64d10 Author: Yves Senn Date: 2014-06-03 16:33:09 +0200 Merge pull request #15442 from sgrif/sg-refactor-field-changed Refactor determination of whether the field has changed commit fcd5e56 refs/heads/master Author: Yves Senn Date: 2014-06-03 16:17:59 +0200 pg, preserve type when schema dumping bit and bit varying columns. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/bit_string_test.rb commit cf64d10 refs/heads/master Author: Sean Griffin Date: 2014-05-30 17:36:27 -0700 Refactor determination of whether the field has changed The types know more about what is going on than the dirty module. Let's ask them! M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/type/numeric.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb commit 51f2471 refs/heads/master Author: Yves Senn Date: 2014-06-03 15:58:29 +0200 test pg, move bit string type tests into `bit_string_test.rb`. A activerecord/test/cases/adapters/postgresql/bit_string_test.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 254cdf4 refs/heads/master Author: Yves Senn Date: 2014-06-03 14:57:02 +0200 test pg, we don't care about the internal state of `column#default`. That data is internal to Active Record. What we care about is that new records have the right default value. M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/geometric_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 098bb63 refs/heads/master Author: Yves Senn Date: 2014-06-03 13:56:21 +0200 pg, preserve point type when schema dumping. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/geometric_test.rb M activerecord/test/cases/schema_dumper_test.rb commit ed1b747 refs/heads/master Author: Yves Senn Date: 2014-06-03 13:46:32 +0200 pg test, examples for default values and schema dumping of point types. /cc @sgrif M activerecord/test/cases/adapters/postgresql/geometric_test.rb A activerecord/test/support/schema_dumping_helper.rb commit eaacb88 refs/heads/master Author: Cristian Bica Date: 2014-06-03 01:04:08 +0300 Raise exception for scheduling jobs in the inline adapter M lib/active_job/queue_adapters/inline_adapter.rb commit b79e22c refs/heads/master Merge: e2a97ad 46acd8b Author: Yves Senn Date: 2014-06-03 08:58:22 +0200 Merge pull request #15483 from eileencodes/reuse-available-reflection-polymorphic-methods fix polymorphic? method and reuse it commit 46acd8b refs/heads/master Author: eileencodes Date: 2014-06-02 14:14:08 -0400 fix polymorphic? method and reuse it Fix polymorphic to check for `options[:polymorphic]` instead of `options.key? :polymorphic` and then reuse the method `polymorphic?` method instead of constantly checking the same `options[:polymorphic]`. M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/reflection.rb commit e2a97ad refs/heads/master Author: Aaron Patterson Date: 2014-06-02 16:43:47 -0700 call `capture` fewer times from `form_for` M actionview/lib/action_view/helpers/form_helper.rb M actionview/lib/action_view/helpers/form_tag_helper.rb commit 8899503 refs/heads/master Author: Aaron Patterson Date: 2014-06-02 16:12:18 -0700 drastically reduce object allocations before this change, we were allocating AS::SafeBuffer objects that were being interpolated in to a string, so the safe buffer object was being thrown away. This change only allocates a string (vs a string *and* a safebuffer) and interpolates the string. On my test application, this reduced the AS::SafeBuffer objects from 1527k per request to about 500 per request. M actionview/lib/action_view/helpers/tag_helper.rb M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 29a1b77 refs/heads/master Author: Aaron Patterson Date: 2014-06-02 15:46:02 -0700 reduce AS::SafeBuffer allocations html_escape_interpolated_argument is only used in mutation methods: https://github.com/rails/rails/blob/c07d09559ec171e1904b55c7ad7e8c7d586ca51b/activesupport/lib/active_support/core_ext/string/output_safety.rb#L174 https://github.com/rails/rails/blob/c07d09559ec171e1904b55c7ad7e8c7d586ca51b/activesupport/lib/active_support/core_ext/string/output_safety.rb#L179 The return value doesn't need to be converted to an AS::SafeBuffer since we know that the current object is an AS::SafeBuffer and will be mutated, and the return value from html_escape_interpolated_argument will be thrown away M activesupport/lib/active_support/core_ext/string/output_safety.rb commit a4a7f02 refs/heads/master Author: Cristian Bica Date: 2014-06-03 00:54:07 +0300 Fixed Hash deserialisation M lib/active_job/arguments.rb M test/cases/parameters_test.rb commit c07d095 refs/heads/master Merge: 9e4bb99 032a8d9 Author: Guillermo Iguaran Date: 2014-06-02 16:52:39 -0500 Merge pull request #15475 from sgrif/sg-initialize-attributes Remove unused `initialize_attributes` method commit ba3ae62 refs/heads/master Author: Cristian Bica Date: 2014-05-31 17:31:20 +0300 Deep serialization M lib/active_job/arguments.rb M test/cases/parameters_test.rb commit 9e4bb99 refs/heads/master Author: Aaron Patterson Date: 2014-06-02 14:26:36 -0700 concat is a hotspot (via AV#append=), so just directly define the methods M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 6b6eb94 refs/heads/master Merge: 083f8e0 742b574 Author: Arthur Nogueira Neves Date: 2014-06-02 15:51:43 -0500 Merge pull request #15477 from aripollak/actioncontroller-overview-typo Fix typo in ActionController Overview commit 742b574 refs/heads/master Author: Ari Pollak Date: 2014-06-02 16:43:43 -0400 Fix typo in ActionController Overview * Should say "sensitive" instead of "sensible" M guides/source/action_controller_overview.md commit 083f8e0 refs/heads/master Merge: 2005e35 1da201b Author: Rafael Mendonça França Date: 2014-06-02 17:16:30 -0300 Merge pull request #15474 from unixmonkey/master File.exist? instead of File.exists? in bin/setup commit 2005e35 refs/heads/master Merge: b5d53f8 9b9dec5 Author: Zachary Scott Date: 2014-06-02 13:15:30 -0700 Merge pull request #15473 from sgrif/sg-missing-colon Add missing colon to internal [ci skip] commit 8ac5b94 refs/remotes/origin/4-1-stable Author: Guillermo Iguaran Date: 2014-02-28 19:26:04 -0500 Merge pull request #14195 from robin850/issue-14079 Avoid namespacing routes inside engines Conflicts: railties/CHANGELOG.md Closes #15376 M railties/CHANGELOG.md M railties/lib/rails/generators/rails/controller/controller_generator.rb M railties/test/generators/plugin_generator_test.rb commit 032a8d9 refs/heads/master Author: Sean Griffin Date: 2014-06-02 13:51:05 -0600 Remove unused `initialize_attributes` method This was previously a hook for a special case related to `serialize`, which has since been removed. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/relation/calculations.rb commit 9b9dec5 refs/heads/master Author: Sean Griffin Date: 2014-06-02 13:42:50 -0600 Add missing colon to internal M activerecord/lib/active_record/properties.rb commit 1da201b refs/heads/master Author: David Jones Date: 2014-06-02 15:31:09 -0400 File.exist? instead of File.exists? in bin/setup File.exists? is deprecated in Ruby 2.1+ https://github.com/ruby/ruby/blob/v2_1_2/file.c#L1413 M railties/lib/rails/generators/rails/app/templates/bin/setup commit b5d53f8 refs/heads/master Author: Aaron Patterson Date: 2014-06-02 10:09:13 -0700 just use `assert` M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit c345365 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-06-02 13:56:22 -0300 Merge pull request #15379 from xuanxu/rational_precision Fix AS::NumberHelper results with rationals Conflicts: activesupport/CHANGELOG.md M actionview/test/template/number_helper_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit f71265f refs/heads/master Merge: 38454bb 60062cf Author: Rafael Mendonça França Date: 2014-06-02 13:56:22 -0300 Merge pull request #15379 from xuanxu/rational_precision Fix AS::NumberHelper results with rationals commit 38454bb refs/heads/master Merge: 14a1cb7 a8439bc Author: Matthew Draper Date: 2014-06-03 01:41:57 +0930 Merge pull request #15464 from tgxworld/improve_notifications_logic Improvements to ActiveSupport::Notifications. commit 0713738 refs/heads/master Author: schneems Date: 2014-06-02 10:42:48 -0500 [ci skip] explain association behavior. When you manually specify `id:` attribute in a fixture Rails' built in association assignment feature will no longer work. http://stackoverflow.com/questions/23985675/incorrect-association-in-fixtures This commit raises awareness of this behavior and encourages developers to look directly at the fixture documentation. M guides/source/testing.md commit a93f385 refs/heads/master Author: schneems Date: 2014-06-02 10:38:03 -0500 [ci skip] add fixture docs link to guides The fixtures API docs are really comprehensive. We should either be driving people there, or perhaps making fixtures its own guide. M guides/source/testing.md commit 654b331 refs/heads/master Author: schneems Date: 2014-06-02 10:33:10 -0500 [ci skip] less derogatory explanation of defaults M activerecord/lib/active_record/fixtures.rb commit 319a8ac refs/heads/master Author: schneems Date: 2014-06-02 10:16:23 -0500 [ci skip] fix "note" syntax M activerecord/lib/active_record/fixtures.rb commit 14a1cb7 refs/heads/master Author: Yves Senn Date: 2014-06-02 16:40:33 +0200 docs, fix typo [ci skip] M activerecord/lib/active_record/type/value.rb commit d7ba8b7 refs/heads/master Author: Yves Senn Date: 2014-06-02 13:21:12 +0200 test pg, add basic test cases for point datatype. A activerecord/test/cases/adapters/postgresql/geometric_test.rb commit f17fa8e refs/heads/master Author: Yves Senn Date: 2014-06-02 08:58:12 +0200 pg, inline casting methods into `OID::Type` objects. This inlines casting for the most obvious types. The rest will follow eventually. I need to put some tests in place, to make sure that the inlining is not causing regressions. /cc @sgrif M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 4c66ab2 refs/heads/master Author: Zachary Scott Date: 2014-06-01 19:11:39 -0700 Feature requests should be made on the mailing list, not submitted to the issue tracker. See also #15455 [ci skip] M actionmailer/README.rdoc M actionpack/README.rdoc M actionview/README.rdoc M activemodel/README.rdoc M activerecord/README.rdoc M activesupport/README.rdoc M railties/README.rdoc commit fab8d07 refs/heads/master Merge: 87cc918 e08494a Author: Guillermo Iguaran Date: 2014-06-01 18:53:46 -0500 Merge pull request #15444 from sgrif/sg-yaml-new-record New records should remain new after yaml serialization commit e08494a refs/heads/master Author: Sean Griffin Date: 2014-05-31 06:01:59 -0700 New records should remain new after yaml serialization M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/yaml_serialization_test.rb commit a8439bc refs/heads/master Author: Guo Xiang Tan Date: 2014-06-01 13:45:27 -0700 Avoid looping through subscribers when unsubscribing with a subscriber object. M activesupport/lib/active_support/notifications/fanout.rb commit 87cc918 refs/heads/master Author: Zachary Scott Date: 2014-06-01 14:02:04 -0700 :nail_care: for migrations guide from #15457 [ci skip] M guides/source/migrations.md commit 1cfa4cc refs/heads/master Merge: 53c26fc 9477f43 Author: Zachary Scott Date: 2014-06-01 13:59:22 -0700 Merge pull request #15457 from maurogeorge/add-changing-columns Create Changing Columns on migrations guides [ci skip] commit 53c26fc refs/heads/master Author: Zachary Scott Date: 2014-06-01 13:56:09 -0700 Remove docs regarding grouping multiple values, as we should avoid duplicating API reference in guides. Also :scissors: [ci skip] M guides/source/active_record_querying.md commit 22820f7 refs/heads/master Merge: 02ee081 0885506 Author: Zachary Scott Date: 2014-06-01 13:54:56 -0700 Merge pull request #15459 from maurogeorge/add-total-grouped-items Add Total of grouped items to Active Record query interface on guides [ci skip] commit a67fdc0 refs/heads/master Author: Guo Xiang Tan Date: 2014-06-01 13:40:07 -0700 Update documentation to reflect unsubscription with name. M activesupport/lib/active_support/notifications.rb M activesupport/lib/active_support/notifications/fanout.rb commit 02ee081 refs/heads/master Merge: 260c384 90c8be7 Author: Yves Senn Date: 2014-06-01 22:24:01 +0200 Merge pull request #15435 from sgrif/sg-rm-serialization Remove most code related to serialized properties commit 04919c7 refs/heads/master Author: Geoff Petrie & Sean Griffin Date: 2014-06-01 12:00:24 -0600 Refactor XML serializer to not depend on `serialized_attributes` M activerecord/lib/active_record/serializers/xml_serializer.rb commit 29cbfa2 refs/heads/master Author: Geoff Petrie & Sean Griffin Date: 2014-06-01 11:40:40 -0600 Test the serialized types of virtual columns in XML The previous tests were passing, because nothing ever looked at the generated XML. What was previously being generated was `...`, which is not consistent with all other cases where there is not a known type. M activerecord/lib/active_record/serializers/xml_serializer.rb M activerecord/test/cases/xml_serialization_test.rb commit 90c8be7 refs/heads/master Author: Sean Griffin Date: 2014-05-30 09:29:22 -0700 Remove most code related to serialized properties Nearly completely implemented in terms of custom properties. `_before_type_cast` now stores the raw serialized string consistently, which removes the need to keep track of "state". The following is now consistently true: - `model.serialized == model.reload.serialized` - A model can be dumped and loaded infinitely without changing - A model can be saved and reloaded infinitely without changing M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/serialized_attribute_test.rb commit 260c384 refs/heads/master Merge: 75f75a8 9373462 Author: Yves Senn Date: 2014-06-01 18:55:55 +0200 Merge pull request #15432 from sgrif/sg-coder-type-casting Don't change values in `@raw_attributes` during serialization commit 9373462 refs/heads/master Author: Sean Griffin Date: 2014-05-30 13:06:05 -0700 Don't change values in `@raw_attributes` during serialization During `init_with`, the attributes given to the coder will be placed into `@raw_attributes`. As such, we should read from `@raw_attributes` when encoding, rather than `@attributes`, which has been type cast. M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/test/cases/store_test.rb M activerecord/test/cases/yaml_serialization_test.rb commit 75f75a8 refs/heads/master Merge: 4ae90a7 48b3257 Author: Yves Senn Date: 2014-06-01 18:23:10 +0200 Merge pull request #14881 from robin850/patch-19 Swallow bundler exceptions when running tests commit df6dc1b refs/heads/master Author: Wojciech Wnętrzak Date: 2014-06-01 17:27:17 +0200 Added missing test case for migrations when using sql structure M railties/test/application/test_test.rb commit 0885506 refs/heads/master Author: Mauro George Date: 2014-06-01 10:58:24 -0300 Add Total of grouped items to AR query interface on guides [ci skip] M guides/source/active_record_querying.md commit 9477f43 refs/heads/master Author: Mauro George Date: 2014-06-01 09:55:11 -0300 Create Changing Columns on migrations guides [ci skip] M guides/source/migrations.md commit 4ae90a7 refs/heads/master Merge: 26c38fe 1913f1e Author: Vijay Dev Date: 2014-06-01 11:46:37 +0000 Merge branch 'master' of github.com:rails/docrails commit 26c38fe refs/heads/master Merge: a70b9ba 6237ebc Author: Matthew Draper Date: 2014-06-01 20:39:47 +0930 Merge pull request #15456 from jonatack/patch-7 config.assets.digests -> config.assets.digest commit 6237ebc refs/heads/master Author: Jon Atack Date: 2014-06-01 12:40:47 +0200 config.assets.digests -> config.assets.digest in Asset Pipeline guide. [skip ci] M guides/source/asset_pipeline.md commit a70b9ba refs/heads/master Author: Zachary Scott Date: 2014-05-31 12:17:06 -0700 Removed 'Caching with Rails' guide from WIP, this guide isn't ready to be published and requires more attention. [ci skip] M guides/source/documents.yaml commit ae12f79 refs/heads/master Merge: 84d956e d7c06a3 Author: Richard Schneeman Date: 2014-05-31 13:29:13 -0500 Merge pull request #15449 from aditya-kapoor/correct-debug-doc [ci skip] correct doc for ActionView::Helpers::DebugHelper commit 84d956e refs/heads/master Author: Zachary Scott Date: 2014-05-31 11:21:56 -0700 Missing period from AP/CHANGELOG [ci skip] M actionpack/CHANGELOG.md commit d7c06a3 refs/heads/master Author: Aditya Kapoor Date: 2014-05-31 23:44:34 +0530 [ci skip] correct doc for ActionView::Helpers::DebugHelper M actionview/lib/action_view/helpers/debug_helper.rb commit 60062cf refs/heads/master Author: Juanjo Bazán Date: 2014-05-28 12:40:42 +0200 Fix AS::NumberHelper results with rationals :precision was incorrectly being applied to Rationals before: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.3" after: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.33" M actionview/test/template/number_helper_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit ccda54a refs/heads/master Merge: 4d83c2a 79b88e0 Author: Carlos Antonio da Silva Date: 2014-05-31 14:57:21 -0300 Merge pull request #15448 from akshay-vishnoi/doc_changes [ci skip] Correct output of Hash#symbolize_keys commit 79b88e0 refs/heads/master Author: Akshay Vishnoi Date: 2014-05-31 22:59:38 +0530 [ci skip] Correct output of Hash#symbolize_keys M activesupport/lib/active_support/core_ext/hash/keys.rb commit 4d83c2a refs/heads/master Merge: b186718 6c5763b Author: Yves Senn Date: 2014-05-31 19:10:19 +0200 Merge pull request #15434 from sgrif/sg-clear-caches Clear all caches calculated based on `@columns` when `@columns` changes commit 6976c72 refs/heads/master Author: Akshay Vishnoi Date: 2014-05-31 22:40:00 +0530 Test `except!` in other cases too M activesupport/test/core_ext/hash_ext_test.rb commit b186718 refs/heads/master Author: Robin Dupret Date: 2014-05-31 19:08:49 +0200 Tiny formatting fix in AS change log [ci skip] M activesupport/CHANGELOG.md commit b73dd62 refs/heads/master Merge: 7c63947 775a13c Author: Robin Dupret Date: 2014-05-31 17:32:15 +0200 Merge pull request #15446 from akshay-vishnoi/doc_changes [ci skip] Correct documentation of HashWithIndifferentAccess#dup commit 7c63947 refs/heads/master Merge: 3051356 f7b0f4f Author: Zachary Scott Date: 2014-05-31 08:24:42 -0700 Merge pull request #15445 from krautcomputing/fix_asset_host_docs Update documentation for setting asset_host to a Proc [ci skip] commit 775a13c refs/heads/master Author: Akshay Vishnoi Date: 2014-05-31 20:38:28 +0530 [ci skip] Correct documentation of HashWithIndifferentAccess#dup M activesupport/lib/active_support/hash_with_indifferent_access.rb commit f7b0f4f refs/heads/master Author: Manuel Meurer Date: 2014-05-31 17:02:49 +0200 Update documentation for setting asset_host to a Proc, mention that the request parameter might not be supplied [ci skip] M actionview/lib/action_view/helpers/asset_url_helper.rb commit 6c5763b refs/heads/master Author: Sean Griffin Date: 2014-05-30 13:51:27 -0700 Clear all caches calculated based on `@columns` when `@columns` changes M activerecord/lib/active_record/properties.rb M activerecord/test/cases/custom_properties_test.rb commit 3051356 refs/heads/master Merge: 4f319ce 7c8f88c Author: Yves Senn Date: 2014-05-31 11:49:50 +0200 Merge pull request #15437 from sgrif/sg-missing-test-case Add missing test case for writing unknown attributes commit 4f319ce refs/heads/master Merge: 2c51c40 f803b82 Author: Zachary Scott Date: 2014-05-30 17:26:06 -0700 Merge pull request #15440 from ilikepi/pr_docs_activesupport_hwia_dup HashWithIndifferentAccess#dup doc [ci skip] commit f803b82 refs/heads/master Author: James Blanding Date: 2014-05-30 19:40:53 -0400 HashWithIndifferentAccess#dup doc [ci skip] The phrase "exact copy" in the existing docmentation is somewhat misleading. M activesupport/lib/active_support/hash_with_indifferent_access.rb commit 7c8f88c refs/heads/master Author: Sean Griffin Date: 2014-05-30 15:48:41 -0700 Add missing test case for writing unknown attributes M activerecord/test/cases/attribute_methods_test.rb commit 2c51c40 refs/heads/master Merge: e6331b0 24b6fa5 Author: Rafael Mendonça França Date: 2014-05-30 16:55:38 -0300 Merge pull request #15431 from sgrif/sg-bad-serialization-test-cases Update some bad test cases for serialized columns commit 24b6fa5 refs/heads/master Author: Sean Griffin Date: 2014-05-30 12:52:58 -0700 Update some bad test cases for serialized columns The first case was not testing what the issue mentioned actually was (A subclass of a class with serialized attributes does not serialize when they come from the database). The second case was a bad coder. It would fail if the model was `dup`ed, or if the the model was loaded from the database and then saved again. The third case wasn't testing anything that wasn't covered by the second (and was also a bad coder for the same reasons as the second). M activerecord/test/cases/serialized_attribute_test.rb commit e6331b0 refs/heads/master Merge: ce348b9 eb6cee9 Author: Rafael Mendonça França Date: 2014-05-30 15:16:48 -0300 Merge pull request #15427 from sgrif/sg-rename-attribute-ivars Rename attribute related instance variables to better express intent commit ce348b9 refs/heads/master Merge: 8c7a44e 5aa1f5d Author: Rafael Mendonça França Date: 2014-05-30 13:55:56 -0300 Merge pull request #15354 from sgrif/sg-properties-default Allow specifying a default value in overloaded properties commit 8c7a44e refs/heads/master Merge: 8c77b0a 1033b7f Author: Zachary Scott Date: 2014-05-30 09:11:23 -0700 Merge pull request #15426 from oggy/doc-3.2.18 Update guides to mention 3.2.18. [ci skip] commit eb6cee9 refs/heads/master Author: Sean Griffin Date: 2014-05-30 09:05:18 -0700 Rename attribute related instance variables to better express intent `@attributes` was actually used for `_before_type_cast` and friends, while `@attributes_cache` is the type cast version (and caching is the wrong word there, but I'm working on removing the conditionals around that). I opted for `@raw_attributes`, because `_before_type_cast` is also semantically misleading. The values in said hash are in the state given by the form builder or database, so raw seemed to be a good word. M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/before_type_cast.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/result.rb M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/attribute_methods_test.rb commit 1033b7f refs/heads/master Author: George Ogata Date: 2014-05-30 11:33:25 -0400 Update guides to mention 3.2.18. And reword things a little to mention the specific patch release less. M guides/source/upgrading_ruby_on_rails.md commit 5aa1f5d refs/heads/master Author: Sean Griffin Date: 2014-05-26 17:06:05 -0700 Allow specifying a default value in overloaded properties M activerecord/lib/active_record/properties.rb M activerecord/test/cases/custom_properties_test.rb M activerecord/test/schema/schema.rb commit 8c77b0a refs/heads/master Merge: c36c7fc 3a08882 Author: Rafael Mendonça França Date: 2014-05-30 11:52:59 -0300 Merge pull request #15313 from andreychernih/time-with-zone-string-conversion-speed-up Speed-up TimeWithZone to String conversion commit 268304f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-30 11:44:55 -0300 Change the version schema to reflect how deprecations are handled [ci skip] We only introduce new deprecations at Minor releases. M guides/source/maintenance_policy.md commit 43862dd refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-30 11:44:55 -0300 Change the version schema to reflect how deprecations are handled [ci skip] We only introduce new deprecations at Minor releases. M guides/source/maintenance_policy.md commit c36c7fc refs/heads/master Author: Rafael Mendonça França Date: 2014-05-30 11:44:55 -0300 Change the version schema to reflect how deprecations are handled [ci skip] We only introduce new deprecations at Minor releases. M guides/source/maintenance_policy.md commit 0cabddd refs/heads/master Merge: 41f4cc0 dcc532d Author: Rafael Mendonça França Date: 2014-05-30 10:30:04 -0300 Merge pull request #15425 from leafac/fix-testing-docs Update Minitest references in Testing Guide commit 41f4cc0 refs/heads/master Author: Yves Senn Date: 2014-05-30 15:23:26 +0200 bin/setup uses `bundle check || bundle install` to improve performance. M railties/lib/rails/generators/rails/app/templates/bin/setup commit dcc532d refs/heads/master Author: Leandro Facchinetti Date: 2014-05-30 07:10:03 -0300 Update Minitest references in Testing Guide The Guide references `test/unit`, which has been replaced by `Minitest` in all versions of Ruby supported by Rails. The following updates were performed: * The superclass of `ActiveSupport::TestCase` is no longer `MiniTest::Unit::TestCase`, but `Minitest::Test` [1]. * The preferred spelling is `Minitest`, not `MiniTest` [2]. * For a method to be a test in Minitest, its name must start with `test_`, not only `test` [3]. * Explanations about `test/unit` in Ruby 1.8 were removed in favor of more up-to-date information on `Minitest`. [1]: https://github.com/rails/rails/blob/6c2b569660c9216595d02ce6412e3bdcc7293317/activesupport/lib/active_support/test_case.rb#L18 [2]: https://github.com/seattlerb/minitest/blob/d5d43cef9a3fd4a0eea972dde125ed5ba1ddb821/lib/minitest.rb#L9 [3]: https://github.com/seattlerb/minitest/blob/d5d43cef9a3fd4a0eea972dde125ed5ba1ddb821/lib/minitest/test.rb#L62 M guides/source/testing.md commit 4321cd0 refs/heads/master Author: Yves Senn Date: 2014-05-30 14:22:17 +0200 refactor, introduce `Type#type_cast_for_schema` to cast for schema.rb This removes the case statement in `SchemaDumper` and gives every `Type` the possibility to control the SchemaDumper default value output. /cc @sgrif M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/range.rb M activerecord/lib/active_record/type/date.rb M activerecord/lib/active_record/type/decimal.rb M activerecord/lib/active_record/type/time_value.rb M activerecord/lib/active_record/type/value.rb commit b9eeb03 refs/heads/master Author: Yves Senn Date: 2014-05-30 13:48:05 +0200 pg, support default values for enum types. Closes #7814. This is an intermediate solution. It is related to the refactoring @sgrif is making and will change in the future. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb commit d6c1205 refs/heads/master Author: Yves Senn Date: 2014-05-30 13:18:31 +0200 pg, `default_sequence_name` respects schema. Closes #7516. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit c17c04f refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-05-30 11:51:14 +0200 Merge pull request #11896 from nkondratyev/fix_pg_columns_for_distinct Fixed #columns_for_distinct of postgresql adapter Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 3d5a201 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-30 11:51:14 +0200 Merge pull request #11896 from nkondratyev/fix_pg_columns_for_distinct Fixed #columns_for_distinct of postgresql adapter Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 6c2b569 refs/heads/master Merge: f1eddea 1cb52a1 Author: Yves Senn Date: 2014-05-30 11:51:14 +0200 Merge pull request #11896 from nkondratyev/fix_pg_columns_for_distinct Fixed #columns_for_distinct of postgresql adapter Conflicts: activerecord/CHANGELOG.md commit f1eddea refs/heads/master Author: Godfrey Chan Date: 2014-05-30 02:29:17 -0700 :scissors: removed deprecated `Numeric#ago` and friends Replacements: 5.ago => 5.seconds.ago 5.until => 5.seconds.until 5.since => 5.seconds.since 5.from_now => 5.seconds.from_now The removed tests does not affect coverage – we have equivalent test cases in the tests for `AS::Duration`. See #12389 for the history and rationale behind this. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/numeric/time.rb M activesupport/test/core_ext/numeric_ext_test.rb commit 58d3e02 refs/heads/master Merge: 290de90 7ba6b75 Author: Yves Senn Date: 2014-05-30 11:35:40 +0200 Merge pull request #15189 from senny/bin/setup `bin/setup` script to bootstrap applications. commit 7ba6b75 refs/heads/master Author: Yves Senn Date: 2014-05-20 10:14:20 +0200 `bin/setup` script to bootstrap applications. M guides/source/getting_started.md M railties/CHANGELOG.md A railties/lib/rails/generators/rails/app/templates/bin/setup M railties/test/generators/app_generator_test.rb commit 290de90 refs/heads/master Author: Yves Senn Date: 2014-05-30 11:09:36 +0200 pg, `reset_pk_sequence!` respects schemas. Closes #14719. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb M activerecord/test/cases/migration/rename_table_test.rb commit 7b8d95d refs/heads/master Author: Yves Senn Date: 2014-05-30 10:53:24 +0200 pg, `PostgreSQL::Name` to hold schema qualified names. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql/utils.rb M activerecord/test/cases/adapters/postgresql/utils_test.rb commit c69baff refs/heads/master Author: Gordon Chan Date: 2014-05-30 20:29:30 +1200 Fixed `ActiveSupport::TimeWithZone#-` so precision is not unnecessarily lost When working with objects with a nanosecond component, the `-` method may unnecessarily cause loss of precision. `ActiveSupport::TimeWithZone#-` should return the same result as if we were using `Time#-`: Time.now.end_of_day - Time.now.beginning_of_day #=> 86399.999999999 Before: Time.zone.now.end_of_day.nsec #=> 999999999 Time.zone.now.end_of_day - Time.zone.now.beginning_of_day #=> 86400.0 After: Time.zone.now.end_of_day - Time.zone.now.beginning_of_day #=> 86399.999999999 M activesupport/CHANGELOG.md M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 14facb1 refs/remotes/origin/4-0-stable Author: Juanito Fatas Date: 2014-05-30 10:35:12 +0800 [ci skip] Document Rails' shifted semver. Conflicts: guides/source/maintenance_policy.md M guides/source/maintenance_policy.md commit 96252c1 refs/remotes/origin/4-1-stable Author: Juanito Fatas Date: 2014-05-30 10:35:12 +0800 [ci skip] Document Rails' shifted semver. M guides/source/maintenance_policy.md commit 6963e33 refs/heads/master Merge: 74b73f1 5e3c0b2 Author: Zachary Scott Date: 2014-05-29 20:43:22 -0700 Merge pull request #15417 from JuanitoFatas/doc/semver-of-rails [ci skip] Document Rails' shifted semver. commit 5e3c0b2 refs/heads/master Author: Juanito Fatas Date: 2014-05-30 10:35:12 +0800 [ci skip] Document Rails' shifted semver. M guides/source/maintenance_policy.md commit 74b73f1 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 16:13:29 -0700 Mapping never actually uses @set, so rm M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/mapper_test.rb commit be137b0 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 16:08:56 -0700 no reason to make a Mapper object if the path is blank M actionpack/lib/action_dispatch/routing/mapper.rb commit c767fbf refs/heads/master Merge: aecf76f da2cf93 Author: Aaron Patterson Date: 2014-05-29 16:02:16 -0700 Merge branch 'mapper' * mapper: (34 commits) no more is_a checks on instantiation Path::Pattern is instantiated internally, so make the contructor require a strexp object Strexp#names is only used in a test, so rm pass the parsed path from mapper to the Strexp add an alternate constructor to Strexp that takes a string ask the strexp for the ast remove dead code disconnect path from the instance reuse the ast we already made use a parser to extract the group parts from the path pass the parsed parameters through the methods so we don't reparse or require caching code "controllers" should be a valid path name controllers with slash names are also not supported, so we can reuse the message only validate controllers golf down a bit only error handling between controller and action is the same add a test for controllers without colons move nil check to a method that yields to a block if the value is not nil translate action / controller to the desired object only one nil check on the action variable ... commit da2cf93 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:45:42 -0700 no more is_a checks on instantiation M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/test/journey/path/pattern_test.rb commit bb207ea refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:44:54 -0700 Path::Pattern is instantiated internally, so make the contructor require a strexp object M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/test/journey/path/pattern_test.rb M actionpack/test/journey/route_test.rb M actionpack/test/journey/router_test.rb M actionpack/test/journey/routes_test.rb commit 5682596 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:31:45 -0700 Strexp#names is only used in a test, so rm M actionpack/lib/action_dispatch/journey/router/strexp.rb D actionpack/test/journey/router/strexp_test.rb commit 333a4d0 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:27:46 -0700 pass the parsed path from mapper to the Strexp M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit 15ffbed refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:23:30 -0700 add an alternate constructor to Strexp that takes a string M actionpack/lib/action_dispatch/journey/router/strexp.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/path/pattern_test.rb M actionpack/test/journey/router/strexp_test.rb M actionpack/test/journey/router_test.rb M actionpack/test/journey/routes_test.rb commit eabe504 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:16:40 -0700 ask the strexp for the ast M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/lib/action_dispatch/journey/router/strexp.rb commit 7da98d0 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:08:12 -0700 remove dead code M actionpack/lib/action_dispatch/routing/mapper.rb commit b3719d3 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:05:22 -0700 disconnect path from the instance M actionpack/lib/action_dispatch/routing/mapper.rb commit ffbe1b1 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 15:01:08 -0700 reuse the ast we already made M actionpack/lib/action_dispatch/routing/mapper.rb commit aecf76f refs/heads/master Merge: 6daa466 fd3f3c5 Author: Rafael Mendonça França Date: 2014-05-29 18:59:51 -0300 Merge pull request #15414 from akshay-vishnoi/doc_changes [ci skip] Include ActiveModel::Model in a class instead of inheriting commit 3a102a5 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 14:57:48 -0700 use a parser to extract the group parts from the path M actionpack/lib/action_dispatch/journey/nodes/node.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/mapper_test.rb commit b5ea25b refs/heads/master Author: Aaron Patterson Date: 2014-05-29 14:44:56 -0700 pass the parsed parameters through the methods so we don't reparse or require caching code M actionpack/lib/action_dispatch/routing/mapper.rb commit fd3f3c5 refs/heads/master Author: Akshay Vishnoi Date: 2014-05-30 03:09:57 +0530 [ci skip] Include ActiveModel::Model in a class instead of inheriting M activemodel/lib/active_model/naming.rb commit 6daa466 refs/heads/master Author: Zachary Scott Date: 2014-05-29 13:33:33 -0700 Generated engines don't include bin/rake, fixes #15409 [ci skip] M guides/source/engines.md commit 6a5f005 refs/heads/master Merge: 5d2ee96 13d92b7 Author: Rafael Mendonça França Date: 2014-05-29 17:49:09 -0300 Merge pull request #15413 from sgrif/sg-i-wish-i-could Don't reference comments that do not exist commit 13d92b7 refs/heads/master Author: Sean Griffin Date: 2014-05-29 13:46:39 -0700 Don't reference comments that do not exist M activerecord/lib/active_record/attribute_methods/write.rb commit 5d2ee96 refs/heads/master Merge: 214423f 912904c Author: Rafael Mendonça França Date: 2014-05-29 17:44:34 -0300 Merge pull request #15412 from sgrif/sg-serialized-type-cast-for-write Move `type_cast_for_write` behavior over to the serialized type object commit 912904c refs/heads/master Author: Sean Griffin Date: 2014-05-29 13:34:23 -0700 Move `type_cast_for_write` behavior over to the serialized type object M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb D activerecord/test/cases/attribute_methods/serialization_test.rb commit 214423f refs/heads/master Author: Zachary Scott Date: 2014-05-29 13:17:28 -0700 Add missing period from 4b802bc [ci skip] M guides/source/3_0_release_notes.md commit 52871ea refs/heads/master Merge: f14164c 4b802bc Author: Zachary Scott Date: 2014-05-29 13:16:48 -0700 Merge pull request #15411 from nathany/patch-1 Fix broken link in Rails 3.0 release_notes [ci skip] commit 4b802bc refs/heads/master Author: Nathan Youngman Date: 2014-05-29 14:10:21 -0600 Fix broken link in Rails 3.0 release_notes M guides/source/3_0_release_notes.md commit f14164c refs/heads/master Merge: 4584be9 2eb547a Author: Yves Senn Date: 2014-05-29 21:53:58 +0200 Merge pull request #15398 from sgrif/sg-serialized-types Refactor serialized types to be partially defined as custom properties commit 1913f1e refs/heads/master Author: schneems Date: 2014-05-29 14:40:02 -0500 document generators hidden_namespaces M railties/lib/rails/generators.rb commit d7d7211 refs/heads/master Author: schneems Date: 2014-05-11 12:55:05 -0500 [ci skip] add created_at and updated_at to example M activerecord/lib/active_record/attribute_assignment.rb commit 2eb547a refs/heads/master Author: Sean Griffin Date: 2014-05-28 08:24:59 -0700 Refactor serialized types to be partially defined as custom properties Many of the methods defined in `AttributeMethods::Serialization` can be refactored onto this type as well, but this is a reasonable small step. Removes the `Type` class, and the need for `decorate_columns` to handle serialized types. M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/properties.rb M activerecord/lib/active_record/type.rb A activerecord/lib/active_record/type/serialized.rb M activerecord/lib/active_record/type/value.rb M activerecord/test/cases/attribute_methods/serialization_test.rb M activerecord/test/cases/serialized_attribute_test.rb commit 295e912 refs/heads/master Merge: 8ed1a56 4584be9 Author: Aaron Patterson Date: 2014-05-29 10:56:33 -0700 Merge branch 'master' into mapper * master: Update url to rake docs [ci skip] Name#model_name doesn't return a String object Result sets never override a model's column type [ci skip] Make last note show up in postgresql guide. Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581. Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip] Use github url for homepage of log4r [ci skip] Remove TODO. Ensure we always use instances of the adapter specific column class Fix indentation from 1b4b26f [ci skip] [ci skip] Improve form_helpers.md guide. Clear inflections after test. Remove unnecessary include for integration tests. Added documentation for the :param option for resourceful routing commit 8ed1a56 refs/heads/master Author: Aaron Patterson Date: 2014-05-29 10:55:59 -0700 "controllers" should be a valid path name M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 4584be9 refs/heads/master Author: Zachary Scott Date: 2014-05-29 10:15:57 -0700 Update url to rake docs [ci skip] M actionpack/RUNNING_UNIT_TESTS.rdoc M actionview/RUNNING_UNIT_TESTS.rdoc commit 8a3b137 refs/heads/master Merge: 9fcdc34 a4d2916 Author: Rafael Mendonça França Date: 2014-05-29 13:53:41 -0300 Merge pull request #75 from seuros/patch-2 Sidekiq::Client does not support symbols as keys commit a4d2916 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-29 16:29:33 +0000 Sidekiq::Client does not support symbols as keys M lib/active_job/queue_adapters/sidekiq_adapter.rb commit b9c8dec refs/remotes/origin/4-0-stable Merge: 5d95d1f d49e680 Author: Rafael Mendonça França Date: 2014-05-29 13:20:49 -0300 Merge pull request #15396 from al2o3cr/issue14834-backport-4-0 Correctly pass joins when creating a JoinDependency. commit b67e2ad refs/heads/master Merge: 4a3f71b 33cc907 Author: Arthur Nogueira Neves Date: 2014-05-29 11:28:34 -0400 Merge pull request #15407 from ShunsukeAida/correct_model_name_example fixed ActiveModel documentation [ci skip] commit 33cc907 refs/heads/master Author: ShunsukeAida Date: 2014-05-30 00:01:10 +0900 Name#model_name doesn't return a String object M activemodel/README.rdoc M activemodel/lib/active_model/naming.rb commit 9fcdc34 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-29 16:27:47 +0200 Stray CR M lib/active_job/identifier.rb commit 4a3f71b refs/heads/master Merge: 29f8eae 8eb536e Author: Rafael Mendonça França Date: 2014-05-29 11:23:07 -0300 Merge pull request #15406 from sgrif/sg-column-type-override Result sets never override a model's column type commit 79d0ade refs/heads/master Merge: 895f06a 6eb163a Author: David Heinemeier Hansson Date: 2014-05-29 16:14:28 +0200 Merge pull request #61 from cristianbica/tagged-logging Tagged logging commit 8eb536e refs/heads/master Author: Sean Griffin Date: 2014-05-29 06:55:44 -0700 Result sets never override a model's column type MySQL and PostgreSQL provide a column type override in order to properly type cast computed columns included in a result set. This should never override the known types of full fledged columns. In addition to messing up computed properties, this would have led to inconsistent behavior between a record created with `new`, and a record created with `last` on the mysql adapter in the following cases: - `tinyint(1)` with `emulate_booleans` set to `false` - `text`, `string`, `binary`, and `decimal` columns M activerecord/lib/active_record/querying.rb A activerecord/test/cases/adapters/mysql/consistency_test.rb M activerecord/test/cases/custom_properties_test.rb commit 35983ea refs/heads/master Author: Ethan Date: 2014-05-18 17:27:02 -0400 implement ActiveRecord::Base#pretty_print + changelog M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/test/cases/core_test.rb commit 29f8eae refs/heads/master Merge: 159c812 da290fa Author: Matthew Draper Date: 2014-05-29 21:33:12 +0930 Merge pull request #15061 from tgxworld/remove_unnecessary_include Remove unnecessary include for integration tests. commit 5e09ea0 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-29 13:20:44 +0200 pg, keep `hstore` and `json` attributes as `Hash` in @attributes. The solution presented in this patch is not efficient. We should replace it in the near future. The following needs to be worked out: * Is `@attributes` storing the Ruby or SQL representation? * `cacheable_column?` is broken but `hstore` and `json` rely on that behavior Closes #15369. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 895f06a refs/heads/master Merge: d1ed2d0 aa34815 Author: David Heinemeier Hansson Date: 2014-05-29 13:14:40 +0200 Merge pull request #69 from seuros/patch-2 Update README.md commit 159c812 refs/heads/master Merge: c0cd779 98a7dde Author: Yves Senn Date: 2014-05-29 13:13:18 +0200 Merge pull request #15397 from sgrif/sg-column-class Ensure we always use instances of the adapter specific column class commit aa34815 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-29 10:56:08 +0000 Update README.md Documented enqueue_at and enqueue_in M README.md commit d1ed2d0 refs/heads/master Merge: 0312c1f 895f22a Author: David Heinemeier Hansson Date: 2014-05-29 12:44:47 +0200 Merge pull request #68 from seuros/patch-2 Update README.md commit c0cd779 refs/heads/master Merge: 3b606a3 29cefc1 Author: Robin Dupret Date: 2014-05-29 12:33:55 +0200 Merge pull request #15403 from JuanitoFatas/doc/pg-guide-note [ci skip] Make last note show up in postgresql guide. commit 895f22a refs/heads/master Author: Abdelkader Boudih Date: 2014-05-29 10:20:13 +0000 Update README.md M README.md commit 29cefc1 refs/heads/master Author: Juanito Fatas Date: 2014-05-29 17:23:59 +0800 [ci skip] Make last note show up in postgresql guide. M guides/source/active_record_postgresql.md commit 5d95d1f refs/remotes/origin/4-0-stable Author: Zachary Scott Date: 2014-05-29 00:24:06 -0700 Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581. M actionpack/lib/action_dispatch/routing/mapper.rb commit 7f46d20 refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-05-29 00:24:06 -0700 Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581. M actionpack/lib/action_dispatch/routing/mapper.rb commit 3b606a3 refs/heads/master Author: Zachary Scott Date: 2014-05-29 00:24:06 -0700 Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581. M actionpack/lib/action_dispatch/routing/mapper.rb commit d560104 refs/heads/master Author: Zachary Scott Date: 2014-05-29 00:20:40 -0700 Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip] M guides/source/routing.md commit ec7fee4 refs/heads/master Merge: 03ee419 cf78637 Author: Zachary Scott Date: 2014-05-29 00:16:41 -0700 Merge branch 'master' of github.com:zackperdue/rails into zackperdue-master commit 03ee419 refs/heads/master Merge: fc63e80 b1bc553 Author: Guillermo Iguaran Date: 2014-05-28 22:12:13 -0500 Merge pull request #15399 from tgxworld/remove_todo_router_test Remove TODO. commit fc63e80 refs/heads/master Author: Zachary Scott Date: 2014-05-28 20:06:57 -0700 Use github url for homepage of log4r [ci skip] M activerecord/README.rdoc commit b1bc553 refs/heads/master Author: Guo Xiang Tan Date: 2014-05-28 20:06:08 -0700 Remove TODO. M actionpack/test/journey/router_test.rb commit 98a7dde refs/heads/master Author: Sean Griffin Date: 2014-05-28 18:23:00 -0700 Ensure we always use instances of the adapter specific column class - Create a consistent API across adapters for building new columns - Use it for custom properties so we don't get `UndefinedMethodError`s in stuff I'm implementing elsewhere. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/properties.rb commit 7e61a32 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 18:07:25 -0700 controllers with slash names are also not supported, so we can reuse the message M actionpack/lib/action_dispatch/routing/mapper.rb commit d311922 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 18:03:26 -0700 only validate controllers M actionpack/lib/action_dispatch/routing/mapper.rb commit 75bfe64 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 17:42:34 -0700 golf down a bit M actionpack/lib/action_dispatch/routing/mapper.rb commit 3d0dc81 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 17:28:59 -0700 only error handling between controller and action is the same M actionpack/lib/action_dispatch/routing/mapper.rb commit 6cabf1d refs/heads/master Author: Aaron Patterson Date: 2014-05-28 17:05:54 -0700 add a test for controllers without colons M actionpack/test/dispatch/routing_test.rb commit 89bf31e refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:59:32 -0700 move nil check to a method that yields to a block if the value is not nil M actionpack/lib/action_dispatch/routing/mapper.rb commit 78deb7f refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:49:47 -0700 translate action / controller to the desired object M actionpack/lib/action_dispatch/routing/mapper.rb commit 309ff10 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:34:36 -0700 only one nil check on the action variable M actionpack/lib/action_dispatch/routing/mapper.rb commit a729f40 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:31:40 -0700 change to case / when on types M actionpack/lib/action_dispatch/routing/mapper.rb commit b27a3af refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:28:38 -0700 only do one nil check against the controller M actionpack/lib/action_dispatch/routing/mapper.rb commit 8d30983 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:23:17 -0700 extract controller and action parsing to a method M actionpack/lib/action_dispatch/routing/mapper.rb commit bc916a7 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:16:14 -0700 we don't need the call to presence. that is my present, to you! M actionpack/lib/action_dispatch/routing/mapper.rb commit 3c03e7e refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:14:22 -0700 swtich to returning early if to responds to call M actionpack/lib/action_dispatch/routing/mapper.rb commit b8be14a refs/heads/master Merge: c0d1823 781f8a8 Author: Yves Senn Date: 2014-05-29 01:13:17 +0200 Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_test Clear inflections after test. commit ac9a3a9 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 16:00:40 -0700 return early if we have a valid controller name M actionpack/lib/action_dispatch/routing/mapper.rb commit c0d1823 refs/heads/master Author: Zachary Scott Date: 2014-05-28 15:56:38 -0700 Fix indentation from 1b4b26f [ci skip] M guides/source/form_helpers.md commit 996e9f5 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 15:56:12 -0700 trade 2 is_a? checks for a nil check M actionpack/lib/action_dispatch/routing/mapper.rb commit 60ae505 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 15:54:43 -0700 invert logic to remove nil? and exclude? checks (use ruby rather than AS when possible M actionpack/lib/action_dispatch/routing/mapper.rb commit 353df48 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 15:50:22 -0700 fewer blank? calls M actionpack/lib/action_dispatch/routing/mapper.rb commit c99d28f refs/heads/master Author: Aaron Patterson Date: 2014-05-28 15:46:00 -0700 reduce action.blank? calls M actionpack/lib/action_dispatch/routing/mapper.rb commit 0a3f634 refs/heads/master Merge: 5bbab51 1b4b26f Author: Zachary Scott Date: 2014-05-28 15:40:26 -0700 Merge pull request #15395 from JuanitoFatas/docs/form-helpers [ci skip] Improve form_helpers.md guide. commit f0eff10 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 15:38:11 -0700 reduce blank? checks M actionpack/lib/action_dispatch/routing/mapper.rb commit ddda5e7 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 15:33:32 -0700 extract controller checks to methods M actionpack/lib/action_dispatch/routing/mapper.rb commit 1b4b26f refs/heads/master Author: Juanito Fatas Date: 2014-05-29 06:31:25 +0800 [ci skip] Improve form_helpers.md guide. M guides/source/form_helpers.md commit d49e680 refs/remotes/origin/4-0-stable Author: Matt Jones Date: 2014-05-28 17:19:07 -0500 Correctly pass joins when creating a JoinDependency. Backport of #14834 to 4-0-stable M activerecord/lib/active_record/associations/alias_tracker.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/inner_join_association_test.rb commit 1ad50aa refs/heads/master Author: Aaron Patterson Date: 2014-05-28 14:52:17 -0700 set defaults at the top so we can avoid the ||= test M actionpack/lib/action_dispatch/routing/mapper.rb commit e135bba refs/heads/master Author: Aaron Patterson Date: 2014-05-28 14:50:47 -0700 add a test for existing mapper functionality I'm not sure if this is actually used, but I'm adding a test to define the behavior M actionpack/test/dispatch/routing_test.rb commit 5bbab51 refs/heads/master Author: Aaron Patterson Date: 2014-05-28 15:14:37 -0700 add tests for argument error cases M actionpack/test/dispatch/routing_test.rb commit 6eb163a refs/heads/master Author: Cristian Bica Date: 2014-05-22 23:38:01 +0300 Tagged logging M README.md M lib/active_job/base.rb A lib/active_job/identifier.rb M lib/active_job/logging.rb M lib/active_job/queue_adapters/sneakers_adapter.rb M test/cases/logging_test.rb A test/jobs/logging_job.rb A test/jobs/nested_job.rb commit 3026f42 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-28 17:15:18 -0300 Merge pull request #15393 from tonytonyjan/patch-2 Fix documentation M actionpack/lib/action_view/helpers/sanitize_helper.rb commit 76a0b10 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-28 17:15:18 -0300 Merge pull request #15393 from tonytonyjan/patch-2 Fix documentation M actionview/lib/action_view/helpers/sanitize_helper.rb commit d49e1c7 refs/heads/master Merge: 37c7774 7575f4b Author: Rafael Mendonça França Date: 2014-05-28 17:15:18 -0300 Merge pull request #15393 from tonytonyjan/patch-2 Fix documentation commit 7575f4b refs/heads/master Author: 簡煒航 (Jian Weihang) Date: 2014-05-29 04:03:23 +0800 Fix documentation To prevent `ArgumentError`, `config.action_view.sanitized_allowed_attributes` should be assigned by an array instead of a list. ``` /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/set.rb:98:in `do_with_enum': value must be enumerable (ArgumentError) from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/set.rb:355:in `merge' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/helpers/sanitize_helper.rb:211:in `sanitized_allowed_attributes=' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:26:in `block (3 levels) in ' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:25:in `each' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:25:in `block (2 levels) in ' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:38:in `instance_eval' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:38:in `execute_hook' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:28:in `block in on_load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:27:in `each' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:27:in `on_load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:24:in `block in ' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:30:in `instance_exec' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:30:in `run' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:55:in `block in run_initializers' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:226:in `block in tsort_each' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:348:in `block (2 levels) in each_strongly_connected_component' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:427:in `each_strongly_connected_component_from' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:347:in `block in each_strongly_connected_component' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `each' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `call' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `each_strongly_connected_component' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:224:in `tsort_each' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:205:in `tsort_each' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:54:in `run_initializers' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/application.rb:288:in `initialize!' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config/environment.rb:5:in `' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:3:in `require' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:3:in `block in
' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:55:in `instance_eval' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:55:in `initialize' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:in `new' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:in `
' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:49:in `eval' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:49:in `new_from_string' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:40:in `parse_file' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:277:in `build_app_and_options_from_config' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:199:in `app' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:50:in `app' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:314:in `wrapped_app' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:130:in `log_to_stdout' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:67:in `start' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:81:in `block in server' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:76:in `tap' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:76:in `server' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:40:in `run_command!' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands.rb:17:in `' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/rails:8:in `require' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/rails:8:in `' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/rails.rb:27:in `load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/rails.rb:27:in `call' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/command.rb:7:in `call' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client.rb:26:in `run' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/bin/spring:48:in `' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/binstub.rb:11:in `load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/binstub.rb:11:in `' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/spring:16:in `require' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/spring:16:in `' from bin/rails:3:in `load' from bin/rails:3:in `
' ``` M actionview/lib/action_view/helpers/sanitize_helper.rb commit 37c7774 refs/heads/master Merge: 83a437c 709ce3d Author: Rafael Mendonça França Date: 2014-05-28 16:23:56 -0300 Merge pull request #15392 from arthurnn/move_open_transactions Keep closer to other methods that touch @transaction commit 709ce3d refs/heads/master Author: Arthur Neves Date: 2014-05-28 15:21:19 -0400 Keep closer to other methods that touch @transaction M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 83a437c refs/heads/master Merge: 092b92f 622021c Author: Rafael Mendonça França Date: 2014-05-28 16:10:16 -0300 Merge pull request #15390 from sgrif/sg-property-order Maintain column order when overriding existing columns commit 622021c refs/heads/master Author: Sean Griffin Date: 2014-05-28 10:32:00 -0700 Maintain column order when overriding existing columns Working towards re-implementing serialized attributes to use the properties API exposed the need for this, as serializing a column shouldn't change the order of the columns. M activerecord/lib/active_record/properties.rb M activerecord/test/cases/custom_properties_test.rb commit 092b92f refs/heads/master Merge: fcf9b71 c59e01a Author: Rafael Mendonça França Date: 2014-05-28 15:36:16 -0300 Merge pull request #15389 from sgrif/sg-property-inheritance Ensure custom properties work correctly with inheritance commit c59e01a refs/heads/master Author: Sean Griffin Date: 2014-05-28 10:11:57 -0700 Ensure custom properties work correctly with inheritance M activerecord/lib/active_record/properties.rb M activerecord/test/cases/custom_properties_test.rb commit fcf9b71 refs/heads/master Merge: 4ff3fba 728fa69 Author: Rafael Mendonça França Date: 2014-05-28 15:22:37 -0300 Merge pull request #15370 from sgrif/sg-type-namespace Move types to the top level `ActiveRecord` namespace commit bcd9b02 refs/tags/v4.0.6.rc2 Author: Zachary Scott Date: 2014-05-28 10:44:35 -0700 Upgrading Ruby on Rails guide is no longer WIP [ci skip] M guides/source/documents.yaml commit e8330c6 refs/tags/v4.1.2.rc2 Author: Zachary Scott Date: 2014-05-28 10:44:35 -0700 Upgrading Ruby on Rails guide is no longer WIP [ci skip] M guides/source/documents.yaml commit 4ff3fba refs/heads/master Author: Zachary Scott Date: 2014-05-28 10:44:35 -0700 Upgrading Ruby on Rails guide is no longer WIP [ci skip] M guides/source/documents.yaml commit bfafd0d refs/heads/master Author: Zachary Scott Date: 2014-05-28 10:43:05 -0700 Formatting of content from b1db615 [ci skip] M activerecord/lib/active_record/errors.rb commit f3e1458 refs/heads/master Merge: 99873ca b1db615 Author: Zachary Scott Date: 2014-05-28 10:40:39 -0700 Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_error Initial doc for TransactionIsolationError [ci skip] commit f4b9df2 refs/tags/v4.0.6.rc2 Author: Yves Senn Date: 2014-05-28 16:29:35 +0200 Revert "Merge pull request #12778 from etehtsea/rake-default-fix" This reverts commit a263d0b368fbd074bff3ee9058d13b457eaa3116. Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/test_unit/railtie.rb commit 99873ca refs/heads/master Author: Yves Senn Date: 2014-05-28 16:31:04 +0200 Revert "Merge pull request #12778 from etehtsea/rake-default-fix" This reverts commit ec0a2b57f67c9153cb5f7bbe2a3f66d13fe64bdd, reversing changes made to a8bd7b16260c217290ef8fe3a166fcceac442c62. This reverts commit 555ec36522011862c03b483c53be32410594a51e This reverts commit 555ec36522011862c03b483c53be32410594a51e By default, Rails uses the `default` Rake task to run all tests. This commit changed the environment of the default task to `development`. This clears the development database and has other negative consequences. M railties/CHANGELOG.md M railties/lib/rails/test_unit/railtie.rb commit 781f8a8 refs/heads/master Author: Zuhao Wan Date: 2014-05-28 22:14:57 +0800 Clear inflections after test. M actionpack/test/controller/params_wrapper_test.rb commit abd6461 refs/heads/master Merge: 7fcbc36 e354b33 Author: Santiago Pastorino Date: 2014-05-28 12:03:50 -0300 Merge pull request #15386 from zuhao/refactor_actionpack_request_forgery_protection_test Avoid hardcoded `request_forgery_protection_token` value in teardown. commit 7fcbc36 refs/heads/master Merge: 9ae3f5f 748f070 Author: Santiago Pastorino Date: 2014-05-28 12:01:39 -0300 Merge pull request #15387 from sgrif/sg-remove-column-coder Remove unused `Column#coder` commit 9ae3f5f refs/heads/master Merge: c711c90 35cc73e Author: Santiago Pastorino Date: 2014-05-28 12:00:35 -0300 Merge pull request #15388 from zuhao/refactor_actionpack_send_file_test Unregister Mime::Type in teardown. commit 35cc73e refs/heads/master Author: Zuhao Wan Date: 2014-05-28 22:54:12 +0800 Unregister Mime::Type in teardown. M actionpack/test/controller/send_file_test.rb commit 748f070 refs/heads/master Author: Sean Griffin Date: 2014-05-28 07:48:07 -0700 Remove unused `Column#coder` It appears this property was added, but never actually used. It would be broken if it were, as it only type casts one way. M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/column_definition_test.rb commit c711c90 refs/heads/master Merge: b22b188 2ba9452 Author: Santiago Pastorino Date: 2014-05-28 11:39:11 -0300 Merge pull request #15385 from zuhao/refactor_actionpack_render_other_test Add and remove renderer inside the test to prevent leak. commit e354b33 refs/heads/master Author: Zuhao Wan Date: 2014-05-28 22:35:48 +0800 Avoid hardcoded value in teardown. M actionpack/test/controller/request_forgery_protection_test.rb commit 9993d1d refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-05-28 16:29:35 +0200 Revert "Merge pull request #12778 from etehtsea/rake-default-fix" This reverts commit a263d0b368fbd074bff3ee9058d13b457eaa3116. Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/test_unit/railtie.rb commit 72e8b56 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-28 16:27:34 +0200 Revert "Merge pull request #12778 from etehtsea/rake-default-fix" This reverts commit 38cf00e553bc709cd1f9c4b14992d9730554f757. Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/test_unit/railtie.rb commit 2ba9452 refs/heads/master Author: Zuhao Wan Date: 2014-05-28 22:24:22 +0800 Add and remove renderer inside the test to prevent leak. M actionpack/test/controller/render_other_test.rb commit 90c028b refs/tags/v4.1.2.rc2 Author: Yves Senn Date: 2014-05-28 16:21:00 +0200 Revert "Merge pull request #12778 from etehtsea/rake-default-fix" This reverts commit 38cf00e553bc709cd1f9c4b14992d9730554f757. Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/test_unit/railtie.rb commit b22b188 refs/heads/master Merge: 0f80a52 1407315 Author: Yves Senn Date: 2014-05-28 16:00:32 +0200 Merge pull request #15383 from zuhao/refactor_actionpack_localized_templates_test Move I18n.locale setting into setup and teardown. commit 1407315 refs/heads/master Author: Zuhao Wan Date: 2014-05-28 21:50:30 +0800 Move I18n.locale setting into setup and teardown. M actionpack/test/controller/localized_templates_test.rb commit 0f80a52 refs/heads/master Merge: bdbf00d 51dc7c2 Author: Yves Senn Date: 2014-05-28 15:50:24 +0200 Merge pull request #15381 from zuhao/refactor_actionpack_content_type_test Add with_default_charset helper. commit 51dc7c2 refs/heads/master Author: Zuhao Wan Date: 2014-05-28 21:17:16 +0800 Add with_default_charset helper. M actionpack/test/controller/content_type_test.rb commit b1db615 refs/heads/master Author: Gaurav Sharma Date: 2014-05-28 18:33:07 +0530 Initial doc for TransactionIsolationError [ci skip] M activerecord/lib/active_record/errors.rb commit bdbf00d refs/heads/master Author: Yves Senn Date: 2014-05-28 13:32:40 +0200 pg, keep `hstore` and `json` attributes as `Hash` in @attributes. The solution presented in this patch is not efficient. We should replace it in the near future. The following needs to be worked out: * Is `@attributes` storing the Ruby or SQL representation? * `cacheable_column?` is broken but `hstore` and `json` rely on that behavior Refs #15369. /cc @sgrif @rafaelfranca M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 728fa69 refs/heads/master Author: Sean Griffin Date: 2014-05-27 10:59:22 -0700 Move types to the top level `ActiveRecord` namespace `ActiveRecord::ConnectionAdapters::Type::Value` => `ActiveRecord::Type::Value` M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb D activerecord/lib/active_record/connection_adapters/type.rb D activerecord/lib/active_record/connection_adapters/type/binary.rb D activerecord/lib/active_record/connection_adapters/type/boolean.rb D activerecord/lib/active_record/connection_adapters/type/date.rb D activerecord/lib/active_record/connection_adapters/type/date_time.rb D activerecord/lib/active_record/connection_adapters/type/decimal.rb D activerecord/lib/active_record/connection_adapters/type/decimal_without_scale.rb D activerecord/lib/active_record/connection_adapters/type/float.rb D activerecord/lib/active_record/connection_adapters/type/hash_lookup_type_map.rb D activerecord/lib/active_record/connection_adapters/type/integer.rb D activerecord/lib/active_record/connection_adapters/type/numeric.rb D activerecord/lib/active_record/connection_adapters/type/string.rb D activerecord/lib/active_record/connection_adapters/type/text.rb D activerecord/lib/active_record/connection_adapters/type/time.rb D activerecord/lib/active_record/connection_adapters/type/time_value.rb D activerecord/lib/active_record/connection_adapters/type/type_map.rb D activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/properties.rb A activerecord/lib/active_record/type.rb A activerecord/lib/active_record/type/binary.rb A activerecord/lib/active_record/type/boolean.rb A activerecord/lib/active_record/type/date.rb A activerecord/lib/active_record/type/date_time.rb A activerecord/lib/active_record/type/decimal.rb A activerecord/lib/active_record/type/decimal_without_scale.rb A activerecord/lib/active_record/type/float.rb A activerecord/lib/active_record/type/hash_lookup_type_map.rb A activerecord/lib/active_record/type/integer.rb A activerecord/lib/active_record/type/numeric.rb A activerecord/lib/active_record/type/string.rb A activerecord/lib/active_record/type/text.rb A activerecord/lib/active_record/type/time.rb A activerecord/lib/active_record/type/time_value.rb A activerecord/lib/active_record/type/type_map.rb A activerecord/lib/active_record/type/value.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb D activerecord/test/cases/connection_adapters/type/type_map_test.rb A activerecord/test/cases/type/type_map_test.rb commit 7f73b91 refs/heads/master Merge: c352e06 aff73e0 Author: Rafael Mendonça França Date: 2014-05-27 19:38:54 -0300 Merge pull request #15374 from sgrif/sg-private-properties Remove AR Properties from the public API commit 569136b refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-27 10:29:59 -0700 Merge pull request #14834 from al2o3cr/issue14155 Correctly alias table names when joining more than once M activerecord/lib/active_record/associations/alias_tracker.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/inner_join_association_test.rb commit aff73e0 refs/heads/master Author: Sean Griffin Date: 2014-05-27 13:08:13 -0700 Remove AR Properties from the public API Making this part of the public API was premature, let's make it private again while I continue to work on the surrounding code. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/type/binary.rb M activerecord/lib/active_record/connection_adapters/type/boolean.rb M activerecord/lib/active_record/connection_adapters/type/date.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/float.rb M activerecord/lib/active_record/connection_adapters/type/integer.rb M activerecord/lib/active_record/connection_adapters/type/string.rb M activerecord/lib/active_record/connection_adapters/type/text.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/lib/active_record/properties.rb commit dae6c40 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-27 19:27:40 -0300 Merge pull request #15269 from arunagw/aa-fixes-8930 rake railties:install:migrations respects the order of railties Conflicts: activerecord/CHANGELOG.md railties/lib/rails/application.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit 030ef7c refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-27 19:27:40 -0300 Merge pull request #15269 from arunagw/aa-fixes-8930 rake railties:install:migrations respects the order of railties M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit c352e06 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-27 19:29:10 -0300 Add CHANGELOG entry for #15269 [ci skip] M activerecord/CHANGELOG.md commit be4b3df refs/heads/master Merge: d0a99c8 50de394 Author: Rafael Mendonça França Date: 2014-05-27 19:27:40 -0300 Merge pull request #15269 from arunagw/aa-fixes-8930 rake railties:install:migrations respects the order of railties commit d0a99c8 refs/heads/master Merge: 6c5f43b fccb752 Author: Rafael Mendonça França Date: 2014-05-27 19:13:58 -0300 Merge pull request #15373 from akshay-vishnoi/test-cases Add test case for clear mappings commit 6c5f43b refs/heads/master Author: Rafael Mendonça França Date: 2014-05-27 19:08:23 -0300 Deprecate all *_filter callbacks in favor of *_action callbacks This is the continuation of the work started at 9d62e04838f01f5589fa50b0baa480d60c815e2c M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/callbacks.rb M actionpack/test/abstract/callbacks_test.rb M actionpack/test/controller/filters_test.rb M actionpack/test/controller/test_case_test.rb M railties/lib/rails/info_controller.rb M railties/lib/rails/mailers_controller.rb commit fccb752 refs/heads/master Author: Akshay Vishnoi Date: 2014-05-28 03:37:48 +0530 Add test case for clear mappings M activerecord/test/cases/connection_adapters/type/type_map_test.rb commit cd03778 refs/heads/master Author: Aaron Patterson Date: 2014-05-27 14:52:59 -0700 rm dead code M actionpack/lib/action_dispatch/http/parameters.rb commit 2ffa126 refs/heads/master Author: Aaron Patterson Date: 2014-05-27 14:46:04 -0700 PARAMETERS_KEY is only used in the request, so move the constant there M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/controller/routing_test.rb commit cfdab77 refs/heads/master Merge: babcd7d 406b1b6 Author: Aaron Patterson Date: 2014-05-27 14:40:55 -0700 Merge branch 'constraints' * constraints: rm reset_parameters because we automatically do it from 9ca4839a move path_parameter encoding check to the request object dispatcher doesn't need `call` anymore call `serve` with the request on dispatchers constraints class does not need the request class anymore give all endpoints a superclass skip the build business if the stack is empty stop hardcoding path_parameters and get it from the request we do not need to cache rack_app a redirect is not a dispatcher by definition, so eliminate test push is_a check up to where the Constraints object is allocated pass the request object to the application pass a request to `matches?` so we can avoid creating excess requests nothing is passed to `rack_app` anymore, so rm the params one fewer is_a check Constraints#app should never return another Constraints object, so switch to if statement eliminate dispatcher is_a checks push is_a?(Dispatcher) check in to one place Always construct route objects with Constraint objects Conflicts: actionpack/lib/action_controller/metal.rb commit 406b1b6 refs/heads/master Author: Aaron Patterson Date: 2014-05-27 14:24:30 -0700 rm reset_parameters because we automatically do it from 9ca4839a M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 4797c4c refs/heads/master Author: Aaron Patterson Date: 2014-05-27 14:01:30 -0700 move path_parameter encoding check to the request object M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/routing/redirection.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit 97a5228 refs/heads/master Author: Aaron Patterson Date: 2014-05-27 13:54:59 -0700 dispatcher doesn't need `call` anymore M actionpack/lib/action_dispatch/routing/route_set.rb commit 9ad01d0 refs/heads/master Author: Aaron Patterson Date: 2014-05-27 13:51:58 -0700 call `serve` with the request on dispatchers M actionpack/lib/action_dispatch/routing/mapper.rb commit 7fe1443 refs/heads/master Author: Aaron Patterson Date: 2014-05-27 13:44:58 -0700 constraints class does not need the request class anymore M actionpack/lib/action_dispatch/routing/mapper.rb commit babcd7d refs/heads/master Merge: d5c315d 5c22db2 Author: Rafael Mendonça França Date: 2014-05-27 17:18:31 -0300 Merge pull request #15372 from akshay-vishnoi/test-cases Test Case - Change method name commit 5c22db2 refs/heads/master Author: Akshay Vishnoi Date: 2014-05-28 01:46:19 +0530 Test Case - Change method name M activerecord/test/cases/adapters/sqlite3/quoting_test.rb commit 402c2af refs/heads/master Author: Aaron Patterson Date: 2014-05-27 12:10:24 -0700 give all endpoints a superclass A actionpack/lib/action_dispatch/routing/endpoint.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/redirection.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit d5c315d refs/heads/master Merge: 086ee1c 61ef04c Author: Rafael Mendonça França Date: 2014-05-27 15:16:10 -0300 Merge pull request #15371 from sgrif/sg-silence-deprecation-warning Silence deprecation warning in test commit 61ef04c refs/heads/master Author: Sean Griffin Date: 2014-05-27 11:12:44 -0700 Silence deprecation warning in test Missed a case that only occured for mysql/mysql2 M activerecord/test/cases/migration_test.rb commit 086ee1c refs/heads/master Merge: 6f9aff7 0fb33f3 Author: Matthew Draper Date: 2014-05-28 03:32:21 +0930 Merge pull request #12080 from ShayDavidson/fix_datetime_partial_dates Added partial days support to `DateTime`'s `advance` method. commit 6f9aff7 refs/heads/master Merge: 0bef6ff 15df2a3 Author: Santiago Pastorino Date: 2014-05-27 14:46:49 -0300 Merge pull request #15321 from tgxworld/only_find_routes_as_heads_for_head_request Call get_routes_as_head only on HEAD requests. commit 0bef6ff refs/heads/master Author: Rafael Mendonça França Date: 2014-05-27 14:39:24 -0300 Require active_support at the railties Railties need to be used without having to require any dependecy first. M activesupport/lib/active_support/i18n_railtie.rb M activesupport/lib/active_support/railtie.rb commit 85bfb08 refs/heads/master Merge: 52434e9 c917fb7 Author: Aaron Patterson Date: 2014-05-27 10:29:59 -0700 Merge pull request #14834 from al2o3cr/issue14155 Correctly alias table names when joining more than once commit fcb1afc refs/tags/v4.1.2.rc1 (tag: v4.1.2.rc1) Author: Rafael Mendonça França Date: 2014-05-27 13:10:30 -0300 Preparing for 4.1.2.rc1 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit bc41bda refs/tags/v4.1.2.rc1 Author: Rafael Mendonça França Date: 2014-05-27 13:08:38 -0300 Fix the changelog task M tasks/release.rb commit 1006828 refs/tags/v4.0.6.rc1 (tag: v4.0.6.rc1) Author: Rafael Mendonça França Date: 2014-05-27 12:58:48 -0300 Preparing for 4.0.6.rc1 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit f8325cd refs/tags/v4.0.6.rc1 Author: Rafael Mendonça França Date: 2014-05-27 12:56:31 -0300 Fix the release task M tasks/release.rb commit 52434e9 refs/heads/master Merge: 3067aee 6b46106 Author: Rafael Mendonça França Date: 2014-05-27 11:28:00 -0300 Merge pull request #15295 from sgrif/sg-deprecate-decimals Deprecate decimal columns being automatically treated as integers commit 50de394 refs/heads/master Author: Arun Agrawal Date: 2014-05-23 14:34:05 +0200 rake railties:install:migrations respects the order of railties This PR fixes #8930 and some stuff from #8985 M activerecord/lib/active_record/railties/databases.rake M railties/lib/rails/application.rb M railties/test/railties/engine_test.rb commit 3a08882 refs/heads/master Author: Andrey Chernih Date: 2014-05-25 12:55:29 +0400 Speed-up TimeWithZone to String conversion I've noticed that `String(model.created_at)` is performing poorly in comparision with other fields. The source of the problem is a way `Kernel#String` works: it first tries to call `to_str` (which causes `NoMethodError` in `method_missing`) and then calls `to_s`. Performance tests: tz = Time.zone.now Benchmark.ips do |x| x.report { String(tz) } end Without this code: Calculating ------------------------------------- 572 i/100ms ------------------------------------------------- 10177.7 (±18.2%) i/s - 48620 in 5.000325s With this code: Calculating ------------------------------------- 1518 i/100ms ------------------------------------------------- 138984.2 (±10.1%) i/s - 677028 in 4.974897s M activesupport/lib/active_support/time_with_zone.rb commit 8cb48ab refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-27 10:34:32 -0300 Merge pull request #15358 from arthurnn/redefine_habtm_fix Fix redefine a has_and_belongs_to_many inside inherited class Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 3067aee refs/heads/master Merge: cd5918f 8570f93 Author: Rafael Mendonça França Date: 2014-05-27 10:34:32 -0300 Merge pull request #15358 from arthurnn/redefine_habtm_fix Fix redefine a has_and_belongs_to_many inside inherited class commit cd5918f refs/heads/master Merge: 83cb356 b9c43e0 Author: Yves Senn Date: 2014-05-27 14:53:48 +0200 Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_sym remove unwanted `to_sym` call. commit 6b46106 refs/heads/master Author: Sean Griffin Date: 2014-05-24 05:30:26 -0700 Deprecate decimal columns being automatically treated as integers With ActiveRecord::Properties, we now have a reasonable path for users to continue to keep this behavior if they want it. This is an edge case that has added a lot of complexity to the code base. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/properties.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/calculations_test.rb M activerecord/test/cases/helper.rb M activerecord/test/cases/migration_test.rb commit 9b6b32a refs/heads/master Author: Harshad Sabne Date: 2014-05-27 15:32:38 +0530 [ci skip] Fix Compiler's Github link M guides/source/3_2_release_notes.md commit 83cb356 refs/heads/master Merge: 9f8ee29 6aaf4bf Author: Yves Senn Date: 2014-05-27 09:21:16 +0200 Merge pull request #15327 from alexbel/replace_double_quotes_with_single_quotes Replace double quotes with single quotes while adding an entry into Gemfile commit 9f8ee29 refs/heads/master Merge: 0bdfb4d 1686c9a Author: Yves Senn Date: 2014-05-27 09:08:22 +0200 Merge pull request #15356 from deeeki/activesupport_loading Remove `require 'active_support'` from individual modules commit 8570f93 refs/heads/master Author: Arthur Neves Date: 2014-05-27 00:23:33 -0400 Fix redefine a has_and_belongs_to_many inside inherited class After ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1, which changed how has_an_belongs_to_many used to work, we start raising an error when redefining the same has_an_belongs_to_many association. This commits fix that regression. [Fixes #14983] M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 1686c9a refs/heads/master Author: deeeki Date: 2014-05-27 11:08:10 +0900 Remove `require 'active_support'` from individual modules Let users require `active_support` before loading any ActiveSupport modules http://guides.rubyonrails.org/active_support_core_extensions.html M activesupport/lib/active_support/i18n_railtie.rb M activesupport/lib/active_support/railtie.rb M activesupport/lib/active_support/time.rb commit 315f51b refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-05-26 20:19:37 -0700 Fix syntax error from 5eae77c M activerecord/test/cases/associations/eager_test.rb commit 0bdfb4d refs/heads/master Author: Zachary Scott Date: 2014-05-26 20:19:37 -0700 Fix syntax error from 5eae77c M activerecord/test/cases/associations/eager_test.rb commit c2af3b6 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-26 23:50:49 -0300 Move test to the proper file All preload tests are in the eager_test file M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb commit 445423d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-26 23:48:43 -0300 Add test case for b13d260 M activerecord/test/cases/associations/eager_test.rb commit b2d915a refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-26 23:40:38 -0300 Merge pull request #15301 from zzak/issue_15212 Skip if the association was already loaded. M activerecord/lib/active_record/associations/preloader.rb commit 5eae77c refs/heads/master Author: Rafael Mendonça França Date: 2014-05-26 23:50:49 -0300 Move test to the proper file All preload tests are in the eager_test file M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb commit a335e10 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-26 23:48:43 -0300 Add test case for b13d260 M activerecord/test/cases/associations/eager_test.rb commit 5462ffa refs/heads/master Merge: 08f57db b13d260 Author: Rafael Mendonça França Date: 2014-05-26 23:40:38 -0300 Merge pull request #15301 from zzak/issue_15212 Skip if the association was already loaded. commit 08f57db refs/heads/master Merge: 5c5fa70 1a3e739 Author: Rafael Mendonça França Date: 2014-05-26 22:57:07 -0300 Merge pull request #15353 from sgrif/sg-mysql-condition Remove unnecessary branch from quoting in Mysql commit 5c5fa70 refs/heads/master Author: Zachary Scott Date: 2014-05-26 18:34:53 -0700 Typo in AR CHANGELOG [ci skip] M activerecord/CHANGELOG.md commit 40514aa refs/heads/master Author: Aaron Patterson Date: 2014-05-26 17:30:17 -0700 skip the build business if the stack is empty M actionpack/lib/action_controller/metal.rb commit 02a9401 refs/heads/master Author: Aaron Patterson Date: 2014-05-26 17:19:54 -0700 stop hardcoding path_parameters and get it from the request M actionpack/lib/action_controller/metal.rb commit 7f1e550 refs/heads/master Merge: 415ba0c 65c3300 Author: Rafael Mendonça França Date: 2014-05-26 20:53:29 -0300 Merge pull request #15284 from sgrif/sg-properties Add a public API to allow users to specify column types commit 415ba0c refs/heads/master Author: Zachary Scott Date: 2014-05-26 16:45:50 -0700 Pass through AM documentation re: 02d048d [ci skip] M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/version.rb commit 1a3e739 refs/heads/master Author: Sean Griffin Date: 2014-05-26 16:40:18 -0700 Remove unnecessary branch from quoting in Mysql This is already the behavior for `BigDecimal` in the abstract adapter. M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 02d048d refs/heads/master Author: Zachary Scott Date: 2014-05-26 16:38:44 -0700 Use "Action Mailer" as canonical name in documentation [ci skip] See also: https://github.com/rails/rails/commit/3a297f8db75b172882bb3c2f9440d0c7365b8b11#commitcomment-6451708 M actionmailer/lib/action_mailer/test_helper.rb commit 3a297f8 refs/heads/master Author: Zachary Scott Date: 2014-05-26 16:34:16 -0700 Add description of ActionMailer::TestHelper module [ci skip] M actionmailer/lib/action_mailer/test_helper.rb commit 6aaf4bf refs/heads/master Author: alexbel Date: 2014-05-26 00:50:11 -0400 Replace double quotes with single quotes while adding an entry into Gemfile M railties/CHANGELOG.md M railties/lib/rails/generators/actions.rb M railties/test/generators/actions_test.rb commit d1012b6 refs/heads/master Author: Aaron Patterson Date: 2014-05-26 15:43:14 -0700 we do not need to cache rack_app M actionpack/lib/action_dispatch/routing/inspector.rb commit 65c3300 refs/heads/master Author: Sean Griffin Date: 2014-05-23 11:24:52 -0700 Add a public API to allow users to specify column types As a result of all of the refactoring that's been done, it's now possible for us to define a public API to allow users to specify behavior. This is an initial implementation so that I can work off of it in smaller pieces for additional features/refactorings. The current behavior will continue to stay the same, though I'd like to refactor towards the automatic schema detection being built off of this API, and add the ability to opt out of automatic schema detection. Use cases: - We can deprecate a lot of the edge cases around types, now that there is an alternate path for users who wish to maintain the same behavior. - I intend to refactor serialized columns to be built on top of this API. - Gem and library maintainers are able to interact with `ActiveRecord` at a slightly lower level in a more stable way. - Interesting ability to reverse the work flow of adding to the schema. Model can become the single source of truth for the structure. We can compare that to what the database says the schema is, diff them, and generate a migration. M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/connection_adapters/type/binary.rb M activerecord/lib/active_record/connection_adapters/type/boolean.rb M activerecord/lib/active_record/connection_adapters/type/date.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/float.rb M activerecord/lib/active_record/connection_adapters/type/integer.rb M activerecord/lib/active_record/connection_adapters/type/string.rb M activerecord/lib/active_record/connection_adapters/type/text.rb M activerecord/lib/active_record/connection_adapters/type/time.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/lib/active_record/model_schema.rb A activerecord/lib/active_record/properties.rb A activerecord/test/cases/custom_properties_test.rb M activerecord/test/schema/schema.rb commit 9a6ed04 refs/heads/master Merge: 178448a f2135ac Author: Rafael Mendonça França Date: 2014-05-26 19:25:16 -0300 Merge pull request #15352 from sgrif/sg-allow-empty-array-where Allow empty arrays in where predicates commit f2135ac refs/heads/master Author: Sean Griffin Date: 2014-05-26 15:12:39 -0700 Allow empty arrays in where predicates M activerecord/lib/active_record/relation/predicate_builder/array_handler.rb commit 178448a refs/heads/master Merge: 5af6120 8163a50 Author: Rafael Mendonça França Date: 2014-05-26 18:32:48 -0300 Merge pull request #15351 from sgrif/sg-allowed-types Extract types which don't require additional typecasting to a method commit 8163a50 refs/heads/master Author: Sean Griffin Date: 2014-05-26 14:28:18 -0700 Extract types which don't require additional typecasting to a method Database specific adapters shouldn't need to override `type_cast` to define types which are already in an acceptable state. M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb commit 64c7fa1 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-24 14:51:58 -0400 Refactoring .reflections public method. Now the internal reflections will hold a reference to its public representation, so when the outside world calls `Account.reflection` we can build a list of public reflections. Conflicts: activerecord/lib/active_record/associations.rb activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/reflection.rb commit 5af6120 refs/heads/master Merge: 923e274 8b39eca Author: Zachary Scott Date: 2014-05-26 14:15:33 -0700 Merge pull request #15347 from JuanitoFatas/benchmark-in-contributing-to-ror [ci skip] Add benchmark your code section to contributing to ruby on rails guide. commit 8b39eca refs/heads/master Author: Juanito Fatas Date: 2014-05-27 05:14:12 +0800 [ci skip] Add benchmark your code section to contributing to ruby on rails guide. I have seen many times that maintainers want people to use this gem to give a benchmark report. It would be nice to add it and refer to it later. M guides/source/contributing_to_ruby_on_rails.md commit 923e274 refs/heads/master Merge: e11e285 00b0242 Author: Rafael Mendonça França Date: 2014-05-26 18:08:26 -0300 Merge pull request #15300 from arthurnn/refactor_reflections Refactor reflections commit 00b0242 refs/heads/master Author: Arthur Neves Date: 2014-05-24 14:51:58 -0400 Refactoring .reflections public method. Now the internal reflections will hold a reference to its public representation, so when the outside world calls `Account.reflection` we can build a list of public reflections. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/reflection.rb commit e11e285 refs/heads/master Merge: 772c571 2f0956c Author: Rafael Mendonça França Date: 2014-05-26 18:02:37 -0300 Merge pull request #15350 from sgrif/sg-refactor-predicate-builder Refactor the handling of arrays in where predicates commit 2f0956c refs/heads/master Author: Sean Griffin Date: 2014-05-26 13:47:27 -0700 Refactor the handling of arrays in where predicates Simplifies the code slightly, isolates non-nil non-range values into a single array, which will make it easier to do things like apply type casting to them in the future. M activerecord/lib/active_record/relation/predicate_builder/array_handler.rb commit 772c571 refs/heads/master Merge: 49f03a7 45072f3 Author: Rafael Mendonça França Date: 2014-05-26 17:26:27 -0300 Merge pull request #15323 from JohnKellyFerguson/getting-started-app Docs: Rename Posts to Articles in Guides' Getting Started App commit 8a826f5 refs/heads/master Author: Aaron Patterson Date: 2014-05-26 13:24:03 -0700 a redirect is not a dispatcher by definition, so eliminate test M actionpack/lib/action_dispatch/routing/inspector.rb commit 605ab03 refs/heads/master Author: Aaron Patterson Date: 2014-05-26 13:20:43 -0700 push is_a check up to where the Constraints object is allocated M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/lib/action_dispatch/routing/mapper.rb commit 223e118 refs/heads/master Author: Guo Xiang Tan Date: 2014-05-26 12:50:44 -0700 Remove duplicated HashWithIndifferentAccess#with_indifferent_access. M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb commit 49f03a7 refs/heads/master Merge: de8c41c 5e36411 Author: Rafael Mendonça França Date: 2014-05-26 16:54:41 -0300 Merge pull request #15346 from aditya-kapoor/correct-doc-for-path correct documentation for asset_path and image_path [ci skip] commit 5e36411 refs/heads/master Author: Aditya Kapoor Date: 2014-05-27 00:58:47 +0530 correct docs for (asset|image)_path [ci skip] M actionview/lib/action_view/helpers/asset_url_helper.rb commit de8c41c refs/heads/master Merge: 76f56c4 72045b2 Author: Guillermo Iguaran Date: 2014-05-26 14:20:07 -0500 Merge pull request #15345 from matthewd/skip-dalli-errors Skip individual tests upon Dalli::RingError commit 76f56c4 refs/heads/master Merge: 505a263 6d8beaa Author: Rafael Mendonça França Date: 2014-05-26 16:18:22 -0300 Merge pull request #15342 from aditya-kapoor/correct-tag-docs correct docs for audio_tag and video_tag [ci skip] commit 72045b2 refs/heads/master Author: Matthew Draper Date: 2014-05-27 04:45:53 +0930 Skip individual tests upon Dalli::RingError Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem. M actionpack/test/dispatch/session/mem_cache_store_test.rb commit 800a30f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-26 16:01:43 -0300 Escape user input before showing in the page. This is not a security issue since this page is not present in production and user have to type something in the field but is better to escape the input. M actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb commit a432b36 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-26 16:01:09 -0300 Escape user input before showing in the page. This is not a security issue since this page is not present in production and user have to type something in the field but is better to escape the input. M actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb commit 505a263 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-26 15:58:51 -0300 Escape user input before showing in the page. This is not a security issue since this page is not present in production and user have to type something in the field but is better to escape the input. M actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb commit 6d8beaa refs/heads/master Author: Aditya Kapoor Date: 2014-05-27 00:21:30 +0530 correct doc for (audio|video)_tag [ci skip] M actionview/lib/action_view/helpers/asset_tag_helper.rb commit 6ed161e refs/heads/master Merge: 70d1267 ad7de78 Author: Rafael Mendonça França Date: 2014-05-26 15:14:45 -0300 Merge pull request #15333 from ShunsukeAida/update_ruby_version update the recommended ruby version. commit 70d1267 refs/heads/master Merge: b4ea605 e83ce84 Author: Rafael Mendonça França Date: 2014-05-26 14:51:15 -0300 Merge pull request #15294 from schneems/schneems/generator-output-in-error2 print generators on failed generate commit b4ea605 refs/heads/master Merge: cfd9d1d c22a253 Author: Rafael Mendonça França Date: 2014-05-26 14:48:20 -0300 Merge pull request #15340 from aditya-kapoor/correct-docs Correct Documentation for asset_tag_helpers commit ad7de78 refs/heads/master Author: ShunsukeAida Date: 2014-05-26 22:58:16 +0900 update the recommended ruby version M railties/lib/rails/ruby_version_check.rb commit c22a253 refs/heads/master Author: Aditya Kapoor Date: 2014-05-26 23:14:16 +0530 Correct Documentation for asset_tag_helpers M actionview/lib/action_view/helpers/asset_tag_helper.rb commit cfd9d1d refs/heads/master Merge: 7a5fbaf fbdd580 Author: Rafael Mendonça França Date: 2014-05-26 14:39:50 -0300 Merge pull request #15339 from sgrif/sg-mysql-booleans Refactor the type casting of booleans in MySQL commit 0312c1f refs/heads/master Merge: e597867 bffd462 Author: David Heinemeier Hansson Date: 2014-05-26 19:35:40 +0200 Merge pull request #67 from seuros/patch-1 Update README.md commit bffd462 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-26 17:34:34 +0000 Update README.md We will add it when a stable version is out. M README.md commit fbdd580 refs/heads/master Author: Sean Griffin Date: 2014-05-26 07:01:53 -0700 Refactor the type casting of booleans in MySQL M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 7a5fbaf refs/heads/master Merge: abd28f6 597d9c8 Author: Matthew Draper Date: 2014-05-27 03:03:09 +0930 Merge pull request #15336 from sgrif/sg-quoting Remove checks against `column.type` in abstract adapter quoting commit b9c43e0 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-26 22:57:32 +0530 remove unwanted `to_sym` call. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit abd28f6 refs/heads/master Merge: d075c84 a8afc63 Author: Rafael Mendonça França Date: 2014-05-26 14:27:16 -0300 Merge pull request #15335 from sgrif/sg-missing-test-case Add missing test case for quoting behavior commit 597d9c8 refs/heads/master Author: Sean Griffin Date: 2014-05-25 09:30:13 -0700 Remove checks against `column.type` in abstract adapter quoting The intention is to eventually remove `column` from the arguments list both for `quote` and for `type_cast` entirely. This is the first step to that end. M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/type/float.rb M activerecord/lib/active_record/connection_adapters/type/integer.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb M activerecord/test/cases/quoting_test.rb commit e83ce84 refs/heads/master Author: schneems Date: 2014-05-24 14:28:50 +0200 print generators on failed generate Let's say we just ran: ``` $ rails g migrate add_click_to_issue_assignment ``` We will get an error that looks like: ``` Could not find generator migrate. ``` This patch adds all existing migrations to the output to make it easier for a developer to find a valid migration. ``` Could not find generator "migrate". Please select a valid generator: Rails: assets controller generator helper integration_test mailer migration model resource scaffold scaffold_controller task ``` It would be nice to do some spelling detection and suggest alternatives, but for now this should help. M railties/lib/rails/generators.rb M railties/test/generators_test.rb commit a8afc63 refs/heads/master Author: Sean Griffin Date: 2014-05-26 07:46:11 -0700 Add missing test case for quoting behavior It appears that the only time that `quote` is called with a column, but without first calling `type_cast` is when where is called with an array. My previous pull request broke this behavior, without failing tests. This adds a test for the only case I can think of that exercises the `if column.type == :integer` branch of `quote` effectively. M activerecord/test/cases/base_test.rb M activerecord/test/cases/relations_test.rb commit d075c84 refs/heads/master Merge: 7a2b37f b5c4ef2 Author: Yves Senn Date: 2014-05-26 15:22:09 +0200 Merge pull request #15307 from sgrif/sg-type-cast-for-write Add an interface for type objects to control Ruby => SQL commit b5c4ef2 refs/heads/master Author: Sean Griffin Date: 2014-05-24 08:23:32 -0700 Add an interface for type objects to control Ruby => SQL Adds the ability to save custom types, which type cast to non-primitive ruby objects. M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb commit 7a2b37f refs/heads/master Author: Yves Senn Date: 2014-05-26 10:35:20 +0200 pg, add missing `:nodoc:` to adapter. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit b952ca3 refs/heads/master Author: Yves Senn Date: 2014-05-26 10:27:53 +0200 pg, remove unused code. Use `extract_schema_and_table` instead. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 2ae6e11 refs/heads/master Merge: 42fe948 86396f8 Author: Yves Senn Date: 2014-05-26 09:10:00 +0200 Merge pull request #15325 from tgxworld/no_need_to_call_to_s Remove duplicated to_s method call. commit 42fe948 refs/heads/master Merge: 30d4200 93c193e Author: Yves Senn Date: 2014-05-26 08:55:54 +0200 Merge pull request #15316 from akshay-vishnoi/test-cases Fix test cases for inflector.rb commit 30d4200 refs/heads/master Merge: 942194b 272f80d Author: Yves Senn Date: 2014-05-26 08:40:31 +0200 Merge pull request #15324 from andriytyurnikov/simple_rake_stats_for_everything simple solution that brings rake stats task to all rails project commit 942194b refs/heads/master Merge: 22e96d0 91cf768 Author: Yves Senn Date: 2014-05-26 08:18:13 +0200 Merge pull request #15328 from kuldeepaggarwal/remove-warnings remove unused variable warning. commit 22e96d0 refs/heads/master Author: Guillermo Iguaran Date: 2014-05-26 01:12:38 -0500 Fix docs for ActionController::Renderers.add M actionpack/lib/action_controller/metal/renderers.rb commit 91cf768 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-26 11:06:25 +0530 remove unused variable warning `warning: assigned but unused variable - album` M activerecord/test/cases/adapters/postgresql/schema_test.rb commit 86396f8 refs/heads/master Author: Guo Xiang Tan Date: 2014-05-25 19:07:57 -0700 Remove duplicated to_s method call. M actionpack/lib/abstract_controller/base.rb M actionpack/lib/action_controller/metal.rb commit 2926a9a refs/heads/master Merge: 6c30717 586c346 Author: Carlos Antonio da Silva Date: 2014-05-25 20:43:02 -0300 Merge pull request #15310 from tgxworld/small_refactor_get_routes_as_head Remove unnecessary flatten! method call. commit 272f80d refs/heads/master Author: Andriy Tyurnikov Date: 2014-05-26 02:19:53 +0300 simple solution that brings rake stats task to every kind of rails project M railties/lib/rails/tasks/statistics.rake commit 45072f3 refs/heads/master Author: John Kelly Ferguson Date: 2014-05-25 18:48:14 -0400 Rename Posts to Articles in Guides' Getting Started App, continuation of #15215 [ci skip] M guides/CHANGELOG.md A guides/code/getting_started/app/assets/javascripts/articles.js.coffee D guides/code/getting_started/app/assets/javascripts/posts.js.coffee A guides/code/getting_started/app/assets/stylesheets/articles.css.scss D guides/code/getting_started/app/assets/stylesheets/posts.css.scss A guides/code/getting_started/app/controllers/articles_controller.rb M guides/code/getting_started/app/controllers/comments_controller.rb D guides/code/getting_started/app/controllers/posts_controller.rb A guides/code/getting_started/app/helpers/articles_helper.rb D guides/code/getting_started/app/helpers/posts_helper.rb A guides/code/getting_started/app/models/article.rb M guides/code/getting_started/app/models/comment.rb D guides/code/getting_started/app/models/post.rb A guides/code/getting_started/app/views/articles/_form.html.erb A guides/code/getting_started/app/views/articles/edit.html.erb A guides/code/getting_started/app/views/articles/index.html.erb A guides/code/getting_started/app/views/articles/new.html.erb A guides/code/getting_started/app/views/articles/show.html.erb M guides/code/getting_started/app/views/comments/_comment.html.erb M guides/code/getting_started/app/views/comments/_form.html.erb D guides/code/getting_started/app/views/posts/_form.html.erb D guides/code/getting_started/app/views/posts/edit.html.erb D guides/code/getting_started/app/views/posts/index.html.erb D guides/code/getting_started/app/views/posts/new.html.erb D guides/code/getting_started/app/views/posts/show.html.erb M guides/code/getting_started/app/views/welcome/index.html.erb M guides/code/getting_started/config/routes.rb A guides/code/getting_started/db/migrate/20130122042648_create_articles.rb D guides/code/getting_started/db/migrate/20130122042648_create_posts.rb M guides/code/getting_started/db/migrate/20130122045842_create_comments.rb M guides/code/getting_started/db/schema.rb A guides/code/getting_started/test/controllers/articles_controller_test.rb D guides/code/getting_started/test/controllers/posts_controller_test.rb A guides/code/getting_started/test/fixtures/articles.yml M guides/code/getting_started/test/fixtures/comments.yml D guides/code/getting_started/test/fixtures/posts.yml A guides/code/getting_started/test/helpers/articles_helper_test.rb D guides/code/getting_started/test/helpers/posts_helper_test.rb A guides/code/getting_started/test/models/article_test.rb D guides/code/getting_started/test/models/post_test.rb commit b18f22d refs/heads/master Author: Aaron Patterson Date: 2014-05-25 14:26:48 -0700 pass the request object to the application M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/journey/router_test.rb commit 62c013d refs/heads/master Author: Aaron Patterson Date: 2014-05-25 14:11:34 -0700 pass a request to `matches?` so we can avoid creating excess requests M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit cff0d15 refs/heads/master Author: Aaron Patterson Date: 2014-05-25 14:06:20 -0700 nothing is passed to `rack_app` anymore, so rm the params M actionpack/lib/action_dispatch/routing/inspector.rb commit c1bc70e refs/heads/master Author: Aaron Patterson Date: 2014-05-25 14:04:08 -0700 one fewer is_a check M actionpack/lib/action_dispatch/routing/inspector.rb commit 15df2a3 refs/heads/master Author: Guo Xiang Tan Date: 2014-05-25 13:48:30 -0700 Call get_routes_as_head only on HEAD requests. M actionpack/lib/action_dispatch/journey/router.rb commit 8a51ec0 refs/heads/master Author: Aaron Patterson Date: 2014-05-25 13:43:14 -0700 Constraints#app should never return another Constraints object, so switch to if statement M actionpack/lib/action_dispatch/routing/mapper.rb commit 93c193e refs/heads/master Author: Akshay Vishnoi Date: 2014-05-25 21:36:02 +0530 Fix test cases for inflector.rb `yield` was missing in #with_dup, due to which 57 assertions were not running in real, and all tests were passing by default. Error was introduced in commit - 31ceb5e. M activesupport/test/inflector_test.rb commit 6c30717 refs/heads/master Merge: 21ec7fe 7981f06 Author: Santiago Pastorino Date: 2014-05-25 13:01:44 -0300 Merge pull request #15315 from JuanitoFatas/guides-guidelines [ci skip] Update GFM link in guides guidelines. commit 7981f06 refs/heads/master Author: Juanito Fatas Date: 2014-05-25 23:36:02 +0800 [ci skip] Update GFM link in guides guidelines. Also remove a duplicated sentence. M guides/source/ruby_on_rails_guides_guidelines.md commit 21ec7fe refs/heads/master Merge: 2bb6b51 d28ed9f Author: Yves Senn Date: 2014-05-25 17:16:05 +0200 Merge pull request #15312 from JuanitoFatas/action_view/asset_path Convert source to string if it is present. commit 2bb6b51 refs/heads/master Merge: f632f79 839d461 Author: Yves Senn Date: 2014-05-25 13:56:59 +0200 Merge pull request #15311 from zuhao/refactor_actionpack_bare_metal_test The correct status to test should be :switching_protocols. commit d28ed9f refs/heads/master Author: Juanito Fatas Date: 2014-05-25 16:18:51 +0800 Convert source to string if it is present. M actionview/lib/action_view/helpers/asset_url_helper.rb commit 839d461 refs/heads/master Author: Zuhao Wan Date: 2014-05-25 16:17:22 +0800 The correct status to test should be :switching_protocols. M actionpack/test/controller/new_base/bare_metal_test.rb commit 586c346 refs/heads/master Author: Guo Xiang Tan Date: 2014-05-25 00:15:24 -0700 Remove unnecessary flatten! method call. M actionpack/lib/action_dispatch/journey/router.rb commit f632f79 refs/heads/master Merge: 98c7fe8 4ca5a5e Author: Guillermo Iguaran Date: 2014-05-24 23:08:29 -0500 Merge pull request #15305 from tgxworld/remove_unnecessary_require Remove unnecessary require of Minitest. commit 4ca5a5e refs/heads/master Author: Guo Xiang Tan Date: 2014-05-24 11:44:39 -0700 Remove unnecessary require of Minitest. Minitest has already been required when calling Minitest.autorun. M actionpack/lib/action_dispatch/testing/integration.rb M activesupport/lib/active_support/test_case.rb M railties/test/generators/argv_scrubber_test.rb M railties/test/generators/generator_test.rb commit b6ec5e2 refs/heads/master Author: Aaron Patterson Date: 2014-05-24 19:07:26 -0700 eliminate dispatcher is_a checks M actionpack/lib/action_dispatch/routing/mapper.rb commit 633589c refs/heads/master Author: Aaron Patterson Date: 2014-05-24 19:03:12 -0700 push is_a?(Dispatcher) check in to one place M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/router_test.rb commit 229c9ed refs/heads/master Author: Aaron Patterson Date: 2014-05-24 18:53:30 -0700 Always construct route objects with Constraint objects M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 98c7fe8 refs/heads/master Author: Aaron Patterson Date: 2014-05-24 17:52:11 -0700 unwrap the constraints object on initialization, eliminate loops Unwrap Constraints objects. I don't actually think it's possible to pass a Constraints object to this constructor, but there were multiple places that kept testing children of this object. I *think* they were just being defensive, but I have no idea. M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit c237861 refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-05-24 16:17:21 -0700 Reference 4.1.1 in debugging rails applications guide from #15304 M guides/source/debugging_rails_applications.md commit 45c5f43 refs/remotes/origin/4-1-stable Author: John Kelly Ferguson Date: 2014-05-24 18:51:23 -0400 Update all Rails 4.1.0 references in guides to 4.1.1 [ci skip] Conflicts: guides/CHANGELOG.md guides/code/getting_started/Gemfile guides/source/debugging_rails_applications.md M guides/CHANGELOG.md M guides/code/getting_started/Gemfile M guides/code/getting_started/Gemfile.lock M guides/source/command_line.md M guides/source/getting_started.md commit e697e02 refs/remotes/origin/4-1-stable Author: Xavier Noria Date: 2014-05-25 00:43:31 +0200 integration tests do not need to load fixtures by hand I don't know when this changed, checked back up to 3.2 and integration tests instantiate fixtures just fine. M guides/code/getting_started/test/test_helper.rb M guides/source/testing.md M railties/lib/rails/generators/rails/app/templates/test/test_helper.rb commit 107c27b refs/heads/master Merge: 36e3ca6 3a480b4 Author: Xavier Noria Date: 2014-05-25 00:57:03 +0200 Merge pull request #15304 from JohnKellyFerguson/guides-4.1.1 Update all Rails 4.1.0 references in guides to 4.1.1 [ci skip] commit 3a480b4 refs/heads/master Author: John Kelly Ferguson Date: 2014-05-24 18:51:23 -0400 Update all Rails 4.1.0 references in guides to 4.1.1 [ci skip] M guides/CHANGELOG.md M guides/code/getting_started/Gemfile M guides/code/getting_started/Gemfile.lock M guides/source/command_line.md M guides/source/debugging_rails_applications.md M guides/source/getting_started.md commit 36e3ca6 refs/heads/master Author: Xavier Noria Date: 2014-05-25 00:43:31 +0200 integration tests do not need to load fixtures by hand I don't know when this changed, checked back up to 3.2 and integration tests instantiate fixtures just fine. M guides/code/getting_started/test/test_helper.rb M guides/source/testing.md M railties/lib/rails/generators/rails/app/templates/test/test_helper.rb commit 0bd909a refs/heads/master Merge: a9ced73 5ec797e Author: Arthur Nogueira Neves Date: 2014-05-24 18:28:38 -0400 Merge pull request #15303 from JohnKellyFerguson/guides-ar-querying Improve readability of Explain Queries table in guides commit 5ec797e refs/heads/master Author: John Kelly Ferguson Date: 2014-05-24 18:16:07 -0400 Improve readability of Explain Queries table in guides [ci skip] M guides/CHANGELOG.md M guides/source/active_record_querying.md commit b13d260 refs/heads/master Author: Zachary Scott Date: 2014-05-24 13:22:52 -0700 Skip if the association was already loaded. M activerecord/lib/active_record/associations/preloader.rb commit 6259e4e refs/heads/master Author: Arthur Neves Date: 2014-05-24 14:04:17 -0400 Use .to_s on _reflections lookup M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/reflection.rb commit 09ac448 refs/heads/master Author: Arthur Neves Date: 2014-05-24 14:03:30 -0400 Merge pull request #15210 from arthurnn/fix_hbtm_reflection Fix habtm reflection Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/reflection_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/lib/active_record/validations/presence.rb M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/reflection_test.rb commit a9ced73 refs/heads/master Merge: 528e590 b71f5f4 Author: Rafael Mendonça França Date: 2014-05-24 15:15:53 -0300 Merge pull request #15299 from andriytyurnikov/engine_friendly_rake_stats rake stats for engines commit 528e590 refs/heads/master Merge: e2bd0eb b4db241 Author: Rafael Mendonça França Date: 2014-05-24 14:51:44 -0300 Merge pull request #15264 from Gaurav2728/gaurav-documentation_fix documentation link fix and removing unused reader commit b4db241 refs/heads/master Author: Gaurav Sharma Date: 2014-05-24 10:55:25 +0530 documentation fix M actionview/lib/action_view/rendering.rb commit b71f5f4 refs/heads/master Author: Andriy Tyurnikov Date: 2014-05-23 23:28:06 +0300 rake stats for engines M railties/lib/rails/generators/rails/plugin/templates/Rakefile M railties/lib/rails/tasks/statistics.rake commit e2bd0eb refs/heads/master Merge: 848776c b2ec147 Author: Rafael Mendonça França Date: 2014-05-24 13:42:19 -0300 Merge pull request #15298 from ShunsukeAida/fix_capitalization fixed capitalization [ci skip] commit 54d9b3c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-24 13:34:16 -0300 Add FIXME note about the thor bug M railties/lib/rails/generators/named_base.rb commit 0467a63 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-24 13:30:51 -0300 Merge pull request #9083 from bronson/patch-1 avoid using alias in generators M railties/lib/rails/generators/named_base.rb commit a8de5b3 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-24 13:34:16 -0300 Add FIXME note about the thor bug M railties/lib/rails/generators/named_base.rb commit c9ff9d1 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-24 13:30:51 -0300 Merge pull request #9083 from bronson/patch-1 avoid using alias in generators M railties/lib/rails/generators/named_base.rb commit 848776c refs/heads/master Author: Rafael Mendonça França Date: 2014-05-24 13:34:16 -0300 Add FIXME note about the thor bug M railties/lib/rails/generators/named_base.rb commit b2ec147 refs/heads/master Author: ShunsukeAida Date: 2014-05-25 01:24:21 +0900 fixed capitalization M railties/lib/rails/generators/rails/app/templates/Gemfile commit fd552e5 refs/heads/master Merge: 50d4f59 21e4113 Author: Rafael Mendonça França Date: 2014-05-24 13:30:51 -0300 Merge pull request #9083 from bronson/patch-1 avoid using alias in generators commit 50d4f59 refs/heads/master Merge: ade105b a3b297f Author: Zachary Scott Date: 2014-05-24 08:55:07 -0700 Merge pull request #13988 from zzak/guides_configuring_reverse_proxy [Guides] Add documentation for using Rails with a reverse proxy [ci skip] commit a3b297f refs/heads/master Author: Zachary Scott Date: 2014-02-09 09:20:51 +0200 Add documentation for using Rails with a reverse proxy M guides/source/configuring.md commit f62de49 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-24 12:41:28 -0300 Merge pull request #14986 from dlangevin/trailing-slash-url-generation Fixes URL generation with trailing_slash: true Conflicts: actionpack/lib/action_dispatch/http/url.rb Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/url.rb Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/url_generation_test.rb commit f83ca9a refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-24 12:41:28 -0300 Merge pull request #14986 from dlangevin/trailing-slash-url-generation Fixes URL generation with trailing_slash: true Conflicts: actionpack/lib/action_dispatch/http/url.rb Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/url.rb M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/url_generation_test.rb commit ade105b refs/heads/master Merge: 286a8b7 82b4d87 Author: Rafael Mendonça França Date: 2014-05-24 12:41:28 -0300 Merge pull request #14986 from dlangevin/trailing-slash-url-generation Fixes URL generation with trailing_slash: true Conflicts: actionpack/lib/action_dispatch/http/url.rb commit 286a8b7 refs/heads/master Author: Yves Senn Date: 2014-05-24 16:08:04 +0200 pg, remove duplicated code. M activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb commit cea4816 refs/heads/master Author: Yves Senn Date: 2014-05-24 16:02:32 +0200 pg, extract schema definitions into separate file. This mirrors the layout of abstract adapter and puts the definitions inside the `PostgreSQL` namespace (no longer under the adapter namespace). /cc @kares A activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit ec88d68 refs/heads/master Author: Yves Senn Date: 2014-05-24 14:22:40 +0200 Revert "Merge pull request #15293 from schneems/schneems/generator-output-in-error" This reverts commit 7466d6a9f989a1a8f90899b79b34f1152e440b7c, reversing changes made to b850c4c540e8f0c15742f67c532f521a4a123655. This was an accidental merge. A new PR will follow. /cc @schneems M railties/lib/rails/generators.rb commit 7466d6a refs/heads/master Merge: b850c4c 3915c45 Author: Richard Schneeman Date: 2014-05-24 14:19:17 +0200 Merge pull request #15293 from schneems/schneems/generator-output-in-error print generators on failed generate commit b850c4c refs/heads/master Merge: d10d749 3f829a8 Author: Andrew White Date: 2014-05-24 13:15:34 +0100 Merge pull request #15278 from akshay-vishnoi/doc_changes [ci skip] Improve doc for ModuleConstMissing.guess_for_anonymous commit 3915c45 refs/heads/master Author: schneems Date: 2014-05-24 14:07:54 +0200 print generators on failed generate Let's say we just ran: ``` $ rails g migrate add_click_to_issue_assignment ``` We will get an error that looks like: ``` Could not find generator migrate. ``` This patch adds all existing migrations to the output to make it easier for a developer to find a valid migration. ``` Could not find generator "migrate". Please select a valid generator: Rails: assets controller generator helper integration_test mailer migration model resource scaffold scaffold_controller task ``` It would be nice to do some spelling detection and suggest alternatives, but for now this should help. M railties/lib/rails/generators.rb commit 5920d58 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-24 01:07:26 -0300 Revert "Merge pull request #15292 from zzak/backport_43f525031ad3f83a04f84e79bbe1de340bf937aa" This reverts commit d40287d330ae1b70f26ded242399db3e20cfb0c7, reversing changes made to 2922417b9aef1df192338c421ce821c02088db5b. These tests are already there M railties/test/application/configuration_test.rb commit 3f829a8 refs/heads/master Author: Akshay Vishnoi Date: 2014-05-24 06:41:16 +0530 [ci skip] Improve doc for ModuleConstMissing.guess_for_anonymous M activesupport/lib/active_support/dependencies.rb commit 7b912a0 refs/remotes/origin/4-1-stable Merge: 372f7a6 8bcaa81 Author: Rafael Mendonça França Date: 2014-05-23 21:55:01 -0300 Merge pull request #15210 from arthurnn/fix_hbtm_reflection Fix habtm reflection commit 7afd944 refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-05-22 14:08:23 -0700 fix test from 7537057888d2d63c3b6c2019d5828bc445fbd6c9 M activerecord/lib/active_record/attribute_methods.rb commit f70058a refs/remotes/origin/4-0-stable Author: Kris Kemper Date: 2014-03-23 08:32:37 -0400 Don't recurse infinitely when calling non-existent method on super M activerecord/test/cases/attribute_methods_test.rb commit 372f7a6 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-22 14:08:23 -0700 fix test from 7537057888d2d63c3b6c2019d5828bc445fbd6c9 M activerecord/lib/active_record/attribute_methods.rb commit 7bc16e3 refs/remotes/origin/4-1-stable Author: Kris Kemper Date: 2014-03-23 08:32:37 -0400 Don't recurse infinitely when calling non-existent method on super M activerecord/test/cases/attribute_methods_test.rb commit d10d749 refs/heads/master Merge: fc6e861 6b2ff4f Author: Rafael Mendonça França Date: 2014-05-23 21:09:21 -0300 Merge pull request #15290 from sgrif/sg-consolidate-zero-scale-decimal Remove special case in schema dumper for decimal without scale commit fc6e861 refs/heads/master Merge: cf2a40b aac85de Author: Rafael Mendonça França Date: 2014-05-23 21:02:45 -0300 Merge pull request #15291 from francocatena/router-visualizer-fix Fix router visualizer CSS and JS resources commit d40287d refs/remotes/origin/4-1-stable Merge: 2922417 eb92b6c Author: Rafael Mendonça França Date: 2014-05-23 21:00:47 -0300 Merge pull request #15292 from zzak/backport_43f525031ad3f83a04f84e79bbe1de340bf937aa Backport 43f5250 commit eb92b6c refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-05-23 16:55:20 -0700 Backport tests from 43f5250 M railties/test/application/configuration_test.rb commit aac85de refs/heads/master Author: Franco Catena Date: 2014-05-23 19:40:32 -0300 Fix router visualizer CSS and JS resources M actionpack/lib/action_dispatch/journey/visualizer/index.html.erb commit 6b2ff4f refs/heads/master Author: Sean Griffin Date: 2014-05-23 15:31:30 -0700 Remove special case in schema dumper for decimal without scale M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type.rb A activerecord/lib/active_record/connection_adapters/type/decimal_without_scale.rb M activerecord/test/cases/connection_adapters/type_lookup_test.rb commit cf2a40b refs/heads/master Author: Aaron Patterson Date: 2014-05-23 16:29:06 -0700 Constraints contructor should always return a Constraints object I know, it's crazy. M actionpack/lib/action_dispatch/routing/mapper.rb commit 2b7b136 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 16:05:33 -0700 default value is never used, so make it required M actionpack/lib/action_dispatch/routing/mapper.rb commit d991b67 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 15:55:47 -0700 push options decomposition up so we can extract M actionpack/lib/action_dispatch/routing/mapper.rb commit 3bc684b refs/heads/master Merge: 6d48d97 1d7b3fa Author: Godfrey Chan Date: 2014-05-23 15:47:53 -0700 Merge pull request #15289 from zzak/future_port_c8ddb61 Future port c8ddb61 [ci skip] commit 6d48d97 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 15:25:34 -0700 glob_param is never used, so rm this also changes the constructor. We don't need to pass more options than "defaults" (whatever defaults are, ugh. probably another hash of stupid stuff). M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/router_test.rb commit 1d7b3fa refs/heads/master Author: Zachary Scott Date: 2014-05-23 14:45:21 -0700 Future port c8ddb61 M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M railties/CHANGELOG.md commit 2922417 refs/remotes/origin/4-1-stable Author: Guillermo Iguaran Date: 2014-05-23 16:44:47 -0500 Update CHANGELOG.md Fix typo M activerecord/CHANGELOG.md commit 8bcaa81 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-23 17:38:43 -0400 Add changelog for #15210 M activerecord/CHANGELOG.md commit f625f78 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-21 16:06:11 -0400 Make HasManyThroughSourceAssociationNotFoundError use _reflections - No need to use .map(:to_s) - Add @api public to reflections M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/reflection.rb commit 5657f5f refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-21 15:53:28 -0400 Add _reflect_on_association method for internal use Internally we wanna look-up the reflection by the association name in the private list of reflections, so I am adding a _reflect_on_association method that does that. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/lib/active_record/validations/presence.rb M activerecord/lib/active_record/validations/uniqueness.rb commit 605e253 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-21 15:30:38 -0400 Replace reflect_on_all_associations internally M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/reflection.rb commit 8c169c4 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-21 11:20:17 -0400 Small test syntax change M activerecord/test/cases/reflection_test.rb commit bb6861d refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-20 18:21:50 -0400 Add has_and_belongs_to_many back to reflections hash. This adds back `has_and_belongs_to_many` reflection to the reflections hash. Even thought we are not using that internally, as `Model.reflections` is a public method we need to keep the hash of reflections coherent. ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1 is the commit that made has_and_belongs_to_many became a has_many :through and a has_many. [fixes #14682] M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/reflection_test.rb commit 78169e1 refs/remotes/origin/4-1-stable Merge: 47a60ea 928a0c6 Author: Rafael Mendonça França Date: 2014-05-23 18:01:28 -0300 Merge pull request #15287 from zzak/backport_14871 Backport 14871 commit 928a0c6 refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-05-16 11:36:48 -0700 Remove the assignment for real this time. cc: https://github.com/rails/rails/commit/a11e2fcff8cdc9691b977d8330abe63024f8c732#commitcomment-6353614 and 0369dbf Conflicts: activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb commit 7abde13 refs/heads/master Merge: 21f99b4 1a4d13b Author: Rafael Mendonça França Date: 2014-05-23 17:59:46 -0300 Merge pull request #15285 from sergey-alekseev/remove-active-record-where-duplicated-condition Remove duplicated parameter check on #where! commit 1a4d13b refs/heads/master Author: Sergey Alekseev Date: 2014-05-23 23:42:36 +0300 Remove duplicated parameter check on #where! It seems that #where! is not designed to be used as a chained where. See initial implementation at 8c2c60511beaad05a218e73c4918ab89fb1804f0. So, no need to check twice. We should not test #where! https://github.com/rails/rails/pull/15285#discussion_r13018316 M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_chain_test.rb commit 21f99b4 refs/heads/master Merge: 482091c e1cc426 Author: Rafael Mendonça França Date: 2014-05-23 17:39:39 -0300 Merge pull request #15283 from oismail91/improve_doc_for_select_tag update select_tag docs for customizing id commit 482091c refs/heads/master Merge: a6f55fe 2004e4e Author: Rafael Mendonça França Date: 2014-05-23 17:36:19 -0300 Merge pull request #15277 from sgrif/sg-schema-cache-refactor Simplify the code in schema cache commit e1cc426 refs/heads/master Author: Omar Ismail Date: 2014-05-23 15:13:27 -0400 update docs to include html id for select_tag M actionview/lib/action_view/helpers/form_tag_helper.rb commit a6f55fe refs/heads/master Merge: 93ae747 36368ea Author: Rafael Mendonça França Date: 2014-05-23 15:23:12 -0300 Merge pull request #15261 from hbin/missing_parameters Bring the missing parameters back. commit 93ae747 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 11:20:05 -0700 use Proc.new to automatically do parameter checking for us M actionpack/lib/action_controller/metal.rb commit 7c26f01 refs/heads/master Merge: a312770 05dd3df Author: Rafael Mendonça França Date: 2014-05-23 15:19:59 -0300 Merge pull request #15282 from sgrif/sg-remove-column-primary Remove `Column#primary` commit 05dd3df refs/heads/master Author: Sean Griffin Date: 2014-05-23 10:59:30 -0700 Remove `Column#primary` It appears to have been used at some point in the past, but is no longer used in any meaningful way. Whether a column is considered primary is a property of the model, not the schema/column. This also removes the need for yet another layer of caching of the model's schema, and we can leave that to the schema cache. M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/adapters/sqlite3/copy_table_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/bind_parameter_test.rb M activerecord/test/cases/primary_keys_test.rb commit a312770 refs/heads/master Merge: cb7f03f 0e94017 Author: Rafael Mendonça França Date: 2014-05-23 15:05:28 -0300 Merge pull request #15276 from kuldeepaggarwal/fix-array-to Array#to now accept negative position also. commit cb7f03f refs/heads/master Merge: b4cce07 9dc8e77 Author: Rafael Mendonça França Date: 2014-05-23 15:04:58 -0300 Merge pull request #15265 from danielmbarlow/master Added force_reload to Auto-generated methods doc commit b4cce07 refs/heads/master Merge: fbdcba8 adb8819 Author: Rafael Mendonça França Date: 2014-05-23 15:02:05 -0300 Merge pull request #15280 from sgrif/sg-postgres-defaults Move parsing of PG sql strings for defaults out of column commit fbdcba8 refs/heads/master Merge: 02f3081 3920d64 Author: Rafael Mendonça França Date: 2014-05-23 14:59:55 -0300 Merge pull request #15275 from kuldeepaggarwal/add-test add test cases for negative position in Array#from commit 02f3081 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:58:06 -0700 there is no formatter on the router object, so rm M actionpack/lib/action_dispatch/journey/router.rb commit baf61ed refs/heads/master Merge: 7d457e9 4f8ba6a Author: Rafael Mendonça França Date: 2014-05-23 14:58:22 -0300 Merge pull request #15271 from sgrif/sg-remove-duplicated-setup Remove duplicated setup in test commit 7d457e9 refs/heads/master Merge: 0f5e3a9 fd03569 Author: Rafael Mendonça França Date: 2014-05-23 14:58:00 -0300 Merge pull request #15273 from DNNX/formatter-refactoring-4 Remove AD::Journey::Formatter#verify_required_parts! commit 0f5e3a9 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:57:15 -0700 decouple the router object from the request class M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/router_test.rb commit 6fd8346 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:52:58 -0700 pass the correct custom request to the recognize method M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/router_test.rb commit 6ed5b01 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:35:51 -0700 switch to the `serve` method so we can remove the request class (eventually) M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/journey/router_test.rb commit f117544 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:27:30 -0700 pull request allocation up one frame M actionpack/lib/action_dispatch/routing/route_set.rb commit aaceca6 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:25:26 -0700 extract request allocation from the main app serving routine M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/dispatch/routing_test.rb commit 0735f8e refs/heads/master Merge: a8931bd 8ae3ed3 Author: Rafael Mendonça França Date: 2014-05-23 14:56:11 -0300 Merge pull request #15279 from akshay-vishnoi/remove#=== [ci skip] Remove Duration#=== when we drop support for 2.0.0-p353 commit 8ae3ed3 refs/heads/master Author: Akshay Vishnoi Date: 2014-05-23 23:23:27 +0530 [ci skip] Remove Duration#=== when we drop support for 2.0.0-p353 M activesupport/lib/active_support/duration.rb commit a8931bd refs/heads/master Merge: 71cdad5 2859066 Author: Rafael Mendonça França Date: 2014-05-23 14:50:18 -0300 Merge pull request #15281 from sgrif/sg-inline-point-type-cast Inline type cast method for PG points commit 71cdad5 refs/heads/master Merge: ca02296 3541657 Author: Rafael Mendonça França Date: 2014-05-23 14:45:15 -0300 Merge pull request #15274 from sgrif/sg-move-type-tests Change typecasting unit tests to test type objects directly commit ca02296 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:17:57 -0700 use the accessors on the request object rather than touching env M actionpack/lib/action_dispatch/journey/router.rb commit 559d89c refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:16:03 -0700 find_routes only use the request, so stop passing env M actionpack/lib/action_dispatch/journey/router.rb commit 3541657 refs/heads/master Author: Sean Griffin Date: 2014-05-23 08:14:58 -0700 Change typecasting unit tests to test type objects directly There's no longer type casting behavior of any kind inside of `Column` for the general case. These tests can be made clearer by testing the type objects directly. D activerecord/test/cases/column_test.rb A activerecord/test/cases/types_test.rb commit 890e0a9 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 10:09:24 -0700 remove NullRequest and just always pass a request class M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/journey/router_test.rb commit a6e9454 refs/heads/master Author: Aaron Patterson Date: 2014-05-23 09:56:33 -0700 use the request object since we have it stop hardcoding hash keys and use the accessors provided on the request object. M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/dispatch/routing_test.rb M actionpack/test/journey/router_test.rb commit 2859066 refs/heads/master Author: Sean Griffin Date: 2014-05-23 09:40:15 -0700 Inline type cast method for PG points M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb commit adb8819 refs/heads/master Author: Sean Griffin Date: 2014-05-23 09:33:14 -0700 Move parsing of PG sql strings for defaults out of column M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 47a60ea refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-17 00:25:04 +0200 doc, pg `hstore` and `json` columns are mapped as `Hash`. [ci skip] Closes #15141. M guides/source/upgrading_ruby_on_rails.md commit 0e94017 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-23 21:32:52 +0530 revert 96525d63 `Array#to` is working for negative position M activesupport/lib/active_support/core_ext/array/access.rb M activesupport/test/core_ext/array_ext_test.rb commit 2004e4e refs/heads/master Author: Sean Griffin Date: 2014-05-23 08:59:53 -0700 Simplify the code in schema cache The use of default procs was unnessecary, made the code confusing to follow, and made marshalling needlessly complex. M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit 0f86846 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-23 05:29:48 -0700 Merge pull request #15240 from chancancode/fix_attribute_methods Fixed serialization for records with an attribute named `format`. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/serialization_test.rb M activerecord/test/fixtures/books.yml M activerecord/test/schema/schema.rb commit 4f8ba6a refs/heads/master Author: Sean Griffin Date: 2014-05-23 07:32:42 -0700 Remove duplicated setup in test M activerecord/test/cases/schema_dumper_test.rb commit b6b65ff refs/remotes/origin/4-1-stable Author: Guillermo Iguaran Date: 2014-04-23 12:48:02 -0500 Merge pull request #14850 from chancancode/fix_json_cookie_jar Fixed an issue with migrating legacy json cookies. Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb commit 3920d64 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-23 20:47:21 +0530 add test cases for negative position in Array#from M activesupport/lib/active_support/core_ext/array/access.rb M activesupport/test/core_ext/array_ext_test.rb commit fd03569 refs/heads/master Author: Viktar Basharymau Date: 2014-05-23 18:00:50 +0300 Remove AD::Journey::Formatter#verify_required_parts! Nobody uses this private method, maybe it is a leftover from some old refactoring. Let's delete it. M actionpack/lib/action_dispatch/journey/formatter.rb commit e180249 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-23 11:45:28 -0300 Remove warning removing the method before redefining We need to test if the same method defined more than once only register one subscriber for it. We can safelly remove because the method body is the same and Subscriber use method_added hook for register the subscriber. M activesupport/test/subscriber_test.rb commit 2fdddce refs/heads/master Author: Rafael Mendonça França Date: 2014-05-23 11:45:28 -0300 Remove warning remeving the method before redefining We need to test if the same method defined more than once only register one subscriber for it. We can safelly remove because the method body is the same and Subscriber use method_added hook for register the subscriber. M activesupport/test/subscriber_test.rb commit e597867 refs/heads/master Merge: 02202e6 8e19b6a Author: Rafael Mendonça França Date: 2014-05-23 11:14:44 -0300 Merge pull request #64 from kalmanh/ruby_19_style_hashes Change to 1.9 symbol-hash syntax commit 8e19b6a refs/heads/master Author: Kalman Hazins Date: 2014-05-23 10:06:16 -0400 Change to 1.9 symbol-hash syntax M Rakefile commit 8b36471 refs/heads/master Merge: 0cc7f02 28d52c5 Author: Aaron Patterson Date: 2014-05-23 05:29:48 -0700 Merge pull request #15240 from chancancode/fix_attribute_methods Fixed serialization for records with an attribute named `format`. commit 9dc8e77 refs/heads/master Author: danielmbarlow Date: 2014-05-23 11:43:12 +0200 Added force_reload to Auto-generated methods doc Should make it a little easier to find the information. Also added note to look below for the definition of the generated methods. M activerecord/lib/active_record/associations.rb commit 36368ea refs/heads/master Author: Bin Huang Date: 2014-05-23 14:39:54 +0800 Bring the missing parameters back. M activerecord/lib/active_record/attribute_methods.rb commit f1c9af7 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-23 08:35:02 +0200 Merge pull request #15251 from peeyushsingla/master Reorder query in active record query of rails guide [ci skip] Conflicts: guides/source/active_record_querying.md M guides/source/active_record_querying.md commit 0cc7f02 refs/heads/master Merge: 9ca4839 42c55b9 Author: Yves Senn Date: 2014-05-23 08:35:02 +0200 Merge pull request #15251 from peeyushsingla/master Reorder query in active record query of rails guide [ci skip] commit 02202e6 refs/heads/master Merge: 53948bf 0f8dc7e Author: David Heinemeier Hansson Date: 2014-05-23 08:24:13 +0200 Merge pull request #62 from DouweM/patch-3 Don't swallow unhandled exceptions. commit 42c55b9 refs/heads/master Author: peeyush Date: 2014-05-22 23:07:18 +0530 resolved reorder issue in rails active record guide M guides/source/active_record_querying.md commit 0f8dc7e refs/heads/master Author: Douwe Maan Date: 2014-05-23 01:14:13 +0200 Don't swallow unhandled exceptions. M lib/active_job/execution.rb M test/cases/rescue_test.rb M test/jobs/rescue_job.rb commit 9ca4839 refs/heads/master Author: Aaron Patterson Date: 2014-05-22 15:57:24 -0700 stop using PARAMETERS_KEY, and use the accessor on the request object this decouples our code from the env hash a bit. M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 1b76c7e refs/heads/master Author: Aaron Patterson Date: 2014-05-22 15:46:38 -0700 pass the instantiated request to the find_routes method M actionpack/lib/action_dispatch/journey/router.rb commit 8d8ebe3 refs/heads/master Author: Aaron Patterson Date: 2014-05-22 15:37:08 -0700 just return path parameters M actionpack/lib/action_dispatch/http/parameters.rb commit 925bd97 refs/heads/master Author: Aaron Patterson Date: 2014-05-22 15:12:03 -0700 use symbol keys for path_parameters M actionpack/lib/action_controller/metal/url_for.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/redirection.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/controller/test_case_test.rb commit 28d52c5 refs/heads/master Author: Godfrey Chan Date: 2014-05-22 11:58:20 -0700 Avoid slowing down AR object initialization 2d73f5a forces AR to enter the `define_attribute_methods` method whenever it instantiate a record from the `init_with` entry point. This is a potential performance hotspot, because `init_with` is called from all `find*` family methods, and `define_attribute_methods` is slow because it tries to acquire a lock on the mutex everytime it is entered. By using [DCL](http://en.wikipedia.org/wiki/Double-checked_locking), we can avoid grabbing the lock most of the time when the attribute methods are already defined (the common case). This is made possible by the fact that reading an instance variable is an atomic operation in Ruby. Credit goes to Aaron Patterson for pointing me to DCL and filling me in on the atomicity guarantees in Ruby. [*Godfrey Chan*, *Aaron Patterson*] M activerecord/lib/active_record/attribute_methods.rb commit 2d73f5a refs/heads/master Author: Godfrey Chan Date: 2014-05-21 23:36:35 -0700 Fixed serialization for records with an attribute named `format`. * * * This bug can be triggered when serializing record R (the instance) of type C (the class), provided that the following conditions are met: 1. The name of one or more columns/attributes on C/R matches an existing private method on C (e.g. those defined by `Kernel`, such as `format`). 2. The attribute methods have not yet been generated on C. In this case, the matching private methods will be called by the serialization code (with no arguments) and their return values will be serialized instead. If the method requires one or more arguments, it will result in an `ArgumentError`. This regression is introduced in d1316bb. * * * Attribute methods (e.g. `#name` and `#format`, assuming the class has columns named `name` and `format` in its database table) are lazily defined. Instead of defining them when a the class is defined (e.g. in the `inherited` hook on `ActiveRecord::Base`), this operation is deferred until they are first accessed. The reason behind this is that is defining those methods requires knowing what columns are defined on the database table, which usually requires a round-trip to the database. Deferring their definition until the last-possible moment helps reducing unnessary work, especially in development mode where classes are redefined and throw away between requests. Typically, when an attribute is first accessed (e.g. `a_book.format`), it will fire the `method_missing` hook on the class, which triggers the definition of the attribute methods. This even works for methods like `format`, because calling a private method with an explicit receiver will also trigger that hook. Unfortunately, `read_attribute_for_serialization` is simply an alias to `send`, which does not respect method visibility. As a result, when serializing a record with those conflicting attributes, the `method_missing` is not fired, and as a result the attribute methods are not defined one would expected. Before d1316bb, this is negated by the fact that calling the `run_callbacks` method will also trigger a call to `respond_to?`, which is another trigger point for the class to define its attribute methods. Therefore, when Active Record tries to run the `after_find` callbacks, it will also define all the attribute methods thus masking the problem. * * * The proper fix for this problem is probably to restrict `read_attribute_for_serialization` to call public methods only (i.e. alias `read_attribute_for_serialization` to `public_send` instead of `send`). This however would be quite risky to change in a patch release and would probably require a full deprecation cycle. Another approach would be to override `read_attribute_for_serialization` inside Active Record to force the definition of attribute methods: def read_attribute_for_serialization(attribute) self.class.define_attribute_methods send(attribute) end Unfortunately, this is quite likely going to cause a performance degradation. This patch therefore restores the behaviour from the 4-0-stable branch by explicitly forcing the class to define its attribute methods in a similar spot (when records are initialized). This should not cause any extra roundtrips to the database because the `@columns` should already be cached on the class. Fixes #15188. M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/test/cases/serialization_test.rb M activerecord/test/fixtures/books.yml M activerecord/test/schema/schema.rb commit 0e7e4f7 refs/heads/master Merge: b89190f 904dd5a Author: Rafael Mendonça França Date: 2014-05-22 18:23:28 -0300 Merge pull request #15257 from jetthoughts/remove_redundant_code Removed not used code commit b89190f refs/heads/master Author: Aaron Patterson Date: 2014-05-22 14:08:23 -0700 fix test from 7537057888d2d63c3b6c2019d5828bc445fbd6c9 M activerecord/lib/active_record/attribute_methods.rb commit a2f13e1 refs/heads/master Author: Kris Kemper Date: 2014-03-23 08:32:37 -0400 Don't recurse infinitely when calling non-existent method on super M activerecord/test/cases/attribute_methods_test.rb commit b318758 refs/heads/master Merge: 8e4d014 1119905 Author: Rafael Mendonça França Date: 2014-05-22 18:09:07 -0300 Merge pull request #15259 from sgrif/sg-push-limit-to-types Push limit to type objects commit 1119905 refs/heads/master Author: Sean Griffin Date: 2014-05-22 13:10:25 -0700 Push limit to type objects Columns and injected types no longer have any conditionals based on the format of SQL type strings! Hooray! M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/test/cases/column_definition_test.rb commit 82b4d87 refs/heads/master Author: Dan Langevin Date: 2014-05-05 18:25:29 -0400 Fixes URL generation with trailing_slash: true URL generation with trailing_slash: true was adding a trailing slash after .:format Routes.draw do resources :bars end bars_url(trailing_slash: true, format: 'json') # => /bars.json/ This commit removes that extra trailing slash M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/url_generation_test.rb commit 8e4d014 refs/heads/master Merge: 73f1ab2 22c27ae Author: Rafael Mendonça França Date: 2014-05-22 16:11:40 -0300 Merge pull request #15256 from sgrif/sg-push-precision-to-types Push precision to type objects commit 53948bf refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-22 21:11:21 +0200 No need for the ClassMethods module M lib/active_job/logging.rb commit 904dd5a refs/heads/master Author: Paul Nikitochkin Date: 2014-05-22 22:07:56 +0300 Removed not-used code M activerecord/lib/active_record/relation/query_methods.rb commit 22c27ae refs/heads/master Author: Sean Griffin Date: 2014-05-22 10:30:15 -0700 Push precision to type objects M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb M activerecord/lib/active_record/connection_adapters/type/numeric.rb M activerecord/lib/active_record/connection_adapters/type/value.rb commit 73f1ab2 refs/heads/master Merge: 70ec49c 57cc778 Author: Rafael Mendonça França Date: 2014-05-22 16:03:52 -0300 Merge pull request #15250 from sgrif/sg-push-scale-to-types Push scale to type objects commit 70ec49c refs/heads/master Merge: 3b814ed 2dafd87 Author: Rafael Mendonça França Date: 2014-05-22 16:02:23 -0300 Merge pull request #15254 from DNNX/formatter-refactoring-3 Rename `stack` to `queue` commit 57cc778 refs/heads/master Author: Sean Griffin Date: 2014-05-22 10:03:26 -0700 Push scale to type objects Ideally types will be usable without having to specify a sql type string, so we should keep the information related to parsing them on the adapter or another object. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/value.rb commit 3b814ed refs/heads/master Merge: 35c1600 5540005 Author: Rafael Mendonça França Date: 2014-05-22 15:47:46 -0300 Merge pull request #15239 from croaky/dc-sg-move-extract-precision-to-types Move `extract_precision` onto type objects commit 5540005 refs/heads/master Author: Dan Croak and Sean Griffin Date: 2014-05-21 17:16:01 -0700 Move `extract_precision` onto type objects M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb M activerecord/lib/active_record/connection_adapters/type/numeric.rb M activerecord/lib/active_record/connection_adapters/type/value.rb commit 35c1600 refs/heads/master Merge: d0f0fcf ee92c61 Author: Rafael Mendonça França Date: 2014-05-22 15:40:15 -0300 Merge pull request #15252 from DNNX/formatter-refactoring-2 Remove unnecessary `Hash#to_a` call commit 26dc3ea refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-22 20:37:06 +0200 Rename #perform_with_hooks to #execution M lib/active_job/base.rb A lib/active_job/execution.rb D lib/active_job/performing.rb M lib/active_job/queue_adapters/backburner_adapter.rb M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/que_adapter.rb M lib/active_job/queue_adapters/queue_classic_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sneakers_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb M test/cases/callbacks_test.rb M test/cases/rescue_test.rb commit ef4aff0 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-22 20:35:02 +0200 Add exception handling with built-in retry options M lib/active_job/enqueuing.rb M lib/active_job/performing.rb M test/cases/callbacks_test.rb A test/cases/rescue_test.rb A test/jobs/rescue_job.rb commit 2dafd87 refs/heads/master Author: Viktar Basharymau Date: 2014-05-22 21:33:26 +0300 Rename `stack` to `queue` Because it is used as a queue (FIFO), not as a stack (LIFO). * http://en.wikipedia.org/wiki/Stack_(abstract_data_type) * http://en.wikipedia.org/wiki/Queue_(data_structure) M actionpack/lib/action_dispatch/journey/formatter.rb commit ee92c61 refs/heads/master Author: Viktar Basharymau Date: 2014-05-22 21:16:56 +0300 Remove unnecessary `Hash#to_a` call Inspired by https://github.com/rails/rails/commit/931ee4186b877856b212b0085cd7bd7f6a4aea67 ```ruby def stat(num) start = GC.stat(:total_allocated_object) num.times { yield } total_obj_count = GC.stat(:total_allocated_object) - start puts "#{total_obj_count / num} allocations per call" end h = { 'x' => 'y' } stat(100) { h. each { |pair| pair } } stat(100) { h.to_a.each { |pair| pair } } __END__ 1 allocations per call 2 allocations per call ``` M actionpack/lib/action_dispatch/journey/formatter.rb commit 387a7d9 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-22 19:35:45 +0200 Standardize on "arguments" for everything -- no more "paramters" A lib/active_job/arguments.rb M lib/active_job/enqueuing.rb D lib/active_job/parameters.rb M lib/active_job/performing.rb M test/cases/callbacks_test.rb M test/cases/parameters_test.rb M test/cases/queuing_test.rb commit c073ba3 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-22 19:33:23 +0200 Add callbacks, implement instrumentation as callbacks, and have the enqueue methods return a job instance M lib/active_job/base.rb A lib/active_job/callbacks.rb M lib/active_job/enqueuing.rb M lib/active_job/logging.rb M lib/active_job/performing.rb M lib/active_job/queue_adapters/backburner_adapter.rb M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/que_adapter.rb M lib/active_job/queue_adapters/queue_classic_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sneakers_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb A test/cases/callbacks_test.rb M test/cases/queuing_test.rb A test/jobs/callback_job.rb commit d0f0fcf refs/heads/master Merge: b343e31 eba8b70 Author: Rafael Mendonça França Date: 2014-05-22 14:03:24 -0300 Merge pull request #15247 from DNNX/activesupport-formatter-refactoring Use `break` instead of `next` in AD::Journey::Formatter#match_route commit b343e31 refs/heads/master Merge: 71248fc 4826a4a Author: Rafael Mendonça França Date: 2014-05-22 13:59:18 -0300 Merge pull request #15249 from sgrif/sg-register-types-in-adapter Use the generic type map for all PG type registrations commit 71248fc refs/heads/master Merge: 3947305 ecf4ad7 Author: Rafael Mendonça França Date: 2014-05-22 13:57:53 -0300 Merge pull request #15248 from sgrif/sg-additional-type-map-args Allow additional arguments to be used during type map lookups commit 4826a4a refs/heads/master Author: Sean Griffin Date: 2014-05-22 09:39:16 -0700 Use the generic type map for all PG type registrations We're going to want all of the benefits of the type map object for registrations, including block registration and real aliasing. Moves type name registrations to the adapter, and aliases the OIDs to the named types M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb commit ecf4ad7 refs/heads/master Author: Sean Griffin Date: 2014-05-22 09:12:23 -0700 Allow additional arguments to be used during type map lookups Determining things like precision and scale in postgresql will require the given blocks to take additional arguments besides the OID. - Adds the ability to handle additional arguments to `TypeMap` - Passes the column type to blocks when looking up PG types M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type/hash_lookup_type_map.rb M activerecord/lib/active_record/connection_adapters/type/type_map.rb M activerecord/test/cases/connection_adapters/type/type_map_test.rb commit f82bc7e refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-22 17:09:17 +0200 Change logging on perform to read more naturally M lib/active_job/logging.rb M test/cases/logging_test.rb commit b1793ac refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-22 17:08:23 +0200 Hide the instrumentation mechanics a little better M lib/active_job/enqueuing.rb M lib/active_job/performing.rb commit 3947305 refs/heads/master Merge: 9086f61 699babe Author: Rafael Mendonça França Date: 2014-05-22 12:00:33 -0300 Merge pull request #15242 from JuanitoFatas/guides-anchor [Guides] Do not gsub non ASCII characters in header anchor. commit 9086f61 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-22 11:49:29 -0300 Fix the hash key being delete from env It was changed by mistake at c5d64b2b86aa42f57881091491ee289b3c489c7e. M actionpack/lib/action_dispatch/http/parameters.rb commit eba8b70 refs/heads/master Author: Viktar Basharymau Date: 2014-05-22 17:44:25 +0300 Use `break` instead of `next` in AD::Journey::Formatter#match_route The array is sorted in descending order, so there is no point in iterating further if we met a negative item - all the rest will be negative too. M actionpack/lib/action_dispatch/journey/formatter.rb commit 50abad3 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-22 11:35:22 -0300 Fix the script M .travis.yml commit c27ff04 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-22 11:28:02 -0300 Add travis configuration A .travis.yml commit 5722ca7 refs/heads/master Merge: 61deda5 af117de Author: Rafael Mendonça França Date: 2014-05-22 10:55:02 -0300 Merge pull request #57 from seuros/railtie Active Job Railtie commit 3a00c6f refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-21 12:38:11 -0300 Merge pull request #14613 from Sirupsen/fix-serialize-update-column Fix serialized field returning serialized data after update_column Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/test/cases/serialized_attribute_test.rb commit 61deda5 refs/heads/master Merge: 53410c9 3fe95c8 Author: David Heinemeier Hansson Date: 2014-05-22 13:58:50 +0200 Merge pull request #58 from cristianbica/logging-tests Added tests for logging commit 3fe95c8 refs/heads/master Author: Cristian Bica Date: 2014-05-22 14:19:48 +0300 Added tests for logging M lib/active_job/enqueuing.rb M lib/active_job/logging.rb A test/cases/logging_test.rb commit 66dd216 refs/heads/master Author: Yves Senn Date: 2014-05-22 10:17:30 +0200 pg test, extract tsvector tests into `postgresql/full_text_test.rb` M activerecord/test/cases/adapters/postgresql/datatype_test.rb A activerecord/test/cases/adapters/postgresql/full_text_test.rb commit e4cdf35 refs/heads/master Author: Yves Senn Date: 2014-05-22 09:55:24 +0200 pg test, move timestamp tests over to `postgresql/timestamp_test.rb`. M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/cases/adapters/postgresql/timestamp_test.rb commit 3ac07aa refs/heads/master Author: Yves Senn Date: 2014-05-22 09:49:25 +0200 pg test, extract network address type tests into separate file. M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/cases/adapters/postgresql/money_test.rb A activerecord/test/cases/adapters/postgresql/network_test.rb commit 699babe refs/heads/master Author: Juanito Fatas Date: 2014-05-22 16:14:31 +0800 Do not gsub non ASCII characters in header anchor. M guides/rails_guides/markdown.rb commit a3897f9 refs/heads/master Author: Yves Senn Date: 2014-05-22 09:30:22 +0200 pg test, remove unused code. M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit 1df087f refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-05-22 14:47:04 +0930 Merge pull request #14803 from kuldeepaggarwal/null_relation_sum_fix Fixed a problem where `sum` used with a `group` was not returning a Hash. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/null_relation.rb M activerecord/test/cases/relations_test.rb commit 6ffe929 refs/heads/master Merge: 110d3d0 4fd144d Author: Andrew White Date: 2014-05-22 08:26:58 +0100 Merge pull request #15101 from tgxworld/improve_performance_of_building_uri Form full URI as string to be parsed in Rack::Test. commit af117de refs/heads/master Author: Abdelkader Boudih Date: 2014-05-21 21:10:17 +0000 Railtie hook on ActiveJob::Base M lib/active_job.rb M lib/active_job/base.rb D lib/active_job/railitie.rb A lib/active_job/railtie.rb commit 4fd144d refs/heads/master Author: Guo Xiang Tan Date: 2014-05-13 19:30:57 -0700 Form full URI as string to be parsed in Rack::Test. There are performance gains to be made by avoiding URI setter methods. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/dispatch/routing_test.rb commit 110d3d0 refs/heads/master Merge: a0155b2 6d36c1d Author: Matthew Draper Date: 2014-05-22 14:47:04 +0930 Merge pull request #14803 from kuldeepaggarwal/null_relation_sum_fix Fixed a problem where `sum` used with a `group` was not returning a Hash. commit a0155b2 refs/heads/master Author: Guillermo Iguaran Date: 2014-05-21 22:20:37 -0500 Update CHANGELOG.md Most recent change should be moved to the top M guides/CHANGELOG.md commit 88a3a5d refs/heads/master Merge: 2fb2913 d02c810 Author: Guillermo Iguaran Date: 2014-05-21 22:18:57 -0500 Merge pull request #15215 from JohnKellyFerguson/rename-posts-to-articles Documentation: Rename Posts to Articles commit d02c810 refs/heads/master Author: John Kelly Ferguson Date: 2014-05-21 21:47:18 -0400 Rename Posts to Articles in Guides, continuation of 2d446e77 / #13774 [ci skip] M guides/CHANGELOG.md M guides/source/action_view_overview.md M guides/source/active_record_basics.md M guides/source/active_record_callbacks.md M guides/source/active_record_querying.md M guides/source/active_record_validations.md M guides/source/active_support_core_extensions.md M guides/source/api_documentation_guidelines.md M guides/source/association_basics.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/generators.md M guides/source/layouts_and_rendering.md M guides/source/routing.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md M guides/source/working_with_javascript_in_rails.md commit 2fb2913 refs/heads/master Merge: 62bcf81 e45e4f4 Author: Rafael Mendonça França Date: 2014-05-21 21:47:53 -0300 Merge pull request #15237 from sgrif/sg-move-extract-scale Move extract_scale to decimal type commit 62bcf81 refs/heads/master Merge: b754d9b 30bf07d Author: Rafael Mendonça França Date: 2014-05-21 21:47:06 -0300 Merge pull request #15218 from sgrif/sg-move-oid-types Move PG OID types to their own files commit b754d9b refs/heads/master Author: Aaron Patterson Date: 2014-05-21 16:33:06 -0700 drop hash allocations during match M actionpack/lib/action_dispatch/journey/router.rb commit 6bd9ade refs/heads/master Author: Aaron Patterson Date: 2014-05-21 16:21:33 -0700 fewer object allocations and method calls during route match M actionpack/lib/action_dispatch/journey/router.rb commit dd1f23d refs/heads/master Author: Aaron Patterson Date: 2014-05-21 16:12:49 -0700 middle variable is never used, so rm M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/router_test.rb commit c5d64b2 refs/heads/master Author: Aaron Patterson Date: 2014-05-21 16:07:57 -0700 use the existing constant rather than the hardcoded string so tht I don't go totally insane with THsi crazy hash driven development. why is Everything a hash? Why do people think hashes in hashes with random keys is a Good API? You can't find things or deprecate them or control access whatsoever, you just have to hope that everyone is like "oh, you want to change that? that's cool! we all know it's hashes so go for it!" The End. M actionpack/lib/action_dispatch/http/parameters.rb commit 15adf77 refs/heads/master Author: Aaron Patterson Date: 2014-05-21 15:54:29 -0700 remove dead code. @klass isn't used anymore M actionpack/lib/action_dispatch/routing/route_set.rb commit 40e7763 refs/heads/master Author: Aaron Patterson Date: 2014-05-21 15:51:28 -0700 we can just use Ruby here M actionpack/lib/action_controller/metal/url_for.rb commit e45e4f4 refs/heads/master Author: Sean Griffin Date: 2014-05-21 15:07:13 -0700 Move extract_scale to decimal type The only type that has a scale is decimal. There's a special case where decimal columns with 0 scale are type cast to integers if the scale is not specified. Appears to only affect schema dumping. M activerecord/lib/active_record/connection_adapters/type.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/test/cases/schema_dumper_test.rb commit 4d1b3a1 refs/heads/master Author: Aaron Patterson Date: 2014-05-21 14:27:09 -0700 reuse path formatter from the non-optimized path. The optimized and non-optimized path share more code now without significant performance degretation M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/visitors.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit 931ee41 refs/heads/master Author: Aaron Patterson Date: 2014-05-21 14:06:58 -0700 reduce object allocations Example: x = [1,2,3,4] y = [3,2,1] def test x, y hash = {} x.zip(y) { |k,v| hash[k] = v } hash end def test2 x, y Hash[x.zip(y)] end def test3 x, y x.zip(y).each_with_object({}) { |(k,v),hash| hash[k] = v } end def stat num start = GC.stat(:total_allocated_object) num.times { yield } total_obj_count = GC.stat(:total_allocated_object) - start puts "#{total_obj_count / num} allocations per call" end stat(100) { test(x,y) } stat(100) { test2(x,y) } stat(100) { test3(x,y) } __END__ 2 allocations per call 7 allocations per call 8 allocations per call M actionpack/lib/action_dispatch/routing/route_set.rb commit da83a6f refs/heads/master Author: Aaron Patterson Date: 2014-05-21 11:56:12 -0700 make variable name more clear M actionpack/lib/action_dispatch/journey/route.rb commit 7bc25f0 refs/heads/master Author: Aaron Patterson Date: 2014-05-21 11:55:15 -0700 do not mutate parameters, let the caller do mutations M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/journey/route.rb commit 620cb01 refs/heads/master Author: Aaron Patterson Date: 2014-05-21 11:50:17 -0700 push the formatter up to the Route object M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/lib/action_dispatch/journey/route.rb commit 0cb85a6 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-21 20:45:56 +0000 Active Job Railtie A lib/active_job/railitie.rb commit e17aead refs/heads/master Merge: 465736b decd92b Author: Guillermo Iguaran Date: 2014-05-21 15:12:54 -0500 Merge pull request #15231 from khusnetdinov/fix_typo_guides_active_support_instrumentation Fix typo guides/source/active_support_instrumentation.md [ci-skip] commit decd92b refs/heads/master Author: Marat Khusnetdinov Date: 2014-05-22 00:00:55 +0400 Fix typo guides/source/active_support_instrumentation.md M guides/source/active_support_instrumentation.md commit 465736b refs/heads/master Merge: 5335f4c 18c5f4e Author: Rafael Mendonça França Date: 2014-05-21 15:30:38 -0300 Merge pull request #15229 from peeyushsingla/master fixes in active record query for reorder in rails guides commit 18c5f4e refs/heads/master Author: peeyush Date: 2014-05-21 23:40:19 +0530 fixes in active record query for reorder M guides/source/active_record_querying.md commit 53410c9 refs/heads/master Merge: 1513705 6187cf8 Author: Rafael Mendonça França Date: 2014-05-21 14:57:40 -0300 Merge pull request #56 from seuros/dry DRY in helper.rb commit 5335f4c refs/heads/master Merge: b042f21 b871b3f Author: Rafael Mendonça França Date: 2014-05-21 14:56:23 -0300 Merge pull request #15227 from sgrif/sg-rename-oid-type Rename `oid_type` to `cast_type` to make PG columns consistent with abstract columns commit 6187cf8 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-21 17:08:59 +0000 DRY M test/helper.rb commit b871b3f refs/heads/master Author: Sean Griffin Date: 2014-05-21 10:11:30 -0700 Rename `oid_type` to `cast_type` to make PG columns consistent M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit b042f21 refs/heads/master Merge: 94e7dbc 8935745 Author: Rafael Mendonça França Date: 2014-05-21 12:42:47 -0300 Merge pull request #15219 from sgrif/sg-missing-nodoc Add missing nodoc commit 94e7dbc refs/heads/master Merge: 6931bed d1b0633 Author: Rafael Mendonça França Date: 2014-05-21 12:38:11 -0300 Merge pull request #14613 from Sirupsen/fix-serialize-update-column Fix serialized field returning serialized data after update_column Conflicts: activerecord/CHANGELOG.md commit 6931bed refs/heads/master Author: Rafael Mendonça França Date: 2014-05-21 12:15:57 -0300 Revert "Merge pull request #14544 from jefflai2/named_scope_sti" This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065. Conflicts: activerecord/CHANGELOG.md activerecord/test/models/comment.rb This change break integration with activerecord-deprecated_finders so I'm reverting until we find a way to make it work with this gem. M activerecord/CHANGELOG.md M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/scoping/named_scoping_test.rb M activerecord/test/fixtures/ratings.yml M activerecord/test/models/comment.rb M activerecord/test/models/rating.rb M activerecord/test/schema/schema.rb commit 1aef6ee refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-21 12:14:33 -0300 Revert "Merge pull request #14544 from jefflai2/named_scope_sti" This reverts commit eed1e2568261172d99e9f3607cb379424f14f5b3. Conflicts: activerecord/CHANGELOG.md activerecord/test/models/comment.rb This change break integration with activerecord-deprecated_finders so I'm reverting until we find a way to make it work with this gem. M activerecord/CHANGELOG.md M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/scoping/named_scoping_test.rb M activerecord/test/fixtures/ratings.yml M activerecord/test/models/comment.rb M activerecord/test/models/rating.rb M activerecord/test/schema/schema.rb commit 8935745 refs/heads/master Author: Sean Griffin Date: 2014-05-21 07:49:00 -0700 Add missing nodocs to MySQL adapter M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit 7a1a945 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-21 12:06:25 -0300 Revert "Merge pull request #14544 from jefflai2/named_scope_sti" This reverts commit 807ee0ac67fe094a4439fdf616c5a5bdbb3bd050. Conflicts: activerecord/test/models/comment.rb This change break integration with activerecord-deprecated_finders so I'm reverting until we find a way to make it work with this gem. M activerecord/CHANGELOG.md M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/scoping/named_scoping_test.rb M activerecord/test/fixtures/ratings.yml M activerecord/test/models/comment.rb M activerecord/test/models/rating.rb M activerecord/test/schema/schema.rb commit 1a6b255 refs/heads/master Merge: b452e4a 4e986e3 Author: Arthur Nogueira Neves Date: 2014-05-21 10:58:48 -0400 Merge pull request #15221 from laurelfan/doc-fix-redirecting fix formatting and text for ActionController::Redirecting doc commit 4e986e3 refs/heads/master Author: Laurel Fan Date: 2014-05-21 07:51:09 -0700 fix formatting and text for ActionController::Redirecting doc M actionpack/lib/action_controller/metal/redirecting.rb commit 30bf07d refs/heads/master Author: Sean Griffin Date: 2014-05-21 07:44:42 -0700 Move PG OID types to their own files As we promote these classes to first class concepts, these classes are starting to gain enough behavior to warrant being moved into their own files. Many of them will become quite large as we move additional behavior to the type objects. M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/bytea.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/date.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/date_time.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/decimal.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/enum.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/float.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/inet.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/infinity.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/integer.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/point.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/range.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/time.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/uuid.rb A activerecord/lib/active_record/connection_adapters/postgresql/oid/vector.rb commit 25a2387 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-21 10:22:10 +0200 build fix, use lambda syntax that ruby 1.9.3 understands. M activerecord/test/models/comment.rb commit 1513705 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-21 15:50:29 +0200 Show which adapter the tests are currently run for M test/helper.rb commit 69607a8 refs/heads/master Merge: 4ad28b1 484dbd8 Author: David Heinemeier Hansson Date: 2014-05-21 15:28:00 +0200 Merge pull request #53 from DouweM/performing-module Don't deserialize parameters in individual adapters. commit 484dbd8 refs/heads/master Author: Douwe Maan Date: 2014-05-21 01:07:45 +0200 Rename Adapter.queue and .queue_at to .enqueue and .enqueue_at for consistency. M lib/active_job/enqueuing.rb M lib/active_job/queue_adapters/backburner_adapter.rb M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/que_adapter.rb M lib/active_job/queue_adapters/queue_classic_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sneakers_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit a00df7e refs/heads/master Author: Douwe Maan Date: 2014-05-21 00:26:19 +0200 Don't deserialize parameters in individual adapters. It's not their responsibility and this makes logging (and rescuing from errors, eventually!) a lot easier. M lib/active_job/base.rb M lib/active_job/enqueuing.rb M lib/active_job/logging.rb A lib/active_job/performing.rb M lib/active_job/queue_adapters/backburner_adapter.rb M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/que_adapter.rb M lib/active_job/queue_adapters/queue_classic_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sneakers_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 1a25159 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-05-21 10:22:10 +0200 build fix, use lambda syntax that ruby 1.9.3 understands. (cherry picked from commit b452e4a39b8a4a8880825cc1868df656ede7d609) M activerecord/test/models/comment.rb commit e2f124a refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-05-21 12:05:10 +0100 Revert "Only make deeply nested routes shallow when parent is shallow" This reverts commit d1ef6c2ed85b0c3c945b9c0f1385f6f3561849cc. M actionpack/CHANGELOG.md commit d1ef6c2 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-04-11 10:20:54 +0100 Only make deeply nested routes shallow when parent is shallow Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684. (cherry picked from commit e10f26f9e90f2fe6c4cd18f70c1e559f2250da56) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md commit b452e4a refs/heads/master Author: Yves Senn Date: 2014-05-21 10:22:10 +0200 build fix, use lambda syntax that ruby 1.9.3 understands. M activerecord/test/models/comment.rb commit 1a92f4f refs/heads/master Author: Yves Senn Date: 2014-05-21 09:51:36 +0200 push `extract_scale` to the `Type`. - `extract_precision`, `extract_limit`, and `extract_default` probably need to follow. - would be good to remove the delegation `Column#extract_scale`. /cc @sgrif M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/type/value.rb commit 4ad28b1 refs/heads/master Merge: d2245cb ce5a88d Author: David Heinemeier Hansson Date: 2014-05-21 09:47:30 +0200 Merge pull request #54 from larrylv/log-serialized-args Ensure we are logging the serialized args. commit 6b4f6d0 refs/heads/master Author: Yves Senn Date: 2014-05-21 09:46:37 +0200 pg, extract money tests into separate file. - Added assertions about the column. Specifically scale. - Move record insertion from setup into test method. M activerecord/test/cases/adapters/postgresql/datatype_test.rb A activerecord/test/cases/adapters/postgresql/money_test.rb commit 9bfe051 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-21 08:19:01 +0200 Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_key Fix polymorphic eager load with foreign_key as String. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/models/comment.rb M activerecord/test/schema/schema.rb commit f69f20e refs/heads/master Merge: b17f6e6 4debc86 Author: Yves Senn Date: 2014-05-21 08:19:01 +0200 Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_key Fix polymorphic eager load with foreign_key as String. commit ce5a88d refs/heads/master Author: Larry Lv Date: 2014-05-21 12:48:23 +0800 Ensure we are logging the serialized args. M lib/active_job/enqueuing.rb commit 4debc86 refs/heads/master Author: Lauro Caetano Date: 2014-04-23 23:51:00 -0300 Fix polymorphic eager load with foreign_key as String. The foreign_key could be `String` and just doing `owners_map[owner_key]` could return `nil`. To prevent this bug, we should `to_s` both keys if their types are different. Fixes #14734. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/models/comment.rb M activerecord/test/schema/schema.rb commit b17f6e6 refs/heads/master Merge: decd719 dbacaff Author: Rafael Mendonça França Date: 2014-05-20 23:25:13 -0300 Merge pull request #15213 from tgxworld/remove_redundant_code Remove redundant code. commit dbacaff refs/heads/master Author: Guo Xiang Tan Date: 2014-05-20 18:25:20 -0700 Remove redundant code. M actionpack/lib/action_dispatch/middleware/public_exceptions.rb commit 81c8239 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-20 21:49:58 -0300 Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arrays Hash#deep_*_keys(!) recurse into nested arrays. Conflicts: activesupport/CHANGELOG.md Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/keys.rb M activesupport/test/core_ext/hash_ext_test.rb commit 6f24aa2 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-20 21:49:58 -0300 Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arrays Hash#deep_*_keys(!) recurse into nested arrays. Conflicts: activesupport/CHANGELOG.md Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/keys.rb M activesupport/test/core_ext/hash_ext_test.rb commit decd719 refs/heads/master Merge: 9a1abed ac0b1d8 Author: Rafael Mendonça França Date: 2014-05-20 21:49:58 -0300 Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arrays Hash#deep_*_keys(!) recurse into nested arrays. Conflicts: activesupport/CHANGELOG.md commit 807ee0a refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-20 21:35:58 -0300 Merge pull request #14544 from jefflai2/named_scope_sti Fixes Issue #13466. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/scoping/named.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/scoping/named_scoping_test.rb M activerecord/test/fixtures/ratings.yml M activerecord/test/models/comment.rb M activerecord/test/models/rating.rb M activerecord/test/schema/schema.rb commit eed1e25 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-20 21:35:58 -0300 Merge pull request #14544 from jefflai2/named_scope_sti Fixes Issue #13466. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/scoping/named_scoping_test.rb M activerecord/test/fixtures/ratings.yml M activerecord/test/models/comment.rb M activerecord/test/models/rating.rb M activerecord/test/schema/schema.rb commit 9a1abed refs/heads/master Merge: c72d6c9 9c3afdc Author: Rafael Mendonça França Date: 2014-05-20 21:35:58 -0300 Merge pull request #14544 from jefflai2/named_scope_sti Fixes Issue #13466. Conflicts: activerecord/CHANGELOG.md commit c72d6c9 refs/heads/master Merge: 437f464 c4245c3 Author: Rafael Mendonça França Date: 2014-05-20 21:17:38 -0300 Merge pull request #15205 from sgrif/sg-delegate-klass Delegate `klass` to the injected type object commit 437f464 refs/heads/master Merge: 26931eb 713fc39 Author: Rafael Mendonça França Date: 2014-05-20 21:03:56 -0300 Merge pull request #14979 from brocktimus/master Making belongs_to: touch behaviour be consistent with save updating updated_at commit 26931eb refs/heads/master Author: Rafael Mendonça França Date: 2014-05-20 20:42:46 -0300 Revert "Revert "Merge pull request #8313 from alan/only_save_changed_has_one_objects"" This reverts commit e94e6c27af495a2460c811bb506459f1428dec6b. Conflicts: activerecord/CHANGELOG.md The original commit was reverted only to be safe since #14407 were reported. We don't have any proof we added a regression with the original commit so reverting it now will give us more problem. Closes #14407 M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/autosave_association_test.rb commit c4245c3 refs/heads/master Author: Sean Griffin Date: 2014-05-19 17:30:26 -0700 Delegate `klass` to the injected type object M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/type/binary.rb M activerecord/lib/active_record/connection_adapters/type/date.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/float.rb M activerecord/lib/active_record/connection_adapters/type/integer.rb M activerecord/lib/active_record/connection_adapters/type/string.rb M activerecord/lib/active_record/connection_adapters/type/time_value.rb M activerecord/lib/active_record/connection_adapters/type/value.rb commit 713fc39 refs/heads/master Author: Brock Trappitt Date: 2014-05-05 20:24:04 +0800 Prevented belongs_to: touch propagating up if there are no changes being saved M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 5508a3e refs/heads/master Merge: 089d9ba 41f7d07 Author: Rafael Mendonça França Date: 2014-05-20 20:24:51 -0300 Merge pull request #15154 from msgehard/move_password_field Put attr_reader in with all of the other instance methods commit 089d9ba refs/heads/master Author: Aaron Patterson Date: 2014-05-20 16:06:59 -0700 we don't use this parameter for anything, so rm M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/router_test.rb commit ba487b9 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 15:43:46 -0700 fewer string allocations per url_for M actionpack/lib/action_dispatch/http/url.rb commit b610104 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 15:33:30 -0700 mutate the path string to avoid object allocations M actionpack/lib/action_dispatch/http/url.rb commit 5f49da8 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 15:29:40 -0700 push only_path conditional up M actionpack/lib/action_dispatch/http/url.rb commit c8ddb61 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-20 19:23:40 -0300 Copy-edit at the CHANGELOGS [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M actionview/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/CHANGELOG.md M railties/CHANGELOG.md commit 960398c refs/heads/master Author: Aaron Patterson Date: 2014-05-20 15:23:38 -0700 push arg checking up M actionpack/lib/action_dispatch/http/url.rb commit 6004c75 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 15:20:16 -0700 fewer method calls and string garbage when there is no user/password M actionpack/lib/action_dispatch/http/url.rb commit c9d544d refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-20 19:15:22 -0300 Copy-edit at the CHANGELOGS [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/CHANGELOG.md M railties/CHANGELOG.md commit 5e181ed refs/heads/master Author: Aaron Patterson Date: 2014-05-20 15:06:35 -0700 fewer hash allocations when calling url_for M actionpack/lib/action_dispatch/routing/route_set.rb commit 84bf3a0 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 14:37:35 -0700 fix variable names, only pass hashes to the positional args method M actionpack/lib/action_dispatch/routing/route_set.rb commit e12adfe refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-20 19:08:27 -0300 Using released sprockets M Gemfile commit 470c4df refs/heads/master Merge: ef00bb7 32218c1 Author: Rafael Mendonça França Date: 2014-05-20 18:42:14 -0300 Merge pull request #15208 from sgrif/sg-delegate-type-cast-for-write Delegate `type_cast_for_write` to injected type object commit 32218c1 refs/heads/master Author: Sean Griffin Date: 2014-05-20 14:36:18 -0700 Delegate `type_cast_for_write` to injected type object M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/type/numeric.rb M activerecord/lib/active_record/connection_adapters/type/value.rb commit 6964b7d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-20 18:12:13 -0300 Merge pull request #11346 from tomykaira/fix_10257 Check authentication scheme in Basic auth M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_basic_authentication_test.rb commit ef00bb7 refs/heads/master Merge: 52b5586 15a98a8 Author: Rafael Mendonça França Date: 2014-05-20 18:12:13 -0300 Merge pull request #11346 from tomykaira/fix_10257 Check authentication scheme in Basic auth commit 52b5586 refs/heads/master Merge: 90a82cb 8f38799 Author: Rafael Mendonça França Date: 2014-05-20 18:10:54 -0300 Merge pull request #15207 from sgrif/sg-inline-column-helpers Inline typecasting helpers from Column to the appropriate types commit 8f38799 refs/heads/master Author: Sean Griffin Date: 2014-05-20 14:07:58 -0700 Inline typecasting helpers from Column to the appropriate types M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/type/boolean.rb M activerecord/lib/active_record/connection_adapters/type/date.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/integer.rb M activerecord/lib/active_record/connection_adapters/type/time.rb M activerecord/lib/active_record/connection_adapters/type/time_value.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/test/cases/column_test.rb commit 90a82cb refs/heads/master Merge: c4640ca 9f61f31 Author: Rafael Mendonça França Date: 2014-05-20 18:05:35 -0300 Merge pull request #15206 from sgrif/sg-type-map-postgresql Use the generic type map for PostgreSQL OID registrations commit c4640ca refs/heads/master Merge: 25c6726 50869f3 Author: Rafael Mendonça França Date: 2014-05-20 18:02:49 -0300 Merge pull request #15204 from sgrif/sg-delegate-predicates Delegate predicate methods to injected type object on Column commit 9f61f31 refs/heads/master Author: Sean Griffin Date: 2014-05-20 13:55:03 -0700 Use the generic type map for PostgreSQL OID registrations M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type/hash_lookup_type_map.rb commit 50869f3 refs/heads/master Author: Sean Griffin Date: 2014-05-19 17:19:16 -0700 Delegate predicate methods to injected type object on Column M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/type.rb M activerecord/lib/active_record/connection_adapters/type/binary.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/float.rb M activerecord/lib/active_record/connection_adapters/type/integer.rb A activerecord/lib/active_record/connection_adapters/type/numeric.rb M activerecord/lib/active_record/connection_adapters/type/string.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb commit c939ca1 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-12 21:16:22 -0300 Test with ruby-head to make @tenderlove happy Conflicts: .travis.yml M .travis.yml commit cea5523 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-12 21:16:22 -0300 Test with ruby-head to make @tenderlove happy M .travis.yml commit 25c6726 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 13:23:50 -0700 remove dead code M actionpack/lib/action_dispatch/journey/visitors.rb commit c99ff6d refs/heads/master Author: Aaron Patterson Date: 2014-05-20 13:17:39 -0700 cache the formatter on the path object M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/lib/action_dispatch/journey/route.rb commit e883db0 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 13:12:59 -0700 translate AST to a formatter before url generation M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/visitors.rb commit 5300844 refs/heads/master Merge: f3407d1 ac4c1c3 Author: Rafael Mendonça França Date: 2014-05-20 17:23:42 -0300 Merge pull request #15200 from sgrif/sg-type-map-mysql Use the generic type map object for mysql field lookups commit ac4c1c3 refs/heads/master Author: Sean Griffin Date: 2014-05-20 08:07:02 -0700 Use the generic type map object for mysql field lookups M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/type.rb A activerecord/lib/active_record/connection_adapters/type/hash_lookup_type_map.rb M activerecord/test/cases/connection_adapters/type/type_map_test.rb commit f3407d1 refs/heads/master Merge: 59ee23f 9aa807c Author: Yves Senn Date: 2014-05-20 21:39:06 +0200 Merge pull request #15191 from camsong/master Distinguish rake assets:clobber from rake assets:clean [ci skip] commit d2245cb refs/heads/master Merge: aa4edf4 dae0a31 Author: Rafael Mendonça França Date: 2014-05-20 15:58:04 -0300 Merge pull request #52 from seuros/logger Use ActiveJob::Base.logger instead ActiveJob::Logging.logger commit dae0a31 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-20 18:54:24 +0000 Use ActiveJob::Base.logger instead ActiveJob::Logging.logger M test/helper.rb commit 59ee23f refs/heads/master Merge: 88d08f2 e781aa3 Author: Rafael Mendonça França Date: 2014-05-20 15:43:37 -0300 Merge pull request #15203 from sgrif/sg-delegate-type-cast Replace `type_cast` case statement with delegation commit aa4edf4 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 20:29:29 +0200 Humanely readable timestamp for logging M lib/active_job/logging.rb commit 88d08f2 refs/heads/master Merge: 74a8477 6cc5a86 Author: Rafael Mendonça França Date: 2014-05-20 15:20:54 -0300 Merge pull request #15187 from v-yarotsky/fix_confusing_delegation_exception Fix confusing exception in ActiveSupport delegation commit 74a8477 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 11:10:52 -0700 prepopulate the dispatch cache so we don't need the ThreadSafe cache. M actionpack/lib/action_dispatch/journey/visitors.rb commit e086964 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 11:00:06 -0700 make the each visitor top-down left-right M actionpack/lib/action_dispatch/journey/visitors.rb commit 4f41646 refs/heads/master Merge: b713e20 b2242d1 Author: Rafael Mendonça França Date: 2014-05-20 14:56:10 -0300 Merge pull request #15201 from sgrif/sg-types-postgresql Have Postgres OID types inherit from general types commit 708775c refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 19:19:14 +0200 Make it clear that the later test is skipped for adapters that do not implement it M test/cases/queuing_test.rb commit 8df6a0b refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 19:17:25 +0200 Style M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 116c23d refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-20 10:16:57 -0700 fix multiple hash preloads. Fixes #14994 M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/relations_test.rb commit 4dd21bf refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 19:17:10 +0200 Highlight difference by placing addition at the end M lib/active_job/queue_adapters/sidekiq_adapter.rb commit b713e20 refs/heads/master Author: Aaron Patterson Date: 2014-05-20 10:16:57 -0700 fix multiple hash preloads. Fixes #14994 M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/relations_test.rb commit 6bd45aa refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 19:15:57 +0200 Style M lib/active_job/queue_adapters/inline_adapter.rb commit b367830 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 19:14:02 +0200 Clarify control flow M lib/active_job/parameters.rb commit fd372e6 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 19:09:45 +0200 Collapse LogSubscriber into Logging D lib/active_job/log_subscriber.rb M lib/active_job/logging.rb commit 373c38a refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 19:08:06 +0200 DRY up the two event loggings M lib/active_job/log_subscriber.rb commit fbda318 refs/heads/master Merge: e26e1d5 67ac8b2 Author: David Heinemeier Hansson Date: 2014-05-20 19:01:11 +0200 Merge pull request #35 from mperham/enqueue_at Implement enqueue_at/enqueue_in commit 67ac8b2 refs/heads/master Merge: 4650a79 e26e1d5 Author: Mike Perham Date: 2014-05-20 09:59:50 -0700 mergy commit 4650a79 refs/heads/master Author: Mike Perham Date: 2014-05-20 09:53:17 -0700 Remove unnecessary comment M lib/active_job/queue_adapters/resque_adapter.rb commit 0c46094 refs/heads/master Author: Mike Perham Date: 2014-05-20 09:52:20 -0700 Switch to NIE M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit b48050d refs/heads/master Author: Mike Perham Date: 2014-05-20 09:45:37 -0700 cleanup M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 0e60e88 refs/heads/master Author: Mike Perham Date: 2014-05-20 09:37:38 -0700 More feedback M lib/active_job/enqueuing.rb M lib/active_job/queue_adapters/inline_adapter.rb commit 9d835fd refs/heads/master Merge: 89ca680 ca703bb Author: Rafael Mendonça França Date: 2014-05-20 13:27:36 -0300 Merge pull request #15199 from sgrif/sg-types-mysql Use general types for mysql fields commit e26e1d5 refs/heads/master Merge: ccd1c21 a76ec4e Author: Guillermo Iguaran Date: 2014-05-20 11:20:08 -0500 Merge pull request #50 from seuros/readme Update Readme.md commit a76ec4e refs/heads/master Author: Abdelkader Boudih Date: 2014-05-20 16:18:35 +0000 Update Readme.md M README.md commit e781aa3 refs/heads/master Author: Sean Griffin Date: 2014-05-20 09:15:22 -0700 Replace `type_cast` case statement with delegation All subclasses of column were now delegating `type_cast` to their injected type object. We can remove the overriding methods, and generalize it on the `Column` class itself. This also enabled us to remove several column classes completely, as they no longer had any meaningful behavior of their own. M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/column_test.rb commit ccd1c21 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 18:14:01 +0200 Remove stray ## M lib/active_job/enqueuing.rb commit 897f86b refs/heads/master Merge: 85880eb 86a71b1 Author: Mike Perham Date: 2014-05-20 09:13:28 -0700 merge master commit 86a71b1 refs/heads/master Merge: 207ca30 5adc311 Author: David Heinemeier Hansson Date: 2014-05-20 18:05:22 +0200 Merge pull request #48 from seuros/master Silence logger commit 85880eb refs/heads/master Author: Mike Perham Date: 2014-05-20 09:05:16 -0700 Assert truthy M test/cases/queuing_test.rb commit ca703bb refs/heads/master Author: Sean Griffin Date: 2014-05-20 07:56:04 -0700 Use general types for mysql fields M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit 89ca680 refs/heads/master Merge: d17b056 ac37165 Author: Yves Senn Date: 2014-05-20 17:59:53 +0200 Merge pull request #15198 from sgrif/sg-delegate-type-cast-mysql Delegate type_cast to injected type object in mysql commit 5adc311 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-20 15:59:50 +0000 Silence logger M test/helper.rb commit b2242d1 refs/heads/master Author: Sean Griffin Date: 2014-05-20 08:51:42 -0700 Have Postgres OID types inherit from general types Using general types where possible. Several more can go away once infinity gets figured out. M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit 207ca30 refs/heads/master Merge: be3b805 243afc0 Author: David Heinemeier Hansson Date: 2014-05-20 17:50:51 +0200 Merge pull request #43 from mytrile/master Adding backburner(beanstalks client) adapter commit 2aa9024 refs/heads/master Author: Mike Perham Date: 2014-05-20 08:44:00 -0700 Fix boogs, stub not implemented adapters M lib/active_job/enqueuing.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/que_adapter.rb M lib/active_job/queue_adapters/sneakers_adapter.rb commit be3b805 refs/heads/master Merge: b13a3cb cbfc8b3 Author: Rafael Mendonça França Date: 2014-05-20 12:38:59 -0300 Merge pull request #44 from DouweM/patch-1 Have Sneakers adapter take queue_name into account. commit b13a3cb refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 17:37:10 +0200 Styling M lib/active_job/queue_adapters/sidekiq_adapter.rb commit a88d9eb refs/heads/master Author: Mike Perham Date: 2014-05-20 08:36:46 -0700 Add logging for enqueued_at and perform errors M lib/active_job/enqueuing.rb M lib/active_job/log_subscriber.rb M lib/active_job/queue_adapters/inline_adapter.rb commit 1d3ba68 refs/heads/master Author: Mike Perham Date: 2014-05-20 08:36:24 -0700 Move past time check out of adapters M lib/active_job/enqueuing.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 1d519aa refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 17:36:17 +0200 Reformat the logging line and ensure we are logging the serialized args M lib/active_job/enqueuing.rb M lib/active_job/log_subscriber.rb commit 3649ebc refs/heads/master Merge: a8cfb3d 42f5ba3 Author: David Heinemeier Hansson Date: 2014-05-20 17:35:41 +0200 Merge pull request #38 from mperham/rework_sidekiq Reimplement Sidekiq adapter commit b49d3f1 refs/heads/master Merge: 23a8723 a8cfb3d Author: Mike Perham Date: 2014-05-20 08:35:12 -0700 merge master commit cbfc8b3 refs/heads/master Author: Douwe Maan Date: 2014-05-20 11:32:29 +0200 Have Sneakers adapter take queue_name into account. M lib/active_job/queue_adapters/sneakers_adapter.rb commit 9c3c559 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-05-20 23:15:08 +0930 Merge pull request #14965 from eric-chahin/issue_14824 Fixed the inferred table name of a HABTM auxiliar Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb commit ac37165 refs/heads/master Author: Sean Griffin Date: 2014-05-20 07:51:33 -0700 Delegate type_cast to injected type object in mysql M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/type.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb M activerecord/lib/active_record/connection_adapters/type/time.rb A activerecord/lib/active_record/connection_adapters/type/time_value.rb commit 6cc5a86 refs/heads/master Author: Vladimir Yarotsky Date: 2014-05-19 22:53:55 -0700 Fix confusing exception in ActiveSupport delegation M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/module/delegation.rb M activesupport/test/core_ext/module_test.rb commit d17b056 refs/heads/master Merge: f9860fc 36fde2b Author: Yves Senn Date: 2014-05-20 16:39:25 +0200 Merge pull request #15197 from sgrif/sg-delegate-type-cast-sqlite3 Delegate `#type_cast` to injected type objects on SQLite3 commit 36fde2b refs/heads/master Author: Sean Griffin Date: 2014-05-20 06:16:47 -0700 Delegate `#type_cast` to injected type objects on SQLite3 M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/connection_adapters/type/boolean.rb M activerecord/lib/active_record/connection_adapters/type/date.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb M activerecord/lib/active_record/connection_adapters/type/decimal.rb M activerecord/lib/active_record/connection_adapters/type/float.rb M activerecord/lib/active_record/connection_adapters/type/integer.rb M activerecord/lib/active_record/connection_adapters/type/string.rb M activerecord/lib/active_record/connection_adapters/type/time.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/test/cases/column_test.rb commit f88d087 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-05-20 23:15:08 +0930 Merge pull request #14965 from eric-chahin/issue_14824 Fixed the inferred table name of a HABTM auxiliar Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb commit a8cfb3d refs/heads/master Merge: 2d19c71 a265011 Author: David Heinemeier Hansson Date: 2014-05-20 16:10:15 +0200 Merge pull request #46 from cristianbica/logging Added logging capabilities commit a265011 refs/heads/master Author: Cristian Bica Date: 2014-05-20 17:02:36 +0300 Moved log_subcriber dependency and cleanup M lib/active_job/base.rb M lib/active_job/log_subscriber.rb M lib/active_job/logging.rb commit 42f5ba3 refs/heads/master Author: Mike Perham Date: 2014-05-20 06:57:29 -0700 Remove all Sidekiq-specific stuff from job, enable retries by default M lib/active_job/queue_adapters/sidekiq_adapter.rb commit f9860fc refs/heads/master Merge: 528aff1 1f4daf1 Author: Matthew Draper Date: 2014-05-20 23:15:08 +0930 Merge pull request #14965 from eric-chahin/issue_14824 Fixed the inferred table name of a HABTM auxiliar commit 1f4daf1 refs/heads/master Author: Eric Chahin Date: 2014-05-03 19:13:27 -0400 Fixed the inferred table name for HABTM within a schema Fixes #14824. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb commit 9aa807c refs/heads/master Author: cam song Date: 2014-05-20 20:04:33 +0800 Distinguish rake assets:clobber from rake assets:clean M guides/source/command_line.md commit 1822f95 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-20 13:40:26 +0200 Merge pull request #15192 from simi/guides-binstubs Use generated binstubs in guides examples. [ci skip] M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_record_validations.md M guides/source/asset_pipeline.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/engines.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/migrations.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md commit 0227af9 refs/heads/master Author: Cristian Bica Date: 2014-05-20 14:41:14 +0300 Added logging capabilities M lib/active_job/base.rb M lib/active_job/enqueuing.rb A lib/active_job/log_subscriber.rb A lib/active_job/logging.rb commit 243afc0 refs/heads/master Author: Dimitar Kostov Date: 2014-05-20 14:03:46 +0300 Adds backburner adapter M Gemfile M Gemfile.lock M Rakefile A lib/active_job/queue_adapters/backburner_adapter.rb A test/adapters/backburner.rb M test/cases/adapter_test.rb A test/support/backburner/inline.rb commit 528aff1 refs/heads/master Merge: 8f8dfa4 981dda5 Author: Yves Senn Date: 2014-05-20 13:40:26 +0200 Merge pull request #15192 from simi/guides-binstubs Use generated binstubs in guides examples. [ci skip] commit 981dda5 refs/heads/master Author: Josef Šimánek Date: 2014-05-20 13:29:18 +0200 Use generated binstubs in guides examples. [ci skip] M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_record_validations.md M guides/source/asset_pipeline.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/engines.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/migrations.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md commit 2d19c71 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 12:22:20 +0200 Add Sneakers test and inline setup/teardown M test/cases/adapter_test.rb commit 34f0e42 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 12:19:14 +0200 Update README with queue_as example and the desire for a Resque 2.x adapter M README.md commit 9d34727 refs/heads/master Merge: f8fc6ca fc062f6 Author: David Heinemeier Hansson Date: 2014-05-20 12:12:32 +0200 Merge pull request #42 from zhouguangming/refactor Make consistent code style commit f8fc6ca refs/heads/master Merge: 7a6aa47 9b5562a Author: David Heinemeier Hansson Date: 2014-05-20 12:10:47 +0200 Merge pull request #45 from DouweM/patch-2 Determine full class name dynamically in QC adapter. commit 7a6aa47 refs/heads/master Merge: 9c8c6bf 6d00950 Author: David Heinemeier Hansson Date: 2014-05-20 12:09:24 +0200 Merge pull request #31 from seuros/master Add Que Adapter/Wrapper commit 9c8c6bf refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 12:06:59 +0200 Clarify that the other option for name_or_adapter is to be a class (the Adapter class) M lib/active_job/queue_adapter.rb commit fa47832 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-20 12:05:26 +0200 No need for the local variable M lib/active_job/queue_adapter.rb commit 6d00950 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-19 18:09:45 +0000 Add Que Adapter/Wrapper M Gemfile M Gemfile.lock M README.md M Rakefile A lib/active_job/queue_adapters/que_adapter.rb A test/adapters/que.rb M test/cases/adapter_test.rb commit 9b5562a refs/heads/master Author: Douwe Maan Date: 2014-05-20 11:37:04 +0200 Determine full class name dynamically in QC adapter. M lib/active_job/queue_adapters/queue_classic_adapter.rb commit 8f8dfa4 refs/heads/master Author: Yves Senn Date: 2014-05-20 11:21:16 +0200 fix `rake test_sqlite3_mem`. While running Sqlite3 memory tests I encountered the following error: ``` Finished in 69.416366s, 58.0267 runs/s, 162.3681 assertions/s. 1) Error: ActiveRecord::Migration::ChangeSchemaTest#test_add_column_with_timestamp_type: NoMethodError: undefined method `type' for nil:NilClass /Users/senny/Projects/rails/activerecord/test/cases/migration/change_schema_test.rb:244:in `test_add_column_with_timestamp_type' 4028 runs, 11271 assertions, 0 failures, 1 errors, 1 skips ``` This was because the table `testings` was used in multiple test-cases. This resulted in a wrongly cached schema on `ActiveRecord::Base.schema_chae`. /cc @zuhao M activerecord/test/cases/migration/change_schema_test.rb commit bb39fff refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-05-20 10:33:50 +0200 docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn] Closes #15122 Closes #15107 Conflicts: activerecord/test/cases/persistence_test.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 748cc75 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-20 10:33:50 +0200 docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn] Closes #15122 Closes #15107 Conflicts: activerecord/test/cases/persistence_test.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 60bd243 refs/heads/master Author: Yves Senn Date: 2014-05-20 10:33:50 +0200 docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn] Closes #15122 Closes #15107 M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit fc062f6 refs/heads/master Author: zhouguangming Date: 2014-05-20 16:26:04 +0800 Make consistent code style M lib/active_job/queue_adapters/sneakers_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 7591e8c refs/heads/master Merge: 00d1b13 f044020 Author: Yves Senn Date: 2014-05-20 08:58:17 +0200 Merge pull request #15182 from zuhao/refactor_actionpack_respond_with_test_2 Un-define :to_json for Customer class after stubbing. commit f044020 refs/heads/master Author: Zuhao Wan Date: 2014-05-19 19:56:06 +0800 Add using_resouce_with_json to controller. M actionpack/test/controller/mime/respond_with_test.rb commit 00d1b13 refs/heads/master Merge: fe06e9a ac36b45 Author: Yves Senn Date: 2014-05-20 08:21:32 +0200 Merge pull request #15178 from zuhao/refactor_actionpack_respond_with_test Deregister csv renderer after test to prevent leak. commit f5c85dc refs/heads/master Merge: 3a233d0 6f059b0 Author: Guillermo Iguaran Date: 2014-05-20 00:04:39 -0500 Merge pull request #39 from larrylv/update-readme Update README for currently supported adapters. commit 6f059b0 refs/heads/master Author: Larry Lv Date: 2014-05-20 12:51:44 +0800 Update README for currently supported adapters. M README.md commit 3a233d0 refs/heads/master Merge: c6925f5 1b71fe5 Author: Guillermo Iguaran Date: 2014-05-19 23:23:02 -0500 Merge pull request #37 from Aesthetikx/master Add Sneakers wrapper commit c813a30 refs/heads/master Author: Mike Perham Date: 2014-05-19 21:08:18 -0700 Reimplement Sidekiq worker This better integrates various Sidekiq features into AJ jobs. Things like the JID will be set as expected and the user can use `sidekiq_options` in AJ::Base subclasses as usual to configure various features. M lib/active_job/queue_adapters/sidekiq_adapter.rb commit fe06e9a refs/heads/master Author: Aaron Patterson Date: 2014-05-19 17:46:27 -0700 make the AST go from left to right, rather than right to left M actionpack/lib/action_dispatch/journey/parser.rb M actionpack/lib/action_dispatch/journey/parser.y commit dc2e3ea refs/heads/master Author: Aaron Patterson Date: 2014-05-19 16:43:16 -0700 fix escaping in generation M actionpack/lib/action_dispatch/journey/visitors.rb commit 1b71fe5 refs/heads/master Author: John DeSilva Date: 2014-05-20 00:56:08 +0200 Add Sneakers wrapper M Gemfile M Gemfile.lock M README.md M Rakefile A lib/active_job/queue_adapters/sneakers_adapter.rb A test/adapters/sneakers.rb A test/support/sneakers/inline.rb commit 62d1b33 refs/heads/master Author: Aaron Patterson Date: 2014-05-19 16:14:47 -0700 Revert "Rewrite journey routes formatter for performance" This reverts commit 5c224de9e110763ec7a0f01f5b604bcf81f40bfb. Conflicts: actionpack/lib/action_dispatch/journey/visitors.rb 5c224de9e110763ec7a0f01f5b604bcf81f40bfb introduced a bug in the formatter. This commit includes a regression test. M actionpack/lib/action_dispatch/journey/visitors.rb M actionpack/test/controller/url_for_test.rb commit 23a8723 refs/heads/master Author: Mike Perham Date: 2014-05-19 15:30:31 -0700 remove debugging M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 3648838 refs/heads/master Author: Mike Perham Date: 2014-05-19 15:27:28 -0700 Implement enqueue_at/enqueue_in Delayed jobs are supported by all systems except QueueClassic. For it I decided to raise NotImplementedError. The inline implementation is a bit rough. M Gemfile M Gemfile.lock M lib/active_job/enqueuing.rb M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/queue_classic_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb M test/cases/queuing_test.rb commit 03035d6 refs/heads/master Merge: 09cc922 d0f8c46 Author: Rafael Mendonça França Date: 2014-05-19 18:56:00 -0300 Merge pull request #15184 from sgrif/sg-remove-timestamp-type Remove :timestamp column type commit c6925f5 refs/heads/master Merge: ac930b8 5cad2c1 Author: Rafael Mendonça França Date: 2014-05-19 18:08:44 -0300 Merge pull request #34 from cristianbica/queue_classic-adpater queue_classic adapter commit 5cad2c1 refs/heads/master Author: Cristian Bica Date: 2014-05-20 00:01:56 +0300 Implemented queue_classic adapter M Gemfile M Gemfile.lock M README.md M Rakefile A lib/active_job/queue_adapters/queue_classic_adapter.rb A test/adapters/queue_classic.rb A test/support/queue_classic/inline.rb commit ac930b8 refs/heads/master Merge: 179060a eebec88 Author: Rafael Mendonça França Date: 2014-05-19 17:23:32 -0300 Merge pull request #33 from mperham/patch-2 Update wanted list commit eebec88 refs/heads/master Author: Mike Perham Date: 2014-05-19 13:21:13 -0700 Update README.md beanstalkd and rabbitmq are MQ servers, they aren't something that would integrate directly with Rails and ActiveJob. That's like saying we want an adapter for Redis, when really you want adapters for Resque, Sidekiq, etc. Sneakers is the latest Ruby job system using rabbitmq. I don't know of a modern beanstalkd system for Ruby, Stalker is pretty dead these days. I added QueueClassic because it's reasonably popular on Heroku for the "postgresql only" crowd. M README.md commit 179060a refs/heads/master Merge: 08d8600 fc80f4e Author: Rafael Mendonça França Date: 2014-05-19 17:20:47 -0300 Merge pull request #32 from mperham/master RDoc enqueue commit fc80f4e refs/heads/master Author: Mike Perham Date: 2014-05-19 13:13:40 -0700 RDoc enqueue M lib/active_job/enqueuing.rb commit d0f8c46 refs/heads/master Author: Sean Griffin Date: 2014-05-19 10:59:57 -0700 Remove :timestamp column type The `:timestamp` type for columns is unused. All database adapters treat them as the same database type. All code in `ActiveRecord` which changes its behavior based on the column's type acts the same in both cases. However, when the type is passed to code that checks for the `:datetime` type, but not `:timestamp` (such as XML serialization), the result is unexpected behavior. Existing schema definitions will continue to work, and the `timestamp` type is transparently aliased to `datetime`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_assignment.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/connection_adapters/type.rb M activerecord/lib/active_record/connection_adapters/type/date_time.rb D activerecord/lib/active_record/connection_adapters/type/timestamp.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/column_test.rb M activerecord/test/cases/connection_adapters/type/type_map_test.rb M activerecord/test/cases/connection_adapters/type_lookup_test.rb M activerecord/test/cases/migration/change_schema_test.rb commit ac36b45 refs/heads/master Author: Zuhao Wan Date: 2014-05-18 16:54:20 +0800 Add ActionController::Renderers.remove. M actionpack/lib/action_controller/metal/renderers.rb M actionpack/test/controller/mime/respond_with_test.rb commit 08d8600 refs/heads/master Merge: ec47b52 6198978 Author: Rafael Mendonça França Date: 2014-05-19 14:48:26 -0300 Merge pull request #30 from larrylv/patch-3 Make tests for `Person` pass. commit 09cc922 refs/heads/master Merge: 361d2ff f369bcf Author: Rafael Mendonça França Date: 2014-05-19 14:47:39 -0300 Merge pull request #15155 from dskang/digest Default config.assets.digests to true in development commit 472a2bb refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-19 13:32:15 -0300 Merge pull request #10798 from jcxplorer/fix-enable_extension-with-table_name_prefix Fix migrations that use enable_extension with table_name_prefix/suffix Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/migration.rb Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/migration.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb A activerecord/test/cases/adapters/postgresql/extension_migration_test.rb commit 41a8827 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-19 13:32:15 -0300 Merge pull request #10798 from jcxplorer/fix-enable_extension-with-table_name_prefix Fix migrations that use enable_extension with table_name_prefix/suffix Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/migration.rb Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb A activerecord/test/cases/adapters/postgresql/extension_migration_test.rb commit 6198978 refs/heads/master Author: Larry Lv Date: 2014-05-20 01:36:41 +0800 Make tests for `Person` pass. M test/models/person.rb commit 361d2ff refs/heads/master Author: Rafael Mendonça França Date: 2014-05-19 14:35:33 -0300 Fixing test order issues M activerecord/test/cases/adapters/postgresql/extension_migration_test.rb commit ec47b52 refs/heads/master Merge: 7a2775b 6889c61 Author: Rafael Mendonça França Date: 2014-05-19 14:34:08 -0300 Merge pull request #29 from larrylv/patch-2 Fix `Person#==` method in test. commit 6889c61 refs/heads/master Author: Larry Lv Date: 2014-05-20 01:32:05 +0800 Fix `Person#==` method in test. M test/models/person.rb commit 7a2775b refs/heads/master Merge: 8a05587 29c9dcc Author: Rafael Mendonça França Date: 2014-05-19 13:59:04 -0300 Merge pull request #28 from larrylv/patch-1 Add doc for setting the queue adapter. commit 29c9dcc refs/heads/master Author: Larry Lv Date: 2014-05-20 00:58:19 +0800 Add doc for setting the queue adapter. M README.md commit 889f61e refs/heads/master Merge: 4273554 40708c3 Author: Rafael Mendonça França Date: 2014-05-19 13:32:15 -0300 Merge pull request #10798 from jcxplorer/fix-enable_extension-with-table_name_prefix Fix migrations that use enable_extension with table_name_prefix/suffix Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/migration.rb commit 4273554 refs/heads/master Merge: a0eec57 0b682e4 Author: Yves Senn Date: 2014-05-19 17:18:17 +0200 Merge pull request #15158 from sgrif/sg-delegate-type Delegate `Column#type` to the injected type object commit 0b682e4 refs/heads/master Author: Sean Griffin Date: 2014-05-17 12:24:13 -0600 Delegate `Column#type` to the injected type object The decision to wrap type registrations in a proc was made for two reasons. 1. Some cases need to make an additional decision based on the type (e.g. a `Decimal` with a 0 scale) 2. Aliased types are automatically updated if they type they point to is updated later. If a user or another adapter decides to change the object used for `decimal` columns, `numeric`, and `number` will automatically point to the new type, without having to track what types are aliased explicitly. Everything else here should be pretty straightforward. PostgreSQL ranges had to change slightly, since the `simplified_type` method is gone. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/type.rb A activerecord/lib/active_record/connection_adapters/type/binary.rb A activerecord/lib/active_record/connection_adapters/type/boolean.rb A activerecord/lib/active_record/connection_adapters/type/date.rb A activerecord/lib/active_record/connection_adapters/type/date_time.rb A activerecord/lib/active_record/connection_adapters/type/decimal.rb A activerecord/lib/active_record/connection_adapters/type/float.rb A activerecord/lib/active_record/connection_adapters/type/integer.rb A activerecord/lib/active_record/connection_adapters/type/string.rb A activerecord/lib/active_record/connection_adapters/type/text.rb A activerecord/lib/active_record/connection_adapters/type/time.rb A activerecord/lib/active_record/connection_adapters/type/timestamp.rb A activerecord/lib/active_record/connection_adapters/type/type_map.rb M activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/test/cases/adapters/mysql/quoting_test.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb M activerecord/test/cases/column_definition_test.rb M activerecord/test/cases/column_test.rb A activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb A activerecord/test/cases/connection_adapters/type/type_map_test.rb A activerecord/test/cases/connection_adapters/type_lookup_test.rb commit a0eec57 refs/heads/master Author: Yves Senn Date: 2014-05-19 14:10:55 +0200 test, inline `DeveloperWithAggregate`, which is used by a single test. M activerecord/test/cases/base_test.rb M activerecord/test/models/developer.rb commit 8a05587 refs/heads/master Merge: c086dfb 68793bf Author: Rafael Mendonça França Date: 2014-05-19 09:04:48 -0300 Merge pull request #23 from DouweM/patch-2 Refactor Resque adapter to be more consistent with others commit 68793bf refs/heads/master Author: Douwe Maan Date: 2014-05-19 14:00:14 +0200 Refactor Resque adapter to be more consistent with others M lib/active_job/queue_adapters/resque_adapter.rb commit c086dfb refs/heads/master Author: Rafael Mendonça França Date: 2014-05-19 08:51:51 -0300 Make sure Bignum can be serialized M lib/active_job/parameters.rb M test/cases/parameters_test.rb commit e240566 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 13:44:07 +0200 Styling M lib/active_job/queue_adapters/sidekiq_adapter.rb commit a9dc36c refs/heads/master Merge: 70419b5 62aa8ac Author: David Heinemeier Hansson Date: 2014-05-19 13:43:03 +0200 Merge pull request #22 from DouweM/patch-1 Have Sidekiq adapter take queue_name into account. commit b52e639 refs/heads/master Merge: 88ee30a 540262a Author: Rafael Mendonça França Date: 2014-05-19 08:39:45 -0300 Merge pull request #15168 from eileencodes/return-early-on-delete-and-destroy-methods Return early on delete and destroy methods commit 62aa8ac refs/heads/master Author: Douwe Maan Date: 2014-05-19 13:36:08 +0200 Have Sidekiq adapter take queue_name into account. M lib/active_job/queue_adapters/sidekiq_adapter.rb commit 70419b5 refs/heads/master Merge: 3a932bf 575a837 Author: Rafael Mendonça França Date: 2014-05-19 08:29:29 -0300 Merge pull request #18 from mperham/param_whitelist Whitelist legal job parameter types commit 3a932bf refs/heads/master Merge: 430228e edc8926 Author: Rafael Mendonça França Date: 2014-05-19 08:27:47 -0300 Merge pull request #21 from DouweM/patch-1 Fix typos in readme. commit edc8926 refs/heads/master Author: Douwe Maan Date: 2014-05-19 13:23:35 +0200 Fix typos in readme. M README.md commit 430228e refs/heads/master Author: Rafael Mendonça França Date: 2014-05-19 08:19:20 -0300 :scissors: M Rakefile commit 7446403 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-19 08:19:09 -0300 Update Gemfile.lock M Gemfile.lock commit 704b17b refs/heads/master Author: Rafael Mendonça França Date: 2014-05-19 08:18:42 -0300 Use bundle gem tasks M Rakefile commit 575a837 refs/heads/master Author: Mike Perham Date: 2014-05-19 04:18:28 -0700 Whitelist legal job parameter types M lib/active_job/parameters.rb M test/cases/parameters_test.rb commit 572e60f refs/heads/master Merge: c2cdb8b 3688c6c Author: Rafael Mendonça França Date: 2014-05-19 08:14:56 -0300 Merge pull request #17 from mperham/patch-1 Pull in rake commit 3688c6c refs/heads/master Author: Mike Perham Date: 2014-05-19 04:14:20 -0700 Pull in rake For those that don't have it globally... M Gemfile commit c2cdb8b refs/heads/master Merge: c69dda4 60b8af4 Author: David Heinemeier Hansson Date: 2014-05-19 13:14:09 +0200 Merge branch 'master' of github.com:rails/activejob commit c69dda4 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 13:13:30 +0200 Add justification M README.md commit 88ee30a refs/heads/master Merge: 85b78fc 9a0d35e Author: Rafael Mendonça França Date: 2014-05-19 08:06:37 -0300 Merge pull request #14126 from schuetzm/index_option_for_column Make `:index` in migrations work with all column types commit 60b8af4 refs/heads/master Merge: f85ad8b ca8b2fd Author: David Heinemeier Hansson Date: 2014-05-19 13:04:16 +0200 Merge pull request #16 from seuros/master Setting the adapter load the required gem. commit ca8b2fd refs/heads/master Author: Abdelkader Boudih Date: 2014-05-19 11:02:37 +0000 Setting the adapter load the required gem. M test/adapters/delayed_job.rb commit f85ad8b refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 13:02:32 +0200 Update README.md M README.md commit c47d6b4 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 13:01:33 +0200 Update README.md M README.md commit 85b78fc refs/heads/master Merge: d4cec31 113f56d Author: Rafael Mendonça França Date: 2014-05-19 07:57:55 -0300 Merge pull request #15160 from sgrif/sg-destructured-each Use destructured arguments when looping through pairs commit d3d5308 refs/heads/master Merge: afb3d4f bc9bd57 Author: David Heinemeier Hansson Date: 2014-05-19 12:55:41 +0200 Merge pull request #15 from seuros/master Use case/when commit bc9bd57 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-19 10:53:25 +0000 Use case/when M lib/active_job/queue_adapter.rb commit afb3d4f refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 12:46:27 +0200 Move to instance method and document usage M README.md M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb M test/jobs/gid_job.rb M test/jobs/hello_job.rb commit f3a9ad7 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 12:39:14 +0200 Move activemodel-globalid dependency to gemspec M Gemfile M Gemfile.lock M activejob.gemspec commit 079ff1f refs/heads/master Merge: 37b13cd c14cc48 Author: David Heinemeier Hansson Date: 2014-05-19 12:36:17 +0200 Merge branch 'master' of github.com:rails/activejob commit 37b13cd refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 12:36:01 +0200 No need to qualify the Parameters class with the namespace M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit 501cc60 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 12:34:27 +0200 Inline the job wrappers D lib/active_job/job_wrappers/delayed_job_wrapper.rb D lib/active_job/job_wrappers/resque_wrapper.rb D lib/active_job/job_wrappers/sidekiq_wrapper.rb D lib/active_job/job_wrappers/sucker_punch_wrapper.rb M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/resque_adapter.rb M lib/active_job/queue_adapters/sidekiq_adapter.rb M lib/active_job/queue_adapters/sucker_punch_adapter.rb commit d4cec31 refs/heads/master Author: Yves Senn Date: 2014-05-19 12:20:30 +0200 pg, re-introduce `PostgreSQL::Utils` to unify schema/table extraction. Partial revert of c0bfc3f412834ffe8327a15ae3a46602cc28e425 M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb A activerecord/lib/active_record/connection_adapters/postgresql/utils.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb A activerecord/test/cases/adapters/postgresql/utils_test.rb commit c14cc48 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 12:08:03 +0200 Update README.md M README.md commit f71147e refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 12:06:24 +0200 Use markdown instead of rdoc A README.md D README.rdoc commit 211ce71 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 12:06:09 +0200 Add GlobalID support for serialization M Gemfile M Gemfile.lock M README.rdoc M lib/active_job/base.rb A lib/active_job/enqueuing.rb A lib/active_job/job_wrappers/delayed_job_wrapper.rb M lib/active_job/job_wrappers/resque_wrapper.rb M lib/active_job/job_wrappers/sidekiq_wrapper.rb M lib/active_job/job_wrappers/sucker_punch_wrapper.rb A lib/active_job/parameters.rb M lib/active_job/queue_adapters/delayed_job_adapter.rb M lib/active_job/queue_adapters/inline_adapter.rb A test/cases/job_serialization_test.rb A test/cases/parameters_test.rb A test/jobs/gid_job.rb A test/models/person.rb commit 881cab4 refs/heads/master Author: Yves Senn Date: 2014-05-19 11:15:51 +0200 pg, add missing nodocs for extracted modules. M activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 65bf5f1 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 11:05:34 +0200 Spacing M test/adapters/delayed_job.rb commit 60d76c5 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 11:04:23 +0200 Extract QueueName into its own module M lib/active_job/base.rb A lib/active_job/queue_name.rb commit 935f53b refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 11:00:00 +0200 Fix for the new adapter setter M test/adapters/delayed_job.rb M test/cases/adapter_test.rb commit dc20f7d refs/heads/master Merge: c334bea e06e64e Author: David Heinemeier Hansson Date: 2014-05-19 10:56:08 +0200 Merge branch 'master' of github.com:rails/activejob commit c334bea refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 10:55:57 +0200 Extract QueueAdapter module for setting and looking up adapters M lib/active_job/base.rb A lib/active_job/queue_adapter.rb M test/adapters/inline.rb M test/adapters/resque.rb M test/adapters/sidekiq.rb M test/adapters/sucker_punch.rb M test/cases/adapter_test.rb commit e06e64e refs/heads/master Merge: fd1e61a 6e18a74 Author: David Heinemeier Hansson Date: 2014-05-19 10:54:30 +0200 Merge pull request #9 from cristianbica/delayed_job_adapter Implemented delayed_job support commit 6e18a74 refs/heads/master Author: Cristian Bica Date: 2014-05-19 11:47:12 +0300 Modified readme M README.rdoc commit d3ff144 refs/heads/master Author: Cristian Bica Date: 2014-05-19 00:47:35 +0300 Implemented delayed job M Gemfile M Gemfile.lock M Rakefile A lib/active_job/queue_adapters/delayed_job_adapter.rb A test/adapters/delayed_job.rb M test/cases/adapter_test.rb M test/helper.rb A test/support/delayed_job/delayed/backend/test.rb A test/support/delayed_job/delayed/serialization/test.rb commit fd1e61a refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-19 09:47:55 +0200 Dont need the explicit error handling -- if the require fails, it will raise exactly the error we want to communicate anyway. Also use the load path, so we can allow plugins, rather than requre_relative M lib/active_job/base.rb D lib/active_job/errors.rb commit d7c3098 refs/heads/master Merge: d3bc449 91461dc Author: David Heinemeier Hansson Date: 2014-05-19 09:43:47 +0200 Merge pull request #10 from seuros/master Lazy-load adapters, fixes #6 commit c6ee495 refs/heads/master Merge: e153fbf da4d841 Author: Yves Senn Date: 2014-05-19 09:34:43 +0200 Merge pull request #14962 from arunagw/aa-fix-rake-activerecord Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi] commit e153fbf refs/heads/master Author: Yves Senn Date: 2014-05-19 09:14:58 +0200 pg guide, move introductory sentences into main content. [ci skip] This is a reaction to https://github.com/rails/rails/commit/7ca75f3789e316b6f3dc1f8000ec4f85c8ba32ea#commitcomment-6303828 M guides/source/active_record_postgresql.md commit 46890ad refs/heads/master Author: Jarmo Isotalo Date: 2014-04-14 13:09:06 +0300 Since upgrading rack we can remove unnecessary string encodings https://github.com/rack/rack/commit/5a5aee36 M actionpack/lib/action_dispatch/http/parameters.rb commit adffea6 refs/heads/master Author: Jarmo Isotalo Date: 2014-02-08 15:30:14 -0800 Upgraded rack As Rack has some non backwards compatible changes added required modifications to keep behaviour in rails close to same as before. Also modified generators to include rack/rack for not yet released version of rack M Gemfile M actionpack/actionpack.gemspec M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/dispatch/request/multipart_params_parsing_test.rb M actionpack/test/dispatch/request_test.rb M railties/lib/rails/generators/app_base.rb commit 91461dc refs/heads/master Author: Abdelkader Boudih Date: 2014-05-18 20:59:12 +0000 Lazy-load adapters, fixes #6 M lib/active_job/base.rb A lib/active_job/errors.rb M lib/active_job/job_wrappers/resque_wrapper.rb M test/adapters/inline.rb M test/adapters/resque.rb M test/adapters/sidekiq.rb M test/adapters/sucker_punch.rb A test/cases/adapter_test.rb commit d29074a refs/heads/master Merge: 239f560 d070a65 Author: Yves Senn Date: 2014-05-18 22:02:56 +0200 Merge pull request #15156 from sgrif/sg-postgres-timestamps PostgreSQL timestamps should always be datetimes commit d3bc449 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 21:37:16 +0200 List adapters supported and wanted M README.rdoc commit e5feb8b refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 21:37:01 +0200 With dependencies for Sidekiq and Sucker Punch M Gemfile.lock commit 12705fa refs/heads/master Merge: ce124a1 68543de Author: David Heinemeier Hansson Date: 2014-05-18 21:23:43 +0200 Merge pull request #5 from seuros/master Add Sidekiq adapter/wrapper fixes #3 commit 68543de refs/heads/master Author: Abdelkader Boudih Date: 2014-05-18 19:20:06 +0000 Add Sucker Punch adapter/wrapper M Gemfile M Rakefile M lib/active_job/base.rb A lib/active_job/job_wrappers/sucker_punch_wrapper.rb A lib/active_job/queue_adapters/sucker_punch_adapter.rb A test/adapters/sucker_punch.rb commit 53f08f9 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-18 19:11:03 +0000 Correct typo in version.rb M lib/active_job/version.rb commit a712c07 refs/heads/master Author: Abdelkader Boudih Date: 2014-05-18 19:02:02 +0000 Add Sidekiq adapter/wrapper fixes #3 M Gemfile M Rakefile M lib/active_job/base.rb A lib/active_job/job_wrappers/sidekiq_wrapper.rb A lib/active_job/queue_adapters/sidekiq_adapter.rb A test/adapters/sidekiq.rb commit 6a05129 refs/tags/v3.2.19 Author: Aaron Patterson Date: 2014-05-18 12:00:03 -0700 Feature detect based on Ruby version. I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob returns the wrong value on Ruby less than 2.2.0. Checking for a case-insensitive FS seems too hard, so just check Ruby version Checking for a case-insensitive FS seems too hard, so just check Ruby version. M actionpack/lib/action_view/template/resolver.rb commit 52ecae4 refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-05-18 12:00:03 -0700 Feature detect based on Ruby version. I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob returns the wrong value on Ruby less than 2.2.0. Checking for a case-insensitive FS seems too hard, so just check Ruby version Checking for a case-insensitive FS seems too hard, so just check Ruby version. M actionpack/lib/action_view/template/resolver.rb commit d7b9eea refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-18 12:00:03 -0700 Feature detect based on Ruby version. I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob returns the wrong value on Ruby less than 2.2.0. Checking for a case-insensitive FS seems too hard, so just check Ruby version Checking for a case-insensitive FS seems too hard, so just check Ruby version. M actionview/lib/action_view/template/resolver.rb commit 239f560 refs/heads/master Author: Aaron Patterson Date: 2014-05-18 12:00:03 -0700 Feature detect based on Ruby version. I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob returns the wrong value on Ruby less than 2.2.0. Checking for a case-insensitive FS seems too hard, so just check Ruby version Checking for a case-insensitive FS seems too hard, so just check Ruby version. M actionview/lib/action_view/template/resolver.rb commit 623da13 refs/heads/master Author: Robin Dupret Date: 2014-05-18 18:58:50 +0200 A tiny pass through the PostgreSQL guide [ci skip] M guides/source/active_record_postgresql.md commit ddf32da refs/heads/master Author: Vijay Dev Date: 2014-05-18 16:01:31 +0000 copy edits[ci skip] M guides/source/api_documentation_guidelines.md commit ce124a1 refs/heads/master Merge: b32fdd5 2ac1a02 Author: David Heinemeier Hansson Date: 2014-05-18 17:38:27 +0200 Merge pull request #1 from charliesome/patch-1 Clean up JobWrappers::ResqueWrapper.perform commit 2ac1a02 refs/heads/master Author: Charlie Somerville Date: 2014-05-19 01:27:50 +1000 Clean up JobWrappers::ResqueWrapper.perform This is not only easier to read, but it'll also properly raise an ArgumentError rather than a NoMethodError when called with no arguments. It also allocates 4 fewer objects per call (8 down from 12), and is about 50% faster according to a quick benchmark. M lib/active_job/job_wrappers/resque_wrapper.rb commit 1963aa3 refs/heads/master Merge: 4d8c6c5 8dd801d Author: Yves Senn Date: 2014-05-18 17:13:00 +0200 Merge pull request #15157 from msgehard/remove_cruft_in_has_secure_password Remove cruft now that strong_parameters is default [ci skip] commit 4d8c6c5 refs/heads/master Merge: dbbcc83 67de652 Author: Yves Senn Date: 2014-05-18 17:08:38 +0200 Merge pull request #15169 from Gaurav2728/gaurav-ecosystem remove ecosystem link that is broken [ci skip] commit b32fdd5 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 16:24:30 +0200 Queue naming with a base, which requires a JobWrapper to comply to Resques expectation of a class variable M lib/active_job/base.rb A lib/active_job/job_wrappers/resque_wrapper.rb M lib/active_job/queue_adapters/resque_adapter.rb A test/cases/queue_naming_test.rb M test/jobs/hello_job.rb commit 67de652 refs/heads/master Author: Gaurav Sharma Date: 2014-05-18 19:08:05 +0530 remove ecosystem link that is broken M guides/source/layout.html.erb commit 8dd801d refs/heads/master Author: Mike Gehard Date: 2014-05-17 18:01:11 -0600 Let others know why this code is here [ci skip] M activemodel/lib/active_model/secure_password.rb commit 540262a refs/heads/master Author: eileencodes Date: 2014-05-17 09:11:25 -0400 early return on delete and destroy methods When delete or destroy is called on all records nothing is deleted or destroyed. Intead of running through the code and still not deleteing anything, we should early return M activerecord/lib/active_record/associations/collection_association.rb commit eed52c8 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 13:11:00 +0200 Add ResqueAdapter and provide test infrastructure for the now multiple adapters M Gemfile M Gemfile.lock M Rakefile M lib/active_job/base.rb D lib/active_job/queue_adapters/inline_queue.rb A lib/active_job/queue_adapters/resque_adapter.rb A test/adapters/inline.rb A test/adapters/resque.rb M test/helper.rb M test/jobs/hello_job.rb commit 30973e3 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 13:10:34 +0200 Rename to InlineAdapter to match *Adapter form, even if the queue is embedded in there too A lib/active_job/queue_adapters/inline_adapter.rb commit 08a2ba9 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 12:32:22 +0200 Simplest job and inline queue M lib/active_job/base.rb A lib/active_job/queue_adapters/inline_queue.rb M test/cases/queuing_test.rb A test/jobs/hello_job.rb commit 60d13d6 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 12:30:57 +0200 Run tests through Rake A Rakefile commit a832bc3 refs/heads/master Author: David Heinemeier Hansson Date: 2014-05-18 11:44:28 +0200 Skeleton gem A CHANGELOG.md A Gemfile A Gemfile.lock A MIT-LICENSE A README.rdoc A activejob.gemspec A lib/active_job.rb A lib/active_job/base.rb A lib/active_job/gem_version.rb A lib/active_job/version.rb A test/cases/queuing_test.rb A test/helper.rb commit 9a0d35e refs/heads/master Author: Marc Schütz Date: 2014-02-20 18:54:13 +0100 Make `:index` in migrations work with all column types M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/test/cases/migration/columns_test.rb commit f369bcf refs/heads/master Author: Dan Kang Date: 2014-05-16 21:00:10 -0400 Default config.assets.digests to true in development M Gemfile M guides/code/getting_started/config/environments/development.rb M guides/source/asset_pipeline.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/test/application/assets_test.rb M railties/test/railties/engine_test.rb commit dbbcc83 refs/heads/master Merge: 7359f81 4bd5dff Author: Yves Senn Date: 2014-05-18 01:17:00 +0200 Merge pull request #15151 from sgrif/sg-add-type-to-column Add a type object to Column constructor commit 4bd5dff refs/heads/master Author: Sean Griffin Date: 2014-05-17 11:04:13 -0600 Add a type object to Column constructor Part of #15134. In order to perform typecasting polymorphically, we need to add another argument to the constructor. The order was chosen to match the `oid_type` on `PostgreSQLColumn`. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb A activerecord/lib/active_record/connection_adapters/type.rb A activerecord/lib/active_record/connection_adapters/type/value.rb M activerecord/test/active_record/connection_adapters/fake_adapter.rb M activerecord/test/cases/adapters/mysql/quoting_test.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb M activerecord/test/cases/column_definition_test.rb M activerecord/test/cases/column_test.rb commit 113f56d refs/heads/master Author: Sean Griffin Date: 2014-05-17 14:50:24 -0600 Use destructured arguments when looping through pairs Minor refactoring of looping behavior for aggregation M activerecord/lib/active_record/aggregations.rb commit d070a65 refs/heads/master Author: Sean Griffin Date: 2014-05-17 14:04:23 -0600 PostgreSQL timestamps are always datetimes The current behavior is that they are treated as `datetime` normally, but if they are part of an array, they are treated as `timestamp`. The only place that seems to be impacted by this is schema dumping, which shouldn't matter since `t.datetime` and `t.timestamp` are equivalent in the `PostgreSQL` adapter, anyway. M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb commit 41f7d07 refs/heads/master Author: Mike Gehard Date: 2014-05-17 13:45:35 -0600 Put attr_reader in with all of the other instance methods This makes the grouping make a little more sense M activemodel/lib/active_model/secure_password.rb commit 656bc9a refs/remotes/origin/4-1-stable Author: Guillermo Iguaran Date: 2014-05-16 11:18:21 -0500 Our test suite isn't ready to run in random order yet :cry: M Gemfile commit 7359f81 refs/heads/master Merge: 0671315 8df8334 Author: Rafael Mendonça França Date: 2014-05-17 16:26:19 -0300 Merge pull request #15137 from sgrif/sg-remove-dead-code Remove dead test code for unsupported adapters commit 8df8334 refs/heads/master Author: Sean Griffin Date: 2014-05-16 12:05:45 -0600 Remove dead test code for unsupported adapters M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/adapter_test.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/binary_test.rb M activerecord/test/cases/defaults_test.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/cases/locking_test.rb M activerecord/test/cases/migration/change_schema_test.rb M activerecord/test/cases/migration/column_attributes_test.rb M activerecord/test/cases/migration/index_test.rb M activerecord/test/cases/migration/rename_table_test.rb M activerecord/test/cases/multiparameter_attributes_test.rb M activerecord/test/cases/pooled_connections_test.rb M activerecord/test/cases/test_case.rb M activerecord/test/cases/xml_serialization_test.rb M activerecord/test/schema/schema.rb commit 0671315 refs/heads/master Merge: 7caf3ff fec7bfe Author: Rafael Mendonça França Date: 2014-05-17 16:21:41 -0300 Merge pull request #14428 from jnormore/reset_counters_alias Updates reset_counters to allow counter name in params commit 74b94de refs/remotes/origin/4-1-stable Author: Zachary Scott Date: 2014-05-14 22:44:44 -0700 Document method visibility for designing API docs. [ci skip] cc https://github.com/rails/rails/issues/14848#issuecomment-41198795 M guides/source/api_documentation_guidelines.md commit 7caf3ff refs/heads/master Author: Zachary Scott Date: 2014-05-14 22:44:44 -0700 Document method visibility for designing API docs. [ci skip] cc https://github.com/rails/rails/issues/14848#issuecomment-41198795 M guides/source/api_documentation_guidelines.md commit 194c24e refs/heads/master Merge: 33ab32f ff4b152 Author: Rafael Mendonça França Date: 2014-05-17 16:02:24 -0300 Merge pull request #15152 from printercu/patch-5 Collected TimeZone's class methods together commit ff4b152 refs/heads/master Author: printercu Date: 2014-05-17 22:16:11 +0400 Collected TimeZone's class methods together Just moved class methods up in file and moved `def self.` methods into `class << self`. M activesupport/lib/active_support/values/time_zone.rb commit 33ab32f refs/heads/master Merge: 31fb1ef 933b212 Author: Rafael Mendonça França Date: 2014-05-17 15:55:11 -0300 Merge pull request #15149 from sgrif/sg-missing-tests Add missing tests for column type cast behavior commit 628e4c5 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-17 15:38:55 -0300 New applications should be created with json serializer The fix introduced at 75ba7425f6d235f254c00a45a58f42e88f80301a were missing this case. To fix the original issue mentioned at that commit the correct is to remove update_config_files from the command list since we should not run both config_files command when creating a new application. Tests were added to make sure everything is working fine. M railties/lib/rails/generators/rails/app/app_generator.rb M railties/test/generators/app_generator_test.rb commit 31fb1ef refs/heads/master Author: Rafael Mendonça França Date: 2014-05-17 15:38:55 -0300 New applications should be created with json serializer The fix introduced at 75ba7425f6d235f254c00a45a58f42e88f80301a were missing this case. To fix the original issue mentioned at that commit the correct is to remove update_config_files from the command list since we should not run both config_files command when creating a new application. Tests were added to make sure everything is working fine. M railties/lib/rails/generators/rails/app/app_generator.rb M railties/test/generators/app_generator_test.rb commit 933b212 refs/heads/master Author: Sean Griffin Date: 2014-05-17 10:38:04 -0600 Add missing tests for column type cast behavior M activerecord/test/cases/column_test.rb commit 1b8529e refs/heads/master Merge: 53c8719 75ba742 Author: Guillermo Iguaran Date: 2014-05-17 12:40:06 -0500 Merge pull request #15150 from xtian/fix-railties-tests Fix app generator test hanging. commit 75ba742 refs/heads/master Author: Christian Wesselhoeft Date: 2014-05-17 09:53:44 -0700 Fix app generator test hanging. M railties/lib/rails/generators/rails/app/app_generator.rb M railties/test/generators/app_generator_test.rb commit 53c8719 refs/heads/master Merge: d71c72f 902fef3 Author: Richard Schneeman Date: 2014-05-17 09:50:58 -0400 Merge pull request #15147 from regonn/fix-symbol Fix symbol at guides getting_started.md commit 902fef3 refs/heads/master Author: regonn Date: 2014-05-17 22:39:49 +0900 fix symbol M guides/source/getting_started.md commit d71c72f refs/heads/master Merge: 13e8c80 45c396b Author: Yves Senn Date: 2014-05-17 13:11:37 +0200 Merge pull request #15132 from zuhao/refactor_actionpack_abstract_collector_test Ensure :js is defined regardless of the outcome of the test. commit 45c396b refs/heads/master Author: Zuhao Wan Date: 2014-05-16 23:09:43 +0800 Ensure :js is defined regardless of the outcome of the test. M actionpack/test/abstract/collector_test.rb commit 13e8c80 refs/heads/master Author: Vijay Dev Date: 2014-05-17 08:58:22 +0000 prefer file name instead of filename [ci skip] M guides/source/api_documentation_guidelines.md commit f534d7a refs/heads/master Author: Vijay Dev Date: 2014-05-17 08:57:16 +0000 fix typo [ci skip] M activerecord/lib/active_record/transactions.rb commit 8193c49 refs/heads/master Merge: b470d85 46fc89f Author: Vijay Dev Date: 2014-05-17 14:08:58 +0530 Merge pull request #15145 from ShunsukeAida/capitalization fixed capitalizations [ci skip] commit 46fc89f refs/heads/master Author: SA Date: 2014-05-17 15:24:13 +0900 fixed capitalizations [ci skip] jQuery, SQLite3 and Unicorn use these respective capitalizations pretty much everywhere else in the comment sections of the project. M guides/code/getting_started/Gemfile commit b470d85 refs/heads/master Merge: ada8e50 7e35675 Author: Godfrey Chan Date: 2014-05-16 22:05:54 -0700 Merge pull request #15144 from leafac/fix-changelog-#15071 Fix typo in CHANGELOG entry for #15071 commit 7e35675 refs/heads/master Author: Leandro Facchinetti Date: 2014-05-17 01:59:55 -0300 Fix typo in CHANGELOG entry for #15071 M activerecord/CHANGELOG.md commit fec7bfe refs/heads/master Author: Jason Normore Date: 2014-03-19 12:24:46 -0400 Updates reset_counters to allow counter name in params Add support for counter name to be passed as parameter on `CounterCache::ClassMethods#reset_counters`. This is to be consistent with the other methods in the module that all accept counter name. M activerecord/CHANGELOG.md M activerecord/lib/active_record/counter_cache.rb M activerecord/test/cases/counter_cache_test.rb commit ada8e50 refs/heads/master Merge: fd11946 f52a13c Author: Rafael Mendonça França Date: 2014-05-16 21:29:37 -0300 Merge pull request #15143 from htanata/first_person_pronouns Replace first person point of view on guides. commit f52a13c refs/heads/master Author: Hendy Tanata Date: 2014-02-27 15:46:27 -0800 Replace first person point of view on guides. [skip ci] M guides/source/active_support_core_extensions.md M guides/source/security.md M guides/source/testing.md commit f58cc8e refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-16 21:13:34 -0300 Merge pull request #15037 from roccoblues/fix_duplicate_activesupport_subscribers Fixed duplicate subscribers in ActiveSupport::Subscriber Conflicts: activesupport/CHANGELOG.md Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/subscriber.rb M activesupport/test/subscriber_test.rb commit fd11946 refs/heads/master Merge: a9ebfc0 b50468d Author: Rafael Mendonça França Date: 2014-05-16 21:13:34 -0300 Merge pull request #15037 from roccoblues/fix_duplicate_activesupport_subscribers Fixed duplicate subscribers in ActiveSupport::Subscriber Conflicts: activesupport/CHANGELOG.md commit a9ebfc0 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-16 21:01:47 -0300 Add CHANGELOG entry for #15071 [ci skip] M activerecord/CHANGELOG.md commit 4877737 refs/heads/master Merge: ec43d95 5866437 Author: Rafael Mendonça França Date: 2014-05-16 20:58:49 -0300 Merge pull request #15071 from leafac/issues/11985 Fix `Relation#delete_all` inconsistency commit dc81805 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-16 20:38:27 -0300 foo :bomb: M railties/lib/rails/generators/rails/app/app_generator.rb commit ec43d95 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-16 20:38:27 -0300 foo :bomb: M railties/lib/rails/generators/rails/app/app_generator.rb commit ffb702c refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-16 20:34:06 -0300 Generate the cookies_serializer configuration with :marshal when upgrading We were generating this configuration with :json what may break applications upgrating from Rails 4.0-. Now we always generate with a safer value and people is free to choose hybrid if they want. We don't generate with hybrid by default because there are some cases that can fail. These cases are explained on the upgrading guide. M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/tasks/framework.rake commit 8941d5a refs/heads/master Author: Rafael Mendonça França Date: 2014-05-16 20:34:06 -0300 Generate the cookies_serializer configuration with :marshal when upgrading We were generating this configuration with :json what may break applications upgrating from Rails 4.0-. Now we always generate with a safer value and people is free to choose hybrid if they want. We don't generate with hybrid by default because there are some cases that can fail. These cases are explained on the upgrading guide. M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/tasks/framework.rake commit 8f1244c refs/remotes/origin/rf-experiment-private-api-documentation (origin/rf-experiment-private-api-documentation) Merge: 5063d6a c6cef0c Author: Godfrey Chan Date: 2014-05-16 15:45:41 -0700 Merge pull request #15115 from zzak/guides_method_visibility Document method visibility for designing API docs. commit c6cef0c refs/remotes/origin/rf-experiment-private-api-documentation Author: Zachary Scott Date: 2014-05-14 22:44:44 -0700 Document method visibility for designing API docs. [ci skip] cc https://github.com/rails/rails/issues/14848#issuecomment-41198795 M guides/source/api_documentation_guidelines.md commit 779ff5c refs/heads/master Author: Yves Senn Date: 2014-05-17 00:25:04 +0200 doc, pg `hstore` and `json` columns are mapped as `Hash`. [ci skip] Closes #15141. M guides/source/upgrading_ruby_on_rails.md commit e83a6ff refs/heads/master Author: Yves Senn Date: 2014-05-17 00:24:50 +0200 remove trailing whitespace. [ci skip] M guides/source/caching_with_rails.md M guides/source/upgrading_ruby_on_rails.md commit da4d841 refs/heads/master Author: Arun Agrawal Date: 2014-05-03 20:15:11 +0200 Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi] M activerecord/Rakefile M ci/travis.rb M guides/source/contributing_to_ruby_on_rails.md M guides/source/development_dependencies_install.md commit 9c4d31f refs/heads/master Merge: 654be5f 5bda6e0 Author: Rafael Mendonça França Date: 2014-05-16 17:44:03 -0300 Merge pull request #15140 from arthurnn/small_cleanup Remove unecessary require commit 5bda6e0 refs/heads/master Author: Arthur Neves Date: 2014-05-16 16:40:22 -0400 Remove unecessary require M activerecord/lib/active_record/transactions.rb commit c917fb7 refs/heads/master Author: Matt Jones Date: 2014-05-16 15:55:44 -0400 WIP: pass existing joins to construct_join_dependency M activerecord/lib/active_record/associations/alias_tracker.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/inner_join_association_test.rb commit 654be5f refs/heads/master Merge: 0369dbf 0372c50 Author: Rafael Mendonça França Date: 2014-05-16 15:52:48 -0300 Merge pull request #15139 from zzak/habtm_build_model_name Remove the assignment for real this time. commit 0372c50 refs/heads/master Author: Zachary Scott Date: 2014-05-16 11:36:48 -0700 Remove the assignment for real this time. cc: https://github.com/rails/rails/commit/a11e2fcff8cdc9691b977d8330abe63024f8c732#commitcomment-6353614 and 0369dbf M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb commit 0369dbf refs/heads/master Author: Rafael Mendonça França Date: 2014-05-16 15:31:51 -0300 prepend mutates the string so we can remove the assignment M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb commit e5f840c refs/heads/master Author: Rafael Mendonça França Date: 2014-05-16 15:20:01 -0300 Reuse the force_clear_transaction_record_state M activerecord/lib/active_record/transactions.rb commit 78399ad refs/heads/master Author: Rafael Mendonça França Date: 2014-05-16 15:09:05 -0300 Missed if :bomb: M activerecord/lib/active_record/transactions.rb commit d89d859 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-16 15:03:40 -0300 Add a specific method to force the transaction record state clear We are using that code path in only one place so we should not add a conditional to all the other cases. This will avoid performance regressions on the old paths. M activerecord/lib/active_record/transactions.rb commit 9900703 refs/heads/master Merge: cb85ddc 535f299 Author: Godfrey Chan Date: 2014-05-16 10:50:21 -0700 Merge pull request #15125 from arthurnn/small_refactoring_transaction_clear Small refactoring on clear_transaction_record_state commit cb85ddc refs/heads/master Merge: 3acf287 0fcc1f9 Author: Rafael Mendonça França Date: 2014-05-16 14:47:57 -0300 Merge pull request #15131 from arunagw/aa-cleanup-rakefile Remove code related to adapter which are no longer in repo commit 3acf287 refs/heads/master Merge: 8c48cd2 db9a5c5 Author: Rafael Mendonça França Date: 2014-05-16 13:31:06 -0300 Merge pull request #15021 from hubertlepicki/allow_custom_host_in_asset_url Allow custom asset host to be passed in asset_url commit 8c48cd2 refs/heads/master Author: Guillermo Iguaran Date: 2014-05-16 11:18:21 -0500 Our test suite isn't ready to run in random order yet :cry: M Gemfile commit 0fcc1f9 refs/heads/master Author: Arun Agrawal Date: 2014-05-16 14:58:01 +0200 Remove code related to adapter which are no longer in repo As we have remove code for these adapters so no need to have tasks M activerecord/Rakefile M activerecord/test/config.example.yml commit f3de182 refs/heads/master Merge: f7552e5 b48bc86 Author: Rafael Mendonça França Date: 2014-05-16 13:11:33 -0300 Merge pull request #15113 from leafac/document-schema-conflicts Document conflicts in `db/schema.rb` [ci skip] commit b48bc86 refs/heads/master Author: Leandro Facchinetti Date: 2014-05-14 18:43:57 -0300 Document conflicts in `db/schema.rb` [ci skip] M guides/source/migrations.md commit f7552e5 refs/heads/master Merge: 8109dc8 812b4e8 Author: Rafael Mendonça França Date: 2014-05-16 12:56:42 -0300 Merge pull request #15133 from ShunsukeAida/master fixed a typo commit 812b4e8 refs/heads/master Author: Aida Date: 2014-05-17 00:29:09 +0900 fixed a typo [ci skip] M actionpack/lib/abstract_controller/url_for.rb commit 8109dc8 refs/heads/master Author: Yves Senn Date: 2014-05-16 09:03:26 +0200 formatting pass through CHANGELOGS. [ci skip] M actionview/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md commit 5866437 refs/heads/master Author: Leandro Facchinetti Date: 2014-05-12 12:06:35 -0300 Fix `Relation#delete_all` inconsistency When relation scopes include one of `uniq`, `group`, `having` or `offset`, the generated query ignores them and that causes unintended records to be deleted. This solves the issue by restricting the deletion when those scopes are present. rails/rails#11985 M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relations_test.rb commit 535f299 refs/heads/master Author: Arthur Neves Date: 2014-05-15 15:38:05 -0400 Clear transaction state if callback raise rollback M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit e3d223b refs/heads/master Author: Arthur Neves Date: 2014-05-15 13:56:44 -0400 Small refactoring on clear_transaction_record_state Make sure when we clean the `@_start_transaction_state` var we do it in the same code-path. Also this makes `clear_transaction_record_state`, more consistent with `restore_transaction_record_state` M activerecord/lib/active_record/transactions.rb commit b4a2c96 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-15 16:18:05 -0300 Merge pull request #15118 from khelben/head_with_status_action_stack_level_too_deep fixes stack level too deep exception on action named 'status' rendering 'head :ok' Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal.rb M actionpack/lib/action_controller/metal/head.rb M actionpack/lib/action_controller/metal/rack_delegation.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/integration_test.rb commit 756baf2 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-15 16:18:05 -0300 Merge pull request #15118 from khelben/head_with_status_action_stack_level_too_deep fixes stack level too deep exception on action named 'status' rendering 'head :ok' Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal.rb M actionpack/lib/action_controller/metal/head.rb M actionpack/lib/action_controller/metal/rack_delegation.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/integration_test.rb commit 16a8a68 refs/heads/master Merge: cf50bbd 20fece1 Author: Rafael Mendonça França Date: 2014-05-15 16:18:05 -0300 Merge pull request #15118 from khelben/head_with_status_action_stack_level_too_deep fixes stack level too deep exception on action named 'status' rendering 'head :ok' commit 20fece1 refs/heads/master Author: Christiaan Van den Poel Date: 2014-05-15 16:08:53 +0200 fixes stack level too deep exception on action named 'status' returning 'head :ok' M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal.rb M actionpack/lib/action_controller/metal/head.rb M actionpack/lib/action_controller/metal/rack_delegation.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/integration_test.rb commit cf50bbd refs/heads/master Merge: 1ad4b48 42728c7 Author: Rafael Mendonça França Date: 2014-05-15 14:36:24 -0300 Merge pull request #15121 from skarpesh/rfc4791-methods Add RFC 4791 MKCALENDAR method commit 5fa2391 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-05-16 01:39:52 +0930 Merge pull request #14791 from asn62/mysql_double_bug Changed extract_limit in class Column to return correct mysql float and double limits M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/schema_test.rb commit 1ad4b48 refs/heads/master Merge: 2367dfe 51de8ce Author: Matthew Draper Date: 2014-05-16 01:39:52 +0930 Merge pull request #14791 from asn62/mysql_double_bug Changed extract_limit in class Column to return correct mysql float and double limits commit 51de8ce refs/heads/master Author: Aaron Nelson Date: 2014-04-17 18:33:10 -0400 Changed extract_limit in class Column to return correct mysql float and double limits M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/schema_test.rb commit 42728c7 refs/heads/master Author: kasper Date: 2014-05-15 17:21:59 +0300 Add RFC4791 MKCALENDAR method M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/routing_test.rb commit 2367dfe refs/heads/master Author: Santiago Pastorino Date: 2014-05-15 11:04:56 -0300 Revert "Remove ruby-head from allow_failures matrix" This reverts commit 5d2d301024cc0b17f26f6b454ac22a72f1db8a23. M .travis.yml commit 5d2d301 refs/heads/master Author: Santiago Pastorino Date: 2014-05-15 10:37:30 -0300 Remove ruby-head from allow_failures matrix M .travis.yml commit ee23984 refs/heads/master Merge: 0068dcc 30f93dc Author: Santiago Pastorino Date: 2014-05-15 08:35:37 -0500 Merge pull request #15116 from tgxworld/remove_unused_method_in_test Remove unused method in RouteSet test. commit 0068dcc refs/heads/master Author: Yves Senn Date: 2014-05-15 12:13:56 +0200 flexible ruby-oci8 version specification. [Gaurav Sharma] Follow up to #15109. /cc @Gaurav2728 M Gemfile commit 77a3cc4 refs/heads/master Author: Yves Senn Date: 2014-05-15 12:10:13 +0200 update ruby-oci8 version specification. Closes #15109. [ci skip] /cc @yahonda M Gemfile commit 30f93dc refs/heads/master Author: Guo Xiang Tan Date: 2014-05-15 00:51:55 -0700 Remove unused method in RouteSet test. M actionpack/test/dispatch/routing/route_set_test.rb commit e8059f5 refs/heads/master Author: Andrew White Date: 2014-05-15 06:30:42 +0100 Only path requirements are relevant to optimized urls The bit of URL generation that is optimized is the generation of the path so things like :host, :port, etc. are irrelevant. M actionpack/lib/action_dispatch/routing/route_set.rb commit 31599ea refs/remotes/origin/4-1-stable Author: Andrew White Date: 2014-05-15 06:03:23 +0100 Add missing requires for require 'action_dispatch/routing' (cherry picked from commit ee8dc39ebe88b294496d731150a9fdca35d9478c) M actionpack/lib/action_dispatch/routing.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit e57328d refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-05-15 06:03:23 +0100 Add missing requires for require 'action_dispatch/routing' (cherry picked from commit ee8dc39ebe88b294496d731150a9fdca35d9478c) M actionpack/lib/action_dispatch/routing.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit ee8dc39 refs/heads/master Author: Andrew White Date: 2014-05-15 06:03:23 +0100 Add missing requires for require 'action_dispatch/routing' M actionpack/lib/action_dispatch/routing.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit 1961894 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 22:27:59 -0300 :scissors: M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit f7aa2cc refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 22:27:20 -0300 Methods of these modules are internal They should not be used on people application so they should not be present on the API documentation. M activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb commit 095c42e refs/heads/master Merge: a11e2fc c0bfc3f Author: Rafael Mendonça França Date: 2014-05-14 22:19:37 -0300 Merge pull request #15088 from kares/shareable-modules [postgres] remove (outer) sub-class declarations with nested modules/classes commit bc67969 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-14 21:35:52 -0300 Merge pull request #14871 from kassio/kb-fixes-namespaced-habtm Fix how to compute class name on habtm namespaced. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb A activerecord/test/models/publisher.rb A activerecord/test/models/publisher/article.rb A activerecord/test/models/publisher/magazine.rb M activerecord/test/schema/schema.rb commit a11e2fc refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 21:46:40 -0300 Don't use Active Support where it is not needed. parent_name is a string of nil, never a blank string so we don't need to use presence. M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb commit f85371f refs/heads/master Merge: ec6bb33 8f6e598 Author: Rafael Mendonça França Date: 2014-05-14 21:35:52 -0300 Merge pull request #14871 from kassio/kb-fixes-namespaced-habtm Fix how to compute class name on habtm namespaced. Conflicts: activerecord/CHANGELOG.md commit 11cfe10 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-14 20:29:30 -0300 Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master Make filter_binds filter out symbols that are equal to strings Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/merger.rb activerecord/test/cases/relation/merging_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/merger.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/comment.rb M activerecord/test/models/post.rb commit 28c6342 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-14 20:29:30 -0300 Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master Make filter_binds filter out symbols that are equal to strings Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/merger.rb M activerecord/test/cases/relation/merging_test.rb M activerecord/test/models/comment.rb M activerecord/test/models/post.rb commit ec6bb33 refs/heads/master Merge: f2bff25 1d316ac Author: Rafael Mendonça França Date: 2014-05-14 20:29:30 -0300 Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master Make filter_binds filter out symbols that are equal to strings Conflicts: activerecord/CHANGELOG.md commit 1d316ac refs/heads/master Author: Nat Budin Date: 2014-05-12 14:30:05 -0700 Make filter_binds filter out symbols that are equal to strings ActiveRecord::Relation::Merger's filter_binds method does not filter out bind variables when one of the attribute nodes has a string name, but the other has a symbol name, even when those names are actually equal. This can result in there being more bind variables than placeholders in the generated SQL. This is particularly an issue for PostgreSQL, where this is treated as an error. This patch changes the filter_binds method to make it convert both attribute names to strings before comparing. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/merger.rb M activerecord/test/cases/relation/merging_test.rb M activerecord/test/models/comment.rb M activerecord/test/models/post.rb commit f2bff25 refs/heads/master Merge: 125cc78 92fbbf6 Author: Rafael Mendonça França Date: 2014-05-14 20:04:43 -0300 Merge pull request #14137 from dasch/better-fragment-cache-instrumentation Add controller and action name to the fragment caching instrumentation payload Conflicts: actionpack/CHANGELOG.md commit 125cc78 refs/heads/master Merge: 09cfa3f 7a84f0b Author: Aaron Patterson Date: 2014-05-14 14:02:04 -0700 Merge pull request #15070 from ayamomiji/sse-patch Add multiple lines message support for SSE module commit 09cfa3f refs/heads/master Author: Yves Senn Date: 2014-05-14 21:25:52 +0200 rake, remove frontbase related tasks from Active Record Rakefile. M activerecord/Rakefile commit 6d36c1d refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-15 00:49:29 +0530 Fixed a problem where `sum`, `size`, `average`, `minimum` and `maximum` used with a grouping was not returning a Hash. M activerecord/CHANGELOG.md M activerecord/lib/active_record/null_relation.rb M activerecord/test/cases/relations_test.rb commit c279d01 refs/heads/master Merge: 96da5e7 bf68ccc Author: Rafael Mendonça França Date: 2014-05-14 15:44:23 -0300 Merge pull request #15110 from kuldeepaggarwal/fix-warning remove warning `ambiguous first argument; put parentheses or even spaces` commit bf68ccc refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-15 00:12:21 +0530 remove warning `ambiguous first argument; put parentheses or even spaces` M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit 96da5e7 refs/heads/master Merge: 1560370 5fc9dff Author: Rafael Mendonça França Date: 2014-05-14 15:42:09 -0300 Merge pull request #15074 from kuldeepaggarwal/docs-changes Add missing information, ref[#522c0fd] commit 1560370 refs/heads/master Merge: 89836f9 b1d52a7 Author: Rafael Mendonça França Date: 2014-05-14 15:04:27 -0300 Merge pull request #15108 from arthurnn/i18n_master Use i18n master to run tests commit 89836f9 refs/heads/master Merge: 7b50d7f ad3628b Author: Rafael Mendonça França Date: 2014-05-14 14:59:20 -0300 Merge pull request #15096 from robin850/patch-20 Update Redcarpet to 3.1.2 commit 5fc9dff refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-14 23:26:42 +0530 [ci skip]add updated information, ref[#522c0fd] M activerecord/lib/active_record/attribute_methods.rb commit ad3628b refs/heads/master Author: Robin Dupret Date: 2014-05-13 23:30:33 +0200 Update Redcarpet to 3.1.2 This version fixes an API breakage between 3.0 and 3.1 ; the header method's arity should not have changed. [ci skip] M Gemfile M guides/rails_guides.rb M guides/rails_guides/markdown/renderer.rb commit b8f419c refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-03-31 19:09:32 -0700 Merge pull request #14546 from eileencodes/fix_delete_all_to_not_use_IN_statement Fix delete all to not produce sql in statement Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb Merge pull request #14727 from robin850/patch-17 Add a changelog entry for #14546 [ci skip] Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/collection_association.rb activerecord/test/cases/associations/has_many_associations_test.rb activerecord/test/cases/test_case.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/test_case.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 7b50d7f refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 14:26:46 -0300 We need an explicit return If we don't return early Ruby will memoize the value of the prefix of the parent class what will make the subsequent searchs to not work as expected. If the early return we are avoiding the memoization. But when using the deprecated path we need to memoize the value, so we are not using early return for the deprecated path. M actionview/lib/action_view/view_paths.rb commit 5063d6a refs/remotes/origin/rf-experiment-private-api-documentation Author: Rafael Mendonça França Date: 2014-05-14 13:50:28 -0300 Be explicit about the API visibility of the methods Even with the :nodoc: people may think the method is part of the public API so it is better to be explicit about it. [ci skip] M actionview/lib/action_view/view_paths.rb commit 548cb1c refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 13:47:14 -0300 Following documentation guideline M actionview/test/actionpack/abstract/abstract_controller_test.rb commit 7bcd66e refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 13:45:20 -0300 Refactoring the code to make consitional return explicit M actionview/lib/action_view/view_paths.rb commit 0af0ffd refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 13:44:14 -0300 Follow the documentation guideline M actionview/lib/action_view/view_paths.rb commit 4fb63f7 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 13:42:55 -0300 Mark _prefix as nodoc These methods are private API. M actionview/lib/action_view/view_paths.rb commit a0630ee refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 13:41:20 -0300 ._prefix is private API so we should not recommend to override it M actionview/lib/action_view/view_paths.rb commit 05edaa6 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-14 13:40:54 -0300 Improve CHANGELOG entry M actionview/CHANGELOG.md commit 51a52cb refs/heads/master Merge: 307a519 b8ad4b5 Author: Rafael Mendonça França Date: 2014-05-14 13:36:58 -0300 Merge remote-tracking branch 'apotonick/simplify-prefixes' This is the rebased version of #15026 Closes #15026 commit 2fe11e4 refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2014-05-14 22:33:03 +0930 Merge pull request #14833 from jyao6/attribute_inheritance Fixed Attribute Inheritance Issue Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb commit 69fc26f refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2013-10-10 10:32:52 +0200 `stored_attributes` need to be specific to a subclass. Currently they are all stored globally in the same `Hash`. This commit forces the creation of a per-class variable if necessary. The behavior was exposed through the following test-case: ``` 1) Failure: StoreTest#test_all_stored_attributes_are_returned [/Users/senny/Projects/rails/activerecord/test/cases/store_test.rb:151]: --- expected +++ actual @@ -1 +1 @@ -[:color, :homepage, :favorite_food] +[:resolution, :color, :homepage, :favorite_food] ``` Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/store_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb commit 0ac1632 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-05-14 22:33:03 +0930 Merge pull request #14833 from jyao6/attribute_inheritance Fixed Attribute Inheritance Issue M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb commit 307a519 refs/heads/master Merge: 374d19a 6de710d Author: Matthew Draper Date: 2014-05-14 22:33:03 +0930 Merge pull request #14833 from jyao6/attribute_inheritance Fixed Attribute Inheritance Issue commit 6de710d refs/heads/master Author: Jessica Yao Date: 2014-04-21 18:08:54 -0400 Fix inheritance of stored_attributes (fixes #14672) [Brad Bennett, Jessica Yao, & Lakshmi Parthasarathy] M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb commit c0bfc3f refs/heads/master Author: kares Date: 2014-05-14 13:38:34 +0200 PostgreSQLAdapter::Utils seems to be only used from a single spot - quite redundant M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb D activerecord/test/cases/adapters/postgresql/utils_test.rb commit ad0ec07 refs/heads/master Author: kares Date: 2014-05-14 13:32:03 +0200 move PostgreSQL's DatabaseStatements out of the PostgreSQLAdapter name-space M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 06e7fec refs/heads/master Author: kares Date: 2014-05-14 12:42:36 +0200 PostgreSQL's SchemaStatements seems a could candidate for re-use (with AR-JDBC) M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 6822dfa refs/heads/master Author: kares Date: 2014-05-14 12:04:14 +0200 introduce AR::ConnectionAdapters::PostgreSQL for sharing modules (with AR-JDBC) ... 'shared' OID, ArrayParser and Cast helpers, also re-arranged Column's dependencies M activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 374d19a refs/heads/master Merge: dd16a10 4fb2be5 Author: Yves Senn Date: 2014-05-14 11:33:36 +0200 Merge pull request #15102 from azul/patch-1 Fix reference to sanitize helper test suite [ci skip] commit 4fb2be5 refs/heads/master Author: azul Date: 2014-05-14 09:24:31 +0200 minor: point to the right test suite location M actionview/test/template/sanitize_helper_test.rb commit dd16a10 refs/heads/master Merge: 522110a 34db2b7 Author: Aaron Patterson Date: 2014-05-13 19:23:59 -0700 Merge pull request #15099 from eileencodes/refactor_delete_records_method Refactor delete_records method commit 34db2b7 refs/heads/master Author: eileencodes Date: 2014-05-13 20:55:36 -0400 remove count var this change was unneccsary as nothing was gained from it M activerecord/lib/active_record/associations/has_many_association.rb commit 05a90c3 refs/heads/master Author: eileencodes Date: 2014-05-12 14:11:15 -0400 rename delete_all_records to delete_or_nullify_all_records Rename delete_all_records because this name better describes what the method is doing. We can then remove :all from the hm:t version and pull out the unoptimized call to load_target in delete_records and pass it directly. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb commit 1c851b8 refs/heads/master Author: eileencodes Date: 2014-05-12 14:01:19 -0400 remove need for :all symbol Refactor delete_count method to only handle delete_all or nullify/nil cases and not destroy and switch to if/else rather than case statement. This refactoring allows removal of :all symbol usage. M activerecord/lib/active_record/associations/has_many_association.rb commit d8ae276 refs/heads/master Author: eileencodes Date: 2014-05-11 20:49:14 -0400 begin refactoring delete_records method Refactor by creating two methods delete_all_records and delete_records to be called by delete_all and delete (or destroy) respectively. This reduces the number of conditionals required to handle _how_ records get deleted. The new delete_count method handles how scope is applied to which delete action. A delete_all_records method also has to be called in has_many_through association because of how the methods are chained. This will be refactored later on. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb commit 522110a refs/heads/master Merge: 348af15 b342d2b Author: Godfrey Chan Date: 2014-05-13 17:23:58 -0700 Merge pull request #15100 from eileencodes/remove-deprecation-warning-no-longer-needed remove deprecation warning commit 348af15 refs/heads/master Author: Aaron Patterson Date: 2014-05-13 17:21:55 -0700 _recall should be set to a hash or not set Then we can avoid nil checks M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/abstract_unit.rb commit 760aa3b refs/heads/master Author: Aaron Patterson Date: 2014-05-13 17:05:32 -0700 we never call url_for with a block, so rm M actionpack/lib/action_dispatch/routing/route_set.rb commit b342d2b refs/heads/master Author: eileencodes Date: 2014-05-13 19:51:57 -0400 remove deprecation warning This deprecation was released in 4.1.0 and can be removed for 4.2.0, deprecation message / handling is no longer necessary. M activesupport/CHANGELOG.md M activesupport/lib/active_support/callbacks.rb commit 33d6e3b refs/heads/master Author: Aaron Patterson Date: 2014-05-13 15:35:41 -0700 drop || test for cases that do not need it M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb commit 67f815a refs/heads/master Author: Aaron Patterson Date: 2014-05-13 15:25:22 -0700 no need to check for presence, script names can be blank M actionpack/lib/action_dispatch/routing/route_set.rb commit d08810e refs/heads/master Author: Aaron Patterson Date: 2014-05-13 14:47:04 -0700 extend with a module then use define_method no need for redefine_method M actionpack/lib/action_dispatch/routing/mapper.rb commit 6457ed4 refs/heads/master Author: Aaron Patterson Date: 2014-05-13 14:32:45 -0700 this method should always have a parameter passed to it, so remove the default M actionpack/lib/action_dispatch/routing/route_set.rb commit 567aa54 refs/heads/master Author: Aaron Patterson Date: 2014-05-13 14:19:23 -0700 options should always be passed to url_for M actionpack/lib/action_dispatch/routing/route_set.rb commit 5953266 refs/heads/master Merge: 354fb0b f8d1845 Author: Rafael Mendonça França Date: 2014-05-13 18:07:50 -0300 Merge pull request #15092 from kares/pg-array-parser [postgres] include PgArrayParser directly commit 354fb0b refs/heads/master Merge: 2b84eea 9a1e23a Author: Rafael Mendonça França Date: 2014-05-13 16:57:19 -0300 Merge pull request #15095 from JuanitoFatas/doc/generators [ci skip] Fix two factual errors and highlight code in generators guide. commit 9a1e23a refs/heads/master Author: Juanito Fatas Date: 2014-05-14 03:55:27 +0800 [ci skip] Fix a factual error and highlight code in generators guide. M guides/source/generators.md commit 04dbeca refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-13 16:11:40 -0300 Merge pull request #15072 from mjtko/fix/issue-15064 [Fixes #15064] Calling number_to_delimited on a ActiveSupport::SafeBuffer results in mangled output Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/number_helper/number_to_delimited_converter.rb M activesupport/test/number_helper_test.rb commit 2b84eea refs/heads/master Merge: 0626543 3703a8a Author: Rafael Mendonça França Date: 2014-05-13 16:11:40 -0300 Merge pull request #15072 from mjtko/fix/issue-15064 [Fixes #15064] Calling number_to_delimited on a ActiveSupport::SafeBuffer results in mangled output commit 0626543 refs/heads/master Merge: 89d9756 70710c9 Author: Rafael Mendonça França Date: 2014-05-13 16:11:21 -0300 Merge pull request #15073 from ifyouseewendy/master Update and add tests in array_ext_test.rb commit 89d9756 refs/heads/master Author: Aaron Patterson Date: 2014-05-13 12:07:01 -0700 calls with :host should still use the optimized path M actionpack/lib/action_dispatch/routing/route_set.rb commit 6eee9e5 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-13 15:34:57 -0300 Merge pull request #15094 from gsamokovarov/patch-1 Remove falsy deprecation note in AS guides [ci skip] M guides/source/active_support_core_extensions.md commit 4cc0767 refs/heads/master Merge: 6f3c8fb 2efc64c Author: Rafael Mendonça França Date: 2014-05-13 15:34:57 -0300 Merge pull request #15094 from gsamokovarov/patch-1 Remove falsy deprecation note in AS guides [ci skip] commit 2efc64c refs/heads/master Author: Genadi Samokovarov Date: 2014-05-13 21:16:10 +0300 Remove falsy deprecation note in AS guides [ci skip] This is no longer true as @jeremy removed the deprecation in 7a5601c. M guides/source/active_support_core_extensions.md commit 6f3c8fb refs/heads/master Author: Aaron Patterson Date: 2014-05-13 11:15:23 -0700 use fewer method calls to determine the url_for options M actionpack/lib/action_dispatch/routing/route_set.rb commit 48cce9d refs/heads/master Author: Aaron Patterson Date: 2014-05-13 11:01:53 -0700 just merge instead of dup and merge M actionpack/lib/action_dispatch/routing/route_set.rb commit ca9fd76 refs/heads/master Author: Aaron Patterson Date: 2014-05-13 10:51:15 -0700 the :only_path option is applied by the time the helper is called M actionpack/lib/action_dispatch/routing/route_set.rb commit 566f25b refs/heads/master Author: Aaron Patterson Date: 2014-05-13 10:41:39 -0700 options already have symbolized keys, so we can avoid this call M actionpack/lib/action_dispatch/routing/route_set.rb commit 71c5d56 refs/heads/master Author: Edo Balvers Date: 2014-05-04 15:29:17 +0200 Fix Baseclass becomes! subclass. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation.rb M activerecord/test/cases/persistence_test.rb commit b1d52a7 refs/heads/master Author: Arthur Neves Date: 2014-05-13 13:19:53 -0400 Use i18n master to run tests M Gemfile commit f8d1845 refs/heads/master Author: kares Date: 2014-05-13 18:51:34 +0200 [postgres] include PgArrayParser directly and only load/include ArrayParser if not found M activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb commit 977d36a refs/heads/master Merge: c4c5801 f179895 Author: Andrew White Date: 2014-05-13 17:42:30 +0100 Merge pull request #15091 from printercu/patch-5 Do not check defined?(CGI) on every call #to_query commit c4c5801 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-13 12:09:11 -0300 Fix assertion order and :scissors: extra spaces M actionview/lib/action_view/helpers/translation_helper.rb M actionview/test/template/translation_helper_test.rb commit f0f7c4f refs/heads/master Merge: 6470f37 6caf3ab Author: Aaron Patterson Date: 2014-05-13 08:04:24 -0700 Merge pull request #15068 from josepjaume/patch-1 Dup options hash to prevent modifications commit 6470f37 refs/heads/master Author: Yves Senn Date: 2014-05-13 16:33:22 +0200 pg, clarify default behavior for composite types. * by default composite types are mapped as `OID::Identity` and issue a warning * the user is advised to register his own `OID::Type` to make use of composite types Registering a new `OID::Type` does currently not allow to specify the type casting behavior when writing to the database. In order for it to work we need to use the values within `@attributes`. They are already being type casted and are ready to be written to the DB. See https://github.com/rails/rails/blob/57643c961feb24b662620d330e71103a830003e8/activerecord/lib/active_record/attribute_methods.rb#L460-L462 M activerecord/test/cases/adapters/postgresql/composite_test.rb commit 15285f2 refs/heads/master Author: Yves Senn Date: 2014-05-13 15:07:51 +0200 extract pg type map initialization process to `TypeMapInitializer`. M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 8f6e598 refs/heads/master Author: Kassio Borges Date: 2014-05-13 11:25:21 -0300 Fix how to compute class name on habtm namespaced. Thank's for @laurocaetano for the help with tests. :smiley: Fixes #14709 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb A activerecord/test/models/publisher.rb A activerecord/test/models/publisher/article.rb A activerecord/test/models/publisher/magazine.rb M activerecord/test/schema/schema.rb commit bde50be refs/remotes/origin/4-1-stable Merge: 3023363 b199a00 Author: Rafael Mendonça França Date: 2014-05-13 10:28:48 -0300 Merge pull request #15090 from arthurnn/fix_assert_redirected_to_41 Fix regression on `assert_redirected_to`, 4-1-stable commit f179895 refs/heads/master Author: printercu Date: 2014-05-13 17:27:43 +0400 Do not check defined?(CGI) on every call #to_query M activesupport/lib/active_support/core_ext/object/to_query.rb commit b199a00 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-13 00:03:38 -0400 Fix regression on `assert_redirected_to`. `assert_redirected_to` would fail if there is no controller set on a `ActionDispatch::IntegrationTest`, as _compute_redirect_to_location would be called on the controller to build the url. This regression was introduced after 1dacfbabf3bb1e0a9057dd2a016b1804e7fa38c0. [fixes #14691] M actionpack/lib/action_dispatch/testing/assertions/response.rb M actionpack/test/controller/integration_test.rb commit c6c1642 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-13 09:49:00 -0300 Get rid of unused method It's usage has been removed in 325c9d5e5235db4b5210d9db6c863835d1ac7eed. M actionpack/lib/action_dispatch/routing/route_set.rb commit 6caf3ab refs/heads/master Author: Josep Jaume Rey Date: 2014-05-12 17:20:51 +0200 Dup options hash to prevent modifications `options[:default]` and `options[:raise]` can be mistakenly added to the `options` hash. This can be a problem if you're reusing the same object. M actionview/lib/action_view/helpers/translation_helper.rb M actionview/test/template/translation_helper_test.rb commit e2ae787 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-13 08:18:07 -0300 Simplify merge call on polymorphic helpers M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 0b2eee4 refs/heads/master Author: Yves Senn Date: 2014-05-13 11:35:02 +0200 test, move all pg array tests into `postgresql/array_test.rb`. M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit b95ac8a refs/heads/master Merge: fd6d6dc 7ec6653 Author: Andrew White Date: 2014-05-13 10:52:40 +0100 Merge pull request #15084 from arthurnn/fix_assert_redirected_to Fix regression on `assert_redirected_to`. commit fd6d6dc refs/heads/master Merge: 9392d16 32ef7d3 Author: Yves Senn Date: 2014-05-13 10:43:50 +0200 Merge pull request #15083 from zuhao/refactor_actionmailer_i18n_with_controller_test Use with_translation helper to clean up I18n stored translations. commit 32ef7d3 refs/heads/master Author: Zuhao Wan Date: 2014-05-13 11:43:26 +0800 Use with_translation helper to clean up I18n stored translations. M actionmailer/test/i18n_with_controller_test.rb commit 9392d16 refs/heads/master Merge: b6d627b 5330b89 Author: Yves Senn Date: 2014-05-13 10:32:37 +0200 Merge pull request #15082 from zuhao/refactor_actionmailer_delivery_methods_test Clean up deliveries after each test. commit 5330b89 refs/heads/master Author: Zuhao Wan Date: 2014-05-13 11:01:11 +0800 Move state restoration from setup/teardown into affected test cases. M actionmailer/test/delivery_methods_test.rb commit b6d627b refs/heads/master Merge: ef8ac1f 4d9e4ea Author: Yves Senn Date: 2014-05-13 09:39:13 +0200 Merge pull request #15086 from zuhao/refactor_actionmailer_mail_layout_test Do not clear deliveries in setup. commit 3023363 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-13 09:04:46 +0200 docs, explain usage of `count` + `select`. Closes #15065. [ci skip] M activerecord/lib/active_record/relation/calculations.rb commit ef8ac1f refs/heads/master Author: Yves Senn Date: 2014-05-13 09:04:46 +0200 docs, explain usage of `count` + `select`. Closes #15065. [ci skip] M activerecord/lib/active_record/relation/calculations.rb commit 4d9e4ea refs/heads/master Author: Zuhao Wan Date: 2014-05-13 13:17:27 +0800 Remove unnecessary setup and teardown. M actionmailer/test/mail_layout_test.rb commit 741abc9 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-12 08:47:25 +0200 Merge pull request #14999 from yahonda/modify_bind_variable_name Modify assert conditions not to be affected by each database bind variable naming conventions Closes #14999. Conflicts: activerecord/test/cases/relation/merging_test.rb M activerecord/test/cases/relation/merging_test.rb commit 55b1f21 refs/heads/master Merge: 84908bb 275d20c Author: Yves Senn Date: 2014-05-13 08:21:13 +0200 Merge pull request #15085 from zuhao/refactor_actionmailer_log_subscriber_test A minor stylistic fix and cleanup of mail deliveries. commit 275d20c refs/heads/master Author: Zuhao Wan Date: 2014-05-13 13:01:14 +0800 A minor stylistic fix and cleanup of mail deliveries. M actionmailer/test/log_subscriber_test.rb commit 7ec6653 refs/heads/master Author: Arthur Neves Date: 2014-05-13 00:03:38 -0400 Fix regression on `assert_redirected_to`. `assert_redirected_to` would fail if there is no controller set on a `ActionDispatch::IntegrationTest`, as _compute_redirect_to_location would be called on the controller to build the url. This regression was introduced after 1dacfbabf3bb1e0a9057dd2a016b1804e7fa38c0. [fixes #14691] M actionpack/lib/action_dispatch/testing/assertions/response.rb M actionpack/test/controller/integration_test.rb commit 84908bb refs/heads/master Author: Aaron Patterson Date: 2014-05-12 18:08:41 -0700 fix bad merge M actionview/test/activerecord/polymorphic_routes_test.rb commit 325c9d5 refs/heads/master Author: Aaron Patterson Date: 2014-05-12 17:33:00 -0700 avoid array allocation when extracting usernames and passwords M actionpack/lib/action_dispatch/routing/route_set.rb commit 890a189 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-12 21:25:54 -0300 Ok. Enough models for today :rage: M railties/test/railties/engine_test.rb commit 290b279 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-12 21:16:22 -0300 Test with ruby-head to make @tenderlove happy M .travis.yml commit 392e627 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-12 21:03:58 -0300 This is also a model M railties/test/application/configuration_test.rb commit be6ff39 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-12 20:54:06 -0300 This model is a model so it should behaves like one M railties/test/railties/mounted_engine_test.rb commit c24c9de refs/heads/master Merge: 3ccd24a dce2385 Author: Rafael Mendonça França Date: 2014-05-12 20:34:10 -0300 Merge pull request #15080 from eileencodes/flip-unless-else-conditional-in-halting-method flip conditional to use if/else instead of unless/else commit dce2385 refs/heads/master Author: eileencodes Date: 2014-05-12 19:23:04 -0400 flip conditional to use if/else instead of unless/else Use if/else instead of unless/else so conditional reads better. M activesupport/lib/active_support/callbacks.rb commit 3ccd24a refs/heads/master Author: Aaron Patterson Date: 2014-05-12 16:20:52 -0700 Revert "reduce conditionals in url_for" This reverts commit 9df60693d77813b362fb528fc62381ac8f1eec12. M actionpack/lib/action_dispatch/routing/route_set.rb commit 5478815 refs/heads/master Author: Aaron Patterson Date: 2014-05-12 16:16:06 -0700 :cry::gun: use an empty hash for magical speed. For some reason, if the hash is empty, we choose "optimized" routes. I am not sure how or why optimized routes differ from regular routes. But, if we make sure the hash is empty, we get a nice speed improvement. M actionview/lib/action_view/helpers/form_helper.rb commit 3d9bd2a refs/heads/master Author: Aaron Patterson Date: 2014-05-12 10:26:20 -0700 this class is a model, so it should act like one M actionpack/test/dispatch/prefix_generation_test.rb commit cfdda38 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 18:42:30 -0700 use the helper method builder to construct helper methods M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionpack/lib/action_dispatch/routing/url_for.rb M actionview/lib/action_view/routing_url_for.rb commit 9656640 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 18:33:52 -0700 probably should not check in a raise M actionview/lib/action_view/routing_url_for.rb commit 74a6ad2 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 11:49:02 -0700 undo optimized calls until the builder object is finished M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionpack/lib/action_dispatch/routing/url_for.rb M actionview/lib/action_view/routing_url_for.rb commit 56ff626 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 11:24:12 -0700 remove suffix from the handler methods M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit cc1ff82 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 11:21:44 -0700 push list handling to the builder object M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 3095f5b refs/heads/master Author: Aaron Patterson Date: 2014-05-08 11:20:33 -0700 push string handling to the builder object M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit e14ec12 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 11:17:02 -0700 push model and class handling to a helper builder object M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 6634e9c refs/heads/master Author: Aaron Patterson Date: 2014-05-08 10:43:54 -0700 adding a method to handle strings using the same api M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 89e0718 refs/heads/master Author: Aaron Patterson Date: 2014-05-07 19:49:25 -0700 fix url_for with classes M actionview/lib/action_view/routing_url_for.rb commit 4b8ab79 refs/heads/master Author: Aaron Patterson Date: 2014-05-07 17:19:27 -0700 break each polymorphic type to it's own method M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/lib/action_view/routing_url_for.rb commit e821045 refs/heads/master Author: Aaron Patterson Date: 2014-05-07 16:48:11 -0700 remove dead code M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 34b2ded refs/heads/master Author: Aaron Patterson Date: 2014-05-06 16:08:51 -0700 only test `persisted?` on the record once also avoid the case of calling `persisted?` on something that doesn't respond to it M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit a572a0e refs/heads/master Author: Aaron Patterson Date: 2014-05-06 16:01:26 -0700 only send options if there are any options M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit b451648 refs/heads/master Author: Aaron Patterson Date: 2014-05-06 15:59:28 -0700 add a test for the parameters sent to the url helper for new records M actionview/test/activerecord/polymorphic_routes_test.rb commit d94cd86 refs/heads/master Author: Aaron Patterson Date: 2014-05-06 15:45:40 -0700 remove should_pop variable M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit ad31afe refs/heads/master Author: Aaron Patterson Date: 2014-05-06 15:45:21 -0700 only pop records when we get an array M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit a20cd88 refs/heads/master Author: Coraline Ada Ehmke + Aaron Patterson Date: 2014-05-05 17:28:43 -0700 remove unnecessary array allocations M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit b89dcde refs/heads/master Author: Coraline Ada Ehmke + Aaron Patterson Date: 2014-05-05 17:23:10 -0700 simplified route method name generation M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/test/template/test_test.rb commit 7b9964c refs/heads/master Author: Coraline Ada Ehmke + Aaron Patterson Date: 2014-05-05 16:51:58 -0700 small refactoring M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 1606fc9 refs/heads/master Author: Coraline Ada Ehmke + Aaron Patterson Date: 2014-05-05 16:51:01 -0700 pulling helpermethods up before refactoring M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit e73740f refs/heads/master Author: Aaron Patterson Date: 2014-05-02 18:44:50 -0700 push all is_a tests up, always pass options to the named route M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 8d572ad refs/heads/master Author: Aaron Patterson Date: 2014-05-02 12:02:56 -0700 pull nil checks up M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 6eeb76f refs/heads/master Author: Aaron Patterson Date: 2014-05-01 16:17:45 -0700 skip another Array is_a check M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit f2fa291 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 16:12:34 -0700 only do the Array is_a check once M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit de1b9f8 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 16:09:29 -0700 we always convert this variable to a list, so we can remove the unconversion M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit b5d2548 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 16:04:18 -0700 record as a hash is not possible, so rm branch M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 42d6700 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 14:36:46 -0700 stop popping in build_named_route_call M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit a3b8926 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 13:56:55 -0700 remove extract_record since we have extracted the list M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit e937df3 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 13:50:17 -0700 always pass a list to build_named_route_call M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 45c8a97 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 11:42:41 -0700 add a test with three objects M actionview/test/activerecord/polymorphic_routes_test.rb commit 38dcb27 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 11:31:59 -0700 add a test for passing two models to the polymorphic_url method M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/test/activerecord/polymorphic_routes_test.rb commit c29474e refs/heads/master Author: Godfrey Chan Date: 2014-05-12 15:37:26 -0700 typo: resulution -> resolution [ci skip] M guides/source/active_record_postgresql.md commit b8ad4b5 refs/heads/master Author: Nick Sutterer Date: 2014-05-10 16:52:44 +1000 deprecate AbC:Base::parent_prefixes. rename ::_local_prefixes to ::local_prefixes to state the public attribute. document the latter. make ::local_prefixes private, test overriding it and remove documentation for overriding ::_parent_prefixes. M actionview/CHANGELOG.md M actionview/lib/action_view/view_paths.rb M actionview/test/actionpack/abstract/abstract_controller_test.rb commit 9df6069 refs/heads/master Author: Aaron Patterson Date: 2014-05-12 11:58:12 -0700 reduce conditionals in url_for M actionpack/lib/action_dispatch/routing/route_set.rb commit 67ec435 refs/heads/master Author: Nick Sutterer Date: 2014-05-08 21:26:20 +1000 simplify AC:ViewPaths::_prefixes. by making it recursively traversing up the inheritance chain, classes can override local prefixes. M actionview/lib/action_view/view_paths.rb commit 2d73a73 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 11:18:20 -0700 extract route key translation to a method and reuse it M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit ffa53ff refs/heads/master Author: Aaron Patterson Date: 2014-05-12 09:47:46 -0700 make the module version quack the same as the instance this way we can stop checking respond_to on every call. M actionpack/lib/action_dispatch/routing/route_set.rb commit eacb426 refs/heads/master Author: Aaron Patterson Date: 2014-05-12 11:38:23 -0700 Hash#except is expensive and this is a hotspot, so use a dup + delete M actionpack/lib/action_dispatch/routing/route_set.rb commit 70710c9 refs/heads/master Author: wendi Date: 2014-05-13 02:11:49 +0800 Update require in `array_ext_test.rb` Removed `FIMXE` tag to require necessary file but not the whole core_ext M activesupport/test/core_ext/array_ext_test.rb commit 9eadf52 refs/heads/master Author: wendi Date: 2014-05-13 00:39:48 +0800 Update and add tests in array_ext_test.rb - Fix `test_to_with_instruct` typo to `test_to_xml_with_instruct` - Rename `test_to_xml` to `test_to_xml_with_hash_elements` to make test name more specific. - Add `test_to_xml_with_non_hash_elements` and `test_to_xml_with_non_hash_different_type_elements` `to_xml` behaves different when containing elements are same and different types. - Add `test_to_xml_with_indent_set` M activesupport/test/core_ext/array_ext_test.rb commit 3703a8a refs/heads/master Author: Mark J. Titorenko Date: 2014-05-12 17:23:28 +0100 Require active_support/core_ext/string/output_safety and use html_safe rather than use non-public SafeBuffer API. M activesupport/test/number_helper_test.rb commit 9c8242e refs/heads/master Author: Mark J. Titorenko Date: 2014-05-12 17:13:19 +0100 Use block parameter rather than `$1` during `gsub!` so `ActiveSupport::SafeBuffer` values aren't mangled. Fixes #15064 M activesupport/CHANGELOG.md M activesupport/lib/active_support/number_helper/number_to_delimited_converter.rb M activesupport/test/number_helper_test.rb commit 7a84f0b refs/heads/master Author: ayaya Date: 2014-05-12 23:44:26 +0800 Add multiple lines message support for SSE module M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit a214bb7 refs/heads/master Author: Yves Senn Date: 2014-05-12 17:52:40 +0200 test, use `columns_hash[]` in place of `columns.find {}`. M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bytea_test.rb M activerecord/test/cases/adapters/postgresql/citext_test.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/test/cases/adapters/postgresql/xml_test.rb commit 50bfc51 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-05-12 17:28:45 +0200 pg, `change_column_default` accepts `[]`. Closes #11586. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit df36a3b refs/heads/master Author: Zachary Scott Date: 2014-05-12 08:37:37 -0700 :scissors: M activerecord/README.rdoc commit b489dbf refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-12 17:28:45 +0200 pg, `change_column_default` accepts `[]`. Closes #11586. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 096be96 refs/heads/master Author: Yves Senn Date: 2014-05-12 17:28:45 +0200 pg, `change_column_default` accepts `[]`. Closes #11586. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 23fb530 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-12 15:48:52 +0200 Merge pull request #13334 from gregolsen/postgresql_infinity pg, fix Infinity and NaN values conversion. Closes #13334. * rebased * removed guard * inlined guard into case statement M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit dc7f47d refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-12 12:09:02 +0200 Merge pull request #10505 from patricksrobertson/bigserial_id_not_identifying_pk Handle other pk types in PostgreSQL gracefully. Closes #10505. - rebased - test slightly modified Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/primary_keys_test.rb commit 711af75 refs/heads/master Author: Yves Senn Date: 2014-05-12 16:39:24 +0200 pg, map `char` and `name` types as string. [dark-panda & Yves Senn] Closes #10802. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit 4320b77 refs/heads/master Merge: f25f533 aac40bc Author: Yves Senn Date: 2014-05-12 15:48:52 +0200 Merge pull request #13334 from gregolsen/postgresql_infinity pg, fix Infinity and NaN values conversion. Closes #13334. * rebased * removed guard * inlined guard into case statement commit aac40bc refs/heads/master Author: Innokenty Mihailov Date: 2013-12-18 23:12:53 +0200 pg, fix Infinity and NaN values conversion. Before this patch `Infinity`, `-Infinity` and `Nan` were read as `0`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit f25f533 refs/heads/master Merge: 5b73405 c0a1245 Author: Yves Senn Date: 2014-05-12 12:09:02 +0200 Merge pull request #10505 from patricksrobertson/bigserial_id_not_identifying_pk Handle other pk types in PostgreSQL gracefully. Closes #10505. - rebased - test slightly modified commit c0a1245 refs/heads/master Author: Patrick Robertson Date: 2013-05-07 14:07:50 -0400 Handle other pk types in PostgreSQL gracefully. In #10410 it was noted that you can no longer create PK's with the type of bigserial in PostgreSQL in 4.0.0.rc1. This is mostly because the newer adapter is checking for column type with the id column instead of just letting it pass through like it did before. Side effects: You may just create a PK column of a type that you really don't want to be your PK. As far as I can tell this was allowed in 3.2.X and perhaps an exception should be raised if you try and do something extremely dumb. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/primary_keys_test.rb commit 5b73405 refs/heads/master Merge: 8e95e54 317868d Author: Yves Senn Date: 2014-05-12 08:47:25 +0200 Merge pull request #14999 from yahonda/modify_bind_variable_name Modify assert conditions not to be affected by each database bind variable naming conventions Closes #14999. commit 317868d refs/heads/master Author: Yasuo Honda Date: 2014-05-07 04:12:02 +0900 Modify assert conditions not to be affected by each database bind variable naming conventions M activerecord/test/cases/relation/merging_test.rb commit 8e95e54 refs/heads/master Merge: 57643c9 77e25a7 Author: Rafael Mendonça França Date: 2014-05-12 01:40:18 -0300 Merge pull request #15060 from tgxworld/remove_unnecessary_tests_method Remove redundant tests method. commit 57643c9 refs/heads/master Author: Guillermo Iguaran Date: 2014-05-11 22:29:04 -0500 Update attribute_methods.rb Improve documentation M activerecord/lib/active_record/attribute_methods.rb commit df5c9aa refs/heads/master Merge: d4fafeb ff5e8f9 Author: Guillermo Iguaran Date: 2014-05-11 21:30:29 -0500 Merge pull request #15063 from cbeer/correct-attribute_present-docs correcting method documentation [ci skip] commit ff5e8f9 refs/heads/master Author: Chris Beer Date: 2014-05-11 19:26:21 -0700 correcting method documentation [ci skip] M activerecord/lib/active_record/attribute_methods.rb commit da290fa refs/heads/master Author: Guo Xiang Tan Date: 2014-05-11 15:41:23 -0700 Remove unnecessary include for integration tests. M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/abstract_unit.rb M actionview/test/abstract_unit.rb commit 77e25a7 refs/heads/master Author: Guo Xiang Tan Date: 2014-05-11 15:28:12 -0700 Remove redundant tests method. M actionpack/test/controller/send_file_test.rb commit d4fafeb refs/heads/master Merge: d1f7d76 05746fe Author: Carlos Antonio da Silva Date: 2014-05-11 19:26:56 -0300 Merge pull request #10662 from take/change-test-name-for-ActiveRecord--Validations#valid- Refactor AR's validations_test.rb commit d1f7d76 refs/heads/master Merge: 7dce1e6 bad291e Author: Robin Dupret Date: 2014-05-11 19:11:29 +0000 Merge pull request #15059 from marcioj/patch-1 Replace :base with :in [ci skip] commit bad291e refs/heads/master Author: Marcio Junior Date: 2014-05-11 15:42:35 -0300 Replace :base with :in [ci skip] M railties/lib/rails/generators/base.rb commit 7dce1e6 refs/heads/master Author: Andrew White Date: 2014-05-11 16:00:55 +0100 Tidy up implementation of #15010 M activesupport/lib/active_support/values/time_zone.rb M activesupport/test/time_zone_test.rb commit 0e909cd refs/heads/master Author: Ulysse Carion Date: 2014-05-07 09:12:25 -0700 Make TimeZone#parse behave more like Time#parse. Namely, if the mday is omitted but any other upper components are, then instead of supplying the mday from the current time, it defaults to 1. M activesupport/CHANGELOG.md M activesupport/lib/active_support/values/time_zone.rb M activesupport/test/time_zone_test.rb commit 65b9abf refs/heads/master Author: Yves Senn Date: 2014-05-11 14:53:50 +0200 docs, make `ActionNotFound` public API. [ci skip] This is a follow up to #15058. This exception is regularly raised during development. This means it will enter the user realm. We should provide an API page to show that this exception is public API. /cc @schneems M actionpack/lib/abstract_controller/base.rb commit e927ff3 refs/heads/master Merge: 225494d bc9b331 Author: Richard Schneeman Date: 2014-05-11 07:50:43 -0500 Merge pull request #15058 from Gaurav2728/gaurav-doc_message adding complete message in documentation [ci skip] commit bc9b331 refs/heads/master Author: Gaurav Sharma Date: 2014-05-11 18:11:23 +0530 adding complete message in documentation [ci skip] M actionpack/lib/abstract_controller/base.rb commit 225494d refs/heads/master Merge: 2378f69 df8a1b2 Author: Andrew White Date: 2014-05-11 13:08:55 +0100 Merge branch 'master' of github.com:rails/rails commit c63e64f refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-05-11 12:56:33 +0100 Always use the provided port for protocol relative urls There may be situations where you need to tunnel SSL connections over port 80 so we shouldn't remove it if it has been explicitly provided. (cherry picked from commit 2378f69e69f98460f426d2c4e0fbb967b4fa5ddf) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/url_generation_test.rb commit 11fc217 refs/remotes/origin/4-0-stable Author: Guilherme Cavalcanti Date: 2014-05-09 15:52:10 -0300 ActionDispatch::Http::URL.normalize_port should not strip port for protocol relative URL. (cherry picked from commit be93d94ef28421a2dbcd6ed870b454433a5a0a72) M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/controller/url_for_test.rb commit 12bbc5b refs/remotes/origin/4-1-stable Author: Andrew White Date: 2014-05-11 12:56:33 +0100 Always use the provided port for protocol relative urls There may be situations where you need to tunnel SSL connections over port 80 so we shouldn't remove it if it has been explicitly provided. (cherry picked from commit 2378f69e69f98460f426d2c4e0fbb967b4fa5ddf) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/url_generation_test.rb commit fb20253 refs/remotes/origin/4-1-stable Author: Guilherme Cavalcanti Date: 2014-05-09 15:52:10 -0300 ActionDispatch::Http::URL.normalize_port should not strip port for protocol relative URL. (cherry picked from commit be93d94ef28421a2dbcd6ed870b454433a5a0a72) M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/controller/url_for_test.rb commit 2378f69 refs/heads/master Author: Andrew White Date: 2014-05-11 12:56:33 +0100 Always use the provided port for protocol relative urls There may be situations where you need to tunnel SSL connections over port 80 so we shouldn't remove it if it has been explicitly provided. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/url_generation_test.rb commit be93d94 refs/heads/master Author: Guilherme Cavalcanti Date: 2014-05-09 15:52:10 -0300 ActionDispatch::Http::URL.normalize_port should not strip port for protocol relative URL. M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/controller/url_for_test.rb commit df8a1b2 refs/heads/master Author: Yves Senn Date: 2014-05-11 13:47:30 +0200 pg guide, PostgreSQL legacy table view example. [ci skip] M guides/source/active_record_postgresql.md commit adcba34 refs/heads/master Author: Yves Senn Date: 2014-05-10 23:42:43 +0200 docs, fix typo in docs added by ed56e596a04673. [ci skip] M activerecord/lib/active_record/associations.rb commit f85942b refs/heads/master Merge: e1cb956 08b435e Author: Rafael Mendonça França Date: 2014-05-10 18:03:10 -0300 Merge pull request #15056 from josemarluedke/single-quotes-on-plugin-gemfile Change Gemfile’s double quotation marks in plugin generator commit 08b435e refs/heads/master Author: Josemar Luedke Date: 2014-05-10 17:56:16 -0300 Change Gemfile’s double quotes in plugin generator Since the generated application’s Gemfile is using single quotation marks, it seems fair to use it on plugin’s Gemfile as well. M railties/lib/rails/generators/rails/plugin/templates/Gemfile M railties/test/generators/plugin_generator_test.rb commit e1cb956 refs/heads/master Merge: 35864db de0d4d7 Author: Rafael Mendonça França Date: 2014-05-10 17:00:53 -0300 Merge pull request #15054 from mechanicles/documentation-consistency Keep method's description/documentation consistent [ci skip] commit de0d4d7 refs/heads/master Author: Santosh Wadghule Date: 2014-05-11 01:14:39 +0530 Keep method's description/documentation consistent [ci skip] M activesupport/lib/active_support/backtrace_cleaner.rb commit c40df47 refs/tags/v3.2.19 Author: Aaron Patterson Date: 2014-05-10 11:52:13 -0700 feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053 M actionpack/lib/action_view/template/resolver.rb commit 68d2128 refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-05-10 11:52:13 -0700 feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053 M actionpack/lib/action_view/template/resolver.rb commit 16ce285 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-10 11:52:13 -0700 feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053 M actionview/lib/action_view/template/resolver.rb commit 35864db refs/heads/master Author: Aaron Patterson Date: 2014-05-10 11:52:13 -0700 feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053 M actionview/lib/action_view/template/resolver.rb commit 7b9e0f5 refs/heads/master Author: Vijay Dev Date: 2014-05-10 14:13:32 +0000 minor change in AR readme [ci skip] M activerecord/README.rdoc commit 9d5bc3c refs/heads/master Merge: ed56e59 ffb9db0 Author: Vijay Dev Date: 2014-05-10 13:57:18 +0000 Merge branch 'master' of github.com:rails/docrails commit ffb9db0 refs/heads/master Author: Vijay Dev Date: 2014-05-10 13:44:43 +0000 copy edits [ci skip] M actionpack/lib/action_dispatch/http/headers.rb M activerecord/lib/active_record/attribute_assignment.rb commit ed56e59 refs/heads/master Author: Yves Senn Date: 2014-05-10 13:46:37 +0200 deprecate, join, preload, eager load of instance dependent associations. Closes #15024. These operations happen before instances are created. The current behavior is misleading and can result in broken behavior. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/associations/preloader.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/associations/eager_test.rb commit 92fbbf6 refs/heads/master Author: Daniel Schierbeck Date: 2014-02-21 10:28:51 +0000 Add controller and action name to the instrumentation payload M actionpack/CHANGELOG.md M actionpack/lib/action_controller/caching/fragments.rb M actionpack/test/controller/caching_test.rb commit f55f5e2 refs/heads/master Merge: dbb0bd8 b769b5f Author: Rafael Mendonça França Date: 2014-05-09 23:24:58 -0300 Merge pull request #15049 from arthurnn/fix_ci Fix broken proc syntax for 1.9.3 commit b769b5f refs/heads/master Author: Arthur Neves Date: 2014-05-09 21:44:03 -0400 Fix broken proc syntax for 1.9.3 M activerecord/test/models/author.rb commit dbb0bd8 refs/heads/master Author: Aaron Patterson Date: 2014-05-09 17:31:13 -0700 skip dealing with params if none are provided This lets us avoid 1. A slow call to Hash#slice 2. An is_a? test 3. Extra hash allocations (from slice) 4. String allocations etc. M actionpack/lib/action_dispatch/http/url.rb commit 73a7b52 refs/heads/master Author: Aaron Patterson Date: 2014-05-09 17:12:08 -0700 don't mutate the options hash, so we don't have to dup avoids extra hash allocations on each call M actionpack/lib/action_dispatch/http/url.rb commit c247370 refs/heads/master Author: schneems Date: 2014-05-09 17:37:11 -0500 [ci skip] add example to AR#assign_attributes M activerecord/lib/active_record/attribute_assignment.rb commit 03e016f refs/tags/v3.2.19 Author: Aaron Patterson Date: 2014-05-09 14:45:43 -0700 use fnmatch to test for case insensitive file systems this is due to: https://bugs.ruby-lang.org/issues/5994 M actionpack/lib/action_view/template/resolver.rb commit 6901012 refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-05-09 14:45:43 -0700 use fnmatch to test for case insensitive file systems this is due to: https://bugs.ruby-lang.org/issues/5994 M actionpack/lib/action_view/template/resolver.rb commit d49f2b7 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-09 14:45:43 -0700 use fnmatch to test for case insensitive file systems this is due to: https://bugs.ruby-lang.org/issues/5994 M actionview/lib/action_view/template/resolver.rb commit 727ae97 refs/heads/master Author: Aaron Patterson Date: 2014-05-09 14:45:43 -0700 use fnmatch to test for case insensitive file systems this is due to: https://bugs.ruby-lang.org/issues/5994 M actionview/lib/action_view/template/resolver.rb commit 20d5ebf refs/heads/master Author: Aaron Patterson Date: 2014-05-09 14:02:53 -0700 use unless and || since these options are boolean M actionpack/lib/action_dispatch/http/url.rb commit 074c8ef refs/heads/master Merge: f451169 21b0c2e Author: Godfrey Chan Date: 2014-05-09 13:49:20 -0700 Merge pull request #15045 from xanhast/patch-1 Documentation, add examples of using an Enum scope [ci skip] commit 21b0c2e refs/heads/master Author: Zac Date: 2014-05-09 21:46:22 +0100 Documentation, add examples of using an Enum scope When scanning the Enum API page I found it easy to miss that scopes are generated. Adding an example clarifies use and has more... *pop*... M activerecord/lib/active_record/enum.rb commit f451169 refs/heads/master Author: Yves Senn Date: 2014-05-08 17:39:02 +0200 test, regression test for has_many with instance dependent scope. M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/author.rb commit 7ab8faf refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-09 17:07:04 -0300 Merge pull request #15044 from zzak/travis_ruby_too_won Only need MINOR version level to test Ruby 2.1.x on Travis Conflicts: .travis.yml M .travis.yml commit 5c09373 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-09 17:07:04 -0300 Merge pull request #15044 from zzak/travis_ruby_too_won Only need MINOR version level to test Ruby 2.1.x on Travis Conflicts: .travis.yml M .travis.yml commit 28232ce refs/heads/master Merge: 05ab902 f2768b5 Author: Rafael Mendonça França Date: 2014-05-09 17:07:04 -0300 Merge pull request #15044 from zzak/travis_ruby_too_won Only need MINOR version level to test Ruby 2.1.x on Travis commit f2768b5 refs/heads/master Author: Zachary Scott Date: 2014-05-09 13:04:50 -0700 Only need MINOR version level to test Ruby 2.1.x on Travis cc http://blog.travis-ci.com/2014-04-28-upcoming-build-environment-updates/ M .travis.yml commit 06f210f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-09 17:01:51 -0300 Merge pull request #15042 from arthurnn/revert_dirty_transactions Reverts dirty track restore on transactions rollback Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit d228286 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-09 17:01:51 -0300 Merge pull request #15042 from arthurnn/revert_dirty_transactions Reverts dirty track restore on transactions rollback Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit 05ab902 refs/heads/master Merge: 314cbea 198d9e3 Author: Rafael Mendonça França Date: 2014-05-09 17:01:51 -0300 Merge pull request #15042 from arthurnn/revert_dirty_transactions Reverts dirty track restore on transactions rollback commit 314cbea refs/heads/master Author: Aaron Patterson Date: 2014-05-09 12:05:24 -0700 just call the method and assert the return value do not test internals M actionpack/test/controller/routing_test.rb commit 198d9e3 refs/heads/master Author: Arthur Neves Date: 2014-05-08 14:46:12 -0400 Reverts "Fix bugs with changed attributes tracking when transaction gets rollback" We are reverting these commits, because there are other caveats related to dirty attributes not being restored when a transaction is rollback. For instance, nested transactions cannot proper restore the dirty attributes state after a rollback. At the moment, the dirty attributes are scoped by the transaction. When we call `.save` on a record, the dirty attributes will be reset even if the transaction gets rollback. [related #13166] [related #15018] [related #15016] [closes #15019] This reverts commits * bab48f0a3d53a08bc23ea0887219e8deb963c3d9 * b0fa7cf3ff8432cc2eef3682b34763b7f8c93cc8. * 73fb39b6faa9de593ae75ad4e3b8e065ea0e53af * 37c238927fbed059de3f26a90d8923fb377568a5. * 8d8d4f1560264cd1c74364d67fa0501f6dd2c4fa Revert "Merge pull request #13166 from bogdan/transaction-magic" M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit 7063e25 refs/heads/master Author: schneems Date: 2014-05-09 11:50:35 -0500 [ci skip] doc ActiveSupport::TimeWithZone#to_s Current docs are wrong. Does not accept strftime inputs. M activesupport/lib/active_support/time_with_zone.rb commit aabbf07 refs/heads/master Author: schneems Date: 2014-05-09 11:29:29 -0500 [ci skip] doc Http::Headers methods M actionpack/lib/action_dispatch/http/headers.rb commit 0a7beb1 refs/heads/master Merge: ea58684 e019ffa Author: Guillermo Iguaran Date: 2014-05-09 11:22:14 -0500 Merge pull request #15041 from arthurnn/update_ruby Use ruby 2.1.2 on travis commit e019ffa refs/heads/master Author: Arthur Neves Date: 2014-05-09 12:07:16 -0400 Use ruby 2.1.2 on travis M .travis.yml commit b50468d refs/heads/master Author: Dennis Schoen Date: 2014-05-09 11:16:18 +0200 Fixed duplicate subscribers in ActiveSupport::Subscriber ActiveSupport::Subscriber no longer creates multiple subscribers when you redefine a method. M activesupport/CHANGELOG.md M activesupport/lib/active_support/subscriber.rb M activesupport/test/subscriber_test.rb commit f9bf2a9 refs/remotes/origin/3-0-test-i18n (origin/3-0-test-i18n) Author: Carlos Antonio da Silva Date: 2014-05-08 19:42:52 -0300 [WIP] Test I18n 0.5 branch with fixes M Gemfile commit ea58684 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 15:56:15 -0700 add tests for path based url_for calls M actionview/test/activerecord/polymorphic_routes_test.rb commit 2a10028 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 15:07:33 -0700 don't manipulate the testclass, just add helpers to the instance M actionview/test/activerecord/polymorphic_routes_test.rb commit 66274d6 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 14:28:09 -0700 add a test for classes with options M actionview/test/activerecord/polymorphic_routes_test.rb commit 5dd6e1b refs/heads/master Author: Aaron Patterson Date: 2014-05-08 13:42:00 -0700 add tests for the polymorphic_path method M actionview/test/activerecord/polymorphic_routes_test.rb commit 45bdbe0 refs/heads/master Merge: a35f07e 6874f01 Author: Rafael Mendonça França Date: 2014-05-08 16:46:35 -0300 Merge pull request #15030 from mechanicles/a-to-an Change 'a' to 'an' [ci skip] commit 6874f01 refs/heads/master Author: Santosh Wadghule Date: 2014-05-09 01:07:04 +0530 Change 'a' to 'an' [ci skip] M activesupport/lib/active_support/core_ext/hash/conversions.rb commit a35f07e refs/heads/master Merge: de6cda5 a001577 Author: Rafael Mendonça França Date: 2014-05-08 16:25:25 -0300 Merge pull request #15029 from JuanitoFatas/docpatch/routing [ci skip] Minor improvements on routing.md. commit a001577 refs/heads/master Author: Juanito Fatas Date: 2014-05-09 03:03:50 +0800 [ci skip] Minor improvements on routing.md. M guides/source/routing.md commit db9a5c5 refs/heads/master Author: Hubert Łępicki Date: 2014-05-08 13:35:31 +0200 Improve documentation for asset_url Updated CHANGELOG.md with entry about :host in asset_url M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/asset_url_helper.rb M guides/source/asset_pipeline.md commit a923375 refs/heads/master Author: Vijay Dev Date: 2014-05-09 00:04:12 +0530 fix formatting errors [ci skip] M activerecord/README.rdoc commit cb6622f refs/heads/master Author: Vijay Dev Date: 2014-05-08 18:24:38 +0000 copy edits [ci skip] M actionpack/lib/action_dispatch/http/headers.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb commit de6cda5 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 10:33:57 -0700 add more tests around the polymorphic url api M actionview/test/activerecord/polymorphic_routes_test.rb commit 7a599b5 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-05-08 09:51:48 -0700 set a constant for the "anonymous" habtm model fixes #15022 I wanted the middle model to be anonymous, but we have to give it a name for marshal support. :'( M activerecord/lib/active_record/associations.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 6ffce17 refs/heads/master Author: Aaron Patterson Date: 2014-05-08 09:51:48 -0700 set a constant for the "anonymous" habtm model fixes #15022 I wanted the middle model to be anonymous, but we have to give it a name for marshal support. :'( M activerecord/lib/active_record/associations.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 83e0544 refs/heads/master Author: Yves Senn Date: 2014-05-08 13:03:05 +0200 test, regression test for unparsable PostgreSQL defaults. This test was inspired by #14866. That PR would break this functionality and we should make sure we notice that in the future. M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit afb44f4 refs/remotes/origin/4-1-stable Author: Carlos Antonio da Silva Date: 2014-05-08 07:55:12 -0300 Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fix Habtm relation size calculation fix. Fixes #14913, Fixes #14914. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/developer.rb commit bb13648 refs/remotes/origin/4-0-stable Merge: 3d057a0 9d4e2ab Author: Carlos Antonio da Silva Date: 2014-05-08 07:56:35 -0300 Merge pull request #14995 from fredwu/habtm_relation_size_calculation_fix-4-0-stable Habtm relation size calculation fix for 4.0 branch commit 33fcdff refs/heads/master Merge: 7f1fd02 f045663 Author: Carlos Antonio da Silva Date: 2014-05-08 07:55:12 -0300 Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fix Habtm relation size calculation fix. Fixes #14913, Fixes #14914. commit 7f1fd02 refs/heads/master Author: Yves Senn Date: 2014-05-08 12:39:16 +0200 test, reset changed state in PG's uuid tests. This resulted in some unrelated errors on Traivs: 1) Error: PostgresqlUUIDTest#test_treat_blank_uuid_as_nil: ActiveRecord::StatementInvalid: PG::UndefinedColumn: ERROR: column "thingy" of relation "uuid_data_type" does not exist LINE 1: INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNIN... ^ : INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNING "id" /cc @zuhao M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit 71e8adc refs/heads/master Author: Yves Senn Date: 2014-05-08 11:27:35 +0200 pg guide, inet code example. [ci skip] M guides/source/active_record_postgresql.md commit 5371106 refs/heads/master Author: Hubert Łępicki Date: 2014-05-08 08:05:45 +0200 Allow custom asset host to be passed in asset_url M actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit f045663 refs/heads/master Author: Fred Wu Date: 2014-05-08 15:57:49 +1000 Fixed HABTM's CollectionAssociation size HABTM should fall back to using the normal CollectionAssociation's size calculation if the collection is not cached or loaded. This addresses both #14913 and #14914 for master. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/developer.rb commit 9d4e2ab refs/remotes/origin/4-0-stable Author: Fred Wu Date: 2014-05-07 00:50:20 +1000 Fixed HABTM's CollectionAssociation size HABTM should not include new records as part of #count_records as new records are already counted. This addresses #14914. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit d2061a2 refs/heads/master Merge: bab48f0 04051df Author: Godfrey Chan Date: 2014-05-07 21:48:20 -0700 Merge pull request #15020 from ivantsepp/contributing_to_rails_guide_fix Mismatch branch name between text and code example [ci skip] commit 04051df refs/heads/master Author: Ivan Tse Date: 2014-05-08 00:29:45 -0400 Branch name should match in text and code example. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 3d057a0 refs/remotes/origin/4-0-stable Author: Arthur Neves Date: 2014-05-07 19:11:37 -0400 Dup the changed_attributes otherwise we could lose them M activerecord/lib/active_record/transactions.rb commit 007b1e6 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-05-07 19:11:37 -0400 Dup the changed_attributes otherwise we could lose them M activerecord/lib/active_record/transactions.rb commit bab48f0 refs/heads/master Merge: 5ff7c59 b0fa7cf Author: Godfrey Chan Date: 2014-05-07 18:08:06 -0700 Merge pull request #15016 from arthurnn/dup_attr_on_save_state Dup the changed_attributes otherwise we could lose them commit b0fa7cf refs/heads/master Author: Arthur Neves Date: 2014-05-07 19:11:37 -0400 Dup the changed_attributes otherwise we could lose them M activerecord/lib/active_record/transactions.rb commit 19c2f39 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-07 19:25:56 -0300 Merge pull request #15015 from pothibo/database-configuration Use Rails::Paths::Path#existent in database_configuration Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb M railties/test/application/configuration_test.rb commit 5ff7c59 refs/heads/master Merge: f274fbd d14fab0 Author: Rafael Mendonça França Date: 2014-05-07 19:25:56 -0300 Merge pull request #15015 from pothibo/database-configuration Use Rails::Paths::Path#existent in database_configuration commit d14fab0 refs/heads/master Author: Pier-Olivier Thibault Date: 2014-05-07 16:03:23 -0400 Use Rails::Paths::Path#existent in database_configuration Database configuration was trying to load the first path that config.paths['config/database'] was returning even if the path didn't exist in the filesystem. Because Rails::Paths::Path has the possibility to return more than 1 path (as an array), database_configuration should filter down the paths to the existing one and then load the first one. This would make it possible to move the database.yml file and add the new path to paths['config/database'] and still load the configurations. M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb M railties/test/application/configuration_test.rb commit f274fbd refs/heads/master Author: Rafael Mendonça França Date: 2014-05-07 18:36:06 -0300 Add CHANGELOG entry for #14989 Closes #14989 M activerecord/CHANGELOG.md commit d1fa1fc refs/heads/master Author: Paul B Date: 2014-05-06 15:20:29 +0200 Return a non zero code when db has never been setup on status M activerecord/lib/active_record/railties/databases.rake M railties/test/application/rake/migrations_test.rb commit 1e86e60 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-07 17:59:19 -0300 Merge pull request #12746 from coreyward/master Fix Hash#deep_merge bug and improve documentation — resolves #12738 Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/test/core_ext/hash_ext_test.rb M activesupport/lib/active_support/core_ext/hash/deep_merge.rb M activesupport/test/core_ext/hash_ext_test.rb commit f100f29 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-07 17:59:19 -0300 Merge pull request #12746 from coreyward/master Fix Hash#deep_merge bug and improve documentation — resolves #12738 M activesupport/lib/active_support/core_ext/hash/deep_merge.rb M activesupport/test/core_ext/hash_ext_test.rb commit 6b2f377 refs/heads/master Merge: 73fb39b 0438134 Author: Rafael Mendonça França Date: 2014-05-07 17:59:19 -0300 Merge pull request #12746 from coreyward/master Fix Hash#deep_merge bug and improve documentation — resolves #12738 commit 8de5d76 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-07 17:39:46 -0300 Merge branch 'rm-trasaction-fix-13166' Conflicts: activerecord/CHANGELOG.md Backport of #13166 M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit e8f5a34 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-07 17:39:46 -0300 Merge branch 'rm-trasaction-fix-13166' Conflicts: activerecord/CHANGELOG.md Backport of #13166 M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit 73fb39b refs/heads/master Merge: 37c1e47 37c2389 Author: Rafael Mendonça França Date: 2014-05-07 17:39:46 -0300 Merge branch 'rm-trasaction-fix-13166' commit 37c2389 refs/heads/master Author: Arthur Neves Date: 2014-05-07 16:02:22 -0400 Keep track of dirty attrs after after rollback. [related #13166] M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit 8d8d4f1 refs/heads/master Merge: 37c1e47 998ba0e Author: Rafael Mendonça França Date: 2014-05-07 17:33:48 -0300 Merge pull request #13166 from bogdan/transaction-magic [Regression 3.2 -> 4.0] Fix bugs with changed attributes tracking when transaction gets rollback commit 3b03c98 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-05-07 19:28:16 +0200 Merge pull request #15012 from schneems/schneems/headers-key HTTP::Headers#key? correctly converts M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit 4214063 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-05-07 19:28:16 +0200 Merge pull request #15012 from schneems/schneems/headers-key HTTP::Headers#key? correctly converts M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit 37c1e47 refs/heads/master Merge: 37d4415 ca97ec5 Author: Yves Senn Date: 2014-05-07 19:28:16 +0200 Merge pull request #15012 from schneems/schneems/headers-key HTTP::Headers#key? correctly converts commit 37d4415 refs/heads/master Author: Aaron Patterson Date: 2014-05-07 10:18:18 -0700 test for inconsistency between String and Symbol url_for handling M actionview/test/activerecord/polymorphic_routes_test.rb commit ca97ec5 refs/heads/master Author: schneems Date: 2014-05-07 12:01:34 -0500 HTTP::Headers#key? correctly converts Previously if you were looking for a given key, the header may incorrectly tell you that it did not exist even though it would return a valid value: ```ruby env = { "CONTENT_TYPE" => "text/plain" } headers = ActionDispatch::Http::Headers.new(env) headers["Content-Type"] # => "text/plain" headers.key?("Content-Type") # => false ``` This PR fixes that behavior by converting the key before checking for presence M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit bfcbd6f refs/heads/master Author: Aaron Patterson Date: 2014-05-07 09:55:57 -0700 add tests for symbols passed to polymorphic_url M actionview/test/activerecord/polymorphic_routes_test.rb commit bbfb40a refs/heads/master Author: schneems Date: 2014-05-07 11:50:12 -0500 [ci skip] document ActionDispatch::HTTP::Headers M actionpack/lib/action_dispatch/http/headers.rb commit 43fbdba refs/heads/master Author: schneems Date: 2014-05-07 11:09:33 -0500 [ci skip] document type_cast_for_write M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/column.rb commit 98baa82 refs/heads/master Author: Yves Senn Date: 2014-05-07 17:57:52 +0200 test, persist inherited class with different table name. Refs #14971. This case prevents against regressions. The change was suggested in a recent PR but the all our tests passed. M activerecord/test/cases/persistence_test.rb commit 4346102 refs/heads/master Merge: 350e3d7 b345fc2 Author: Arthur Neves Date: 2014-05-07 09:12:31 -0400 Merge pull request #15002 from vanderhoop/master typo fixes in active_record_basics.md [skip ci] commit b345fc2 refs/heads/master Author: vanderhoop Date: 2014-05-06 19:46:55 -0400 fixed typos in active_record basics [skip ci] M guides/source/active_record_basics.md commit 350e3d7 refs/heads/master Merge: 6dd0b72 1401637 Author: Yves Senn Date: 2014-05-07 14:52:57 +0200 Merge pull request #14964 from zuhao/refactor_actionmailer_tests WIP: Make ActionMailer tests order-independent. commit 1401637 refs/heads/master Author: Zuhao Wan Date: 2014-05-01 23:39:04 +0800 Fix state leaks in actionmailer/test/base_test.rb. M actionmailer/test/base_test.rb commit 6dd0b72 refs/heads/master Merge: c2c84ec b243705 Author: Yves Senn Date: 2014-05-07 13:13:49 +0200 Merge pull request #15007 from vipulnsward/fix-scrubber-overshadow rename var to fix overshadowing of variable commit c2c84ec refs/heads/master Merge: cbc554b 22f2518 Author: Yves Senn Date: 2014-05-07 13:12:46 +0200 Merge pull request #14993 from jonatack/patch-7 Follow-up to #14990 [ci skip] commit 22f2518 refs/heads/master Author: Jon Atack Date: 2014-05-06 15:19:02 +0200 Follow-up to #14990 [ci skip] Rewrite to avoid 'we'/'you', add missing period, and keep lines at 80 chars. Cheers :) Improve readability with help from @senny [ci skip] M activerecord/lib/active_record/associations/has_many_through_association.rb commit b243705 refs/heads/master Author: Vipul A M Date: 2014-05-07 14:32:27 +0530 rename `str` to `string` to fix overshadowing of variable M railties/test/generators/argv_scrubber_test.rb commit fc8b67e refs/remotes/origin/4-0-stable Author: Arun Agrawal Date: 2014-05-07 10:57:26 +0200 Update links to new rails version in guides [ci skip] M guides/source/_welcome.html.erb commit cd9222a refs/remotes/origin/4-1-stable Author: Arun Agrawal Date: 2014-05-07 10:55:41 +0200 Update links to new rails version in guides [ci skip] M guides/source/_welcome.html.erb commit cbc554b refs/heads/master Author: Arun Agrawal Date: 2014-05-07 10:53:33 +0200 Update links to new rails version in guides [ci skip] M guides/source/_welcome.html.erb commit e76c9f6 refs/heads/master Merge: af86444 278872a Author: Yves Senn Date: 2014-05-07 08:47:42 +0200 Merge pull request #15004 from JuanitoFatas/patch/ar-pg [ci skip] Add feature section and normalize prologue with other guides. commit 278872a refs/heads/master Author: Juanito Fatas Date: 2014-05-07 13:47:39 +0800 [ci skip] Add feature section and normalize prologue with other guides. Also change Json => JSON. Fill Ruby's Range & IPAddr link. M guides/source/active_record_postgresql.md commit af86444 refs/heads/master Author: Aaron Patterson Date: 2014-05-06 18:10:44 -0700 apparently passing a string to polymorphic_url is something we support o_O M actionview/test/activerecord/polymorphic_routes_test.rb commit 57e5098 refs/heads/master Author: Aaron Patterson Date: 2014-05-06 17:51:24 -0700 make sure url_for works similar to polymorphic_url M actionview/test/activerecord/polymorphic_routes_test.rb commit e60c55d refs/heads/master Author: Aaron Patterson Date: 2014-05-06 15:59:28 -0700 add a test for the parameters sent to the url helper for new records M actionview/test/activerecord/polymorphic_routes_test.rb commit 5fb2e92 refs/heads/master Merge: 3fad674 fda7292 Author: Arthur Nogueira Neves Date: 2014-05-06 18:00:59 -0400 Merge pull request #15000 from gregmolnar/guides_fix fix guides mobile nav issue commit fda7292 refs/heads/master Author: Greg Molnar Date: 2014-05-06 22:59:27 +0100 fix guides mobile nav issue [ci skip] M guides/assets/stylesheets/main.css commit 3fad674 refs/heads/master Author: Xavier Noria Date: 2014-05-06 22:17:03 +0200 typo [ci skip] M guides/source/active_support_core_extensions.md commit 29ae431 refs/heads/master Merge: adc10d2 d5f2c5c Author: Rafael Mendonça França Date: 2014-05-06 16:40:45 -0300 Merge pull request #14997 from jpcody/nested_value_i18n Include label value in i18n attribute lookup commit adc10d2 refs/heads/master Merge: daaa21b 176b1b1 Author: Rafael Mendonça França Date: 2014-05-06 16:40:19 -0300 Merge pull request #14998 from arthurnn/tests_for_process_return Ensure that .process return the method return commit d5f2c5c refs/heads/master Author: Joshua Cody Date: 2014-05-05 17:48:53 -0500 Include label value in i18n attribute lookup Previously, only the object and method name from the label tag were used when looking up the translation for a label. If a value is given for the label, this ought to be additionally used. The following: # form.html.erb <%= form_for @post do |f| %> <%= f.label :type, value: "long" %> <% end %> # en.yml en: activerecord: attributes: post/long: "Long-form Post" Used to simply return "long", but now it will return "Long-form Post". M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/tags/label.rb M actionview/test/template/form_helper_test.rb M guides/source/i18n.md commit daaa21b refs/heads/master Author: Xavier Noria Date: 2014-05-06 21:25:52 +0200 several enhancements to humanize [closes #12288] * Strips leading underscores. * Changes some unnecessary gsub!s to sub!s. * Replaces some anchors ^, $ with \A, \z. * Documents that human inflection rules are applied. * Documents that words are downcased except acronyms. * Adds an example with an acronym. * Rewords docs. M activesupport/CHANGELOG.md M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/inflector_test_cases.rb M guides/source/active_support_core_extensions.md commit 176b1b1 refs/heads/master Author: Arthur Neves Date: 2014-05-06 15:35:25 -0400 Ensure that .process return the method return M actionview/test/actionpack/abstract/render_test.rb M actionview/test/actionpack/controller/render_test.rb commit d975819 refs/heads/master Merge: 2bb008a bf4a802 Author: Rafael Mendonça França Date: 2014-05-06 15:35:33 -0300 Merge pull request #14982 from eric-chahin/GBV_refactor Refactored AssociationScope#get_bind_values commit 2bb008a refs/heads/master Merge: bdcd5f9 7d5a858 Author: Rafael Mendonça França Date: 2014-05-06 14:30:21 -0300 Merge pull request #14945 from tomkadwill/form_authenticity_param_refactor Moved 'params[request_forgery_protection_token]' into its own method and... commit bdcd5f9 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-17 16:50:39 -0300 Only accept actions without File::SEPARATOR in the name. This will avoid directory traversal in implicit render. Fixes: CVE-2014-0130 Conflicts: actionpack/lib/abstract_controller/base.rb M actionpack/lib/abstract_controller/base.rb M actionpack/test/controller/new_base/render_implicit_action_test.rb commit 561811f refs/remotes/origin/4-1-stable Merge: e8a2db2 254e8e2 Author: Rafael Mendonça França Date: 2014-05-06 13:34:57 -0300 Merge branch '4-1-sec' into 4-1-stable Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md actionview/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md guides/CHANGELOG.md railties/CHANGELOG.md commit 7dfe5b0 refs/remotes/origin/4-0-stable Merge: 2961fa8 15ac2f0 Author: Rafael Mendonça França Date: 2014-05-06 13:32:40 -0300 Merge branch '4-0-sec' into 4-0-stable Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md commit bbec7d7 refs/tags/v3.2.19 Merge: a3bda38 50d6b45 Author: Rafael Mendonça França Date: 2014-05-06 13:31:07 -0300 Merge branch '3-2-sec' into 3-2-stable Conflicts: actionpack/CHANGELOG.md commit 50d6b45 refs/tags/v3.2.18 (tag: v3.2.18) Author: Rafael Mendonça França Date: 2014-05-06 11:41:30 -0300 Fix broken tests of the previous release M Gemfile M actionpack/test/template/number_helper_i18n_test.rb commit 4e8f1d2 refs/tags/v3.2.18 Author: Rafael Mendonça França Date: 2014-05-05 13:17:18 -0300 Preparing for 3.2.18 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activeresource/CHANGELOG.md M activeresource/lib/active_resource/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit 15ac2f0 refs/tags/v4.0.5 (tag: v4.0.5) Author: Rafael Mendonça França Date: 2014-05-05 14:08:36 -0300 Fix tests with bundler 1.6 M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/test/generators/plugin_new_generator_test.rb commit 254e8e2 refs/tags/v4.1.1 (tag: v4.1.1) Author: Rafael Mendonça França Date: 2014-05-05 13:06:29 -0300 Preparing for 4.1.1 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/gem_version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/gem_version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/gem_version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/gem_version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/gem_version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/gem_version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/gem_version.rb M version.rb commit 7d5a858 refs/heads/master Author: Tom Kadwill Date: 2014-05-02 15:54:35 +0100 Moved 'params[request_forgery_protection_token]' into its own method and improved tests. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/test/controller/request_forgery_protection_test.rb commit e167a54 refs/heads/master Merge: b13c2aa fe126f1 Author: Yves Senn Date: 2014-05-06 13:56:37 +0200 Merge pull request #14990 from fredwu/has_many_through_association_doc_grammar Fixed grammar [ci skip] commit fe126f1 refs/heads/master Author: Fred Wu Date: 2014-05-06 21:54:34 +1000 Fixed grammar M activerecord/lib/active_record/associations/has_many_through_association.rb commit b13c2aa refs/heads/master Merge: 8357d3a 69acb2b Author: Yves Senn Date: 2014-05-06 13:22:32 +0200 Merge branch 'postgres/guide' commit 69acb2b refs/heads/master Author: Yves Senn Date: 2014-05-06 13:20:32 +0200 pg guides, some stylistic changes [ci skip] M guides/source/active_record_postgresql.md commit 8d33a60 refs/heads/master Author: Yves Senn Date: 2014-02-24 19:25:15 +0100 pg guide, advanced features [ci skip] M guides/source/active_record_postgresql.md commit 7ca75f3 refs/heads/master Author: Yves Senn Date: 2014-01-21 12:13:11 +0100 pg guide, datatypes and examples. [ci skip] A guides/source/active_record_postgresql.md commit 8357d3a refs/heads/master Merge: d76b528 2205285 Author: Yves Senn Date: 2014-05-06 11:39:10 +0200 Merge pull request #12667 from nateberkopec/make_guides_html_valid Fix Guide HTML validation commit d76b528 refs/heads/master Merge: 7d24aa7 dac5399 Author: Rafael Mendonça França Date: 2014-05-05 21:17:25 -0300 Merge pull request #14984 from jkingdon/add-jdbcmysql Fix rails dbconsole for jdbcmysql adapter commit 7d24aa7 refs/heads/master Merge: b6bab2a 255de98 Author: Guillermo Iguaran Date: 2014-05-05 19:00:29 -0500 Merge pull request #14985 from eileencodes/refactor-delete-all-method refactor and clean up delete_all method commit 255de98 refs/heads/master Author: eileencodes Date: 2014-05-05 18:05:36 -0400 refactor and clean up delete_all method Now that delete_all with destroy or delete_all dependency behave the same we no longer need this conditional. This means we can remove the new delete_all_with_dependency method I added and go straight to delete_records from delete_all, passing :all and the dependent directly. M activerecord/lib/active_record/associations/collection_association.rb commit dac5399 refs/heads/master Author: Gabriel Gilder and Jim Kingdon Date: 2014-05-05 14:55:48 -0700 Fix rails dbconsole for jdbcmysql adapter. M railties/lib/rails/commands/dbconsole.rb commit bf4a802 refs/heads/master Author: Eric Chahin Date: 2014-05-05 16:03:29 -0400 Refactor AssociationScope#get_bind_values Added #join_id_for(owner) to reflection to avoid accessing the source_macro M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/reflection.rb commit 2205285 refs/heads/master Author: Nate Berkopec Date: 2013-10-27 15:14:41 -0400 Guides: output valid HTML5 [ci skip] M Gemfile M guides/rails_guides.rb M guides/rails_guides/helpers.rb M guides/rails_guides/markdown.rb M guides/rails_guides/markdown/renderer.rb M guides/source/2_3_release_notes.md M guides/source/3_0_release_notes.md M guides/source/active_support_instrumentation.md M guides/source/index.html.erb M guides/source/layout.html.erb M guides/w3c_validator.rb commit b6bab2a refs/heads/master Merge: 4efb0f3 5de7309 Author: Carlos Antonio da Silva Date: 2014-05-05 17:24:40 -0300 Merge pull request #14951 from jenrzzz/module_table_name_suffix Add support for module-level table_suffix in models commit 5de7309 refs/heads/master Author: Jenner LaFave Date: 2014-05-02 18:00:53 -0700 Add support for module-level table_suffix in models This makes table_name_suffix work the same as table_name_prefix when using namespaced models. Pretty much the same as 67d1cec. M activerecord/CHANGELOG.md M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/modules_test.rb M activerecord/test/models/company_in_module.rb commit e8a2db2 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-05 13:22:24 -0300 Merge pull request #14978 from bogdan/relation-join [Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/delegation.rb M activerecord/test/cases/relation/delegation_test.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/comment.rb commit 4efb0f3 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-05 13:23:29 -0300 Improve CHANGELOG entry [ci skip] M activerecord/CHANGELOG.md commit 69a3792 refs/heads/master Merge: a8d85c4 7e20bdc Author: Rafael Mendonça França Date: 2014-05-05 13:22:24 -0300 Merge pull request #14978 from bogdan/relation-join [Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array commit 250741d refs/tags/v4.0.5 Author: Rafael Mendonça França Date: 2014-05-05 13:10:40 -0300 Preparing for 4.0.5 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit 529720d refs/tags/v4.1.1 Author: Rafael Mendonça França Date: 2014-04-17 16:50:39 -0300 Only accept actions without File::SEPARATOR in the name. This will avoid directory traversal in implicit render. Fixes: CVE-2014-0130 M actionpack/lib/abstract_controller/base.rb M actionpack/test/controller/new_base/render_implicit_action_test.rb commit 0f3b7d1 refs/tags/v3.2.18 Author: Rafael Mendonça França Date: 2014-04-17 16:50:39 -0300 Only accept actions without File::SEPARATOR in the name. This will avoid directory traversal in implicit render. Fixes: CVE-2014-0130 M actionpack/lib/abstract_controller/base.rb M actionpack/test/controller/new_base/render_implicit_action_test.rb commit a8ecbfd refs/tags/v4.0.5 Author: Rafael Mendonça França Date: 2014-04-17 16:50:39 -0300 Only accept actions without File::SEPARATOR in the name. This will avoid directory traversal in implicit render. Fixes: CVE-2014-0130 M actionpack/lib/abstract_controller/base.rb M actionpack/test/controller/new_base/render_implicit_action_test.rb commit 7e20bdc refs/heads/master Author: Bogdan Gusiev Date: 2014-05-05 10:48:59 +0300 Put back Relation#join method as a delegate to Array This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/delegation.rb M activerecord/test/cases/relation/delegation_test.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/comment.rb commit a8d85c4 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-05 08:22:27 -0300 Get rid of unused method in AR Post test model M activerecord/test/models/post.rb commit 9381d82 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-05 08:14:06 -0300 Get rid of extra local var that does not add to the logic There are too many "action name" variables around the process method. M actionpack/lib/abstract_controller/base.rb commit f200383 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-05 02:07:38 -0300 Arel master is 6.0.0 M activerecord/activerecord.gemspec commit e918516 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-04 18:47:29 -0300 Improve CHANGELOG entry M actionpack/CHANGELOG.md commit 5ad661e refs/heads/master Author: Rafael Mendonça França Date: 2014-05-04 18:47:21 -0300 Use assert_raises M actionpack/test/dispatch/routing_test.rb commit e2334a2 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-04 18:46:48 -0300 Do not use short-circuit return M actionpack/lib/action_dispatch/routing/mapper.rb commit 95ab4fd refs/heads/master Merge: d65ab43 9fd0c60 Author: Rafael Mendonça França Date: 2014-05-04 18:42:20 -0300 Merge pull request #11166 from xavier/callable_constraint_verification Callable route constraint verification Conflicts: actionpack/CHANGELOG.md commit d65ab43 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-04 18:35:04 -0300 Improve CHANGELOG [ci skip] M activesupport/CHANGELOG.md commit 3b1ade1 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-04 18:29:31 -0300 Merge pull request #14949 from bogdan/empty-hash-array-parameterization [Fixes #14948] Hash#to_query: right serialization for empty hash and array Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/to_param.rb M activesupport/test/core_ext/object/to_query_test.rb commit 73f2e25 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-04 18:33:24 -0300 No need the else clause M activesupport/lib/active_support/core_ext/object/to_param.rb commit b4b0d9d refs/heads/master Merge: cf0dc18 41bbac6 Author: Rafael Mendonça França Date: 2014-05-04 18:29:31 -0300 Merge pull request #14949 from bogdan/empty-hash-array-parameterization [Fixes #14948] Hash#to_query: right serialization for empty hash and array commit affa34b refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-04 18:20:51 -0300 Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exception Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/log_subscriber_test.rb commit cf0dc18 refs/heads/master Author: Rafael Mendonça França Date: 2014-05-04 18:21:36 -0300 Invert the if/else clause The case where the value is present is more common M activerecord/lib/active_record/log_subscriber.rb commit 7922ccb refs/heads/master Merge: af68161 12ff63b Author: Rafael Mendonça França Date: 2014-05-04 18:20:51 -0300 Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exception Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md commit af68161 refs/heads/master Merge: 8eb7813 5e80313 Author: Rafael Mendonça França Date: 2014-05-04 17:58:29 -0300 Merge pull request #14973 from kuldeepaggarwal/f-refactor Convert column name to string only once commit 8eb7813 refs/heads/master Merge: 681fbec f76e275 Author: Rafael Mendonça França Date: 2014-05-04 17:26:35 -0300 Merge pull request #14974 from kuldeepaggarwal/remove-deprecated-files Remove deprecated file commit 681fbec refs/heads/master Merge: 9b2b36f 88b7144 Author: Robin Dupret Date: 2014-05-04 20:16:22 +0200 Merge pull request #14961 from jonatack/patch-7 Follow-up to #14905 and formatting pass [ci skip] commit 88b7144 refs/heads/master Author: Jon Atack Date: 2014-05-03 19:40:24 +0200 Follow-up to #14905 and formatting pass on the Getting Started guide. [skip ci] Added 2 changes suggested by @robin850 [skip ci] M guides/source/getting_started.md commit f76e275 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-04 22:37:55 +0530 Remove deprecated file(`active_support/core_ext/object/to_json.rb`) and its test case. D activesupport/lib/active_support/core_ext/object/to_json.rb D activesupport/test/core_ext/object/json_test.rb commit 5e80313 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-05-04 22:32:07 +0530 Convert column name to string only once M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 9b2b36f refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-04 11:15:40 -0300 Fix examples indent and improve #process docs a bit [ci skip] M actionpack/lib/action_controller/test_case.rb commit 3561565 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-04 11:00:37 -0300 Use the reader attribute rather than the instance var when possible M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit c61eebd refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-04 10:56:27 -0300 Simplify building options hash in rename column method for mysql M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 9aa63b2 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-04 10:54:25 -0300 Get rid of conditional since column_for handles raising now column_for will raise in case column is not found for the given table, so there is no need to handle that here. M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 816efac refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-04 10:52:09 -0300 Simplify unless conditional with OR M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 872a17d refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-04 10:44:49 -0300 Convert column name to string only once M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 9c05300 refs/remotes/origin/4-1-stable Author: Robin Dupret Date: 2014-05-04 15:28:41 +0200 Rails One Click is not maintained anymore [ci skip] Let's tell people that they should rely on Tokaido instead of Rails One Click. Fixes #14960. M guides/source/getting_started.md commit 275fdef refs/heads/master Author: Robin Dupret Date: 2014-05-04 15:28:41 +0200 Rails One Click is not maintained anymore [ci skip] Let's tell people that they should rely on Tokaido instead of Rails One Click. Fixes #14960. M guides/source/getting_started.md commit 52d9746 refs/heads/master Merge: 242bcac 4a43769 Author: Yves Senn Date: 2014-05-04 14:31:28 +0200 Merge pull request #14923 from gaurish/document-testcase-process Document ActionController::TestCase::Behavior#process [ci skip] commit 4a43769 refs/heads/master Author: Gaurish Sharma Date: 2014-05-01 10:33:36 +0530 Document ActionController::TestCase::Behavior#process [ci skip] M actionpack/lib/action_controller/test_case.rb commit 242bcac refs/heads/master Author: Yves Senn Date: 2014-04-29 22:18:08 -0500 refactor, move `column_for` to `AbstractAdapter` for better reuse. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 51c0b8a refs/heads/master Merge: 5924123 1f89330 Author: Yves Senn Date: 2014-05-04 13:57:10 +0200 Merge pull request #14966 from tgxworld/remove_unnecessary_setting_of_controller_name Remove tests method for test cases when controller can be inferred. commit 5924123 refs/heads/master Merge: b231825 1e7b8ae Author: Robin Dupret Date: 2014-05-04 12:59:58 +0200 Merge pull request #14959 from akshay-vishnoi/doc_changes Typo, grammar and textual changes [ci skip] commit 1f89330 refs/heads/master Author: Guo Xiang Date: 2014-05-03 23:55:23 -0700 Remove tests method for test cases when controller can be inferred. M actionpack/test/controller/force_ssl_test.rb M actionpack/test/controller/mime/accept_format_test.rb M actionpack/test/controller/mime/respond_to_test.rb M actionpack/test/controller/mime/respond_with_test.rb M actionpack/test/controller/send_file_test.rb commit e5ac6c8 refs/heads/master Author: Gaurish Sharma Date: 2014-05-04 10:40:16 +0530 Fix Formatting in AR Readme Don't make free form text appear in code blocks [ci skip] M activerecord/README.rdoc commit b231825 refs/heads/master Author: Yves Senn Date: 2014-05-03 20:08:15 +0200 Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar" This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing changes made to add9560643ef79830febf47fa1228752d1df3502. M activerecord/Rakefile M ci/travis.rb M guides/source/contributing_to_ruby_on_rails.md M guides/source/development_dependencies_install.md commit fe98596 refs/heads/master Merge: add9560 2de8468 Author: Yves Senn Date: 2014-05-03 19:45:56 +0200 Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar Reorganize ActiveRecord's rake tasks commit 2de8468 refs/heads/master Author: Arun Agrawal Date: 2014-05-03 19:34:18 +0200 Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi] M activerecord/Rakefile M ci/travis.rb M guides/source/contributing_to_ruby_on_rails.md M guides/source/development_dependencies_install.md commit add9560 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-03 14:33:48 -0300 Remove duplicated fixture addition M activerecord/test/cases/associations/has_many_associations_test.rb commit c588850 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-03 14:31:00 -0300 Refactor test to not care about the specific result of valid? Only care about its truthiness rather than asserting specific true/false values. If we need to check for the return value in particular, there will be a test for that. M activerecord/test/cases/associations/has_many_associations_test.rb commit de804e9 refs/heads/master Merge: 5757fe4 aac4840 Author: Yves Senn Date: 2014-05-03 17:48:41 +0200 Merge pull request #14952 from gregmolnar/schema_load make `db:structure:load` listed with `rake -T` commit 5757fe4 refs/heads/master Author: Yves Senn Date: 2014-05-03 17:16:53 +0200 docs, restructure newly added part to `includes`. [ci skip] This is a follow up to #14139. /cc @carlosantoniodasilva M activerecord/lib/active_record/associations.rb commit 022c797 refs/heads/master Merge: 193eb62 c6d685b Author: Matthew Draper Date: 2014-05-03 16:19:24 +0930 Merge pull request #14924 from eric-chahin/issue_13854 Fixed custom validation context bug for child associations commit 193eb62 refs/heads/master Merge: 0076353 c1e3a8c Author: Aaron Patterson Date: 2014-05-02 23:22:39 -0700 Merge pull request #14956 from akshay-vishnoi/refactor Use #include? instead of #any?, make it simpler commit 1e7b8ae refs/heads/master Author: Akshay Vishnoi Date: 2014-05-03 11:11:19 +0530 Typo, grammar and textual changes [ci skip] M actionview/lib/action_view/lookup_context.rb commit 41bbac6 refs/heads/master Author: Bogdan Gusiev Date: 2014-05-02 20:57:59 +0300 [Fixes #14948] Hash#to_query: Changed a way how empty hash and empty array are serialized Empty Hash or Array should not present in serialization result {a: []}.to_query # => "" {a: {}}.to_query # => "" For more info see #14948. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/to_param.rb M activesupport/test/core_ext/object/to_query_test.rb commit 0076353 refs/heads/master Merge: 2b6e305 91d7b6f Author: Rafael Mendonça França Date: 2014-05-03 01:24:00 -0300 Merge pull request #14957 from akshay-vishnoi/test-cases Test typecasting on instance rather than class itself commit 91d7b6f refs/heads/master Author: Akshay Vishnoi Date: 2014-05-03 09:17:36 +0530 Test typecasting on instance rather than class itself M activerecord/test/cases/adapters/sqlite3/quoting_test.rb commit c1e3a8c refs/heads/master Author: Akshay Vishnoi Date: 2014-05-03 08:19:30 +0530 Use #include? instead of #any?, make it simpler M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 2b6e305 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-02 21:13:31 -0300 Add missing require to fix test :bomb: M activerecord/test/cases/dup_test.rb commit 8828916 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-02 21:03:11 -0300 Add branch to arel on Gemfile to allow local bundle config [ci skip] M Gemfile commit dbaceba refs/heads/master Author: Carlos Antonio da Silva Date: 2014-05-02 15:54:07 -0300 Move dup destroyed test to specific file that tests dup logic Also change other related test to use existing record rather than creating new one. M activerecord/test/cases/dup_test.rb M activerecord/test/cases/persistence_test.rb commit c1c6f51 refs/heads/master Author: Aaron Patterson Date: 2014-05-02 14:29:08 -0700 passing a nil in the polymorphic array is not supported. remove nils before you call the method M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/test/activerecord/polymorphic_routes_test.rb commit aac4840 refs/heads/master Author: Greg Molnar Date: 2014-05-02 21:55:31 +0100 make `db:structure:load` listed with `rake -T` M activerecord/lib/active_record/railties/databases.rake commit 3d87c26 refs/heads/master Author: Aaron Patterson Date: 2014-05-02 11:52:37 -0700 push up bind params on "simple" subquery calculations bind parameters we not being propogated to simple subquery calculation calls. This fixes it M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit dece005 refs/heads/master Author: Aaron Patterson Date: 2014-05-02 11:38:37 -0700 passing a nil should always raise an ArgumentError M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/test/activerecord/polymorphic_routes_test.rb commit 61d5731 refs/heads/master Author: Vijay Dev Date: 2014-05-02 17:45:43 +0000 eliminate repetition in guide links for past releases [ci skip] M guides/source/_welcome.html.erb commit 3b68a42 refs/heads/master Merge: 4565cb7 6604ce6 Author: Rafael Mendonça França Date: 2014-05-02 13:40:29 -0300 Merge pull request #14943 from arunagw/hbakhtiyor-i18n-validation-message-singular-and-plural Add singular and plural form for some validation messages commit 12ff63b refs/heads/master Author: James Coleman Date: 2014-05-02 12:32:49 -0400 Fix exception when logging SQL w/ nil binary value. M activerecord/CHANGELOG.md M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/log_subscriber_test.rb commit 6604ce6 refs/heads/master Author: Abd ar-Rahman Hamidi Date: 2013-04-04 08:31:48 +0500 Add singular and plural form for some validation messages M activemodel/CHANGELOG.md M activemodel/lib/active_model/locale/en.yml M activemodel/test/cases/validations/i18n_generate_message_validation_test.rb commit 4565cb7 refs/heads/master Merge: 504adac 9b4dc59 Author: Rafael Mendonça França Date: 2014-05-02 13:13:03 -0300 Merge pull request #14942 from JuanitoFatas/patch/cc-by-sa-4-0 [ci skip] Update guides license to CC BY-SA 4.0 International. commit 504adac refs/heads/master Merge: 7fcc582 c694c8e Author: Rafael Mendonça França Date: 2014-05-02 12:12:14 -0300 Merge pull request #14941 from arunagw/hbakhtiyor-new-plugin-command-advanced-config Plugin gemspec commit 2961fa8 refs/remotes/origin/4-0-stable Merge: e60553f 6e3d689 Author: Guillermo Iguaran Date: 2014-05-02 09:56:32 -0500 Merge pull request #14944 from arunagw/aa-added-memcached-to-travis memcached service is required to run few specs commit c694c8e refs/heads/master Author: Arun Agrawal Date: 2014-05-02 11:26:31 +0200 skip-git should not hit git commands plugin generators M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin/plugin_generator.rb M railties/test/generators/plugin_generator_test.rb commit e8c310e refs/heads/master Author: Roman Shmatov Date: 2013-04-12 10:51:52 +0600 Works correctly if git not installed M railties/lib/rails/generators/rails/plugin/plugin_generator.rb M railties/test/generators/plugin_generator_test.rb commit 65b5514 refs/heads/master Author: Abd ar-Rahman Hamidi Date: 2013-04-06 19:02:13 +0500 Automaticly add username and email if configured in git-scm, as bundle gem M railties/lib/rails/generators/rails/plugin/plugin_generator.rb M railties/lib/rails/generators/rails/plugin/templates/%name%.gemspec M railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE commit 7fcc582 refs/heads/master Author: Robin Dupret Date: 2014-05-02 15:35:30 +0200 Tiny follow up to #14915 [ci skip] M actionpack/lib/action_dispatch/routing/mapper.rb commit d4a2f7e refs/heads/master Author: Arun Agrawal Date: 2014-05-02 15:26:52 +0200 Added link for 4.1 guides on edge guide [ci skip] M guides/source/_welcome.html.erb commit 6e3d689 refs/remotes/origin/4-0-stable Author: Arun Agrawal Date: 2014-05-02 15:21:18 +0200 memcached service is required to run few specs Found that was not running here https://travis-ci.org/rails/rails/jobs/24216624#L110 M .travis.yml commit 9b4dc59 refs/heads/master Author: Juanito Fatas Date: 2014-05-02 18:49:37 +0800 [ci skip] Update guides license to CC BY-SA 4.0 International. Benefits: https://creativecommons.org/version4 M guides/source/_license.html.erb commit 4142a30 refs/heads/master Author: Robin Dupret Date: 2014-05-02 11:58:44 +0200 Follow up to 38ad5438 [ci skip] This commit adds new lines between titles, paragraphs and code blocks for an easier reading. Moreover, in order to be consistent with the other guides, let's remove the sharps on the right side of the different titles. The "Running a Single Test" part was also explained after the "Testing Active Record" one which shows how to run a single test under the scope of a specific adapter. Finally, let's explain the `-n` option to run a specific test method. M guides/source/contributing_to_ruby_on_rails.md commit 5c87c95 refs/heads/master Author: Robin Dupret Date: 2014-05-02 11:56:03 +0200 Enhance a bit a few changelog entries [ci skip] M actionview/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md commit 0591f18 refs/heads/master Merge: 280e76e ac67d11 Author: Damien Mathieu <42@dmathieu.com> Date: 2014-05-02 10:21:39 +0200 Merge pull request #14939 from jonatack/patch-8 Form_tag_helper grammar fix [skip ci] commit ac67d11 refs/heads/master Author: Jon Atack Date: 2014-05-02 10:11:53 +0200 Form_tag_helper grammar fix [skip ci] M actionview/lib/action_view/helpers/form_tag_helper.rb commit 280e76e refs/heads/master Author: Aaron Patterson Date: 2014-05-01 16:24:33 -0700 only add the optiosn if they are not empty I think this is wrong, but it gets the build passing for now. We should always add options, but we need to make more guarantees about how the underlying url helper is called M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit b44bfa4 refs/heads/master Author: Aaron Patterson Date: 2014-05-01 16:03:26 -0700 always pass options to the _url method M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionview/test/template/test_test.rb commit 7f97eac refs/heads/master Author: Aaron Patterson Date: 2014-05-01 15:44:35 -0700 never merge url options in to the first data hash if you want options, don't mix them with the first hash, just pass them all in with the second hash M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit e60553f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-01 17:49:20 -0300 Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_mode Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit 970ca2c refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-01 17:49:20 -0300 Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_mode Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit e99e23d refs/heads/master Merge: 492282d 7e8b062 Author: Rafael Mendonça França Date: 2014-05-01 17:49:20 -0300 Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_mode Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md commit 3bf02ae refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-01 17:37:41 -0300 Merge pull request #14932 from phoet/use_file_join always use File.join in asset_path Conflicts: actionview/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit 88ee47d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-01 17:37:41 -0300 Merge pull request #14932 from phoet/use_file_join always use File.join in asset_path Conflicts: actionview/CHANGELOG.md M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit 492282d refs/heads/master Merge: b410a57 b6aa70c Author: Rafael Mendonça França Date: 2014-05-01 17:37:41 -0300 Merge pull request #14932 from phoet/use_file_join always use File.join in asset_path commit b6aa70c refs/heads/master Author: phoet Date: 2014-05-01 15:10:56 -0400 always use File.join M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/asset_url_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit b410a57 refs/heads/master Merge: 0b6ac00 830839c Author: Jeremy Kemper Date: 2014-05-01 12:29:48 -0700 Merge pull request #14931 from heironimus/security_guide_clarity [ci skip] Security guide clarity. commit 830839c refs/heads/master Author: Kyle Heironimus Date: 2014-05-01 14:09:09 -0500 [ci skip] Security guide clarity. M guides/source/security.md commit 1f3f6f4 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-01 15:02:31 -0300 Rescue the right exception M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 6ce807c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-01 14:48:01 -0300 Merge pull request #14915 from juanpastas/patch-1 Update mapper.rb [ci skip] Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/mapper.rb commit d78368e refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-01 14:48:01 -0300 Merge pull request #14915 from juanpastas/patch-1 Update mapper.rb [ci skip] M actionpack/lib/action_dispatch/routing/mapper.rb commit 0b6ac00 refs/heads/master Merge: b638c1a 73cd32c Author: Rafael Mendonça França Date: 2014-05-01 14:48:01 -0300 Merge pull request #14915 from juanpastas/patch-1 Update mapper.rb commit b638c1a refs/heads/master Merge: c42aeac cd78d72 Author: Rafael Mendonça França Date: 2014-05-01 14:43:14 -0300 Merge pull request #12651 from cespare/ipv6-remote-ip-fixes Make remote_ip detection properly handle private IPv6 addresses Conflicts: actionpack/CHANGELOG.md commit 84b987d refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-05-01 14:10:04 -0300 Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit ea8603f refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-05-01 14:10:04 -0300 Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit c42aeac refs/heads/master Author: Rafael Mendonça França Date: 2014-05-01 14:10:11 -0300 Remove unused variable M activerecord/test/cases/associations/callbacks_test.rb commit 372e28c refs/heads/master Merge: b4db126 6f16513 Author: Rafael Mendonça França Date: 2014-05-01 14:10:04 -0300 Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md commit b4db126 refs/heads/master Merge: 71669b9 bed8882 Author: Rafael Mendonça França Date: 2014-05-01 13:48:31 -0300 Merge pull request #14928 from potomak/update-scaffold-form-template Avoid unnecessary conditional block commit bed8882 refs/heads/master Author: Giovanni Cappellotto Date: 2014-05-01 17:21:16 +0200 Avoid unnecessary conditional block GeneratedAttribute#column_name checks already for reference? on the attribute returning the right name to use as symbol for label and field. M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb commit 71669b9 refs/heads/master Merge: bf44fcc 55880b3 Author: Rafael Mendonça França Date: 2014-05-01 11:15:56 -0300 Merge pull request #14922 from rizwanreza/add-selected-documentation-to-select-tag Add documentation to select_tag for :selected option commit c6d685b refs/heads/master Author: Eric Chahin Date: 2014-05-01 02:38:15 -0400 Fixed custom validation context bug where child associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey] M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/pirate.rb M activerecord/test/models/ship.rb commit bf44fcc refs/heads/master Merge: 8761557 c343945 Author: Matthew Draper Date: 2014-05-01 16:30:24 +0930 Merge pull request #14916 from moktin/real_privacy_for_functions_in_predicate_builder Give real privacy to class methods in AR::PredicateBuilder commit c343945 refs/heads/master Author: Hector Satre Date: 2014-05-01 08:16:33 +0200 Give real privacy to class methods in AR::PredicateBuilder M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/predicate_builder.rb commit 55880b3 refs/heads/master Author: Rizwan Reza Date: 2014-04-30 21:59:32 -0700 Add documentation to select_tag for :selected option M actionview/lib/action_view/helpers/form_tag_helper.rb commit 73cd32c refs/heads/master Author: Juan David Pastas Date: 2014-04-29 23:47:46 -0500 [skip ci] Document: required `via` option in `match` routing method. M actionpack/lib/action_dispatch/routing/mapper.rb commit 8761557 refs/heads/master Author: Aaron Patterson Date: 2014-04-30 15:32:57 -0700 avoid calling extract_record multiple times M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit f1c0358 refs/heads/master Author: Aaron Patterson Date: 2014-04-30 15:07:57 -0700 eliminate conditional when sending the named route method M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb commit 6e34d09 refs/heads/master Author: Aaron Patterson Date: 2014-04-30 14:48:37 -0700 do not allocate strings while creating urls M actionpack/lib/action_controller/metal/url_for.rb commit 5c5c1cc refs/heads/master Author: Aaron Patterson Date: 2014-04-30 14:24:14 -0700 don't allocate string on hash access M actionpack/lib/action_controller/metal/url_for.rb commit 7e8b062 refs/heads/master Author: Paul Nikitochkin Date: 2014-04-29 01:39:47 +0300 Stringify variables names for mysql connections For mysql2/mysql adapters, `sql_mode` variable name set in `database.yml` as string, was ignored and `sql_mode` was set to use strict mode. Fixes #14895 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit fd92437 refs/heads/master Author: Aaron Patterson Date: 2014-04-30 10:56:48 -0700 split nil / Hash cases in url_for this reduces the number of comparisons and method calls `url_for` requires. The nil case no longer calls `symbolize_keys`, we already know options is nil, so no more ||=, and since it is nil we already know that options[:host] will be nil too. M actionview/lib/action_view/routing_url_for.rb commit 31c3eec refs/heads/master Author: Earl St Sauver Date: 2014-04-29 18:26:16 -0700 Propagate test messages through assert_routing helper, Fixes #14908 assert_routing was not raising the message passed into the assertion violation that it raised. This change propagates messages through the on_fail error. This fixes this error: https://github.com/rails/rails/issues/14908 A test case for this issue is located here. https://github.com/estsauver/test14908 To see that test case fail in the example app, just run ruby -Itest test/controllers/guests_controller_test.rb M actionpack/lib/action_dispatch/testing/assertions/routing.rb M actionpack/test/dispatch/routing_assertions_test.rb commit ca20037 refs/heads/master Merge: 5dc4dde 0128882 Author: Arthur Nogueira Neves Date: 2014-04-29 20:37:28 -0300 Merge pull request #14909 from jonatack/patch-7 the use of ... in place >> using ... instead commit 0128882 refs/heads/master Author: Jon Atack Date: 2014-04-30 01:05:56 +0200 the use of ... in place >> using ... instead [ci skip] M guides/source/getting_started.md commit 5dc4dde refs/heads/master Author: Xavier Noria Date: 2014-04-29 22:02:29 +0200 rewrites the API docs of favicon_link_tag [ci skip] Motivated by #14907. M actionview/lib/action_view/helpers/asset_tag_helper.rb commit 89893a0 refs/heads/master Merge: e2e8fad f591762 Author: Vijay Dev Date: 2014-04-29 23:03:50 +0530 Merge pull request #14905 from jonatack/patch-7 Update the Getting Started tutorial commit e2e8fad refs/heads/master Author: Yves Senn Date: 2014-04-29 10:12:10 -0500 cleanup, remove trailing whitespace. [ci skip] M activerecord/lib/active_record/associations.rb commit 4841ad3 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-28 16:55:49 -0500 Merge pull request #14139 from anilmaurya/master [ci skip] updating active_record/associations to demonstrate where conflict with eager loading. M activerecord/lib/active_record/associations.rb commit f591762 refs/heads/master Author: Jon Atack Date: 2014-04-29 16:56:43 +0200 Update the Getting Started tutorial Update the Getting Started tutorial to clarify where and how to add controller actions, and fix some grammar. This PR is an improved version of #14828, #14822 and #14815. [skip ci] M guides/source/getting_started.md commit 7763cff refs/heads/master Merge: b7b319e 748daa3 Author: Aaron Patterson Date: 2014-04-28 20:10:35 -0700 Merge pull request #14899 from eileencodes/fix-delete-all-with-nil-dependency-to-not-produce-in-statement Fix delete all with nil (:nullify) dependency to not produce in statement commit 748daa3 refs/heads/master Author: eileencodes Date: 2014-04-28 20:58:17 -0400 add test to check that loaded and non laoded are the same Test checks that SQL is the same for a loaded vs not loaded association (category.categorizations, category.categorization.delete_all vs category.cartegroization.delete_al). This was fixed for delete_all dependency but was not fixed for no (:nullify, or nil) dependency). M activerecord/test/cases/associations/has_many_associations_test.rb commit 96f90b5 refs/heads/master Author: eileencodes Date: 2014-04-28 19:31:45 -0400 clear shouldnt fire callbacks so remove order test Since clear shouldn't fire callbacks the order doesn't matter since it was never updated. Remove the portion of this test that tests for order after clear. M activerecord/test/cases/associations/has_many_through_associations_test.rb commit a0401aa refs/heads/master Author: eileencodes Date: 2014-04-28 19:15:42 -0400 rewrite test to correctly test clear method Clear should not call callbacks because it clear calls delete_all and then returns self. It should behave the same as delete_all. This test clarifies the goal of the test and tests the correct outcome. M activerecord/test/cases/associations/callbacks_test.rb commit fe5d098 refs/heads/master Author: eileencodes Date: 2014-04-28 19:09:46 -0400 flip conditional in delete_all to handle nullify better Nullify (or nil dependency) was doing the same thing delete_all was doing in issue #14546, creating a large IN statement if the association was loaded. Loaded and not loaded associations should behave the same. The IN statement is also not great because it's inefficient. M activerecord/lib/active_record/associations/collection_association.rb commit b7b319e refs/heads/master Merge: 7707eb9 be1f2db Author: Yves Senn Date: 2014-04-28 16:55:49 -0500 Merge pull request #14139 from anilmaurya/master [ci skip] updating active_record/associations to demonstrate where conflict with eager loading. commit be1f2db refs/heads/master Author: anilmaurya Date: 2014-02-21 17:39:07 +0530 [ci skip] updating active_record/associations to demonstrate where conflict with eager loading. M activerecord/lib/active_record/associations.rb commit 7707eb9 refs/heads/master Merge: 3f5d14f e0e5860 Author: Aaron Patterson Date: 2014-04-28 11:11:59 -0700 Merge pull request #14892 from eileencodes/breakup-complex-conditionals-on-delete Breakup complex conditionals on delete commit e0e5860 refs/heads/master Author: eileencodes Date: 2014-04-23 22:35:23 -0400 simplify the delete all w/ dependency method After reviewing this code I realized the conditional that was there previously was basically saying if the dependency is not delete all. This is a better, cleaner, and clearer way to write this method. M activerecord/lib/active_record/associations/collection_association.rb commit 7ad476b refs/heads/master Author: eileencodes Date: 2014-04-23 22:33:24 -0400 remove unnecessary code from delete method Now that we have a new method delete_all_with_dependency this coupled conditional is no longer needed. M activerecord/lib/active_record/associations/collection_association.rb commit 0d4bf17 refs/heads/master Author: eileencodes Date: 2014-04-23 22:31:08 -0400 write a new method to be accessed from delete_all The delete method is very coupled with delete all even though only a portion of the conditionals apply. Decoupling this will make the code easier to understand and manipulate. M activerecord/lib/active_record/associations/collection_association.rb commit 3f5d14f refs/heads/master Merge: d160ca4 535bd1a Author: Arthur Nogueira Neves Date: 2014-04-28 12:58:57 -0300 Merge pull request #14890 from fuzzyalej/patch-1 Added a missing `end` commit 535bd1a refs/heads/master Author: Alejandro Andrés Date: 2014-04-28 17:52:07 +0200 Added a missing `end` M guides/source/active_support_instrumentation.md commit d160ca4 refs/heads/master Merge: 16cc914 027aa1c Author: Arthur Nogueira Neves Date: 2014-04-28 10:15:14 -0300 Merge pull request #14889 from kiela/master Remove double declaration of memcache services on travis commit 027aa1c refs/heads/master Author: Kamil Kieliszczyk Date: 2014-04-28 10:08:56 +0200 Remove double declaration of memcache services on travis M .travis.yml commit 16cc914 refs/heads/master Author: Godfrey Chan Date: 2014-04-27 10:26:56 -0700 Revert "Don't rely on Arel master in bug report template [ci skip]" This reverts commit fd6d7835. We are back on arel master, see b395265f. M guides/bug_report_templates/active_record_master.rb commit 48b3257 refs/heads/master Author: Robin Dupret Date: 2014-04-27 18:19:29 +0200 Swallow bundler exceptions when running tests Let's avoid useless output when testing stuff related to Bundler. M railties/test/generators/shared_generator_tests.rb commit 099efc0 refs/remotes/origin/4-1-stable Author: River MacLeod Date: 2014-04-18 17:03:41 +0100 PostgreSQL, Fix handling of exclusive lower bound for int/date ranges. [River MacLeod & Yves Senn] Closes #14797. This behavior is fixed on `master` by using `from.succ`. However, the lower bownds exclusion is flawed and was deprecated. This fix is to make it behave consistently until it's removed. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit 668d842 refs/heads/master Merge: fb1b695 9ace0a7 Author: Vijay Dev Date: 2014-04-27 21:35:38 +0530 Merge branch 'master' of github.com:rails/docrails commit 9ace0a7 refs/heads/master Author: Vijay Dev Date: 2014-04-27 21:29:15 +0530 Revert "Running AR tests on postgres, mysql & sqlite" This reverts commit 28bd442034e0974d0a4d664076dafb8e9555816d. Reason: Existing text was clearer imo. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 75acbac refs/heads/master Author: Vijay Dev Date: 2014-04-27 21:25:40 +0530 Revert "Document ActionController::TestCase::Behavior::ClassMethods.process" This reverts commit 2aef9fddf8b4487a05638ea3341dfd65ceb229ef. Reason: The added change isn't clear in terms of explaining the arguments. Will ask the author to provide a PR and take it forward. [ci skip] M actionpack/lib/action_controller/test_case.rb commit fb1b695 refs/heads/master Author: Yves Senn Date: 2014-04-27 10:47:33 -0500 Generators, remove leftover variable assignment. refs #14877 The last uses of this variable was removed with the `--builder` option. 2da5ea1c9feb4a7b491bd00bd6ffd931b9203da8 M railties/lib/rails/generators/app_base.rb commit afa3557 refs/heads/master Merge: 33b9e3c c354d33 Author: Vijay Dev Date: 2014-04-27 01:17:17 +0530 Merge pull request #14872 from jonatack/patch-7 Grammar and formatting fixes in Form Helpers Guide commit 33b9e3c refs/heads/master Merge: 8230745 2929ebd Author: Guillermo Iguaran Date: 2014-04-26 07:24:01 -0500 Merge pull request #14874 from arunagw/aa-warning-removed-missmatched Warning removed for missmatched indentation commit 8230745 refs/heads/master Merge: 856ea2a 1d6fb05 Author: Lauro Caetano Date: 2014-04-25 22:44:00 -0300 Merge pull request #14875 from prathamesh-sonpatki/fix-extract-handler-format-variant-doc Fix documentation of extract_handler_and_format_and_variant [ci skip] commit 1d6fb05 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-04-26 06:40:05 +0530 Fix documentation of extract_handler_and_format_and_variant [ci skip] M actionview/lib/action_view/template/resolver.rb commit 2929ebd refs/heads/master Author: Arun Agrawal Date: 2014-04-26 00:35:22 +0200 Warning removed for missmatched indentation M activesupport/test/multibyte_conformance_test.rb commit 98b56ed refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-25 15:48:39 -0500 Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm Fix to use custom join table in habtm Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/builder/has_many.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 856ea2a refs/heads/master Merge: 0dd3d2c 18fa87b Author: Yves Senn Date: 2014-04-25 15:48:39 -0500 Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm Fix to use custom join table in habtm commit 18fa87b refs/heads/master Author: Kassio Borges Date: 2014-04-25 17:34:13 -0300 Fix custom join_table name on habtm reflections When used a custom join_table name on a habtm, rails was not saving it on Reflections. This causes a problem when rails loads fixtures, because it uses the reflections to set database with fixtures. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/builder/has_many.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 0dd3d2c refs/heads/master Merge: ccdeb43 10c4a3e Author: Yves Senn Date: 2014-04-25 15:24:24 -0500 Merge pull request #14873 from jonatack/patch-8 Fix code & improve grammar in "Forms to External Resources" [ci skip] commit 10c4a3e refs/heads/master Author: Jon Atack Date: 2014-04-25 20:48:06 +0200 Fix code & grammar in Form Helpers Guide in the "Forms to External Resources" section [skip ci] M guides/source/form_helpers.md commit c354d33 refs/heads/master Author: Jon Atack Date: 2014-04-25 20:26:47 +0200 Grammar and formatting fixes in Form Helpers Guide Improved version of #14851 after helpful feedback from @robin850 and @matthewd. [skip ci] M guides/source/form_helpers.md commit ccdeb43 refs/heads/master Merge: b395265 7fe5ae8 Author: Aaron Patterson Date: 2014-04-25 12:37:08 -0500 Merge branch 'master' into adequaterecord * master: (28 commits) move AR length validation tests into separate test-case. No need for trailing slash on migration path. reset `@arel` when modifying a Relation in place. PostgreSQL Timestamps always map to `:datetime`. [ci skip] Improve formatting and yml Fix a typo in the doc of forty_two AR FinderMethod Improve readability of contributing to rails guide. [ci skip] Precompile the image we're referencing, too. `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions. Fixed an issue with migrating legacy json cookies. Correct comment [ci skip] Perfer to define methods instead of calling test Fix syntax error Add CHANGELOG entry for #14757 [ci skip] Fix run-on sentences and improve grammar [skip ci] Add test for using ActionView::Helpers::FormHelper.label with block and html select! renamed to avoid name collision Array#select! Rearrange deck chairs on the titanic. Organize connection handling test cases. Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. ActionController::Renderers documentation fix ... commit 7fe5ae8 refs/heads/master Author: Yves Senn Date: 2013-03-25 16:00:24 +0100 move AR length validation tests into separate test-case. Conflicts: activerecord/test/cases/validations/association_validation_test.rb M activerecord/test/cases/validations/association_validation_test.rb A activerecord/test/cases/validations/length_validation_test.rb commit 906f339 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-03-29 15:41:26 +0100 Merge pull request #13890 from achempion/syntax-error-backtrace append link to bad code when error type is SyntaxError Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/test/dispatch/debug_exceptions_test.rb commit 960707a refs/heads/master Author: Jeremy Kemper Date: 2014-04-24 16:14:08 -0500 No need for trailing slash on migration path. Causes a double // in Dir.glob that breaks Ruby 2.2-trunk. Not really a bug, but not relevant to this test either. Originally added in ed21f0c50270139ddb6993acfdaea4586ffd09a3 M activerecord/test/cases/migrator_test.rb commit 1b7aa62 refs/heads/master Author: Yves Senn Date: 2014-04-24 12:34:33 -0500 reset `@arel` when modifying a Relation in place. /cc @tenderlove M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/lib/active_record/relation/query_methods.rb commit 10ed701 refs/heads/master Merge: a5db212 d080e8c Author: Yves Senn Date: 2014-04-24 12:39:02 -0500 Merge pull request #14859 from jefflai2/datetime_type PostgreSQL Timestamps always map to `:datetime`. commit d080e8c refs/heads/master Author: Jefferson Lai Date: 2014-04-24 04:20:30 -0700 PostgreSQL Timestamps always map to `:datetime`. The PG Adapter should use `:datetime` consistently instead of mapping mispellings to `:timestamp`. See #14513 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb commit a5db212 refs/heads/master Merge: 43101ab c480767 Author: Santiago Pastorino Date: 2014-04-24 10:16:18 -0500 Merge pull request #14856 from Gaurav2728/gaurav-typo_fix [ci skip] Improve formatting and yml commit c480767 refs/heads/master Author: Gaurav Sharma Date: 2014-04-16 17:10:26 +0530 [ci skip] Improve formatting and yml M actionmailer/lib/action_mailer/base.rb commit 24d8206 refs/remotes/origin/4-1-stable Author: Eric Bouchut Date: 2014-04-24 10:55:52 +0200 Fix a typo in the doc of forty_two AR FinderMethod [ci skip] M activerecord/lib/active_record/relation/finder_methods.rb commit 43101ab refs/heads/master Merge: 12ad2a7 cd440c9 Author: Robin Dupret Date: 2014-04-24 11:25:53 +0200 Merge pull request #14858 from ebouchut/patch-1 Fix a typo in the doc of forty_two AR FinderMethod [ci skip] commit cd440c9 refs/heads/master Author: Eric Bouchut Date: 2014-04-24 10:55:52 +0200 Fix a typo in the doc of forty_two AR FinderMethod M activerecord/lib/active_record/relation/finder_methods.rb commit 9c3afdc refs/heads/master Author: Jefferson Lai Date: 2014-02-10 03:00:05 -0800 Fixes Issue #13466. Changed the call to a scope block to be evaluated with instance_eval. The result is that ScopeRegistry can use the actual class instead of base_class when caching scopes so queries made by classes with a common ancestor won't leak scopes. M activerecord/CHANGELOG.md M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/scoping/named_scoping_test.rb M activerecord/test/fixtures/ratings.yml M activerecord/test/models/comment.rb M activerecord/test/models/rating.rb M activerecord/test/schema/schema.rb commit 12ad2a7 refs/heads/master Merge: 26ba863 1c2484d Author: Santiago Pastorino Date: 2014-04-23 16:13:10 -0500 Merge pull request #14843 from tgxworld/improve_readability_of_contributing_to_rails_guide [ci skip] Improve readability of contributing to rails guide. commit 4262797 refs/remotes/origin/4-0-stable Author: Matt Jones Date: 2014-04-18 14:43:45 -0400 Correctly handle joining scoped associations with table aliases. Backport of #14154 to 4-0-stable. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/scoping/default.rb M activerecord/test/cases/associations/inner_join_association_test.rb M activerecord/test/models/category.rb commit 1c7eec1 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-23 15:43:43 -0500 Merge pull request #14852 from matthewd/fix_build_for_assets Fix railties asset tests: precompile the image we're referencing Conflicts: railties/test/application/assets_test.rb M railties/test/application/assets_test.rb commit 26ba863 refs/heads/master Merge: 32cdc03 4f31b77 Author: Rafael Mendonça França Date: 2014-04-23 15:43:43 -0500 Merge pull request #14852 from matthewd/fix_build_for_assets Fix railties asset tests: precompile the image we're referencing commit 1c2484d refs/heads/master Author: Guo Xiang Tan Date: 2014-04-23 00:02:34 -0700 Improve readability of contributing to rails guide. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 4f31b77 refs/heads/master Author: Matthew Draper Date: 2014-04-24 04:44:20 +0930 Precompile the image we're referencing, too. You can't compile a file that references a non-compiled asset's path. .. unless you turn off asset runtime errors. Outside of a test case like this, `config.assets.precompile` would normally retain its default entry, which precompiles all images (and other non-JS/CSS files) that are in `app/assets`. M railties/test/application/assets_test.rb commit c20fe80 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-23 13:37:19 -0500 Merge pull request #14842 from lucasmazza/lm-no-touching-callbacks Move `NoTouching` down the inheritance chain on AR::Base Conflicts: activerecord/test/cases/timestamp_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb commit 32cdc03 refs/heads/master Merge: e201140 4866399 Author: Yves Senn Date: 2014-04-23 13:37:19 -0500 Merge pull request #14842 from lucasmazza/lm-no-touching-callbacks Move `NoTouching` down the inheritance chain on AR::Base commit 4866399 refs/heads/master Author: Lucas Mazza Date: 2014-04-22 23:37:13 -0500 `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions. Closes #14841. M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb commit e201140 refs/heads/master Merge: 650585d 2a412b3 Author: Guillermo Iguaran Date: 2014-04-23 12:48:02 -0500 Merge pull request #14850 from chancancode/fix_json_cookie_jar Fixed an issue with migrating legacy json cookies. commit 2a412b3 refs/heads/master Author: Godfrey Chan Date: 2014-04-23 11:07:50 -0500 Fixed an issue with migrating legacy json cookies. Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming cookies are marshal-encoded. This is not the case when `secret_token` is used in conjunction with the `:json` or `:hybrid` serializer. In those case, when upgrading to use `secret_key_base`, this would cause a `TypeError: incompatible marshal file format` and a 500 error for the user. Fixes #14774. *Godfrey Chan* M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb commit 0ce2e90 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-22 17:25:17 -0500 Merge pull request #14757 from estsauver/14752 Fix behavior of select! to be consistent with select #14752 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/delegation.rb activerecord/lib/active_record/relation/query_methods.rb activerecord/test/cases/relation/mutation_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/lib/active_record/relation/merger.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation_test.rb commit 650585d refs/heads/master Merge: d10e2ca 290b83d Author: Arthur Nogueira Neves Date: 2014-04-23 11:45:13 -0400 Merge pull request #14840 from akshay-vishnoi/doc_changes Correct comment [ci skip] commit b395265 refs/heads/master Author: Aaron Patterson Date: 2014-04-23 08:55:38 -0500 Revert "Edge Rails applications doesn't need to use arel master" This reverts commit 7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee. M railties/lib/rails/generators/app_base.rb commit 290b83d refs/heads/master Author: Akshay Vishnoi Date: 2014-04-23 14:15:03 +0530 Correct comment [ci skip] M activesupport/lib/active_support/inflector/methods.rb commit fda3653 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-22 18:29:16 -0500 Perfer to define methods instead of calling test This file is using this pattern already M activerecord/test/cases/associations/has_many_through_associations_test.rb commit ab4f8ec refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-22 18:27:19 -0500 Fix syntax error M activerecord/test/cases/associations/has_many_through_associations_test.rb commit d10e2ca refs/heads/master Author: Rafael Mendonça França Date: 2014-04-22 18:29:16 -0500 Perfer to define methods instead of calling test This file is using this pattern already M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 8116411 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-22 18:27:19 -0500 Fix syntax error M activerecord/test/cases/associations/has_many_through_associations_test.rb commit cfa53cc refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-22 17:25:17 -0500 Merge pull request #14757 from estsauver/14752 Fix behavior of select! to be consistent with select #14752 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/lib/active_record/relation/delegation.rb M activerecord/lib/active_record/relation/merger.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/mutation_test.rb commit 40335e7 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-22 18:17:01 -0500 Add CHANGELOG entry for #14757 [ci skip] M activerecord/CHANGELOG.md commit ba84bd9 refs/heads/master Merge: c26a690 70b377f Author: Rafael Mendonça França Date: 2014-04-22 17:25:17 -0500 Merge pull request #14757 from estsauver/14752 Fix behavior of select! to be consistent with select #14752 commit c35e438 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-22 17:20:52 -0500 Merge pull request #14573 from habermann24/has_many_through_fix Properly handle scoping with has_many :through. Fixes #14537. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/models/post.rb M activerecord/test/models/reader.rb commit c26a690 refs/heads/master Merge: 148d909 47a04b8 Author: Rafael Mendonça França Date: 2014-04-22 17:20:52 -0500 Merge pull request #14573 from habermann24/has_many_through_fix Properly handle scoping with has_many :through. Fixes #14537. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb commit 148d909 refs/heads/master Merge: 85c2141 459f7bf Author: Rafael Mendonça França Date: 2014-04-22 12:13:26 -0500 Merge pull request #14801 from kuldeepaggarwal/fix-string-inflection Fix inconsistent behavior from String#pluralize commit 86d6f05 refs/heads/master Author: Aaron Patterson Date: 2014-04-22 11:28:21 -0500 use statement cache for belongs_to relations M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/singular_association.rb M activerecord/lib/active_record/reflection.rb commit bdd6491 refs/heads/master Author: Aaron Patterson Date: 2014-04-22 10:51:20 -0500 extract record fetching to a method for belongs_to M activerecord/lib/active_record/associations/singular_association.rb commit 3601932 refs/remotes/origin/4-1-stable Author: Arun Agrawal Date: 2014-04-20 21:43:24 +0200 Changed miss-leading comment [ci skip] After this 21dbe6f39b57f52967e92716dbd5e2b894e7a64c 2.1.1 :001 > 'business'.classify => "Business" 2.1.1 :004 > 'calculus'.classify => "Calculu" 2.1.1 :005 > Conflicts: activesupport/lib/active_support/inflector/methods.rb M activesupport/lib/active_support/inflector/methods.rb commit 85c2141 refs/heads/master Merge: 99613f0 5b56db5 Author: Yves Senn Date: 2014-04-22 09:05:16 -0500 Merge pull request #14836 from jonatack/patch-5 Fix run-on sentences and improve grammar [skip ci] commit 5b56db5 refs/heads/master Author: Jon Atack Date: 2014-04-22 09:40:32 +0200 Fix run-on sentences and improve grammar [skip ci] M guides/source/getting_started.md commit 99613f0 refs/heads/master Merge: 0303d3a c8b7ad1 Author: Rafael Mendonça França Date: 2014-04-22 01:13:14 -0500 Merge pull request #13335 from glorieux/favicon_link_tag_mimetype Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. commit 0303d3a refs/heads/master Merge: 673cace 2717f00 Author: Rafael Mendonça França Date: 2014-04-22 01:03:29 -0500 Merge pull request #10764 from mokevnin/replace_class_eval_by_define_method replace class_eval by define_method in abstract_controller/callbacks commit 673cace refs/heads/master Merge: 6e6c76d 1161d10 Author: Rafael Mendonça França Date: 2014-04-22 00:58:22 -0500 Merge pull request #14835 from zzak/test_form_helper_label_with_block_and_html Add test for using ActionView::Helpers::FormHelper.label with block and html commit 1161d10 refs/heads/master Author: Zachary Scott Date: 2014-04-22 10:51:54 +0900 Add test for using ActionView::Helpers::FormHelper.label with block and html M actionview/lib/action_view/helpers/form_helper.rb M actionview/test/template/form_helper_test.rb commit 70b377f refs/heads/master Author: Earl J St Sauver Date: 2014-04-15 21:43:24 -0700 select! renamed to avoid name collision Array#select! Fixes #14752 Select mimics the block interface of arrays, but does not mock the block interface for select!. This change moves the api to be a private method, _select!. M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/lib/active_record/relation/delegation.rb M activerecord/lib/active_record/relation/merger.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/mutation_test.rb commit 6e6c76d refs/heads/master Author: Jeremy Kemper Date: 2014-04-21 15:54:28 -0500 Rearrange deck chairs on the titanic. Organize connection handling test cases. D activerecord/test/cases/connection_adapters/abstract_adapter_test.rb A activerecord/test/cases/connection_adapters/adapter_leasing_test.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb A activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb commit 957881a refs/heads/master Author: Xavier Noria Date: 2014-04-21 08:25:50 -0500 Revert "Revert "Revert "update doc, assert_template also accepts false""" Revert Festival! I reverted a reverted commit, undo. This reverts commit 07ea37763d62e57d5709ab37da01b2848d12edd5. M actionpack/lib/action_controller/test_case.rb commit 07ea377 refs/heads/master Author: Xavier Noria Date: 2014-04-21 08:21:12 -0500 Revert "Revert "update doc, assert_template also accepts false"" Reason: docrails policy is very strict about code. No matter how innocent the change, if it is not documentation it needs to go through a PR to rails/rails. Plase see the warning box at the bottom of http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation This reverts commit e1c5d24369440857de1402d61c85d982b29d8019. M actionpack/lib/action_controller/test_case.rb commit e1c5d24 refs/heads/master Author: Gaurish Sharma Date: 2014-04-21 18:33:19 +0530 Revert "update doc, assert_template also accepts false" This reverts commit 9b1c077c91f09b64b8105f31fdf5240cd12c2e16. my bad. `assert_template` only accepts a String, Symbol, Hash, Regexp or nil. `false`(layout: false) is provided as a Hash. M actionpack/lib/action_controller/test_case.rb commit 28bd442 refs/heads/master Author: Gaurish Sharma Date: 2014-04-21 18:09:22 +0530 Running AR tests on postgres, mysql & sqlite [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit c8b7ad1 refs/heads/master Author: glorieux Date: 2013-12-16 12:13:18 +0100 Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. Although the official IANA-registered MIME type for ICO files is image/vnd.microsoft.icon, registered in 2003, it was submitted to IANA by a third party and is not recognized by Microsoft products. The MIME type image/x-icon should be used since is the one recognized by the major browsers on the market. M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/asset_tag_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit 5adf6ca refs/heads/master Merge: 7b493d4 7fb0d21 Author: Arthur Nogueira Neves Date: 2014-04-20 18:44:07 -0400 Merge pull request #14826 from stevegraham/action_controller_renderer_doc_fix ActionController::Renderers documentation fix commit 7b493d4 refs/heads/master Merge: 50b849c 94799eb Author: Arun Agrawal Date: 2014-04-20 22:59:51 +0200 Merge pull request #14825 from arunagw/aa-remove-missleading-comment Removed missleading comment [ci skip] commit 7fb0d21 refs/heads/master Author: Stevie Graham Date: 2014-04-20 21:46:19 +0100 ActionController::Renderers documentation fix ActionController::Renderers::RENDERERS is an instance of Set. Docs incorrectly state that it's a Hash. M actionpack/lib/action_controller/metal/renderers.rb commit 94799eb refs/heads/master Author: Arun Agrawal Date: 2014-04-20 21:43:24 +0200 Changed miss-leading comment [ci skip] After this 21dbe6f39b57f52967e92716dbd5e2b894e7a64c 2.1.1 :001 > 'business'.classify => "Business" 2.1.1 :004 > 'calculus'.classify => "Calculu" 2.1.1 :005 > M activesupport/lib/active_support/inflector/methods.rb commit 94cd2f7 refs/heads/master Merge: 5cbf73c 86b0282 Author: Aaron Patterson Date: 2014-04-20 12:38:33 -0700 Merge branch 'master' into adequaterecord * master: (74 commits) [ci skip] builtin -> built-in Fix code indentation and improve formatting Grammar fix in Getting Started Guide Make URL escaping more consistent Optimize URI escaping Always escape string passed to url helper. Remove statement assuming coffee shop/public space wifi is inherently insecure Don't rely on Arel master in bug report template [ci skip] wrap methods in backticks [ci skip] "subhash" --> "sub-hash" multibyte_conformance.rb --> multibyte_conformance_test.rb Fix inconsistent behavior from String#first/#last `@destroyed` should always be set to `false` when an object is duped. remove warning `warning: ambiguous first argument; put parentheses or even spaces` :uglify -> :uglifier Regression test for irregular inflection on has_many Singularize association names before camelization Fix spelling and proper nouns Optimize select_value, select_values, select_rows and dry up checking whether to exec with cache for Postgresql adapter Include default rails protect_from_forgery with: :exception ... Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 50b849c refs/heads/master Merge: 86b0282 21dbe6f Author: Arun Agrawal Date: 2014-04-20 21:23:52 +0200 Merge pull request #14823 from kuldeepaggarwal/fix-inflector-example correct the classify example's output. commit 21dbe6f refs/heads/master Author: Kuldeep Aggarwal Date: 2014-04-21 00:44:52 +0530 [ci-skip] correct the classify example's output M activesupport/lib/active_support/inflector/methods.rb commit 2aef9fd refs/heads/master Author: Gaurish Sharma Date: 2014-04-20 23:54:39 +0530 Document ActionController::TestCase::Behavior::ClassMethods.process [ci skip] M actionpack/lib/action_controller/test_case.rb commit 2717f00 refs/heads/master Author: kirill Date: 2013-05-26 18:49:17 +0400 replace class_eval by define_method in abstract_controller/callbacks M actionpack/lib/abstract_controller/callbacks.rb commit 86b0282 refs/heads/master Merge: 0044bfb 0c2854f Author: Richard Schneeman Date: 2014-04-20 12:46:03 -0500 Merge pull request #14820 from akshay-vishnoi/doc_changes [ci skip] builtin -> built-in commit 0044bfb refs/heads/master Merge: b1000ea 1365af1 Author: Arthur Nogueira Neves Date: 2014-04-20 11:40:56 -0400 Merge pull request #14821 from jonatack/patch-5 Fix code indentation and improve formatting commit 0c2854f refs/heads/master Author: Akshay Vishnoi Date: 2014-04-20 21:03:09 +0530 [ci skip] builtin -> built-in M actionpack/lib/action_controller/metal/responder.rb M activesupport/lib/active_support/core_ext/time/conversions.rb M activesupport/lib/active_support/inflector/methods.rb M guides/source/active_support_core_extensions.md M guides/source/configuring.md M guides/source/form_helpers.md commit 1365af1 refs/heads/master Author: Jon Atack Date: 2014-04-20 17:26:51 +0200 Fix code indentation and improve formatting in the Getting Started Guide. This PR regroups #14817, #14818 and #14819 into one commit. [skip ci] M guides/source/getting_started.md commit b1000ea refs/heads/master Merge: 5460591 cd86201 Author: Robin Dupret Date: 2014-04-20 12:23:19 +0200 Merge pull request #14816 from jonatack/patch-2 Grammar fix in Getting Started Guide [ci skip] commit cd86201 refs/heads/master Author: Jon Atack Date: 2014-04-20 12:21:28 +0200 Grammar fix in Getting Started Guide M guides/source/getting_started.md commit 8a06764 refs/remotes/origin/4-1-stable Author: edogawaconan Date: 2014-04-07 15:34:21 +0900 Make URL escaping more consistent 1. Escape '%' characters in URLs - only unescaped data should be passed to URL helpers 2. Add an `escape_segment` helper to `Router::Utils` that escapes '/' characters 3. Use `escape_segment` rather than `escape_fragment` in optimized URL generation 4. Use `escape_segment` rather than `escape_path` in URL generation For point 4 there are two exceptions. Firstly, when a route uses wildcard segments (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This means that wildcard routes can't be optimized. Secondly, if a `:controller` segment is used in the path then this uses `escape_path` as the controller may be namespaced. Fixes #14629, #14636 and #14070. Cherry picked from: e2ef83f8387679ce540d745659a79dd13164f9b5 a61792574d9c8904590895f7a2f56803e02a6c52 5460591f0226a9d248b7b4f89186bd5553e7768f Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/router/utils.rb M actionpack/lib/action_dispatch/journey/visitors.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb M actionpack/test/journey/router/utils_test.rb M actionpack/test/journey/router_test.rb commit 5460591 refs/heads/master Author: Andrew White Date: 2014-04-20 10:08:32 +0100 Make URL escaping more consistent 1. Escape '%' characters in URLs - only unescaped data should be passed to URL helpers 2. Add an `escape_segment` helper to `Router::Utils` that escapes '/' characters 3. Use `escape_segment` rather than `escape_fragment` in optimized URL generation 4. Use `escape_segment` rather than `escape_path` in URL generation For point 4 there are two exceptions. Firstly, when a route uses wildcard segments (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This means that wildcard routes can't be optimized. Secondly, if a `:controller` segment is used in the path then this uses `escape_path` as the controller may be namespaced. Fixes #14629, #14636 and #14070. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/router/utils.rb M actionpack/lib/action_dispatch/journey/visitors.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb M actionpack/test/journey/router/utils_test.rb M actionpack/test/journey/router_test.rb commit a617925 refs/heads/master Author: Andrew White Date: 2014-04-19 18:37:41 +0100 Optimize URI escaping The URI::Parser#escape method is a general use method that has to deal with a variety of input however our use of it is limited in scope so we can increase the performance by implementing our specific needs within ActionDispatch::Journey::Router::Utils directly. If there is no encoding required then there is no change in performance or number of objects allocated, but for each character that needs to be encoded we save five object allocations and gain a performance boost. The performance boost seen varies from 20% when there is one character to over 50% when encoding ten characters. M actionpack/lib/action_dispatch/journey/router/utils.rb commit e2ef83f refs/heads/master Author: edogawaconan Date: 2014-04-07 15:34:21 +0900 Always escape string passed to url helper. Makes it clear that anything passed with the helper must not be percent encoded. Fixes previous behavior which tricks people into believing passing non-percent-encoded will generate a proper percent-encoded path while in reality it doesn't ('%' isn't escaped). The intention is nice but the heuristic is broken. M actionpack/lib/action_dispatch/journey/router/utils.rb M actionpack/test/journey/router/utils_test.rb commit 9b1c077 refs/heads/master Author: Gaurish Sharma Date: 2014-04-20 03:23:01 +0530 update doc, assert_template also accepts false [ci skip] M actionpack/lib/action_controller/test_case.rb commit c524556 refs/heads/master Merge: 6642407 66e5844 Author: Guillermo Iguaran Date: 2014-04-19 15:19:47 -0500 Merge pull request #14811 from qrush/master Remove statement assuming coffee shop/public space wifi is inherently insecure commit 0fd301a refs/heads/master Author: Gaurish Sharma Date: 2014-04-20 01:39:52 +0530 Remove reference to outdated section [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 8de5f7e refs/heads/master Author: Lucas Clemente Date: 2014-02-06 22:58:25 +0100 skip migration check if adapter doesn't support it M activerecord/lib/active_record/migration.rb A activerecord/test/cases/migration/pending_migrations_test.rb commit 66e5844 refs/heads/master Author: Nick Quaranto Date: 2014-04-19 15:19:09 -0400 Remove statement assuming coffee shop/public space wifi is inherently insecure M guides/source/security.md commit 6642407 refs/heads/master Merge: 116864d fd6d783 Author: Godfrey Chan Date: 2014-04-19 11:18:35 -0700 Merge pull request #14810 from robin850/patch-18 Don't rely on Arel master in bug report template commit fd6d783 refs/heads/master Author: Robin Dupret Date: 2014-04-19 18:25:11 +0200 Don't rely on Arel master in bug report template [ci skip] We should rely instead on the version supported by Active Record Closes #14809 M guides/bug_report_templates/active_record_master.rb commit 6d71384 refs/heads/master Author: ZENATI YASSINE Date: 2014-04-19 18:18:03 +0200 [ci skip] Added example for number_field_tag method M actionview/lib/action_view/helpers/form_tag_helper.rb commit 320d436 refs/heads/master Author: ZENATI YASSINE Date: 2014-04-19 18:09:07 +0200 [ci skip] Added example for date_field_tag method M actionview/lib/action_view/helpers/form_tag_helper.rb commit fb955f1 refs/heads/master Author: ZENATI YASSINE Date: 2014-04-19 18:05:18 +0200 [ci skip] Added example for email_field_tag method M actionview/lib/action_view/helpers/form_tag_helper.rb commit 116864d refs/heads/master Merge: d39a0d8 89a1809 Author: Andrew White Date: 2014-04-19 15:49:26 +0100 Merge pull request #14805 from akshay-vishnoi/structure-change multibyte_conformance.rb --> multibyte_conformance_test.rb commit d39a0d8 refs/heads/master Merge: 92d92b0 fe8a6ba Author: Arthur Nogueira Neves Date: 2014-04-19 09:46:08 -0500 Merge pull request #14804 from akshay-vishnoi/doc_changes "subhash" --> "sub-hash" commit 92d92b0 refs/heads/master Merge: 5f72fc6 5facaca Author: Xavier Noria Date: 2014-04-19 13:06:32 +0200 Merge pull request #14808 from akalyaev/few-corrections-in-rails-initialization-guides Few corrections in Rails Initialization Guides commit 5facaca refs/heads/master Author: Anton Kalyaev Date: 2014-04-19 14:19:53 +0400 wrap methods in backticks [ci skip] M guides/source/initialization.md commit fe8a6ba refs/heads/master Author: Akshay Vishnoi Date: 2014-04-19 04:03:43 +0530 "subhash" --> "sub-hash" M actionpack/lib/action_dispatch/http/filter_parameters.rb M activesupport/test/core_ext/hash_ext_test.rb M guides/source/action_controller_overview.md commit 89a1809 refs/heads/master Author: Akshay Vishnoi Date: 2014-04-19 02:22:42 +0530 multibyte_conformance.rb --> multibyte_conformance_test.rb D activesupport/test/multibyte_conformance.rb A activesupport/test/multibyte_conformance_test.rb commit 459f7bf refs/heads/master Author: Kuldeep Aggarwal Date: 2014-04-19 01:31:07 +0530 Fix inconsistent behavior from String#pluralize Before: When calling String#pluralize with count=1 then it returned same string, but with count other than 1, returned new string. After: String#pluralize always return a new string. => Prevent mutation of a string inadvertently. M activesupport/lib/active_support/core_ext/string/inflections.rb M activesupport/test/core_ext/string_ext_test.rb commit 5f72fc6 refs/heads/master Merge: 9935208 9e67954 Author: Rafael Mendonça França Date: 2014-04-18 16:00:57 -0300 Merge pull request #14799 from ernie/string-first-last-fix Fix inconsistent behavior from String#first/#last commit 9e67954 refs/heads/master Author: Ernie Miller Date: 2014-04-18 14:55:30 -0400 Fix inconsistent behavior from String#first/#last While calling String#first or String#last with zero or a Fixnum < the string's length returns a new string, a Fixnum >= the string's length returns the string itself. This inconsistency can lead to inadvertent mutation of a string. M activesupport/lib/active_support/core_ext/string/access.rb M activesupport/test/core_ext/string_ext_test.rb commit d63c39f refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-04-18 20:38:38 +0200 Merge pull request #14796 from kuldeepaggarwal/fix-save-issue when a destroyed record is duped, it is no longer ´destroyed?`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/test/cases/persistence_test.rb commit c1d9c11 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-18 20:38:38 +0200 Merge pull request #14796 from kuldeepaggarwal/fix-save-issue when a destroyed record is duped, it is no longer ´destroyed?`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/test/cases/persistence_test.rb commit 9935208 refs/heads/master Merge: 98e8c96 5fe4e62 Author: Yves Senn Date: 2014-04-18 20:38:38 +0200 Merge pull request #14796 from kuldeepaggarwal/fix-save-issue when a destroyed record is duped, it is no longer ´destroyed?`. commit 5fe4e62 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-04-19 00:01:01 +0530 `@destroyed` should always be set to `false` when an object is duped. M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/test/cases/persistence_test.rb commit 98e8c96 refs/heads/master Merge: c2fa85f 03042b0 Author: Yves Senn Date: 2014-04-18 19:47:16 +0200 Merge pull request #14798 from kuldeepaggarwal/fix-warning remove warning while running TEST CASES commit 03042b0 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-04-18 23:15:42 +0530 remove warning `warning: ambiguous first argument; put parentheses or even spaces` M activerecord/test/cases/sanitize_test.rb commit c2fa85f refs/heads/master Merge: 2ff138b e507193 Author: Vijay Dev Date: 2014-04-18 21:59:44 +0530 Merge branch 'master' of github.com:rails/docrails commit 2ff138b refs/heads/master Merge: 1aeb5e7 d5acf61 Author: Rafael Mendonça França Date: 2014-04-18 11:45:02 -0300 Merge pull request #14795 from braddunbar/uglifier :uglify -> :uglifier commit d5acf61 refs/heads/master Author: Brad Dunbar Date: 2014-04-18 10:35:56 -0400 :uglify -> :uglifier The name of the gem is `uglifier` and all other references use `uglifier`, not `uglify`. M guides/source/asset_pipeline.md commit 1aeb5e7 refs/heads/master Merge: d1756ba 1a7338d Author: Rafael Mendonça França Date: 2014-04-18 11:15:40 -0300 Merge pull request #14790 from krisselden/optimize-postgres-selects Optimize select_value, select_values, select_rows in Postgresql adapter. commit 88d8f6e refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-18 10:51:21 -0300 Merge pull request #14793 from arthurnn/fixes_8928 Fixed has_many association to make it support irregular inflections. M activerecord/CHANGELOG.md M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/reflection_test.rb commit 87a2f02 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-18 10:51:21 -0300 Merge pull request #14793 from arthurnn/fixes_8928 Fixed has_many association to make it support irregular inflections. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/reflection_test.rb commit d1756ba refs/heads/master Merge: a3fd6e7 c0b6e16 Author: Rafael Mendonça França Date: 2014-04-18 10:51:21 -0300 Merge pull request #14793 from arthurnn/fixes_8928 Fixed has_many association to make it support irregular inflections. commit c0b6e16 refs/heads/master Author: Arthur Neves Date: 2014-04-18 01:11:47 -0400 Regression test for irregular inflection on has_many Also add a Changelog entry [related #9702] [fixes #8928] M activerecord/CHANGELOG.md M activerecord/test/cases/reflection_test.rb commit bcfa2bf refs/heads/master Author: Javier Goizueta Date: 2013-03-13 16:54:25 +0100 Singularize association names before camelization So that irregular multi-word pluralization rules have to be defined only for snake-case strings. M activerecord/lib/active_record/reflection.rb commit e507193 refs/heads/master Author: Steven Harman Date: 2014-04-17 23:24:41 -0400 Fix spelling and proper nouns [ci skip] M guides/source/asset_pipeline.md M guides/source/command_line.md commit a3fd6e7 refs/heads/master Merge: 1de258e d315275 Author: Rafael Mendonça França Date: 2014-04-17 19:14:08 -0300 Merge pull request #14786 from PaulL1/patch-1 CSRF protection should rescue exception not extend commit 1a7338d refs/heads/master Author: Kris Selden Date: 2014-04-17 14:18:58 -0700 Optimize select_value, select_values, select_rows and dry up checking whether to exec with cache for Postgresql adapter Reduces creating unused objects, with the most dramatic reduction in select_values which used to map(&:first) an array of single element arrays. M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit d315275 refs/heads/master Author: PaulL1 Date: 2014-04-17 21:20:17 +0200 Include default rails protect_from_forgery with: :exception Extend previous changes, include the default line from the application controller that new rails applications are created with: protect_from_forgery with: :exception Minor wording changes to align. M guides/source/security.md commit 1de258e refs/heads/master Author: Rafael Mendonça França Date: 2014-04-17 16:15:43 -0300 Remove wrapper div for inputs in button_to Related with cbb917455f306cf5818644b162f22be09f77d4b2 M actionpack/test/controller/request_forgery_protection_test.rb M actionview/lib/action_view/helpers/url_helper.rb M actionview/test/template/url_helper_test.rb commit dd5f831 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-17 16:14:40 -0300 Update Request forgery tests to remove input wrappign div This was changed at cbb917455f306cf5818644b162f22be09f77d4b2 M actionpack/test/controller/request_forgery_protection_test.rb commit cbb9174 refs/heads/master Merge: c91a531 89ff1f8 Author: Rafael Mendonça França Date: 2014-04-17 15:29:37 -0300 Merge pull request #14738 from tilsammans/pull/11407 Remove wrapping div with inline styles for hidden form fields. Conflicts: actionview/CHANGELOG.md commit c91a531 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-17 14:50:52 -0300 Add CHANGELOG entry for #14755 [ci skip] M actionpack/CHANGELOG.md commit d1c5e4b refs/heads/master Author: Rafael Mendonça França Date: 2014-04-17 14:49:02 -0300 Change the method description M actionpack/test/dispatch/uploaded_file_test.rb commit 6a13ed7 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-17 14:48:51 -0300 Implement to_io as an alias M actionpack/lib/action_dispatch/http/upload.rb commit b77d10f refs/heads/master Merge: 27a0a4b e601728 Author: Rafael Mendonça França Date: 2014-04-17 14:46:45 -0300 Merge pull request #14755 from timlinquist/to_io_http_upload Use common to_io so users can access the underlying IO object commit b8a91a6 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-16 19:03:25 -0300 Merge pull request #14783 from hakanensari/autoload-strict-validation-failed Autoload ActiveModel::StrictValidationFailed M activemodel/lib/active_model.rb commit 2a72514 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-16 19:03:25 -0300 Merge pull request #14783 from hakanensari/autoload-strict-validation-failed Autoload ActiveModel::StrictValidationFailed M activemodel/lib/active_model.rb commit 27a0a4b refs/heads/master Merge: 542457b 4db2e1f Author: Rafael Mendonça França Date: 2014-04-17 14:24:41 -0300 Merge pull request #14788 from arthurnn/conn_adpt_api Bring SQLite3Adpter init API closer to others commit 4db2e1f refs/heads/master Author: Arthur Neves Date: 2014-04-17 12:10:20 -0400 Bring SQLite3Adpter init API closer to others M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 92fd44b refs/heads/master Author: PaulL1 Date: 2014-04-17 14:04:40 +0200 CSRF protection should rescue exception not extend I think the changes to the default behaviour mean that rails will throw an exception when an invalid authenticity token is found. The previous proposed code of calling super then sign_out meant that sign_out was never reached - the exception handler never returned. I think the best approach now is to catch the exception, although I'm not 100% certain on that. M guides/source/security.md commit 542457b refs/heads/master Merge: db5a610 9be22bd Author: Rafael Mendonça França Date: 2014-04-16 19:03:25 -0300 Merge pull request #14783 from hakanensari/autoload-strict-validation-failed Autoload ActiveModel::StrictValidationFailed commit 9be22bd refs/heads/master Author: hakanensari Date: 2014-04-16 22:48:51 +0100 Autoload ActiveModel::StrictValidationFailed Currently, if environment doesn’t eager load code, invoking this constant before calling #valid? on a model instance results in a NameError. M activemodel/lib/active_model.rb commit db5a610 refs/heads/master Merge: 4134d42 c0c646f Author: Rafael Mendonça França Date: 2014-04-16 16:56:42 -0300 Merge pull request #14781 from zenati/master [ci skip] Added examples for telephone_field_tag and url_field_tag methods commit c0c646f refs/heads/master Author: ZENATI YASSINE Date: 2014-04-16 21:53:20 +0200 [ci skip] Added examples for url_field_tag method M actionview/lib/action_view/helpers/form_tag_helper.rb commit 1292051 refs/heads/master Author: ZENATI YASSINE Date: 2014-04-16 21:49:39 +0200 [ci skip] Added examples for telephone_field_tag method M actionview/lib/action_view/helpers/form_tag_helper.rb commit 4134d42 refs/heads/master Merge: 11eb1e3 4d566ee Author: Rafael Mendonça França Date: 2014-04-16 16:48:25 -0300 Merge pull request #14780 from zenati/master [ci skip] Added examples for search_field_tag method commit 4d566ee refs/heads/master Author: ZENATI YASSINE Date: 2014-04-16 21:41:10 +0200 [ci skip] Added examples for search_field_tag method M actionview/lib/action_view/helpers/form_tag_helper.rb commit 11eb1e3 refs/heads/master Merge: 8fab384 235e0d9 Author: Rafael Mendonça França Date: 2014-04-16 16:34:06 -0300 Merge pull request #14779 from zenati/master [ci skip] Added examples for color_field_tag method commit 8fab384 refs/heads/master Merge: c1dc647 2c99e58 Author: Arthur Nogueira Neves Date: 2014-04-16 15:31:54 -0400 Merge pull request #14771 from heironimus/i18n_guide_reorder Reorder i18n guide commit 235e0d9 refs/heads/master Author: ZENATI YASSINE Date: 2014-04-16 21:15:01 +0200 [ci skip] Added examples for color_field_tag method M actionview/lib/action_view/helpers/form_tag_helper.rb commit 2c99e58 refs/heads/master Author: Kyle Heironimus Date: 2014-04-15 23:43:46 -0500 [skip ci] Reorder i18n guide Currently, the section called "How to store your custom translations" has several subheadings that make no sense, such as "Translations for ActiveRecord models." These make more sense under the "Overview of the I18n API Features" section. I moved the "How to store..." section down to the more appropriate sub-headings "Using Different Backends" and "Using Different Exception Handlers" and removed the "Customize your i18n setup" header. M guides/source/i18n.md commit 4bdff5b refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-03-31 19:09:32 -0700 Merge pull request #14546 from eileencodes/fix_delete_all_to_not_use_IN_statement Fix delete all to not produce sql in statement Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb Merge pull request #14727 from robin850/patch-17 Add a changelog entry for #14546 [ci skip] Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/test_case.rb commit f5417fc refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-04-16 17:03:24 +0200 Merge pull request #14773 from eric-chahin/null_relation_fix Changed the NullRelation so that when count is called with #group it wil... Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/null_relation.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/null_relation.rb M activerecord/test/cases/relations_test.rb commit b31b2fe refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-16 17:03:24 +0200 Merge pull request #14773 from eric-chahin/null_relation_fix Changed the NullRelation so that when count is called with #group it wil... Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/null_relation.rb M activerecord/test/cases/relations_test.rb commit c1dc647 refs/heads/master Merge: 973a452 93f8525 Author: Yves Senn Date: 2014-04-16 17:03:24 +0200 Merge pull request #14773 from eric-chahin/null_relation_fix Changed the NullRelation so that when count is called with #group it wil... commit 973a452 refs/heads/master Author: Yves Senn Date: 2014-04-16 16:45:10 +0200 `sanitize_sql_like` escapes `escape_character` not only backslash. * This is a follow up to: fe4b0eee05f59831e1468ed50f55fbad0ce11e1d * The originating PR is #14222 * It should fix the build M activerecord/lib/active_record/sanitization.rb M activerecord/test/cases/sanitize_test.rb commit fa83601 refs/heads/master Merge: fe4b0ee 82acd0e Author: Arthur Nogueira Neves Date: 2014-04-16 10:49:26 -0400 Merge pull request #11836 from mcfiredrill/engines-testing-doc additional note about routes in functional tests for engines [ci skip] commit 93f8525 refs/heads/master Author: Eric Chahin Date: 2014-04-16 02:27:26 -0400 Changed the NullRelation so that when count is called with #group it will properly return an empty hash instead of zero. Fixes issue #14721 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/null_relation.rb M activerecord/test/cases/relations_test.rb commit fe4b0ee refs/heads/master Author: Rob Gilson Date: 2014-02-27 13:34:21 -0500 SQL Like escaping helper method. [Rob Gilson & Yves Senn] Closes #14222. This is a follow up to #6104 This does not have the backwards compatibility issues brought up in implementation to break. M activerecord/CHANGELOG.md M activerecord/lib/active_record/sanitization.rb M activerecord/test/cases/sanitize_test.rb commit 4988d34 refs/remotes/origin/4-1-stable Author: Emily Dobervich Date: 2014-04-08 16:24:35 -0700 Fixed problem where `1.day.eql?(1.day)` is false This fixes: 1.second.eql?(1.second) #=> false The new `eql?` requires that `other` is an `ActiveSupport::Duration`. This requirement makes `ActiveSupport::Duration`'s behavior consistent with other numeric types in Ruby. 1.eql?(1.0) #=> false 1.0.eql?(1) #=> false 1.second.eql?(1) #=> false (was true) 1.eql?(1.second) #=> false { 1 => "foo", 1.0 => "bar" } #=> { 1 => "foo", 1.0 => "bar" } { 1 => "foo", 1.second => "bar" } # now => { 1 => "foo", 1.second => "bar" } # was => { 1 => "bar" } And though the behavior here hasn't changed, for reference: 1 == 1.0 #=> true 1.0 == 1 #=> true 1 == 1.second #=> true 1.second == 1 #=> true Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/duration.rb M activesupport/test/core_ext/duration_test.rb commit 112896b refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-15 22:21:13 -0300 Merge pull request #14770 from crazymykl/avoid_dos_vuln_in_i18n_guide Avoid suggesting dangerous code in i18n guide Conflicts: guides/source/i18n.md M guides/source/i18n.md commit a1439bb refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-15 22:21:13 -0300 Merge pull request #14770 from crazymykl/avoid_dos_vuln_in_i18n_guide Avoid suggesting dangerous code in i18n guide M guides/source/i18n.md commit d46771b refs/heads/master Merge: e665ce7 19b2bcc Author: Rafael Mendonça França Date: 2014-04-15 22:21:13 -0300 Merge pull request #14770 from crazymykl/avoid_dos_vuln_in_i18n_guide Avoid suggesting dangerous code in i18n guide commit 19b2bcc refs/heads/master Author: Mike MacDonald Date: 2014-04-15 21:03:28 -0400 [ci skip] Avoid suggesting dangerous code in i18n guide Calling `to_sym` on user input opens apps up to Denial of Service attacks, via the symbol table being expanded to consume vast swathes of memory. It is a fairly common configuration to have DNS configured such that all subdomains route to your Rails app, in which case an attacker visits `www1.foo.com`, `www2.foo.com`, and so on until something gives. It is far less likely to have this problem with TLDs, so that change was only for consistency. M guides/source/i18n.md commit e665ce7 refs/heads/master Merge: a21fae7 e120d21 Author: Rafael Mendonça França Date: 2014-04-15 19:10:24 -0300 Merge pull request #14733 from akshay-vishnoi/test-cases Improve tests for duplicable, remove unnecessary constant commit e120d21 refs/heads/master Author: Akshay Vishnoi Date: 2014-04-16 03:34:26 +0530 Object#duplicable? 1. Improve tests 2. Remove unnecessary constant 3. Add docs for BigDecimal#duplicable? M activesupport/lib/active_support/core_ext/object/duplicable.rb M activesupport/test/core_ext/object/duplicable_test.rb commit 5f8b8c3 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-15 18:17:57 -0300 Fix merge conflict M railties/test/application/configuration_test.rb commit 945c44c refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-15 18:02:14 -0300 Merge pull request #14768 from spectator/ac_metal_docfix Update AC::Metal documentation example [ci skip] M actionpack/lib/action_controller/metal.rb commit a21fae7 refs/heads/master Merge: f02393c 5f11d13 Author: Rafael Mendonça França Date: 2014-04-15 18:02:14 -0300 Merge pull request #14768 from spectator/ac_metal_docfix Update AC::Metal documentation example commit 5f11d13 refs/heads/master Author: Yury Velikanau Date: 2014-04-15 13:57:42 -0700 Update AC::Metal documentation example [ci skip] Include proper module since AV was extracted form AP as mentioned in #14659. M actionpack/lib/action_controller/metal.rb commit b0fa1a6 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-15 17:17:19 -0300 Merge pull request #14766 from eric-chahin/migration_bug Changed change_column in PG schema_statements.rb to make sure that the u... Conflicts: activerecord/test/cases/adapters/postgresql/uuid_test.rb Conflicts: activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit 00fd52b refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-15 17:17:19 -0300 Merge pull request #14766 from eric-chahin/migration_bug Changed change_column in PG schema_statements.rb to make sure that the u... Conflicts: activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit f02393c refs/heads/master Author: Rafael Mendonça França Date: 2014-04-15 17:24:49 -0300 Add CHANGELOG entry for #14766 [ci skip] M activerecord/CHANGELOG.md commit e482696 refs/heads/master Merge: 3870ce0 7af987c Author: Rafael Mendonça França Date: 2014-04-15 17:19:31 -0300 Merge pull request #14765 from byroot/refactor-counter-cache-create-and-destroy Refactor counter cache create and destroy commit 3870ce0 refs/heads/master Merge: 3fce111 eaa3949 Author: Rafael Mendonça França Date: 2014-04-15 17:17:19 -0300 Merge pull request #14766 from eric-chahin/migration_bug Changed change_column in PG schema_statements.rb to make sure that the u... commit eaa3949 refs/heads/master Author: Eric Chahin Date: 2014-04-15 16:08:04 -0400 Changed change_column in PG schema_statements.rb to make sure that the uuid_generate function was not being quoted. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit 7af987c refs/heads/master Author: Jean Boussier Date: 2014-04-15 14:21:35 -0400 Hide BelongsToAssociation#increment_counters and #decrement_counters M activerecord/lib/active_record/associations/belongs_to_association.rb M activerecord/lib/active_record/associations/builder/belongs_to.rb commit d254341 refs/heads/master Author: Jean Boussier Date: 2014-04-15 14:11:47 -0400 Restore the destroy_by_association check in post destroy counter cache M activerecord/lib/active_record/counter_cache.rb commit c5e083a refs/heads/master Author: schneems Date: 2014-04-15 13:06:20 -0500 [ci skip] document `statement_limit` Per discussion at https://github.com/rails/rails/issues/14645#issuecomment-40499409 M guides/source/configuring.md commit b415390 refs/heads/master Author: schneems Date: 2014-04-15 12:56:33 -0500 [ci skip] PP does not generate pass by default This was changed in https://github.com/rails/rails/pull/13415/files M guides/source/configuring.md commit e601728 refs/heads/master Author: Tim Linquist Date: 2014-04-15 11:05:08 -0700 Provide interface for accessing underlying IO object In some cases users may need to work with/manipulate more of the Tempfile api than provided by Upload. Allow users to get at the underlying io via the common to_io method of IO/IO-like objects M actionpack/lib/action_dispatch/http/upload.rb M actionpack/test/dispatch/uploaded_file_test.rb commit ca13cc1 refs/heads/master Author: Waynn Lue Date: 2014-04-15 11:04:07 -0700 re-phrase how to run a test M actionpack/RUNNING_UNIT_TESTS.rdoc commit 5e32f97 refs/heads/master Author: Jean Boussier Date: 2014-04-15 13:35:02 -0400 Set _after_create_counter_called flag to make update counter cache work M activerecord/lib/active_record/counter_cache.rb commit 5cbf73c refs/heads/master Author: Aaron Patterson Date: 2014-04-15 09:28:13 -0700 use cache queries for hm:t associations M activerecord/lib/active_record/associations/has_many_through_association.rb commit a5a2542 refs/heads/master Author: schneems Date: 2014-04-15 11:01:04 -0500 [ci skip] Use valid current config in example `reaping_frequency` is used in Active Record `reap_frequency` is not M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 3fce111 refs/heads/master Merge: ccdea7b 59dbf68 Author: Rafael Mendonça França Date: 2014-04-15 12:51:59 -0300 Merge pull request #14745 from razum2um/plain-text-diagnostics Display diagnostics in text format for xhr request commit ccdea7b refs/heads/master Merge: 5a0d804 b335def Author: Arthur Nogueira Neves Date: 2014-04-15 10:17:53 -0400 Merge pull request #14762 from dwo/master use YAML.load_file in database tasks example commit 6047c6b refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-15 10:54:26 -0300 Merge pull request #14756 from laurocaetano/fix-count-on-association-relation Fix count on association relation (calls to empty and size). M activerecord/lib/active_record/association_relation.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/relations_test.rb commit 5a0d804 refs/heads/master Merge: a230530 a9416a4 Author: Rafael Mendonça França Date: 2014-04-15 10:54:26 -0300 Merge pull request #14756 from laurocaetano/fix-count-on-association-relation Fix count on association relation (calls to empty and size). commit b335def refs/heads/master Author: Robin Tweedie Date: 2014-04-15 13:12:49 +0100 use YAML.load_file in database tasks example rather than YAML.load(File.read(path)). YAML.load_file is also used in guides/rails_guides/helper.rb since 2011, the only other precedent I could find. M activerecord/lib/active_record/tasks/database_tasks.rb commit 39a607f refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-15 10:19:47 +0200 Merge pull request #14758 from JuanitoFatas/migrations-md [ci skip] Add missing end in one of the examples in Migrations.md. M guides/source/migrations.md commit a230530 refs/heads/master Merge: 8167807 2e57d51 Author: Yves Senn Date: 2014-04-15 10:19:47 +0200 Merge pull request #14758 from JuanitoFatas/migrations-md [ci skip] Add missing end in one of the examples in Migrations.md. commit 2e57d51 refs/heads/master Author: Juanito Fatas Date: 2014-04-15 15:57:09 +0800 [ci skip] Add missing end in one of the examples in Migrations.md. M guides/source/migrations.md commit f23e30b refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-04-15 08:57:43 +0200 Merge pull request #14728 from stomar/assertion-msg Remove surplus period from assertion messages M actionpack/lib/action_dispatch/testing/assertions/selector.rb M actionpack/test/controller/assert_select_test.rb commit ba71deb refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-15 08:57:43 +0200 Merge pull request #14728 from stomar/assertion-msg Remove surplus period from assertion messages M actionpack/lib/action_dispatch/testing/assertions/selector.rb M actionpack/test/controller/assert_select_test.rb commit 8167807 refs/heads/master Merge: ab529c8 ce6f472 Author: Yves Senn Date: 2014-04-15 08:57:43 +0200 Merge pull request #14728 from stomar/assertion-msg Remove surplus period from assertion messages commit ab529c8 refs/heads/master Merge: 43f5250 26ff72f Author: Yves Senn Date: 2014-04-15 08:48:49 +0200 Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribing Fix subscriptions not being unsubscribed. commit a9416a4 refs/heads/master Author: Lauro Caetano Date: 2014-04-14 21:35:49 -0300 Make sure the column_name is different from 'all'. 968c581ea34b5236af14805e6a77913b1cb36238 have fixed the EagerLoadTest, but not in the correct way. The problem was when `empty?` or `size` was called on relation. It was triggering `count(:all)`, which was passing `:all` as the column name to `count` on Calculations. On the other hand, the method `calculate` on Calculations was calling `construct_relation_for_association_calculations` instead of `perform_calculation`, because `has_include?` was returning `true` since `column_name` was present. To prevent calling the wrong method to perform the calculation, we have to check if the `column_name` is present and if it is different from `:all` (which is now used to correctly do `count` with `select`). More information here: https://github.com/rails/rails/commit/968c581ea34b5236af14805e6a77913b1cb36238#commitcomment-6006135 M activerecord/lib/active_record/relation/calculations.rb commit 34945e4 refs/heads/master Author: Lauro Caetano Date: 2014-04-14 21:24:31 -0300 The Association Relation should use `empty?` and `size` from Relation. 968c581ea34b5236af14805e6a77913b1cb36238 have introduced this bug #14744 on Association Relation when the method `empty?` or `size` was called. Example: # Given an author that does have 3 posts, but none of them with the # title 'Some Title' Author.last.posts.where(title: 'Some Title').size # => 3 It was occurring, because the Association Relation had implemented these methods based on `@association`, this way giving wrong results. To fix it, was necessary to remove the methods `empty?` and `size` from Association Relation. It just have to use these methods from Relation. Example: # Given an author that does have 3 posts, but none of them with the # title 'Some Title' Author.last.posts.where(title: 'Some Title').size # => 0 # Now it will return the correct value. Fixes #14744. M activerecord/lib/active_record/association_relation.rb M activerecord/test/cases/relations_test.rb commit 1cd40d4 refs/heads/master Author: Aaron Patterson Date: 2014-04-14 17:14:19 -0700 oops. should probably double check in the DCL M activerecord/lib/active_record/reflection.rb commit bd3b28f refs/heads/master Author: Aaron Patterson Date: 2014-04-14 16:26:28 -0700 cache scope building on associations SQL statements for querying associations are now cached M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/reflection.rb commit 69da9a8 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-14 18:56:59 -0300 Make console and generators blocks works at Application instance level Like rake tasks and runner blocks these blocks should also being shared between applications since they are stored at the classes. Fixes #14748 Conflicts: railties/test/application/configuration_test.rb M railties/CHANGELOG.md M railties/lib/rails/application.rb M railties/test/application/configuration_test.rb M railties/test/application/multiple_applications_test.rb commit 43f5250 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-14 18:56:59 -0300 Make console and generators blocks works at Application instance level Like rake tasks and runner blocks these blocks should also being shared between applications since they are stored at the classes. Fixes #14748 M railties/CHANGELOG.md M railties/lib/rails/application.rb M railties/test/application/configuration_test.rb M railties/test/application/multiple_applications_test.rb commit e8c6628 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-14 18:51:34 -0300 :scissors: M railties/test/application/configuration_test.rb commit 4d21e49 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-14 16:59:47 -0300 Return null type format when format is not know When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/controller/mime/respond_to_test.rb commit ed6894b refs/heads/master Author: Rafael Mendonça França Date: 2014-04-14 14:40:38 -0300 Remove outdated comment M activerecord/test/models/pirate.rb commit 320124f refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-14 16:59:47 -0300 Return null type format when format is not know When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/controller/mime/respond_to_test.rb commit 75509d1 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-14 16:59:47 -0300 Return null type format when format is not know When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/controller/mime_responds_test.rb commit c52a84f refs/heads/master Merge: a1e2db2 e753148 Author: Richard Schneeman Date: 2014-04-14 14:14:46 -0500 Merge pull request #14729 from akshay-vishnoi/doc_changes [ci skip] Improve doc, fix grammatical issue commit 7e28b4e refs/heads/master Author: Jean Boussier Date: 2014-04-14 14:55:34 -0400 Use inheritance chain instead of callbacks to increment counter caches after destroy M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/lib/active_record/counter_cache.rb commit 316ee25 refs/heads/master Merge: 09608ce a1e2db2 Author: Aaron Patterson Date: 2014-04-14 11:49:36 -0700 Merge branch 'master' into adequaterecord * master: (70 commits) [ci skip] Added link to ruby-lang.org installation. Use the index on hidden field `collection_check_boxes` respects `:index` option for the hidden filed name. docs, double meaning of `serialize` argument. Closes #14284. Just call read_attribute, no need to use `send`. - Fix lingering reference to `:text` instead of the newer `:plain` - Section references `form_tag` instead of the `form_for` used in the example again, read_attribute is public, so just call it read_attribute is public, so we should just call it Disable assest cache store in docs [ci skip] Make counter cache decrementation on destroy idempotent Write the failing test case for concurrent counter cache [ci skip] Use plain underscore instead of "\_". Update documentation to use Rails.application instead Add a changelog entry for #14546 [ci skip] Move tests for deep_dup and duplicable to object directory Missing 'are' in note - [ci skip] CollectionHelpers now accepts a readonly option Fix a few typos [ci skip] Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows). don't bother with an offset if the offset is zero ... commit 109d1b2 refs/heads/master Author: Jean Boussier Date: 2014-04-14 14:28:26 -0400 Use inheritance chain instead of callbacks to increment counter caches after create M activerecord/lib/active_record/associations/belongs_to_association.rb M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/lib/active_record/counter_cache.rb commit 89ff1f8 refs/heads/master Author: Joost Baaij Date: 2014-04-14 00:38:46 +0200 Remove wrapping div with inline styles for hidden form fields. We are dropping HTML 4.01 and XHTML strict compliance since input tags directly inside a form are valid HTML5, and the absense of inline styles help in validating for Content Security Policy. M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/form_tag_helper.rb M actionview/test/activerecord/form_helper_activerecord_test.rb M actionview/test/template/form_helper_test.rb M actionview/test/template/form_tag_helper_test.rb commit a1e2db2 refs/heads/master Merge: 3bf8f8b 655a366 Author: Aaron Patterson Date: 2014-04-14 10:16:27 -0700 Merge pull request #14735 from byroot/idempotent-counter-caches Idempotent counter caches, fix concurrency issues with counter caches commit 26ff72f refs/heads/master Author: Guo Xiang Tan Date: 2014-04-07 21:42:27 -0700 Fix subscriptions not being unsubscribed. M actionpack/lib/action_controller/test_case.rb M actionview/lib/action_view/test_case.rb commit ce6f472 refs/heads/master Author: Marcus Stollsteimer Date: 2014-04-14 17:40:57 +0200 Refine tests for assert_select failure messages M actionpack/test/controller/assert_select_test.rb commit 3bf8f8b refs/heads/master Merge: 3842645 1497529 Author: Yves Senn Date: 2014-04-14 17:18:18 +0200 Merge pull request #14746 from zenati/master Reference and link to install RVM in the Getting Started Guide. [ci skip] commit 1497529 refs/heads/master Author: ZENATI YASSINE Date: 2014-04-14 15:55:11 +0200 [ci skip] Added link to ruby-lang.org installation. M guides/source/getting_started.md commit e0fe8dd refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-14 11:53:47 -0300 Use the index on hidden field M actionpack/test/template/form_helper_test.rb commit 3448ea0 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-14 11:41:03 -0300 Merge pull request #14736 from nashby/hidden-index `collection_check_boxes` respects `:index` option for the hidden filed name Conflicts: actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb actionpack/test/template/form_collections_helper_test.rb actionview/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb M actionpack/test/template/form_collections_helper_test.rb commit 3842645 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-14 11:53:47 -0300 Use the index on hidden field M actionview/test/template/form_helper_test.rb commit 5f768ea refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-14 11:53:47 -0300 Use the index on hidden field M actionview/test/template/form_helper_test.rb commit c07bfd3 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-14 11:41:03 -0300 Merge pull request #14736 from nashby/hidden-index `collection_check_boxes` respects `:index` option for the hidden filed name Conflicts: actionview/lib/action_view/helpers/tags/collection_check_boxes.rb actionview/test/template/form_collections_helper_test.rb M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/tags/collection_check_boxes.rb M actionview/test/template/form_collections_helper_test.rb commit d40d392 refs/heads/master Merge: 2e000ab 3964bbc Author: Rafael Mendonça França Date: 2014-04-14 11:41:03 -0300 Merge pull request #14736 from nashby/hidden-index `collection_check_boxes` respects `:index` option for the hidden filed name commit 3964bbc refs/heads/master Author: Vasiliy Ermolovich Date: 2014-04-13 21:58:42 +0300 `collection_check_boxes` respects `:index` option for the hidden filed name. closes #14147 M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/tags/collection_check_boxes.rb M actionview/test/template/form_collections_helper_test.rb commit 59dbf68 refs/heads/master Author: Vlad Bokov Date: 2014-04-14 20:45:40 +0700 Display diagnostics in text format for xhr request D actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb A actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb A actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb M actionpack/test/dispatch/debug_exceptions_test.rb commit 329d46d refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-04-14 14:47:28 +0200 docs, double meaning of `serialize` argument. Closes #14284. The second argument to serialize has double meaning: * `class_name` of the Type to serialize * `coder` to use then serializing. The new variable name and the docs better describe that behavior. M activerecord/lib/active_record/attribute_methods/serialization.rb commit aaeff0e refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-14 14:47:28 +0200 docs, double meaning of `serialize` argument. Closes #14284. The second argument to serialize has double meaning: * `class_name` of the Type to serialize * `coder` to use then serializing. The new variable name and the docs better describe that behavior. M activerecord/lib/active_record/attribute_methods/serialization.rb commit 2e000ab refs/heads/master Author: Yves Senn Date: 2014-04-14 14:47:28 +0200 docs, double meaning of `serialize` argument. Closes #14284. The second argument to serialize has double meaning: * `class_name` of the Type to serialize * `coder` to use then serializing. The new variable name and the docs better describe that behavior. M activerecord/lib/active_record/attribute_methods/serialization.rb commit 2f8cb89 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-14 09:27:19 +0200 Merge pull request #14739 from oysta/guide-fixes Fix some inconsistent references between text and example code in getting started guide [ci skip] M guides/source/getting_started.md commit 97b5253 refs/heads/master Merge: 6c002ba 0e9fab5 Author: Yves Senn Date: 2014-04-14 09:27:19 +0200 Merge pull request #14739 from oysta/guide-fixes Fix some inconsistent references between text and example code in getting started guide [ci skip] commit cf78637 refs/heads/master Author: Zack Perdue Date: 2014-04-14 02:33:24 -0400 Added documentation for the :param option for resourceful routing M guides/source/routing.md commit 6c002ba refs/heads/master Merge: af549a1 a16f330 Author: Rafael Mendonça França Date: 2014-04-14 00:15:14 -0300 Merge pull request #14740 from laurocaetano/read-attribute Just call read_attribute, no need to use send. commit a16f330 refs/heads/master Author: Lauro Caetano Date: 2014-04-14 00:04:08 -0300 Just call read_attribute, no need to use `send`. Follow up to af549a1ad6692d7e2c756750651f0e1b293f5185 M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/attribute_methods_test.rb commit 0e9fab5 refs/heads/master Author: Christopher Owen Date: 2014-04-14 12:06:59 +1000 - Fix lingering reference to `:text` instead of the newer `:plain` - Section references `form_tag` instead of the `form_for` used in the example M guides/source/getting_started.md commit af549a1 refs/heads/master Author: Aaron Patterson Date: 2014-04-13 15:46:50 -0700 again, read_attribute is public, so just call it M activerecord/lib/active_record/associations/has_many_through_association.rb commit feb88bd refs/heads/master Author: Aaron Patterson Date: 2014-04-13 15:44:01 -0700 read_attribute is public, so we should just call it M activerecord/lib/active_record/associations/has_many_association.rb commit 4baa866 refs/heads/master Merge: 2c21e6a 0debba8 Author: Arthur Nogueira Neves Date: 2014-04-13 16:24:48 -0400 Merge pull request #14737 from nickborromeo/disable-asset-cache-docs Disable assest cache store in docs [ci skip] commit 0debba8 refs/heads/master Author: Nick Borromeo Date: 2014-04-13 12:01:45 -0700 Disable assest cache store in docs [ci skip] M guides/source/asset_pipeline.md commit 2c21e6a refs/heads/master Merge: 0bccde9 982a19e Author: Robin Dupret Date: 2014-04-13 20:15:25 +0200 Merge pull request #14732 from JuanitoFatas/doc/patch1 [ci skip] Use plain underscore instead of "\_". [ci skip] commit 655a366 refs/heads/master Author: Jean Boussier Date: 2014-04-13 12:24:59 -0400 Make counter cache decrementation on destroy idempotent M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/lib/active_record/counter_cache.rb commit dd063f6 refs/heads/master Author: Jean Boussier Date: 2014-04-13 12:03:54 -0400 Write the failing test case for concurrent counter cache M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 982a19e refs/heads/master Author: Juanito Fatas Date: 2014-04-13 23:56:59 +0800 [ci skip] Use plain underscore instead of "\_". M guides/source/3_0_release_notes.md M guides/source/3_2_release_notes.md M guides/source/association_basics.md M guides/source/security.md commit e753148 refs/heads/master Author: Akshay Vishnoi Date: 2014-04-13 21:20:31 +0530 [ci skip] Improve doc, fix grammatical issue M activerecord/lib/active_record/nested_attributes.rb M guides/source/nested_model_forms.md commit 5372ec2 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-13 12:23:56 -0300 Merge pull request #14592 from laurocaetano/equality_between_relation_and_collection_proxy The comparison between `Relation` and `CollectionProxy` should be consistent. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/association_relation.rb activerecord/test/cases/base_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/association_relation.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/base_test.rb commit 6c61893 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-13 12:23:56 -0300 Merge pull request #14592 from laurocaetano/equality_between_relation_and_collection_proxy The comparison between `Relation` and `CollectionProxy` should be consistent. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/association_relation.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/base_test.rb commit 0bccde9 refs/heads/master Merge: bae857b 783982a Author: Rafael Mendonça França Date: 2014-04-13 12:23:56 -0300 Merge pull request #14592 from laurocaetano/equality_between_relation_and_collection_proxy The comparison between `Relation` and `CollectionProxy` should be consistent. Conflicts: activerecord/CHANGELOG.md commit bae857b refs/heads/master Merge: b502fcc d815ca2 Author: Rafael Mendonça França Date: 2014-04-13 12:20:59 -0300 Merge pull request #14726 from akshay-vishnoi/structural-change Move tests for deep_dup and duplicable to object directory commit c4d2e8e refs/heads/master Author: Steven Harman Date: 2014-04-13 10:15:55 -0400 Fix spelling errors and grammar issues Including replacing a few "smart quotes" with regular quotes (' and "), for consistency. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit b502fcc refs/heads/master Merge: 8b3ff37 dfac1b1 Author: Santiago Pastorino Date: 2014-04-13 10:44:53 -0300 Merge pull request #14722 from maurogeorge/mg-readonly-collection CollectionHelpers now accepts a readonly option commit 8b3ff37 refs/heads/master Merge: 090db0f 2ddbe87 Author: Santiago Pastorino Date: 2014-04-13 10:28:56 -0300 Merge pull request #14718 from mcmorgan/update-documentation-to-match-generated-config Update documentation to use Rails.application instead commit 47f7171 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-04-13 14:39:46 +0200 PostgreSQL, warn once per connection per missing OID. Closes #14275. [Yves Senn & Matthew Draper] (cherry picked from commit 9f62344d9552f0a58e4aa43ca6f1a7fec273a04e) This is a partial backport of #14692. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 090db0f refs/heads/master Merge: 47d9321 5d5becc Author: Yves Senn Date: 2014-04-13 14:50:35 +0200 Merge pull request #14727 from robin850/patch-17 Add a changelog entry for #14546 [ci skip] commit 461171b refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-13 14:39:46 +0200 PostgreSQL, warn once per connection per missing OID. Closes #14275. [Yves Senn & Matthew Draper] (cherry picked from commit 9f62344d9552f0a58e4aa43ca6f1a7fec273a04e) This is a partial backport of #14692. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 2ddbe87 refs/heads/master Author: Marcel Morgan Date: 2014-04-12 08:31:00 -0500 Update documentation to use Rails.application instead References to ``AppName::Application` removed in favour of ``Rails.application`` as generated with a new rails 4.1 app. [ci skip] M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M actionpack/lib/action_dispatch/routing.rb M actionview/lib/action_view/helpers/atom_feed_helper.rb M guides/code/getting_started/Rakefile M guides/code/getting_started/config.ru M guides/code/getting_started/config/environment.rb M guides/code/getting_started/config/environments/development.rb M guides/code/getting_started/config/environments/production.rb M guides/code/getting_started/config/environments/test.rb M guides/code/getting_started/config/initializers/secret_token.rb M guides/code/getting_started/config/initializers/session_store.rb M guides/code/getting_started/config/routes.rb M guides/source/action_controller_overview.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/rails_on_rack.md M guides/source/routing.md commit 8c81c9c refs/heads/master Author: Marcus Stollsteimer Date: 2014-04-13 11:13:21 +0200 Remove surplus period from assertion messages M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 5d5becc refs/heads/master Author: Robin Dupret Date: 2014-04-13 11:13:19 +0200 Add a changelog entry for #14546 [ci skip] M activerecord/CHANGELOG.md commit d815ca2 refs/heads/master Author: Akshay Vishnoi Date: 2014-04-13 12:32:00 +0530 Move tests for deep_dup and duplicable to object directory D activesupport/test/core_ext/deep_dup_test.rb D activesupport/test/core_ext/duplicable_test.rb A activesupport/test/core_ext/object/deep_dup_test.rb A activesupport/test/core_ext/object/duplicable_test.rb commit 09608ce refs/heads/master Author: Aaron Patterson Date: 2014-04-12 18:40:29 -0700 use an array for bind params to simplify substitution M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/statement_cache_test.rb commit 47d9321 refs/heads/master Merge: 80d0dd5 7782fdc Author: Richard Schneeman Date: 2014-04-12 20:16:45 -0500 Merge pull request #14725 from afshinator/patch-1 Missing 'are' in note - [ci skip] commit 7782fdc refs/heads/master Author: Afshin Mokhtari Date: 2014-04-12 17:43:23 -0700 Missing 'are' in note - [ci skip] This is in the note at the end of Section 2: Controller Naming Convention. [ci skip] M guides/source/action_controller_overview.md commit dfac1b1 refs/heads/master Author: Mauro George Date: 2014-04-12 15:14:35 -0300 CollectionHelpers now accepts a readonly option M actionview/lib/action_view/helpers/tags/collection_helpers.rb M actionview/test/template/form_collections_helper_test.rb commit 80d0dd5 refs/heads/master Author: Robin Dupret Date: 2014-04-12 20:10:15 +0200 Fix a few typos [ci skip] This is a follow up to 545afc15. M guides/source/debugging_rails_applications.md commit 76fcbf3 refs/heads/master Merge: 711a882 c8ccab0 Author: Rafael Mendonça França Date: 2014-04-12 15:07:11 -0300 Merge pull request #14720 from philr/tzinfo_data_x64_mingw Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows). commit b9f6d14 refs/remotes/origin/4-1-stable Author: Joan Karadimov Date: 2014-02-20 20:07:01 +0200 Check if the `request` variable isn't nil when calling render_to_string closes #14125 M actionpack/lib/abstract_controller/rendering.rb commit c8ccab0 refs/heads/master Author: Phil Ross Date: 2014-04-12 18:44:50 +0100 Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows). M railties/lib/rails/generators/rails/app/templates/Gemfile commit 711a882 refs/heads/master Author: Aaron Patterson Date: 2014-04-12 10:14:12 -0700 don't bother with an offset if the offset is zero we're guaranteed to pass a numeric value for offset, so if it's zero, just don't add an offset to the query M activerecord/lib/active_record/relation/finder_methods.rb commit 8c2b79d refs/heads/master Author: Aaron Patterson Date: 2014-04-12 09:45:39 -0700 only add the offset and index when we need to M activerecord/lib/active_record/relation/finder_methods.rb commit 0405d5a refs/heads/master Author: Aaron Patterson Date: 2014-04-12 09:42:02 -0700 remove branching logic from calls to find_nth M activerecord/lib/active_record/relation/finder_methods.rb commit 783982a refs/heads/master Author: Lauro Caetano Date: 2014-04-11 20:09:30 -0300 Ensure that the comparison between 'CollectionProxy' and 'AssociationRelation' is consistent. M activerecord/test/cases/base_test.rb commit 24052f9 refs/heads/master Author: Lauro Caetano Date: 2014-04-11 19:51:38 -0300 Make the comparison between 'Relation' and 'AssociationRelation' consistent. M activerecord/lib/active_record/association_relation.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/base_test.rb commit fd56a78 refs/heads/master Merge: e533855 73bfb51 Author: Robin Dupret Date: 2014-04-12 12:54:07 +0200 Merge pull request #14717 from vipulnsward/change-37signal-links Change links to 37signals and svn blog to point to new destinations. [ci skip] commit 73bfb51 refs/heads/master Author: Vipul A M Date: 2014-04-12 12:46:04 +0530 Change links to 37signals and svn blog to point to new destinations. [ci skip] M actionview/lib/action_view/helpers/cache_helper.rb M guides/source/caching_with_rails.md M guides/source/credits.html.erb commit e533855 refs/heads/master Author: Aaron Patterson Date: 2014-04-11 16:22:01 -0700 please use Ruby, not ActiveSupport M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit 85f3a57 refs/heads/master Author: Aaron Patterson Date: 2014-04-11 16:14:51 -0700 propogate bind values collected in arel to SQL generation M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/post.rb commit d6840f9 refs/heads/master Author: Lauro Caetano Date: 2014-04-03 22:07:03 -0300 The comparison between `Relation` and `CollectionProxy` should be consistent. Example: author.posts == Post.where(author_id: author.id) # => true Post.where(author_id: author.id) == author.posts # => true Fixes #13506 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation.rb M activerecord/test/cases/base_test.rb commit 7240d6a refs/heads/master Author: Steven Harman Date: 2014-04-11 16:24:08 -0400 Correct docs as singlton true is not returned here [ci skip] M activesupport/lib/active_support/core_ext/load_error.rb commit 21bb6e0 refs/heads/master Author: Steven Harman Date: 2014-04-11 16:14:08 -0400 Fix a few grammar issues. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit d870cfd refs/heads/master Author: Steven Harman Date: 2014-04-11 16:04:53 -0400 Document LoadError core extensions [ci skip] M activesupport/lib/active_support/core_ext/load_error.rb commit 9efab21 refs/heads/master Author: Steven Harman Date: 2014-04-11 15:49:43 -0400 Use path where extensions are defined, not used For consistency with all other documentation, point to where these core extensions are defined, not where the example code comes from. [ci skip] M guides/source/active_support_core_extensions.md commit 968c581 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-11 15:47:36 -0300 Merge branch 'rm-fix-13648' Includes https://github.com/rails/rails/pull/14711 and some cleanup commits. Fixes #13648 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/association_relation.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb commit c8a7066 refs/heads/master Merge: 7bb8fd2 8d11fbf Author: Rafael Mendonça França Date: 2014-04-11 15:47:36 -0300 Merge branch 'rm-fix-13648' Includes https://github.com/rails/rails/pull/14711 and some cleanup commits. Fixes #13648 commit 8d11fbf refs/heads/master Author: Rafael Mendonça França Date: 2014-04-11 15:46:49 -0300 Use assert_not M activerecord/test/cases/relations_test.rb commit bf98261 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-11 15:46:20 -0300 New CHANGELOG entries are in to top of file M activerecord/CHANGELOG.md commit 8a08f5c refs/heads/master Author: Rafael Mendonça França Date: 2014-04-11 15:46:04 -0300 :scissors: M activerecord/lib/active_record/association_relation.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb commit d447eef refs/heads/master Merge: 7bb8fd2 70fffac Author: Rafael Mendonça França Date: 2014-04-11 15:13:36 -0300 Merge pull request #14711 from swoker/activerecord_fix_aggregate_methods_with_select Activerecord fix aggregate methods with select commit 70fffac refs/heads/master Author: Simon Woker Date: 2014-04-11 17:54:03 +0000 fix exception on polymorphic associations with predicates M activerecord/lib/active_record/association_relation.rb M activerecord/test/cases/associations/eager_test.rb commit 7bb8fd2 refs/heads/master Merge: 4e9c0b7 545afc1 Author: Rafael Mendonça França Date: 2014-04-11 13:55:10 -0300 Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_default Improve debugging support commit 7f6bd0a refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-11 13:39:37 -0300 Fix version indicator on guides and link to Rails 4.0 [ci skip] M guides/source/_welcome.html.erb commit 4e9c0b7 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-11 13:39:37 -0300 Fix version indicator on guides and link to Rails 4.0 [ci skip] M guides/source/_welcome.html.erb commit 48e7203 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-11 12:56:03 -0300 Merge pull request #14689 from matthewd/asset_initializer Move assets precompile (and version) to an initializer Conflicts: railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M guides/source/asset_pipeline.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt A railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt M railties/test/generators/app_generator_test.rb commit f166f1d refs/heads/master Merge: f1a4f0a f612c2b Author: Rafael Mendonça França Date: 2014-04-11 12:56:03 -0300 Merge pull request #14689 from matthewd/asset_initializer Move assets precompile (and version) to an initializer commit f1a4f0a refs/heads/master Author: Rafael Mendonça França Date: 2014-04-11 11:27:24 -0300 Add CHANGELOG entry for #14619 [ci skip] M actionpack/CHANGELOG.md commit 3abed7f refs/heads/master Merge: 08775e3 14391d7 Author: Rafael Mendonça França Date: 2014-04-11 11:25:20 -0300 Merge pull request #14619 from winston/enhance-routing-error-html Enhance routing error html page commit 08775e3 refs/heads/master Merge: d91117f aca64fe Author: Rafael Mendonça França Date: 2014-04-11 11:10:59 -0300 Merge pull request #14707 from minio-sk/fix-issue-14702 Be explicit about allowed constraint values, fixes #14702 commit d91117f refs/heads/master Merge: d0b5484 9f62344 Author: Yves Senn Date: 2014-04-11 16:04:50 +0200 Merge pull request #14692 from senny/pg/reload_type_map_for_unknown_types PostgreSQL automatic type map reload commit aca64fe refs/heads/master Author: Jano Suchal Date: 2014-04-11 15:19:37 +0200 Be explicit about allowed constraint values, fixes #14702 M guides/source/routing.md commit f612c2b refs/heads/master Author: Matthew Draper Date: 2014-04-11 02:28:35 +0930 Move assets precompile (and version) to an initializer sprockets-rails 2.1 needs the precompile list to be available in all environments. M guides/source/asset_pipeline.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt A railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt M railties/test/generators/app_generator_test.rb commit d0b5484 refs/heads/master Merge: 1424482 075a1e2 Author: Rafael Mendonça França Date: 2014-04-11 09:46:22 -0300 Merge pull request #14705 from akshay-vishnoi/doc_changes Add more test case for #demodulize, Improve documentation commit 075a1e2 refs/heads/master Author: Akshay Vishnoi Date: 2014-04-11 17:57:16 +0530 Add more test case for #demodulize, Improve documentation M activesupport/lib/active_support/core_ext/string/inflections.rb M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/inflector_test.rb M guides/source/active_support_core_extensions.md commit 545afc1 refs/heads/master Author: David Rodríguez de Dios Date: 2014-04-11 13:55:42 +0200 Re-review the debugging guide. Tested on a brand new app to exactly match current byebug's behaviour. M guides/source/debugging_rails_applications.md commit d0e5963 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-04-11 10:59:30 +0100 Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bug Add a failing test for a URL helper that was broken by a6b9ea2. (cherry picked from commit 142448259d7f450df49fdac06bf912edfecaa633) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 176ce1d refs/remotes/origin/4-1-stable Author: Andrew White Date: 2014-04-11 10:37:15 +0100 Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bug Add a failing test for a URL helper that was broken by a6b9ea2. (cherry picked from commit 142448259d7f450df49fdac06bf912edfecaa633) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 1424482 refs/heads/master Merge: 856ffbe e10f26f Author: Andrew White Date: 2014-04-11 10:26:23 +0100 Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bug Add a failing test for a URL helper that was broken by a6b9ea2. commit e10f26f refs/heads/master Author: Andrew White Date: 2014-04-11 10:20:54 +0100 Only make deeply nested routes shallow when parent is shallow Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb commit 14391d7 refs/heads/master Author: Winston Date: 2014-04-10 22:28:22 +0800 Split search results into 'exact matches' and 'fuzzy matches'. - also refactored the javascript. M actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb commit 2ad5dad refs/heads/master Author: Winston Date: 2014-04-06 18:03:55 +0800 Improve CSS styling for routing error html page. M actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb commit 976495c refs/heads/master Author: Winston Date: 2014-04-06 18:03:15 +0800 Implement fuzzy matching for route search on routing error html page. M actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb commit 9f62344 refs/heads/master Author: Yves Senn Date: 2014-04-10 20:39:21 +0200 PostgreSQL, warn once per connection per missing OID. Closes #14275. [Yves Senn & Matthew Draper] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 0c9bbc6 refs/heads/master Author: Yves Senn Date: 2014-04-10 20:25:40 +0200 PostgreSQL, adapter automatically reloads it's type map. Closes #14678. [Yves Senn & Matthew Draper] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/domain_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit 8834847 refs/heads/master Author: David Rodríguez de Dios Date: 2014-04-11 11:00:19 +0200 Minor fixes in the rails debugging guide M guides/source/debugging_rails_applications.md commit daea4cf refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-11 07:53:39 +0200 docs, make association `autosave: true` examples runnable. Closes #14700 [ci skip] The examples are written in a way you expect them to be executable. However one snippet assumed there to be two comments when only one was created above. The defined models did not extend `ActiveRecord::Base` The example used `comments.last.mark_for_destruction`. This does no longer load the whole collection but just the last record. It is then refetcht on subsequent calls to `last`. This breaks the example. M activerecord/lib/active_record/autosave_association.rb commit 856ffbe refs/heads/master Author: Yves Senn Date: 2014-04-11 07:53:39 +0200 docs, make association `autosave: true` examples runnable. Closes #14700 [ci skip] The examples are written in a way you expect them to be executable. However one snippet assumed there to be two comments when only one was created above. The defined models did not extend `ActiveRecord::Base` The example used `comments.last.mark_for_destruction`. This does no longer load the whole collection but just the last record. It is then refetcht on subsequent calls to `last`. This breaks the example. M activerecord/lib/active_record/autosave_association.rb commit dbc8c0e refs/heads/master Author: Aaron Patterson Date: 2014-04-10 17:24:10 -0700 decouple the factory method from the constructing model The factory method only requires the constructing model to get the connection object. Since the model is available when calling the factory method, we can just pass the appropriate connection in. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/statement_cache_test.rb commit 249fd68 refs/heads/master Author: Aaron Patterson Date: 2014-04-10 17:20:22 -0700 remove intelligence from StatementCache#initialize M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/statement_cache_test.rb commit 2d3969c refs/heads/master Author: Aaron Patterson Date: 2014-04-10 17:15:17 -0700 stop caching the class on the statement cache object M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/statement_cache_test.rb commit 8de3c43 refs/heads/master Author: Aaron Patterson Date: 2014-04-10 17:10:09 -0700 fix ivar names and add reader methods M activerecord/lib/active_record/statement_cache.rb commit f85e4bc refs/heads/master Author: Aaron Patterson Date: 2014-04-10 17:06:08 -0700 eagerly build the cacheable query builder M activerecord/lib/active_record/statement_cache.rb commit 4962040 refs/heads/master Author: Aaron Patterson Date: 2014-04-10 17:00:12 -0700 eagerly build the bind map M activerecord/lib/active_record/statement_cache.rb commit 47037b6 refs/heads/master Author: Aaron Patterson Date: 2014-04-10 16:58:15 -0700 eagerly build the relation object M activerecord/lib/active_record/statement_cache.rb commit 90c9a09 refs/heads/master Author: Aaron Patterson Date: 2014-04-10 16:34:03 -0700 remove dead code M activerecord/lib/active_record/statement_cache.rb commit fca54a1 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-10 17:43:59 -0300 Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548 Fix insertion of records for hmt association with scope Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/relation_test.rb M activerecord/test/models/club.rb commit 74d920d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-10 17:43:59 -0300 Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548 Fix insertion of records for hmt association with scope Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/relation_test.rb M activerecord/test/models/club.rb commit a7a180b refs/heads/master Merge: 632d9d2 ec09280 Author: Rafael Mendonça França Date: 2014-04-10 17:43:59 -0300 Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548 Fix insertion of records for hmt association with scope Conflicts: activerecord/CHANGELOG.md commit 632d9d2 refs/heads/master Merge: 167e6da 16f481b Author: Rafael Mendonça França Date: 2014-04-10 17:13:17 -0300 Merge pull request #14694 from heironimus/callback_guide Add after_commit/after_rollback to callback list commit 167e6da refs/heads/master Merge: 1938c96 8c1406c Author: Rafael Mendonça França Date: 2014-04-10 17:03:10 -0300 Merge pull request #14695 from akshay-vishnoi/doc_changes [ci skip] Remove false documentation commit 8c1406c refs/heads/master Author: Akshay Vishnoi Date: 2014-04-11 01:27:44 +0530 [ci skip] Remove false documentation M guides/source/active_support_core_extensions.md commit 16f481b refs/heads/master Author: Kyle Heironimus Date: 2014-04-10 14:58:36 -0500 Add after_commit/after_rollback to callback list Adding after_commit/after_rollback to list of callbacks in order helps explain the callback order as well as making it consistent with the API docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html M guides/source/active_record_callbacks.md commit 1938c96 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-10 15:58:08 -0300 Remove warning of unused variable M activerecord/test/cases/adapters/postgresql/bytea_test.rb commit ea2c31e refs/heads/master Merge: 53610e5 7edb204 Author: Rafael Mendonça França Date: 2014-04-10 15:57:36 -0300 Merge branch 'rm-uuid-fixtures' commit 7edb204 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-10 15:43:51 -0300 No need to call send M activerecord/lib/active_record/fixtures.rb commit 085ce4f refs/heads/master Merge: 54d8c81 53610e5 Author: Rafael Mendonça França Date: 2014-04-10 15:34:55 -0300 Merge branch 'master' into rm-uuid-fixtures Conflicts: activerecord/CHANGELOG.md activesupport/CHANGELOG.md commit c077cbe refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-10 14:57:46 -0300 Require action_controller before any other action_controller file This will load properly the loading hooks. Closes rails/sass-rails#205 M railties/lib/rails/test_help.rb commit 53610e5 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-10 14:57:46 -0300 Require action_controller before any other action_controller file This will load properly the loading hooks. Closes rails/sass-rails#205 M railties/lib/rails/test_help.rb commit 6e9af5c refs/heads/master Merge: 85b48d2 05d7cde Author: Rafael Mendonça França Date: 2014-04-10 14:38:22 -0300 Merge pull request #11656 from emre-basala/xml_mini_test Add tests to ActiveSupport:XmlMini to_tag method commit 85b48d2 refs/heads/master Merge: d8d0fcb 3664e3a Author: Rafael Mendonça França Date: 2014-04-10 14:10:10 -0300 Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippets [ci skip] Update code snippets to latest master (initialization.md). commit afd4d82 refs/heads/master Author: Simon Woker Date: 2014-04-10 16:58:39 +0000 Fix error for aggregate methods with select, see issue #13648 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relations_test.rb commit 3664e3a refs/heads/master Author: Juanito Fatas Date: 2014-04-10 22:44:47 +0800 [ci skip] Update code snippets to latest master (initialization.md). Also update the `server.run` example (Replace Mongrel with Puma). M guides/source/initialization.md commit 7fe49a4 refs/heads/master Author: David Rodríguez de Dios Date: 2014-04-10 16:20:46 +0200 Prevent generation of extra whitespace in templates M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/plugin/templates/Gemfile commit 6fae9ac refs/heads/master Author: David Rodríguez de Dios Date: 2014-04-10 16:02:13 +0200 Isolate debugger related code M railties/lib/rails/commands/console.rb M railties/test/commands/console_test.rb commit 77252c3 refs/heads/master Author: James Coglan Date: 2014-04-10 13:54:41 +0100 Add a failing test for a URL helper that was broken by a6b9ea2. M actionpack/test/dispatch/routing_test.rb commit b09eac1 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-10 12:41:07 +0200 Merge pull request #14679 from pbharadiya/master Correct factual error for page not found [ci skip] M guides/source/upgrading_ruby_on_rails.md commit d8d0fcb refs/heads/master Merge: bb63e9c 3fe7b5f Author: Yves Senn Date: 2014-04-10 12:41:07 +0200 Merge pull request #14679 from pbharadiya/master Correct factual error for page not found [ci skip] commit 3fe7b5f refs/heads/master Author: Parth Bharadiya Date: 2014-04-10 15:41:09 +0530 Correct factual error for page not found M guides/source/upgrading_ruby_on_rails.md commit bb63e9c refs/heads/master Author: Akira Matsuda Date: 2014-04-10 15:44:38 +0900 +EOL M railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb commit febfc57 refs/heads/master Merge: 9a8af0c cb24aa1 Author: Aaron Patterson Date: 2014-04-09 20:04:23 -0700 Merge pull request #11411 from dscataglini/master Active support callback's before/after/around filters are not correctly making their singleton methods private commit 9a8af0c refs/heads/master Author: Carlos Antonio da Silva Date: 2014-04-09 23:31:10 -0300 Only call uniq on the conditional that actually needs it M activerecord/lib/active_record/reflection.rb commit cf0e44c refs/heads/master Author: Carlos Antonio da Silva Date: 2014-04-09 23:30:47 -0300 Remove extra collect call M activerecord/lib/active_record/reflection.rb commit 82cb477 refs/heads/master Merge: c7d009b 213ef56 Author: Aaron Patterson Date: 2014-04-09 19:19:59 -0700 Merge pull request #14675 from laurocaetano/make_reflection_caches_works_with_string_keys Make reflection and aggregate_reflection caches work with string keys. commit 213ef56 refs/heads/master Author: Lauro Caetano Date: 2014-04-09 21:56:40 -0300 Make sure the reflection test is passing a String to the reflection cache. M activerecord/test/cases/reflection_test.rb commit e7630b6 refs/heads/master Author: Lauro Caetano Date: 2014-04-09 21:34:48 -0300 Make the aggregate_reflections cache work with strings as its keys. M activerecord/lib/active_record/reflection.rb commit 4c6ba74 refs/heads/master Author: Lauro Caetano Date: 2014-04-09 21:25:39 -0300 No need to call `to_sym` on reflection name, since the cache now works with strings with string keys. Related #14668. M activerecord/lib/active_record/reflection.rb commit 1f31488 refs/heads/master Author: Lauro Caetano Date: 2014-04-09 21:23:43 -0300 Make the reflections cache work with strings as its keys. M activerecord/lib/active_record/reflection.rb commit 6388b4b refs/heads/master Author: Aaron Patterson Date: 2014-04-09 16:47:20 -0700 speed up parameter substitution store the offsets of the bind values, then only index to bind value locations before joining the array M activerecord/lib/active_record/statement_cache.rb commit b1ba768 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 16:46:40 -0700 tests still pass when caching unprepared statements M activerecord/lib/active_record/core.rb commit 57ee6b0 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 16:21:37 -0700 oops! Fix Gemfile. :bomb: M Gemfile commit c954a74 refs/heads/master Merge: 89e569d c7d009b Author: Aaron Patterson Date: 2014-04-09 16:20:52 -0700 Merge branch 'master' into adequaterecord * master: add services: memcache to travis The `source` option for `has_many => through` should accept String values. commit 89e569d refs/heads/master Author: Aaron Patterson Date: 2014-04-09 16:08:28 -0700 remove the bind visitor since the collector handles substituting bind values M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/explain_test.rb commit 8caaa08 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 15:56:40 -0700 push the collectors up to the abstract adapter M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit f6d46d9 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 15:52:06 -0700 sqlite3 tests passing again M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 8522365 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 15:50:38 -0700 mysql tests are passing again M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit d073fc3 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 15:48:15 -0700 all tests passing on mysql2 M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql2/explain_test.rb commit 42a1bf1 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 15:45:05 -0700 working against arel/collector branch M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/statement_cache.rb commit 70bd5eb refs/heads/master Author: Aaron Patterson Date: 2014-04-09 15:20:56 -0700 fix bind collecting for mysql M Gemfile M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit ee54e9b refs/heads/master Author: Aaron Patterson Date: 2014-04-09 14:32:51 -0700 add a bind collector, remove the bind visitor M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit c7d009b refs/heads/master Merge: 1368311 45195b3 Author: Rafael Mendonça França Date: 2014-04-09 18:09:56 -0300 Merge pull request #14671 from arthurnn/travis_memcache add services: memcache to travis commit 45195b3 refs/heads/master Author: Arthur Neves Date: 2014-04-09 17:06:54 -0400 add services: memcache to travis M .travis.yml commit 6ed464f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-09 16:32:09 -0300 Define the required asset M railties/test/application/assets_test.rb commit 1794ac0 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 12:02:43 -0700 remove the bind substitution visitor. to_sql should never return bind values M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relation/merging_test.rb commit e46ff16 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-04-09 11:15:12 -0700 Merge pull request #14668 from laurocaetano/source_option_with_string_value The :source option for has_many => through should accept String values. M activerecord/lib/active_record/reflection.rb M activerecord/test/models/tag.rb commit 1368311 refs/heads/master Merge: 7b75b67 a91e5ff Author: Aaron Patterson Date: 2014-04-09 11:15:12 -0700 Merge pull request #14668 from laurocaetano/source_option_with_string_value The :source option for has_many => through should accept String values. commit a14f746 refs/heads/master Author: Aaron Patterson Date: 2014-04-09 11:06:47 -0700 use the compile method so we do not have to specify the collectors in this case M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/relation.rb commit db5e578 refs/heads/master Merge: 3321d1a 7b75b67 Author: Aaron Patterson Date: 2014-04-09 11:03:10 -0700 Merge branch 'master' into adequaterecord * master: (26 commits) Avoid URI parsing Add missing require so requiring `active_support/cache` works again. depend_on_asset is not required anymore on sprockets-rails 2.1.2 upgrading section for 4.1 is no longer WIP. [ci skip] Expand explanation of how to set secrets.yml. [ci skip] Guides: minor typo fixed [ci skip] Fixed problem where `1.day.eql?(1.day)` is false new CHANGELOGs entries are in the top [ci skip] Updates the maintenance policy with new Rails versions Dont abbreviate that which needs no abbreviation Dont encourage aliases now that we have variants Use short-form for the scaffold render calls and drop the needless test Drop in @jeremy's new database.yml template text Don't deprecate after all Less ambition, more deprecation Ensure we correctly and immediately load all ENV entries Give a deprecation message even when the lookup fails Rearrange the config merger some more entry is always a Hash Check env_url only once ... Conflicts: Gemfile commit a91e5ff refs/heads/master Author: Lauro Caetano Date: 2014-04-09 14:39:08 -0300 The `source` option for `has_many => through` should accept String values. With the changes introduced by 16b70fddd4dc7e7fb7be108add88bae6e3c2509b it was expecting the value to be a Symbol, while it could be also a String value. M activerecord/lib/active_record/reflection.rb M activerecord/test/models/tag.rb commit 3321d1a refs/heads/master Author: Aaron Patterson Date: 2014-04-09 10:56:42 -0700 working against arel/collector branch M Gemfile M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/sanitization.rb M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/adapters/sqlite3/explain_test.rb commit 58e53c2 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-09 14:20:56 -0300 Merge pull request #14665 from andrielfn/avoid-uri-parsing Avoid URI parsing M actionpack/lib/action_dispatch/middleware/ssl.rb M actionpack/test/dispatch/ssl_test.rb commit 7b75b67 refs/heads/master Merge: 7142ff8 85e424d Author: Rafael Mendonça França Date: 2014-04-09 14:20:56 -0300 Merge pull request #14665 from andrielfn/avoid-uri-parsing Avoid URI parsing commit 85e424d refs/heads/master Author: Andriel Nuernberg Date: 2014-04-09 13:48:53 -0300 Avoid URI parsing This parsing is unecessary once the Request object already has the needed information. M actionpack/lib/action_dispatch/middleware/ssl.rb M actionpack/test/dispatch/ssl_test.rb commit 40fec3d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-09 14:12:21 -0300 Merge pull request #14667 from lucasmazza/require-per-thread-registry Add missing require so requiring `active_support/cache` works again. M activesupport/lib/active_support/cache/strategy/local_cache.rb commit 7142ff8 refs/heads/master Merge: b053a47 0645a1a Author: Rafael Mendonça França Date: 2014-04-09 14:12:21 -0300 Merge pull request #14667 from lucasmazza/require-per-thread-registry Add missing require so requiring `active_support/cache` works again. commit 9067a95 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-09 14:10:10 -0300 Allow to use sprockets-rails 2.1 M Gemfile M rails.gemspec commit 0645a1a refs/heads/master Author: Lucas Mazza Date: 2014-04-09 13:57:32 -0300 Add missing require so requiring `active_support/cache` works again. M activesupport/lib/active_support/cache/strategy/local_cache.rb commit b053a47 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-09 14:07:31 -0300 depend_on_asset is not required anymore on sprockets-rails 2.1.2 M Gemfile M guides/source/asset_pipeline.md M railties/test/application/assets_test.rb commit e3eab91 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-09 13:05:44 -0300 Merge pull request #14654 from Alamoz/secret_key Expand explanation of how to set secrets.yml. M guides/source/upgrading_ruby_on_rails.md commit 040a1db refs/heads/master Merge: 7cf46ad a4e5587 Author: Rafael Mendonça França Date: 2014-04-09 13:05:44 -0300 Merge pull request #14654 from Alamoz/secret_key Expand explanation of how to set secrets.yml. commit 00a3dd1 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-04-09 11:23:33 +0200 upgrading section for 4.1 is no longer WIP. [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 7cf46ad refs/heads/master Author: Yves Senn Date: 2014-04-09 11:23:33 +0200 upgrading section for 4.1 is no longer WIP. [ci skip] M guides/source/upgrading_ruby_on_rails.md commit a4e5587 refs/heads/master Author: Adrien Lamothe Date: 2014-04-08 17:59:14 -0700 Expand explanation of how to set secrets.yml. [ci skip] M guides/source/upgrading_ruby_on_rails.md commit fe79ddb refs/remotes/origin/4-1-stable Author: Vadim Golub Date: 2014-04-09 02:54:42 +0300 Guides: minor typo fixed [ci skip] M guides/source/asset_pipeline.md commit e117829 refs/heads/master Merge: aff37a9 fec69b9 Author: Arun Agrawal Date: 2014-04-09 07:59:28 +0530 Merge pull request #14653 from vdmgolub/patch-1 Guides: minor typo fixed in Asset Pipeline guide commit aff37a9 refs/heads/master Merge: 30a41e7 5aeb3cd Author: Guillermo Iguaran Date: 2014-04-08 21:13:21 -0500 Merge pull request #14652 from Emily/duration_eqls Fixed problem where `1.day.eql?(1.day)` is false commit fec69b9 refs/heads/master Author: Vadim Golub Date: 2014-04-09 02:54:42 +0300 Guides: minor typo fixed [ci skip] M guides/source/asset_pipeline.md commit 5aeb3cd refs/heads/master Author: Emily Dobervich Date: 2014-04-08 16:24:35 -0700 Fixed problem where `1.day.eql?(1.day)` is false This fixes: 1.second.eql?(1.second) #=> false The new `eql?` requires that `other` is an `ActiveSupport::Duration`. This requirement makes `ActiveSupport::Duration`'s behavior consistent with other numeric types in Ruby. 1.eql?(1.0) #=> false 1.0.eql?(1) #=> false 1.second.eql?(1) #=> false (was true) 1.eql?(1.second) #=> false { 1 => "foo", 1.0 => "bar" } #=> { 1 => "foo", 1.0 => "bar" } { 1 => "foo", 1.second => "bar" } # now => { 1 => "foo", 1.second => "bar" } # was => { 1 => "bar" } And though the behavior here hasn't changed, for reference: 1 == 1.0 #=> true 1.0 == 1 #=> true 1 == 1.second #=> true 1.second == 1 #=> true M activesupport/CHANGELOG.md M activesupport/lib/active_support/duration.rb M activesupport/test/core_ext/duration_test.rb commit 5d5b7c5 refs/heads/master Author: Gaurish Sharma Date: 2014-04-09 04:34:33 +0530 Instead boat load of libraries, simply say StdLib M guides/source/testing.md commit ae9fef3 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-08 15:22:34 -0500 Merge pull request #14647 from matiaskorhonen/updates-maintenance-policy Updates the maintenance policy with new Rails versions Conflicts: guides/CHANGELOG.md M guides/CHANGELOG.md M guides/source/maintenance_policy.md commit 30a41e7 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-08 17:34:19 -0300 new CHANGELOGs entries are in the top [ci skip] M guides/CHANGELOG.md commit c28742f refs/heads/master Merge: 304d2f1 f0125a1 Author: Rafael Mendonça França Date: 2014-04-08 15:22:34 -0500 Merge pull request #14647 from matiaskorhonen/updates-maintenance-policy Updates the maintenance policy with new Rails versions commit f0125a1 refs/heads/master Author: Matias Korhonen Date: 2014-04-08 23:10:29 +0300 Updates the maintenance policy with new Rails versions M guides/CHANGELOG.md M guides/source/maintenance_policy.md commit cf70674 refs/remotes/origin/4-1-stable Merge: f08665e 4e16801 Author: Rafael Mendonça França Date: 2014-04-08 16:41:10 -0300 Merge branch '4-1-0' into 4-1-stable Conflicts: actionpack/CHANGELOG.md actionview/CHANGELOG.md activerecord/CHANGELOG.md commit 304d2f1 refs/heads/master Author: David Heinemeier Hansson Date: 2014-04-08 21:09:33 +0200 Dont abbreviate that which needs no abbreviation M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb commit 10570cf refs/heads/master Author: David Heinemeier Hansson Date: 2014-04-08 21:11:03 +0200 Dont encourage aliases now that we have variants M railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb commit f08665e refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-04-08 21:09:33 +0200 Dont abbreviate that which needs no abbreviation M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb commit 094b961 refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-04-08 21:11:03 +0200 Dont encourage aliases now that we have variants M railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb commit 4e16801 refs/tags/v4.1.0 (tag: v4.1.0) Author: David Heinemeier Hansson Date: 2014-04-08 21:11:03 +0200 Dont encourage aliases now that we have variants M railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb commit d85c1dd refs/tags/v4.1.0 Author: David Heinemeier Hansson Date: 2014-04-08 21:09:33 +0200 Dont abbreviate that which needs no abbreviation M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb commit eb2d555 refs/heads/master Author: David Rodríguez de Dios Date: 2014-04-08 20:59:28 +0200 Update debugging guide to use byebug M guides/source/debugging_rails_applications.md commit f35f4ae refs/tags/v4.1.0 Author: David Heinemeier Hansson Date: 2014-04-08 20:59:28 +0200 Prepare for 4.1.0 final release M RAILS_VERSION M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/lib/action_view/gem_version.rb M activemodel/lib/active_model/gem_version.rb M activerecord/lib/active_record/gem_version.rb M activesupport/lib/active_support/gem_version.rb M railties/lib/rails/gem_version.rb M version.rb commit 4b0c8a9 refs/heads/master Author: David Heinemeier Hansson Date: 2014-04-08 20:54:36 +0200 Use short-form for the scaffold render calls and drop the needless test M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb commit d8a4e48 refs/heads/master Author: David Rodríguez de Dios Date: 2014-04-08 20:57:12 +0200 Update Gemfile templates to provide correct debugger M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/plugin/templates/Gemfile M railties/test/generators/app_generator_test.rb M railties/test/generators/plugin_generator_test.rb commit 1fba21a refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-04-08 20:54:36 +0200 Use short-form for the scaffold render calls and drop the needless test M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb commit 7901ae1 refs/heads/master Author: David Rodríguez de Dios Date: 2014-04-08 20:55:23 +0200 Keep debugger support only for rubies < 2.0.0 M activesupport/lib/active_support/core_ext/kernel.rb M activesupport/test/core_ext/kernel_test.rb M railties/lib/rails/commands/console.rb M railties/lib/rails/commands/server.rb M railties/lib/rails/rack.rb M railties/test/commands/console_test.rb commit 0279c7a refs/tags/v4.1.0 Author: David Heinemeier Hansson Date: 2014-04-08 20:54:36 +0200 Use short-form for the scaffold render calls and drop the needless test M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb commit 3a118cc refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-08 11:57:47 -0500 Merge pull request #14633 from matthewd/narrow_database_url Only apply DATABASE_URL for Rails.env M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb M railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit ce7e3d5 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-08 11:57:47 -0500 Merge pull request #14633 from matthewd/narrow_database_url Only apply DATABASE_URL for Rails.env M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb M railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit 75e0ee8 refs/heads/master Merge: 77692ff d72a0cb Author: Rafael Mendonça França Date: 2014-04-08 11:57:47 -0500 Merge pull request #14633 from matthewd/narrow_database_url Only apply DATABASE_URL for Rails.env commit d72a0cb refs/heads/master Author: Matthew Draper Date: 2014-04-09 01:41:11 +0930 Drop in @jeremy's new database.yml template text In passing, allow multi-word adapters to be referenced in a URL: underscored_name must become hyphened-name. M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb M railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit 88cd65b refs/heads/master Author: Matthew Draper Date: 2014-04-09 00:55:49 +0930 Don't deprecate after all M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 615e0dc refs/heads/master Author: Matthew Draper Date: 2014-04-09 00:17:13 +0930 Less ambition, more deprecation The "DATABASE_URL_*" idea was moving in the wrong direction. Instead, let's deprecate the situation where we end up using ENV['DATABASE_URL'] at all: the Right Way is to explicitly include it in database.yml with ERB. M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 8f23c22 refs/heads/master Author: Matthew Draper Date: 2014-04-08 15:10:15 +0930 Ensure we correctly and immediately load all ENV entries .. even when the supplied config made no hint that name was relevant. M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 2369218 refs/heads/master Author: Matthew Draper Date: 2014-04-08 15:00:38 +0930 Give a deprecation message even when the lookup fails If the supplied string doesn't contain a colon, it clearly cannot be a database URL. They must have intended to do a key lookup, so even though it failed, give the explanatory deprecation warning, and raise the exception that lists the known configs. Conveniently, this also simplifies our logical behaviour: if the string matches a known configuration, or doesn't contain a colon (and is therefore clearly not a URL), then we output a deprecation warning, and behave exactly as we would if it were a symbol. M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit de9f2f6 refs/heads/master Author: Matthew Draper Date: 2014-04-08 14:49:03 +0930 Rearrange the config merger some more This seems to simplify the operative part. Most importantly, by pre-loading all the configs supplied in ENV, we ensure the list is complete: if the developer specifies an unknown config, the exception includes a list of valid ones. M activerecord/lib/active_record/connection_handling.rb commit 0ec0475 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-07 19:19:28 -0300 entry is always a Hash M activerecord/lib/active_record/connection_handling.rb commit d035ba1 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-07 19:17:43 -0300 Check env_url only once M activerecord/lib/active_record/connection_handling.rb commit 2b6d1da refs/heads/master Author: Rafael Mendonça França Date: 2014-04-07 19:17:06 -0300 Only call DEFAULT_ENV proc one time M activerecord/lib/active_record/connection_handling.rb commit d459f75 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-07 19:16:20 -0300 Test DATABASE_URL has precendance over DATABASE_URL_#{environment} M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit e533826 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-07 19:05:50 -0300 Make sure DEFAULT_URL only override current environment database configuration M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 2b817cd refs/heads/master Author: Matthew Draper Date: 2014-04-08 03:54:23 +0930 Only apply DATABASE_URL for Rails.env As we like ENV vars, also support DATABASE_URL_#{env}, for more obscure use cases. M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit cc15d99 refs/tags/v4.1.0 Author: Godfrey Chan Date: 2014-04-07 19:08:08 -0700 Ensure we are looking with string keys M activerecord/lib/active_record/enum.rb commit 98ebec1 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-04-07 19:08:08 -0700 Ensure we are looking with string keys M activerecord/lib/active_record/enum.rb commit 77692ff refs/heads/master Author: Godfrey Chan Date: 2014-04-07 19:08:08 -0700 Ensure we are looking with string keys M activerecord/lib/active_record/enum.rb commit cbbb3c2 refs/tags/v4.1.0 Author: Godfrey Chan Date: 2014-04-07 18:52:21 -0700 Follow up to bbe7fe41 to fix enum leakage across classes. The original attempt didn't really fix the problem and wasn't testing the problematic area. This commit corrected those issues in the original commit. Also removed the private `enum_mapping_for` method. As `defined_enums` is now a method, this method doesn't provide much value anymore. Conflicts: activerecord/lib/active_record/validations/uniqueness.rb M activerecord/lib/active_record/enum.rb M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/enum_test.rb commit 30cdb28 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-04-07 18:52:21 -0700 Follow up to bbe7fe41 to fix enum leakage across classes. The original attempt didn't really fix the problem and wasn't testing the problematic area. This commit corrected those issues in the original commit. Also removed the private `enum_mapping_for` method. As `defined_enums` is now a method, this method doesn't provide much value anymore. Conflicts: activerecord/lib/active_record/validations/uniqueness.rb M activerecord/lib/active_record/enum.rb M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/enum_test.rb commit a5664fe refs/heads/master Author: Godfrey Chan Date: 2014-04-07 18:52:21 -0700 Follow up to bbe7fe41 to fix enum leakage across classes. The original attempt didn't really fix the problem and wasn't testing the problematic area. This commit corrected those issues in the original commit. Also removed the private `enum_mapping_for` method. As `defined_enums` is now a method, this method doesn't provide much value anymore. M activerecord/lib/active_record/enum.rb M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/enum_test.rb commit a38e957 refs/heads/master Author: Aaron Patterson Date: 2014-04-07 17:16:40 -0700 wrap the literal value before handing it to arel this lets arel know how to correctly quote the value M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 426ae86 refs/heads/master Author: Aaron Patterson Date: 2014-04-07 16:05:29 -0700 where_values should extract the value of the Casted node makes adequaterecord work with arel master. M activerecord/lib/active_record/relation.rb commit 347d74a refs/heads/master Merge: 30b94a8 3f5eb59 Author: Aaron Patterson Date: 2014-04-07 15:26:13 -0700 Merge branch 'master' into adequaterecord * master: (122 commits) Rails.application should be set inside before_configuration hook remove check for present? from delete_all Remove useless begin..end Build the reverse_order on its proper method. Use connection-specific bytea escaping Ignore order when doing count. make enums distinct per class Remove unused `subclass_controller_with_flash_type_bar` var from flash test. fix CollectionProxy delete_all documentation Added OS X specific commands to installation guide [ci skip] Recommended using homebrew for installing MySQL and PostgreSQL Fix setup of adding _flash_types test. Use SVG version of travis build status badge [skip ci] W3C CSP document moved to gihub.io URL [ci skip] sprockets-rails was released Fix the test defining the models in the right place Add CHANGELOG entry for #11650 [ci skip] Declare the assets dependency Use sass-rails 4.0.3 Make possible to use sprockets-rails 2.1 add missing parentheses to validates_with documentation [skip ci] ... commit 3f5eb59 refs/heads/master Merge: 9575c82 6c311e0 Author: Rafael Mendonça França Date: 2014-04-07 16:31:14 -0500 Merge pull request #14634 from laurocaetano/fix_reorder Build the reverse_order on its proper method. commit 9575c82 refs/heads/master Merge: e1404ec 2512bd7 Author: Rafael Mendonça França Date: 2014-04-07 16:01:12 -0500 Merge pull request #14635 from eileencodes/remove-check-for-present remove check for present? from delete_all method commit 32896e5 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-07 17:33:40 -0300 Rails.application should be set inside before_configuration hook Fixes #14620 M railties/lib/rails/application.rb M railties/test/application/multiple_applications_test.rb M railties/test/railties/railtie_test.rb commit 4d56b87 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-07 17:33:40 -0300 Rails.application should be set inside before_configuration hook Fixes #14620 M railties/lib/rails/application.rb M railties/test/application/multiple_applications_test.rb M railties/test/railties/railtie_test.rb commit e1404ec refs/heads/master Author: Rafael Mendonça França Date: 2014-04-07 17:33:40 -0300 Rails.application should be set inside before_configuration hook Fixes #14620 M railties/lib/rails/application.rb M railties/test/application/multiple_applications_test.rb M railties/test/railties/railtie_test.rb commit 2512bd7 refs/heads/master Author: eileencodes Date: 2014-04-07 14:16:55 -0400 remove check for present? from delete_all Passing in a blank string is a bug so there's no reason to check for a blank string. M activerecord/lib/active_record/associations/collection_association.rb commit 70c83f4 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-04-07 16:53:58 -0300 Remove useless begin..end M railties/lib/rails/application.rb commit 6c311e0 refs/heads/master Author: Lauro Caetano Date: 2014-04-07 16:01:17 -0300 Build the reverse_order on its proper method. The reverse_order method was using a flag to control if the order should be reversed or not. Instead of using this variable just build the reverse order inside its proper method. This implementation was leading to an unexpected behavior when using reverse_order and then applying reorder(nil). Example: Before Post.order(:name).reverse_order.reorder(nil) # => SELECT "posts".* FROM "posts" ORDER BY "posts"."id" DESC After Post.order(:name).reverse_order.reorder(nil) # => SELECT "posts".* FROM "posts" M activerecord/lib/active_record/relation/merger.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/mutation_test.rb M activerecord/test/cases/relations_test.rb commit 6bbbe0b refs/heads/master Merge: 83e9e19 c4bdca1 Author: Rafael Mendonça França Date: 2014-04-07 12:23:29 -0500 Merge pull request #14632 from matthewd/escape_bytea Use connection-specific bytea escaping commit 9b92c6c refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-07 09:07:51 -0500 Merge pull request #14609 from evanwhalen/enums_inheritance Make enums distinct per class Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit 222d207 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-07 09:07:51 -0500 Merge pull request #14609 from evanwhalen/enums_inheritance Make enums distinct per class Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit 890d4f3 refs/remotes/origin/4-0-stable Author: Santiago Pastorino Date: 2014-04-07 12:01:39 -0300 Merge pull request #14631 from laurocaetano/fix_count_with_order Ignore order when doing count. M activerecord/test/cases/calculations_test.rb commit 22eb8d9 refs/tags/v4.1.0 Author: Santiago Pastorino Date: 2014-04-07 12:01:39 -0300 Merge pull request #14631 from laurocaetano/fix_count_with_order Ignore order when doing count. M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit c4bdca1 refs/heads/master Author: Matthew Draper Date: 2014-04-07 22:54:58 +0930 Use connection-specific bytea escaping In our normal usage, it's rare for this to make a difference... but is more technically correct. As well as a spec that proves this is a good idea, let's also add a more sane-looking one that just covers basic to_sql functionality. There aren't many places where we actually use escape_bytea, but that's one that won't be going away. M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/bytea_test.rb commit ff69589 refs/remotes/origin/4-1-stable Author: Santiago Pastorino Date: 2014-04-07 12:01:39 -0300 Merge pull request #14631 from laurocaetano/fix_count_with_order Ignore order when doing count. M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 83e9e19 refs/heads/master Merge: 013b7c1 bbad752 Author: Santiago Pastorino Date: 2014-04-07 12:01:39 -0300 Merge pull request #14631 from laurocaetano/fix_count_with_order Ignore order when doing count. commit bbad752 refs/heads/master Author: Lauro Caetano Date: 2014-04-07 11:07:46 -0300 Ignore order when doing count. This is necessary because Postgresql doesn't play nice with ORDER BY and no GROUP BY. Fixes #14621. M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 013b7c1 refs/heads/master Merge: 67e6706 bbe7fe4 Author: Rafael Mendonça França Date: 2014-04-07 09:07:51 -0500 Merge pull request #14609 from evanwhalen/enums_inheritance Make enums distinct per class commit bbe7fe4 refs/heads/master Author: Evan Whalen Date: 2014-04-07 10:01:03 -0400 make enums distinct per class M activerecord/CHANGELOG.md M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit 67e6706 refs/heads/master Merge: 89ca9dd a44d710 Author: Yves Senn Date: 2014-04-07 08:23:58 +0200 Merge pull request #14628 from vipulnsward/remove-flash-test-warning Remove unused `subclass_controller_with_flash_type_bar` var from flash test. commit 89ca9dd refs/heads/master Merge: 39a54c6 2bc0271 Author: Yves Senn Date: 2014-04-07 08:10:22 +0200 Merge pull request #14624 from jamox/dev_install_guide Added OS X specific commands to installation guide [ci skip] commit a44d710 refs/heads/master Author: Vipul A M Date: 2014-04-07 10:34:17 +0530 Remove unused `subclass_controller_with_flash_type_bar` var from flash test. M actionpack/test/controller/flash_test.rb commit 39a54c6 refs/heads/master Merge: 5ac58be 9534006 Author: Arthur Nogueira Neves Date: 2014-04-06 23:00:51 -0400 Merge pull request #14626 from eileencodes/fix_incorrect_collection_proxy_delete_all_documentation fix CollectionProxy delete_all documentation commit cb12e04 refs/heads/master Author: Steven Harman Date: 2014-04-06 22:06:18 -0400 Add documentation for Thread#freeze M activesupport/lib/active_support/core_ext/thread.rb commit 9534006 refs/heads/master Author: eileencodes Date: 2014-04-03 18:20:28 -0400 fix CollectionProxy delete_all documentation This method no longer returns an array of all records that have been removed. Correct documentation to reflect this change. See issue 14546 M activerecord/lib/active_record/associations/collection_proxy.rb commit 2bc0271 refs/heads/master Author: Jarmo Isotalo Date: 2014-04-06 21:57:20 +0300 Added OS X specific commands to installation guide [ci skip] Recommended using homebrew for installing MySQL and PostgreSQL M guides/source/development_dependencies_install.md commit 5ac58be refs/heads/master Merge: baa9b9b 8bbaa94 Author: Yves Senn Date: 2014-04-06 22:56:50 +0200 Merge pull request #14614 from tgxworld/fix_add_flash_types_test Fix setup of adding _flash_types test. commit 8bbaa94 refs/heads/master Author: Guo Xiang Tan Date: 2014-04-05 11:02:18 -0700 Fix setup of adding _flash_types test. Adding flash types to a controller within any of the tests will result in a global state change of the controller under test. This patch will prevent state leaks and allow us to run the test in random order. M actionpack/test/controller/flash_test.rb commit baa9b9b refs/heads/master Merge: c45939e 752e7a1 Author: Yves Senn Date: 2014-04-06 20:07:09 +0200 Merge pull request #14623 from t3chnoboy/master Use SVG version of travis build status badge [ci skip] commit 752e7a1 refs/heads/master Author: Dmitry Mazuro Date: 2014-04-06 20:39:28 +0300 Use SVG version of travis build status badge [skip ci] M README.md commit 38ad543 refs/heads/master Author: Gaurish Sharma Date: 2014-04-06 02:26:43 +0530 Improve Contributing to Rails Guide Logically group the content, so it makes more sense if someone tries to read from start of page to end of page. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit d1b0633 refs/heads/master Author: Simon Eskildsen Date: 2014-04-05 13:19:18 -0400 Fix serialized field returning serialized data after update_column M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/test/cases/serialized_attribute_test.rb commit c45939e refs/heads/master Merge: 8d1c703 3779c1d Author: Arthur Nogueira Neves Date: 2014-04-05 12:03:45 -0400 Merge pull request #14612 from acallaghan/patch-1 W3C CSP document moved to gihub.io URL [ci skip] commit 3779c1d refs/heads/master Author: Andy Callaghan Date: 2014-04-05 17:01:59 +0100 W3C CSP document moved to gihub.io URL [ci skip] The old link https://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-specification.dev.html is now being soft redirected to this new URL M guides/source/security.md commit 8d1c703 refs/heads/master Merge: f79881e 80f4a65 Author: Rafael Mendonça França Date: 2014-04-04 19:51:35 -0300 Merge pull request #14579 from senny/pg/remove_string_limit PostgreSQL, remove varchar limit. Conflicts: activerecord/CHANGELOG.md commit f79881e refs/heads/master Author: Rafael Mendonça França Date: 2014-04-04 19:47:40 -0300 sprockets-rails was released M Gemfile commit a0804f7 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-04 19:44:17 -0300 Fix the test defining the models in the right place Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb activerecord/test/schema/schema.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb A activerecord/test/models/column.rb A activerecord/test/models/record.rb M activerecord/test/schema/schema.rb commit 7a2eb62 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 19:44:17 -0300 Fix the test defining the models in the right place M activerecord/test/cases/associations/belongs_to_associations_test.rb A activerecord/test/models/column.rb A activerecord/test/models/record.rb M activerecord/test/schema/schema.rb commit 57c7d5c refs/heads/master Author: Rafael Mendonça França Date: 2014-04-04 19:44:17 -0300 Fix the test defining the models in the right place M activerecord/test/cases/associations/belongs_to_associations_test.rb A activerecord/test/models/column.rb A activerecord/test/models/record.rb M activerecord/test/schema/schema.rb commit 1755958 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-04 18:38:06 -0300 Merge pull request #11650 from prathamesh-sonpatki/rename Renamed private methods _create_record and _update_record Conflicts: activerecord/lib/active_record/persistence.rb activerecord/lib/active_record/relation.rb activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/singular_association.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/callbacks.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit df1df87 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 18:38:06 -0300 Merge pull request #11650 from prathamesh-sonpatki/rename Renamed private methods _create_record and _update_record M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/singular_association.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/callbacks.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 989cccd refs/heads/master Author: Rafael Mendonça França Date: 2014-04-04 18:41:43 -0300 Add CHANGELOG entry for #11650 [ci skip] M activerecord/CHANGELOG.md commit e9e5341 refs/heads/master Merge: bc6a949 9694f86 Author: Rafael Mendonça França Date: 2014-04-04 18:38:06 -0300 Merge pull request #11650 from prathamesh-sonpatki/rename Renamed private methods _create_record and _update_record commit 81e8a7e refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-04 18:03:14 -0300 Declare the assets dependency M railties/test/application/assets_test.rb commit 6826b38 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-04 18:03:00 -0300 Use sass-rails 4.0.3 M railties/lib/rails/generators/app_base.rb commit dffb9c5 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 18:03:14 -0300 Declare the assets dependency M railties/test/application/assets_test.rb commit 322d5a3 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 18:03:00 -0300 Use sass-rails 4.0.3 M railties/lib/rails/generators/app_base.rb commit bc6a949 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-04 18:03:14 -0300 Declare the assets dependency M railties/test/application/assets_test.rb commit 61a8fd5 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-04 18:03:00 -0300 Use sass-rails 4.0.3 M railties/lib/rails/generators/app_base.rb commit c2d84ea refs/remotes/origin/4-0-stable Merge: b30104c 650a05c Author: Rafael Mendonça França Date: 2014-04-04 15:48:08 -0500 Merge pull request #14605 from laurocaetano/fix_nodoc_on_collection_proxy Backport to fix wrong nodoc on collection proxy. commit 650a05c refs/remotes/origin/4-0-stable Author: edogawaconan Date: 2013-08-22 17:56:07 +0900 Stray nodoc causes rest of file not parsed [ci skip] M activerecord/lib/active_record/associations/collection_proxy.rb commit 8df0748 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-04 16:30:41 -0300 Make possible to use sprockets 2.1 M rails.gemspec commit cdd6018 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 16:30:41 -0300 Make possible to use sprockets 2.1 M rails.gemspec commit a338b39 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-04 16:25:46 -0300 Make possible to use sprockets-rails 2.1 M Gemfile M rails.gemspec commit b30104c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-04 13:31:10 -0300 Merge pull request #14562 from jefflai2/collection_proxy CollectionProxy uses the arel of its association's scope. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/relations_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/post.rb commit b097ebe refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 13:31:10 -0300 Merge pull request #14562 from jefflai2/collection_proxy CollectionProxy uses the arel of its association's scope. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/post.rb commit 5f1346b refs/heads/master Merge: edb6f7d 1b187ca Author: Rafael Mendonça França Date: 2014-04-04 13:31:10 -0300 Merge pull request #14562 from jefflai2/collection_proxy CollectionProxy uses the arel of its association's scope. Conflicts: activerecord/CHANGELOG.md commit edb6f7d refs/heads/master Merge: b9774a5 e412ccb Author: Arthur Nogueira Neves Date: 2014-04-04 11:57:07 -0400 Merge pull request #14599 from spagalloco/patch-1 add missing parentheses to validates_with documentation [skip ci] commit e412ccb refs/heads/master Author: Steve Agalloco Date: 2014-04-04 11:19:39 -0400 add missing parentheses to validates_with documentation [skip ci] M activemodel/lib/active_model/validations/with.rb commit 54d8c81 refs/heads/master Merge: b9774a5 9330631 Author: Rafael Mendonça França Date: 2014-04-04 12:52:49 -0300 Merge pull request #12016 from roderickvd/uuid_fixes Auto-generate stable fixture UUIDs on PostgreSQL Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/fixtures.rb activerecord/test/cases/adapters/postgresql/uuid_test.rb activesupport/CHANGELOG.md commit b9774a5 refs/heads/master Author: Rafael Mendonça França Date: 2014-04-04 09:52:43 -0500 Remove unused variable M activerecord/test/cases/associations/has_many_associations_test.rb commit 32f3f8f refs/heads/master Merge: d68e1ba 996658e Author: Rafael Mendonça França Date: 2014-04-04 09:46:49 -0500 Merge pull request #14598 from rajcybage/assert_dprecated_for_as_test_case Active support instead of ActiveSupport::Deprecation.silence we can use assert_deprecated commit 996658e refs/heads/master Author: Rajarshi Das Date: 2014-04-04 20:16:26 +0530 Active support instead of ActiveSupport::Deprecation.silence we can use assert_deprecated M activesupport/test/core_ext/class/delegating_attributes_test.rb commit 2fb1365 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-04 09:24:11 -0500 Merge pull request #14597 from matthewd/kernel_y_for_1_9_option_1 Ensure we supply Kernel#y for 1.9 too M railties/lib/rails/application.rb M railties/lib/rails/engine.rb M railties/lib/rails/railtie.rb commit 2386d15 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-04 09:24:11 -0500 Merge pull request #14597 from matthewd/kernel_y_for_1_9_option_1 Ensure we supply Kernel#y for 1.9 too M railties/lib/rails/application.rb M railties/lib/rails/engine.rb M railties/lib/rails/railtie.rb commit d68e1ba refs/heads/master Merge: f50dbf3 b058897 Author: Rafael Mendonça França Date: 2014-04-04 09:24:11 -0500 Merge pull request #14597 from matthewd/kernel_y_for_1_9_option_1 Ensure we supply Kernel#y for 1.9 too commit b058897 refs/heads/master Author: Matthew Draper Date: 2014-04-04 22:35:29 +1030 Ensure we supply Kernel#y for 1.9 too In 1.9, it doesn't live in its own file, so we'll have to define it ourselves. Check RUBY_VERSION, instead of rescuing the require, because we want this to break if `psych/y` moves in a future Ruby release. M railties/lib/rails/application.rb M railties/lib/rails/engine.rb M railties/lib/rails/railtie.rb commit f50dbf3 refs/heads/master Merge: 362203e 20181e4 Author: Yves Senn Date: 2014-04-04 11:31:40 +0200 Merge pull request #14593 from tgxworld/fix_postgresql_schema_test_random_order Prevent state leak in test. commit 80f4a65 refs/heads/master Author: Yves Senn Date: 2014-04-04 09:16:02 +0200 test, show current adapter behavior for `add_column limit: nil`. This is an illustration of https://github.com/rails/rails/pull/13435#issuecomment-33789752 Removing the limit from the PG and SQLite adapter solves the issue. MySQL is still affected by the issue. M activerecord/test/cases/migration/column_attributes_test.rb commit f4226c3 refs/heads/master Author: Yves Senn Date: 2014-04-03 14:59:53 +0200 PostgreSQL and SQLite, remove varchar limit. [Vladimir Sazhin & Toms Mikoss & Yves Senn] There is no reason for the PG adapter to have a default limit of 255 on :string columns. See this snippet from the PG docs: Tip: There is no performance difference among these three types, apart from increased storage space when using the blank-padded type, and a few extra CPU cycles to check the length when storing into a length-constrained column. While character(n) has performance advantages in some other database systems, there is no such advantage in PostgreSQL; in fact character(n) is usually the slowest of the three because of its additional storage costs. In most situations text or character varying should be used instead. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/reflection_test.rb M activerecord/test/schema/schema.rb commit 20181e4 refs/heads/master Author: Guo Xiang Tan Date: 2014-04-03 18:56:51 -0700 Prevent state leak in test. This will allow us to run the tests in random order. M activerecord/test/cases/adapters/postgresql/schema_test.rb commit 1778b07 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-03 16:41:56 -0500 Merge pull request #14582 from arthurnn/blacklist_ruby_methods Blacklist ruby keywords for scopes Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/enum_test.rb M activerecord/test/cases/scoping/named_scoping_test.rb commit 0f05fbf refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-03 16:41:56 -0500 Merge pull request #14582 from arthurnn/blacklist_ruby_methods Blacklist ruby keywords for scopes M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/enum_test.rb M activerecord/test/cases/scoping/named_scoping_test.rb commit 362203e refs/heads/master Merge: ae110ce 815c9de Author: Rafael Mendonça França Date: 2014-04-03 16:41:56 -0500 Merge pull request #14582 from arthurnn/blacklist_ruby_methods Blacklist ruby keywords for scopes commit 815c9de refs/heads/master Author: Arthur Neves Date: 2014-04-03 10:39:05 -0400 Block a few default Class methods as scope name. Add tests to make sure scopes cannot be create with names such as: private, protected, public. Make sure enum values don't collide with those methods too. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/enum_test.rb M activerecord/test/cases/scoping/named_scoping_test.rb commit c5af132 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-04-03 17:13:24 -0300 Merge pull request #14572 from laurocaetano/with_options_and_scope Fix error when using `with_options` with lambda. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/CHANGELOG.md M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/college.rb M activerecord/test/models/student.rb M activerecord/test/schema/schema.rb M activesupport/lib/active_support/option_merger.rb commit 8b48b21 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-03 17:13:24 -0300 Merge pull request #14572 from laurocaetano/with_options_and_scope Fix error when using `with_options` with lambda. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/CHANGELOG.md M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/college.rb M activerecord/test/models/student.rb M activerecord/test/schema/schema.rb M activesupport/lib/active_support/option_merger.rb commit ae110ce refs/heads/master Merge: 6da3e9a db5d26c Author: Rafael Mendonça França Date: 2014-04-03 17:13:24 -0300 Merge pull request #14572 from laurocaetano/with_options_and_scope Fix error when using `with_options` with lambda. Conflicts: activerecord/CHANGELOG.md commit 6da3e9a refs/heads/master Merge: 2c835a6 251840f Author: Arthur Nogueira Neves Date: 2014-04-03 15:33:54 -0400 Merge pull request #14590 from czak/improved_kindlerb_error_message Improve error message for guides:generate:kindle commit 251840f refs/heads/master Author: Łukasz Adamczak Date: 2014-04-03 20:05:51 +0200 Improve error message for guides:generate:kindle With `kindlegen` missing from the PATH, the task keeps suggesting to `gem install kindlerb`. This change provides a more meaningful error message for guides:generate:kindle. M guides/Rakefile commit 8c89868 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-03 13:15:26 -0500 Merge pull request #14588 from matthewd/kernel_y_with_spring Explicitly load Kernel#y when starting a console M railties/lib/rails/engine.rb commit 1b2ea12 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-03 13:15:26 -0500 Merge pull request #14588 from matthewd/kernel_y_with_spring Explicitly load Kernel#y when starting a console M railties/lib/rails/engine.rb commit 2c835a6 refs/heads/master Merge: 7e66303 272f7c2 Author: Rafael Mendonça França Date: 2014-04-03 13:15:26 -0500 Merge pull request #14588 from matthewd/kernel_y_with_spring Explicitly load Kernel#y when starting a console commit 2bfb14c refs/tags/v4.1.0 Author: Matthew Draper Date: 2014-04-02 23:06:16 +1030 Revise 'sqlite3:' URL handling for smoother upgrades Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll change to the absolute-path interpretation in 4.2. The current "correct" spellings for in-memory, relative, and absolute URLs, respectively, are: sqlite3::memory: sqlite3:relative/path sqlite3:/full/path Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce. Uncovered by @guilleiguaran while investigating #14495, though that sounds like a different issue. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/connection_specification/resolver_test.rb M activerecord/test/cases/fixtures_test.rb M guides/source/configuring.md M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/test/application/initializers/frameworks_test.rb M railties/test/application/rake/dbs_test.rb commit 272f7c2 refs/heads/master Author: Matthew Draper Date: 2014-04-04 04:29:50 +1030 Explicitly load Kernel#y when starting a console Previously, we relied on the IRB-detection in Psych itself. But that doesn't work when we're running under spring: the application boots (and thus psych is required) before we switch to console mode and load IRB. Fixes #14587. M railties/lib/rails/engine.rb commit 47a04b8 refs/heads/master Author: Jan Habermann Date: 2014-04-03 19:03:31 +0200 Minor improvement: Use the merge method on the relation instead of instance_eval directly. M activerecord/lib/active_record/associations/through_association.rb commit 33c1dbd refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-03-31 10:11:33 -0700 Merge pull request #14532 from thedarkone/polymorphic-preload-fix Fix polymorphic preloads on NOT NULL _type columns M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/associations/eager_test.rb commit 13d5db7 refs/remotes/origin/4-0-stable Merge: 9310741 48f1065 Author: Rafael Mendonça França Date: 2014-04-03 09:17:12 -0500 Merge pull request #14580 from thedarkone/4-0-stable-backport-14532 Backport #14532 into 4-0-stable commit 1118724 refs/remotes/origin/4-1-stable Author: Matthew Draper Date: 2014-04-02 23:06:16 +1030 Revise 'sqlite3:' URL handling for smoother upgrades Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll change to the absolute-path interpretation in 4.2. The current "correct" spellings for in-memory, relative, and absolute URLs, respectively, are: sqlite3::memory: sqlite3:relative/path sqlite3:/full/path Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce. Uncovered by @guilleiguaran while investigating #14495, though that sounds like a different issue. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/connection_specification/resolver_test.rb M activerecord/test/cases/fixtures_test.rb M guides/source/configuring.md M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/test/application/initializers/frameworks_test.rb M railties/test/application/rake/dbs_test.rb commit 7e66303 refs/heads/master Merge: 3fafc1c 0a99fdd Author: Rafael Mendonça França Date: 2014-04-03 11:12:06 -0300 Merge pull request #14569 from matthewd/sqlite_relative_deprecated Revise 'sqlite3:' URL handling for smoother upgrades Conflicts: activerecord/CHANGELOG.md commit 48f1065 refs/remotes/origin/4-0-stable Author: thedarkone Date: 2014-04-03 15:58:24 +0200 Simplify Preloader#grouped_records code. The new method relies on AR::Associations::Association knowing about both reflection and a model class. AR::Base#association now raises a descriptive error when trying to access non-existent associations. Previously it would blow up with a confusing NoMethodError: undefined method `association_class' for nil:NilClass. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/associations/eager_test.rb commit 53a5f36 refs/remotes/origin/4-0-stable Author: thedarkone Date: 2014-04-03 15:46:17 +0200 Fix polymorphic preloads on NOT NULL _type columns. Defer to Association#klass instead of having a custom/duplicate code. M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/associations/eager_test.rb commit db5d26c refs/heads/master Author: Lauro Caetano Date: 2014-04-02 19:27:55 -0300 Fix error when using `with_options` with lambda. It was causing error when using `with_options` passing a lambda as its last argument. class User < ActiveRecord::Base with_options dependent: :destroy do |assoc| assoc.has_many :profiles, -> { where(active: true) } end end It was happening because the `option_merger` was taking the last argument and checking if it was a Hash. This breaks the HasMany usage, because its last argument can be a Hash or a Proc. As the behavior described in this test: https://github.com/rails/rails/blob/master/activesupport/test/option_merger_test.rb#L69 the method will only accept the lambda, this way it will keep the expected behavior. See 9eaa0a34 M activerecord/CHANGELOG.md M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/college.rb M activerecord/test/models/student.rb M activerecord/test/schema/schema.rb M activesupport/lib/active_support/option_merger.rb commit d54d4af refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-04-03 08:21:00 -0500 Merge pull request #14570 from matthewd/uri_deprecation_warning Avoid a spurious deprecation warning for database URLs M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit d1a94dc refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-04-03 08:21:00 -0500 Merge pull request #14570 from matthewd/uri_deprecation_warning Avoid a spurious deprecation warning for database URLs M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 3fafc1c refs/heads/master Merge: 7531404 ad14153 Author: Rafael Mendonça França Date: 2014-04-03 08:21:00 -0500 Merge pull request #14570 from matthewd/uri_deprecation_warning Avoid a spurious deprecation warning for database URLs commit 384984d refs/heads/master Author: Jan Habermann Date: 2014-04-03 12:40:38 +0200 Simplify the code in target_scope M activerecord/lib/active_record/associations/through_association.rb commit 7531404 refs/heads/master Merge: bd34a95 f1169d9 Author: Yves Senn Date: 2014-04-03 10:48:27 +0200 Merge pull request #14561 from tgxworld/refactor_run_without_connection Add ConnectionHelper to refactor tests. commit bd34a95 refs/heads/master Merge: c0e0e80 1f432c5 Author: Yves Senn Date: 2014-04-03 10:46:46 +0200 Merge branch 'lavrovdv-patch-1' commit 1f432c5 refs/heads/master Author: Dmitry Lavrov Date: 2014-03-27 15:29:20 +0300 Treat blank UUID values as nil M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit c0e0e80 refs/heads/master Merge: 79f06a9 34a3d42 Author: Yves Senn Date: 2014-04-03 10:31:29 +0200 Merge pull request #14576 from ariabov/scope_sections_reordering Change order of scope subsections in Active Record Querying guide [ci skip] commit f1169d9 refs/heads/master Author: Guo Xiang Tan Date: 2014-04-01 22:04:10 -0700 Add ConnectionHelper to refactor tests. M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/postgresql/connection_test.rb M activerecord/test/cases/adapters/postgresql/domain_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb A activerecord/test/support/connection_helper.rb D activerecord/test/support/postgresql_helper.rb commit 34a3d42 refs/heads/master Author: ariabov Date: 2014-04-02 23:39:22 -0700 In Active Record Querying guide, currently `Merging of scopes` section uses a concept of default scope in its example before it is introduced in the following section titled `Applying a default scope`. It makes more sense to switch the ordering to introduce default scopes (`Applying a default scope`) first and then go into `Merging of scopes` section where it is used. M guides/CHANGELOG.md M guides/source/active_record_querying.md commit 79f06a9 refs/heads/master Merge: 5aa4157 3f70c69 Author: Rafael Mendonça França Date: 2014-04-02 20:53:12 -0500 Merge pull request #14564 from killthekitten/patch-2 Fix default_url_options example in i18n guide commit 3f70c69 refs/heads/master Author: Nikolay Shebanov Date: 2014-04-02 13:12:52 +0400 Fix default_url_options example in i18n guide [ci skip] M guides/source/i18n.md commit a3d41cb refs/heads/master Author: Jan Habermann Date: 2014-04-03 02:25:16 +0200 Add a CHANGELOG entry for the has_many :through scoping fix (See #14537 for details). M activerecord/CHANGELOG.md commit 98e6907 refs/heads/master Author: Jan Habermann Date: 2014-04-03 01:52:42 +0200 Properly handle scoping with has_many :through. Fixes #14537. M activerecord/lib/active_record/associations/through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/models/post.rb M activerecord/test/models/reader.rb commit 1b187ca refs/heads/master Author: Jefferson Lai Date: 2014-04-01 20:18:16 -0700 CollectionProxy uses the arel of its association's scope. CollectionProxy should be able to reuse the behavior (methods) of its parent class, but with its own state. This change allows CollectionProxy to use the arel object corresponding to its association's scope. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/post.rb commit ad14153 refs/heads/master Author: Matthew Draper Date: 2014-04-03 06:19:18 +1030 Avoid including DB details in exception messages The keys are quite sufficient; we shouldn't be throwing passwords around. M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 88e60a4 refs/heads/master Author: Matthew Draper Date: 2014-04-03 03:33:40 +1030 Avoid a spurious deprecation warning for database URLs This is all about the case where we have a `DATABASE_URL`, and we have a `database.yml` present, but the latter doesn't contain the key we're looking for. If the key is a symbol, we'll always connect to `DATABASE_URL`, per the new behaviour in 283a2edec2f8ccdf90fb58025608f02a63948fa0. If the key is a string, on the other hand, it should always be a URL: the ability to specify a name not present in `database.yml` is new in this version of Rails, and that ability does not stretch to the deprecated use of a string in place of a symbol. Uncovered by @guilleiguaran while investigating #14495 -- this actually may be related to the original report, but we don't have enough info to confirm. M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit a16824a refs/tags/v4.1.0 Author: Carlos Antonio da Silva Date: 2014-04-02 13:19:13 -0300 Fix cookie serializer docs The option actually needs to be set on action_dispatch. [ci skip] Conflicts: guides/source/upgrading_ruby_on_rails.md M guides/source/upgrading_ruby_on_rails.md commit c13169d refs/remotes/origin/4-1-stable Author: Carlos Antonio da Silva Date: 2014-04-02 13:19:13 -0300 Fix cookie serializer docs The option actually needs to be set on action_dispatch. [ci skip] Conflicts: guides/source/upgrading_ruby_on_rails.md M guides/source/upgrading_ruby_on_rails.md commit 5aa4157 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-04-02 13:19:13 -0300 Fix cookie serializer docs The option actually needs to be set on action_dispatch. [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 654dd04 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-04-02 13:17:21 -0300 Move require to actual file Change to require all active_support/deprecation since that's the actual entry point for the deprecation methods. M activesupport/lib/active_support/core_ext/string/output_safety.rb M activesupport/test/core_ext/string_ext_test.rb commit 0a99fdd refs/heads/master Author: Matthew Draper Date: 2014-04-03 01:41:34 +1030 Complete change of `sqlite3:///` path handling That which was now relative is now absolute. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit f846828 refs/heads/master Author: Matthew Draper Date: 2014-04-02 23:06:16 +1030 Revise 'sqlite3:' URL handling for smoother upgrades Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll change to the absolute-path interpretation in 4.2. The current "correct" spellings for in-memory, relative, and absolute URLs, respectively, are: sqlite3::memory: sqlite3:relative/path sqlite3:/full/path Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce. Uncovered by @guilleiguaran while investigating #14495, though that sounds like a different issue. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/connection_specification/resolver_test.rb M activerecord/test/cases/fixtures_test.rb M guides/source/configuring.md M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/test/application/initializers/frameworks_test.rb M railties/test/application/rake/dbs_test.rb commit a9752dc refs/heads/master Author: Rafael Mendonça França Date: 2014-04-02 11:24:05 -0300 Use asert_deprecated M activesupport/test/core_ext/string_ext_test.rb commit 821f968 refs/heads/master Merge: 3bcc51a 8482895 Author: Rafael Mendonça França Date: 2014-04-02 11:23:45 -0300 Merge pull request #14529 from rwz/master ActiveSupport::SafeBuffer#prepend inconsistency commit 3bcc51a refs/heads/master Merge: c82483a 8ae3f24 Author: Rafael Mendonça França Date: 2014-04-02 09:20:45 -0500 Merge pull request #14568 from alex88/patch-1 Fixed upgrade guide typo commit 8ae3f24 refs/heads/master Author: Alessandro Tagliapietra Date: 2014-04-02 16:02:13 +0200 Fixed small documentation typo Using `Rails.application.config.cookies_serializer :hybrid` throws an exception, fixed to `=`. M guides/source/upgrading_ruby_on_rails.md commit 8482895 refs/heads/master Author: Pavel Pravosud Date: 2014-04-02 09:19:50 -0400 DRY AS::SafeBuffer a bit using existing helper M activesupport/lib/active_support/core_ext/string/output_safety.rb commit c82483a refs/heads/master Merge: def6071 ee36af1 Author: Rafael Mendonça França Date: 2014-04-02 07:29:03 -0500 Merge pull request #14565 from rajcybage/conditional_test_cases We can conditional define the tests depending on the adapter or connection. commit ee36af1 refs/heads/master Author: Rajarshi Das Date: 2014-04-02 16:19:57 +0530 We can conditional define the tests depending on the adapter or connection. M activerecord/test/cases/adapter_test.rb commit def6071 refs/heads/master Author: Dave Lee Date: 2013-11-30 16:01:34 -0700 PostgreSQL, Support for materialized views. [Dave Lee & Yves Senn] Expand the query used in #table_exists? to include materialized views in the kinds of relations it searches. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/view_test.rb commit f159b0a refs/heads/master Author: Yves Senn Date: 2014-04-02 09:03:48 +0200 cleanup, `reset_pg_session` in range_test.rb Also do not use transactional fixtures. We drop the type and the table after every run, so there is nothing for the transaction to clean up. M activerecord/test/cases/adapters/postgresql/range_test.rb commit 7934124 refs/heads/master Merge: 442d722 9896c5f Author: Yves Senn Date: 2014-04-02 08:44:00 +0200 Merge pull request #14550 from tgxworld/fix_failing_enum_test_random_order Allow postgresql enum_test to be run in random order. commit 442d722 refs/heads/master Merge: 5fa65f9 90aef28 Author: Rafael Mendonça França Date: 2014-04-02 00:25:12 -0500 Merge pull request #14560 from abwinkler999/typo-in-RELEASING_RAILS Changed 'so' to 'see' commit 9896c5f refs/heads/master Author: Guo Xiang Tan Date: 2014-03-31 21:53:43 -0700 Allow postgresql enum_test to be run in random order. Creating and dropping similar tables within the same connection causes postgresql to look up old values in the cache of tables which have already been dropped. M activerecord/test/cases/adapters/postgresql/domain_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb A activerecord/test/support/postgresql_helper.rb commit 90aef28 refs/heads/master Author: Benjamin Winkler Date: 2014-04-02 00:31:52 -0400 Changed 'so' to 'see' M RELEASING_RAILS.rdoc commit 5fa65f9 refs/heads/master Merge: 9aa7c25 6c6dc32 Author: Aaron Patterson Date: 2014-04-01 16:00:16 -0700 Merge branch 'rmc' * rmc: push move_string in to `move` combine move_regexp and move_string so we only loop over states once do not create memo objects since we'll just throw them away only ask if `t` is empty once. commit 6c6dc32 refs/heads/master Author: Aaron Patterson Date: 2014-04-01 15:58:42 -0700 push move_string in to `move` M actionpack/lib/action_dispatch/journey/gtg/transition_table.rb commit 0e53d11 refs/heads/master Author: Aaron Patterson Date: 2014-04-01 15:56:23 -0700 combine move_regexp and move_string so we only loop over states once M actionpack/lib/action_dispatch/journey/gtg/transition_table.rb commit ee453a1 refs/heads/master Author: Aaron Patterson Date: 2014-04-01 15:55:48 -0700 do not create memo objects since we'll just throw them away M actionpack/lib/action_dispatch/journey/gtg/simulator.rb M actionpack/lib/action_dispatch/journey/router.rb commit d04bcf9 refs/heads/master Author: Aaron Patterson Date: 2014-04-01 15:50:58 -0700 only ask if `t` is empty once. M actionpack/lib/action_dispatch/journey/gtg/transition_table.rb commit 9aa7c25 refs/heads/master Author: Jeremy Kemper Date: 2014-04-01 16:45:15 -0500 Clarify 'database does not exist' message and implementation. * Clarify what the situation is and what to do. * Advise loading schema using `rake db:setup` instead of migrating. * Use a rescue in the initializer rather than extending the error message in-place. * Preserve the original backtrace of other errors by using `raise` rather than raising again with `raise error`. References 0ec45cd15d0a2f5aebc75e23d841b6c12f3ba763 M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/errors.rb M activerecord/lib/active_record/railtie.rb commit 5d0a4e0 refs/heads/master Author: Yves Senn Date: 2014-04-01 23:41:25 +0200 fix, adjust OID query without range support to include required fields. This is a follow-up fix to f7a6b115fea9f675190a79b701c7034214678f19 and 06082f66d541e581110406bbac3bc395bace3f86 M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 06082f6 refs/heads/master Author: Yves Senn Date: 2014-04-01 19:56:34 +0200 refactor, use `typtype` instead of `typinput` to segment PG types. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit f7a6b11 refs/heads/master Author: Yves Senn Date: 2014-04-01 19:42:22 +0200 PostgreSQL, register custom domains. Closes #14305. This patch registers custom domains in our OID-type_map. They will behave exactly as the type specified by `pg_type.typbasetype`. /cc @matthewd M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb A activerecord/test/cases/adapters/postgresql/domain_test.rb commit fc0b98d refs/heads/master Merge: f54dd28 4d344bb Author: Rafael Mendonça França Date: 2014-04-01 09:56:06 -0500 Merge pull request #14513 from senny/pg/responsible_oid PostgreSQL determine `Column#type` through corresponding OID. #7814 commit 4d344bb refs/heads/master Author: Yves Senn Date: 2014-03-26 17:14:05 +0100 PostgreSQL determine `Column#type` through corresponding OID. #7814 I ran the whole test suite and compared the old to the new types. Following is the list of types that did change with this patch: ``` DIFFERENT TYPE FOR mood: NEW: enum, BEFORE: DIFFERENT TYPE FOR floatrange: NEW: floatrange, BEFORE: float ``` The `floatrange` is a custom type. The old type `float` was simply a coincidence form the name `floatrange` and our type-guessing. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb M activerecord/test/cases/column_definition_test.rb commit f54dd28 refs/heads/master Merge: e9f53f7 49e1743 Author: Rafael Mendonça França Date: 2014-03-31 22:07:48 -0500 Merge pull request #14548 from eileencodes/refactor_capture_sql_in_tests refactor assert_sql query to reuse capture_sql commit 49e1743 refs/heads/master Author: eileencodes Date: 2014-03-31 22:53:45 -0400 refactor assert_sql query to reuse capture_sql set assert_sql to reuse the capture_sql method from above instead of repeating the code in response to comments on issue #14546 M activerecord/test/cases/test_case.rb commit 6df507e refs/heads/master Author: Pavel Pravosud Date: 2014-03-31 22:33:53 -0400 Make AS::SafeBuffer#prepend act like String#prepend Make `#prepend` method modify instance in-place and return self instead of just returning modified value. That is exactly what `#prepend!` method was doing previously, so it's deprecated from now on. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/output_safety.rb M activesupport/test/core_ext/string_ext_test.rb commit e9f53f7 refs/heads/master Merge: 165d93b e247f32 Author: Aaron Patterson Date: 2014-03-31 19:09:32 -0700 Merge pull request #14546 from eileencodes/fix_delete_all_to_not_use_IN_statement Fix delete all to not produce sql in statement commit e247f32 refs/heads/master Author: eileencodes Date: 2014-03-26 10:06:13 -0400 fix delete_all to remove records directly When delete_all is run on a CollectionProxy and has a dependency of delete_all the SQL that is produced has an IN statement. (DELETE FROM `associated_model` where `associated_model` .`parent_id` = 1 AND `associated_model`.`id` IN (1, 2, 3...)). This only happens if the association is not loaded (both loaded and non-loaded delete_all should behave the same. This is a huge problem when it comes to deleting many records because the query becomes very slow. Instead the SQL produced should be (DELETE FROM `assoicated_model` where `associated_model`.`parent_model_id`=1). I fixed this by making sure the check for loaded and destroy also makes sure that the dependent is not delete_all, so the conditional goes to the else and deletes the records directly without the IN statement. M activerecord/lib/active_record/associations/collection_association.rb commit a116afe refs/heads/master Author: eileencodes Date: 2014-03-31 19:25:31 -0400 add test to compare sql statements in delete_all query delete_all sql if an association is not loaded should behave the same as if the association is loaded. This test ensures the SQL statements are exactly the same. M activerecord/test/cases/associations/has_many_associations_test.rb commit a672936 refs/heads/master Author: eileencodes Date: 2014-03-31 19:18:04 -0400 add capture_sql method to compare sql statements and compare Other methods compare specific patterns, this method outputs the actual sql query that is generated. M activerecord/test/cases/test_case.rb commit 9310741 refs/remotes/origin/4-0-stable Author: Guillermo Iguaran Date: 2014-03-31 14:56:35 -0500 Merge pull request #14539 from lparedes/master Do not overwrite selected and disabled attributes Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/template/form_options_helper_test.rb commit 443d3f3 refs/remotes/origin/4-1-stable Author: Guillermo Iguaran Date: 2014-03-31 14:56:35 -0500 Merge pull request #14539 from lparedes/master Do not overwrite selected and disabled attributes M actionview/lib/action_view/helpers/form_options_helper.rb M actionview/test/template/form_options_helper_test.rb commit 165d93b refs/heads/master Merge: 08c8ce6 95692c6 Author: Guillermo Iguaran Date: 2014-03-31 14:56:35 -0500 Merge pull request #14539 from lparedes/master Do not overwrite selected and disabled attributes commit 95692c6 refs/heads/master Author: Laura Paredes Date: 2014-03-31 20:51:13 +0200 Add test for selected and disabled custom attributes in options_for_select M actionview/test/template/form_options_helper_test.rb commit 08c8ce6 refs/heads/master Merge: b88cfed 21a674a Author: Rafael Mendonça França Date: 2014-03-31 13:47:16 -0500 Merge pull request #14542 from arthurnn/fix_release_task Fix release task commit 21a674a refs/heads/master Author: Arthur Neves Date: 2014-03-31 14:45:34 -0400 Fix release task Add a parentheses. related: b4c96490eeb1fbb944e116c7703dd528b37fc08a M tasks/release.rb commit b88cfed refs/heads/master Merge: 5eb13fc 055942d Author: Aaron Patterson Date: 2014-03-31 10:11:33 -0700 Merge pull request #14532 from thedarkone/polymorphic-preload-fix Fix polymorphic preloads on NOT NULL _type columns commit 5eb13fc refs/heads/master Author: Yves Senn Date: 2014-03-31 10:05:24 +0200 refactor, put `PostgreSQLColumn` into `column.rb`. We have `connection_adapters/column.rb` so it's easier to remember that the column in in a separate file. A activerecord/lib/active_record/connection_adapters/postgresql/column.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 17ddc1b refs/remotes/origin/4-0-stable Author: Ian C. Anderson Date: 2014-03-30 22:19:30 -0400 Tiny doc fix for Strong Parameters - accepts_nested_attribute_for -> accepts_nested_attributes_for M actionpack/lib/action_controller/metal/strong_parameters.rb commit 440c191 refs/remotes/origin/4-1-stable Author: Ian C. Anderson Date: 2014-03-30 22:19:30 -0400 Tiny doc fix for Strong Parameters - accepts_nested_attribute_for -> accepts_nested_attributes_for M actionpack/lib/action_controller/metal/strong_parameters.rb commit 5e31b4a refs/heads/master Merge: 4d441e3 aa7382a Author: Arun Agrawal Date: 2014-03-31 08:58:31 +0530 Merge pull request #14535 from iancanderson/patch-1 Tiny doc fix for Strong Parameters commit aa7382a refs/heads/master Author: Ian C. Anderson Date: 2014-03-30 22:19:30 -0400 Tiny doc fix for Strong Parameters - accepts_nested_attribute_for -> accepts_nested_attributes_for M actionpack/lib/action_controller/metal/strong_parameters.rb commit 1dc609c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-30 13:49:19 -0500 Merge pull request #14509 from lukesteensen/pg-array-defaults remove calls to sql_type on pg columns Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 2340c74 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-30 13:49:19 -0500 Merge pull request #14509 from lukesteensen/pg-array-defaults remove calls to sql_type on pg columns Conflicts: activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 055942d refs/heads/master Author: thedarkone Date: 2014-03-30 20:52:01 +0200 Simplify Preloader#grouped_records code. The new method relies on AR::Associations::Association knowing about both reflection and a model class. AR::Base#association now raises a descriptive error when trying to access non-existent associations. Previously it would blow up with a confusing NoMethodError: undefined method `association_class' for nil:NilClass. M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/associations/eager_test.rb commit 4d441e3 refs/heads/master Merge: fd5739c 5098bca Author: Rafael Mendonça França Date: 2014-03-30 13:49:19 -0500 Merge pull request #14509 from lukesteensen/pg-array-defaults remove calls to sql_type on pg columns commit 6fc7708 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-26 22:19:29 -0300 Fix build with bundler 1.6 M railties/test/generators/plugin_new_generator_test.rb commit de32d97 refs/heads/master Author: thedarkone Date: 2014-03-30 20:23:50 +0200 Fix polymorphic preloads on NOT NULL _type columns. Defer to Association#klass instead of having a custom/duplicate code. M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/associations/eager_test.rb commit be521ef refs/heads/master Author: Laura Paredes Date: 2014-03-30 20:23:46 +0200 Do not overwrite selected and disabled attributes M actionview/lib/action_view/helpers/form_options_helper.rb commit 5098bca refs/heads/master Author: Luke Steensen Date: 2014-03-30 12:34:01 -0500 fix mysql builds M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 318a20c1 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-03-30 11:40:13 -0500 Merge pull request #14528 from planas/patch-1 Require yaml explicitly on #database_configuration M railties/lib/rails/application/configuration.rb commit c40bfc6 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-30 11:40:13 -0500 Merge pull request #14528 from planas/patch-1 Require yaml explicitly on #database_configuration M railties/lib/rails/application/configuration.rb commit fd5739c refs/heads/master Merge: 74a8217 7afe193 Author: Rafael Mendonça França Date: 2014-03-30 11:40:13 -0500 Merge pull request #14528 from planas/patch-1 Require yaml explicitly on #database_configuration commit c74ee5f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-30 11:35:05 -0500 Merge pull request #14518 from Peeja/hash-wia-update-respects-to-hash-4-1-stable HashWithIndifferentAccess better respects #to_hash (4-1-stable backport) Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit 6e257b0 refs/remotes/origin/4-1-stable Merge: d5c9fc5 939f4ea Author: Rafael Mendonça França Date: 2014-03-30 11:35:05 -0500 Merge pull request #14518 from Peeja/hash-wia-update-respects-to-hash-4-1-stable HashWithIndifferentAccess better respects #to_hash (4-1-stable backport) commit 78e4862 refs/heads/master Author: Luke Steensen Date: 2014-03-30 11:10:41 -0500 fix bug on non empty defaults for pg array columns fixes #10613 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 74a8217 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-30 13:02:04 -0300 No need to call to_sym It is already called inside type_to_sql method. M activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb commit 593e697 refs/heads/master Merge: 03bf81a 0264762 Author: Yves Senn Date: 2014-03-30 12:22:00 +0200 Merge pull request #14474 from tgxworld/table_cleanup_after_each_test Refactor test to use DdlHelper. commit 7afe193 refs/heads/master Author: Adrià Planas Date: 2014-03-29 21:21:01 +0100 Require yaml explicitly M railties/lib/rails/application/configuration.rb commit 0264762 refs/heads/master Author: Guo Xiang Tan Date: 2014-03-24 20:38:10 -0700 Refactor test to use DdlHelper. Follow-Up to https://github.com/rails/rails/pull/14400 This ensures that all tables are removed after each test and thereby allowing us to run the tests in a random order. M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/helper.rb commit 03bf81a refs/heads/master Merge: 0b33c06 6af07c2 Author: Yves Senn Date: 2014-03-29 15:41:26 +0100 Merge pull request #13890 from achempion/syntax-error-backtrace append link to bad code when error type is SyntaxError commit 0b33c06 refs/heads/master Merge: 66b42a6 0212a41 Author: Yves Senn Date: 2014-03-29 14:52:56 +0100 Merge pull request #14524 from tgxworld/fix_unsubscribe_from_notifications Fix tests not unsubscribing from Notifications. commit b1bd32f refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-03-26 22:19:29 -0300 Fix build with bundler 1.6 M railties/test/generators/plugin_generator_test.rb commit 47dca8d refs/tags/v4.1.0 Author: Godfrey Chan Date: 2014-03-29 04:27:23 -0700 Ensure we are returning either `true` or `false` for `#==` 460eb83d cused `ActiveRecord::Base#==` to sometimes return `nil` in some cases, this ensures we always return a boolean value. Also fixed a similar problem in AR reflections. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/base_test.rb commit d5c9fc5 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-03-29 04:27:23 -0700 Ensure we are returning either `true` or `false` for `#==` 460eb83d cused `ActiveRecord::Base#==` to sometimes return `nil` in some cases, this ensures we always return a boolean value. Also fixed a similar problem in AR reflections. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/base_test.rb commit 66b42a6 refs/heads/master Merge: 3ae3396 945dd25 Author: Xavier Noria Date: 2014-03-29 04:56:13 -0700 Merge pull request #14526 from chancancode/fix_ar_equality Ensure we are returning either `true` or `false` for `#==` commit 3ae3396 refs/heads/master Merge: 86c53d5 f8872d6 Author: Vijay Dev Date: 2014-03-29 17:08:40 +0530 Merge branch 'master' of github.com:rails/docrails commit f8872d6 refs/heads/master Author: Vijay Dev Date: 2014-03-29 17:08:07 +0530 copy edit [ci skip] M guides/source/debugging_rails_applications.md commit 945dd25 refs/heads/master Author: Godfrey Chan Date: 2014-03-29 04:27:23 -0700 Ensure we are returning either `true` or `false` for `#==` 460eb83d cused `ActiveRecord::Base#==` to sometimes return `nil` in some cases, this ensures we always return a boolean value. Also fixed a similar problem in AR reflections. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/base_test.rb commit 0212a41 refs/heads/master Author: Guo Xiang Tan Date: 2014-03-28 18:54:35 -0700 Fix tests not unsubscribing from Notifications. See https://github.com/rails/rails/blob/master/activesupport/lib/active_support/notifications.rb#L131 M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/postgresql/connection_test.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/bind_parameter_test.rb commit c41167b refs/remotes/origin/4-1-stable Merge: 38cf00e 89a7187 Author: Xavier Noria Date: 2014-03-28 10:57:26 -0700 Merge pull request #14522 from kreynolds/replace-regexp-with-include-or-string-4-1 Replace trivial regexp with string or include, twice as fast commit 86c53d5 refs/heads/master Merge: 74d7df1 e43cd0a Author: Xavier Noria Date: 2014-03-28 10:55:56 -0700 Merge pull request #14521 from kreynolds/replace-regexp-with-include-or-string Replace trivial regexp with string or include, twice as fast commit d545dcb refs/remotes/origin/test_equality_operators_return_values (origin/test_equality_operators_return_values) Merge: 925c225 74d7df1 Author: Godfrey Chan Date: 2014-03-28 10:51:52 -0700 Merge branch 'master' into test_equality_operators_return_values commit 925c225 refs/remotes/origin/test_equality_operators_return_values Author: Godfrey Chan Date: 2014-03-28 10:50:43 -0700 Call super first to minimize the noise M activesupport/lib/active_support/test_case.rb commit 89a7187 refs/remotes/origin/4-1-stable Author: Kelley Reynolds Date: 2014-03-28 13:30:47 -0400 Replace trivial regexp with string or include, twice as fast M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_dispatch/http/mime_type.rb M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/railties/databases.rake commit e43cd0a refs/heads/master Author: Kelley Reynolds Date: 2014-03-28 13:19:47 -0400 Replace trivial regexp with string or index, twice as fast M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_dispatch/http/mime_type.rb M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/railties/databases.rake commit 791d235 refs/remotes/origin/4-0-stable Merge: a263d0b f14c74f Author: Xavier Noria Date: 2014-03-28 10:07:38 -0700 Merge pull request #14520 from kreynolds/replace-regexp-with-index-or-string Replace trivial regexp with string or index, twice as fast commit f14c74f refs/remotes/origin/4-0-stable Author: Kelley Reynolds Date: 2014-03-28 12:56:23 -0400 Replace trivial regexp with string or index, twice as fast M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_dispatch/http/mime_type.rb commit 939f4ea refs/remotes/origin/4-1-stable Author: Peter Jaros Date: 2013-10-15 15:45:07 -0400 HashWithIndifferentAccess better respects #to_hash In particular, `#update`, `#merge`, `#replace` all accept objects which respond to `#to_hash`, even if those objects are not Hashes directly. M activesupport/CHANGELOG.md M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit 74d7df1 refs/heads/master Merge: 555ec36 03f35a2 Author: Rafael Mendonça França Date: 2014-03-28 10:37:41 -0500 Merge pull request #12550 from Peeja/hash-wia-update-respects-to-hash HashWithIndifferentAccess#update respects #to_hash commit a263d0b refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-28 10:24:18 -0500 Merge pull request #12778 from etehtsea/rake-default-fix Don't load test env by default. Closes #13241 Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/test_unit/railtie.rb commit 38cf00e refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-28 10:24:18 -0500 Merge pull request #12778 from etehtsea/rake-default-fix Don't load test env by default. Closes #13241 M railties/CHANGELOG.md M railties/lib/rails/test_unit/railtie.rb commit 555ec36 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-28 12:28:28 -0300 Add CHANGELOG entry for #12778 [ci skip] M railties/CHANGELOG.md commit ec0a2b5 refs/heads/master Merge: a8bd7b1 a3dbb96 Author: Rafael Mendonça França Date: 2014-03-28 10:24:18 -0500 Merge pull request #12778 from etehtsea/rake-default-fix Don't load test env by default. Closes #13241 commit a8bd7b1 refs/heads/master Author: Yves Senn Date: 2014-03-28 16:20:26 +0100 PostgreSQL, use `PostgreSQLColumn` in PG specific tests. M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit d8b4583 refs/heads/master Author: Yves Senn Date: 2014-03-28 16:10:24 +0100 PostgreSQL, test-cases to lock down column default values. M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 03f35a2 refs/heads/master Author: Peter Jaros Date: 2013-10-15 15:45:07 -0400 HashWithIndifferentAccess better respects #to_hash In particular, `.new`, `#update`, `#merge`, `#replace` all accept objects which respond to `#to_hash`, even if those objects are not Hashes directly. M activesupport/CHANGELOG.md M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit 557ac34 refs/heads/master Merge: 13b618f 8753ce1 Author: Yves Senn Date: 2014-03-28 14:36:01 +0100 Merge pull request #14515 from mzahir/fix_xml_warning Fix warning for overshadowing XML variable commit 8753ce1 refs/heads/master Author: Musannif Zahir Date: 2014-03-28 20:11:58 +0800 Fix warning for overshadowing XML variable M activemodel/test/cases/serializers/xml_serialization_test.rb commit 13b618f refs/heads/master Author: Yves Senn Date: 2014-03-28 09:40:21 +0100 PostgreSQL, test cases to lock the current column types. M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/citext_test.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/ltree_test.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit bbb4566 refs/remotes/origin/4-1-stable Merge: 799a7bc 0f73bc9 Author: Aaron Patterson Date: 2014-03-27 22:49:43 -0700 Merge pull request #14508 from al2o3cr/pull14154-4-1-stable Backport #14154 to 4-1-stable commit 0f73bc9 refs/remotes/origin/4-1-stable Author: Matt Jones Date: 2014-02-21 17:58:40 -0500 Pass a base relation to build_default_scope when joining This allows the default scope to be built using the current table alias. Resolves #12770 M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/scoping/default.rb M activerecord/test/cases/associations/inner_join_association_test.rb M activerecord/test/models/category.rb commit c81e4e6 refs/heads/master Merge: dd3ea17 70a5e56 Author: Aaron Patterson Date: 2014-03-27 21:00:06 -0700 Merge pull request #14154 from al2o3cr/issue12770 Pass a base relation to build_default_scope when joining commit dd3ea17 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-27 16:10:17 -0500 Merge pull request #14469 from tiegz/timestamp_inheritance_fix Swap Timestamp/Callbacks order in ActiveRecord::Base M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb commit 799a7bc refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-27 16:10:17 -0500 Merge pull request #14469 from tiegz/timestamp_inheritance_fix Swap Timestamp/Callbacks order in ActiveRecord::Base M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb commit 17b5aac refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-27 18:14:31 -0300 Add CHANGELOG entry for #14469 [ci skip] M activerecord/CHANGELOG.md commit b117206 refs/remotes/origin/4-0-stable Merge: 93ed89d 3de4c56 Author: Rafael Mendonça França Date: 2014-03-27 16:10:17 -0500 Merge pull request #14469 from tiegz/timestamp_inheritance_fix Swap Timestamp/Callbacks order in ActiveRecord::Base commit 3de4c56 refs/remotes/origin/4-0-stable Author: Tieg Zaharia Date: 2014-03-24 16:16:51 -0400 Swap Timestamp/Callbacks inheritance in ActiveRecord::Base Fixes a regression in the lookup chain for update_record & create_record. Timestamp's methods were being executed before Callback's. M activerecord/lib/active_record/base.rb M activerecord/test/cases/timestamp_test.rb commit 5cf456a refs/heads/master Merge: bdab7b1 d93bfac Author: Carlos Antonio da Silva Date: 2014-03-27 17:18:44 -0300 Merge pull request #14505 from davefp/patch-1 Adds explanation of :base attribute to errors.add [ci skip] commit d93bfac refs/heads/master Author: David Underwood Date: 2014-03-27 16:13:56 -0400 Adds explanation of :base attribute to errors.add [ci skip] M activemodel/lib/active_model/errors.rb commit 93ed89d refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-27 15:02:48 -0300 Merge pull request #14393 from chrisfinne/persisted_exception AR .persisted? throws SystemStackError for an unsaved model with a custom primary_key that didn't save due to validation error Conflicts: activerecord/CHANGELOG.md activerecord/test/models/movie.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb M activerecord/test/models/movie.rb commit d6c704f refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-27 15:02:48 -0300 Merge pull request #14393 from chrisfinne/persisted_exception AR .persisted? throws SystemStackError for an unsaved model with a custom primary_key that didn't save due to validation error Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb M activerecord/test/models/movie.rb commit bdab7b1 refs/heads/master Merge: eddcdb0 3a66179 Author: Rafael Mendonça França Date: 2014-03-27 15:02:48 -0300 Merge pull request #14393 from chrisfinne/persisted_exception AR .persisted? throws SystemStackError for an unsaved model with a custom primary_key that didn't save due to validation error commit 3a66179 refs/heads/master Author: chrisfinne Date: 2014-03-15 03:32:24 -0700 AR .persisted? throws SystemStackError for an unsaved model with a custom primary_key that didn't save due to validation error M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb M activerecord/test/models/movie.rb commit d6787ef refs/remotes/origin/test_equality_operators_return_values Author: Godfrey Chan Date: 2014-03-27 10:47:34 -0700 A hack to ensure we are returning booleans for #== and #!= M activesupport/lib/active_support/test_case.rb commit eddcdb0 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-27 14:16:57 -0300 Add CHANGELOG to Active Model too [ci skip] M activemodel/CHANGELOG.md commit 56dabd8 refs/heads/master Merge: 5bf38ff 2e70f44 Author: Rafael Mendonça França Date: 2014-03-27 14:02:55 -0300 Merge pull request #14456 from henrik/add-validate-method ActiveRecord/ActiveModel '#validate' alias for 'valid?' commit 2e70f44 refs/heads/master Author: Henrik Nyh Date: 2014-03-23 12:09:55 +0100 ActiveRecord/ActiveModel '#validate' alias for 'valid?' It's unintuitive to call '#valid?' when you want to run validations but don't care about the return value. The alias in ActiveRecord isn't strictly necessary (the ActiveModel alias is still in effect), but it clarifies. M activemodel/lib/active_model/validations.rb M activemodel/test/cases/validations_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations.rb M activerecord/test/cases/validations_test.rb commit 15a18c1 refs/heads/master Author: Gaurish Sharma Date: 2014-03-27 16:37:47 +0530 Clarify environment_name for logs [ci skip] M guides/source/debugging_rails_applications.md commit 5bf38ff refs/heads/master Author: Yves Senn Date: 2014-03-27 11:55:46 +0100 require dependency to execute a single test from xml_serialization_test When the tests are executed in order, the dependency is loaded at the right time. However this makes it impossible to execute a single test later down the line. Let's require the dependecy at the beginning to get them working independent of the order. This resolves the following error: ``` $ ARCONN=postgresql ruby -Itest /Users/senny/Projects/rails/activerecord/test/cases/xml_serialization_test.rb -n test_to_xml Using postgresql Run options: -n test_to_xml --seed 51819 E Finished in 0.081320s, 12.2971 runs/s, 0.0000 assertions/s. 1) Error: DatabaseConnectedXmlSerializationTest#test_to_xml: NameError: uninitialized constant DatabaseConnectedXmlSerializationTest::REXML /Users/senny/Projects/rails/activerecord/test/cases/xml_serialization_test.rb:226:in `test_to_xml' ``` /cc @tgxworld fyi M activerecord/test/cases/xml_serialization_test.rb commit 70a4144 refs/heads/master Author: Yves Senn Date: 2014-03-27 11:24:31 +0100 only run citext_test if the connection supports_extensions?. This will keep the test suite passing with older PG installations. M activerecord/test/cases/adapters/postgresql/citext_test.rb commit 73b3afe refs/heads/master Merge: 8a081db ff8f9f0 Author: Rafael Mendonça França Date: 2014-03-26 22:16:02 -0500 Merge pull request #14494 from laurocaetano/test_case_for_fk_with_validate_false Add a test case for save(validate: false) with invalid foreign key. commit ff8f9f0 refs/heads/master Author: Lauro Caetano Date: 2014-03-26 22:23:42 -0300 Add a test case for save(validate:false) with invalid foreign key. It is supposed to raise ActiveRecord::InvalidForeignKey when the database has a fk constraint. M activerecord/test/cases/adapter_test.rb commit 9ec117d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-26 22:46:40 -0300 Fix test case M railties/test/generators/shared_generator_tests.rb commit 8fa883f refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-26 22:19:29 -0300 Fix build with bundler 1.6 M railties/test/generators/plugin_generator_test.rb commit a6a8f9a refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-26 22:18:53 -0300 Edge Rails applications doesn't need to use arel master Conflicts: railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/app_base.rb commit 8a081db refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 22:19:29 -0300 Fix build with bundler 1.6 M railties/test/generators/plugin_generator_test.rb commit 7f62f30 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 22:18:53 -0300 Edge Rails applications doesn't need to use arel master M railties/lib/rails/generators/app_base.rb commit 054e2c4 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 20:34:16 -0300 Remove unused method This method is not being called anywhere in our code and a GitHub search show it is not being used in any project. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 110f2ed refs/heads/master Merge: 9ed0cf5 cbe1bc2 Author: Rafael Mendonça França Date: 2014-03-26 20:31:51 -0300 Merge branch 'rm-create-with-index' commit cbe1bc2 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 20:31:32 -0300 Improve CHANGELOG entry M activerecord/CHANGELOG.md commit 8a37f3b refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 20:30:28 -0300 No need to use begin/end blocks M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb commit 03d4ed3 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 20:18:59 -0300 No need to gsub the string M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb commit ee7db77 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 20:04:55 -0300 Don't use send when we own the method M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit e1a41fb refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 20:04:12 -0300 Make method private M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 4e2ca9b refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 20:02:27 -0300 Improve the method * cache `o.name` value * Avoid extra `concat` call * Avoid extra `<<` call M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit fb74394 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 19:15:57 -0300 Remove unneeded comments about feature support on the adapters These comments will likely be outdated with time and doesn't include any information that can't be found in the adapters M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit baf62e5 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-26 17:37:26 -0300 Invert the conditionals to make easier to read Also improve some of the code conventions M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 6af07c2 refs/heads/master Author: Boris Kuznetsov Date: 2014-01-30 18:33:49 +0400 Append link to bad code to backtrace when exception is SyntaxError M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/test/dispatch/debug_exceptions_test.rb commit fb522a2 refs/heads/master Merge: 9ed0cf5 63c94ef Author: Rafael Mendonça França Date: 2014-03-26 17:26:20 -0300 Merge pull request #14480 from steverice/mysql-indexes-in-create-table Create indexes inline in CREATE TABLE for MySQL commit 8718b83 refs/tags/v4.1.0 Author: Rafael Mendonça França Date: 2014-03-26 12:45:38 -0500 Merge pull request #14487 from JuanitoFatas/patch/fix-release-note-url [ci skip] Fix Pull Request URL in 4.1 release note. M guides/source/4_1_release_notes.md commit 5ac4d6e refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-26 12:45:38 -0500 Merge pull request #14487 from JuanitoFatas/patch/fix-release-note-url [ci skip] Fix Pull Request URL in 4.1 release note. M guides/source/4_1_release_notes.md commit 9ed0cf5 refs/heads/master Merge: dcda6e3 c7ab4fc Author: Rafael Mendonça França Date: 2014-03-26 12:45:38 -0500 Merge pull request #14487 from JuanitoFatas/patch/fix-release-note-url [ci skip] Fix Pull Request URL in 4.1 release note. commit c7ab4fc refs/heads/master Author: Juanito Fatas Date: 2014-03-27 01:39:58 +0800 [ci skip] Fix Pull Request URL in 4.1 release note. M guides/source/4_1_release_notes.md commit dcda6e3 refs/heads/master Author: Yves Senn Date: 2014-03-26 09:06:31 +0100 link to "Schema migration" Wikipedia page. Closes #14479. [ci skip] M guides/source/migrations.md commit 63c94ef refs/heads/master Author: Steve Rice Date: 2014-03-25 21:13:29 -0700 Fixes bugs for using indexes in CREATE TABLE by adding checks for table existence Also: - updates tests by stubbing table_exists? method - adds entry for creating indexes in CREATE TABLE to changelog M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb commit afa148a refs/heads/master Author: Cody Cutrer Date: 2014-01-21 16:56:53 -0700 create indexes inline in CREATE TABLE for MySQL This is important, because adding an index on a temporary table after it has been created would commit the transaction Conflicts: activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb commit 6b6f8b5 refs/tags/v4.1.0.rc2 (tag: v4.1.0.rc2) Author: David Heinemeier Hansson Date: 2014-03-25 20:17:43 +0100 Prepare for rc2 release M RAILS_VERSION M actionmailer/lib/action_mailer/gem_version.rb M actionpack/lib/action_pack/gem_version.rb M actionview/lib/action_view/gem_version.rb M activemodel/lib/active_model/gem_version.rb M activerecord/lib/active_record/gem_version.rb M activesupport/lib/active_support/gem_version.rb M railties/lib/rails/gem_version.rb M version.rb commit 470108b refs/heads/master Author: Rafael Mendonça França Date: 2014-03-25 15:36:28 -0300 Fix task comment to match which file should be changed [ci skip] M Rakefile commit d4d0307 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-25 15:36:28 -0300 Fix task comment to match which file should be changed [ci skip] M Rakefile commit 2d26022 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-25 15:36:28 -0300 Fix task comment to match which file should be changed [ci skip] M Rakefile commit f9c52f2 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-25 15:35:06 -0300 Fix the update_versions release task M Rakefile M tasks/release.rb commit e0c93e8 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-25 15:35:06 -0300 Fix the update_versions release task M Rakefile M tasks/release.rb commit ce0df82 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-25 15:35:06 -0300 Fix the update_versions release task M Rakefile M tasks/release.rb commit ba70017 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-25 15:14:52 -0300 Use rails conventions M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 05f62fc refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-25 15:13:22 -0300 Merge pull request #14390 from huoxito/true-touch Still touch associations when theres no timestamp M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit afebf52 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-25 15:14:52 -0300 Use rails conventions M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 2400e44 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-25 15:13:22 -0300 Merge pull request #14390 from huoxito/true-touch Still touch associations when theres no timestamp M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 15e83ed refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-25 15:14:52 -0300 Use rails convetions M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 97b40f6 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-25 15:13:22 -0300 Merge pull request #14390 from huoxito/true-touch Still touch associations when theres no timestamp M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit ade741e refs/heads/master Author: Rafael Mendonça França Date: 2014-03-25 15:14:52 -0300 Use rails convetions M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 833109c refs/heads/master Merge: e94e6c2 ea3a73e Author: Rafael Mendonça França Date: 2014-03-25 15:13:22 -0300 Merge pull request #14390 from huoxito/true-touch Still touch associations when theres no timestamp commit e94e6c2 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-25 15:09:48 -0300 Revert "Merge pull request #8313 from alan/only_save_changed_has_one_objects" This reverts commit 6e3ab3e15faf782f6a937ccf5574a4fb63e3e353, reversing changes made to 39e07b64ce3f4bb55e60ba0266e677f8e4f4893a. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/autosave_association_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/autosave_association_test.rb commit c325b64 refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-03-25 19:07:47 +0100 Add warning about changed Digestor cache_key M actionview/CHANGELOG.md commit 31f6f01 refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-03-25 19:07:47 +0100 Add warning about changed Digestor cache_key M actionview/CHANGELOG.md commit 30b94a8 refs/heads/master Merge: 23ffd03 9a976ab Author: Aaron Patterson Date: 2014-03-25 10:18:42 -0700 Merge branch 'master' into adequaterecord * master: (96 commits) clarify CHANGELOG [ci skip]. Fix Generation of proper migration when ActiveRecord::Base.pluralize_table_names = false. update comments to reflect that options support is not available synchronize changelogs and 4.1 release notes. [ci skip] do not rely on method_missing hitting arel use ARel factory methods for building AST nodes Fix date_select option overwriting html classes - Rename `increment_or_decrement` to an apt `set_cache_value` since it actually doesn't increment/decrement in localstore. Check if any sqlite files are not included in the gitignore Remove sqlite3 lines from .gitignore if the application is not using sqlite3. Adding active_model in Rails::Info Clean up tables after each test. Swapped parameters of assert_equal in assert_select Update test helper to use latest Digestor API Digestor should just rely on the finder to know about the format and the variant -- trying to pass it back in makes a mess of things (oh, and doesnt work) Log the full path, including variant, that the digestor is trying to find Fix for digestor to consider variants for partials -- this still needs more testing!! fix log_tags request object grammar Extract with_example_table into helper method. test for structure:dump without schema information table. refs eafec46 ... Conflicts: activerecord/test/cases/relation/where_chain_test.rb commit 9a976ab refs/heads/master Author: Yves Senn Date: 2014-03-25 16:07:52 +0100 clarify CHANGELOG [ci skip]. M activerecord/CHANGELOG.md commit c35fb52 refs/heads/master Merge: 3fd15f4 5a3817c Author: Yves Senn Date: 2014-03-25 16:03:51 +0100 Merge pull request #13440 from kuldeepaggarwal/pluralize_table_name_issue Generating proper migration when ActiveRecord::Base.pluralize_table_names = false commit 5a3817c refs/heads/master Author: Kuldeep Aggarwal Date: 2014-03-25 20:27:37 +0530 Fix Generation of proper migration when ActiveRecord::Base.pluralize_table_names = false. Previously, generation a migration like this: rails g migration add_column_name_to_user name would not generating the correct table name. Fixes #13426. M activerecord/CHANGELOG.md M activerecord/lib/rails/generators/active_record/migration/migration_generator.rb M railties/lib/rails/generators/generated_attribute.rb M railties/test/generators/migration_generator_test.rb commit 3fd15f4 refs/heads/master Merge: 10b6895 3ed5104 Author: Rafael Mendonça França Date: 2014-03-25 09:39:33 -0500 Merge pull request #14477 from fcheung/options_test_method Support the options methods in tests commit 3ed5104 refs/heads/master Author: Frederick Cheung Date: 2014-03-25 13:46:18 +0000 update comments to reflect that options support is not available M actionpack/lib/action_controller/test_case.rb commit 10b6895 refs/heads/master Author: Yves Senn Date: 2014-03-25 10:03:27 +0100 synchronize changelogs and 4.1 release notes. [ci skip] Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md M guides/source/4_1_release_notes.md commit 7fa391d refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-03-25 10:03:27 +0100 synchronize changelogs and 4.1 release notes. [ci skip] Conflicts: activerecord/CHANGELOG.md M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/source/4_1_release_notes.md M railties/CHANGELOG.md commit a5bff17 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-03-25 10:03:27 +0100 synchronize changelogs and 4.1 release notes. [ci skip] M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/source/4_1_release_notes.md M railties/CHANGELOG.md commit f72058a refs/heads/master Author: Aaron Patterson Date: 2014-03-24 17:38:18 -0700 do not rely on method_missing hitting arel arel methods are not supposed to be public API for ActiveRecord M activerecord/test/cases/scoping/relation_scoping_test.rb commit c7191e3 refs/heads/master Author: Aaron Patterson Date: 2014-03-24 17:20:55 -0700 use ARel factory methods for building AST nodes This abstracts us from the actual construction of the nodes M activerecord/test/cases/relation/predicate_builder_test.rb M activerecord/test/cases/relation/where_chain_test.rb commit e209723 refs/heads/master Merge: 416099c ab6deee Author: Rafael Mendonça França Date: 2014-03-24 19:16:03 -0500 Merge pull request #14466 from vipulnsward/rename-cache-method Rename method and stop passing unused arguements. commit 7f9cb9c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-24 19:09:15 -0500 Merge pull request #14468 from izoomi/date_select_helper Fix date_select with_css_classes: true option overwriting other html classes Conflicts: actionview/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_test.rb commit 193062e refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-24 19:09:15 -0500 Merge pull request #14468 from izoomi/date_select_helper Fix date_select with_css_classes: true option overwriting other html classes M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/date_helper.rb M actionview/test/template/date_helper_test.rb commit 416099c refs/heads/master Merge: b9440c3 60ed9d6 Author: Rafael Mendonça França Date: 2014-03-24 19:09:15 -0500 Merge pull request #14468 from izoomi/date_select_helper Fix date_select with_css_classes: true option overwriting other html classes commit 60ed9d6 refs/heads/master Author: Izumi Wong-Horiuchi Date: 2014-03-21 16:28:47 -0400 Fix date_select option overwriting html classes with_css_classes: true option overwrites other html classes. Concatenate day month and year classes rather than overwriting. M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/date_helper.rb M actionview/test/template/date_helper_test.rb commit ab6deee refs/heads/master Author: Vipul A M Date: 2014-03-24 19:41:43 +0530 - Rename `increment_or_decrement` to an apt `set_cache_value` since it actually doesn't increment/decrement in localstore. M activesupport/lib/active_support/cache/strategy/local_cache.rb commit b9440c3 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-24 09:24:47 -0300 Check if any sqlite files are not included in the gitignore If the sqlite file name change in future version we this regexp should catch M railties/test/generators/app_generator_test.rb commit 9d8354c refs/heads/master Merge: 8bd2912 f42c7ee Author: Rafael Mendonça França Date: 2014-03-24 09:22:11 -0300 Merge pull request #14447 from Houdini/gitignore Skip sqlite3 files in .gitignore if no sqlite3 in app commit f42c7ee refs/heads/master Author: Dmitrii Golub Date: 2014-03-22 03:26:02 +0400 Remove sqlite3 lines from .gitignore if the application is not using sqlite3. M railties/CHANGELOG.md M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/app/templates/gitignore M railties/test/generators/app_generator_test.rb commit 8bd2912 refs/heads/master Merge: 93ed759 1db36c4 Author: Yves Senn Date: 2014-03-24 09:15:50 +0100 Merge pull request #14440 from tgxworld/mysql_table_cleanup_after_each_test Clean up tables after each test. commit 93ed759 refs/heads/master Merge: bcf3a82 23eafe8 Author: Guillermo Iguaran Date: 2014-03-24 01:09:03 -0500 Merge pull request #14463 from ankit8898/add_info Adding active_model in Rails::Info commit 23eafe8 refs/heads/master Author: Ankit Gupta Date: 2014-03-23 23:55:03 -0400 Adding active_model in Rails::Info M railties/lib/rails/info.rb commit 79a2be6 refs/tags/v4.1.0.rc2 Author: Vishal Lal Date: 2014-03-22 22:50:55 +0000 Swapped parameters of assert_equal in assert_select Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 9fccb3c refs/remotes/origin/4-0-stable Author: Vishal Lal Date: 2014-03-22 22:50:55 +0000 Swapped parameters of assert_equal in assert_select M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit b423eba refs/remotes/origin/4-1-stable Author: Vishal Lal Date: 2014-03-22 22:50:55 +0000 Swapped parameters of assert_equal in assert_select M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit bcf3a82 refs/heads/master Merge: 9d44b3f 0ebae1d Author: Godfrey Chan Date: 2014-03-22 18:52:03 -0700 Merge pull request #14450 from vlal/vlal-rails Incorrect values being printed by assert_select. commit 1db36c4 refs/heads/master Author: Guo Xiang Tan Date: 2014-03-20 14:41:09 -0700 Clean up tables after each test. Follow-Up to https://github.com/rails/rails/pull/14400 This ensures that all tables are removed after each test and thereby allowing us to run the tests in a random order. M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb commit 0ebae1d refs/heads/master Author: Vishal Lal Date: 2014-03-22 22:50:55 +0000 Swapped parameters of assert_equal in assert_select M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/testing/assertions/selector.rb commit 46b66aa refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-03-21 17:37:23 +0100 Update test helper to use latest Digestor API M actionpack/test/controller/caching_test.rb commit 767a2b0 refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-03-21 16:29:00 +0100 Digestor should just rely on the finder to know about the format and the variant -- trying to pass it back in makes a mess of things (oh, and doesnt work) M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb M actionview/test/template/digestor_test.rb commit 494803a refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-03-19 20:51:13 +0100 Log the full path, including variant, that the digestor is trying to find M actionview/lib/action_view/digestor.rb commit ca1749e refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-03-19 19:23:29 +0100 Fix for digestor to consider variants for partials -- this still needs more testing!! M actionview/lib/action_view/digestor.rb commit 9d44b3f refs/heads/master Author: David Heinemeier Hansson Date: 2014-03-21 17:37:23 +0100 Update test helper to use latest Digestor API M actionpack/test/controller/caching_test.rb commit 637bb72 refs/heads/master Author: David Heinemeier Hansson Date: 2014-03-21 16:29:00 +0100 Digestor should just rely on the finder to know about the format and the variant -- trying to pass it back in makes a mess of things (oh, and doesnt work) M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb M actionview/test/template/digestor_test.rb commit 4bca347 refs/heads/master Author: David Heinemeier Hansson Date: 2014-03-19 20:51:13 +0100 Log the full path, including variant, that the digestor is trying to find M actionview/lib/action_view/digestor.rb commit 06b4f01 refs/heads/master Author: David Heinemeier Hansson Date: 2014-03-19 19:23:29 +0100 Fix for digestor to consider variants for partials -- this still needs more testing!! M actionview/lib/action_view/digestor.rb commit 239c1b3 refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-03-21 17:37:23 +0100 Update test helper to use latest Digestor API M actionpack/test/controller/caching_test.rb commit 958199a refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-03-21 16:29:00 +0100 Digestor should just rely on the finder to know about the format and the variant -- trying to pass it back in makes a mess of things (oh, and doesnt work) M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb M actionview/test/template/digestor_test.rb commit 1cb9f59 refs/heads/master Merge: 2ca3f33 3bbc960 Author: Rafael Mendonça França Date: 2014-03-21 10:04:35 -0500 Merge pull request #14445 from ibroadfo/patch-1 fix log_tags request object grammar commit 3bbc960 refs/heads/master Author: Iain D Broadfoot Date: 2014-03-21 14:59:42 +0000 fix log_tags request object grammar M guides/source/configuring.md commit 9632919 refs/heads/master Author: Earl St Sauver Date: 2014-03-20 14:59:39 -0700 Mention required glob param name in match docs for mapper THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error. M actionpack/lib/action_dispatch/routing/mapper.rb commit 2ca3f33 refs/heads/master Merge: 582cbff 79405a0 Author: Yves Senn Date: 2014-03-20 21:54:10 +0100 Merge pull request #14400 from tgxworld/ensure_tables_are_dropped_after_test Drop custom tables after each test. commit 79405a0 refs/heads/master Author: Guo Xiang Tan Date: 2014-03-18 19:06:44 -0700 Extract with_example_table into helper method. This setups the helper method which other tests can benefit from. M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb A activerecord/test/support/ddl_helper.rb commit 8030534 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-03-20 18:40:51 +0100 test for structure:dump without schema information table. refs eafec46 This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa M railties/test/application/rake/dbs_test.rb commit dbd84b4 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-03-20 18:40:51 +0100 test for structure:dump without schema information table. refs eafec46 This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa M railties/test/application/rake/dbs_test.rb commit 582cbff refs/heads/master Author: Yves Senn Date: 2014-03-20 18:40:51 +0100 test for structure:dump without schema information table. refs eafec46 This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa M railties/test/application/rake/dbs_test.rb commit f522aeb refs/heads/master Merge: a2a7f8b 886fcb0 Author: Rafael Mendonça França Date: 2014-03-20 12:06:15 -0500 Merge pull request #14436 from arunagw/aa-warning-removed-grouped-expression Warning removed (...) interpreted as grouped expression commit 886fcb0 refs/heads/master Author: Arun Agrawal Date: 2014-03-20 21:01:00 +0530 Warning removed (...) interpreted as grouped expression M actionview/lib/action_view/digestor.rb commit a2a7f8b refs/heads/master Merge: 3980d40 41548df Author: Carlos Antonio da Silva Date: 2014-03-20 10:04:54 -0300 Merge pull request #14271 from akshay-vishnoi/fixes Deprecate superclass_delegating_accessor, use class_attribute instead. commit 41548df refs/heads/master Author: Akshay Vishnoi Date: 2014-03-20 18:29:09 +0530 Deprecate Class#superclass_delegating_accessor M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/class/delegating_attributes.rb M activesupport/test/core_ext/class/delegating_attributes_test.rb commit 7bfc462 refs/tags/v4.1.0.rc2 Author: Godfrey Chan Date: 2014-03-20 05:36:31 -0700 The digest option is no longer honoured since Rails 3.0 [ci skip] Closes #8513 M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 482fa29 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-03-20 05:36:31 -0700 The digest option is no longer honoured since Rails 3.0 [ci skip] Closes #8513 M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 9f8ee0b refs/remotes/origin/4-0-stable Author: Godfrey Chan Date: 2014-03-20 05:36:31 -0700 The digest option is no longer honoured since Rails 3.0 [ci skip] Closes #8513 M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 3980d40 refs/heads/master Author: Godfrey Chan Date: 2014-03-20 05:36:31 -0700 The digest option is no longer honoured since Rails 3.0 [ci skip] Closes #8513 M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 850f59f refs/heads/master Merge: 656f4f2 0110d7b Author: Yves Senn Date: 2014-03-20 13:38:44 +0100 Merge pull request #12955 from joshwilliams/master Postgres schema: Constrain sequence search classid commit 656f4f2 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-20 08:40:31 -0300 Remove extra indirection for testing exceptions and messages assert_raise + assert_equal on the returned exception message work just fine, there is no need for extra work, specially like this overly complicated helper. M activerecord/test/cases/nested_attributes_test.rb commit 0110d7b refs/heads/master Author: Josh Williams Date: 2013-11-19 15:50:14 -0500 Postgres schema: Constrain sequence search classid The pk_an_sequence_for query previously joined against pg_class's oid for rows in pg_depend, but pg_depend's objid may point to other system tables, such as pg_attrdef. If a row in one of those other tables coincidentally has the same oid as an (unrelated) sequence, that sequence name may be returned instead of the real one. This ensures that only the pg_depend entries pointing to pg_class are considered. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 97229c6 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-20 08:27:22 -0300 Remove some indirection in rake dbs test Just pass in the expected database as argument rather than "caching" it in a hash and using the hash in the helper methods. M railties/test/application/rake/dbs_test.rb commit 66dc576 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-20 08:19:33 -0300 Check if the output is empty rather than asserting for equality Also fix indent of test block. M railties/test/application/rake/dbs_test.rb commit bebe4a9 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-20 08:08:22 -0300 Improve touch docs with extra attributes passed in [ci skip] M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb commit 140ea22 refs/heads/master Merge: eafec46 c80ca4c Author: Carlos Antonio da Silva Date: 2014-03-20 08:00:28 -0300 Merge pull request #14423 from yakko/persistence-touches-many ActiveRecord#touch should accept multiple attributes Conflicts: activerecord/CHANGELOG.md commit 18176f3 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-03-20 10:30:30 +0100 only dump schema information if migration table exists. Closes #14217 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake commit 4c99710 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-03-20 10:30:30 +0100 only dump schema information if migration table exists. Closes #14217 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake commit eafec46 refs/heads/master Author: Yves Senn Date: 2014-03-20 10:30:30 +0100 only dump schema information if migration table exists. Closes #14217 M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake commit 7f7a40f refs/heads/master Merge: e0235c3 102c556 Author: Godfrey Chan Date: 2014-03-19 21:23:41 -0700 Merge pull request #14433 from adomokos/cleaning_up_and_adding_session_tests Cleaning up and adding tests for Session commit 102c556 refs/heads/master Author: Attila Domokos Date: 2014-03-19 21:01:08 -0500 Cleaning and adding tests for Session Adding tests for Session `destroy`, `update` and `delete` methods. No changes for code under test. M actionpack/test/dispatch/request/session_test.rb commit c80ca4c refs/heads/master Author: Thiago Pinto Date: 2014-03-19 21:13:03 -0400 ActiveRecord#touch should accept multiple attributes #14423 M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/timestamp_test.rb commit e0235c3 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-17 21:08:03 -0300 Refactor assertion of line numbers matching 4 spaces M railties/test/application/rake/notes_test.rb commit 29aff93 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-17 21:05:10 -0300 Move booting/loading tasks setup to the rake notes helper method M railties/test/application/rake/notes_test.rb commit 9c5c0bc refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-17 21:04:18 -0300 Extract rake notes command and lines scan boilerplate Refactor to a reusable method. M railties/test/application/rake/notes_test.rb commit 3a3a386 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-17 20:56:10 -0300 Remove extra space assertion No need to check that each line contains an extra space, just matching the space in the regexp is enough to ensure that. M railties/test/application/rake/notes_test.rb commit dcf7a16 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-17 20:12:53 -0300 Extract common setup for loading tasks in rake notes tests M railties/test/application/rake/notes_test.rb commit 00b7a21 refs/tags/v4.1.0.rc2 Author: Godfrey Chan Date: 2014-03-19 15:19:44 -0700 Added a warning about serializing data with JSON cookie jars [skip ci] Closes #14409 M guides/source/action_controller_overview.md M guides/source/upgrading_ruby_on_rails.md commit 6cef846 refs/remotes/origin/4-1-stable Author: Godfrey Chan Date: 2014-03-19 15:19:44 -0700 Added a warning about serializing data with JSON cookie jars [skip ci] Closes #14409 M guides/source/action_controller_overview.md M guides/source/upgrading_ruby_on_rails.md commit 0e0fc50 refs/heads/master Merge: c7a307c 3dad856 Author: Guillermo Iguaran Date: 2014-03-19 17:43:39 -0500 Merge pull request #14431 from chancancode/warn_about_json_cookie_jars Added a warning about serializing data with JSON cookie jars [skip ci] commit 3dad856 refs/heads/master Author: Godfrey Chan Date: 2014-03-19 15:19:44 -0700 Added a warning about serializing data with JSON cookie jars [skip ci] Closes #14409 M guides/source/action_controller_overview.md M guides/source/upgrading_ruby_on_rails.md commit c7a307c refs/heads/master Merge: 8cea8ae 2ec51d0 Author: Arthur Nogueira Neves Date: 2014-03-19 16:49:21 -0400 Merge pull request #14429 from chriskohlbrenner/fix_typo_ar_querying_guide Fix a typo to make clause plural [ci skip] commit 2ec51d0 refs/heads/master Author: chriskohlbrenner Date: 2014-03-19 16:39:45 -0400 Fix a typo to make clause plural [ci skip] M guides/source/active_record_querying.md commit df0bb78 refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-03-19 20:51:13 +0100 Log the full path, including variant, that the digestor is trying to find M actionview/lib/action_view/digestor.rb commit 20845f6 refs/remotes/origin/4-1-stable Author: David Heinemeier Hansson Date: 2014-03-19 19:23:29 +0100 Fix for digestor to consider variants for partials -- this still needs more testing!! M actionview/lib/action_view/digestor.rb commit 6ebcf7b refs/tags/v4.1.0.rc2 Author: Jeremy Kemper Date: 2014-03-15 16:17:19 -0700 Merge pull request #14395 from arthurnn/fix_mailer_preview_test Fix MailerPreview broken tests M actionmailer/test/base_test.rb commit 8cea8ae refs/heads/master Merge: 4279a75 4f90298 Author: Rafael Mendonça França Date: 2014-03-18 15:33:34 -0500 Merge pull request #14421 from davidpdrsn/reorder-conditionals Reorder conditional logic in link_to_if and link_to_unless commit 4f90298 refs/heads/master Author: David Pedersen Date: 2014-03-18 21:16:36 +0100 Reorder conditional logic According to the best practice that "unless not" and "unless else" is hard to follow logically the link_to_unless and link_to_if were reversed. M actionview/lib/action_view/helpers/url_helper.rb commit 4279a75 refs/heads/master Merge: 34e54fa e64875f Author: Godfrey Chan Date: 2014-03-18 01:27:54 -0700 Merge pull request #14413 from arthurnn/port_test_cc Add counter cache test for class_name commit 47c3e06 refs/remotes/origin/4-1-stable Merge: 65533c3 4fc1ca3 Author: Godfrey Chan Date: 2014-03-18 01:27:45 -0700 Merge pull request #14414 from arthurnn/port_test_cc_41 Add counter cache test for class_name commit 4fc1ca3 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-03-17 21:23:54 -0400 Add counter cache test for class_name Backport test from #14410 M activerecord/test/cases/associations/belongs_to_associations_test.rb commit e64875f refs/heads/master Author: Arthur Neves Date: 2014-03-17 21:23:54 -0400 Add counter cache test for class_name Backport test from #14410 M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 7549dba refs/remotes/origin/4-0-stable Merge: a6b9ea2 64ccb19 Author: Godfrey Chan Date: 2014-03-17 18:12:50 -0700 Merge pull request #14410 from arthurnn/fix_14369 Fix counter cache when association uses a class_name commit 34e54fa refs/heads/master Author: Aaron Patterson Date: 2014-03-17 17:37:05 -0700 test should only pass if the pool.size+1 checkout fails Previously, any of the connection checkouts could have failed, and this test would pass. M activerecord/test/cases/connection_pool_test.rb commit 4db4f90 refs/heads/master Author: Aaron Patterson Date: 2014-03-17 17:29:33 -0700 use a latch to avoid busy loops M activerecord/test/cases/connection_pool_test.rb commit 8f21826 refs/heads/master Merge: 4a69c93 9e457a8 Author: Aaron Patterson Date: 2014-03-17 17:13:00 -0700 Merge pull request #14360 from matthewd/thread_aware_reaper Track owning thread for connection pool commit 9e457a8 refs/heads/master Author: Matthew Draper Date: 2014-03-08 00:06:09 +1030 Reap connections based on owning-thread death .. not a general timeout. Now, if a thread checks out a connection then dies, we can immediately recover that connection and re-use it. This should alleviate the pool exhaustion discussed in #12867. More importantly, it entirely avoids the potential issues of the reaper attempting to check whether connections are still active: as long as the owning thread is alive, the connection is its business alone. As a no-op reap is now trivial (only entails checking a thread status per connection), we can also perform one in-line any time we decide to sleep for a connection. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/connection_adapters/abstract_adapter_test.rb M activerecord/test/cases/connection_pool_test.rb M activerecord/test/cases/reaper_test.rb commit 11a4463 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-03-17 10:49:07 -0700 Merge pull request #14090 from Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit 65533c3 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-03-17 10:49:07 -0700 Merge pull request #14090 from Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit cc0d54b refs/heads/master Author: Matthew Draper Date: 2014-03-08 01:14:26 +1030 Teach PostgreSQLAdapter#reset! to actually reset It wasn't doing anything beyond clearing the statement cache. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 4a69c93 refs/heads/master Merge: ba3ad25 3b073ac Author: Guillermo Iguaran Date: 2014-03-17 17:47:24 -0500 Merge pull request #14379 from robertomiranda/rake-notes.config Add Public Api for Register New Extensions for Rake Notes commit 3b073ac refs/heads/master Author: robertomiranda Date: 2014-03-17 15:20:46 -0500 Rake notes should picked up new Extensions registered in the config/application.rb file M railties/test/application/rake/notes_test.rb commit 6b4793b refs/heads/master Author: robertomiranda Date: 2014-03-17 10:31:21 -0500 Update command line guide M guides/source/command_line.md commit 6c82107 refs/heads/master Author: Earl St Sauver Date: 2014-03-17 11:28:57 -0700 Update documentation on group method to indicate it takes an array The group method also takes an array, however this isn't immediately clear by reading the source since it delegates this method. If you trace it back to the AREL building you can see that it does support an array. Shoutout to @betovelandia for pointing this out. M activerecord/lib/active_record/relation/query_methods.rb commit 64ccb19 refs/remotes/origin/4-0-stable Author: Arthur Neves Date: 2014-03-17 10:47:25 -0400 Fix counter cache when association uses a class_name The idea of this commits is from bf28422cbda9068afb900020fa6911afd01963e1, which fixes this problem, but only on AR 4.1+ [fixes #14369] M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit ba3ad25 refs/heads/master Merge: 8ba6091 933e9b4 Author: Aaron Patterson Date: 2014-03-17 10:49:07 -0700 Merge pull request #14090 from Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming commit 8eac0a6 refs/heads/master Author: robertomiranda Date: 2014-03-16 15:08:16 -0500 Add Changelog Entry ref #14379 M railties/CHANGELOG.md commit 4c0d668 refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-03-17 14:20:23 +0100 `where.not` adds `references` for `includes`. Closes #14406. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb commit 2be3a2c refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-03-17 10:55:21 +0100 fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`. Closes #14405. This is a follow-up to 9e997e9039435617b6a844158f5437e97f6bc107 to restore the documented behavior. Conflicts: actionview/CHANGELOG.md M actionview/CHANGELOG.md M actionview/test/template/number_helper_test.rb M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit b5abb4b refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-03-17 14:20:23 +0100 `where.not` adds `references` for `includes`. Closes #14406. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb commit 8ba6091 refs/heads/master Author: Yves Senn Date: 2014-03-17 14:20:23 +0100 `where.not` adds `references` for `includes`. Closes #14406. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb commit 3711112 refs/remotes/origin/4-1-stable Author: Yves Senn Date: 2014-03-17 10:55:21 +0100 fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`. Closes #14405. This is a follow-up to 9e997e9039435617b6a844158f5437e97f6bc107 to restore the documented behavior. Conflicts: actionview/CHANGELOG.md M actionview/CHANGELOG.md M actionview/test/template/number_helper_test.rb M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit 378c8d2 refs/heads/master Author: Yves Senn Date: 2014-03-17 10:55:21 +0100 fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`. Closes #14405. This is a follow-up to 9e997e9039435617b6a844158f5437e97f6bc107 to restore the documented behavior. M actionview/CHANGELOG.md M actionview/test/template/number_helper_test.rb M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit a0c1c18 refs/heads/master Author: Yves Senn Date: 2014-03-17 08:44:56 +0100 format ActiveRecord CHANGELOG. [ci skip] M activerecord/CHANGELOG.md commit 1330274 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-14 20:57:36 -0300 Fix assertions M railties/test/application/rake/dbs_test.rb commit cbc3b89 refs/heads/master Author: Jeremy Kemper Date: 2014-03-16 16:08:16 -0700 Add an explicit require for 4ece124396669d3580e7f229ab407a0d4882727a rather than assume SecureRandom is available M actionpack/test/dispatch/session/mem_cache_store_test.rb commit 4ece124 refs/heads/master Author: Jeremy Kemper Date: 2014-03-16 16:06:27 -0700 Avoid concurrent test collision on the same memcache server by namespacing keys M actionpack/test/dispatch/session/mem_cache_store_test.rb commit a76a8d4 refs/tags/v4.1.0.rc2 Author: Jeremy Kemper Date: 2014-03-16 15:29:00 -0700 Remove changelog for 7dfbd91b0780fbd6a1dd9bfbc176e10894871d2d since the refactoring no longer affects users after 7a5601c432d3906cc6ab853b3316e76a162f75d1 M activesupport/CHANGELOG.md commit cdf4293 refs/remotes/origin/4-1-stable Author: Jeremy Kemper Date: 2014-03-16 15:29:00 -0700 Remove changelog for 7dfbd91b0780fbd6a1dd9bfbc176e10894871d2d since the refactoring no longer affects users after 7a5601c432d3906cc6ab853b3316e76a162f75d1 M activesupport/CHANGELOG.md commit dd4dd73 refs/tags/v4.1.0.rc2 Author: Akira Matsuda Date: 2014-03-16 12:23:58 +0900 Let COMMAND_WHITELIST be an Array, not a String M railties/lib/rails/commands/commands_tasks.rb commit fc70235 refs/remotes/origin/4-1-stable Author: Akira Matsuda Date: 2014-03-16 12:23:58 +0900 Let COMMAND_WHITELIST be an Array, not a String M railties/lib/rails/commands/commands_tasks.rb commit 27e9572 refs/heads/master Author: robertomiranda Date: 2014-03-16 14:57:21 -0500 Add config.annotations, in order to register new extensions for Rake notes at config level M railties/lib/rails/application/configuration.rb M railties/test/application/configuration_test.rb commit ce38a6b refs/heads/master Author: robertomiranda Date: 2014-03-16 14:32:08 -0500 Fix Shadowing extensions variable in Register Annotation Exentsions M railties/lib/rails/source_annotation_extractor.rb M railties/test/application/rake/notes_test.rb commit bb05188 refs/heads/master Author: Andrew White Date: 2014-03-16 09:15:52 +0000 Use nested_scope? not shallow? to determine whether to copy options The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit a6b9ea2 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-03-16 09:15:52 +0000 Use nested_scope? not shallow? to determine whether to copy options The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388. (cherry picked from commit 924345abcff0101e3221f87d1d56d3d6517a79a4) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 236bc35 refs/remotes/origin/4-1-stable Author: Andrew White Date: 2014-03-16 09:15:52 +0000 Use nested_scope? not shallow? to determine whether to copy options The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388. (cherry picked from commit 924345abcff0101e3221f87d1d56d3d6517a79a4) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit af98176 refs/heads/master Author: Robin Dupret Date: 2014-03-16 10:07:31 +0100 Remove extra white-spaces [ci skip] Follow up to 024e5e31 M guides/source/getting_started.md commit e9625d6 refs/heads/master Author: Akira Matsuda Date: 2014-03-16 12:23:58 +0900 Let COMMAND_WHITELIST be an Array, not a String M railties/lib/rails/commands/commands_tasks.rb commit ecebe5e refs/heads/master Merge: 4a883af f47421f Author: Jeremy Kemper Date: 2014-03-15 20:05:01 -0700 Merge pull request #14399 from genericsteele/fixture-label-string-interpolation Extend fixture label replacement to allow string interpolation commit f47421f refs/heads/master Author: Eric Steele Date: 2014-03-15 21:49:04 -0400 Extend fixture label replacement to allow string interpolation Allows fixtures to use their $LABEL as part of a string instead of limiting use to the entire value. mark: first_name: $LABEL username: $LABEL1973 email: $LABEL@$LABELmail.com users(:mark).first_name # => mark users(:mark).username # => mark1973 users(:mark).email # => mark@markmail.com M activerecord/CHANGELOG.md M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/fixtures_test.rb M activerecord/test/fixtures/pirates.yml commit d1cfcb5 refs/remotes/origin/4-1-stable Merge: 10ab2b0 19ebb28 Author: Rafael Mendonça França Date: 2014-03-15 19:13:12 -0500 Merge pull request #14397 from arthurnn/fix_mailer_preview_test_41 Fix MailerPreview broken tests commit 19ebb28 refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-03-15 18:56:32 -0400 Fix MailerPreview broken tests `BaseMailerPreview.welcome` is an instance method, so we need to stub the method on a instance level and not on Class. The stub is important to make sure the Message object is the same in the other expectations. This was working randomly because Mocha uses == to compare two objects on the `with()` expectation and even if the Mail::Message objects were not the same object they are equal, but thats not the case in 100% of the runs. So we need to make sure we use `.any_instance` method and have the right message object. M actionmailer/test/base_test.rb commit 4a883af refs/heads/master Merge: 147f0ae 024e5e3 Author: Jeremy Kemper Date: 2014-03-15 16:39:54 -0700 Merge pull request #14396 from afshinator/master Reword 5.6 strong parameters and private method stuff [ci skip] commit 024e5e3 refs/heads/master Author: Afshin Mokhtari Date: 2014-03-15 23:28:34 +0000 Reword 5.6 strong parameters and private method stuff [ci skip] M guides/source/getting_started.md commit 147f0ae refs/heads/master Merge: 2d171bd f870c4d Author: Jeremy Kemper Date: 2014-03-15 16:17:19 -0700 Merge pull request #14395 from arthurnn/fix_mailer_preview_test Fix MailerPreview broken tests commit 2d171bd refs/heads/master Merge: e3b12f6 106c988 Author: Rafael Mendonça França Date: 2014-03-15 20:00:50 -0300 Merge pull request #12662 from nashby/include-hidden-collection add include_hidden option to collection_check_boxes helper Conflicts: actionview/CHANGELOG.md actionview/test/template/form_collections_helper_test.rb commit f870c4d refs/heads/master Author: Arthur Neves Date: 2014-03-15 18:56:32 -0400 Fix MailerPreview broken tests `BaseMailerPreview.welcome` is an instance method, so we need to stub the method on a instance level and not on Class. The stub is important to make sure the Message object is the same in the other expectations. This was working randomly because Mocha uses == to compare two objects on the `with()` expectation and even if the Mail::Message objects were not the same object they are equal, but thats not the case in 100% of the runs. So we need to make sure we use `.any_instance` method and have the right message object. M actionmailer/test/base_test.rb commit e3b12f6 refs/heads/master Merge: 0da7758 2156df1 Author: Arthur Neves Date: 2014-03-15 12:12:49 -0400 Merge pull request #14394 from zoltankiss/fix_typo Minor grammer, code conventions fix [ci skip] commit 2156df1 refs/heads/master Author: Zoltan Kiss Date: 2014-03-14 18:08:18 -0500 Minor grammer, code conventions fix [ci skip] Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/lib/active_support/core_ext/hash/conversions.rb commit 82a2bf9 refs/tags/v4.1.0.rc2 Author: Jeremy Kemper Date: 2014-03-15 06:55:14 -0700 Clarify AV::Digestor.digest method signature docs and deprecation warning M actionview/lib/action_view/digestor.rb M actionview/test/template/digestor_test.rb commit 10ab2b0 refs/remotes/origin/4-1-stable Author: Jeremy Kemper Date: 2014-03-15 06:55:14 -0700 Clarify AV::Digestor.digest method signature docs and deprecation warning M actionview/lib/action_view/digestor.rb M actionview/test/template/digestor_test.rb commit 0da7758 refs/heads/master Author: Jeremy Kemper Date: 2014-03-15 06:55:14 -0700 Clarify AV::Digestor.digest method signature docs and deprecation warning M actionview/lib/action_view/digestor.rb M actionview/test/template/digestor_test.rb commit 22c6700 refs/tags/v4.1.0.rc2 Author: Jeremy Kemper Date: 2014-03-15 06:26:06 -0700 Remove deprecation on active_support/core_ext/class/attribute_accessors requires. Appropriate to keep this, users don't care that the implementation got unified. M activesupport/lib/active_support/core_ext/class/attribute_accessors.rb commit 178e261 refs/remotes/origin/4-1-stable Author: Jeremy Kemper Date: 2014-03-15 06:26:06 -0700 Remove deprecation on active_support/core_ext/class/attribute_accessors requires. Appropriate to keep this, users don't care that the implementation got unified. M activesupport/lib/active_support/core_ext/class/attribute_accessors.rb commit 7a5601c refs/heads/master Author: Jeremy Kemper Date: 2014-03-15 06:26:06 -0700 Remove deprecation on active_support/core_ext/class/attribute_accessors requires. Appropriate to keep this, users don't care that the implementation got unified. M activesupport/lib/active_support/core_ext/class/attribute_accessors.rb commit 6869884 refs/heads/master Merge: bae7f1d 3baace6 Author: Yves Senn Date: 2014-03-15 11:59:25 +0100 Merge pull request #14380 from tgxworld/use_teardown_helper_method_in_activerecord Use teardown helper method. commit 933e9b4 refs/heads/master Author: Kevin Casey Date: 2014-02-17 18:41:21 -0800 re-raise error if error occurs before committing in streaming update the tests, using an if-else M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit 3baace6 refs/heads/master Author: Guo Xiang Tan Date: 2014-03-13 21:35:58 -0700 Use teardown helper method. Follow-Up to https://github.com/rails/rails/pull/14348 Ensure that SQLCounter.clear_log is called after each test. This is a step to prevent side effects when running tests. This will allow us to run them in random order. M activerecord/test/cases/adapter_test.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql/reserved_word_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/reserved_word_test.rb M activerecord/test/cases/adapters/postgresql/active_schema_test.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/bytea_test.rb M activerecord/test/cases/adapters/postgresql/citext_test.rb M activerecord/test/cases/adapters/postgresql/composite_test.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/ltree_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb M activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb M activerecord/test/cases/adapters/postgresql/view_test.rb M activerecord/test/cases/adapters/postgresql/xml_test.rb M activerecord/test/cases/ar_schema_test.rb M activerecord/test/cases/associations/eager_load_nested_include_test.rb M activerecord/test/cases/associations/eager_singularization_test.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/bind_parameter_test.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb M activerecord/test/cases/connection_pool_test.rb M activerecord/test/cases/defaults_test.rb M activerecord/test/cases/disconnected_test.rb M activerecord/test/cases/explain_subscriber_test.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/cases/invalid_connection_test.rb M activerecord/test/cases/invertible_migration_test.rb M activerecord/test/cases/migration/change_schema_test.rb M activerecord/test/cases/migration/change_table_test.rb M activerecord/test/cases/migration/column_positioning_test.rb M activerecord/test/cases/migration/create_join_table_test.rb M activerecord/test/cases/migration/index_test.rb M activerecord/test/cases/migration/logger_test.rb M activerecord/test/cases/migration/references_index_test.rb M activerecord/test/cases/migration_test.rb M activerecord/test/cases/migrator_test.rb M activerecord/test/cases/modules_test.rb M activerecord/test/cases/nested_attributes_test.rb M activerecord/test/cases/pooled_connections_test.rb M activerecord/test/cases/reaper_test.rb M activerecord/test/cases/serialized_attribute_test.rb M activerecord/test/cases/unconnected_test.rb M activerecord/test/cases/validations/i18n_validation_test.rb commit ea3a73e refs/heads/master Author: Washington Luiz Date: 2014-03-14 22:20:13 -0300 Still touch associations when theres no timestamp Prior to Rails 4.0.4 when touching a object which doesn't have timestamp attributes (updated_at / updated_on) rails would still touch all associations. After 73ba2c14cd7d7dfb2d132b18c47ade995401736f it updates associations but rollsback because `touch` would return nil since there's no timestamp attribute M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 1ca204b refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-03-14 20:17:03 -0300 Obey `validate: false` option for habtm Fixes #14383. M activerecord/lib/active_record/associations.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/person.rb M activerecord/test/models/treasure.rb commit b46e75b refs/remotes/origin/4-1-stable Author: Carlos Antonio da Silva Date: 2014-03-14 20:17:03 -0300 Obey `validate: false` option for habtm Fixes #14383. M activerecord/lib/active_record/associations.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/person.rb M activerecord/test/models/treasure.rb commit bae7f1d refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-14 20:17:03 -0300 Obey `validate: false` option for habtm Fixes #14383. M activerecord/lib/active_record/associations.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/models/person.rb M activerecord/test/models/treasure.rb commit eb31a86 refs/heads/master Merge: 6d5724d a215ca6 Author: Arthur Nogueira Neves Date: 2014-03-14 19:22:10 -0400 Merge pull request #14387 from huoxito/touch-api-doc Update callbacks executed on AR::Base#touch [skip ci] commit a215ca6 refs/heads/master Author: Washington Luiz Date: 2014-03-14 19:44:07 -0300 Update callbacks executed on AR::Base#touch [skip ci] As of https://github.com/rails/rails/pull/12031 after_commit and after_rollback are also executed M activerecord/lib/active_record/persistence.rb commit f43421c refs/heads/master Author: robertomiranda Date: 2014-03-14 17:51:14 -0500 Supporting .ruby, .yml and .yaml Extension in Rake Notes M railties/lib/rails/source_annotation_extractor.rb M railties/test/application/rake/notes_test.rb commit 810af6f refs/heads/master Author: robertomiranda Date: 2014-03-14 15:34:24 -0500 Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we have an API for register it in the corresponding gems M railties/lib/rails/source_annotation_extractor.rb M railties/test/application/rake/notes_test.rb commit 6d5724d refs/heads/master Merge: 03edba1 d75eead Author: Godfrey Chan Date: 2014-03-14 15:02:32 -0700 Merge pull request #10278 from codeodor/fix-to_json-for-Enumerable Fix #to_json for BasicObject Enumerables commit d75eead refs/heads/master Author: Sammy Larbi Date: 2013-04-20 13:06:22 -0500 Fix #to_json for BasicObject Enumerables M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/json.rb M activesupport/lib/active_support/core_ext/object/to_json.rb M activesupport/test/json/encoding_test.rb commit 2e87984 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-14 15:59:16 -0500 Merge pull request #14373 from schneems/schneems/jdbc-ar-2 Allow custom JDBC urls M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb M railties/test/generators/plugin_generator_test.rb commit 6907235 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-14 15:59:16 -0500 Merge pull request #14373 from schneems/schneems/jdbc-ar-2 Allow custom JDBC urls M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb M railties/test/generators/plugin_generator_test.rb commit 03edba1 refs/heads/master Merge: d17b879 aa27766 Author: Rafael Mendonça França Date: 2014-03-14 15:59:16 -0500 Merge pull request #14373 from schneems/schneems/jdbc-ar-2 Allow custom JDBC urls commit fa89632 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-14 17:28:31 -0300 Fix the resolver cache and stop mutating the lookup_context Before we had a bug in the resolver cache so the disable_cache were not working when passing options to find M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/lookup_context.rb M actionview/test/template/digestor_test.rb M actionview/test/template/lookup_context_test.rb commit fe21789 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-14 14:58:34 -0300 Merge pull request #14329 from pch/digestor-lookup-fix Ensure LookupContext in Digestor selects correct variant M actionpack/test/controller/caching_test.rb A actionpack/test/fixtures/functional_caching/formatted_fragment_cached_with_variant.html+phone.erb M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb M actionview/lib/action_view/lookup_context.rb M actionview/lib/action_view/template.rb M actionview/lib/action_view/template/resolver.rb M actionview/lib/action_view/testing/resolvers.rb A actionview/test/fixtures/test/hello_world.html+phone.erb A actionview/test/fixtures/test/hello_world.text+phone.erb M actionview/test/template/digestor_test.rb M actionview/test/template/lookup_context_test.rb commit fe5f2b4 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-14 17:28:31 -0300 Fix the resolver cache and stop mutating the lookup_context Before we had a bug in the resolver cache so the disable_cache were not working when passing options to find M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/lookup_context.rb M actionview/test/template/digestor_test.rb M actionview/test/template/lookup_context_test.rb commit 5f9f2cd refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-14 14:58:34 -0300 Merge pull request #14329 from pch/digestor-lookup-fix Ensure LookupContext in Digestor selects correct variant M actionpack/test/controller/caching_test.rb A actionpack/test/fixtures/functional_caching/formatted_fragment_cached_with_variant.html+phone.erb M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb M actionview/lib/action_view/lookup_context.rb M actionview/lib/action_view/template.rb M actionview/lib/action_view/template/resolver.rb M actionview/lib/action_view/testing/resolvers.rb A actionview/test/fixtures/test/hello_world.html+phone.erb A actionview/test/fixtures/test/hello_world.text+phone.erb M actionview/test/template/digestor_test.rb M actionview/test/template/lookup_context_test.rb commit d17b879 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-14 17:28:31 -0300 Fix the resolver cache and stop mutating the lookup_context Before we had a bug in the resolver cache so the disable_cache were not working when passing options to find M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/lookup_context.rb M actionview/test/template/digestor_test.rb M actionview/test/template/lookup_context_test.rb commit a2fb164 refs/heads/master Author: robertomiranda Date: 2014-03-13 19:16:49 -0500 Add Public Api for register new extensions for Rake Notes M railties/lib/rails/source_annotation_extractor.rb M railties/test/application/rake/notes_test.rb commit 274d5e4 refs/heads/master Merge: b4c9649 2c2326e Author: Rafael Mendonça França Date: 2014-03-14 14:58:34 -0300 Merge pull request #14329 from pch/digestor-lookup-fix Ensure LookupContext in Digestor selects correct variant commit ed2c313 refs/remotes/origin/4-0-stable Merge: eb39505 76c7ecd Author: Rafael Mendonça França Date: 2014-03-14 12:54:29 -0500 Merge pull request #14381 from zzak/as_changelog_typo Fix typo in ActiveSupport CHANGELOG commit baf4992 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-14 14:52:17 -0300 Take in consideration guides CHANGELOG M tasks/release.rb commit d3a38f2 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-14 14:34:49 -0300 Match the whole string M tasks/release.rb commit 4dd5fe6 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-14 14:52:17 -0300 Take in consideration guides CHANGELOG M tasks/release.rb commit c32365d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-14 14:34:49 -0300 Match the whole string M tasks/release.rb commit b4c9649 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-14 14:52:17 -0300 Take in consideration guides CHANGELOG M tasks/release.rb commit d153355 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-14 14:34:49 -0300 Match the whole string M tasks/release.rb commit 76c7ecd refs/remotes/origin/4-0-stable Author: Zachary Scott Date: 2014-03-14 10:49:42 -0700 Fix typo in ActiveSupport CHANGELOG M activesupport/CHANGELOG.md commit eb39505 refs/remotes/origin/4-0-stable Merge: d436477 2abe4b0 Author: Rafael Mendonça França Date: 2014-03-14 14:47:40 -0300 Merge branch '4-0-4' into 4-0-stable Conflicts: activerecord/CHANGELOG.md commit 2abe4b0 refs/tags/v4.0.4 (tag: v4.0.4) Author: Rafael Mendonça França Date: 2014-03-14 14:35:22 -0300 Preparing for 4.0.4 release M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 0d46739 refs/tags/v4.0.4 Author: Rafael Mendonça França Date: 2014-03-14 14:34:49 -0300 Match the whole string M tasks/release.rb commit aa27766 refs/heads/master Author: schneems Date: 2014-03-14 11:33:42 -0500 better test error messages M railties/test/generators/plugin_generator_test.rb commit 7f17019 refs/heads/master Author: schneems Date: 2014-03-11 22:23:21 -0500 Allow custom JDBC urls mitigates #14323 M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 03d89f9 refs/tags/v4.0.4 Author: Rafael Mendonça França Date: 2014-03-14 13:31:37 -0300 Add release date M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/CHANGELOG.md M railties/CHANGELOG.md M tasks/release.rb commit 1037dad refs/tags/v4.0.4 Author: Rafael Mendonça França Date: 2014-03-14 13:22:09 -0300 Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error See https://github.com/rails/sass-rails/pull/191 for more information M railties/lib/rails/generators/app_base.rb commit d436477 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-14 13:22:09 -0300 Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error See https://github.com/rails/sass-rails/pull/191 for more information M railties/lib/rails/generators/app_base.rb commit 3fbe59e refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-14 13:20:16 -0300 Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error See https://github.com/rails/sass-rails/issues/191 for more information M railties/lib/rails/generators/app_base.rb commit 4fd3c47 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-14 13:20:16 -0300 Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error See https://github.com/rails/sass-rails/issues/191 for more information M railties/lib/rails/generators/app_base.rb commit eaa19cc refs/heads/master Author: Rafael Mendonça França Date: 2014-03-14 13:20:16 -0300 Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error See https://github.com/rails/sass-rails/issues/191 for more information M railties/lib/rails/generators/app_base.rb commit cc4c6d4 refs/heads/master Author: Steven Harman Date: 2014-03-14 12:09:26 -0400 Fix misspelling in references docs M activerecord/lib/active_record/relation/query_methods.rb commit 13cdb5f refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-14 10:41:02 -0300 Avoid duplicated conditionals M activerecord/lib/active_record/associations/collection_association.rb commit 2c2326e refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-14 13:40:46 +0100 Introduce #with_formats_and_variants to prevent problems with mutating finder object M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/lookup_context.rb M actionview/test/template/digestor_test.rb M actionview/test/template/lookup_context_test.rb commit 9f677bf refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-13 16:56:29 +0100 Add mocked disable_cache for FixtureFinder M actionview/test/template/digestor_test.rb commit 03b8922 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-13 16:55:54 +0100 Set format in finder M actionview/test/template/digestor_test.rb commit 3b9daf0 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-13 16:27:24 +0100 Rename _setup_options to _options_for_digest M actionview/lib/action_view/digestor.rb commit 4725d58 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-13 14:46:43 +0100 Disable LookupContext's cache when looking for template M actionview/lib/action_view/digestor.rb commit 48a6bae refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-12 15:43:09 +0100 Don't pass hash as keys to #find method M actionview/lib/action_view/digestor.rb commit c63b18d refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-12 15:42:21 +0100 Add variants to Template class M actionview/lib/action_view/template.rb M actionview/lib/action_view/template/resolver.rb M actionview/lib/action_view/testing/resolvers.rb commit 4718927 refs/tags/v4.1.0.rc2 Author: Afshin Mokhtari Date: 2014-03-13 20:28:02 +0000 Fix probs in sections 5.6 and 5.9; [ci skip] M guides/source/getting_started.md commit 97e0d6b refs/remotes/origin/4-1-stable Author: Afshin Mokhtari Date: 2014-03-13 20:28:02 +0000 Fix probs in sections 5.6 and 5.9; [ci skip] M guides/source/getting_started.md commit 3560d7a refs/heads/master Merge: a0936a1 4d1bc02 Author: Godfrey Chan Date: 2014-03-13 14:24:20 -0700 Merge pull request #14378 from afshinator/master Fix probs in sections 5.6 and 5.9; [ci skip] commit 4d1bc02 refs/heads/master Author: Afshin Mokhtari Date: 2014-03-13 20:28:02 +0000 Fix probs in sections 5.6 and 5.9; [ci skip] M guides/source/getting_started.md commit d2b0653 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-13 16:53:05 -0300 No need to binds be optional M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit cc987c9 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-13 16:53:05 -0300 No need to binds be optional M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit a0936a1 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-13 16:53:05 -0300 No need to binds be optional M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit cf57853 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-13 16:28:08 -0300 Merge pull request #14372 from arthurnn/fix_query_cache_binds Make select_all on query cache accept a Relation without binds. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb M activerecord/test/cases/query_cache_test.rb commit b0a9853 refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-13 16:28:08 -0300 Merge pull request #14372 from arthurnn/fix_query_cache_binds Make select_all on query cache accept a Relation without binds. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb M activerecord/test/cases/query_cache_test.rb commit b4d4d93 refs/heads/master Merge: 229dd87 433b19d Author: Rafael Mendonça França Date: 2014-03-13 16:28:08 -0300 Merge pull request #14372 from arthurnn/fix_query_cache_binds Make select_all on query cache accept a Relation without binds. commit 229dd87 refs/heads/master Merge: f8fb1fa a9023ec Author: Godfrey Chan Date: 2014-03-13 12:13:14 -0700 Merge pull request #14376 from laurocaetano/test-deprecation-warning-for-find Add test for deprecation warning for passing an AR object to `find`. commit a9023ec refs/heads/master Author: Lauro Caetano Date: 2014-03-13 16:10:04 -0300 Add test for deprecation warning for passing an AR object to `find`. M activerecord/test/cases/finder_test.rb commit efa1514 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-03-13 12:02:32 -0700 require actions rather than create_file thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319 M railties/lib/rails/generators/actions/create_migration.rb commit f8fb1fa refs/heads/master Merge: 499c6aa d3d3d07 Author: Aaron Patterson Date: 2014-03-13 12:05:27 -0700 Merge pull request #14375 from laurocaetano/test-deprecation-warning-for-exists Add test for deprecation warning for passing an AR object to `exists?`. commit d30a377 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-03-13 12:02:32 -0700 require actions rather than create_file thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319 M railties/lib/rails/generators/actions/create_migration.rb commit 499c6aa refs/heads/master Author: Aaron Patterson Date: 2014-03-13 12:02:32 -0700 require actions rather than create_file thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319 M railties/lib/rails/generators/actions/create_migration.rb commit 433b19d refs/heads/master Author: Arthur Neves Date: 2014-03-13 13:05:10 -0400 Make select_all on query cache accept a Relation without binds. [fixes #14361] [related #13886] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb M activerecord/test/cases/query_cache_test.rb commit d3d3d07 refs/heads/master Author: Lauro Caetano Date: 2014-03-13 15:57:35 -0300 Test deprecation warning for passing an ActiveRecord object to `exists?` M activerecord/test/cases/finder_test.rb commit 23ffd03 refs/heads/master Author: Aaron Patterson Date: 2014-03-13 11:49:00 -0700 add the deprecation to adequate record too M activerecord/lib/active_record/core.rb commit 7658dc3 refs/heads/master Merge: d99974b d35f003 Author: Aaron Patterson Date: 2014-03-13 11:48:07 -0700 Merge branch 'master' into adequaterecord * master: passing an instance of an AR object to `find` is deprecated passing an ActiveRecord object to `exists?` is deprecated. commit d35f003 refs/heads/master Author: Aaron Patterson Date: 2014-03-13 11:47:12 -0700 passing an instance of an AR object to `find` is deprecated please pass the id of the AR object by calling `.id` on the model first. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relations_test.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb commit d92ae6c refs/heads/master Author: Aaron Patterson Date: 2014-03-13 11:40:35 -0700 passing an ActiveRecord object to `exists?` is deprecated. Pass the id of the object to the method by calling `.id` on the AR object. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/relations_test.rb commit d99974b refs/heads/master Author: Aaron Patterson Date: 2014-03-13 11:21:54 -0700 `where` automatically uses bind values now M activerecord/lib/active_record/relation/finder_methods.rb commit 66e0321 refs/heads/master Merge: 37ca1b4 e88da37 Author: Aaron Patterson Date: 2014-03-13 11:18:01 -0700 Merge branch 'master' into adequaterecord * master: (108 commits) make tests pass on Ruby 2.2 Use Sqlite3 adapter in examples use the body proxy to freeze headers just ask the response for the commit status, we do not need to ask the jar only write the jar if the response isn't committed Fix a grammatical error in the i18n guide [ci skip] use method_defined? to check whether or not a method is defined Enhance docs for update_attribute [ci-skip] Change usec to 0 on tests that compare seconds Unit test for mysql quote time usec Changelog entry for mysql56 microseconds Test microsecond on mysql 5.6 MySQL 5.6 and later supports microsecond precision in datetime. [ci skip] Add documentation for original_fullpath. Remove mocking on save, when not necessary comment why we are modifying global state. [ci skip] `change_table` supports `citext`. Follow up to #12523. Removed unnecessary command "application" register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester] Fixes STI when 2+ levels deep. ... commit 6ffadb5 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-03-12 17:40:08 -0700 use the body proxy to freeze headers avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header Conflicts: actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/dispatch/live_response_test.rb commit 3d3c918 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-03-12 16:07:04 -0700 only write the jar if the response isn't committed when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352 M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/dispatch/live_response_test.rb commit 2ce5e08 refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-03-13 10:55:52 -0700 make tests pass on Ruby 2.2 Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593 M activerecord/lib/active_record/associations/has_many_association.rb M activesupport/lib/active_support/values/time_zone.rb commit 901a0cf refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-03-13 10:55:52 -0700 make tests pass on Ruby 2.2 Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593 M activerecord/lib/active_record/associations/has_many_association.rb M activesupport/lib/active_support/values/time_zone.rb commit e88da37 refs/heads/master Author: Aaron Patterson Date: 2014-03-13 10:55:52 -0700 make tests pass on Ruby 2.2 Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593 M activerecord/lib/active_record/associations/has_many_association.rb M activesupport/lib/active_support/values/time_zone.rb commit 0ca6836 refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-11 16:30:58 +0100 Don't create addition vars, use options[] directly M actionview/lib/action_view/digestor.rb commit f72feae refs/heads/master Author: Łukasz Strzałkowski Date: 2014-03-11 16:30:00 +0100 Don't pass variant in params, it's ignored We're setting variant above, in request object directly M actionpack/test/controller/caching_test.rb commit 2f19263 refs/remotes/origin/4-0-stable Author: Julian Simioni Date: 2014-03-12 15:24:02 -0700 Use Sqlite3 adapter in examples Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip] M activerecord/lib/active_record/connection_handling.rb commit daf7e25 refs/remotes/origin/4-1-stable Author: Julian Simioni Date: 2014-03-12 15:24:02 -0700 Use Sqlite3 adapter in examples Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip] M activerecord/lib/active_record/connection_handling.rb commit 15720df refs/heads/master Author: Julian Simioni Date: 2014-03-12 15:24:02 -0700 Use Sqlite3 adapter in examples Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip] M activerecord/lib/active_record/connection_handling.rb commit 3022c15 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-03-12 17:40:08 -0700 use the body proxy to freeze headers avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header Conflicts: actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/dispatch/live_response_test.rb commit 3df07d0 refs/heads/master Author: Aaron Patterson Date: 2014-03-12 17:40:08 -0700 use the body proxy to freeze headers avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/dispatch/live_response_test.rb commit c0a7836 refs/heads/master Author: Aaron Patterson Date: 2014-03-12 16:21:01 -0700 just ask the response for the commit status, we do not need to ask the jar M actionpack/lib/action_controller/metal/live.rb commit 890aa15 refs/remotes/origin/4-1-stable Author: Aaron Patterson Date: 2014-03-12 16:07:04 -0700 only write the jar if the response isn't committed when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352 M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/dispatch/live_response_test.rb commit 77a0921 refs/heads/master Author: Aaron Patterson Date: 2014-03-12 16:07:04 -0700 only write the jar if the response isn't committed when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352 M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/dispatch/live_response_test.rb commit f6da992 refs/heads/master Merge: 0693494 69ba49d Author: Lauro Caetano Date: 2014-03-12 19:14:04 -0300 Merge pull request #14366 from sukolsak/grammar Fix a grammatical error in the i18n guide commit 69ba49d refs/heads/master Author: sukolsak Date: 2014-03-12 14:08:57 -0700 Fix a grammatical error in the i18n guide [ci skip] M guides/source/i18n.md commit 0693494 refs/heads/master Merge: 28d05f0 40847a7 Author: Arthur Nogueira Neves Date: 2014-03-12 17:48:23 -0400 Merge pull request #14364 from why-el/better-docs-for-update-attribute Enhance docs for update_attribute [skip ci] commit 28d05f0 refs/heads/master Author: Aaron Patterson Date: 2014-03-12 13:34:07 -0700 use method_defined? to check whether or not a method is defined M activesupport/lib/active_support/testing/declarative.rb commit 81d08ab refs/heads/master Merge: 591b8f3 7058321 Author: Rafael Mendonça França Date: 2014-03-12 14:07:10 -0300 Merge pull request #14363 from arthurnn/usec_tests_mysql56 Add more tests for mysql 5.6 microseconds + Fix tests commit 40847a7 refs/heads/master Author: Mohamed Wael Khobalatte Date: 2014-03-12 16:57:45 +0100 Enhance docs for update_attribute [ci-skip] M activerecord/lib/active_record/persistence.rb commit 7058321 refs/heads/master Author: Arthur Neves Date: 2014-03-12 11:52:39 -0400 Change usec to 0 on tests that compare seconds Avoid rounding problems with `.usec` method rounding the seconds when the field doesn't persist the `.usec` piece. M activerecord/test/cases/persistence_test.rb commit 66d61ab refs/heads/master Author: Arthur Neves Date: 2014-03-12 11:50:50 -0400 Unit test for mysql quote time usec M activerecord/test/cases/adapters/mysql2/connection_test.rb commit 591b8f3 refs/heads/master Merge: 79ceae6 501ae92 Author: Rafael Mendonça França Date: 2014-03-12 10:51:10 -0300 Merge pull request #13040 from kamipo/case_sensitive_comparison Only use BINARY for mysql case sensitive uniqueness check when column has a case insensitive collation. Conflicts: activerecord/CHANGELOG.md commit 79ceae6 refs/heads/master Merge: 7bbdb07 2ed1cbb Author: Rafael Mendonça França Date: 2014-03-12 10:24:50 -0300 Merge pull request #14359 from arthurnn/mysql2_56_franc_sec MySQL 5.6 Fractional Seconds commit 2ed1cbb refs/heads/master Author: Arthur Neves Date: 2014-03-12 09:15:46 -0400 Changelog entry for mysql56 microseconds M activerecord/CHANGELOG.md commit 5a934e6 refs/heads/master Author: Arthur Neves Date: 2014-03-12 09:06:12 -0400 Test microsecond on mysql 5.6 M activerecord/test/cases/base_test.rb M activerecord/test/cases/helper.rb M activerecord/test/schema/schema.rb commit df5a38f refs/heads/master Author: Tatsuhiko Miyagawa Date: 2012-11-12 13:48:50 -0800 MySQL 5.6 and later supports microsecond precision in datetime. You might want to branch it to include this only for 5.6, but passing these values to < 5.6 doesn't cause issues either. M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb commit 7bbdb07 refs/heads/master Merge: 7e21be3 0d191ba Author: Yves Senn Date: 2014-03-12 08:41:45 +0100 Merge pull request #14291 from laurocaetano/doc-for-original-fullpath Add documentation for original_fullpath. [ci skip] commit 0d191ba refs/heads/master Author: Lauro Caetano Date: 2014-03-05 19:12:02 -0300 [ci skip] Add documentation for original_fullpath. M actionpack/lib/action_dispatch/http/request.rb commit 7e21be3 refs/heads/master Merge: ccaf0ed 3c23f76 Author: Rafael Mendonça França Date: 2014-03-11 15:16:42 -0300 Merge pull request #14353 from arthurnn/remove_small_mock Remove mocking on save, when not necessary commit 3c23f76 refs/heads/master Author: Arthur Neves Date: 2014-03-11 14:07:29 -0400 Remove mocking on save, when not necessary M activerecord/test/cases/autosave_association_test.rb commit 26bfdf9 refs/tags/v4.0.4.rc1 (tag: v4.0.4.rc1) Author: Rafael Mendonça França Date: 2014-03-11 14:28:49 -0300 Preparing for 4.0.4.rc1 release M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 71662c8 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-11 14:26:49 -0300 Use released arel version M Gemfile commit 0aecb71 refs/tags/v4.1.0.rc2 Author: Arthur Neves Date: 2014-03-10 11:37:33 -0400 Fixes STI when 2+ levels deep. PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined. M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb commit ed7bffc refs/remotes/origin/4-1-stable Author: Arthur Neves Date: 2014-03-10 11:37:33 -0400 Fixes STI when 2+ levels deep. PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined. M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb commit f48f51d refs/remotes/origin/4-0-stable Author: Arthur Neves Date: 2014-03-10 11:37:33 -0400 Fixes STI when 2+ levels deep. PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined. Conflicts: activerecord/test/cases/attribute_methods_test.rb M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb commit ccaf0ed refs/heads/master Merge: 6868265 e5f15a8 Author: Godfrey Chan Date: 2014-03-11 07:25:36 -0700 Merge pull request #14345 from arthurnn/revert_14052 Fixes STI when 2+ levels deep. commit 6868265 refs/heads/master Author: Yves Senn Date: 2014-03-11 08:34:51 +0100 comment why we are modifying global state. [ci skip] M activemodel/test/cases/secure_password_test.rb commit 3f5339f refs/heads/master Author: Yves Senn Date: 2014-03-11 08:27:59 +0100 `change_table` supports `citext`. Follow up to #12523. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/citext_test.rb commit 0e0b41d refs/heads/master Merge: 47ea87b b3e0da3 Author: Yves Senn Date: 2014-03-11 08:19:25 +0100 Merge pull request #12523 from lsylvester/pg_citext Support for PostgreSQL citext data type. commit 47ea87b refs/heads/master Merge: 80b27c2 cc6bc1c Author: Jeremy Kemper Date: 2014-03-10 20:04:56 -0700 Merge pull request #14342 from zuhao/eliminate_global_state_leak_in_activemodel_tests Eliminate global state leaks completely in ActiveModel tests commit 80b27c2 refs/heads/master Merge: d411540 9e61a14 Author: Carlos Antonio da Silva Date: 2014-03-10 19:32:58 -0300 Merge pull request #11616 from arunagw/removed-application-command-rails Removed command "application" commit 9e61a14 refs/heads/master Author: Arun Agrawal Date: 2013-07-26 17:20:06 +0200 Removed unnecessary command "application" M railties/CHANGELOG.md M railties/lib/rails/commands/commands_tasks.rb commit b3e0da3 refs/heads/master Author: lsylvester Date: 2014-03-11 08:10:25 +1100 register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester] citext makes it possible to use AR Hash finders for case-insensitive matching as sql UPPER/LOWER functions are not needed. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb A activerecord/test/cases/adapters/postgresql/citext_test.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit e5f15a8 refs/heads/master Author: Arthur Neves Date: 2014-03-10 11:37:33 -0400 Fixes STI when 2+ levels deep. PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined. M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb commit d411540 refs/heads/master Merge: 6e3ab3e 2c634f0 Author: Vijay Dev Date: 2014-03-10 23:07:25 +0530 Merge pull request #14343 from garysweaver/master minor fix to 4.1 rel notes for begin_transaction joinable option commit cc6bc1c refs/heads/master Author: Zuhao Wan Date: 2014-03-10 21:22:22 +0800 Completely remove potential global state leaks in ActiveModel tests. ActiveModel tests can now be run in random order. M activemodel/test/cases/attribute_methods_test.rb M activemodel/test/cases/secure_password_test.rb M activemodel/test/cases/serializers/json_serialization_test.rb M activemodel/test/cases/serializers/xml_serialization_test.rb M activemodel/test/cases/validations/confirmation_validation_test.rb M activemodel/test/cases/validations/numericality_validation_test.rb M activemodel/test/cases/validations_test.rb commit 2c634f0 refs/heads/master Author: Gary S. Weaver Date: 2014-03-10 12:39:24 -0400 minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip] M guides/source/4_1_release_notes.md commit 51d9bed refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-10 11:59:59 -0300 Review CHANGELOGs [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/CHANGELOG.md M railties/CHANGELOG.md commit f756e0c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-03-10 11:41:55 -0300 Merge pull request #8313 from alan/only_save_changed_has_one_objects Save has_one associations only if record has changes Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/autosave_association.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/autosave_association_test.rb commit 3fa487d refs/remotes/origin/4-1-stable Author: Rafael Mendonça França Date: 2014-03-10 11:41:55 -0300 Merge pull request #8313 from alan/only_save_changed_has_one_objects Save has_one associations only if record has changes Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/autosave_association_test.rb commit 6e3ab3e refs/heads/master Merge: 39e07b6 f74a561 Author: Rafael Mendonça França Date: 2014-03-10 11:41:55 -0300 Merge pull request #8313 from alan/only_save_changed_has_one_objects Save has_one associations only if record has changes Conflicts: activerecord/CHANGELOG.md commit 39e07b6 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-10 11:09:39 -0300 current_adapter? accepts multiple arguments M activerecord/test/cases/schema_dumper_test.rb commit d50f753 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-10 11:07:10 -0300 mysql adapter also fails with a number bigger than int M activerecord/test/cases/finder_test.rb commit a1ad848 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-10 10:31:43 -0300 The 4.1 release notes is already a thing so lets show in the guides links M guides/source/documents.yaml commit f31a035 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-10 10:31:43 -0300 The 4.1 release notes is already a thing so lets show in the guides links M guides/source/documents.yaml commit 8923631 refs/tags/v4.1.0.rc2 Author: Rafael Mendonça França Date: 2014-03-10 10:30:46 -0300 Update the CHANGELOG to reflect the changes made at 58db2df [ci skip] M actionpack/CHANGELOG.md commit d547b23 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-10 10:23:17 -0300 Change the assertions depending in the database adapter This will avoid the confusing flunk logic M activerecord/test/cases/finder_test.rb commit 18b9595 refs/heads/master Author: Rafael Mendonça França Date: 2014-03-10 10:20:27 -0300 Do proper adapter check M activerecord/test/cases/finder_test.rb commit 0e5fb0b refs/heads/master Author: Rafael Mendonça França Date: 2014-03-10 10:08:00 -0300 Whitespaces M activerecord/lib/active_record/validations/uniqueness.rb commit 8db0afe refs/heads/master Merge: ed9a69a b87962f Author: Yves Senn Date: 2014-03-10 13:27:17 +0100 Merge pull request #14341 from keikun17/master fix minor typo 'fields_for'. [ci skip] commit b87962f refs/heads/master Author: Cakey | Buddy Magsipoc Date: 2014-03-10 20:10:38 +0800 Fix 'fields_for' doc typo. M actionview/lib/action_view/helpers/form_helper.rb commit ed9a69a refs/heads/master Merge: 740862a 5ade4b0 Author: Yves Senn Date: 2014-03-10 08:30:26 +0100 Merge pull request #14332 from tgxworld/autosave_association_test Delete instances of Parrot after each test. commit 5ade4b0 refs/heads/master Author: Guo Xiang Tan Date: 2014-03-09 13:16:01 -0700 Cleanup Parrot after each test. M activerecord/test/cases/autosave_association_test.rb commit 740862a refs/heads/master Merge: 29bd586 b5dc91d Author: Godfrey Chan Date: 2014-03-09 19:47:09 -0700 Merge pull request #14334 from kennym/master Enhance readability of ActionView DateHelper#distance_of_time_in_words commit b5dc91d refs/heads/master Author: Kenny Meyer Date: 2014-03-09 21:32:26 -0300 Enhance readability of ActionView DateHelper#distance_of_time_in_words Refactor numerical constants to module constants which give the numbers a contextual meaning. This commit aims to provide quicker understanding for part of the implementation of the DateHelper#distance_of_time_in_words method. M actionview/lib/action_view/helpers/date_helper.rb commit 29bd586 refs/heads/master Merge: ec23277 9ffeb36 Author: Yves Senn Date: 2014-03-09 21:03:13 +0100 Merge pull request #14315 from zuhao/activemodel_tests_in_random_order Run ActiveModel test suites in random order. commit 9ffeb36 refs/heads/master Author: Zuhao Wan Date: 2014-03-08 01:59:57 +0800 Run ActiveModel test suites in random order. This gets the whole ActiveModel test suites working even if `self.i_suck_and_my_tests_are_order_dependent!` is disabled in `ActiveSupport::TestCase`. Two places are found that potentially leak global state. This patch makes sure states are restored so that none of the changes happen in a single test will be carried over to subsequence tests. M activemodel/test/cases/secure_password_test.rb M activemodel/test/cases/translation_test.rb M activemodel/test/cases/validations/confirmation_validation_test.rb M activemodel/test/cases/validations/i18n_validation_test.rb commit ec23277 refs/heads/master Merge: 45efd0e cff340f Author: Andrew White Date: 2014-03-09 10:04:57 +0000 Merge pull request #14262 from sferik/flat_map Replace additional instances of map.flatten with flat_map commit 025c691 refs/heads/master Author: Piotr Chmolowski Date: 2014-03-08 23:09:54 +0100 Ensure LookupContext in Digestor selects correct variant Related to: #14242 #14243 14293 Variants passed to LookupContext#find() seem to be ignored, so I've used the setter instead: `finder.variants = [ variant ]`. I've also added some more test cases for variants. Hopefully this time passing tests will mean it actually works. M actionpack/test/controller/caching_test.rb A actionpack/test/fixtures/functional_caching/formatted_fragment_cached_with_variant.html+phone.erb M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb A actionview/test/fixtures/test/hello_world.html+phone.erb A actionview/test/fixtures/test/hello_world.text+phone.erb M actionview/test/template/digestor_test.rb M actionview/test/template/lookup_context_test.rb commit 45efd0e refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-08 18:17:49 -0300 Move changelog entry to the top, highlight module name [ci skip] M actionpack/CHANGELOG.md commit 05bfc18 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-03-08 19:49:11 +0000 Copy shallow options from normal options when using scope If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set. (cherry picked from commit af4c9b78ff1c967cc1aaef14d34205ef92db8134) M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 09c6c85 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-03-03 20:19:17 +0200 Pull namespace defaults out of the options hash If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241. (cherry picked from commit 8711086f5a2e73cd068434a5fafef258ba9f4fe1) M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 6adc92e refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-03-02 20:19:04 +0200 Only use shallow nested scope when depth is > 1 By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224. (cherry picked from commit dcc91a04a177466516dac12abc358c590743fa71) M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 26b3423 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-03-02 14:02:25 +0200 Move setting :scope_level_resource to resource_scope Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated. (cherry picked from commit ed0fb4ae7ea28cf3eecce6ec02650bcffc7c7657) M actionpack/lib/action_dispatch/routing/mapper.rb commit 6a1bd53 refs/tags/v4.1.0.rc2 Author: Andrew White Date: 2014-03-08 19:49:11 +0000 Copy shallow options from normal options when using scope If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set. (cherry picked from commit af4c9b78ff1c967cc1aaef14d34205ef92db8134) M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 37406bb refs/tags/v4.1.0.rc2 Author: Andrew White Date: 2014-03-03 20:19:17 +0200 Pull namespace defaults out of the options hash If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241. (cherry picked from commit 8711086f5a2e73cd068434a5fafef258ba9f4fe1) M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 7de1a68 refs/tags/v4.1.0.rc2 Author: Andrew White Date: 2014-03-02 20:19:04 +0200 Only use shallow nested scope when depth is > 1 By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224. (cherry picked from commit dcc91a04a177466516dac12abc358c590743fa71) M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 0919ecb refs/tags/v4.1.0.rc2 Author: Andrew White Date: 2014-03-02 14:02:25 +0200 Move setting :scope_level_resource to resource_scope Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated. (cherry picked from commit ed0fb4ae7ea28cf3eecce6ec02650bcffc7c7657) M actionpack/lib/action_dispatch/routing/mapper.rb commit af4c9b7 refs/heads/master Author: Andrew White Date: 2014-03-08 19:49:11 +0000 Copy shallow options from normal options when using scope If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 8711086 refs/heads/master Author: Andrew White Date: 2014-03-03 20:19:17 +0200 Pull namespace defaults out of the options hash If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit dcc91a0 refs/heads/master Author: Andrew White Date: 2014-03-02 20:19:04 +0200 Only use shallow nested scope when depth is > 1 By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit ed0fb4a refs/heads/master Author: Andrew White Date: 2014-03-02 14:02:25 +0200 Move setting :scope_level_resource to resource_scope Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated. M actionpack/lib/action_dispatch/routing/mapper.rb commit 002c063 refs/heads/master Merge: 1fbb905 f6ab778 Author: Yves Senn Date: 2014-03-08 20:30:42 +0100 Merge pull request #14313 from m-Peter/active_model_doc_fixes Fix errors for four of the code samples [ci skip] commit 7ea0a50 refs/heads/master Author: Rashmi Yadav Date: 2014-03-08 20:23:15 +0100 Updating select helper doc [ci skip] M guides/source/form_helpers.md commit f6ab778 refs/heads/master Author: Peter Markou Date: 2014-03-07 16:08:08 +0200 Fix errors for four of the code samples The four code samples that fail to run are: - Add attribute magic to objects. Fixed by introducing a Person instance variable. - Tracking value changes. Fixed by replacing `attr_accessor` with `define_attribute_methods`, providing getter and setter methods for `name` and providing the missing `Person#save` method. A call to `Person#save` has to precede the `person.name = 'robert'` assignment, if we want `previous_changes` to include 'bob'. - Adding `errors` interface to objects. Fixed by introducing a Person instance variable, assigning `nil` to its name and calling `Person#validate!`. - Custom validators. Fixed by defining `HasNameValidator` before it is used by `ValidatorPerson`. All the code samples can now be run smoothly. Call Dirty#changes_applied in Person#save, instead of modifying instance vars. M activemodel/README.rdoc commit 9f559b0 refs/tags/v4.1.0.rc2 Merge: 93086d2 3ac2aea Author: Santiago Pastorino Date: 2014-03-08 17:08:36 -0200 Merge pull request #14326 from arthurnn/backport_14318 Make sure we clean preview_interceptors commit 93086d2 refs/tags/v4.1.0.rc2 Merge: 6dd0f68 af39f58 Author: Santiago Pastorino Date: 2014-03-08 16:48:46 -0200 Merge pull request #14327 from zzak/backport_a94966e Backport a94966e commit af39f58 refs/tags/v4.1.0.rc2 Author: Arthur Neves Date: 2014-02-26 15:22:52 -0500 Fix OrderedHash.select to return self instance. On ruby 2.1.1 the behavior of .select and .reject has changed. They will return a Hash new instance, so we need to override them to keep the instance object class. M activesupport/lib/active_support/ordered_hash.rb M activesupport/test/ordered_hash_test.rb commit 1fbb905 refs/heads/master Merge: 18c6516 9c53b8b Author: Santiago Pastorino Date: 2014-03-08 16:15:12 -0200 Merge pull request #14325 from robin850/issue-12133 Make the rails:template rake task load initializers commit ac65da2 refs/remotes/origin/4-0-stable Merge: d80efad 5ad4c8d Author: Santiago Pastorino Date: 2014-03-08 16:12:17 -0200 Merge pull request #14198 from arthurnn/fix_14188 Fix Hash#select and #reject on ruby 2.1.1 commit 18c6516 refs/heads/master Merge: 2af7a7b a94966e Author: Santiago Pastorino Date: 2014-03-08 16:12:10 -0200 Merge pull request #14244 from arthurnn/orderd_hash_select_fix Fix OrderedHash.select to return self instance. commit 3ac2aea refs/tags/v4.1.0.rc2 Author: Arthur Neves Date: 2014-03-07 14:53:18 -0500 Make sure we clean preview_interceptors We should make sure we clean preview_interceptors after each test so they dont leaky to the next test M actionmailer/test/base_test.rb commit 2af7a7b refs/heads/master Merge: dc8bfc8 67584c6 Author: Santiago Pastorino Date: 2014-03-08 15:22:42 -0200 Merge pull request #14280 from joho/make_csrf_failure_logging_optional Make CSRF failure logging optional/configurable. commit 9c53b8b refs/heads/master Author: Robin Dupret Date: 2014-03-08 15:51:49 +0100 Make the rails:template rake task load initializers Templates could rely on irregular inflections or external libraries for instance so we should load the application's initializers when running the rails:template task. The introducing commit of this feature is f7f11361 ; the initializers have never been loaded invoking this task. Fixes #12133. M railties/CHANGELOG.md M railties/lib/rails/tasks/framework.rake M railties/test/application/rake_test.rb commit dc8bfc8 refs/heads/master Author: Yves Senn Date: 2014-03-08 15:46:43 +0100 docs, shorten CsrfHelper description and refer to security guide. [ci skip] M guides/source/action_view_overview.md commit 2883cb9 refs/heads/master Author: Yves Senn Date: 2014-03-08 13:41:38 +0100 added CSRF helper to rails guide documentation. Closes #11615. [ci skip] M guides/source/action_view_overview.md commit 6dd0f68 refs/tags/v4.1.0.rc2 Author: Pavel Penkov Date: 2013-08-19 11:52:31 +0400 Tests for indifferent access using full_messages_for. Closes #11916 M activemodel/test/cases/errors_test.rb commit d80efad refs/remotes/origin/4-0-stable Author: Pavel Penkov Date: 2013-08-19 11:52:31 +0400 Tests for indifferent access using full_messages_for. Closes #11916 M activemodel/test/cases/errors_test.rb commit 62e8145 refs/heads/master Author: Pavel Penkov Date: 2013-08-19 11:52:31 +0400 Tests for indifferent access using full_messages_for. Closes #11916 M activemodel/test/cases/errors_test.rb commit 5f24446 refs/heads/master Merge: 5ecb52c d39bba7 Author: Andrew White Date: 2014-03-07 21:00:17 +0000 Merge pull request #14318 from arthurnn/clean_preview_interceptors Make sure we clean preview_interceptors commit d39bba7 refs/heads/master Author: Arthur Neves Date: 2014-03-07 14:53:18 -0500 Make sure we clean preview_interceptors We should make sure we clean preview_interceptors after each test so they dont leaky to the next test M actionmailer/test/base_test.rb commit 5ecb52c refs/heads/master Merge: 70ff31d 91156b6 Author: Arthur Nogueira Neves Date: 2014-03-07 14:04:41 -0500 Merge pull request #14316 from the4dpatrick/master Add preventDefault() on click event commit 91156b6 refs/heads/master Author: Patrick Perey Date: 2014-03-07 10:46:27 -0800 Add preventDefault() on click event M guides/source/working_with_javascript_in_rails.md commit 5ad4c8d refs/remotes/origin/4-0-stable Author: Arthur Neves Date: 2014-03-07 12:40:30 -0500 Syntax polishing M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/lib/active_support/ordered_hash.rb M activesupport/test/core_ext/hash_ext_test.rb commit b57da83 refs/remotes/origin/4-0-stable Author: Arthur Neves Date: 2014-02-26 15:22:52 -0500 Fix OrderedHash.select to return self instance. On ruby 2.1.1 the behavior of .select and .reject has changed. They will return a Hash new instance, so we need to override them to keep the instance object class. M activesupport/lib/active_support/ordered_hash.rb M activesupport/test/ordered_hash_test.rb commit a94966e refs/heads/master Author: Arthur Neves Date: 2014-02-26 15:22:52 -0500 Fix OrderedHash.select to return self instance. On ruby 2.1.1 the behavior of .select and .reject has changed. They will return a Hash new instance, so we need to override them to keep the instance object class. M activesupport/lib/active_support/ordered_hash.rb M activesupport/test/ordered_hash_test.rb commit 70ff31d refs/heads/master Merge: 507ee79 3f1699a Author: Vijay Dev Date: 2014-03-07 20:58:11 +0530 Merge branch 'master' of github.com:rails/docrails Conflicts: guides/source/4_1_release_notes.md commit 3f1699a refs/heads/master Author: dmathieu <42@dmathieu.com> Date: 2014-03-07 15:06:20 +0100 fix typo app -> all Thank you @bquorning M activerecord/lib/active_record/scoping/default.rb commit 2443488 refs/heads/master Author: dmathieu <42@dmathieu.com> Date: 2014-03-07 14:52:44 +0100 unscope doesn't remove only the default_scope, but all of them. [ci-skip] Closes rails/rails#14294 M activerecord/lib/active_record/scoping/default.rb commit 507ee79 refs/heads/master Merge: b719214 d361d93 Author: Vijay Dev Date: 2014-03-06 22:53:08 +0530 Merge pull request #14257 from killthekitten/patch-1 Add "Low-Level Caching" part to "Caching With Rails" guide commit 58db2df refs/tags/v4.1.0.rc2 Merge: 3ddb749 c3bca73 Author: Aaron Patterson Date: 2014-03-06 08:22:51 -0800 Merge pull request #14286 from sikachu/4-1-stable-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body` commit b719214 refs/heads/master Merge: 2e048bc ed88a60 Author: Aaron Patterson Date: 2014-03-06 08:22:43 -0800 Merge pull request #14285 from sikachu/master-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body` commit 3ddb749 refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-03-06 11:45:04 +0100 Merge pull request #14296 from joker1007/fix_rails_guides_about_active_record_default_timezone Fix guide about `config.active_record.default_timezone` [ci skip] M guides/source/configuring.md commit 2e048bc refs/heads/master Merge: 9f84c7b 64816da Author: Yves Senn Date: 2014-03-06 11:45:04 +0100 Merge pull request #14296 from joker1007/fix_rails_guides_about_active_record_default_timezone Fix guide about `config.active_record.default_timezone` [ci skip] commit 64816da refs/heads/master Author: joker1007 Date: 2014-03-06 18:57:29 +0900 Fix guide about `config.active_record.default_timezone` [ci skip] Now the initial value of ActiveRecord.default_timezone is always :utc M guides/source/configuring.md commit d361d93 refs/heads/master Author: Nikolay Shebanov Date: 2014-03-03 15:54:52 +0300 [ci skip] Add "Low-Level Caching" part to "Caching With Rails" M guides/source/caching_with_rails.md commit 589d1ed refs/heads/master Author: Hendy Tanata Date: 2014-03-05 11:38:39 -0800 Update doc for TagHelper. M actionview/lib/action_view/helpers/tag_helper.rb commit ea8aba8 refs/tags/v4.1.0.rc2 Merge: 332a359 3bf87d7 Author: Jeremy Kemper Date: 2014-03-05 10:39:16 -0700 Merge pull request #14103 from sikachu/4-1-stable-fix-versioning-task Introduce `Rails.gem_version` commit 9f84c7b refs/heads/master Merge: 058d3c6 2dd2fcf Author: Jeremy Kemper Date: 2014-03-05 10:38:48 -0700 Merge pull request #14101 from sikachu/master-fix-versioning-task Introduce `Rails.gem_version` commit 3bf87d7 refs/tags/v4.1.0.rc2 Author: Prem Sichanugrist Date: 2014-02-18 16:13:23 -0500 Introduce `Rails.gem_version` This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> # Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`. M Rakefile A actionmailer/lib/action_mailer/gem_version.rb M actionmailer/lib/action_mailer/version.rb A actionpack/lib/action_pack/gem_version.rb M actionpack/lib/action_pack/version.rb A actionview/lib/action_view/gem_version.rb M actionview/lib/action_view/version.rb A activemodel/lib/active_model/gem_version.rb M activemodel/lib/active_model/version.rb A activerecord/lib/active_record/gem_version.rb M activerecord/lib/active_record/version.rb A activesupport/lib/active_support/gem_version.rb M activesupport/lib/active_support/version.rb M railties/CHANGELOG.md M railties/lib/rails.rb A railties/lib/rails/gem_version.rb M railties/lib/rails/version.rb A railties/test/version_test.rb M version.rb commit 2dd2fcf refs/heads/master Author: Prem Sichanugrist Date: 2014-02-18 16:13:23 -0500 Introduce `Rails.gem_version` This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> # Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`. M Rakefile A actionmailer/lib/action_mailer/gem_version.rb M actionmailer/lib/action_mailer/version.rb A actionpack/lib/action_pack/gem_version.rb M actionpack/lib/action_pack/version.rb A actionview/lib/action_view/gem_version.rb M actionview/lib/action_view/version.rb A activemodel/lib/active_model/gem_version.rb M activemodel/lib/active_model/version.rb A activerecord/lib/active_record/gem_version.rb M activerecord/lib/active_record/version.rb A activesupport/lib/active_support/gem_version.rb M activesupport/lib/active_support/version.rb M railties/CHANGELOG.md M railties/lib/rails.rb A railties/lib/rails/gem_version.rb M railties/lib/rails/version.rb A railties/test/version_test.rb M version.rb commit ed88a60 refs/heads/master Author: Prem Sichanugrist Date: 2014-02-28 19:39:22 -0500 Do note remove `Content-Type` when `render :body` `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da. M actionpack/lib/action_controller/metal/rack_delegation.rb M actionpack/lib/action_controller/metal/rendering.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/new_base/render_body_test.rb M actionpack/test/dispatch/response_test.rb M actionview/lib/action_view/helpers/rendering_helper.rb M actionview/lib/action_view/rendering.rb M guides/source/layouts_and_rendering.md commit c3bca73 refs/tags/v4.1.0.rc2 Author: Prem Sichanugrist Date: 2014-02-28 19:39:22 -0500 Do note remove `Content-Type` when `render :body` `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da. M actionpack/lib/action_controller/metal/rack_delegation.rb M actionpack/lib/action_controller/metal/rendering.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/new_base/render_body_test.rb M actionpack/test/dispatch/response_test.rb M actionview/lib/action_view/helpers/rendering_helper.rb M actionview/lib/action_view/rendering.rb M guides/source/layouts_and_rendering.md commit 332a359 refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-03-04 09:42:15 -0300 Always return an array from formats so there is no need to wrap it when calling M railties/lib/rails/generators/erb.rb M railties/lib/rails/generators/erb/controller/controller_generator.rb M railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb commit 4ca8180 refs/tags/v4.1.0.rc2 Author: Allen Fair Date: 2014-02-20 17:39:45 -0500 Fix for external generators extend Erb::Generators HAML and probably other generators extend this class and invoke filename_with_extensions with the old signature (without format). This makes the second argument optional and defaults it to the #format method which could be overridden as well. Closes #14132. M railties/lib/rails/generators/erb.rb commit 058d3c6 refs/heads/master Author: Robin Dupret Date: 2014-03-05 14:00:23 +0100 Remove a reference to an issue [ci skip] This actually not an issue fixing ; the changelog is referring to the introducing pull request itself. M activerecord/CHANGELOG.md commit d7cf95c refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-03-04 16:15:26 +0100 Take variants into account when calculating template digests in ActionView::Digestor M actionpack/test/controller/caching_test.rb M actionview/CHANGELOG.md M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb A actionview/test/fixtures/digestor/messages/new.html+iphone.erb M actionview/test/template/digestor_test.rb commit b74eed5 refs/heads/master Author: Yves Senn Date: 2014-03-05 10:45:37 +0100 get rid of intermediate arrays. origin: https://github.com/rails/rails/commit/f6aeb8b1a3687c8523e4a56309fe3736011b2935#commitcomment-5569649 M activerecord/lib/active_record/relation/query_methods.rb commit f6aeb8b refs/heads/master Author: Yves Senn Date: 2014-03-05 10:24:13 +0100 we only need to support `asc` and `ASC`. No need for mixed cases. #14263 This is a result of the discussion at https://github.com/rails/rails/pull/14263/files#r10291489 M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit f441ac7 refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-03-05 09:53:39 +0100 docs, flash message keys are normalized to strings. [ci skip] This is a follow up to a668beffd64106a1e1fedb71cc25eaaa11baf0c1 M guides/source/upgrading_ruby_on_rails.md commit 8d486c6 refs/heads/master Author: Yves Senn Date: 2014-03-05 09:53:39 +0100 docs, flash message keys are normalized to strings. [ci skip] This is a follow up to a668beffd64106a1e1fedb71cc25eaaa11baf0c1 M guides/source/upgrading_ruby_on_rails.md commit 54a120e refs/heads/master Author: Yves Senn Date: 2014-03-05 09:07:12 +0100 quick pass over Active Record CHANGELOG. [ci skip]. M activerecord/CHANGELOG.md commit 5f7f3bb refs/heads/master Merge: ef7e7ad acbd7ab Author: Yves Senn Date: 2014-03-05 09:05:15 +0100 Merge pull request #14263 from robin850/allow_passing_string_to_order_hash Follow up of #10732 - Allow string hash values on AR order method commit ef7e7ad refs/heads/master Merge: ccf8f27 f317cc8 Author: Aaron Patterson Date: 2014-03-04 19:59:58 -0800 Merge pull request #14261 from MSch/bound-parameters-for-exists Make exists? use bound values. commit ccf8f27 refs/heads/master Author: Godfrey Chan Date: 2014-03-04 17:58:58 -0800 Revert "Merge pull request #14269 from arthurnn/expanded_key_array" This reverts commit 475c96589ca65282e1a61350271c2f83f0d4044f, reversing changes made to 705915ab5cf24430892107764b0050c07e1df583. We decided that this is not worth busting everyone's cache as this seems like a very unlikely problem. The problem only occurs when the user is 1) not using a namespace, or 2) using the same namesapce for different *kinds* of cache items. The recommended "fix" is to put those cache items into their own namspace: id = 1 Rails.cache.fetch(id, namespace: "user"){ User.find(id) } ids = [1] Rails.cache.fetch(ids, namespace: "users"){ User.find(ids) } See the discussion on #14269 for details. M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache.rb M activesupport/test/caching_test.rb commit 67584c6 refs/heads/master Author: John Barton (joho) Date: 2014-03-05 11:24:51 +1100 Make CSRF failure logging optional/configurable. Added the log_warning_on_csrf_failure option to ActionController::RequestForgeryProtection which is on by default. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/test/controller/request_forgery_protection_test.rb commit 475c965 refs/heads/master Merge: 705915a 7d98247 Author: Guillermo Iguaran Date: 2014-03-04 17:11:34 -0500 Merge pull request #14269 from arthurnn/expanded_key_array Cache key should be different when is Array. commit acbd7ab refs/heads/master Author: Marcelo Casiraghi Date: 2013-05-23 00:17:15 -0300 Allow string hash values on AR order method This behavior has almost no performance impact: String not allowed 66.910000 0.030000 66.940000 ( 67.024976) String allowed 69.360000 0.030000 69.390000 ( 69.503096) Benchmarked with http://git.io/Y0YuRw. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit cff340f refs/heads/master Author: Erik Michaels-Ober Date: 2014-03-03 19:23:29 -0800 Replace map.flatten with flat_map in railties M railties/lib/rails/commands/plugin.rb M railties/lib/rails/generators/actions.rb M railties/lib/rails/paths.rb M railties/lib/rails/source_annotation_extractor.rb commit 705915a refs/heads/master Merge: ab1bd7c 1858cc6 Author: David Heinemeier Hansson Date: 2014-03-04 16:15:26 +0100 Merge pull request #14243 from pch/digestor-variants Variants in ActionView::Digestor commit ab1bd7c refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-04 09:42:15 -0300 Always return an array from formats so there is no need to wrap it when calling M railties/lib/rails/generators/erb.rb M railties/lib/rails/generators/erb/controller/controller_generator.rb M railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb commit 3624ff7 refs/heads/master Author: Allen Fair Date: 2014-02-20 17:39:45 -0500 Fix for external generators extend Erb::Generators HAML and probably other generators extend this class and invoke filename_with_extensions with the old signature (without format). This makes the second argument optional and defaults it to the #format method which could be overridden as well. Closes #14132. M railties/lib/rails/generators/erb.rb commit 1858cc6 refs/heads/master Author: Piotr Chmolowski Date: 2014-03-01 18:59:56 +0100 Variants in ActionView::Digestor Take variants into account when calculating template digests in ActionView::Digest. Digestor#digest now takes a hash as an argument to support variants and allow more flexibility in the future. Old-style arguments have been deprecated. Fixes #14242 M actionpack/test/controller/caching_test.rb M actionview/CHANGELOG.md M actionview/lib/action_view/digestor.rb M actionview/lib/action_view/helpers/cache_helper.rb A actionview/test/fixtures/digestor/messages/new.html+iphone.erb M actionview/test/template/digestor_test.rb commit 8ed0f54 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-04 09:50:39 -0300 Inline block to fix indent [ci skip] M activerecord/test/cases/adapters/postgresql/enum_test.rb commit b89bc10 refs/remotes/origin/ca-fix-mailer-generators (origin/ca-fix-mailer-generators) Author: Carlos Antonio da Silva Date: 2014-03-04 09:42:15 -0300 Always return an array from formats so there is no need to wrap it when calling M railties/lib/rails/generators/erb.rb M railties/lib/rails/generators/erb/controller/controller_generator.rb M railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb commit cd84219 refs/remotes/origin/ca-fix-mailer-generators Author: Allen Fair Date: 2014-02-20 17:39:45 -0500 Fix for external generators extend Erb::Generators HAML and probably other generators extend this class and invoke filename_with_extensions with the old signature (without format). This makes the second argument optional and defaults it to the #format method which could be overridden as well. M railties/lib/rails/generators/erb.rb commit 18db6a7 refs/heads/master Merge: 9ada39f 6e66de6 Author: Yves Senn Date: 2014-03-04 13:38:30 +0100 Merge pull request #14273 from vipulnsward/fix-warning-13244 Fix enum test unused variable warning. commit 6e66de6 refs/heads/master Author: Vipul A M Date: 2014-03-04 18:06:19 +0530 Fix enum test unused variable warning. Related - https://github.com/rails/rails/commit/5c55aafd38f45ac019573f98438ffdbdc8c580f9 M activerecord/test/cases/adapters/postgresql/enum_test.rb commit 9ada39f refs/heads/master Merge: 7231a13 5c55aaf Author: Yves Senn Date: 2014-03-04 13:14:41 +0100 Merge pull request #13244 from kommen/pg_enum_type_map Add Enum type to postgresql adapter's oids to prevent unknown OID warnings commit 801e159 refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-03-04 08:25:15 -0300 Use 1.9 style hash on docs [ci skip] M actionview/lib/action_view/helpers/form_tag_helper.rb commit c16d058 refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-03-04 08:21:32 -0300 Simplify handling of defaults/options in button_tag There's no need to rely on Active Support's Hash#reverse_merge for simple cases with default values, since we can just merge from the default rather than reverse merge from the options. This also avoids the creation of one extra hash object by moving to a Hash#merge! call. M actionview/lib/action_view/helpers/form_tag_helper.rb commit 7231a13 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-04 08:25:15 -0300 Use 1.9 style hash on docs [ci skip] M actionview/lib/action_view/helpers/form_tag_helper.rb commit 8b1ccd5 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-03-04 08:21:32 -0300 Simplify handling of defaults/options in button_tag There's no need to rely on Active Support's Hash#reverse_merge for simple cases with default values, since we can just merge from the default rather than reverse merge from the options. This also avoids the creation of one extra hash object by moving to a Hash#merge! call. M actionview/lib/action_view/helpers/form_tag_helper.rb commit ecda6df refs/heads/master Author: Godfrey Chan Date: 2014-03-04 03:12:18 -0800 Added missing changlog entry for #14255 M actionview/CHANGELOG.md commit e293425 refs/tags/v4.1.0.rc2 Author: Godfrey Chan Date: 2014-03-04 03:06:36 -0800 Correctly apply the default options for the `button_tag` helper Fixes #14254 [Sergey Prikhodko] M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/form_tag_helper.rb M actionview/test/template/form_tag_helper_test.rb commit 87d520b refs/heads/master Merge: ffcc617 e447ed6 Author: Godfrey Chan Date: 2014-03-04 02:51:58 -0800 Merge pull request #14255 from prikha/master Fixes #14254 ActionView button_tag helper default options values issue. commit 5c55aaf refs/heads/master Author: Dieter Komendera Date: 2013-12-09 18:52:36 +0100 Add Enum type to postgresql adapter's oids to prevent unknown OID warnings. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/enum_test.rb commit e447ed6 refs/heads/master Author: Sergey Prikhodko Date: 2014-03-04 13:18:32 +0400 remove private method and rewrite into more precise notation M actionview/lib/action_view/helpers/form_tag_helper.rb commit f317cc8 refs/heads/master Author: Martin Schürrer Date: 2014-03-03 17:44:55 +0100 Make exists? use bound values. When we build a query with an inline value that is a numeric (e.g. because it's out of range for an int4) PostgreSQL doesn't use an index on the column, since it's now comparing numerics and not int4s. This leads to a _very_ slow query. When we use bound parameters instead of inline values PostgreSQL raises numeric_value_out_of_range since no automatic coercion happens. M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb commit 3413b88 refs/heads/master Author: Erik Michaels-Ober Date: 2014-03-03 19:23:22 -0800 Replace map.flatten with flat_map in activerecord M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/associations/callbacks_test.rb M activerecord/test/cases/autosave_association_test.rb commit 817fe31 refs/heads/master Author: Erik Michaels-Ober Date: 2014-03-03 19:23:12 -0800 Replace map.flatten with flat_map in actionpack M actionpack/lib/action_dispatch/journey/gtg/builder.rb M actionpack/lib/action_dispatch/journey/gtg/simulator.rb M actionpack/lib/action_dispatch/journey/gtg/transition_table.rb M actionpack/lib/action_dispatch/journey/nfa/dot.rb M actionpack/lib/action_dispatch/journey/nfa/simulator.rb M actionpack/lib/action_dispatch/journey/nfa/transition_table.rb M actionpack/lib/action_dispatch/journey/path/pattern.rb commit 7d98247 refs/heads/master Author: Arthur Neves Date: 2014-03-03 20:50:31 -0500 Cache key should be different when is Array. `cache.fetch(['foo'])` and `cache.fetch('foo')` should generate different cache keys as they are not equivalents. [related #8615] [related #8614] M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache.rb M activesupport/test/caching_test.rb commit ca1b98a refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 18:32:29 +0400 rollback to private method M actionview/lib/action_view/helpers/form_tag_helper.rb commit d1eae6a refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-03-03 11:07:40 -0300 Merge pull request #14258 from shuhei/fix_deep_munge_log Add spaces to the log message of ActionController:: LogSubscriber#deep_munge M actionpack/lib/action_controller/log_subscriber.rb commit ffcc617 refs/heads/master Merge: 686e820 38594b3 Author: Carlos Antonio da Silva Date: 2014-03-03 11:07:40 -0300 Merge pull request #14258 from shuhei/fix_deep_munge_log Add spaces to the log message of ActionController:: LogSubscriber#deep_munge commit d0d2497 refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 17:59:57 +0400 cleanup and move extracted method right into the helper M actionview/lib/action_view/helpers/form_tag_helper.rb commit 38594b3 refs/heads/master Author: Shuhei Kagawa Date: 2014-03-03 22:39:15 +0900 Add spaces to deep_munge log message. M actionpack/lib/action_controller/log_subscriber.rb commit ed4fc43 refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 17:16:28 +0400 fix content_or_options to be replaced by options and set to nil M actionview/lib/action_view/helpers/form_tag_helper.rb commit 686e820 refs/heads/master Author: Robin Dupret Date: 2014-03-03 14:15:59 +0100 Add a comment to ensure that a test won't be removed [ci skip] The 'cow' => 'kine' inflection has gone with c300dca9 but it should not be removed from the tested irregularities since it ensures that inflections work with words that do not begin with the same letters. M activesupport/test/inflector_test_cases.rb commit 28c0177 refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 16:42:04 +0400 fix indentations M actionview/lib/action_view/helpers/form_tag_helper.rb commit 51ff88c refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 16:33:24 +0400 fix form button M actionview/lib/action_view/helpers/form_tag_helper.rb commit 4a7c8ef refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 15:40:16 +0400 fix button tag without options M actionview/lib/action_view/helpers/form_tag_helper.rb commit aa2101e refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 14:57:41 +0400 fix accept nil options M actionview/lib/action_view/helpers/form_tag_helper.rb commit 60bbbce refs/heads/master Author: Sergey Prikhodko Date: 2014-03-03 12:23:51 +0400 fixes default attributes for button_tag M actionview/lib/action_view/helpers/form_tag_helper.rb M actionview/test/template/form_tag_helper_test.rb commit 409fbff refs/heads/master Merge: 9291d5a 11e815e Author: Jeremy Kemper Date: 2014-03-02 15:24:32 -0700 Merge pull request #14239 from zzak/refactor_actionpack_dispatch_request_tests Refactor actionpack ActionDispatch::Request tests commit 9291d5a refs/heads/master Merge: f60b524 398b4de Author: Yves Senn Date: 2014-03-02 22:50:26 +0100 Merge pull request #14248 from vipulnsward/fix-pg-ar-warnings Fix PG warnings. commit 398b4de refs/heads/master Author: Vipul A M Date: 2014-03-03 02:35:42 +0530 Fix warnings due to: - unused variable in PG Adapter. - Ambiguous argument warning from range_test for use - to + Infinity range without brackets. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit f8646f0 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-28 09:53:12 -0800 Merge pull request #14226 from senny/14109_partial_revert `includes` uses SQL parsing when String joins are involved. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation.rb M activerecord/test/cases/associations/eager_test.rb commit 11e815e refs/heads/master Author: Zachary Scott Date: 2014-02-28 21:49:45 -0800 Refactor tests from BaseRackTest into BaseRequestTest D actionpack/test/dispatch/rack_test.rb M actionpack/test/dispatch/request_test.rb commit f60b524 refs/heads/master Merge: f160107 774160b Author: Santiago Pastorino Date: 2014-03-01 12:03:23 -0200 Merge pull request #14234 from arthurnn/fix_trans_on_replace Remove unnecessary db call when replacing. commit f160107 refs/heads/master Merge: 401787d b11ebf1 Author: José Valim Date: 2014-03-01 08:19:03 +0100 Merge pull request #14240 from sferik/flat_map Replace map.flatten(1) with flat_map commit b11ebf1 refs/heads/master Author: Erik Michaels-Ober Date: 2014-02-28 22:41:49 -0800 Replace map.flatten(1) with flat_map M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/journey/gtg/transition_table.rb commit f7cf45a refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-28 16:35:23 -0800 make sure we wait for the threads to shut down before asserting closure M actionpack/test/controller/live_stream_test.rb commit 401787d refs/heads/master Author: Aaron Patterson Date: 2014-02-28 16:35:23 -0800 make sure we wait for the threads to shut down before asserting closure M actionpack/test/controller/live_stream_test.rb commit b0767af refs/heads/master Merge: a7b059e fc61bca Author: Guillermo Iguaran Date: 2014-02-28 19:26:04 -0500 Merge pull request #14195 from robin850/issue-14079 Avoid namespacing routes inside engines commit 20416f1 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-28 15:39:08 -0800 use built-in exception handling in live controllers when an exception happens in an action before the response has been committed, then we should re-raise the exception in the main thread. This lets us reuse the existing exception handling. M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit a7b059e refs/heads/master Author: Aaron Patterson Date: 2014-02-28 15:39:08 -0800 use built-in exception handling in live controllers when an exception happens in an action before the response has been committed, then we should re-raise the exception in the main thread. This lets us reuse the existing exception handling. M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit a6d2c97 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-28 15:22:35 -0800 live controllers should have live responses detect the type of controller we're testing and return the right type of response based on that controller. This allows us to stop doing the weird sleep thing. M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/live_stream_test.rb commit 30d21df refs/heads/master Author: Aaron Patterson Date: 2014-02-28 15:22:35 -0800 live controllers should have live responses detect the type of controller we're testing and return the right type of response based on that controller. This allows us to stop doing the weird sleep thing. M actionpack/lib/action_controller/metal/live.rb M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/live_stream_test.rb commit 20c2e92 refs/tags/v4.1.0.rc2 Merge: 404924f 43d096e Author: Aaron Patterson Date: 2014-02-28 15:15:56 -0800 Merge pull request #14236 from hone/4-1-stable Backport 283a2ed from master to 4-1-stable commit 43d096e refs/tags/v4.1.0.rc2 Author: schneems Date: 2014-02-21 16:04:21 -0600 Handle missing environment from non empty config If using a `DATABASE_URL` and a `database.yml`. The connection information in `DATABASE_URL` should be merged into whatever environment we are in. As released in 4.1.0rc1 if someone has a database.yml but is missing a key like production: ```yml development: host: localhost ``` Then the check for blank config will return false so the information from the `DATABASE_URL` will not be used when attempting to connect to the `production` database and the connection will incorrectly fail. This commit fixes this problem and adds a test for the behavior. In addition the ability to specify a connection url in a `database.yml` like this: ``` production: postgres://localhost/foo ``` Was introduced in 4.1.0rc1 though should not be used, instead using a url sub key ``` production: url: postgres://localhost/foo ``` This url sub key was also introduced in 4.1.0rc1 though the `production: postgres://localhost/foo` was not removed. As a result we should not test this behavior. M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 774160b refs/heads/master Author: Arthur Neves Date: 2014-02-28 17:00:38 -0500 Remove unnecessary db call when replacing. When replacing a has_many association with the same one, there is no need to do a round-trip to the db to create/and drop a new transaction. [fixes #14220] M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit be6f51a refs/heads/master Merge: 9af4258 ae75289 Author: Guillermo Iguaran Date: 2014-02-28 16:55:11 -0500 Merge pull request #14233 from kuldeepaggarwal/fix-secrets-doc use `secrets.secret_key_base` instead of `config.secret_key_base` commit ae75289 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-03-01 01:35:29 +0530 [ci skip] use secrets.secret_key_base instead of config.secret_key_base use secrets.yml instead of secret_token.rb M guides/source/configuring.md M guides/source/security.md commit 404924f refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-28 11:57:15 -0800 set the error callback to a nice default in case nobody set an error callback and an error happens M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit 9af4258 refs/heads/master Author: Aaron Patterson Date: 2014-02-28 11:57:15 -0800 set the error callback to a nice default in case nobody set an error callback and an error happens M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit cee7a06 refs/heads/master Author: Hendy Tanata Date: 2014-02-28 11:28:24 -0800 Improve collision explanation for Hash#transform_keys. Based on comments at https://github.com/rails/docrails/commit/42417b0013819e573be9ffc5402e179003156e8e#commitcomment-5527251 [skip ci] M guides/source/active_support_core_extensions.md commit a92c707 refs/heads/master Merge: 3bdc7eb 16f9623 Author: Robin Dupret Date: 2014-02-28 20:23:31 +0100 Merge pull request #14230 from kuldeepaggarwal/doc-select Correct `select` examples and doc, ref [522c0fd] [ci skip] commit 16f9623 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-03-01 00:51:35 +0530 [ci skip] correct select examples and doc, ref [522c0fd] M activerecord/lib/active_record/relation/query_methods.rb commit e7ec793 refs/tags/v4.1.0.rc2 Author: Robin Dupret Date: 2014-02-28 19:21:18 +0100 Improve a bit the 4.1 release notes [ci skip] Fix a few typos. #present_in has been changed to #presence_in through commit d61baee5. M guides/source/4_1_release_notes.md commit 3bdc7eb refs/heads/master Author: Robin Dupret Date: 2014-02-28 19:21:18 +0100 Improve a bit the 4.1 release notes [ci skip] Fix a few typos. #present_in has been changed to #presence_in through commit d61baee5. M guides/source/4_1_release_notes.md commit 422906d refs/heads/master Merge: 6ef3460 d1e7cd1 Author: Aaron Patterson Date: 2014-02-28 09:53:12 -0800 Merge pull request #14226 from senny/14109_partial_revert `includes` uses SQL parsing when String joins are involved. commit 6ef3460 refs/heads/master Merge: 544c78a 4b1639d Author: Guillermo Iguaran Date: 2014-02-28 12:50:58 -0500 Merge pull request #14231 from brianstorti/bs-docs-secret-token Use secrets.yml instead of secret_token.rb in the docs commit d1e7cd1 refs/heads/master Author: Yves Senn Date: 2014-02-28 09:49:52 +0100 `includes` uses SQL parsing when String joins are involved. This is a partial revert of 22b3481ba2aa55fad1f9a5db94072312b345fb55. The current implementation of `references_eager_loaded_tables?` needs to know every table involved in the query. With the current API this is not possible without SQL parsing. While a2dab46cae35a06fd5c5500037177492a047c252 deprecated SQL parsing for `includes`. It did not issue deprecation warnings when String joins are involved. This resulted in a breaking change after the deprecated behavior was removed (22b3481ba2aa55fad1f9a5db94072312b345fb55). We will need to rethink the usage of `includes`, `preload` and `eager_load` but for now, this brings back the old *working* behavior. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation.rb M activerecord/test/cases/associations/eager_test.rb commit 4b1639d refs/heads/master Author: Brian Thomas Storti Date: 2014-02-27 23:39:58 -0800 [ci skip] use secrets.yml instead of secret_token.rb in the action controller guide M guides/source/action_controller_overview.md commit 245574a refs/heads/master Author: Hendy Tanata Date: 2014-02-27 19:39:17 -0800 Fix code alignment in duplicable? guide. [skip ci] M guides/source/active_support_core_extensions.md commit 42417b0 refs/heads/master Author: Hendy Tanata Date: 2014-02-27 19:31:08 -0800 Improve guide for Hash#transform_keys and related methods. [skip ci] M guides/source/active_support_core_extensions.md commit 4c0fb7c refs/tags/v4.1.0.rc2 Author: TheMonster Date: 2014-02-26 03:24:44 +0200 Fix a bug affecting validations of enum attributes This fixes a bug where any enum attribute of a model would be evaluated always as 0 when calling the database on validations. This fix converts the value of the enum attribute to its integer value rather than the string before building the relation as the bug occured when the string finally gets converted to integer using string.to_i which converts it to 0. [Vilius Luneckas, Ahmed AbouElhamayed] M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/enum_test.rb commit 544c78a refs/heads/master Merge: 14e697c 6e53d92 Author: Godfrey Chan Date: 2014-02-27 14:56:10 -0800 Merge pull request #14203 from Alwahsh/aabouelhamayed Fix a bug affecting validations of enum attributes commit 6e53d92 refs/heads/master Author: TheMonster Date: 2014-02-26 03:24:44 +0200 Fix a bug affecting validations of enum attributes This fixes a bug where any enum attribute of a model would be evaluated always as 0 when calling the database on validations. This fix converts the value of the enum attribute to its integer value rather than the string before building the relation as the bug occured when the string finally gets converted to integer using string.to_i which converts it to 0. [Vilius Luneckas, Ahmed AbouElhamayed] M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/enum_test.rb commit 37ca1b4 refs/heads/master Author: Aaron Patterson Date: 2014-02-27 11:33:25 -0800 we can't cache when the arguments are a hash M activerecord/lib/active_record/core.rb commit 2630642 refs/heads/master Merge: bf3ddfa 14e697c Author: Aaron Patterson Date: 2014-02-27 11:25:15 -0800 Merge branch 'master' into adequaterecord * master: modify model generator warning message. refs [#174c9f0] Replace "data store" with database [ci skip] Return a hash rather than array from fetch_multi Fix concerning module reference [ci skip] Fixes docs typo in nested resource path helpers [skip ci] Fix some validators when used on model instance Pass strings to demodulize method pass strings to the underscore method speed up `underscore` in cases that don't need to do anything pass the class name to `tableize` [ci skip] Update list of files extensions in rake notes guide Fix controller test not resetting @_url_options commit 14e697c refs/heads/master Merge: 00824b0 adff19c Author: Yves Senn Date: 2014-02-27 18:57:45 +0100 Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_test fix test cases commit adff19c refs/heads/master Author: Kuldeep Aggarwal Date: 2014-02-27 22:04:01 +0530 modify model generator warning message. refs [#174c9f0] M railties/lib/rails/generators/model_helpers.rb M railties/test/generators/model_generator_test.rb M railties/test/generators/resource_generator_test.rb commit 00824b0 refs/heads/master Author: Robin Dupret Date: 2014-02-27 17:10:47 +0100 Replace "data store" with database [ci skip] Active Record is specifically for databases. Refs #12101. M activerecord/lib/active_record/persistence.rb commit 82dde71 refs/tags/v4.1.0.rc2 Author: Robin Dupret Date: 2014-02-27 17:10:47 +0100 Replace "data store" with database [ci skip] Active Record is specifically for databases. Refs #12101. M activerecord/lib/active_record/persistence.rb commit d682b0d refs/remotes/origin/4-0-stable Author: Robin Dupret Date: 2014-02-27 17:10:47 +0100 Replace "data store" with database [ci skip] Active Record is specifically for databases. Refs #12101. M activerecord/lib/active_record/persistence.rb commit f33a652 refs/heads/master Merge: 7c92e0b c046e60 Author: Guillermo Iguaran Date: 2014-02-27 09:40:08 -0500 Merge pull request #11481 from sorentwo/fetch-multi-hash Cache#fetch_multi returns a Hash instead of an Array commit c046e60 refs/heads/master Author: Parker Selbert Date: 2013-07-17 13:59:15 -0500 Return a hash rather than array from fetch_multi The current implementation of `fetch_multi` returns an array and has no means to easily backtrack which names yielded which results. By changing the return value to a Hash we retain the name information. Hash#values can be used on the response if only the values are needed. M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache.rb M activesupport/test/caching_test.rb commit 7c92e0b refs/heads/master Merge: 34c74f8 90d887d Author: Arthur Nogueira Neves Date: 2014-02-26 19:47:40 -0500 Merge pull request #14216 from garethson/routes-docs-typo [skip ci] Fixes docs typo in nested resource path helpers commit 34c74f8 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-02-26 21:45:54 -0300 Fix concerning module reference [ci skip] M activesupport/lib/active_support/core_ext/kernel/concern.rb commit 90d887d refs/heads/master Author: Gareth du Plooy Date: 2014-02-26 18:22:29 -0600 Fixes docs typo in nested resource path helpers [skip ci] M guides/source/routing.md commit bdf9141 refs/tags/v4.1.0.rc2 Author: Eric Hutzelman Date: 2014-02-20 19:17:48 -0600 Fix some validators when used on model instance Now that Validator #setup is called from the initializer, we need a reference to the model's class to be passed in to allow the validators to continue functioning when used at the instance level. Closes #14134. M activemodel/lib/active_model/validations/with.rb M activemodel/test/cases/validations_test.rb M activemodel/test/models/automobile.rb commit 86aeab3 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-26 15:48:49 -0800 Merge pull request #14105 from twooster/fix-controller-tests Fix controller test not resetting @_url_options Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/testing.rb M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/test_case_test.rb commit 088c116 refs/heads/master Author: Eric Hutzelman Date: 2014-02-20 19:17:48 -0600 Fix some validators when used on model instance Now that Validator #setup is called from the initializer, we need a reference to the model's class to be passed in to allow the validators to continue functioning when used at the instance level. Closes #14134. M activemodel/lib/active_model/validations/with.rb M activemodel/test/cases/validations_test.rb M activemodel/test/models/automobile.rb commit c20fe91 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-02-26 21:20:33 -0300 Pass strings to demodulize method Goes along with fea1cdcff4d50d302d8e8532432c3ab107ff816d and 59ec4562a2e70df455b2e44a67c340fa5254e26e. M activemodel/lib/active_model/conversion.rb commit 8d8ea78 refs/heads/master Merge: 59ec456 a351149 Author: Aaron Patterson Date: 2014-02-26 15:48:49 -0800 Merge pull request #14105 from twooster/fix-controller-tests Fix controller test not resetting @_url_options commit 59ec456 refs/heads/master Author: Aaron Patterson Date: 2014-02-26 15:43:20 -0800 pass strings to the underscore method M railties/lib/rails/engine.rb M railties/lib/rails/railtie.rb commit 707dfcd refs/heads/master Author: Aaron Patterson Date: 2014-02-26 15:09:18 -0800 speed up `underscore` in cases that don't need to do anything Benchmark: Benchmark.ips do |x| x.report("home") { "home".underscore } x.report("Home") { "Home".underscore } x.report("homeBase") { "homeBase".underscore } x.report("home::base") { "home::base".underscore } end Before: Calculating ------------------------------------- home 2598 i/100ms Home 2463 i/100ms homeBase 2300 i/100ms home::base 2086 i/100ms ------------------------------------------------- home 28522.3 (±14.7%) i/s - 140292 in 5.065102s Home 29165.8 (±14.9%) i/s - 140391 in 5.000475s homeBase 26218.5 (±7.1%) i/s - 131100 in 5.030485s home::base 27712.3 (±5.9%) i/s - 139762 in 5.064077s After: Calculating ------------------------------------- home 23163 i/100ms Home 2432 i/100ms homeBase 2160 i/100ms home::base 2265 i/100ms ------------------------------------------------- home 1501614.8 (±10.2%) i/s - 7412160 in 5.009540s Home 28754.0 (±8.5%) i/s - 143488 in 5.033886s homeBase 25331.1 (±5.6%) i/s - 127440 in 5.047940s home::base 27089.9 (±5.5%) i/s - 135900 in 5.033516s M activesupport/lib/active_support/inflector/methods.rb commit fea1cdc refs/heads/master Author: Aaron Patterson Date: 2014-02-26 15:02:57 -0800 pass the class name to `tableize` We should not rely on to_s to return the name of the class M activemodel/lib/active_model/conversion.rb commit 982091e refs/heads/master Merge: 3225898 7d357b2 Author: Guillermo Iguaran Date: 2014-02-26 17:08:50 -0500 Merge pull request #14215 from robertomiranda/docs-rake-notes [ci skip] Update list of files extensions in rake notes guide commit 7d357b2 refs/heads/master Author: robertomiranda Date: 2014-02-26 17:01:43 -0500 [ci skip] Update list of files extensions in rake notes guide M guides/source/command_line.md commit 6b927b8 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-17 00:10:25 -0200 Remove warnings on Ruby 2.1 Conflicts: activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/lib/active_support/ordered_hash.rb commit fc2641d refs/remotes/origin/4-0-stable Author: Albert Llop Date: 2013-05-23 15:26:00 +0200 HashWithIndifferentAccess#select working as intended Before this commit, #reject returned a HashWithIndifferentAccess, whereas #select returned a Hash. Now #select also returns a HashWithIndifferentAccess. M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit a351149 refs/heads/master Author: Tony Wooster Date: 2014-02-18 14:12:11 -0800 Fix controller test not resetting @_url_options Commit 4f2cd3e9 introduced a bug by reordering the call to `@controller.recycle!` above the call to `build_request_uri`. The impact of this was that the `@_url_options` cache ends up not being reset between building a request URI (occurring within the test controller) and the firing of the actual request. We encountered this bug because we had the following setup: class MinimumReproducibleController < ActionController::Base before_filter { @param = 'param' } def index render text: url_for(params) end def default_url_options { custom_opt: @param } end end def test_index get :index # builds url, then fires actual request end The first step in `get :index` in the test suite would populate the @_url_options cache. The subsequent call to `url_for` inside of the controller action would then utilize the uncleared cache, thus never calling the now-updated default_url_options. This commit fixes this bug calling recycle! twice, and removes a call to set response_body, which should no longer be needed since we're recycling the request object explicitly. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/testing.rb M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/test_case_test.rb commit bf3ddfa refs/heads/master Merge: e5e440f 3225898 Author: Aaron Patterson Date: 2014-02-26 10:14:40 -0800 Merge branch 'master' into adequaterecord * master: (55 commits) [ci skip] Move association class method notes extract common code in `uuid_test.rb`. move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`. [ci skip] remove guide section on models in migrations test case for custom PostgreSQL enum type. Remove inclusion of rubysl gem for rbx on generated Gemfile let `insert_record` actuall save the object. [skip ci] Fix test name typo in app generator tests. travis s/2.1.0/2.1.1 Bump version of bcrypt gem Skip test_migrate_revert_add_index_with_name if databases do not allow to create duplicate indexes on the same columns Optimize getting started guide images, and use png instead of jpg :scissors: [ci skip] Point master changelogs to 4-1-stable branch Add missing parantheses in index_exists? `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191. [skip ci] Standardized punctuation. [skip ci] Fix typo in link_to :method option description refactor, with_locale is not needed because I18n is mocked. Fix ActionView label translation for more than 10 nested elements ... commit 5b74b23 refs/remotes/origin/4-0-stable Author: Guillermo Iguaran Date: 2014-02-25 16:09:18 -0500 Merge pull request #14199 from arthurnn/travis_211 travis s/2.1.0/2.1.1 Conflicts: .travis.yml M .travis.yml commit 3225898 refs/heads/master Merge: 671e997 3a707e2 Author: Xavier Noria Date: 2014-02-26 09:28:27 -0800 Merge pull request #14211 from loganhasson/master [ci skip] Move association class method notes commit 3a707e2 refs/heads/master Author: Logan Hasson Date: 2014-02-26 11:27:04 -0500 [ci skip] Move association class method notes Make explanation of association class methods clearer by moving notes to beginning of each example section. M activerecord/lib/active_record/associations.rb commit 772afef refs/remotes/origin/4-0-stable Merge: d91d946 085372e Author: Carlos Antonio da Silva Date: 2014-02-26 13:58:51 -0300 Merge pull request #14210 from tjschuck/bcrypt_gem_rename_4-0-stable Bump version of bcrypt gem in 4-0-stable commit 085372e refs/remotes/origin/4-0-stable Author: T.J. Schuck Date: 2014-02-21 15:58:09 -0500 Bump version of bcrypt gem M Gemfile M activemodel/lib/active_model/secure_password.rb M guides/code/getting_started/Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile commit 671e997 refs/heads/master Author: Yves Senn Date: 2014-02-26 16:04:37 +0100 extract common code in `uuid_test.rb`. M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit 50be1d0 refs/heads/master Author: Yves Senn Date: 2014-02-26 15:56:11 +0100 move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`. M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit fc61bca refs/heads/master Author: Robin Dupret Date: 2014-02-25 14:57:23 +0100 Avoid namespacing routes inside engines Since #11544, invoking the controller generator, any generated route is namespaced according to the class_path method. Since a mountable plugin is namespaced, creating a controller inside would generate a namespaced route based on the engine's name. The controller generator now relies on regular_class_path which does not contain the class hierarchy but the given path. Fixes #14079. M railties/CHANGELOG.md M railties/lib/rails/generators/rails/controller/controller_generator.rb M railties/test/generators/plugin_generator_test.rb commit be97499 refs/heads/master Merge: cfb2238 a2d8041 Author: Xavier Noria Date: 2014-02-26 06:43:40 -0800 Merge pull request #14208 from lukesteensen/remove-migration-example [ci skip] remove guide section on models in migrations [ci skip] commit a2d8041 refs/heads/master Author: Luke Steensen Date: 2014-02-26 08:35:06 -0600 [ci skip] remove guide section on models in migrations Both examples given are incorrect, and no one can seem to come up with a realistic situation where this is an actual problem. For now, it seems like the best thing to do is just scrap the section altogether. M guides/source/migrations.md commit cfb2238 refs/heads/master Author: Yves Senn Date: 2014-02-11 14:41:11 +0100 test case for custom PostgreSQL enum type. This test currently outputs the following warning: ``` unknown OID: current_mood(3567879) (SELECT "postgresql_enums".* FROM "postgresql_enums" ORDER BY "postgresql_enums"."id" ASC LIMIT 1) unknown OID: current_mood(3567879) (SELECT "postgresql_enums".* FROM "postgresql_enums" WHERE "postgresql_enums"."id" = $1 LIMIT 1) ``` We have an open PR to deal with this issue. It will dynamically register the OID for enum columns. This test case is merely to exhibit the current behavior of PostgreSQL enum columns. A activerecord/test/cases/adapters/postgresql/enum_test.rb commit 3bdf7b8 refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-02-26 08:11:50 -0300 Merge pull request #14149 from tjschuck/bcrypt_gem_rename Bump version of bcrypt gem M Gemfile M activemodel/lib/active_model/secure_password.rb M guides/code/getting_started/Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile commit 89b4b51 refs/heads/master Merge: 1d298bd 53f1ab5 Author: Carlos Antonio da Silva Date: 2014-02-26 08:11:50 -0300 Merge pull request #14149 from tjschuck/bcrypt_gem_rename Bump version of bcrypt gem commit b6c713f refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-02-25 21:46:55 -0300 Remove inclusion of rubysl gem for rbx on generated Gemfile From #14026: Specific rbx-2 to limit testing on Rubinius 2.x (since there will be other versions of Rubinius > 2.x soon). Also, as of Rubinius 2.2.5, it is no longer necessary to bundle the rubysl gem. This is what Rails master/4.1 supports, so we don't need to add rubysl to gemfiles anymore. Conflicts: railties/test/generators/app_generator_test.rb M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit 1d298bd refs/heads/master Author: Carlos Antonio da Silva Date: 2014-02-25 21:46:55 -0300 Remove inclusion of rubysl gem for rbx on generated Gemfile From #14026: Specific rbx-2 to limit testing on Rubinius 2.x (since there will be other versions of Rubinius > 2.x soon). Also, as of Rubinius 2.2.5, it is no longer necessary to bundle the rubysl gem. This is what Rails master/4.1 supports, so we don't need to add rubysl to gemfiles anymore. M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit 759c99b refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-25 14:57:06 -0800 let `insert_record` actuall save the object. `before_add` callbacks are fired before the record is saved on `has_and_belongs_to_many` assocations *and* on `has_many :through` associations. Before this change, `before_add` callbacks would be fired before the record was saved on `has_and_belongs_to_many` associations, but *not* on `has_many :through` associations. Fixes #14144 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/callbacks_test.rb commit b1656fa refs/heads/master Author: Aaron Patterson Date: 2014-02-25 14:57:06 -0800 let `insert_record` actuall save the object. `before_add` callbacks are fired before the record is saved on `has_and_belongs_to_many` assocations *and* on `has_many :through` associations. Before this change, `before_add` callbacks would be fired before the record was saved on `has_and_belongs_to_many` associations, but *not* on `has_many :through` associations. Fixes #14144 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/callbacks_test.rb commit 7b98746 refs/tags/v4.1.0.rc2 Author: Godfrey Chan Date: 2014-02-13 11:49:19 -0800 Fixed STI classes not defining an attribute method if there is a conflicting private method defined on its ancestors. The problem is that `method_defined_within?(name, klass, superklass)` only works correclty when `klass` and `superklass` are both `Class`es. If both `klass` and `superklass` are both `Class`es, they share the same inheritance chain, so if a method is defined on `klass` but not `superklass`, this method must be introduced at some point between `klass` and `superklass`. This does not work when `superklass` is a `Module`. A `Module`'s inheritance chain contains just itself. So if a method is defined on `klass` but not on `superklass`, the method could still be defined somewhere upstream, e.g. in `Object`. This fix works by avoiding calling `method_defined_within?` with a module while still fufilling the requirement (checking that the method is defined withing `superclass` but not is not a generated attribute method). 4d8ee288 is likely an attempted partial fix for this problem. This unrolls that fix and properly check the `superclass` as intended. Fixes #11569. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/fixtures/computers.yml M activerecord/test/schema/schema.rb commit d91d946 refs/remotes/origin/4-0-stable Author: Godfrey Chan Date: 2014-02-13 11:49:19 -0800 Fixed STI classes not defining an attribute method if there is a conflicting private method defined on its ancestors. The problem is that `method_defined_within?(name, klass, superklass)` only works correclty when `klass` and `superklass` are both `Class`es. If both `klass` and `superklass` are both `Class`es, they share the same inheritance chain, so if a method is defined on `klass` but not `superklass`, this method must be introduced at some point between `klass` and `superklass`. This does not work when `superklass` is a `Module`. A `Module`'s inheritance chain contains just itself. So if a method is defined on `klass` but not on `superklass`, the method could still be defined somewhere upstream, e.g. in `Object`. This fix works by avoiding calling `method_defined_within?` with a module while still fufilling the requirement (checking that the method is defined withing `superclass` but not is not a generated attribute method). 4d8ee288 is likely an attempted partial fix for this problem. This unrolls that fix and properly check the `superclass` as intended. Fixes #11569. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/attribute_methods_test.rb activerecord/test/schema/schema.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/fixtures/computers.yml M activerecord/test/schema/schema.rb commit 7c2ce04 refs/heads/master Merge: 90ba6a7 ad75539 Author: Carlos Antonio da Silva Date: 2014-02-25 19:26:41 -0300 Merge pull request #14200 from spencer1248/fix_typo_in_app_generator_test_name Fix test name typo in app generator tests. commit ad75539 refs/heads/master Author: Spencer Rogers Date: 2014-02-25 16:45:43 -0500 [skip ci] Fix test name typo in app generator tests. M railties/test/generators/app_generator_test.rb commit 90ba6a7 refs/heads/master Merge: 6e94140 4155431 Author: Jon Leighton Date: 2014-02-25 22:21:56 +0000 Merge remote-tracking branch 'chancancode/fix_instance_method_already_implemented' Conflicts: activerecord/CHANGELOG.md commit 42a1c30 refs/tags/v4.1.0.rc2 Author: Guillermo Iguaran Date: 2014-02-25 16:09:18 -0500 Merge pull request #14199 from arthurnn/travis_211 travis s/2.1.0/2.1.1 M .travis.yml commit 6e94140 refs/heads/master Merge: b189f28 a9a767b Author: Guillermo Iguaran Date: 2014-02-25 16:09:18 -0500 Merge pull request #14199 from arthurnn/travis_211 travis s/2.1.0/2.1.1 commit a9a767b refs/heads/master Author: Arthur Neves Date: 2014-02-25 16:08:21 -0500 travis s/2.1.0/2.1.1 M .travis.yml commit b189f28 refs/heads/master Merge: 6d35190 283a2ed Author: Aaron Patterson Date: 2014-02-25 08:34:16 -0800 Merge pull request #14152 from schneems/schneems/fix-ar-wtf-why-is-there-no-environment Handle missing environment from non empty config commit 53f1ab5 refs/heads/master Author: T.J. Schuck Date: 2014-02-21 15:58:09 -0500 Bump version of bcrypt gem M Gemfile M activemodel/lib/active_model/secure_password.rb M guides/code/getting_started/Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile commit 5a782db refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-25 14:14:45 +0100 Merge pull request #14177 from yahonda/skip_tests_if_duplicate_index_not_allowed Skip test_migrate_revert_add_index_with_name for some databases M activerecord/test/cases/invertible_migration_test.rb commit e3f0f17 refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-02-25 14:14:45 +0100 Merge pull request #14177 from yahonda/skip_tests_if_duplicate_index_not_allowed Skip test_migrate_revert_add_index_with_name for some databases M activerecord/test/cases/invertible_migration_test.rb commit 6d35190 refs/heads/master Merge: 7aa500d d64673c Author: Yves Senn Date: 2014-02-25 14:14:45 +0100 Merge pull request #14177 from yahonda/skip_tests_if_duplicate_index_not_allowed Skip test_migrate_revert_add_index_with_name for some databases commit 0831aa5 refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-02-25 09:37:21 -0300 Optimize getting started guide images, and use png instead of jpg We noticed the rails gem increased in size between the beta and rc versions, and the reason is that some guides images were updated but not properly optimized, and one image changed from png to jpg, way bigger. Converting the jpg image back to png, and using ImageOptim to optimize all the images for web view, improves the situation [ci skip]. --- In current master/4-1-stable: 508K guides/assets/images/getting_started/ In v4.1.0.beta1: 268K guides/assets/images/getting_started/ In 4-0-stable 328K guides/assets/images/getting_started/ After the patch: 260K guides/assets/images/getting_started/ M guides/assets/images/getting_started/article_with_comments.png M guides/assets/images/getting_started/challenge.png M guides/assets/images/getting_started/confirm_dialog.png M guides/assets/images/getting_started/forbidden_attributes_for_new_article.png M guides/assets/images/getting_started/form_with_errors.png M guides/assets/images/getting_started/index_action_with_edit_link.png M guides/assets/images/getting_started/new_article.png D guides/assets/images/getting_started/rails_welcome.jpg A guides/assets/images/getting_started/rails_welcome.png M guides/assets/images/getting_started/routing_error_no_controller.png M guides/assets/images/getting_started/routing_error_no_route_matches.png M guides/assets/images/getting_started/show_action_for_articles.png M guides/assets/images/getting_started/template_is_missing_articles_new.png M guides/assets/images/getting_started/unknown_action_create_for_articles.png M guides/assets/images/getting_started/unknown_action_new_for_articles.png M guides/source/getting_started.md commit 000f41c refs/tags/v4.1.0.rc2 Author: Vijay Dev Date: 2014-02-25 17:48:15 +0530 Merge pull request #14193 from ys/patch-1 Add missing parantheses in index_exists? M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit d64673c refs/heads/master Author: Yasuo Honda Date: 2014-02-24 22:33:43 +0900 Skip test_migrate_revert_add_index_with_name if databases do not allow to create duplicate indexes on the same columns M activerecord/test/cases/invertible_migration_test.rb commit 7aa500d refs/heads/master Author: Carlos Antonio da Silva Date: 2014-02-25 09:37:21 -0300 Optimize getting started guide images, and use png instead of jpg We noticed the rails gem increased in size between the beta and rc versions, and the reason is that some guides images were updated but not properly optimized, and one image changed from png to jpg, way bigger. Converting the jpg image back to png, and using ImageOptim to optimize all the images for web view, improves the situation [ci skip]. --- In current master/4-1-stable: 508K guides/assets/images/getting_started/ In v4.1.0.beta1: 268K guides/assets/images/getting_started/ In 4-0-stable 328K guides/assets/images/getting_started/ After the patch: 260K guides/assets/images/getting_started/ M guides/assets/images/getting_started/article_with_comments.png M guides/assets/images/getting_started/challenge.png M guides/assets/images/getting_started/confirm_dialog.png M guides/assets/images/getting_started/forbidden_attributes_for_new_article.png M guides/assets/images/getting_started/form_with_errors.png M guides/assets/images/getting_started/index_action_with_edit_link.png M guides/assets/images/getting_started/new_article.png D guides/assets/images/getting_started/rails_welcome.jpg A guides/assets/images/getting_started/rails_welcome.png M guides/assets/images/getting_started/routing_error_no_controller.png M guides/assets/images/getting_started/routing_error_no_route_matches.png M guides/assets/images/getting_started/show_action_for_articles.png M guides/assets/images/getting_started/template_is_missing_articles_new.png M guides/assets/images/getting_started/unknown_action_create_for_articles.png M guides/assets/images/getting_started/unknown_action_new_for_articles.png M guides/source/getting_started.md commit c023a6f refs/heads/master Author: Carlos Antonio da Silva Date: 2014-02-25 09:20:15 -0300 :scissors: [ci skip] M guides/source/getting_started.md commit c55f339 refs/heads/master Merge: 71b3910 be37b0c Author: Vijay Dev Date: 2014-02-25 17:48:15 +0530 Merge pull request #14193 from ys/patch-1 Add missing parantheses in index_exists? commit 71b3910 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-02-25 09:14:35 -0300 Point master changelogs to 4-1-stable branch Remove 4-1 related entries from master [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M actionview/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/CHANGELOG.md M railties/CHANGELOG.md commit be37b0c refs/heads/master Author: Yannick Schutz Date: 2014-02-25 13:09:26 +0100 Add missing parantheses in index_exists? M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit c16a8ab refs/tags/v4.1.0.rc2 Author: Arthur Nogueira Neves Date: 2014-02-20 14:41:41 -0500 Merge pull request #14131 from kuldeepaggarwal/upgrade-rails-version update guides to new version of rails 3.2.x, i.e. 3.2.17 [skip ci] M guides/source/upgrading_ruby_on_rails.md commit c77337c refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-02-20 10:16:25 -0300 Merge pull request #14120 from gregmolnar/guides change 'assert !' to 'assert_not' in guides [ci skip] M guides/source/testing.md commit 980cdd3 refs/tags/v4.1.0.rc2 Author: Guillermo Iguaran Date: 2014-02-18 15:18:37 -0500 Fix render plain docs example in AM::Base The errors were introduced in e220a34e39 M actionmailer/lib/action_mailer/base.rb commit 698389d refs/tags/v4.1.0.rc2 Author: Guillermo Iguaran Date: 2014-02-18 15:11:33 -0500 Merge pull request #14099 from robertomiranda/render-text-2-plain Update Docs in favor to use render plain instead of text option M actionmailer/lib/action_mailer/base.rb M actionpack/lib/action_controller/base.rb M actionpack/lib/action_controller/metal/data_streaming.rb M actionpack/lib/action_controller/metal/http_authentication.rb commit babbdde refs/tags/v4.1.0.rc2 Author: Arthur Nogueira Neves Date: 2014-02-18 14:33:25 -0500 Merge pull request #14098 from Amit-Thawait/master Typo fix for unscope [ci skip] M activerecord/CHANGELOG.md M guides/source/upgrading_ruby_on_rails.md commit 5772ffe refs/remotes/origin/4-0-stable Author: Arthur Nogueira Neves Date: 2014-02-24 14:20:07 -0500 Merge pull request #14182 from mecampbellsoup/fix_typo_in_url_helper_docs [skip ci] Fixing typo in documentation: actionview/lib/action_view/helpers/url_helper.rb M actionpack/lib/action_view/helpers/url_helper.rb commit 433ad33 refs/tags/v4.1.0.rc2 Author: Arthur Nogueira Neves Date: 2014-02-24 14:20:07 -0500 Merge pull request #14182 from mecampbellsoup/fix_typo_in_url_helper_docs [skip ci] Fixing typo in documentation: actionview/lib/action_view/helpers/url_helper.rb M actionview/lib/action_view/helpers/url_helper.rb commit bbe81ee refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-02-25 11:18:54 +0100 `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191. See 449039a86d802871b707dfb51ac1ed96d53526f9 for the original commit. M actionpack/lib/action_dispatch.rb commit 9f76b1f refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-25 11:18:54 +0100 `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191. See 449039a86d802871b707dfb51ac1ed96d53526f9 for the original commit. M actionpack/lib/action_dispatch.rb commit 06f815e refs/heads/master Author: Yves Senn Date: 2014-02-25 11:18:54 +0100 `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191. See 449039a86d802871b707dfb51ac1ed96d53526f9 for the original commit. M actionpack/lib/action_dispatch.rb commit fcf4a0d refs/heads/master Merge: 418d1e5 88cfeca Author: Xavier Noria Date: 2014-02-25 09:00:50 +0100 Merge pull request #14006 from Loremaster/strong_params_improvement Sungularize ActionController::UnpermittedParameters error in case when only 1 parameter is unpermitted. commit 418d1e5 refs/heads/master Merge: 82158ae ac85125 Author: Yves Senn Date: 2014-02-25 08:40:43 +0100 Merge pull request #14186 from ch33hau/standardized-punctuation Standardized punctuation. commit ac85125 refs/heads/master Author: ch33hau Date: 2014-02-25 11:04:08 +0800 [skip ci] Standardized punctuation. M guides/source/plugins.md commit 417ee00 refs/tags/v4.1.0.rc2 Merge: 11e00f1 b2d19a5 Author: Guillermo Iguaran Date: 2014-02-24 14:28:22 -0500 Merge pull request #14179 from arthurnn/14171_backport [backport] Extract local cache middleware commit 82158ae refs/heads/master Merge: 947b3cb 44c5813 Author: Arthur Nogueira Neves Date: 2014-02-24 14:20:07 -0500 Merge pull request #14182 from mecampbellsoup/fix_typo_in_url_helper_docs [skip ci] Fixing typo in documentation: actionview/lib/action_view/helpers/url_helper.rb commit 44c5813 refs/heads/master Author: Matt Campbell Date: 2014-02-24 14:03:43 -0500 [skip ci] Fix typo in link_to :method option description M actionview/lib/action_view/helpers/url_helper.rb commit 11e00f1 refs/tags/v4.1.0.rc2 Author: Yves Senn Date: 2014-02-24 19:25:02 +0100 Merge pull request #14170 from kritik/master there could be more than 10 nested records M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/tags/label.rb M actionview/test/template/form_helper_test.rb commit 947b3cb refs/heads/master Author: Yves Senn Date: 2014-02-24 19:31:23 +0100 refactor, with_locale is not needed because I18n is mocked. This is a follow up to #14170. While backporting I recognized that this call is not needed at all. M actionview/test/template/form_helper_test.rb commit 25dd7c9 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-24 19:25:02 +0100 Merge pull request #14170 from kritik/master there could be more than 10 nested records Conflicts: actionview/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/tags/label.rb M actionpack/test/template/form_helper_test.rb commit f2577ca refs/heads/master Merge: d61baee 2cbc8c4 Author: Yves Senn Date: 2014-02-24 19:25:02 +0100 Merge pull request #14170 from kritik/master there could be more than 10 nested records commit 2cbc8c4 refs/heads/master Author: Vladimir Krylov Date: 2014-02-24 17:06:57 +0200 Fix ActionView label translation for more than 10 nested elements M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/tags/label.rb M actionview/test/template/form_helper_test.rb commit b2d19a5 refs/tags/v4.1.0.rc2 Author: Arthur Neves Date: 2014-02-23 14:17:15 -0500 Extract local cache middleware Extract LocalCache Middleware, so it can requires rack dependencies, without adding rack dependencies to `AS::Cache::Strategy::LocalCache`. M activesupport/lib/active_support/cache/strategy/local_cache.rb A activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb commit d61baee refs/heads/master Author: David Heinemeier Hansson Date: 2014-02-24 12:32:16 +0100 Go with #presence_in instead of #present_in -- it doesnt sound quite as good, but the closer relationship to #presence over #present is ultimately worth it M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/inclusion.rb M activesupport/test/core_ext/object/inclusion_test.rb commit 876e893 refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-02-24 12:33:15 +0100 Wups, committed the Gemfile change by mistake M Gemfile commit c4bc2df refs/tags/v4.1.0.rc2 Author: David Heinemeier Hansson Date: 2014-02-24 12:32:16 +0100 Go with #presence_in instead of #present_in -- it doesnt sound quite as good, but the closer relationship to #presence over #present is ultimately worth it M Gemfile M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/inclusion.rb M activesupport/test/core_ext/object/inclusion_test.rb commit 64bbc9e refs/remotes/origin/4-0-stable Author: Arthur Neves Date: 2014-02-19 11:43:25 -0500 Methods silence_stream/quietly are not thread-safe [skip ci] State that on the doc. [fixes #11954] M activesupport/lib/active_support/core_ext/kernel/reporting.rb commit 3007c29 refs/heads/master Author: Yves Senn Date: 2014-02-24 10:28:48 +0100 refactor, extract `with_locale` helper. M actionview/test/template/form_helper_test.rb commit 88cfeca refs/heads/master Author: Serj L Date: 2014-02-24 13:25:38 +0400 Simple Sungularize ActionController::UnpermittedParameters error in case when only 1 parameter is unpermitted. M actionpack/lib/action_controller/log_subscriber.rb M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb commit b5c6c31 refs/heads/master Author: Yves Senn Date: 2014-02-24 10:09:56 +0100 build fix. follow up to 174c9f0df39cd338a4871f82794256cc64f68a81 M railties/test/generators/resource_generator_test.rb commit 174c9f0 refs/heads/master Author: Yves Senn Date: 2014-02-24 09:43:30 +0100 include names in model generator warning message. refs #13515. This is a follow up to #13515. It includes the name given and the singularized version in the warning message. This will aide the user to see wether the detected singular was right or not. M railties/lib/rails/generators/model_helpers.rb M railties/test/generators/model_generator_test.rb commit 0e144be refs/heads/master Merge: 4d24c15 d9314b4 Author: Yves Senn Date: 2014-02-24 08:26:49 +0100 Merge pull request #10497 from senny/10485_does_not_coerce_strings coerce strings when reading attributes commit 4d24c15 refs/heads/master Merge: 2403869 cb172db Author: Guillermo Iguaran Date: 2014-02-23 22:19:54 -0500 Merge pull request #14171 from arthurnn/extract_middleware_cache Extract local cache middleware commit 2403869 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-02-23 22:45:16 -0300 Group assets options in production env template M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 25a0572 refs/tags/v4.1.0.rc2 Author: Jon Leighton Date: 2014-02-23 11:14:05 +0000 Add tests for default scope behaviour change See #13875 M activerecord/test/cases/scoping/default_scoping_test.rb M activerecord/test/models/developer.rb commit cb172db refs/heads/master Author: Arthur Neves Date: 2014-02-23 14:17:15 -0500 Extract local cache middleware Extract LocalCache Middleware, so it can requires rack dependencies, without adding rack dependencies to `AS::Cache::Strategy::LocalCache`. M activesupport/lib/active_support/cache/strategy/local_cache.rb A activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb commit b16c36e refs/heads/master Author: Jeremy Kemper Date: 2014-02-23 12:06:18 -0700 Introduce Concern#class_methods and Kernel#concern M activesupport/CHANGELOG.md M activesupport/lib/active_support/concern.rb M activesupport/lib/active_support/core_ext/kernel.rb A activesupport/lib/active_support/core_ext/kernel/concern.rb M activesupport/test/concern_test.rb A activesupport/test/core_ext/kernel/concern_test.rb M activesupport/test/core_ext/module/concerning_test.rb commit 4155431 refs/heads/master Author: Godfrey Chan Date: 2014-02-13 11:49:19 -0800 Fixed STI classes not defining an attribute method if there is a conflicting private method defined on its ancestors. The problem is that `method_defined_within?(name, klass, superklass)` only works correclty when `klass` and `superklass` are both `Class`es. If both `klass` and `superklass` are both `Class`es, they share the same inheritance chain, so if a method is defined on `klass` but not `superklass`, this method must be introduced at some point between `klass` and `superklass`. This does not work when `superklass` is a `Module`. A `Module`'s inheritance chain contains just itself. So if a method is defined on `klass` but not on `superklass`, the method could still be defined somewhere upstream, e.g. in `Object`. This fix works by avoiding calling `method_defined_within?` with a module while still fufilling the requirement (checking that the method is defined withing `superclass` but not is not a generated attribute method). 4d8ee288 is likely an attempted partial fix for this problem. This unrolls that fix and properly check the `superclass` as intended. Fixes #11569. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/fixtures/computers.yml M activerecord/test/schema/schema.rb commit d9314b4 refs/heads/master Author: Yves Senn Date: 2013-08-07 18:56:49 +0200 Coerce strings when reading attributes. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/attribute_methods_test.rb commit e8458d0 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2013-11-22 13:58:15 -0800 Merge pull request #12774 from exAspArk/fix_uniqueness_on_relation Fix validation on uniqueness Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb commit 96759cf refs/heads/master Merge: c554d17 91949e4 Author: Yves Senn Date: 2014-02-23 13:18:06 +0100 Merge pull request #13793 from senny/postgres/dynamic_range_oid Dynamically define PostgreSQL Range OIDs commit c554d17 refs/heads/master Author: Yves Senn Date: 2014-02-23 13:14:43 +0100 update version to 4.2.0.alpha M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M actionview/lib/action_view/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 91949e4 refs/heads/master Author: Yves Senn Date: 2014-01-22 14:20:01 +0100 deprecate support for pg ranges with excluding beginnings. The Ruby Range object does not support excluding beginnings. We currently support excluding beginnings for some subtypes using manually by incrementing them (now using the `#succ` method). This is approach is flawed as it's not equal to an excluding beginning. This commit deprecates the current support for excluding beginnings. It also raises an `ArgumentError` for subtypes that do not implement the `succ` method. This is a temporary solution to get rid of the broken state. We might still add complete support for excluding beginnings afterwards. (Probably with a new `PGRange` object, which acts like a `Range` but has excluding beginnings. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit 4cb4716 refs/heads/master Author: Yves Senn Date: 2014-01-21 12:14:11 +0100 dynamically define PostgreSQL OID range types. This gets AR working with custom defined range types. It also removes the need for subtype specific branches in `OID::Range`. This expands the interface of all `OID` types with the `infinity` method. It's responsible to provide a value for positive and negative infinity. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/range_test.rb commit 40a9d89 refs/heads/master Author: Jon Leighton Date: 2014-02-23 11:14:05 +0000 Add tests for default scope behaviour change See #13875 M activerecord/test/cases/scoping/default_scoping_test.rb M activerecord/test/models/developer.rb commit f302079 refs/heads/master Author: Zachary Scott Date: 2014-02-23 20:19:15 +1100 :scissors: This commit also addresses rails/docrails#169 and rails/rails#14159 M actionmailer/README.rdoc M actionmailer/lib/action_mailer/base.rb M actionpack/lib/action_dispatch/middleware/cookies.rb commit f8dcc48 refs/heads/master Merge: 624f855 de8bef9 Author: Godfrey Chan Date: 2014-02-22 23:44:08 -0800 Merge pull request #13515 from kuldeepaggarwal/f-model-generation Added warning when user tried to create model with pluralize name. commit de8bef9 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-02-23 13:10:41 +0530 Add warning when user tried to create model with pluralize name. 1. Generate model with correct_name. 2. It will help new users to avoid mistakes when tried to create model with wrong name. A railties/lib/rails/generators/model_helpers.rb M railties/lib/rails/generators/rails/model/model_generator.rb M railties/lib/rails/generators/resource_helpers.rb M railties/test/generators/model_generator_test.rb M railties/test/generators/resource_generator_test.rb commit b91d761 refs/heads/master Author: Gaurish Sharma Date: 2014-02-23 12:35:53 +0530 Tweak Configuring Guide language the fact that Rails is multi-thread by default is not very relevant. see https://github.com/rails/rails/pull/13998 [ci skip] M guides/source/configuring.md commit 624f855 refs/heads/master Merge: 58ba48e 5ea67a2 Author: Guillermo Iguaran Date: 2014-02-22 23:45:40 -0500 Merge pull request #14164 from vajrasky/fix_typo_max_id Fixed typo in comment about MAX_ID. commit 5ea67a2 refs/heads/master Author: Vajrasky Kok Date: 2014-02-23 12:17:44 +0800 Fixed typo in comment about MAX_ID. M activerecord/lib/active_record/fixtures.rb commit 4b95405 refs/heads/master Author: Mikhail Dieterle Date: 2014-02-22 21:57:11 +0300 typos fixes M guides/source/4_1_release_notes.md commit 58ba48e refs/heads/master Author: Jeremy Kemper Date: 2014-02-22 09:18:53 -0700 Distinguish ConnectionNotEstablished messages: no conn pool for the class, or no conn available from the pool M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit 70a5e56 refs/heads/master Author: Matt Jones Date: 2014-02-21 17:58:40 -0500 Pass a base relation to build_default_scope when joining This allows the default scope to be built using the current table alias. Resolves #12770 M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/scoping/default.rb M activerecord/test/cases/associations/inner_join_association_test.rb M activerecord/test/models/category.rb commit 283a2ed refs/heads/master Author: schneems Date: 2014-02-21 16:04:21 -0600 Handle missing environment from non empty config If using a `DATABASE_URL` and a `database.yml`. The connection information in `DATABASE_URL` should be merged into whatever environment we are in. As released in 4.1.0rc1 if someone has a database.yml but is missing a key like production: ```yml development: host: localhost ``` Then the check for blank config will return false so the information from the `DATABASE_URL` will not be used when attempting to connect to the `production` database and the connection will incorrectly fail. This commit fixes this problem and adds a test for the behavior. In addition the ability to specify a connection url in a `database.yml` like this: ``` production: postgres://localhost/foo ``` Was introduced in 4.1.0rc1 though should not be used, instead using a url sub key ``` production: url: postgres://localhost/foo ``` This url sub key was also introduced in 4.1.0rc1 though the `production: postgres://localhost/foo` was not removed. As a result we should not test this behavior. M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit f214896 refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2014-02-21 12:35:56 -0300 Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_for Prevent foreign_key_for? from evaluating all attributes M activerecord/lib/active_record/associations/association.rb commit 2fdbddd refs/tags/v4.1.0.rc2 Author: Carlos Antonio da Silva Date: 2014-02-21 12:35:56 -0300 Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_for Prevent foreign_key_for? from evaluating all attributes M activerecord/lib/active_record/associations/association.rb commit 467cb90 refs/heads/master Merge: b1867c8 dbf9ec0 Author: Carlos Antonio da Silva Date: 2014-02-21 12:35:56 -0300 Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_for Prevent foreign_key_for? from evaluating all attributes commit 20f475c refs/remotes/origin/4-0-stable Author: Guillermo Iguaran Date: 2014-02-21 10:14:13 -0500 Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665." This reverts commit e2b2539468e2f0109ca309ed9ade53edbcc156a2. Conflicts: railties/CHANGELOG.md We expect loggers to quack like stdlib logger. If log4r needs different level= assignment, using a Logger-quacking wrapper is the way to do it. Fixes #14114. M railties/CHANGELOG.md M railties/lib/rails/application/bootstrap.rb M railties/test/application/configuration_test.rb commit d094d7e refs/tags/v4.1.0.rc2 Author: Guillermo Iguaran Date: 2014-02-21 09:50:19 -0500 Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665." This reverts commit e0a521cfcd13e4d1f0ae8ab96004289e1c020f71. Conflicts: railties/CHANGELOG.md We expect loggers to quack like stdlib logger. If log4r needs different level= assignment, using a Logger-quacking wrapper is the way to do it. Fixes #14114. M railties/CHANGELOG.md M railties/lib/rails/application/bootstrap.rb M railties/test/application/configuration_test.rb commit b1867c8 refs/heads/master Author: Guillermo Iguaran Date: 2014-02-21 09:50:19 -0500 Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665." This reverts commit e0a521cfcd13e4d1f0ae8ab96004289e1c020f71. Conflicts: railties/CHANGELOG.md We expect loggers to quack like stdlib logger. If log4r needs different level= assignment, using a Logger-quacking wrapper is the way to do it. Fixes #14114. M railties/CHANGELOG.md M railties/lib/rails/application/bootstrap.rb M railties/test/application/configuration_test.rb commit dbf9ec0 refs/heads/master Author: Wojtek Kruszewski Date: 2014-02-21 14:47:39 +0100 Prevent foreign_key_for? from type casting all attributes M activerecord/lib/active_record/associations/association.rb commit ba68e75 refs/remotes/origin/4-0-stable Author: Xavier Noria Date: 2014-02-20 23:37:05 +0100 releasing Rails no longer needs triggering docs generation by hand [ci skip] GitHub is now able to notify tag creation, I have configured the webhook for the docs server to receive that event. Therefore, we no longer need to trigger docs generation manually when releasing. M RELEASING_RAILS.rdoc M Rakefile commit 5b8f95f refs/tags/v4.1.0.rc2 Author: Xavier Noria Date: 2014-02-20 23:35:44 +0100 releasing Rails no longer needs triggering docs generation by hand [ci skip] GitHub is now able to notify tag creation, I have configured the webhook for the docs server to receive that event. Therefore, we no longer need to trigger docs generation manually when releasing. M RELEASING_RAILS.rdoc M Rakefile commit c93c558 refs/heads/master Author: Xavier Noria Date: 2014-02-20 23:32:36 +0100 releasing Rails no longer needs triggering docs generation by hand [ci skip] GitHub is now able to notify tag creation, I have configured the webhook for the docs server to receive that event. Therefore, we no longer need to trigger docs generation manually when releasing. M RELEASING_RAILS.rdoc M Rakefile commit 020c783 refs/heads/master Merge: 7eaebd8 5ce58db Author: Arthur Nogueira Neves Date: 2014-02-20 14:41:41 -0500 Merge pull request #14131 from kuldeepaggarwal/upgrade-rails-version update guides to new version of rails 3.2.x, i.e. 3.2.17 [skip ci] commit 5ce58db refs/heads/master Author: Kuldeep Aggarwal Date: 2014-02-21 01:05:26 +0530 [ci skip] update guides to new version of rails 3.2.x M guides/source/upgrading_ruby_on_rails.md commit 95bacbe refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-20 11:25:48 -0800 adding a test for #14106 M activerecord/test/cases/autosave_association_test.rb commit 621633a refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-20 10:46:53 -0800 Revert "context in validation goes through has many relationship" This reverts commit 5e3d466d52fa4e9a42c3a1f8773a7c31da875e48. M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/pirate.rb M activerecord/test/models/ship.rb commit 7eaebd8 refs/heads/master Author: Aaron Patterson Date: 2014-02-20 11:25:48 -0800 adding a test for #14106 M activerecord/test/cases/autosave_association_test.rb commit 358802b refs/heads/master Author: Aaron Patterson Date: 2014-02-20 10:46:53 -0800 Revert "context in validation goes through has many relationship" This reverts commit 5e3d466d52fa4e9a42c3a1f8773a7c31da875e48. M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/pirate.rb M activerecord/test/models/ship.rb commit 53d7b2f refs/heads/master Merge: 9e4c1ab f6d9b68 Author: Carlos Antonio da Silva Date: 2014-02-20 16:04:26 -0300 Merge pull request #14129 from joankaradimov/fix-render-to-string Fix `render_to_string` when called via manually instantiated controllers commit f6d9b68 refs/heads/master Author: Joan Karadimov Date: 2014-02-20 20:07:01 +0200 Check if the `request` variable isn't nil when calling render_to_string closes #14125 M actionpack/lib/abstract_controller/rendering.rb commit 9e4c1ab refs/heads/master Merge: e5a6e6f b7aeab6 Author: Arthur Nogueira Neves Date: 2014-02-20 13:00:47 -0500 Merge pull request #14086 from jingweno/master Fix the javascript path in guide for asset modules [skip ci] commit 942f328 refs/tags/v4.1.0.rc2 Author: Aaron Patterson Date: 2014-02-20 09:59:29 -0800 Merge pull request #14124 from arthurnn/fix_14116 Fix collection proxy exists? regression M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit e5a6e6f refs/heads/master Merge: b078f5e f96831e Author: Aaron Patterson Date: 2014-02-20 09:59:29 -0800 Merge pull request #14124 from arthurnn/fix_14116 Fix collection proxy exists? regression commit b078f5e refs/heads/master Merge: 1774618 5c3eda8 Author: Vijay Dev Date: 2014-02-20 22:28:37 +0530 Merge branch 'master' of github.com:rails/docrails commit b7aeab6 refs/heads/master Author: Jingwen Owen Ou Date: 2014-02-17 12:05:00 -0800 [skip ci] Fix the javascript path in guide for asset modules M guides/source/asset_pipeline.md commit f96831e refs/heads/master Author: Arthur Neves Date: 2014-02-20 10:34:57 -0500 Add regression test for collection proxy reader [related #14116] M activerecord/test/cases/associations/has_many_through_associations_test.rb commit d038a72 refs/heads/master Author: Arthur Neves Date: 2014-02-20 10:34:08 -0500 Revert "speed up the collection proxy reader method, but slow down the constructor" This reverts commit f9e4c3c7c0c4152b62fe9202a9d12262884bb118. [fixes #14116] M activerecord/lib/active_record/associations/collection_association.rb commit 1774618 refs/heads/master Merge: 25ce856 fa8d35b Author: Carlos Antonio da Silva Date: 2014-02-20 10:16:25 -0300 Merge pull request #14120 from gregmolnar/guides change 'assert !' to 'assert_not' in guides [ci skip] commit fa8d35b refs/heads/master Author: Greg Molnar Date: 2014-02-20 14:04:53 +0100 change 'assert !' to 'assert_not' in guides [ci skip] M guides/source/testing.md commit 2ec916b refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-01-09 14:12:05 -0800 Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/values/time_zone.rb commit 9694f86 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-07-29 09:22:14 +0530 [Active Record] Renamed private methods create_record and update_record This is to ensure that they are not accidentally called by the app code. They are renamed to _create_record and _update_record respectively. Closes #11645 M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/singular_association.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/callbacks.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit d969c07 refs/tags/v4.1.0.rc2 Author: Arun Agrawal Date: 2014-02-19 22:59:32 +0100 Pointing to latest guides [ci skip] M guides/source/_welcome.html.erb commit 2213cb8 refs/remotes/origin/4-0-stable Author: Arun Agrawal Date: 2014-02-19 22:59:32 +0100 Pointing to latest guides [ci skip] M guides/source/_welcome.html.erb commit 25ce856 refs/heads/master Author: Arun Agrawal Date: 2014-02-19 22:59:32 +0100 Pointing to latest guides [ci skip] M guides/source/_welcome.html.erb commit a26394d refs/heads/master Merge: a0d63c3 7a025b1 Author: Xavier Noria Date: 2014-02-19 17:53:13 +0100 Merge pull request #14102 from arthurnn/quietly_doc Add note to silence_stream and quietly. [skip ci] commit 7a025b1 refs/heads/master Author: Arthur Neves Date: 2014-02-19 11:43:25 -0500 Methods silence_stream/quietly are not thread-safe [skip ci] State that on the doc. [fixes #11954] M activesupport/lib/active_support/core_ext/kernel/reporting.rb commit b3c3e59 refs/heads/master Author: Maarten Brouwers Date: 2014-02-19 16:37:31 +0100 Moved explanation of `--mountable` option up The example code uses `--mountable`. In previous version this was followed by an explanation of the `--full` option, which doesn't make sense. Later on in the text this is better explained. I moved this explanation up without repeating too much. M guides/source/engines.md commit 5524b45 refs/tags/v4.1.0.rc2 Author: Prakash Murthy Date: 2014-02-19 13:39:31 +0530 [ci skip] Close the meta tag with '/>' instead of '>' This change fixes the 42 instances of `end tag for "meta" omitted, but OMITTAG NO was specified` error message that comes up when the full railsguides are validated. Full error list at https://gist.github.com/prakashmurthy/9086679. M guides/source/layout.html.erb commit 97c105a refs/remotes/origin/4-0-stable Author: Prakash Murthy Date: 2014-02-19 13:39:31 +0530 [ci skip] Close the meta tag with '/>' instead of '>' This change fixes the 42 instances of `end tag for "meta" omitted, but OMITTAG NO was specified` error message that comes up when the full railsguides are validated. Full error list at https://gist.github.com/prakashmurthy/9086679. M guides/source/layout.html.erb commit a0d63c3 refs/heads/master Merge: 1c248df 9b3be63 Author: Arun Agrawal Date: 2014-02-19 09:58:07 +0100 Merge pull request #14107 from prakashmurthy/patch-1 Close the meta tag with '/>' instead of '>' commit 9b3be63 refs/heads/master Author: Prakash Murthy Date: 2014-02-19 13:39:31 +0530 [ci skip] Close the meta tag with '/>' instead of '>' This change fixes the 42 instances of `end tag for "meta" omitted, but OMITTAG NO was specified` error message that comes up when the full railsguides are validated. Full error list at https://gist.github.com/prakashmurthy/9086679. M guides/source/layout.html.erb commit e27b6fe refs/tags/v4.1.0.rc2 Merge: 51bd49b 24e1fff Author: Godfrey Chan Date: 2014-02-18 19:00:40 -0800 Merge pull request #14100 from chancancode/rails_new_edge `rails new --edge` should use the '4-1-stable' branch commit 24e1fff refs/tags/v4.1.0.rc2 Author: Godfrey Chan Date: 2014-02-18 12:07:37 -0800 `rails new --edge` should use the '4-1-stable' branch See 14ef77ba M railties/lib/rails/generators/app_base.rb M railties/test/generators/shared_generator_tests.rb commit 51bd49b refs/tags/v4.1.0.rc2 Author: Arun Agrawal Date: 2014-02-18 21:56:33 +0100 Pointing README links to 4-1-stable [ci skip] M actionmailer/README.rdoc M actionpack/README.rdoc M actionview/README.rdoc M activemodel/README.rdoc M activerecord/README.rdoc M activesupport/README.rdoc M railties/README.rdoc commit 78ba185 refs/tags/v4.1.0.rc1 (tag: v4.1.0.rc1) Author: David Heinemeier Hansson Date: 2014-02-18 21:36:51 +0100 Update versions for 4.1.0.rc1 (using new format) M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M actionview/lib/action_view/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit ccddc40 refs/tags/v4.1.0.rc1 Author: David Heinemeier Hansson Date: 2014-02-18 21:34:28 +0100 Revert "Update versions for 4.1.0.rc1" -- old format for versions! This reverts commit 211ec1f3c2ebac301655870e25a97ca4d6f7b746. M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M actionview/lib/action_view/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 211ec1f refs/tags/v4.1.0.rc1 Author: David Heinemeier Hansson Date: 2014-02-18 21:29:11 +0100 Update versions for 4.1.0.rc1 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M actionview/lib/action_view/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 1c248df refs/heads/master Author: Guillermo Iguaran Date: 2014-02-18 15:18:37 -0500 Fix render plain docs example in AM::Base The errors were introduced in e220a34e39 M actionmailer/lib/action_mailer/base.rb commit 11645ad refs/heads/master Merge: 5dc6bf5 e220a34 Author: Guillermo Iguaran Date: 2014-02-18 15:11:33 -0500 Merge pull request #14099 from robertomiranda/render-text-2-plain Update Docs in favor to use render plain instead of text option commit e220a34 refs/heads/master Author: robertomiranda Date: 2014-02-18 15:04:16 -0500 Update Docs in favor to use render plain instead of text option ref #14062 M actionmailer/lib/action_mailer/base.rb M actionpack/lib/action_controller/base.rb M actionpack/lib/action_controller/metal/data_streaming.rb M actionpack/lib/action_controller/metal/http_authentication.rb commit e5e440f refs/heads/master Merge: 20fd254 5dc6bf5 Author: Aaron Patterson Date: 2014-02-18 11:46:12 -0800 Merge branch 'master' into adequaterecord * master: (32 commits) Typo fix for unscope Use the reference for the mime type to get the format Preparing for 4.1.0.beta2 release Correctly escape PostgreSQL arrays. Escape format, negative_format and units options of number helpers Sync 4.1 release notes with changes since 7f648bc7 [ci skip] Update upgrading guide regarding `render :text` Add `#no_content_type` attribute to `AD::Response` Add missing CHANGELOG entry to Action View Update guides for new rendering options Cleanup `ActionController::Rendering` Fix a fragile test on `action_view/render` Introduce `render :html` for render HTML string Introduce `render :plain` for render plain text Update hash format for render_text_test Introduce `render :body` for render raw content Don't use `# =>` when it is not the expression values Fix the column name [ci skip] Document the default scopes change on the release notes, CHANGELOG and upgrating guides Move changelog entry to the top, fix examples indent [ci skip] ... commit 20fd254 refs/heads/master Author: Aaron Patterson Date: 2014-02-18 11:45:42 -0800 cache queries in the Model.find(id) path M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/core.rb commit 5dc6bf5 refs/heads/master Merge: 33cb47e b74490e Author: Arthur Nogueira Neves Date: 2014-02-18 14:33:25 -0500 Merge pull request #14098 from Amit-Thawait/master Typo fix for unscope [ci skip] commit b74490e refs/heads/master Author: Amit Thawait Date: 2014-02-18 11:26:54 -0800 Typo fix for unscope M activerecord/CHANGELOG.md M guides/source/upgrading_ruby_on_rails.md commit 33cb47e refs/tags/v4.1.0.rc1 Author: Rafael Mendonça França Date: 2014-02-18 16:12:51 -0300 Use the reference for the mime type to get the format Before we were calling to_sym in the mime type, even when it is unknown what can cause denial of service since symbols are not removed by the garbage collector. Fixes: CVE-2014-0082 M actionview/lib/action_view/template/html.rb M actionview/lib/action_view/template/text.rb A actionview/test/template/html_test.rb A actionview/test/template/text_test.rb commit 3e215c0 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-18 16:09:34 -0300 Use the reference for the mime type to get the format Before we were calling to_sym in the mime type, even when it is unknown what can cause denial of service since symbols are not removed by the garbage collector. Fixes: CVE-2014-0082 M actionpack/lib/action_view/template/text.rb A actionpack/test/template/text_test.rb commit 857c6ee refs/remotes/origin/3-0-stable (origin/3-0-stable) Author: Rafael Mendonça França Date: 2014-02-11 23:12:15 -0200 Use the reference for the mime type to get the format Before we were calling to_sym in the mime type, even when it is unknown what can cause denial of service since symbols are not removed by the garbage collector. Fixes: CVE-2014-0082 M actionpack/lib/action_view/template/text.rb A actionpack/test/template/text_test.rb commit 06cbb8a refs/remotes/origin/3-1-stable (origin/3-1-stable) Author: Rafael Mendonça França Date: 2014-02-11 22:56:50 -0200 Use the reference for the mime type to get the format Before we were calling to_sym in the mime type, even when it is unknown what can cause denial of service since symbols are not removed by the garbage collector. Fixes: CVE-2014-0082 M actionpack/lib/action_view/template/text.rb A actionpack/test/template/text_test.rb commit 1879c25 refs/tags/v4.1.0.rc1 Merge: 4f23760 8b20c72 Author: Rafael Mendonça França Date: 2014-02-18 16:00:47 -0300 Merge branch '4-1-0-beta2' Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md commit 2413ba5 refs/remotes/origin/4-0-stable Merge: ad84512 1f6113c Author: Rafael Mendonça França Date: 2014-02-18 15:59:22 -0300 Merge branch '4-0-3' into 4-0-stable Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md commit a3bda38 refs/tags/v3.2.19 Merge: 5a84d3e 666e9f6 Author: Rafael Mendonça França Date: 2014-02-18 15:57:32 -0300 Merge branch '3-2-17' into 3-2-stable Conflicts: actionpack/CHANGELOG.md commit 8b20c72 refs/tags/v4.1.0.beta2 (tag: v4.1.0.beta2) Author: Rafael Mendonça França Date: 2014-02-18 15:45:20 -0300 Preparing for 4.1.0.beta2 release M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M actionview/CHANGELOG.md M actionview/lib/action_view/version.rb M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 6256b1d refs/tags/v4.1.0.beta2 Author: Aaron Patterson Date: 2014-02-12 16:22:40 -0800 Correctly escape PostgreSQL arrays. Thanks Godfrey Chan for reporting this! Fixes: CVE-2014-0080 M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit 08d0a11 refs/tags/v4.1.0.beta2 Author: Rafael Mendonça França Date: 2014-02-11 23:36:10 -0200 Escape format, negative_format and units options of number helpers Previously the values of these options were trusted leading to potential XSS vulnerabilities. Fixes: CVE-2014-0081 M actionview/lib/action_view/helpers/number_helper.rb M actionview/test/template/number_helper_test.rb commit 1f6113c refs/tags/v4.0.3 (tag: v4.0.3) Author: Rafael Mendonça França Date: 2014-02-18 15:37:26 -0300 Preparing for 4.0.3 release M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 3eaea65 refs/tags/v4.0.3 Author: Aaron Patterson Date: 2014-02-12 16:22:40 -0800 Correctly escape PostgreSQL arrays. Thanks Godfrey Chan for reporting this! Fixes: CVE-2014-0080 M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit 9e2d63d refs/tags/v4.0.3 Author: Rafael Mendonça França Date: 2014-02-11 23:22:58 -0200 Escape format, negative_format and units options of number helpers Previously the values of these options were trusted leading to potential XSS vulnerabilities. Fixes: CVE-2014-0081 M actionpack/lib/action_view/helpers/number_helper.rb M actionpack/test/template/number_helper_test.rb commit 666e9f6 refs/tags/v3.2.17 (tag: v3.2.17) Author: Rafael Mendonça França Date: 2014-02-18 15:08:16 -0300 Preparing for 3.2.17 release M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 388d2f8 refs/tags/v3.2.17 Author: Rafael Mendonça França Date: 2014-02-11 22:56:50 -0200 Use the reference for the mime type to get the format Before we were calling to_sym in the mime type, even when it is unknown what can cause denial of service since symbols are not removed by the garbage collector. Fixes: CVE-2014-0082 M actionpack/lib/action_view/template/text.rb A actionpack/test/template/text_test.rb commit eaa2101 refs/tags/v3.2.17 Author: Rafael Mendonça França Date: 2014-02-11 23:29:27 -0200 Escape format, negative_format and units options of number helpers Previously the values of these options were trusted leading to potential XSS vulnerabilities. Fixes: CVE-2014-0081 M actionpack/lib/action_view/helpers/number_helper.rb M actionpack/test/template/number_helper_test.rb commit 4f23760 refs/tags/v4.1.0.rc1 Merge: acc0e63 578839b Author: Godfrey Chan Date: 2014-02-18 09:59:15 -0800 Merge pull request #14097 from chancancode/sync_4_1_release_notes Sync 4.1 release notes with changes since 7f648bc7 commit 578839b refs/tags/v4.1.0.rc1 Author: Godfrey Chan Date: 2014-02-18 09:43:39 -0800 Sync 4.1 release notes with changes since 7f648bc7 [ci skip] M guides/source/4_1_release_notes.md commit acc0e63 refs/tags/v4.1.0.rc1 Merge: 6c496a6 ede0f8c Author: Rafael Mendonça França Date: 2014-02-18 14:13:49 -0300 Merge pull request #14062 from sikachu/ps-render-format Introduce `:plain`, `:html`, and `:body` render options. commit ede0f8c refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-18 09:30:43 -0500 Update upgrading guide regarding `render :text` M guides/source/upgrading_ruby_on_rails.md commit 3047376 refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-14 15:50:08 -0500 Add `#no_content_type` attribute to `AD::Response` Setting this attribute to `true` will remove the content type header from the request. This is use in `render :body` feature. M actionpack/lib/action_controller/metal/rack_delegation.rb M actionpack/lib/action_controller/metal/rendering.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/dispatch/response_test.rb M actionview/lib/action_view/rendering.rb commit 9fe506e refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-14 13:15:47 -0500 Add missing CHANGELOG entry to Action View M actionview/CHANGELOG.md commit 76be30f refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-14 13:11:20 -0500 Update guides for new rendering options * Introduces `:plain`, `:html`, `:body` render option. * Update guide to use `render :plain` instead of `render :text`. M guides/source/action_controller_overview.md M guides/source/getting_started.md M guides/source/layouts_and_rendering.md commit 79c4983 refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-14 10:45:46 -0500 Cleanup `ActionController::Rendering` M actionpack/lib/action_controller/metal/rendering.rb commit 243e6e4 refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-14 10:24:49 -0500 Fix a fragile test on `action_view/render` This test were assuming that the list of render options will always be the same. Fixing that so this doesn't break when we add/remove render option in the future. M actionview/test/template/render_test.rb commit 920f3ba refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-14 09:57:47 -0500 Introduce `render :html` for render HTML string This is an option for to HTML content with a content type of `text/html`. This rendering option calls `ERB::Util.html_escape` internally to escape unsafe HTML string, so you will have to mark your string as html safe if you have any HTML tag in it. Please see #12374 for more detail. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/rendering.rb A actionpack/test/controller/new_base/render_html_test.rb M actionview/lib/action_view/helpers/rendering_helper.rb M actionview/lib/action_view/layouts.rb M actionview/lib/action_view/renderer/template_renderer.rb M actionview/lib/action_view/template.rb A actionview/lib/action_view/template/html.rb commit 8cd9f6d refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-07 13:45:57 -0500 Introduce `render :plain` for render plain text This is as an option to render content with a content type of `text/plain`. This is the preferred option if you are planning to render a plain text content. Please see #12374 for more detail. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/rendering.rb A actionpack/test/controller/new_base/render_plain_test.rb M actionview/lib/action_view/helpers/rendering_helper.rb M actionview/lib/action_view/layouts.rb M actionview/lib/action_view/renderer/template_renderer.rb commit 9e9cc66 refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-02-07 11:24:54 -0500 Update hash format for render_text_test M actionpack/test/controller/new_base/render_text_test.rb commit 103e18c refs/tags/v4.1.0.rc1 Author: Prem Sichanugrist Date: 2014-01-31 15:37:58 -0500 Introduce `render :body` for render raw content This is an option for sending a raw content back to browser. Note that this rendering option will unset the default content type and does not include "Content-Type" header back in the response. You should only use this option if you are expecting the "Content-Type" header to not be set. More information on "Content-Type" header can be found on RFC 2616, section 7.2.1. Please see #12374 for more detail. M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/rendering.rb M actionpack/lib/action_controller/metal/rendering.rb M actionpack/lib/action_dispatch/http/response.rb A actionpack/test/controller/new_base/render_body_test.rb M actionpack/test/dispatch/response_test.rb M actionview/lib/action_view/helpers/rendering_helper.rb M actionview/lib/action_view/layouts.rb M actionview/lib/action_view/renderer/template_renderer.rb M actionview/lib/action_view/rendering.rb commit 6c496a6 refs/tags/v4.1.0.rc1 Merge: 67e57ea fc641a1 Author: Rafael Mendonça França Date: 2014-02-18 14:06:29 -0300 Merge pull request #14095 from rails/rm-scopes Document `default_scope` changes commit fc641a1 refs/tags/v4.1.0.rc1 Author: Rafael Mendonça França Date: 2014-02-18 13:48:26 -0300 Don't use `# =>` when it is not the expression values [ci skip] M activerecord/CHANGELOG.md M guides/source/active_record_querying.md M guides/source/upgrading_ruby_on_rails.md commit 967a6dc refs/tags/v4.1.0.rc1 Author: Rafael Mendonça França Date: 2014-02-18 12:08:51 -0300 Fix the column name [ci skip] M activerecord/CHANGELOG.md M guides/source/active_record_querying.md M guides/source/upgrading_ruby_on_rails.md commit 6370e69 refs/tags/v4.1.0.rc1 Author: Rafael Mendonça França Date: 2014-02-18 12:04:26 -0300 Document the default scopes change on the release notes, CHANGELOG and upgrating guides [ci skip] M activerecord/CHANGELOG.md M guides/source/4_1_release_notes.md M guides/source/upgrading_ruby_on_rails.md commit 67e57ea refs/tags/v4.1.0.rc1 Merge: 68345d4 4e84e12 Author: Carlos Antonio da Silva Date: 2014-02-18 13:02:25 -0300 Merge pull request #14094 from kalabiyau/fix_parameters_naming Fix parameter naming in RemoteIp middleware constructor method [ci skip] commit 68345d4 refs/tags/v4.1.0.rc1 Author: Carlos Antonio da Silva Date: 2014-02-18 12:53:00 -0300 Move changelog entry to the top, fix examples indent [ci skip] M activesupport/CHANGELOG.md commit 76fec33 refs/tags/v4.1.0.rc1 Author: Carlos Antonio da Silva Date: 2014-02-18 12:50:02 -0300 Minor grammar/punctuation fixes [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 36bf5ac refs/tags/v4.1.0.rc1 Author: David Heinemeier Hansson Date: 2014-02-18 16:40:11 +0100 Use assert_nil instead as its clearer about what the return is expected to be M activesupport/test/core_ext/object/inclusion_test.rb commit 8c4ca89 refs/tags/v4.1.0.rc1 Merge: 4edca10 4921d39 Author: Guillermo Iguaran Date: 2014-02-18 10:38:39 -0500 Merge pull request #14096 from arthurnn/precompile_all Upgrade Doc: assets:precompile:all was removed on 4 commit 4edca10 refs/tags/v4.1.0.rc1 Author: David Heinemeier Hansson Date: 2014-02-18 15:20:15 +0100 Added Object#present_in to simplify value whitelisting M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/inclusion.rb M activesupport/test/core_ext/object/inclusion_test.rb commit 4921d39 refs/tags/v4.1.0.rc1 Author: Arthur Neves Date: 2014-02-18 10:31:20 -0500 Doc: assets:precompile:all was removed on 4 [skip ci] M guides/source/upgrading_ruby_on_rails.md commit 28a0dd4 refs/tags/v4.1.0.rc1 Author: Rafael Mendonça França Date: 2014-02-18 11:45:15 -0300 Aesthetic [ci skip] M guides/source/active_record_querying.md commit 4e84e12 refs/tags/v4.1.0.rc1 Author: KalabiYau Date: 2014-02-18 15:52:56 +0100 Fix parameter naming in RemoteIp middleware constructor method Was custom_proxies in inline docs, but should be and defined in constructor as custom_proxies M actionpack/lib/action_dispatch/middleware/remote_ip.rb commit 56c8242 refs/tags/v4.1.0.rc1 Author: Rafael Mendonça França Date: 2014-02-18 11:45:00 -0300 Tell default_scope are prepended [ci skip] M guides/source/active_record_querying.md commit a8a7654 refs/tags/v4.1.0.rc1 Author: Rashmi Yadav Date: 2014-01-29 12:26:18 +0100 Updated doc for default scope [ci skip] M guides/source/active_record_querying.md commit 5d03781 refs/heads/master Author: Xavier Noria Date: 2014-02-18 10:22:43 +0100 travel_to travels back and re-raises if the block raises M activesupport/lib/active_support/testing/time_helpers.rb M activesupport/test/time_zone_test.rb commit 24fa399 refs/heads/master Author: Xavier Noria Date: 2014-02-18 09:52:42 +0100 adds a missing travel back M activesupport/test/time_zone_test.rb commit 65a7c57 refs/heads/master Author: Xavier Noria Date: 2014-02-18 09:35:11 +0100 time helpers honor the application time zone when passed a date Rails applications are expected to be always aware of the application time zone. To be consistent with that contract, we have to assume that a bare date passed to time helpers is a date in the application time zone, not in the system time zone. The system time zone is irrelevant, we should totally ignore it. For example, travel_to user.birth_date + 40.years should make that user be 40th years old regardless of the system time zone. Without this patch that may not be true. M activesupport/CHANGELOG.md M activesupport/lib/active_support/testing/time_helpers.rb M activesupport/test/time_zone_test.rb commit f430836 refs/heads/master Merge: c18e7ab 8508346 Author: Aaron Patterson Date: 2014-02-17 16:11:19 -0800 Merge pull request #14000 from Fortisque/kevin/stream_error_management streaming should change status of response when exception is caught commit 77b18d7 refs/heads/master Author: Aaron Patterson Date: 2014-02-17 14:55:54 -0800 add AST cache to the find_by method M activerecord/lib/active_record/core.rb commit 23ce2f6 refs/heads/master Merge: fe42eff c18e7ab Author: Aaron Patterson Date: 2014-02-17 13:42:42 -0800 Merge branch 'master' into adequaterecord * master: Revert "Merge pull request #13344 from ccutrer/fix-from-default-select" No need to use symbols Don't skip tests if they are not broken. Just don't define they Fix typo [ci skip] Resolve encoding issues with arrays of hstore (bug 11135). Fix coffeescript sample [ci skip] commit c18e7ab refs/heads/master Merge: a2075f4 d0b251e Author: Carlos Antonio da Silva Date: 2014-02-17 17:41:02 -0300 Merge pull request #14087 from 10io/patch-1 Fix coffeescript sample [ci skip] commit fe42eff refs/heads/master Merge: 5ac2879 3e3ed1e Author: Aaron Patterson Date: 2014-02-17 11:21:18 -0800 Merge branch 'master' into adequaterecord * master: (311 commits) Add a missing changelog entry for #13981 and #14035 Revert "Fixed plugin_generator test" implements new option :month_format_string for date select helpers [Closes #13618] add factory methods for empty alias trackers guarantee a list in the alias tracker so we can remove a conditional stop exposing table_joins make most parameters to the AliasTracker required make a singleton for AssociationScope pass the association and connection to the scope method pass the tracker down the stack and construct it in the scope method clean up add_constraints signature remove the reflection delegate remove klass delegator remove railties changes. fixes #14054 remove chain delegate remove scope_chain delegate Add verb to sanitization note fix path shown in mailer's templates updated Travis build status image url fix guide active_support_core_extensions. add Note to String#indent [ci skip] ... Conflicts: activerecord/lib/active_record/associations/join_dependency.rb activerecord/test/cases/associations/association_scope_test.rb commit a2075f4 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-17 10:49:38 -0300 Revert "Merge pull request #13344 from ccutrer/fix-from-default-select" This reverts commit 3ea840355409dc205a9e0d027fc09f1452636969, reversing changes made to e4cde5d58cbb09d1843796f96ba86225ff94fe05. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/query_methods.rb Reason: using `from` without `select` should not change the select list to SELECT * because it can lead different query results. If it is needed to change the table to a subquery or a view you can pass a table alias in the `from` call or use `select('subquery.*')`. Fixes #14049. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit c507f9f refs/heads/master Author: Rafael Mendonça França Date: 2014-02-16 21:49:28 -0300 No need to use symbols M activerecord/lib/active_record/relation/query_methods.rb commit 141313c refs/heads/master Author: Rafael Mendonça França Date: 2014-02-16 21:08:39 -0300 Don't skip tests if they are not broken. Just don't define they M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/associations/eager_singularization_test.rb commit 99cdad6 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-16 21:05:55 -0300 Fix typo [ci skip] M actionmailer/lib/action_mailer/preview.rb M activerecord/CHANGELOG.md commit ad84512 refs/remotes/origin/4-0-stable Merge: 0ea8e5f d96d7e8 Author: Guillermo Iguaran Date: 2014-02-16 18:46:22 -0500 Merge pull request #14078 from gsamokovarov/hstore_arrays_fix_4_0 Backport #13512 to 4.0 stable commit d96d7e8 refs/remotes/origin/4-0-stable Author: Josh Goodall Date: 2013-07-15 11:55:24 +1000 Resolve encoding issues with arrays of hstore (bug 11135). We didn't have enough encoding for the wire protocol to store an array of hstore types. So, further encode any hstore that is an array member. Whilst we're here, ensure it's an HashWithIndifferentAccess being returned, to be consistent with other serialized forms, and add testing for arrays of hstore. So now the following migration: enable_extension "hstore" create_table :servers do |t| t.string :name t.hstore :interfaces, array: true end produces a model that can used like this, to store an array of hashes: server = Server.create(name: "server01", interfaces: [ { name: "bge0", ipv4: "192.0.2.2", state: "up" }, { name: "de0", state: "disabled", by: "misha" }, { name: "fe0", state: "up" }, ]) More at http://inopinatus.org/2013/07/12/using-arrays-of-hstore-with-rails-4/ M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit 7c32db1 refs/heads/master Merge: 3e3ed1e da3fec2 Author: Guillermo Iguaran Date: 2014-02-16 17:45:16 -0500 Merge pull request #13512 from gsamokovarov/hstore_arrays_fix Hstore arrays fix (follow up for #11444) commit da3fec2 refs/heads/master Author: Josh Goodall Date: 2013-07-15 11:55:24 +1000 Resolve encoding issues with arrays of hstore (bug 11135). We didn't have enough encoding for the wire protocol to store an array of hstore types. So, further encode any hstore that is an array member. Whilst we're here, ensure it's an HashWithIndifferentAccess being returned, to be consistent with other serialized forms, and add testing for arrays of hstore. So now the following migration: enable_extension "hstore" create_table :servers do |t| t.string :name t.hstore :interfaces, array: true end produces a model that can used like this, to store an array of hashes: server = Server.create(name: "server01", interfaces: [ { name: "bge0", ipv4: "192.0.2.2", state: "up" }, { name: "de0", state: "disabled", by: "misha" }, { name: "fe0", state: "up" }, ]) More at http://inopinatus.org/2013/07/12/using-arrays-of-hstore-with-rails-4/ M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit 3e3ed1e refs/heads/master Merge: 8b80e3c 8e6d0fd Author: Vijay Dev Date: 2014-02-16 19:55:36 +0530 Merge pull request #13937 from ktaragorn/guides_fixes Guides fixes commit b892d20 refs/heads/master Author: Potapov Sergey Date: 2014-02-16 14:40:23 +0200 Do not try to write timestamps if they are missing #8813 M activerecord/CHANGELOG.md M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/timestamp_test.rb commit 0ea8e5f refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-15 21:49:00 -0200 Merge pull request #14072 from robin850/patch-16 Add a missing changelog entry for #13981 and #14035 M activerecord/CHANGELOG.md commit 8b80e3c refs/heads/master Merge: 4914adc 0c63fbc Author: Rafael Mendonça França Date: 2014-02-15 21:49:00 -0200 Merge pull request #14072 from robin850/patch-16 Add a missing changelog entry for #13981 and #14035 commit 8508346 refs/heads/master Author: Kevin Casey Date: 2014-02-15 13:05:00 -0800 Correct prestreaming controller response status. if the controller action has not yet streamed any data, actions should process as normal, and errors should trigger the appropriate behavior (500, or in the case of ActionController::BadRequest, a 400 Bad Request) M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit 0c63fbc refs/heads/master Author: Robin Dupret Date: 2014-02-15 21:07:13 +0100 Add a missing changelog entry for #13981 and #14035 [ci skip] M activerecord/CHANGELOG.md commit 4914adc refs/heads/master Merge: 5f295ae 5f07366 Author: Carlos Antonio da Silva Date: 2014-02-15 13:33:44 -0200 Merge pull request #14069 from arunagw/aa-plugin-generator-build-fix Revert "Fixed plugin_generator test" As this commit 22a1a5ac8c4631f29cfeac451c361e8da1dd2261 has reverted all changes so this plugin generator also needs to fix. commit 5f07366 refs/heads/master Author: Arun Agrawal Date: 2014-02-15 11:26:17 +0100 Revert "Fixed plugin_generator test" This reverts commit fefa8ae9a172835fb6b8aef7d1dd46d58eecd49f. M railties/lib/rails/generators/rails/plugin/plugin_generator.rb commit 5f295ae refs/heads/master Author: Xavier Noria Date: 2014-02-15 10:27:15 +0100 implements new option :month_format_string for date select helpers [Closes #13618] M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/date_helper.rb M actionview/test/template/date_helper_test.rb commit bfc776f refs/heads/master Author: Aaron Patterson Date: 2014-02-14 18:01:12 -0800 add factory methods for empty alias trackers If we know the alias tracker is empty, we can create one that doesn't use a hash with default block for counting. ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') ActiveRecord::Schema.define do create_table :posts, force: true do |t| t.integer :comments_count end create_table :comments, force: true do |t| t.integer :post_id end end class Post < ActiveRecord::Base; has_many :comments; end class Comment < ActiveRecord::Base; belongs_to :post, counter_cache: true; end 10.times { Comment.create!(post: Post.create!) } record = Post.first association_name = :comments Benchmark.ips do |x| reflection = record.class.reflect_on_association(association_name) association = reflection.association_class.new(record, reflection) x.report('assoc') do reflection.association_class.new(record, reflection) end x.report('reader') do association.reader;nil end x.report('combined') do reflection.association_class.new(record, reflection).reader;nil end end [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0062s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 833 i/100ms reader 28703 i/100ms combined 839 i/100ms ------------------------------------------------- assoc 9010.3 (±3.8%) i/s - 44982 in 5.000022s reader 3214523.4 (±5.5%) i/s - 16016274 in 5.001136s combined 8841.0 (±5.8%) i/s - 44467 in 5.049269s [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0060s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 888 i/100ms reader 29217 i/100ms combined 900 i/100ms ------------------------------------------------- assoc 9674.3 (±3.3%) i/s - 48840 in 5.054022s reader 2988474.8 (±6.9%) i/s - 14842236 in 4.998230s combined 9674.0 (±3.1%) i/s - 48600 in 5.028694s M activerecord/lib/active_record/associations/alias_tracker.rb M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/associations/join_dependency.rb commit 4e823b6 refs/heads/master Author: Aaron Patterson Date: 2014-02-14 17:40:21 -0800 guarantee a list in the alias tracker so we can remove a conditional M activerecord/lib/active_record/associations/alias_tracker.rb M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/relation/finder_methods.rb commit 494a26d refs/heads/master Author: Aaron Patterson Date: 2014-02-14 16:51:24 -0800 stop exposing table_joins M activerecord/lib/active_record/associations/alias_tracker.rb commit c24ea24 refs/heads/master Author: Aaron Patterson Date: 2014-02-14 16:47:03 -0800 make most parameters to the AliasTracker required This helps with our sanity. The class is internal, we can refactor to a "nice" API later. M activerecord/lib/active_record/associations/alias_tracker.rb M activerecord/lib/active_record/associations/join_dependency.rb commit 213b2fb refs/heads/master Author: Aaron Patterson Date: 2014-02-14 14:23:04 -0800 make a singleton for AssociationScope AssociationScope no longer maintains state, so we're safe to keep a singleton and save on GC time M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/association_scope.rb M activerecord/test/cases/associations/association_scope_test.rb commit 8e6ef92 refs/heads/master Author: Aaron Patterson Date: 2014-02-14 14:20:07 -0800 pass the association and connection to the scope method M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/association_scope.rb M activerecord/test/cases/associations/association_scope_test.rb commit 3b675f0 refs/heads/master Author: Aaron Patterson Date: 2014-02-14 14:13:52 -0800 pass the tracker down the stack and construct it in the scope method M activerecord/lib/active_record/associations/association_scope.rb commit db3f50c refs/heads/master Author: Aaron Patterson Date: 2014-02-14 14:04:39 -0800 clean up add_constraints signature M activerecord/lib/active_record/associations/association_scope.rb commit a35325e refs/heads/master Author: Aaron Patterson Date: 2014-02-14 14:02:18 -0800 remove the reflection delegate M activerecord/lib/active_record/associations/association_scope.rb commit 40a015f refs/heads/master Author: Aaron Patterson Date: 2014-02-14 13:57:17 -0800 remove klass delegator M activerecord/lib/active_record/associations/association_scope.rb commit 22a1a5a refs/heads/master Author: Aaron Patterson Date: 2014-02-14 11:38:26 -0800 remove railties changes. fixes #14054 Squashed commit of the following: commit 96991e8e919edfb20cc4120bca4e36ed51175d57 Author: Aaron Patterson Date: Fri Feb 14 11:29:24 2014 -0800 Revert "gems can be added or skipped from the template" This reverts commit 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb railties/test/generators/app_generator_test.rb commit 35599c0e657245ef14ac0f28c9189ad16acf40e6 Author: Aaron Patterson Date: Fri Feb 14 11:26:53 2014 -0800 Revert "oops, template replay needs to happen after bundle. :orz:" This reverts commit 9104702be61253f9448ca070a22fc86bb4299555. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb commit f519c3902c313db8e906a49251c91643b8e6499e Author: Aaron Patterson Date: Fri Feb 14 11:25:51 2014 -0800 Revert "only ask for these ivars if the target responds to them" This reverts commit 656d412546cd97d5660c634c2a41c799d3f9e211. commit aa524a9428e3e4c45fe221f10a66a08efb827ab5 Author: Aaron Patterson Date: Fri Feb 14 11:25:39 2014 -0800 Revert "refactor generator tests to use block form of Tempfile" This reverts commit 65251820ef0ab7f3cffb38130de3dd41af8d72be. commit 7d3740549fa4dfa62e3761f8d4bc6d6d441256e7 Author: Aaron Patterson Date: Fri Feb 14 11:25:25 2014 -0800 Revert "add a more restricted codepath for templates fixes #13390" This reverts commit 2875b4a66e38e4333da887a4afbed33358999298. commit 525df0af1001918986cdfce59539fd2d52c4f32c Author: Aaron Patterson Date: Fri Feb 14 11:25:11 2014 -0800 Revert "add a send so `apply` can be called. Fixes #13510" This reverts commit c5034d60dba0cd31a6a8c612ee35d63b8127793a. M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/tasks/framework.rake D railties/test/application/rake/templates_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/generator_test.rb commit a8775bb refs/heads/master Author: Aaron Patterson Date: 2014-02-13 15:58:28 -0800 remove chain delegate M activerecord/lib/active_record/associations/association_scope.rb commit 279212d refs/heads/master Author: Aaron Patterson Date: 2014-02-13 15:42:32 -0800 remove scope_chain delegate M activerecord/lib/active_record/associations/association_scope.rb commit 8ce72d9 refs/heads/master Merge: 820f635 848e377 Author: Rafael Mendonça França Date: 2014-02-14 14:40:10 -0200 Merge pull request #14061 from davejachimiak/add_verb_in_guides Add verb to sanitization note commit 848e377 refs/heads/master Author: Dave Jachimiak Date: 2014-02-14 11:36:03 -0500 Add verb to sanitization note M guides/source/security.md commit 820f635 refs/heads/master Merge: cdda290 aae455f Author: Rafael Mendonça França Date: 2014-02-14 14:23:45 -0200 Merge pull request #14060 from kassio/master Fix path shown in mailer's templates commit aae455f refs/heads/master Author: Kassio Borges Date: 2014-02-14 14:17:12 -0200 fix path shown in mailer's templates M railties/lib/rails/generators/erb/mailer/templates/view.html.erb M railties/lib/rails/generators/erb/mailer/templates/view.text.erb M railties/test/generators/mailer_generator_test.rb commit cdda290 refs/heads/master Merge: 112b58f b283190 Author: Carlos Antonio da Silva Date: 2014-02-14 12:01:26 -0200 Merge pull request #14048 from pcreux/better-error-message-db-migrate-down Add hint to error message of task db:migrate:down commit 112b58f refs/heads/master Merge: 926781b 680f7d9 Author: Carlos Antonio da Silva Date: 2014-02-14 11:58:18 -0200 Merge pull request #14057 from rajcybage/Ar_remove_unnecessary_fixtures Remove unused fixtures from sqlite3 test case commit 702f3dc refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2014-02-14 11:56:15 -0200 Merge pull request #14059 from tbpgr/guides_active_support_core_ext [Guides] fix guide active_support_core_extensions. add Note to String#indent [ci skip] M guides/source/active_support_core_extensions.md commit 926781b refs/heads/master Merge: bcaef36 0e19e35 Author: Carlos Antonio da Silva Date: 2014-02-14 11:56:15 -0200 Merge pull request #14059 from tbpgr/guides_active_support_core_ext [Guides] fix guide active_support_core_extensions. add Note to String#indent [ci skip] commit bcaef36 refs/heads/master Merge: 7d897ab 4f5aff9 Author: Rafael Mendonça França Date: 2014-02-14 11:38:04 -0200 Merge pull request #14058 from lantoli/master updated Travis build status image url commit 4f5aff9 refs/heads/master Author: Leo Antoli Date: 2014-02-14 14:24:52 +0100 updated Travis build status image url M README.md commit 0e19e35 refs/heads/master Author: tbpgr Date: 2014-02-14 22:02:23 +0900 fix guide active_support_core_extensions. add Note to String#indent [ci skip] M guides/source/active_support_core_extensions.md commit 680f7d9 refs/heads/master Author: Rajarshi Das Date: 2014-02-14 16:36:45 +0530 remove unused fixtures from sqlite3 test cases M activerecord/test/cases/adapters/sqlite3/copy_table_test.rb commit bbf6df7 refs/heads/master Author: Girish S Date: 2014-02-14 15:32:10 +0530 SQLite3Adapter now checks for views in table_exists? fixes: 14041 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 8e6d0fd refs/heads/master Author: Karthik T Date: 2014-02-04 11:08:23 +0800 Getting started guide fixes & Explain X-SendFile a little better, with links Explain how form_for :article is able to pull in the properties of @article Make it clear that article_id is generated due to the association set up Add link to the rails function that uses X-Sendfile. Add links to apache and nginx docs for the header M guides/source/asset_pipeline.md M guides/source/getting_started.md commit 7d897ab refs/heads/master Author: Aaron Patterson Date: 2014-02-13 15:40:18 -0800 remove more delegate methods M activerecord/lib/active_record/associations/association_scope.rb commit e804d07 refs/heads/master Author: Aaron Patterson Date: 2014-02-13 14:12:29 -0800 :scissors: whitespace M activerecord/lib/active_record/associations/association_scope.rb commit 500b1df refs/heads/master Author: Aaron Patterson Date: 2014-02-13 15:33:18 -0800 rm delegate methods that are not actually used M activerecord/lib/active_record/associations/association_scope.rb commit 7dc5692 refs/remotes/origin/fxn/string-pools (origin/fxn/string-pools) Merge: 6324f54 bfc34fc Author: Xavier Noria Date: 2014-02-13 21:17:44 +0100 Merge branch 'master' into fxn/string-pools Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb activerecord/lib/active_record/core.rb commit 0fddc3c refs/heads/master Author: Aaron Patterson Date: 2014-02-13 12:13:24 -0800 JoinHelper is never reused, so there is no need to separate M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/association_scope.rb D activerecord/lib/active_record/associations/join_helper.rb commit bfc34fc refs/remotes/origin/fxn/string-pools Author: David Heinemeier Hansson Date: 2014-02-13 20:38:33 +0100 No variant should also be picked up by variant.any if variant.none is not defined (just like any other variant) M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/test/controller/mime/respond_to_test.rb commit b283190 refs/heads/master Author: Philippe Creux Date: 2014-02-13 10:46:22 -0800 Add hint to error message of task db:migrate:down M activerecord/lib/active_record/railties/databases.rake commit f9e4c3c refs/remotes/origin/fxn/string-pools Author: Aaron Patterson Date: 2014-02-13 11:03:00 -0800 speed up the collection proxy reader method, but slow down the constructor M activerecord/lib/active_record/associations/collection_association.rb commit 9ec42f9 refs/remotes/origin/fxn/string-pools Merge: ad48267 00a4af9 Author: David Heinemeier Hansson Date: 2014-02-13 19:29:08 +0100 Merge pull request #14047 from strzalek/variants-array-check Check if variant array contains only symbols commit deb32f6 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-13 19:07:13 +0100 Merge pull request #14034 from hdabrows/drop-correct-index-when-reverting-migration Drop the correct index after reverting a migration Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/invertible_migration_test.rb M activerecord/test/cases/migration/command_recorder_test.rb commit ad48267 refs/remotes/origin/fxn/string-pools Merge: 24fc74c e1d4673 Author: Yves Senn Date: 2014-02-13 19:07:13 +0100 Merge pull request #14034 from hdabrows/drop-correct-index-when-reverting-migration Drop the correct index after reverting a migration commit 24fc74c refs/remotes/origin/fxn/string-pools Merge: f2dfa83 c387252 Author: Guillermo Iguaran Date: 2014-02-13 12:13:32 -0500 Merge pull request #14045 from arthurnn/kill_fibers Dont use Enumarator on join_association commit 00a4af9 refs/remotes/origin/fxn/string-pools Author: Łukasz Strzałkowski Date: 2014-02-13 18:05:55 +0100 Check if variant array contains only symbols M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/dispatch/request_test.rb commit f2dfa83 refs/remotes/origin/fxn/string-pools Merge: ea3af7e f9b6b86 Author: David Heinemeier Hansson Date: 2014-02-13 17:24:22 +0100 Merge pull request #14043 from strzalek/variants-negotiation Variant negotiation commit e1d4673 refs/remotes/origin/fxn/string-pools Author: Hubert Dąbrowski Date: 2014-02-12 22:23:16 +0100 Drop the correct index after reverting a migration Previously when reverting a migration which added a named index it would instead drop a corresponding index with matching columns but without a name. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/invertible_migration_test.rb M activerecord/test/cases/migration/command_recorder_test.rb commit ea3af7e refs/remotes/origin/fxn/string-pools Author: Yves Senn Date: 2014-02-13 16:45:56 +0100 tests are responsible to clean up afterwards. remove created state after test execution, not before the next test. This prevents the leak of the `ex` table outside of a single test. M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit c387252 refs/remotes/origin/fxn/string-pools Author: Arthur Neves Date: 2014-02-13 10:41:43 -0500 Dont use Enumarator on join_association M activerecord/lib/active_record/associations/join_dependency/join_association.rb commit f9b6b86 refs/remotes/origin/fxn/string-pools Author: Lukasz Strzalkowski Date: 2014-02-13 15:59:09 +0100 Variant negotiation Allow setting `request.variant` as an array - an order in which they will be rendered. For example: request.variant = [:tablet, :phone] respond_to do |format| format.html.none format.html.phone # this gets rendered end M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/controller/mime/respond_to_test.rb M actionpack/test/dispatch/request_test.rb M actionview/lib/action_view/rendering.rb commit de5ef15 refs/remotes/origin/fxn/string-pools Merge: 6a1b459 dafc0ee Author: Guillermo Iguaran Date: 2014-02-13 09:41:13 -0500 Merge pull request #13945 from rails/json_cookie_serializer_improvements Cookies serializer improvements commit 6a1b459 refs/remotes/origin/fxn/string-pools Merge: 6e61da2 37e30d2 Author: Guillermo Iguaran Date: 2014-02-13 09:38:01 -0500 Merge pull request #14029 from senny/dont_crash_on_empty_secrets_yml do not crash when `config/secrets.yml` is blank. commit d0b251e refs/heads/master Author: David Fernandez Date: 2014-02-13 11:37:34 +0100 Fix coffeescript sample [ci skip] Replace bind() with on() as suggested by the JQuery bind() documentation: https://api.jquery.com/bind/ M guides/source/working_with_javascript_in_rails.md commit 2dad2bc refs/remotes/origin/4-0-stable Merge: 6ebc07b e1c2b8a Author: Aaron Patterson Date: 2014-02-12 17:15:25 -0800 Merge pull request #14036 from matthewd/pg_terminate_backend_4-0-stable 4-0-stable: Terminate the backend ourselves on PG 9.2+ commit e1c2b8a refs/remotes/origin/4-0-stable Author: Matthew Draper Date: 2013-12-19 01:43:02 +1030 Terminate the backend ourselves on PG 9.2+ This should make it harder to accidentally break this test. M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 6e61da2 refs/remotes/origin/fxn/string-pools Merge: 4bf7071 3b645fd Author: Aaron Patterson Date: 2014-02-12 15:26:11 -0800 Merge pull request #14035 from matthewd/pg_terminate_backend Terminate the backend ourselves on PG 9.2+ commit 3b645fd refs/remotes/origin/fxn/string-pools Author: Matthew Draper Date: 2013-12-19 01:43:02 +1030 Terminate the backend ourselves on PG 9.2+ This should make it harder to accidentally break this test. M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 4bf7071 refs/remotes/origin/fxn/string-pools Author: Aaron Patterson Date: 2014-02-12 15:19:17 -0800 `execute` is a hotspot, so let's reduce branches M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 6ebc07b refs/remotes/origin/4-0-stable Author: Nicholas Jakobsen Date: 2013-08-30 13:02:45 -0700 Don't create fibers just to iterate M activerecord/lib/active_record/relation/merger.rb commit 4dc4204 refs/remotes/origin/fxn/string-pools Merge: 8cdd93a 5b793a8 Author: Rafael Mendonça França Date: 2014-02-12 15:50:14 -0200 Merge pull request #13761 from iainbeeston/refactor_out_render_object Refactored object rendering in RenderingHelper#render into it's own method commit 5b793a8 refs/remotes/origin/fxn/string-pools Author: Iain Beeston Date: 2014-02-12 17:40:52 +0000 Added tests to render helper that expect `render partial: @foo` to automatically call @foo.to_partial_path Calling `render @foo` allows local variables but not options to be passed to the partial renderer. The correct way to render an object AND pass options to the partial renderer is to pass the object in the `:partial` parameter. However, there were previously no tests for this behaviour (in `render_helper_test.rb` at least). A actionview/test/fixtures/customers/_customer.xml.erb M actionview/test/template/render_test.rb commit 37e30d2 refs/remotes/origin/fxn/string-pools Author: Yves Senn Date: 2014-02-12 17:17:00 +0100 do not crash when `config/secrets.yml` is blank. M railties/CHANGELOG.md M railties/lib/rails/application.rb M railties/test/application/configuration_test.rb commit 8cdd93a refs/remotes/origin/fxn/string-pools Merge: 7d5454d 2c7471a Author: Yves Senn Date: 2014-02-12 16:16:22 +0100 Merge pull request #14025 from xtian/rails-new-quiet Hide bundler output for `rails new` if quiet option is specified. commit 7d5454d refs/remotes/origin/fxn/string-pools Merge: 6d14c22 af66c46 Author: Carlos Antonio da Silva Date: 2014-02-12 10:12:13 -0200 Merge pull request #14026 from sferik/rbx-2 Update Travis settings for Rubinius commit af66c46 refs/remotes/origin/fxn/string-pools Author: Erik Michaels-Ober Date: 2014-02-12 12:55:47 +0100 Update Travis settings for Rubinius /cc @brixen M .travis.yml M Gemfile commit 6d14c22 refs/remotes/origin/fxn/string-pools Merge: f34e0c4 42b2e32 Author: Carlos Antonio da Silva Date: 2014-02-12 09:48:27 -0200 Merge pull request #14023 from prathamesh-sonpatki/assert_redirected_to [Testing Guide] Explain usage of assert_redirected_to with named routes and ActiveRecord objects [ci skip] commit 42b2e32 refs/remotes/origin/fxn/string-pools Author: Prathamesh Sonpatki Date: 2014-02-12 09:53:28 +0530 [Testing Guide] Explain usage of assert_redirected_to with named routes and Active Record objects [ci skip] M guides/source/testing.md commit 2c7471a refs/remotes/origin/fxn/string-pools Author: Christian Wesselhoeft Date: 2014-02-11 23:11:02 -0800 Hide bundler output for `rails new` if quiet option is specified. M railties/lib/rails/generators/app_base.rb commit f34e0c4 refs/remotes/origin/fxn/string-pools Author: kayvan Date: 2014-02-09 11:00:45 -0800 adding missed change M activerecord/lib/active_record/migration.rb commit 2862cd8 refs/remotes/origin/fxn/string-pools Author: kayvan Date: 2014-02-09 10:26:10 -0800 adding connection parameter to check_pending for migrations M activerecord/lib/active_record/migration.rb commit c5034d6 refs/remotes/origin/fxn/string-pools Author: Aaron Patterson Date: 2014-02-11 14:08:12 -0800 add a send so `apply` can be called. Fixes #13510 THIS IS A HUGE HACK. Thor does not allow us to define public methods without turning them in to "thor tasks". That means we cannot subclass the `apply` method and make it public, so we have to make the method private and call `send` on it. M railties/lib/rails/tasks/framework.rake A railties/test/application/rake/templates_test.rb commit e00ab2d refs/remotes/origin/fxn/string-pools Author: Xavier Noria Date: 2014-02-11 17:16:31 +0100 Revert "Don't symbolize tainted data." [ci skip] Reason: i18n whitelists now locales without passing through symbols, see https://github.com/svenfuchs/i18n/blob/master/lib/i18n.rb#L278. Therefore, this snippet is no longer a good practice. This reverts commit ec0664a6eb8906fcd31a53a1efad69bdc7fe6f5b. M guides/source/i18n.md commit 4359bc6 refs/remotes/origin/fxn/string-pools Merge: b12c1b8 ec0664a Author: Xavier Noria Date: 2014-02-11 17:07:17 +0100 Merge pull request #14016 from devlinzed/i18n_doc_fix Documentation: Don't symbolize tainted data. [ci skip] commit ec0664a refs/remotes/origin/fxn/string-pools Author: devlin zed Date: 2014-02-11 10:44:45 -0500 Don't symbolize tainted data. `I18n.locale=` symbolizes its argument, so passing it `params[:locale]` allows one to DOS your application by visiting `...?locale=` URLS repeatedly, with unique values, until the never-GCed symbols monopolize the available memory. M guides/source/i18n.md commit b12c1b8 refs/remotes/origin/fxn/string-pools Merge: 4b11dcc 3a0cc5c Author: Guillermo Iguaran Date: 2014-02-11 10:34:00 -0500 Merge pull request #14015 from acapilleri/add_patch add patch in HTTP Verb Constraints [ci skip] commit 3a0cc5c refs/remotes/origin/fxn/string-pools Author: Angelo capilleri Date: 2014-02-11 16:28:39 +0100 add patch in HTTP Verb Constraints [ci skip] M guides/source/routing.md commit 4b11dcc refs/remotes/origin/fxn/string-pools Author: Yves Senn Date: 2014-02-11 13:58:04 +0100 test case to illustrate current PostgreSQL composite behavior. A activerecord/test/cases/adapters/postgresql/composite_test.rb commit 888386a refs/remotes/origin/fxn/string-pools Merge: f0d8996 2868bab Author: Vijay Dev Date: 2014-02-11 17:49:01 +0530 Merge pull request #13571 from bak/getting_started_guide A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] commit dafc0ee refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-11 03:56:35 -0800 rm warning about variable shadowing M actionpack/lib/action_dispatch/middleware/cookies.rb commit 7a3ef98 refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-11 02:55:48 -0800 Migrate hash-based cookie values correctly M actionpack/lib/action_dispatch/middleware/cookies.rb commit 0b86a6e refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-11 02:13:09 -0800 Updated CHANGELOG, docs, guides and release notes. Also added a `cookies_serializer.rb` initializer to the app template. M actionpack/CHANGELOG.md M guides/source/4_1_release_notes.md M guides/source/action_controller_overview.md M guides/source/upgrading_ruby_on_rails.md A railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb commit ecf04f1 refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-11 00:45:44 -0800 Added changelog entry for Flash changes [ci skip] M actionpack/CHANGELOG.md commit 9fc7a6f refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-11 00:43:37 -0800 Missed FlashHash#replace M actionpack/lib/action_dispatch/middleware/flash.rb commit b97e087 refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-11 00:38:36 -0800 Fixed broken flash tests M actionpack/lib/action_dispatch/middleware/flash.rb M actionpack/test/controller/flash_test.rb commit cd5960e refs/remotes/origin/fxn/string-pools Author: Guillermo Iguaran Date: 2014-02-09 11:47:38 -0500 Fix AppGeneratorTest: serializer option was removed from session_store M railties/test/generators/app_generator_test.rb commit 3a89386 refs/remotes/origin/fxn/string-pools Author: Guillermo Iguaran Date: 2014-02-09 11:05:25 -0500 Remove serializer option from session_store.rb template M railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt commit ead947a refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-09 01:12:11 -0800 Re-write legacy (marshal) cookies on read M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb commit a668bef refs/remotes/origin/fxn/string-pools Author: Guillermo Iguaran Date: 2014-02-09 00:35:10 -0500 Stringify the incoming hash in FlashHash Stringify the incoming as well to handle incoming symbol keys from marshalled sessions M actionpack/lib/action_dispatch/middleware/flash.rb commit a6ce984 refs/remotes/origin/fxn/string-pools Author: Guillermo Iguaran Date: 2014-02-08 23:56:40 -0500 Convert FlashHash in a Hash with indifferent access M actionpack/lib/action_dispatch/middleware/flash.rb M actionpack/test/controller/flash_hash_test.rb commit ba6861d refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-08 11:28:53 -0800 Changed the tests to ensure HybridSerializer actually migrates the cookies (currently failing) M actionpack/test/dispatch/cookies_test.rb commit 6de4888 refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-08 10:16:43 -0800 Fixed minor typo in test code M actionpack/test/dispatch/cookies_test.rb commit d4b7aa7 refs/remotes/origin/fxn/string-pools Author: Rafael Mendonça França Date: 2014-02-08 01:23:06 -0200 Tests for the HybridSerializer M actionpack/test/dispatch/cookies_test.rb commit 25f68ac refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-05 03:24:49 -0800 Removed an old test M actionpack/test/dispatch/cookies_test.rb commit fafe8ec refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-05 03:17:28 -0800 Added HybridSerializer to upgrade existing marshal cookies (wip: need tests) M actionpack/lib/action_dispatch/middleware/cookies.rb commit 54641fa refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-05 03:15:11 -0800 Just very so slightly better test coverage M actionpack/test/dispatch/cookies_test.rb commit b927d67 refs/remotes/origin/fxn/string-pools Author: Godfrey Chan Date: 2014-02-04 09:31:48 -0800 Renamed session_serializer option to cookies_serializer M actionpack/lib/action_dispatch.rb M actionpack/lib/action_dispatch/middleware/cookies.rb D actionpack/lib/action_dispatch/middleware/session/json_serializer.rb D actionpack/lib/action_dispatch/middleware/session/marshal_serializer.rb M actionpack/test/dispatch/cookies_test.rb M guides/source/action_controller_overview.md M railties/lib/rails/application.rb commit f0d8996 refs/remotes/origin/fxn/string-pools Merge: 92f567a c71e96b Author: Carlos Antonio da Silva Date: 2014-02-11 07:21:37 -0200 Merge pull request #14008 from udaykadaboina/jqueryUpgrade Upgraded jquery-rails gem version commit 92f567a refs/remotes/origin/fxn/string-pools Author: Yves Senn Date: 2014-02-11 09:06:28 +0100 docs, hide inflector comment targeting only contributors. [ci skip] This is a follow up to: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e As suggested by @fxn this comment should not be visible in the API: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e#commitcomment-5331658 M activesupport/lib/active_support/inflections.rb commit 5c3eda8 refs/heads/master Author: Zachary Scott Date: 2014-02-10 23:29:33 -0800 Add tip about using RDoc's --pipe command to quickly test the output of a piece of documentation. This can be useful for trying out combinations of markup and code, as discussed in rails/rails@225bcad M guides/source/api_documentation_guidelines.md commit ccb0301 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-01-05 00:24:57 +0000 Use a custom route vistor for optimized route generation Using a Regexp to replace dynamic segments in a path string is fraught with difficulty and can lead to odd edge cases like #13349. Since we already have a parsed representation of the path it makes sense to use that to generate an array of segments that can be used to build an optimized route's path quickly. Tests on a simple route (e.g. /posts/:id) show a speedup of 35%: https://gist.github.com/pixeltrix/8261932 Calculating ------------------------------------- Current Helper: 5274 i/100ms New Helper: 8050 i/100ms ------------------------------------------------- Current Helper: 79263.6 (±3.7%) i/s - 395550 in 4.997252s New Helper: 153464.5 (±4.9%) i/s - 772800 in 5.047834s Tests on a more complex route show even an greater performance boost: https://gist.github.com/pixeltrix/8261957 Calculating ------------------------------------- Current Helper: 2367 i/100ms New Helper: 5382 i/100ms ------------------------------------------------- Current Helper: 29506.0 (±3.2%) i/s - 149121 in 5.059294s New Helper: 78815.5 (±4.1%) i/s - 398268 in 5.062161s It also has the added benefit of fixing the edge cases described above. Fixes #13349 (cherry picked from commit d017e92e1d825c6bf9fa49c339c55ca920effe45) Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/visitors.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 488885a refs/remotes/origin/fxn/string-pools Merge: 73a431a 67e6dee Author: Rafael Mendonça França Date: 2014-02-10 21:05:49 -0200 Merge pull request #14007 from kintamanimatt/missing_directory_slashes Add missing directory slashes [ci skip] commit 67e6dee refs/remotes/origin/fxn/string-pools Author: Matthew Nicholas Bradley Date: 2014-02-10 22:55:37 +0000 Add missing directory slashes [ci skip] M guides/source/getting_started.md commit 73a431a refs/remotes/origin/fxn/string-pools Author: Rafael Mendonça França Date: 2014-02-10 19:33:48 -0200 Avoid using deprecated arel constants M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/associations/join_helper.rb commit e063dbc refs/remotes/origin/fxn/string-pools Merge: 3b868cc ae28e4b Author: Rafael Mendonça França Date: 2014-02-10 14:46:36 -0200 Merge pull request #13919 from jcoyne/fix_jruby_encoding Fix tidy_bytes for JRuby commit 3b868cc refs/remotes/origin/fxn/string-pools Author: Yves Senn Date: 2014-02-10 15:51:51 +0100 docs, link to HTTP and CGI header definitions. [ci skip] This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210 M actionpack/test/dispatch/rack_test.rb M guides/source/testing.md commit 56fa194 refs/remotes/origin/fxn/string-pools Author: Yves Senn Date: 2014-02-10 15:32:01 +0100 docs, update broken link. [ci skip] from https://github.com/rack/rack/blob/master/lib/rack/server.rb#L289-L300. M guides/source/initialization.md commit ae28e4b refs/remotes/origin/fxn/string-pools Author: Justin Coyne Date: 2014-02-01 22:13:07 -0600 Fix tidy_bytes for JRuby The previous implementation was broken because JRuby (1.7.10) doesn't have a code converter for UTF-8 to UTF8-MAC. M activesupport/CHANGELOG.md M activesupport/lib/active_support/multibyte/unicode.rb commit 07c7024 refs/remotes/origin/fxn/string-pools Author: Yves Senn Date: 2014-02-10 08:50:06 +0100 docs, mention that the current inflection rules are frozen. [ci skip] Closes #13993. M activesupport/lib/active_support/inflections.rb commit 3a428f3 refs/remotes/origin/fxn/string-pools Merge: e4911e9 395bcb5 Author: Robin Dupret Date: 2014-02-09 21:54:15 +0100 Merge pull request #13998 from gaurish/doc-rails-threadsafe `Rails.threadsafe!` mode is deprecated, Update Docs [ci skip] commit 2868bab refs/remotes/origin/fxn/string-pools Author: Ben Cullen-Kerney Date: 2014-01-01 21:25:40 -0800 A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] * Add note about managing Ruby environments * Point to curated lists of Ruby learning resources * Expound on DRY and Convention over Configuration * Remove note on superuser--thankfuly coders new to Rails don't have to sudo anymore :) * Installation/verification instructions for SQLite3, since it's a dependency M guides/source/getting_started.md commit 395bcb5 refs/remotes/origin/fxn/string-pools Author: Gaurish Sharma Date: 2014-02-10 00:53:51 +0530 `Rails.threadsafe!` mode is deprecated [ci skip] M guides/source/configuring.md commit ce671be refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-02-09 10:36:45 -0800 Set the :shallow_path as each scope is generated If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498. (cherry picked from commit 462d7cb3148e95c9a793d33fd882a99f0d9c57c2) Conflicts: actionpack/CHANGELOG.md actionpack/test/dispatch/routing_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit e4911e9 refs/remotes/origin/fxn/string-pools Merge: 462d7cb 8acd58f Author: Rafael Mendonça França Date: 2014-02-09 16:51:59 -0200 Merge pull request #13997 from dmitry/test_coverage_improvement Test coverage improvement commit 462d7cb refs/remotes/origin/fxn/string-pools Author: Andrew White Date: 2014-02-09 10:36:45 -0800 Set the :shallow_path as each scope is generated If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 8acd58f refs/remotes/origin/fxn/string-pools Author: Dmitry Polushkin Date: 2014-02-09 01:34:14 +0000 add test coverage for activemodel Dirty#reset_changes M activemodel/test/cases/dirty_test.rb commit 5af7cab refs/remotes/origin/fxn/string-pools Author: Dmitry Polushkin Date: 2014-02-09 18:41:41 +0000 add actionmailer test coverage for undefined delivery method M actionmailer/lib/action_mailer/base.rb M actionmailer/test/delivery_methods_test.rb commit 72e11ab refs/remotes/origin/fxn/string-pools Author: Vijay Dev Date: 2014-02-09 23:58:09 +0530 Simplify doc [ci skip] The `as` option was already explained in a previous example and doesn't need to be repeated. Explain only the `locals` option which the example is meant for. M guides/source/layouts_and_rendering.md commit ccd908f refs/remotes/origin/fxn/string-pools Merge: 8b5d08a 6c252b5 Author: Vijay Dev Date: 2014-02-09 23:51:46 +0530 Merge pull request #13630 from seapy/master Fixed typo [ci skip] commit 8b5d08a refs/remotes/origin/fxn/string-pools Merge: 92fdd65 f25e411 Author: Vijay Dev Date: 2014-02-09 23:39:49 +0530 Merge pull request #13994 from elysdir/master Clarifying confusing phrasing commit 92fdd65 refs/heads/master Merge: 33be58b ae7580a Author: Vijay Dev Date: 2014-02-09 23:33:55 +0530 Merge branch 'master' of github.com:rails/docrails Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md commit f25e411 refs/remotes/origin/fxn/string-pools Author: Jed Hartman Date: 2014-02-09 09:36:53 -0800 Clarifying confusing phrasing M guides/source/getting_started.md commit 33be58b refs/heads/master Merge: a5ee843 069bc27 Author: Aaron Patterson Date: 2014-02-09 08:50:28 -0800 Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursion Fix response flatten infinite recursion commit a5ee843 refs/heads/master Merge: e08514e 8d7923b Author: Rafael Mendonça França Date: 2014-02-09 11:58:10 -0200 Merge pull request #13990 from zzak/ap_dont_autoload_filter_parameters FilterParameters is referenced at the class level from the Request commit e08514e refs/heads/master Merge: a503444 dfe9cf1 Author: Carlos Antonio da Silva Date: 2014-02-09 11:49:18 -0200 Merge pull request #13985 from zzak/remove_old_todo_in_url_for_test Remove outdated TODO from url_for test, this test was fixed in 900a2d30 commit a503444 refs/heads/master Author: Zachary Scott Date: 2014-02-09 08:57:06 +0200 Remove end of line whitespace from bb87c16 M guides/source/getting_started.md commit ec43584 refs/remotes/origin/fxn/string-pools Author: Dmitry Polushkin Date: 2014-02-09 12:05:42 +0000 add activerecord test coverage for `sanitize_sql_array` check it is handles empty statement M activerecord/test/cases/sanitize_test.rb commit 424b2d8 refs/remotes/origin/fxn/string-pools Author: Dmitry Polushkin Date: 2014-02-09 12:04:26 +0000 move alias method `sanitize_conditions` to a correct place M activerecord/lib/active_record/sanitization.rb commit ae7580a refs/heads/master Author: Zachary Scott Date: 2014-02-09 10:03:30 +0200 Fixed a grammatical error in Booleans section of API documentation guide from e1e17a5 M guides/source/api_documentation_guidelines.md commit 7afd92e refs/heads/master Author: Xavier Noria Date: 2014-01-26 22:10:05 +0100 adds a section about booleans in the API guidelines [ci skip] M guides/source/api_documentation_guidelines.md commit 605c81b refs/heads/master Author: Zachary Scott Date: 2014-02-09 09:39:22 +0200 Use full-length version of multiple from c7abc51 M guides/source/active_record_validations.md commit 4e4a92e refs/heads/master Author: Yves Senn Date: 2014-02-04 13:37:11 +0100 docs, link MySQL manual for multi column indexes. [ci ckip]. Closes #9131. M guides/source/active_record_validations.md commit 17b0edd refs/heads/master Author: Zachary Scott Date: 2014-02-09 03:07:33 +0200 Specify what #starts_with? we're talking about. Also added a note what kind of exception we should expect for this internal comment. M activesupport/lib/active_support/dependencies.rb commit dbe3345 refs/heads/master Author: Zachary Scott Date: 2014-02-09 03:06:19 +0200 Fix grammar of internal comment and modify it's location M activesupport/lib/active_support/core_ext/module/attr_internal.rb commit 8d7923b refs/heads/master Author: Zachary Scott Date: 2014-02-09 11:30:49 +0200 FilterParameters is referenced at the class level from the Request Since it's already required in the file, we don't need to use autoload too. This commit is symmetrical change to 0b10180 for Response. M actionpack/lib/action_dispatch.rb commit 6ac2655 refs/heads/master Merge: 76af5c1 a09c078 Author: Godfrey Chan Date: 2014-02-09 01:14:00 -0800 Merge pull request #13983 from hsbt/remove-warning use File.exist? instead of File.exists? commit a09c078 refs/heads/master Author: SHIBATA Hiroshi Date: 2014-02-09 17:39:55 +0900 use File.exist? instead of File.exists? M actionpack/test/dispatch/static_test.rb commit 069bc27 refs/heads/master Author: Dan Kang Date: 2014-02-08 17:40:08 -0800 Prevent [response].flatten from recursing infinitely. Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec. M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/dispatch/response_test.rb commit 76af5c1 refs/heads/master Author: Aaron Patterson Date: 2014-02-08 23:21:07 -0800 use feature detection to decide which implementation to use Decouple the code from the particular Ruby version. M activesupport/lib/active_support/multibyte/unicode.rb commit 9337f64 refs/remotes/origin/4-0-stable Author: Aaron Patterson Date: 2014-02-08 23:12:07 -0800 Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafe Reaper has access to threadsafe active? call M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/connection_pool_test.rb M activerecord/test/cases/reaper_test.rb commit e4dc303 refs/heads/master Merge: f99b254 02a3c0e Author: Aaron Patterson Date: 2014-02-08 23:12:07 -0800 Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafe Reaper has access to threadsafe active? call commit dfe9cf1 refs/heads/master Author: Zachary Scott Date: 2014-02-09 04:20:56 +0200 Remove outdated TODO from url_for test, this test was fixed in 900a2d30 M actionpack/test/controller/url_for_test.rb commit cbd10e2 refs/heads/master Author: Myron Marston Date: 2014-02-02 14:55:35 -0800 Add missing test for response destructuring. M actionpack/test/dispatch/response_test.rb commit 02a3c0e refs/heads/master Author: Kevin Casey Date: 2014-02-08 17:38:54 -0800 Reaper has access to threadsafe active? call M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/connection_pool_test.rb M activerecord/test/cases/reaper_test.rb commit f99b254 refs/heads/master Merge: 3b684dd 5e3d466 Author: Aaron Patterson Date: 2014-02-08 17:11:27 -0800 Merge pull request #13978 from Fortisque/kevin/validation_context_for_children context in validation goes through has many relationship commit 3b684dd refs/heads/master Merge: 1ec25d1 28a450d Author: Aaron Patterson Date: 2014-02-08 17:11:03 -0800 Merge pull request #13980 from mellowi/skipping_linked_folder_tests_if_symlink_is_invalid Skips linked folder tests if symlink is invalid commit 28a450d refs/heads/master Author: Mikko Johansson Date: 2014-02-09 02:52:32 +0200 Skips linked folder tests if symlink is invalid M activerecord/test/cases/fixtures_test.rb commit 1ec25d1 refs/heads/master Merge: 3c8e0a4 ccd1c43 Author: Aaron Patterson Date: 2014-02-08 16:11:08 -0800 Merge pull request #13979 from mellowi/windows_disallowed_static_files_skipped Skips tests on Windows that create files with illegal characters commit 3c8e0a4 refs/heads/master Merge: 3c2fe5c 4fa8c8b Author: Aaron Patterson Date: 2014-02-08 16:04:37 -0800 Merge pull request #13977 from Octember/master Fixed an issue where reloading of removed dependencies would cause an un... commit ccd1c43 refs/heads/master Author: Mikko Johansson Date: 2014-02-09 02:02:44 +0200 Skips tests on Windows that create files with illegal characters M actionpack/test/dispatch/static_test.rb commit 4fa8c8b refs/heads/master Author: Noah Lindner Date: 2014-02-08 15:35:12 -0800 Fixed an issue where reloading of removed dependencies would cause an unexpected circular dependency error M activesupport/lib/active_support/dependencies.rb M activesupport/test/dependencies_test.rb commit 3c2fe5c refs/heads/master Merge: 7757714 1ea61cb Author: Rafael Mendonça França Date: 2014-02-08 19:05:42 -0200 Merge pull request #13974 from laurocaetano/test_case_for_autosave_with_accepts_nested_attributes Add test case for autosave association with nested attributes. commit 1ea61cb refs/heads/master Author: Lauro Caetano Date: 2014-02-08 18:46:32 -0200 Add test case for autosave HasMany with accepts_nested_attributes. It should not save the parent record when the nested attributes are invalid. Test case to cover #8194. M activerecord/test/cases/autosave_association_test.rb M activerecord/test/models/electron.rb M activerecord/test/models/molecule.rb commit a373ec7 refs/remotes/origin/4-0-stable Author: Godfrey Chan Date: 2014-02-08 10:00:09 -0800 Updated the cookie docs to use the safer JSON.{generate,parse} cc @senny M actionpack/lib/action_dispatch/middleware/cookies.rb commit 7757714 refs/heads/master Author: Godfrey Chan Date: 2014-02-08 10:00:09 -0800 Updated the cookie docs to use the safer JSON.{generate,parse} cc @senny M actionpack/lib/action_dispatch/middleware/cookies.rb commit 5e3d466 refs/heads/master Author: Kevin Casey Date: 2014-02-08 08:44:10 -0800 context in validation goes through has many relationship M activerecord/lib/active_record/autosave_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/pirate.rb M activerecord/test/models/ship.rb commit 50d828c refs/heads/master Author: Robin Dupret Date: 2014-02-08 16:31:12 +0100 Rely on backticks instead of tt tags [ci skip] Since the language in code blocks is inferred, if the code contains tt tags, the block will be parsed as XML for instance while it is Ruby. M actionpack/lib/action_dispatch/middleware/cookies.rb commit eebb813 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-08 13:42:10 +0100 docs, Cookie values are String based. Closes #12860. [ci skip] M actionpack/lib/action_dispatch/middleware/cookies.rb commit 519deb6 refs/heads/master Author: Yves Senn Date: 2014-02-08 13:42:10 +0100 docs, Cookie values are String based. Closes #12860. [ci skip] M actionpack/lib/action_dispatch/middleware/cookies.rb commit 3f90787 refs/heads/master Author: Andrew White Date: 2014-02-07 17:08:09 -0800 Adjust test value so that timezone has no effect If the test is run in a timezone that is behind UTC it fails because the time generated is ahead of 0000-01-01 00:00:00. Just increase the time subtracted so that timezone has no effect. M activerecord/test/cases/adapters/postgresql/timestamp_test.rb commit ed66361 refs/heads/master Merge: 9da2ae1 8fffcfc Author: Yves Senn Date: 2014-02-07 18:42:51 +0100 Merge pull request #13952 from prathamesh-sonpatki/testing [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip] commit 9da2ae1 refs/heads/master Merge: 2248684 47860b6 Author: Yves Senn Date: 2014-02-07 18:41:49 +0100 Merge pull request #13967 from fphilipe/fix-missing-action-view-const Require action_view to fix missing constant ENCODING_FLAG commit 8fffcfc refs/heads/master Author: Prathamesh Sonpatki Date: 2014-02-06 00:07:35 +0530 [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip] M guides/source/testing.md commit 47860b6 refs/heads/master Author: Philipe Fatio Date: 2014-02-07 11:06:55 +0100 Require action_view to fix missing constant Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view. M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/rendering.rb commit 2248684 refs/heads/master Merge: e3d8194 bb87c16 Author: Yves Senn Date: 2014-02-07 15:09:13 +0100 Merge pull request #13968 from kintamanimatt/fix-wordy-sentence Fix wordy sentence [ci-skip] commit bb87c16 refs/heads/master Author: Matthew Nicholas Bradley Date: 2014-02-07 14:03:39 +0000 Fix wordy sentence M guides/source/getting_started.md commit 2fdbd59 refs/heads/master Author: Calvin Tam Date: 2014-02-07 20:02:34 +1100 Fixed spelling error: `extracetd` => `extracted` M guides/source/4_1_release_notes.md commit e3d8194 refs/heads/master Merge: c0fb8d0 f8d740a Author: Yves Senn Date: 2014-02-07 08:35:18 +0100 Merge pull request #13962 from iwiznia/test_controller_skip_action_class Test for skipping a controller filter set up with a class Part 3 commit f8d740a refs/heads/master Author: Ionatan Wiznia Date: 2014-02-06 20:11:40 +0100 Tests that skips a controller filters that was set up using a class M actionpack/test/controller/filters_test.rb commit c0fb8d0 refs/heads/master Merge: 7f648bc 8806768 Author: Xavier Noria Date: 2014-02-06 15:03:20 +0100 Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md commit 8806768 refs/heads/master Author: Emil Soman Date: 2014-02-05 13:02:38 +0530 Add config to disable schema dump after migration * Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/railties/databases.rake M guides/source/configuring.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/test/application/configuration_test.rb M railties/test/application/rake/migrations_test.rb commit 7f648bc refs/heads/master Author: Yves Senn Date: 2014-02-06 12:18:46 +0100 docs, Associations also raise on name conflicts. [ci skip] Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470 M guides/source/4_1_release_notes.md commit 580f0b6 refs/heads/master Author: Yves Senn Date: 2014-02-06 11:43:16 +0100 synchronize 4.1 release notes with CHANGELOGS. [ci skip] /cc @chancancode M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/source/4_1_release_notes.md M railties/CHANGELOG.md commit b9ead0f refs/heads/master Author: dpmehta02 Date: 2014-02-05 02:26:24 -0800 update contribution doc grammar. [ci skip] - Manually applied from #13951. - Discussion at #13947. - Removed trailing whitespace from https://github.com/dpmehta02/rails/commit/18044e86af93672dfc38befbe974261e87b3518d /cc @dpmehta02 M guides/source/contributing_to_ruby_on_rails.md commit c82dbc6 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-06 01:03:41 -0200 Fix to_query with empty arrays too M activesupport/lib/active_support/core_ext/object/to_query.rb M activesupport/test/core_ext/object/to_query_test.rb commit 7aa4b7d refs/heads/master Author: Rafael Mendonça França Date: 2014-02-05 23:55:50 -0200 Add CHANGELOG entry Closes #13909 M activesupport/CHANGELOG.md commit ab51b28 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-05 23:55:17 -0200 Refatoring the method to avoid shot-circuit return M activesupport/lib/active_support/core_ext/object/to_param.rb M activesupport/test/core_ext/object/to_query_test.rb commit d6e3fd7 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-05 23:47:16 -0200 Test with a blank value M activesupport/test/core_ext/object/to_query_test.rb commit 88b064d refs/heads/master Author: Rafael Mendonça França Date: 2014-02-05 23:42:43 -0200 Move test to the right file M activesupport/test/core_ext/object/to_param_test.rb M activesupport/test/core_ext/object/to_query_test.rb commit 326e652 refs/heads/master Author: Hincu Petru Date: 2014-02-03 09:51:05 +0000 Fixed "Hash#to_param confused by empty hash values #13892" M activesupport/lib/active_support/core_ext/object/to_param.rb M activesupport/test/core_ext/object/to_param_test.rb commit 6cc3afb refs/heads/master Merge: 84fe7b7 26698fb Author: Rafael Mendonça França Date: 2014-02-05 23:07:01 -0200 Merge pull request #13953 from seanwalbran/fix-humanize-match-reference fix interplay of humanize and html_escape commit 26698fb refs/heads/master Author: Sean Walbran Date: 2014-02-05 17:19:51 -0600 fix interplay of humanize and html_escape M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/core_ext/string_ext_test.rb commit 84fe7b7 refs/heads/master Merge: 1df4dcf a476020 Author: Rafael Mendonça França Date: 2014-02-05 20:10:45 -0200 Merge pull request #13938 from marcandre/sized_enumerator Sized enumerator commit a476020 refs/heads/master Author: Marc-Andre Lafortune Date: 2014-02-04 02:18:03 -0500 Return sized enumerator from Enumerable#index_by M activerecord/CHANGELOG.md M activesupport/lib/active_support/core_ext/enumerable.rb M activesupport/test/core_ext/enumerable_test.rb commit 13d2696 refs/heads/master Author: Marc-Andre Lafortune Date: 2014-01-29 15:42:07 -0500 Return sized enumerator from Batches#find_each M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/lib/active_record/result.rb M activerecord/test/cases/batches_test.rb M activerecord/test/cases/result_test.rb M activesupport/lib/active_support/core_ext/enumerable.rb commit d37f395 refs/heads/master Author: Marc-Andre Lafortune Date: 2014-01-29 14:53:54 -0500 Return sized enumerator from Batches#find_in_batches M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit 4499ab5 refs/heads/master Author: Marc-Andre Lafortune Date: 2014-02-04 01:47:40 -0500 Strengthen test with different nb of rows and columns M activerecord/test/cases/result_test.rb commit 39b2cc1 refs/heads/master Author: Marc-Andre Lafortune Date: 2014-02-04 01:57:27 -0500 Remove obsolete test (builtin group_by is now used) M activesupport/test/core_ext/enumerable_test.rb commit 4c3e11d refs/heads/master Author: Marc-Andre Lafortune Date: 2014-02-04 01:51:21 -0500 Remove obsolete line (was needed for Ruby 1.8.7 support) M activesupport/test/core_ext/enumerable_test.rb commit 1df4dcf refs/heads/master Author: Yves Senn Date: 2014-02-05 15:16:28 +0100 remove gemnasium batch from README. [ci skip] The rails/rails gemnasium page (https://gemnasium.com/rails/rails) is not helping much. It lists 0 dependencies so there is not much to track. Also our gems mostly depend on other gems we control. There is not much point in monitoring them. The batch was introduced with #3909. M README.md commit 10867a7 refs/heads/master Author: Arun Agrawal Date: 2014-02-05 11:14:24 +0100 Removed unused commented code [ci skip] As discussed in #13940 this can be removed We can document this somewhere else in testing guides. M guides/source/testing.md commit 069a010 refs/heads/master Merge: 132834b 128fa3b Author: Arun Agrawal Date: 2014-02-05 10:41:01 +0100 Merge pull request #13950 from calvintam/fix_typos Fixed typos commit 128fa3b refs/heads/master Author: Calvin Tam Date: 2014-02-05 19:55:06 +1100 Fixed typos [ci skip] M guides/source/configuring.md commit 132834b refs/heads/master Merge: 3ba0eed 3877794 Author: Yves Senn Date: 2014-02-05 10:14:00 +0100 Merge pull request #13949 from vajrasky/fix_typo_column_definition_test Fixed typos in column_definition_test.rb. commit 3877794 refs/heads/master Author: Vajrasky Kok Date: 2014-02-05 16:51:34 +0800 Fixed typo in column_definition_test.rb. M activerecord/test/cases/column_definition_test.rb commit 9369486 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-05 08:52:59 +0100 docs, AR already auto-detects primary keys. Closes #13946. This behavior was introduced since Rails 3.1 (207f266ccaaa9cd04cd2a7513ae5598c4358b510) but the docs were still out of date. Conflicts: activerecord/test/models/mixed_case_monkey.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/models/mixed_case_monkey.rb commit 3ba0eed refs/heads/master Author: Yves Senn Date: 2014-02-05 08:52:59 +0100 docs, AR already auto-detects primary keys. Closes #13946. [ci skip] This behavior was introduced since Rails 3.1 (207f266ccaaa9cd04cd2a7513ae5598c4358b510) but the docs were still out of date. M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/models/mixed_case_monkey.rb commit f92142d refs/heads/master Author: Rafael Mendonça França Date: 2014-02-04 15:27:57 -0200 Document that enum conditions must use the ordinal value [ci skip] M activerecord/lib/active_record/enum.rb commit 9079432 refs/heads/master Merge: 404cb36 e9bfa28 Author: Rafael Mendonça França Date: 2014-02-04 08:45:28 -0800 Merge pull request #13943 from loganhasson/master [ci skip] Add missing 'task' to note on Running Migrations commit e9bfa28 refs/heads/master Author: Logan Hasson Date: 2014-02-04 11:43:26 -0500 [ci skip] Add missing 'task' to note on Running Migrations M guides/source/migrations.md commit bff8c2c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-04 06:03:14 -0800 Merge pull request #13935 from arthurnn/fix_12566 Make sure transaction state resets after commit M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transaction_callbacks_test.rb commit 404cb36 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-04 12:13:14 -0200 Add CHANGELOG entry for #13935 [ci skip] M activerecord/CHANGELOG.md commit f1a6307 refs/heads/master Merge: 75510a6 9b66d6d Author: Rafael Mendonça França Date: 2014-02-04 06:03:14 -0800 Merge pull request #13935 from arthurnn/fix_12566 Make sure transaction state resets after commit commit 75510a6 refs/heads/master Merge: c7abc51 d3edf1e Author: Arun Agrawal Date: 2014-02-04 04:58:04 -0800 Merge pull request #13940 from gregmolnar/guides add missing sharp [ci skip] commit d3edf1e refs/heads/master Author: Greg Molnar Date: 2014-02-04 13:54:22 +0100 add missing sharp [ci skip] M guides/source/testing.md commit c7abc51 refs/heads/master Author: Yves Senn Date: 2014-02-04 13:37:11 +0100 docs, link MySQL manual for multi column indexes. [ci ckip]. Closes #9131. M guides/source/active_record_validations.md commit 702e0e1 refs/heads/master Merge: 7d196cf 00ebbb7 Author: Rafael Mendonça França Date: 2014-02-04 04:11:46 -0800 Merge pull request #13899 from Fortisque/kevin/active_record_HABTM_with_belongs_to destruction errors out on HABTM w/out primary key commit 98e2ae9 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-04 10:27:46 +0100 `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399. The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key) states that it returns `nil` if there are no key attributes. `to_param` needs to be aware of that fact and return `nil` as well. Previously it raised the following exception: ``` 1) Error: ConversionTest#test_to_param_returns_nil_if_to_key_is_nil: NoMethodError: undefined method `join' for nil:NilClass /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param' /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in ' ``` Conflicts: activemodel/CHANGELOG.md M activemodel/CHANGELOG.md M activemodel/lib/active_model/conversion.rb M activemodel/test/cases/conversion_test.rb commit 7d196cf refs/heads/master Author: Yves Senn Date: 2014-02-04 10:27:46 +0100 `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399. The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key) states that it returns `nil` if there are no key attributes. `to_param` needs to be aware of that fact and return `nil` as well. Previously it raised the following exception: ``` 1) Error: ConversionTest#test_to_param_returns_nil_if_to_key_is_nil: NoMethodError: undefined method `join' for nil:NilClass /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param' /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in ' ``` M activemodel/CHANGELOG.md M activemodel/lib/active_model/conversion.rb M activemodel/test/cases/conversion_test.rb commit a5dd1d2 refs/heads/master Merge: 28abd96 b10f45c Author: Guillermo Iguaran Date: 2014-02-03 19:20:52 -0800 Merge pull request #13936 from edogawaconan/fix_docs Missing closing parenthesis. [ci skip] commit b10f45c refs/heads/master Author: edogawaconan Date: 2014-02-04 11:46:59 +0900 Missing closing parenthesis. M guides/source/i18n.md commit c71e96b refs/remotes/origin/fxn/string-pools Author: Uday Kadaboina Date: 2014-02-03 19:49:59 -0500 Upgraded jquery-rails gem version M Gemfile commit 9b66d6d refs/heads/master Author: Arthur Neves Date: 2014-02-03 15:29:26 -0500 Make sure transaction state resets after commit [fixes #12566] M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transaction_callbacks_test.rb commit d5e684f refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-03 08:38:44 -0800 Merge pull request #11770 from timruffles/doc_ajax_xhr be more specific about csrf token and ajax - not whitelisted outside of jquery-rails [ci skip] M actionpack/lib/action_view/helpers/csrf_helper.rb commit 28abd96 refs/heads/master Merge: dd493d3 08525e3 Author: Yves Senn Date: 2014-02-03 08:38:44 -0800 Merge pull request #11770 from timruffles/doc_ajax_xhr be more specific about csrf token and ajax - not whitelisted outside of jquery-rails [ci skip] commit dd493d3 refs/heads/master Author: Yves Senn Date: 2014-02-03 16:42:02 +0100 docs, be clear that `options` is a hash. Closes #11904. [ci skip]. M activesupport/lib/active_support/cache.rb commit 06dde5f refs/heads/master Author: Yves Senn Date: 2014-02-03 14:52:01 +0100 some wording format changes. [ci skip] M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb commit 584a464 refs/heads/master Author: Yves Senn Date: 2014-02-03 14:48:59 +0100 pass `habtm :autosave` to underlying `hm:t` association. Closes #13923. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/models/pirate.rb commit b7c7cb1 refs/heads/master Author: Yves Senn Date: 2014-02-03 13:27:23 +0100 docs, revisit polymorphic associations with STI example. [ci skip] This is a follow up to #13926. /cc @fxn M activerecord/lib/active_record/associations.rb commit c46b0d1 refs/heads/master Author: Yves Senn Date: 2014-02-03 11:55:16 +0100 docs, reference to ruby-lang.org. refs #13492. [ci skip] M guides/source/getting_started.md commit 67d4dc2 refs/heads/master Author: Yves Senn Date: 2014-02-03 11:59:01 +0100 `rails_guides/helpers.rb` requires `YAML` to run. Resolve the following error when running `bundle exec rake guides:generate:html`: ``` /Users/senny/.rbenv/versions/2.0.0-p353/bin/ruby rails_guides.rb Generating 2_2_release_notes.md as 2_2_release_notes.html /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:17:in `documents_by_section': uninitialized constant RailsGuides::Helpers::YAML (ActionView::Template::Error) from /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:32:in `docs_for_menu' from /Users/senny/Projects/rails/guides/source/layout.html.erb:56:in `block in ___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `each' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:143:in `block in render' from /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:161:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:337:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:141:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:61:in `render_with_layout' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:47:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:17:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:42:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:23:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/helpers/rendering_helper.rb:24:in `render' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:160:in `render_page' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:25:in `render' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:205:in `block in generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `open' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:144:in `block in generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `each' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:97:in `generate' from rails_guides.rb:63:in `
' rake aborted! Command failed with status (1): [/Users/senny/.rbenv/versions/2.0.0-p353/bi...] /Users/senny/Projects/rails/guides/Rakefile:11:in `block (3 levels) in ' Tasks: TOP => guides:generate:html (See full trace by running task with --trace) ``` M guides/rails_guides/helpers.rb commit 9321d67 refs/heads/master Merge: 7f8fbf7 8f0460d Author: Arun Agrawal Date: 2014-02-03 02:16:11 -0800 Merge pull request #13930 from calvintam/master Fixed minor typo [ci skip] commit 8f0460d refs/heads/master Author: Calvin Tam Date: 2014-02-03 21:09:29 +1100 Fixed minor typo [ci skip] M guides/source/testing.md commit 3469cee refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-02-02 23:25:44 -0800 Merge pull request #13926 from fredwu/doc_polymorphic_sti_var_name_typo Fixes the camelCase variable name in the docs [ci skip] M activerecord/lib/active_record/associations.rb commit 7f8fbf7 refs/heads/master Merge: 3e6d302 ca1121a Author: Yves Senn Date: 2014-02-02 23:25:44 -0800 Merge pull request #13926 from fredwu/doc_polymorphic_sti_var_name_typo Fixes the camelCase variable name in the docs [ci skip] commit ca1121a refs/heads/master Author: Fred Wu Date: 2014-02-03 12:02:07 +1100 Fixes the camelCase variable name in the docs [ci skip] M activerecord/lib/active_record/associations.rb commit 00ebbb7 refs/heads/master Author: Kevin Casey Date: 2014-02-02 11:47:06 -0800 fix HABTM w/out primary key errors on destruction M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb commit 3e6d302 refs/heads/master Merge: 4ac1144 4b4db54 Author: Rafael Mendonça França Date: 2014-02-02 08:30:35 -0800 Merge pull request #13924 from adomokos/adding_path_examples_to_button_to_tests Adding a documentation example and a test to button_to with path commit 4b4db54 refs/heads/master Author: Attila Domokos Date: 2014-02-02 10:27:18 -0600 Adding an documentation example and a test to button_to with path I did not see in the docs that `button_to` supports not only URLs but paths as well. I documented this functionality with a unit tests and added an example to the docs as well. M actionview/lib/action_view/helpers/url_helper.rb M actionview/test/template/url_helper_test.rb commit 4ac1144 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-01 18:29:53 -0200 Assert the file is deprecated M activesupport/test/core_ext/big_decimal/yaml_conversions_test.rb commit 8c679fe refs/heads/master Author: Rafael Mendonça França Date: 2014-02-01 18:29:41 -0200 Fix isolated tests M activesupport/lib/active_support/core_ext/big_decimal/yaml_conversions.rb commit a60ccad refs/heads/master Merge: 682a579 c87b27e Author: Rafael Mendonça França Date: 2014-02-01 18:03:21 -0200 Merge pull request #13911 from davidcelis/remove-bigdecimal-serialization Deprecate custom BigDecimal serialization Conflicts: activesupport/CHANGELOG.md commit c87b27e refs/heads/master Author: David Celis Date: 2014-02-01 10:26:50 -0800 Remove BigDecimal#to_d This was backported for Ruby 1.8 support and is no longer needed. Signed-off-by: David Celis M activesupport/lib/active_support/core_ext/big_decimal/conversions.rb M activesupport/test/core_ext/bigdecimal_test.rb commit 85d820b refs/heads/master Author: David Celis Date: 2014-01-31 17:42:21 -0800 Don't require BigDecimal serialization extension Rails currently provides an extension to BigDecimal that redefines how it is serialized to YAML. However, as noted in #12467, this does not work as expected. When ActiveSupport is required, BigDecimal YAML serialization does not maintain the object type. It instead ends up serializing the number represented by the BigDecimal itself which, when loaded by YAML later, becomes a Float: ```ruby require 'yaml' require 'bigdecimal' yaml = BigDecimal('13.37').to_yaml YAML.load(yaml).class require 'active_support/all' yaml = BigDecimal('13.37').to_yaml YAML.load(yaml).class ``` @tenderlove posits that we should deprecate the custom BigDecimal serialization and let Ruby handle it. For the time being, users who require this serialization for backwards compatibility can manually `require 'active_support/core_ext/big_decimal/yaml_conversions'`. This will close #12467 and deprecate the custom BigDecimal#to_yaml. Signed-off-by: David Celis M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/big_decimal/conversions.rb A activesupport/lib/active_support/core_ext/big_decimal/yaml_conversions.rb A activesupport/test/core_ext/big_decimal/yaml_conversions_test.rb M activesupport/test/core_ext/bigdecimal_test.rb commit e6003cb refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-01 16:36:13 -0200 Fix tests M activerecord/test/cases/adapters/postgresql/array_test.rb commit 682a579 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-01 16:27:58 -0200 Remove warnings for already defined methods M activerecord/test/cases/scoping/named_scoping_test.rb commit cd93d71 refs/heads/master Author: Rafael Mendonça França Date: 2014-02-01 16:16:06 -0200 Make arel methods private API Since its conception arel was made to be private API of Active Record. If users want to use arel features directly we should provide a way using the Active Record API without exposing the arel implementation. M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/relation/query_methods.rb commit 7971cb2 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-01 16:01:38 -0200 Merge pull request #13688 from jbaudanza/psql-index-exists PostgreSQL implementation of SchemaStatements#index_name_exists? Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb commit 83ea905 refs/heads/master Merge: e9be1c1 a099d7d Author: Rafael Mendonça França Date: 2014-02-01 16:01:38 -0200 Merge pull request #13688 from jbaudanza/psql-index-exists PostgreSQL implementation of SchemaStatements#index_name_exists? Conflicts: activerecord/CHANGELOG.md commit 4dcda46 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-01 15:53:27 -0200 Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-params Do not discard query parameters on requests that use wrap_parameters Conflicts: actionpack/CHANGELOG.md Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/params_wrapper.rb M actionpack/test/controller/params_wrapper_test.rb commit e9be1c1 refs/heads/master Merge: 989923e 1f9586f Author: Rafael Mendonça França Date: 2014-02-01 15:53:27 -0200 Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-params Do not discard query parameters on requests that use wrap_parameters Conflicts: actionpack/CHANGELOG.md commit a4d4afd refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-01 09:45:46 -0800 Merge pull request #13912 from mauricio/bug-13907 Fixes issue with parsing whitespace content back from database - fixes #13907 Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 989923e refs/heads/master Merge: 82701cd a34c10f Author: Rafael Mendonça França Date: 2014-02-01 09:45:46 -0800 Merge pull request #13912 from mauricio/bug-13907 Fixes issue with parsing whitespace content back from database - fixes #13907 commit 0603d53 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-02-01 14:49:32 -0200 Merge pull request #12769 from birkirb/master Boolean parser blows up on a Fixnum. Conflicts: activesupport/CHANGELOG.md Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/xml_mini.rb M activesupport/test/xml_mini_test.rb commit 82701cd refs/heads/master Merge: 9b2a017 8dd4aca Author: Rafael Mendonça França Date: 2014-02-01 14:49:32 -0200 Merge pull request #12769 from birkirb/master Boolean parser blows up on a Fixnum. Conflicts: activesupport/CHANGELOG.md commit a34c10f refs/heads/master Author: Mauricio Linhares Date: 2014-02-01 01:11:03 -0300 Fixes issue with parsing whitespace content back from database - fixes #13907 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 9b2a017 refs/heads/master Author: Aaron Patterson Date: 2014-01-31 14:10:31 -0800 this class depends on JoinHelper, so we should require it M activerecord/lib/active_record/associations/association_scope.rb commit 3fbff78 refs/heads/master Author: Aaron Patterson Date: 2014-01-31 12:05:50 -0800 just require the template resolver LookupContext is eagerly loaded, and FallbackFileSystemResolver is referenced at the class level. Just require the resolver from the eagerly loaded class rather than jumping through autoload hoops M actionview/lib/action_view.rb M actionview/lib/action_view/lookup_context.rb commit e8fcd59 refs/heads/master Author: Aaron Patterson Date: 2014-01-31 12:00:54 -0800 only ask for the location filters once M actionpack/lib/action_dispatch/http/filter_redirect.rb M actionview/lib/action_view.rb commit 0b10180 refs/heads/master Author: Aaron Patterson Date: 2014-01-31 11:54:42 -0800 FilterRedirect is referenced at the class level from the Response We can just require the file rather than going through the autoload indirection M actionpack/lib/action_dispatch.rb M actionpack/lib/action_dispatch/http/response.rb commit 63f8fab refs/heads/master Author: Andrew White Date: 2014-01-31 17:13:12 +0000 Maintain the current timezone in wrap_with_time_zone Extend the solution from the fix for #12163 to the general case where `Time` methods are wrapped with a time zone. Fixes #12596. M activesupport/CHANGELOG.md M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit f484df7 refs/heads/master Merge: 8c7e8b4 464d47e Author: Rafael Mendonça França Date: 2014-01-31 04:06:56 -0800 Merge pull request #13780 from rohitpaulk/patch-1 Updated association_basics.md commit 8c7e8b4 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-31 08:02:56 -0200 Minor changelog improvements [ci skip] M actionview/CHANGELOG.md M activerecord/CHANGELOG.md commit 8ea7978 refs/heads/master Merge: 5df5296 0a4466b Author: Carlos Antonio da Silva Date: 2014-01-31 01:57:00 -0800 Merge pull request #13900 from zzak/issue_12963 Document default trim mode for Erubis and affected ERB tags. Fixes #12963 [ci skip] commit 5df5296 refs/heads/master Merge: 530cab3 4506dd2 Author: Carlos Antonio da Silva Date: 2014-01-31 01:41:24 -0800 Merge pull request #13896 from laurocaetano/dangerous_association_names Associations now raises `ArgumentError` on name conflicts. Closes #13217. commit 0a4466b refs/heads/master Author: Zachary Scott Date: 2014-01-31 00:25:52 -0800 Document default trim mode for Erubis and affected ERB tags [ci skip] Fixes #12963 M guides/source/configuring.md commit 530cab3 refs/heads/master Merge: f64c50a 1664897 Author: Godfrey Chan Date: 2014-01-30 22:21:50 -0800 Merge pull request #13898 from timfenney/my_branch Remove unused variable. commit 464d47e refs/heads/master Author: Rohit Paul Kuruvilla Date: 2014-01-21 23:07:18 +0530 Updated association_basics.md [ci skip] Updated association_basics.md to include how to write migrations for self joins Update association_basics.md Corrected the update Update association_basics.md Typo fix Changed :employee to :manager M guides/source/association_basics.md commit 1664897 refs/heads/master Author: Tim Fenney Date: 2014-01-31 00:50:09 -0500 Remove unused variable. M activerecord/test/cases/enum_test.rb commit 4506dd2 refs/heads/master Author: Lauro Caetano Date: 2014-01-30 22:58:00 -0200 Associations now raise `ArgumentError` on name conflicts. Dangerous association names conflicts include instance or class methods already defined by `ActiveRecord::Base`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/association.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb commit 1f9586f refs/heads/master Author: Josh Jordan Date: 2014-01-28 16:51:01 -0500 Do not discard query parameters on requests that use wrap_parameters M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/params_wrapper.rb M actionpack/test/controller/params_wrapper_test.rb commit f64c50a refs/heads/master Merge: 27aedee abc19c3 Author: Rafael Mendonça França Date: 2014-01-30 14:28:29 -0800 Merge pull request #13859 from huoxito/let-it-go Let `unscope` ignore non Arel scope.where_values commit abc19c3 refs/heads/master Author: Washington Luiz Date: 2014-01-28 00:59:11 -0300 Let `unscope` ignore non Arel scope.where_values M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/scoping/default_scoping_test.rb commit 286542a refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-30 12:14:38 -0800 Merge pull request #13886 from arthurnn/fix_relation_arel Fix regression on .select method Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb activerecord/test/cases/adapter_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapter_test.rb commit 27aedee refs/heads/master Merge: 32bdbdd b7fcad8 Author: Rafael Mendonça França Date: 2014-01-30 12:14:38 -0800 Merge pull request #13886 from arthurnn/fix_relation_arel Fix regression on .select method commit 9541434 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-30 11:11:45 -0800 Merge pull request #13612 from eval/issue-13588 Add CreateMigration action Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/migration.rb M railties/CHANGELOG.md A railties/lib/rails/generators/actions/create_migration.rb M railties/lib/rails/generators/migration.rb A railties/test/generators/create_migration_test.rb commit 32bdbdd refs/heads/master Merge: d4d041c 3858a24 Author: Rafael Mendonça França Date: 2014-01-30 11:11:45 -0800 Merge pull request #13612 from eval/issue-13588 Add CreateMigration action commit b7fcad8 refs/heads/master Author: Arthur Neves Date: 2014-01-29 21:17:10 -0500 Fix regression on `.select_*` methods. This was a common pattern: ``` query = author.posts.select(:title) connection.select_one(query) ``` However `.select` returns a ActiveRecord::AssociationRelation, which has the bind information, so we can use that to get the right sql query. Also fix select_rows on postgress and sqlite3 that were not using the binds [fixes #7538] [fixes #12017] [related #13731] [related #12056] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapter_test.rb commit d4d041c refs/heads/master Author: Yves Senn Date: 2014-01-30 12:05:02 +0100 fix typo and indent. [ci skip] M activesupport/lib/active_support/core_ext/module/concerning.rb M guides/source/getting_started.md commit 2d46e77 refs/heads/master Merge: db6f69f 08bbe5d Author: Yves Senn Date: 2014-01-30 07:27:07 -0800 Merge pull request #13774 from prathamesh-sonpatki/post-to-article Replace Post model with Article model in getting started guide [ci skip] commit db6f69f refs/heads/master Merge: 7f5466d fa1f20e Author: Rafael Mendonça França Date: 2014-01-30 04:19:00 -0800 Merge pull request #13884 from rafaelfranca/rm-travel-back Add `travel_back` to remove stubs from `travel` and `travel_to` and remove auto-rollback after each test case commit fa1f20e refs/heads/master Author: Rafael Mendonça França Date: 2014-01-30 10:13:58 -0200 Improve documentation [ci skip] M activesupport/lib/active_support/testing/time_helpers.rb M guides/source/4_1_release_notes.md commit 7abb6e0 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 22:41:30 -0200 Remove automatic removal of Date/Time stubs after each test case This behavior is only work out-of-box with minitest and also add a downside to run after each test case, even if we don't used the travel or travel_to methods M activerecord/test/cases/mixin_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/testing/time_helpers.rb M activesupport/test/test_test.rb M activesupport/test/time_zone_test.rb commit 6b16c27 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 22:24:48 -0200 Add `travel_back` to remove stubs from `travel` and `travel_to` M activesupport/CHANGELOG.md M activesupport/lib/active_support/testing/time_helpers.rb M activesupport/test/test_test.rb M guides/source/4_1_release_notes.md commit 7f5466d refs/heads/master Merge: 02f9f33 642106e Author: Rafael Mendonça França Date: 2014-01-30 04:10:48 -0800 Merge pull request #13878 from marcandre/leave_my_options_alone find_in_batches should not mutate its argument commit 02f9f33 refs/heads/master Author: Yves Senn Date: 2014-01-30 11:12:46 +0100 tidy CHANGELOGs [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M actionview/CHANGELOG.md M activemodel/CHANGELOG.md M activesupport/CHANGELOG.md commit 9632c98 refs/heads/master Author: Yves Senn Date: 2014-01-30 10:46:06 +0100 docs, `references` is only used with `includes`. Closes #13727. There is no gain in `referencing` tables that are not used for preloading. Furthermore it will break if polymorphic associations are invloved. This is because `references_eager_loaded_tables?` uses all `reference_values` to decide wether to `eager_load` or `preload`. M activerecord/lib/active_record/relation/query_methods.rb commit 1917293 refs/heads/master Merge: db5d6bf fd48786 Author: Godfrey Chan Date: 2014-01-30 00:24:28 -0800 Merge pull request #13888 from rails/session-serializer Modify the session serializer implementation commit 56ac83b refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-29 07:40:52 -0800 Merge pull request #13868 from mauricio/bug-13788 Correctly send the string given to lock! and reload(:lock) to the lock scope - fixes #13788 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/locking_test.rb commit fd48786 refs/heads/master Author: Guillermo Iguaran Date: 2014-01-30 01:12:23 -0500 Modify the session serializer implementation Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb M guides/source/action_controller_overview.md M railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt M railties/test/generators/app_generator_test.rb commit 642106e refs/heads/master Author: Marc-Andre Lafortune Date: 2014-01-29 15:02:13 -0500 find_in_batches should not mutate its argument M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit db5d6bf refs/heads/master Merge: 5d1f0d4 06e06cd Author: Rafael Mendonça França Date: 2014-01-29 16:00:25 -0800 Merge pull request #13883 from rafaelfranca/rm-time-travel Alternative implementation to make time travel not dependent on mocha commit 06e06cd refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 21:22:15 -0200 Use each_value M activesupport/lib/active_support/testing/time_helpers.rb commit 17cb126 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 21:17:05 -0200 Store the singleton_class in a local variable M activesupport/lib/active_support/testing/time_helpers.rb commit 7cf9a1c refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 21:16:52 -0200 Change the class and method visibility M activesupport/lib/active_support/testing/time_helpers.rb commit 6dce436 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 21:10:10 -0200 Use instance method instead of before hook M activesupport/lib/active_support/testing/time_helpers.rb commit 049a10d refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 21:07:46 -0200 Alias the original method first to avoid warnings M activesupport/lib/active_support/testing/time_helpers.rb commit b2bb1aa refs/heads/master Author: Rafael Mendonça França Date: 2014-01-21 23:49:02 -0200 Implement a simple stub feature to use in the Time travel helpers M activesupport/lib/active_support/testing/time_helpers.rb commit 4e29dad refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-29 20:44:58 -0200 Merge pull request #13867 from mauricio/bug-13861 Fixing issue with activerecord serialization not being able to dump a record after loading it from YAML - fixes #13861 Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/store_test.rb commit 5d1f0d4 refs/heads/master Merge: 5977e7e 7d6592e Author: Rafael Mendonça França Date: 2014-01-29 14:51:04 -0800 Merge pull request #13879 from schneems/schneems/more-explicit-database-config-error Enhance errors while retrieving database config commit 5977e7e refs/heads/master Author: Rafael Mendonça França Date: 2014-01-29 20:48:43 -0200 Aesthetic M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/test/cases/store_test.rb commit 6bc1790 refs/heads/master Merge: bd01735 c934632 Author: Rafael Mendonça França Date: 2014-01-29 20:44:58 -0200 Merge pull request #13867 from mauricio/bug-13861 Fixing issue with activerecord serialization not being able to dump a record after loading it from YAML - fixes #13861 commit bd01735 refs/heads/master Merge: 6277bd8 aba9fc0 Author: Rafael Mendonça França Date: 2014-01-29 14:43:26 -0800 Merge pull request #13876 from sowjumn/master Added some style changes in asset pipeline documentation commit c934632 refs/heads/master Author: Mauricio Linhares Date: 2014-01-29 00:54:13 -0300 Fixing issue with activerecord serialization not being able to dump a record after loading it from YAML - fixes #13861 M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/store_test.rb commit 6277bd8 refs/heads/master Merge: fec1028 4256662 Author: Robin Dupret Date: 2014-01-29 12:50:39 -0800 Merge pull request #13871 from kassio/fix-filters-with-classes-documentation Fix documentation of filters api with classes [ci skip] commit 4256662 refs/heads/master Author: Kassio Borges Date: 2014-01-29 18:07:52 -0200 Fix documentation of new controller filters api [ci skip] The api for filters with classes change and the guides weren't updated. Now the class must respond for methods with the same name as the filter, so the `before_action` calls a `before` method, and so on. The method `#filter` has been deprecated in 4.0.0 and has been removed in 4.1.0: #7560 M activesupport/CHANGELOG.md M guides/source/4_1_release_notes.md M guides/source/action_controller_overview.md commit aba9fc0 refs/heads/master Author: sowjanya Date: 2014-01-29 10:42:07 -0800 Added some style changes in asset pipeline documentation M guides/source/asset_pipeline.md commit 7d6592e refs/heads/master Author: schneems Date: 2014-01-29 14:16:39 -0600 Enhance errors while retrieving database config Right now if there is an error retrieving database configuration the intent of the error (what the code was trying to do while you got the error) could be more explicit. Instead of this error: ``` Invalid DATABASE_URL: nil (erb):9:in `rescue in
' (erb):6:in `
' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `eval' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `result' /Users/schneems/Documents/projects/rails/railties/lib/rails/application/configuration.rb:98:in `database_configuration' /Users/schneems/Documents/projects/rails/activerecord/lib/active_record/railtie.rb:41:in `block in ' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `instance_exec' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `each' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/application.rb:339:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/engine/railties.rb:13:in `each' ``` I propose we issue this error: ``` Cannot load `Rails.application.database_configuration`: Invalid DATABASE_URL: nil (erb):9:in `rescue in
' (erb):6:in `
' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `eval' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `result' /Users/schneems/Documents/projects/rails/railties/lib/rails/application/configuration.rb:98:in `database_configuration' /Users/schneems/Documents/projects/rails/activerecord/lib/active_record/railtie.rb:41:in `block in ' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `instance_exec' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `each' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/application.rb:339:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/engine/railties.rb:13:in `each' ``` M railties/lib/rails/application/configuration.rb commit fec1028 refs/heads/master Merge: 2c964ac 0aad463 Author: Rafael Mendonça França Date: 2014-01-29 17:53:10 -0200 Merge pull request #13201 from marcandre/find_in_batch_enumerator `find_in_batches` now returns an `Enumerator` Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/batches.rb commit 2c964ac refs/heads/master Merge: 9653a65 a2cf795 Author: Rafael Mendonça França Date: 2014-01-29 11:40:15 -0800 Merge pull request #13877 from marcandre/find_in_batches Mention find_each in find_in_batches doc [ci skip] commit a2cf795 refs/heads/master Author: Marc-Andre Lafortune Date: 2014-01-29 14:30:36 -0500 Mention find_each in find_in_batches doc [ci skip] M activerecord/lib/active_record/relation/batches.rb commit 9653a65 refs/heads/master Merge: 0f15610 40f0257 Author: Godfrey Chan Date: 2014-01-29 10:56:18 -0800 Merge pull request #13450 from chancancode/ar_raise_on_conflict Raise an error if `scope` or `enum` is about to add a conflicting method to the class Fixed #13389 commit 40f0257 refs/heads/master Author: Godfrey Chan Date: 2014-01-27 01:39:52 -0800 `enum` now raises on "dangerous" name conflicts Dangerous name conflicts includes instance or class method conflicts with methods defined within `ActiveRecord::Base` but not its ancestors, as well as conflicts with methods generated by other enums on the same class. Fixes #13389. M activerecord/CHANGELOG.md M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit 7e8e91c refs/heads/master Author: Godfrey Chan Date: 2014-01-24 18:28:05 -0800 `scope` now raises on "dangerous" name conflicts Similar to dangerous attribute methods, a scope name conflict is dangerous if it conflicts with an existing class method defined within `ActiveRecord::Base` but not its ancestors. See also #13389. *Godfrey Chan*, *Philippe Creux* M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/scoping/named_scoping_test.rb commit 9ed6664 refs/heads/master Author: Godfrey Chan Date: 2014-01-24 18:05:33 -0800 Fixed a bug in AR::Base#respond_to? Before: >> ActiveRecord::Base.respond_to?(:find_by_something) NoMethodError: undefined method `abstract_class?' for Object:Class After: >> ActiveRecord::Base.respond_to?(:find_by_something) => false M activerecord/lib/active_record/dynamic_matchers.rb M activerecord/test/cases/finder_respond_to_test.rb commit 0f15610 refs/heads/master Author: Guillermo Iguaran Date: 2014-01-29 13:52:25 -0500 Update CHANGELOG properly with GH #13692 [ci-skip] M actionpack/CHANGELOG.md commit b242552 refs/heads/master Merge: 40e7fe3 b23ffd0 Author: Guillermo Iguaran Date: 2014-01-29 10:48:49 -0800 Merge pull request #13692 from lukesarnacki/change-default-session-serializer Allow session serializer key in config.session_store commit b23ffd0 refs/heads/master Author: Lukasz Sarnacki Date: 2014-01-10 12:57:50 +0100 Allow session serializer key in config.session_store MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch.rb M actionpack/lib/action_dispatch/middleware/cookies.rb A actionpack/lib/action_dispatch/middleware/session/json_serializer.rb A actionpack/lib/action_dispatch/middleware/session/marshal_serializer.rb M actionpack/test/dispatch/cookies_test.rb M activesupport/lib/active_support/message_encryptor.rb M guides/source/action_controller_overview.md M railties/lib/rails/application.rb M railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt M railties/test/generators/app_generator_test.rb commit 40e7fe3 refs/heads/master Merge: f142527 66e533f Author: Yves Senn Date: 2014-01-29 07:40:52 -0800 Merge pull request #13868 from mauricio/bug-13788 Correctly send the string given to lock! and reload(:lock) to the lock scope - fixes #13788 commit 66e533f refs/heads/master Author: Mauricio Linhares Date: 2014-01-29 01:56:20 -0300 Correctly send the string given to lock! and reload(:lock) to the lock scope - fixes #13788 As per the documentation at lock!, if the :lock option is a string it should use the given SQL to generate the lock statement. M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/locking_test.rb commit f142527 refs/heads/master Author: Aaron Patterson Date: 2014-01-28 17:42:26 -0800 always use a block for cleanup / prepare callbacks so we can clean the method signature M actionpack/lib/action_dispatch/middleware/reloader.rb commit dd6488d refs/heads/master Author: Aaron Patterson Date: 2014-01-28 17:36:03 -0800 scope is not necessary M actionpack/lib/action_dispatch/middleware/reloader.rb commit f912eed refs/heads/master Merge: 0fcbc65 fe8ffca Author: Rafael Mendonça França Date: 2014-01-28 17:06:21 -0800 Merge pull request #13864 from sowjumn/master Added documentation for css_compressor in asset_pipeline.md commit 0fcbc65 refs/heads/master Merge: 2c2792b 69ab91a Author: Rafael Mendonça França Date: 2014-01-28 16:57:41 -0800 Merge pull request #13813 from lukesarnacki/log-deep-munge Log for which keys values were set to nil in deep_munge commit fe8ffca refs/heads/master Author: sowjanya Date: 2014-01-28 16:53:30 -0800 Added documentation for css_compressor M guides/source/asset_pipeline.md commit 2c2792b refs/heads/master Merge: b9cd5a2 c1d9934 Author: Godfrey Chan Date: 2014-01-28 16:48:11 -0800 Merge pull request #11821 from kuroda/select-and-order-by-aliased-attributes Handle aliased attributes in AR::Relation#select, #order, etc. commit c1d9934 refs/heads/master Author: Tsutomu Kuroda Date: 2013-08-09 23:46:27 +0900 Handle aliased attributes in AR::Relation#select, #order, etc. With this we can write `Model#select(:aliased)`, `Model#order(:aliased)`, `Model#reoder(aliased: :desc)`, etc. Supplementary work to 54122067acaad39b277a5363c6d11d6804c7bf6b. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/mutation_test.rb M activerecord/test/cases/relations_test.rb commit 69ab91a refs/heads/master Author: Lukasz Sarnacki Date: 2014-01-23 16:31:52 +0100 Log which keys were set to nil in deep_munge deep_munge solves CVE-2013-0155 security vulnerability, but its behaviour is definately confuisng. This commit adds logging to deep_munge. It logs keys for which values were set to nil. Also mentions in guides were added. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/log_subscriber.rb M actionpack/lib/action_dispatch/request/utils.rb M guides/source/action_controller_overview.md M guides/source/configuring.md M guides/source/security.md commit b9cd5a2 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-28 08:16:20 -0200 Fix indent on test case [ci skip] M activerecord/test/cases/associations/has_many_associations_test.rb commit e09c402 refs/heads/master Merge: 61bd71e f93ce1b Author: Damien Mathieu <42@dmathieu.com> Date: 2014-01-28 00:15:59 -0800 Merge pull request #13838 from vipulnsward/13197-fix-has-one-documentation Add docs about behaviour of replacing a has_one associate object. commit f93ce1b refs/heads/master Author: Vipul A M Date: 2014-01-25 19:55:48 +0530 Add docs about behaviour of replacing a has_one associate object, that the previous one is deleted even if the new one doesn't get persisted to database. Fixes #13197 . [ci skip] M activerecord/lib/active_record/associations.rb commit 6704f90 refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2014-01-27 16:59:32 -0800 Merge pull request #13857 from teoljungberg/replace-file-exists-eh Replace File.exists? with File.exist? M railties/lib/rails/generators/rails/plugin_new/templates/bin/rails.tt commit 61bd71e refs/heads/master Merge: 5e5af5b 7a372c8 Author: Carlos Antonio da Silva Date: 2014-01-27 16:59:32 -0800 Merge pull request #13857 from teoljungberg/replace-file-exists-eh Replace File.exists? with File.exist? commit 3858a24 refs/heads/master Author: Gert Goet Date: 2014-01-06 12:01:15 +0100 Add CreateMigration action This Thor-action isolates the logic whether to (over-)write migration and what is shown to the user. It's modelled after Thor's CreateFile-action. This solves the issue that removing a non-existing migration, tried to remove the template-path (#13588). Related issues: #12674 M railties/CHANGELOG.md A railties/lib/rails/generators/actions/create_migration.rb M railties/lib/rails/generators/migration.rb A railties/test/generators/create_migration_test.rb commit 7a372c8 refs/heads/master Author: Teo Ljungberg Date: 2014-01-27 22:21:28 +0100 Replace File.exists? with File.exist? To quell warnings on ruby 2.1 M railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt commit 5e5af5b refs/heads/master Merge: d57ce23 20317f3 Author: Carlos Antonio da Silva Date: 2014-01-27 10:58:54 -0800 Merge pull request #13855 from kuldeepaggarwal/reset_validators use the new clear_validators! api everywhere to reset validators in tests commit 20317f3 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-01-28 00:13:35 +0530 use the new clear_validators! api everywhere to reset validators in tests M activemodel/test/cases/validations/acceptance_validation_test.rb M activerecord/test/cases/persistence_test.rb M activerecord/test/cases/validations/i18n_generate_message_validation_test.rb commit d57ce23 refs/heads/master Merge: 3161606 433628a Author: Rafael Mendonça França Date: 2014-01-27 10:04:26 -0800 Merge pull request #13832 from kassio/setup-for-raise-missing-translations Rails config for raise on missing translations commit b5a6b6a refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-01-27 09:08:56 +0000 Clear filtered request attributes between requests in tests The request attributes filtered_parameters, filtered_env and filtered_path are memoized for performance reasons. However this can cause unusual behavior in tests where there are multiple calls to get, post, etc. Fixes #13803. (cherry picked from commit 31616068032beb537768787ff3a206b062eb192e) M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/log_subscriber_test.rb M actionpack/test/controller/test_case_test.rb commit 3161606 refs/heads/master Author: Andrew White Date: 2014-01-27 09:08:56 +0000 Clear filtered request attributes between requests in tests The request attributes filtered_parameters, filtered_env and filtered_path are memoized for performance reasons. However this can cause unusual behavior in tests where there are multiple calls to get, post, etc. Fixes #13803. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/log_subscriber_test.rb M actionpack/test/controller/test_case_test.rb commit 9673d5d refs/heads/master Author: Yves Senn Date: 2014-01-27 13:57:25 +0100 docs, remove deprecation entry in favor of abe6484. [ci skip] M guides/source/4_1_release_notes.md commit 26fb57b refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-27 08:24:33 -0200 Fix doc markup of clear_validators! M activemodel/lib/active_model/validations.rb commit 801baee refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-27 08:22:26 -0200 Use the new clear_validators! api to reset validators in tests M activemodel/test/cases/validations/absence_validation_test.rb M activemodel/test/cases/validations/acceptance_validation_test.rb M activemodel/test/cases/validations/conditional_validation_test.rb M activemodel/test/cases/validations/confirmation_validation_test.rb M activemodel/test/cases/validations/exclusion_validation_test.rb M activemodel/test/cases/validations/format_validation_test.rb M activemodel/test/cases/validations/i18n_generate_message_validation_test.rb M activemodel/test/cases/validations/i18n_validation_test.rb M activemodel/test/cases/validations/inclusion_validation_test.rb M activemodel/test/cases/validations/length_validation_test.rb M activemodel/test/cases/validations/numericality_validation_test.rb M activemodel/test/cases/validations/presence_validation_test.rb M activemodel/test/cases/validations/validates_test.rb M activemodel/test/cases/validations/validations_context_test.rb M activemodel/test/cases/validations/with_validation_test.rb M activemodel/test/cases/validations_test.rb commit 5336ce2 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-27 08:17:20 -0200 Merge tests about multiple validation contexts M activemodel/test/cases/validations/validations_context_test.rb commit abe6484 refs/heads/master Author: Yves Senn Date: 2014-01-27 11:23:10 +0100 mention #13314 in 4.1 release notes. refs #12140. [ci skip] M guides/source/4_1_release_notes.md commit 50d9717 refs/heads/master Merge: 3fd6329 8855163 Author: Carlos Antonio da Silva Date: 2014-01-27 02:12:42 -0800 Merge pull request #13754 from vpuzzella/master Ability to specify multiple contexts when defining a validation. commit 433628a refs/heads/master Author: Kassio Borges Date: 2014-01-26 20:05:34 -0200 Rails config for raise on missing translations Add a config to setup whether raise exception for missing translation or not. M actionview/CHANGELOG.md M actionview/lib/action_view/base.rb M actionview/lib/action_view/helpers/translation_helper.rb M actionview/test/template/translation_helper_test.rb M guides/source/configuring.md M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt commit 3fd6329 refs/heads/master Merge: 5540dfc 8b14b11 Author: Carlos Antonio da Silva Date: 2014-01-27 02:02:22 -0800 Merge pull request #13848 from huoxito/tell-value Display value when raising due to unscope() issues commit 8855163 refs/heads/master Author: Vince Puzzella Date: 2014-01-18 11:34:38 -0500 Ability to specify multiple contexts when defining a validation. Example: validates_presence_of :name, on: [:update, :custom_validation_context] M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations.rb M activemodel/test/cases/validations/validations_context_test.rb commit 5540dfc refs/heads/master Author: Yves Senn Date: 2014-01-27 08:05:13 +0100 docs, clarify usage of `action_mailer.default_options`. [ci skip]. Closes #13820. M guides/source/configuring.md commit 16ee18e refs/heads/master Merge: dd339bb 9690bcf Author: Guillermo Iguaran Date: 2014-01-26 22:40:53 -0800 Merge pull request #13849 from fgo/patch-12 Ruby on Rails 4.1 Release Notes: Fix spelling [ci skip] commit 9690bcf refs/heads/master Author: Francis Go Date: 2014-01-27 17:10:21 +1100 Ruby on Rails 4.1 Release Notes: Fix spelling [ci skip] M guides/source/4_1_release_notes.md commit 8b14b11 refs/heads/master Author: Washington Luiz Date: 2014-01-27 02:18:56 -0300 Display value when raising due to unscope() issues Hopefully make it easier to debug errors. e.g Before: RuntimeError: unscope(where: "deleted_at") failed: unscoping String is unimplemented. After: RuntimeError: unscope(where: "deleted_at") failed: unscoping String "'t'='t'" is unimplemented. M activerecord/lib/active_record/relation/query_methods.rb commit dd339bb refs/heads/master Author: Andrew White Date: 2014-01-26 21:22:23 +0000 Make ActiveSupport::TimeWithZone#xmlschema consistent Both Time#xmlschema and DateTime#xmlschema can accept nil values for the fraction_digits parameter. This commit makes this so for TimeWithZone values as well. M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit c096500 refs/heads/master Author: Andrew White Date: 2014-01-26 21:09:06 +0000 Add support for JSON time_precision to Time and DateTime M activesupport/lib/active_support/core_ext/object/json.rb M activesupport/lib/active_support/json/encoding.rb M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/json/encoding_test.rb commit 9484f4b refs/heads/master Author: Andrew White Date: 2014-01-26 20:55:21 +0000 Add CHANGELOG entry for #11464 M activesupport/CHANGELOG.md commit e3c382e refs/heads/master Author: Andrew White Date: 2014-01-26 20:39:16 +0000 Rename subsecond_fraction_digits option to time_precision M activesupport/lib/active_support/json/encoding.rb M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/json/encoding_test.rb M guides/source/configuring.md commit ef17225 refs/heads/master Author: Andrew White Date: 2014-01-26 20:32:34 +0000 Consolidate JSON encoding tests in one file M activesupport/test/core_ext/time_with_zone_test.rb M activesupport/test/json/encoding_test.rb commit 4cfc467 refs/heads/master Author: Parker Selbert Date: 2013-07-16 16:16:33 -0400 Customize subsecond digits when encoding DateWithTime The subsecond fraction digits had been hardcoded to 3. This forced all timestamps to include the subsecond digits with no way to customize the value. While the subsecond format is part of the ISO8601 spec, it is not adhered to by all parsers (notably mobile clients). This adds the ability to customize the number of digits used, optionally setting them to 0 in order to eliminate the subsecond fraction entirely: ActiveSupport::JSON::Encoding.subsecond_fraction_digits = 0 M activesupport/lib/active_support/json/encoding.rb M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit e1e17a5 refs/heads/master Author: Xavier Noria Date: 2014-01-26 22:10:05 +0100 adds a section about booleans in the API guidelines [ci skip] M guides/source/api_documentation_guidelines.md commit 225bcad refs/heads/master Author: Xavier Noria Date: 2014-01-26 21:36:17 +0100 API guidelines: revises warning about +...+ [ci skip] Modern RDoc accepts a few more things in +...+. In particular symbols work now. The current regexp in RDoc is https://github.com/rdoc/rdoc/blob/v4.1.1/lib/rdoc/markup/attribute_manager.rb#L133. M guides/source/api_documentation_guidelines.md commit 0df1f91 refs/heads/master Author: Xavier Noria Date: 2014-01-26 20:47:56 +0100 revises references to :allow_(nil|blank) in some docs [ci skip] [Steven Yang & Xavier Noria] Closes #11247. M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validations/absence.rb M activemodel/lib/active_model/validations/acceptance.rb M activemodel/lib/active_model/validations/confirmation.rb M activemodel/lib/active_model/validations/exclusion.rb M activemodel/lib/active_model/validations/format.rb M activemodel/lib/active_model/validations/inclusion.rb M activemodel/lib/active_model/validations/numericality.rb M activemodel/lib/active_model/validations/presence.rb M activemodel/lib/active_model/validations/validates.rb commit 61554ef refs/heads/master Merge: b594492 70588be Author: Robin Dupret Date: 2014-01-26 11:23:50 -0800 Merge pull request #13846 from gsaks123/patch-1 Fix order syntax in find_by_sql example [ci skip] commit 70588be refs/heads/master Author: Greg Saks Date: 2014-01-26 14:21:05 -0500 Fix order syntax in find_by_sql example M guides/source/active_record_querying.md commit b594492 refs/heads/master Author: Andrew White Date: 2014-01-26 16:56:33 +0000 Maintain current timezone when changing time during DST overlap Currently if a time is changed during DST overlap in the autumn then the method `period_for_local` will return the DST period. However if the original time is not DST then this can be surprising and is not what is generally wanted. This commit changes that behavior to maintain the current period if it's in the list of periods returned by `periods_for_local`. It is possible to alter the behavior of `period_for_local` by specifying a second argument but since we may be change from another time that could be either DST or not then this would give inconsistent results. Fixes #12163. M activesupport/CHANGELOG.md M activesupport/lib/active_support/time_with_zone.rb M activesupport/lib/active_support/values/time_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 718d3b0 refs/heads/master Author: Robin Dupret Date: 2014-01-26 13:11:26 +0100 Remove an extra comment [ci skip] M actionmailer/lib/action_mailer/base.rb commit 4df9cc2 refs/heads/master Author: Andrew White Date: 2014-01-26 12:03:32 +0000 Support underscored symbols in Action Mailer config We allow the use of underscored symbols to represent classes throughout other parts of Rails so it seems incongruous that it's not supported in `register_interceptor` and `register_observer`. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb commit 7d86352 refs/heads/master Author: Andrew White Date: 2014-01-26 11:50:36 +0000 Don't use a class_attribute for ActionMailer::Base.preview_path Since preview_path is read from ActionMailer::Base when previewing, subclasses can’t change it so don’t there's no need for the extra overhead imposed by using it. M actionmailer/lib/action_mailer/preview.rb M actionmailer/lib/action_mailer/railtie.rb commit 35fd816 refs/heads/master Author: Andrew White Date: 2014-01-26 11:38:30 +0000 Add the ability to intercept emails before previewing To support the ability for tools like CSS style inliners to operate on emails being previewed this commit adds a hook in a similar fashion to the existing delivery interceptor hook, e.g: class CSSInlineStyler def self.previewing_email(message) # inline CSS styles end end ActionMailer::Base.register_preview_interceptor CSSInlineStyler Fixes #13622. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/preview.rb M actionmailer/test/base_test.rb commit 14d59d2 refs/heads/master Merge: 81c1f58 9d0fceb Author: Godfrey Chan Date: 2014-01-25 23:57:53 -0800 Merge pull request #13844 from Alamoz/config_grammar thread -> threaded [ci skip] commit 9d0fceb refs/heads/master Author: Adrien Lamothe Date: 2014-01-25 23:04:36 -0800 Correct grammar from '... allowing both thread web servers ...' to '... allowing both threaded web servers ...'. M guides/code/getting_started/config/environments/production.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 81c1f58 refs/heads/master Merge: a31a44a fe63933 Author: Guillermo Iguaran Date: 2014-01-25 13:47:43 -0800 Merge pull request #13841 from robin850/patch-15 Add a missing changelog entry for #13825 [ci skip] commit fe63933 refs/heads/master Author: Robin Dupret Date: 2014-01-25 22:12:28 +0100 Add a missing changelog entry for #13825 [ci skip] M railties/CHANGELOG.md commit 08bbe5d refs/heads/master Author: Prathamesh Sonpatki Date: 2014-01-21 00:36:44 +0530 Replace Post with Article in getting started guide [ci skip] - Used Article model instead of Post as it may confuse with 'post' requests - Tried to wrap the guide to 80 chars lines as much as possible. - Removed unused image - Fixes #13764 A guides/assets/images/getting_started/article_with_comments.png M guides/assets/images/getting_started/challenge.png M guides/assets/images/getting_started/confirm_dialog.png A guides/assets/images/getting_started/forbidden_attributes_for_new_article.png D guides/assets/images/getting_started/forbidden_attributes_for_new_post.png M guides/assets/images/getting_started/form_with_errors.png M guides/assets/images/getting_started/index_action_with_edit_link.png A guides/assets/images/getting_started/new_article.png D guides/assets/images/getting_started/new_post.png D guides/assets/images/getting_started/post_with_comments.png M guides/assets/images/getting_started/routing_error_no_controller.png A guides/assets/images/getting_started/show_action_for_articles.png D guides/assets/images/getting_started/show_action_for_posts.png A guides/assets/images/getting_started/template_is_missing_articles_new.png D guides/assets/images/getting_started/template_is_missing_posts_new.png D guides/assets/images/getting_started/undefined_method_post_path.png A guides/assets/images/getting_started/unknown_action_create_for_articles.png D guides/assets/images/getting_started/unknown_action_create_for_posts.png A guides/assets/images/getting_started/unknown_action_new_for_articles.png D guides/assets/images/getting_started/unknown_action_new_for_posts.png M guides/source/getting_started.md commit 9cc4dad refs/heads/master Author: Vipul A M Date: 2014-01-25 14:04:09 +0530 Remove old comments about suppressing warnings. M guides/source/contributing_to_ruby_on_rails.md commit a31a44a refs/heads/master Author: Andrew White Date: 2014-01-25 07:38:29 +0000 Add additional tests for #13824 M actionpack/test/dispatch/routing_test.rb commit 345555c refs/heads/master Author: Byron Bischoff Date: 2014-01-24 13:07:02 -0800 Transform dashes to underscores in resource route names Fixes #13824 M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing/inspector_test.rb commit 94ce514 refs/heads/master Merge: 7776fd6 98705d8 Author: Godfrey Chan Date: 2014-01-24 20:35:48 -0800 Merge pull request #13772 from chancancode/fix_has_secure_password_for_good Refactored validations rules for has_secure_password commit 7776fd6 refs/heads/master Merge: 220ee0c e2f3e0d Author: Guillermo Iguaran Date: 2014-01-24 20:35:00 -0800 Merge pull request #13835 from frodsan/remove_unused_argument Remove unused argument. commit 98705d8 refs/heads/master Author: Godfrey Chan Date: 2014-01-24 19:57:07 -0800 Some minor fixes M activemodel/lib/active_model/secure_password.rb M activemodel/test/cases/secure_password_test.rb commit b6ddbfb refs/heads/master Author: Godfrey Chan Date: 2014-01-20 05:06:03 -0800 Removed old tests D activemodel/test/cases/secure_password_new_test.rb M activemodel/test/cases/secure_password_test.rb D activemodel/test/models/oauthed_user.rb commit 8ca5923 refs/heads/master Author: Godfrey Chan Date: 2014-01-20 05:04:19 -0800 Got all the new tests passing M activemodel/lib/active_model/secure_password.rb commit 20490ad refs/heads/master Author: Godfrey Chan Date: 2014-01-20 04:27:42 -0800 Restored the ability to clear the password with user.password= nil (see the docs) M activemodel/lib/active_model/secure_password.rb commit 19a4ef3 refs/heads/master Author: Godfrey Chan Date: 2014-01-20 04:21:44 -0800 Rewrote the tests for has_secure_password A activemodel/test/cases/secure_password_new_test.rb M activemodel/test/models/oauthed_user.rb M activemodel/test/models/user.rb commit e2f3e0d refs/heads/master Author: Francesco Rodriguez Date: 2014-01-24 22:25:15 -0300 Remove unused argument. M actionpack/test/controller/http_token_authentication_test.rb commit 6324f54 refs/remotes/origin/fxn/string-pools Merge: 9130324 c438c61 Author: Xavier Noria Date: 2014-01-24 23:42:20 +0100 Merge branch 'master' into fxn/string-pools Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 220ee0c refs/heads/master Merge: c438c61 3a0ddf3 Author: Yves Senn Date: 2014-01-24 15:13:16 -0800 Merge pull request #13785 from kuldeepaggarwal/fix-find_with_multiple_ids Fix `ActiveRecord::RecordNotFound` error message with custom primary key commit 3a0ddf3 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-01-25 02:29:23 +0530 Fix `ActiveRecord::RecordNotFound` error message with custom primary key M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb commit b942b2e refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-24 11:41:25 -0800 Merge pull request #13829 from qsymmachus/improve_validates_with_example Reordered classes in AR Validation #validates_with example [ci skip] M guides/source/active_record_validations.md commit c438c61 refs/remotes/origin/fxn/string-pools Merge: 0a43bf3 098a960 Author: Rafael Mendonça França Date: 2014-01-24 11:41:25 -0800 Merge pull request #13829 from qsymmachus/improve_validates_with_example Reordered classes in AR Validation #validates_with example [ci skip] commit 098a960 refs/remotes/origin/fxn/string-pools Author: John Olmsted & Strand McCutchen Date: 2014-01-24 11:24:06 -0800 Reordered classes in AR Validation #validates_with example [ci skip] Person called GoodnessValidator before it was defined. This change will compile the example correctly. M guides/source/active_record_validations.md commit 0a43bf3 refs/remotes/origin/fxn/string-pools Author: Guillermo Iguaran Date: 2014-01-24 14:10:46 -0500 Add a test-case for GH #13825 M railties/test/app_rails_loader_test.rb commit f5c3531 refs/remotes/origin/fxn/string-pools Merge: 8efd5fe cf6c00d Author: Guillermo Iguaran Date: 2014-01-24 10:05:35 -0800 Merge pull request #13828 from bronzle/apploader-should-check-for-file app_rails_loader.rb should check if bin/rails is a File before calling F... commit cf6c00d refs/remotes/origin/fxn/string-pools Author: Byron Bischoff Date: 2014-01-24 10:00:31 -0800 app_rails_loader.rb should check if bin/rails is a File before calling File.read(exe); closes #13825 M railties/lib/rails/app_rails_loader.rb commit 4b85b3f refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-24 04:34:22 -0800 Merge pull request #13811 from mdesantis/issue-13810 Fixes #13810 `rake routes` error when mount `Rails::Engine` with empty routes Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/test/dispatch/routing/inspector_test.rb commit 8efd5fe refs/remotes/origin/fxn/string-pools Merge: e61b841 c1f8a0d Author: Yves Senn Date: 2014-01-24 04:34:22 -0800 Merge pull request #13811 from mdesantis/issue-13810 Fixes #13810 `rake routes` error when mount `Rails::Engine` with empty routes commit c1f8a0d refs/remotes/origin/fxn/string-pools Author: Maurizio De Santis Date: 2014-01-23 14:50:29 +0100 Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; fixes rails/rails#13810 Squash M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/test/dispatch/routing/inspector_test.rb commit e61b841 refs/remotes/origin/fxn/string-pools Merge: f1a0b15 9b254df Author: Yves Senn Date: 2014-01-23 23:52:25 -0800 Merge pull request #13821 from vipulnsward/remove-assignment-in-test Remove unused assignment to fix warnings in enum test. commit 3e28b7c refs/heads/master Author: Vipul A M Date: 2014-01-24 12:40:21 +0530 `framwork` => `framework` M guides/source/testing.md commit 5b31da4 refs/heads/master Author: Vipul A M Date: 2014-01-24 12:37:24 +0530 `easiy` => `easy` M guides/source/configuring.md commit 1adaf6c refs/heads/master Author: Vipul A M Date: 2014-01-24 12:32:17 +0530 `requies` => `requires` M guides/source/asset_pipeline.md commit 9b254df refs/remotes/origin/fxn/string-pools Author: Vipul A M Date: 2014-01-24 12:14:02 +0530 Remove unused assignment to fix warnings in enum test. M activerecord/test/cases/enum_test.rb commit f1a0b15 refs/remotes/origin/fxn/string-pools Merge: bc0820c aae53d2 Author: Guillermo Iguaran Date: 2014-01-23 19:33:59 -0800 Merge pull request #13819 from arthurnn/one_require_test unify param.require tests commit aae53d2 refs/remotes/origin/fxn/string-pools Author: Arthur Neves Date: 2014-01-23 22:28:24 -0500 unify param.require tests D actionpack/test/controller/parameters/parameters_require_test.rb M actionpack/test/controller/required_params_test.rb commit bc0820c refs/remotes/origin/fxn/string-pools Merge: a7680ab 96dd301 Author: Guillermo Iguaran Date: 2014-01-23 19:03:24 -0800 Merge pull request #13818 from arthurnn/small_test_case test boolean and number json param parsing commit 96dd301 refs/remotes/origin/fxn/string-pools Author: Arthur Neves Date: 2014-01-23 21:56:28 -0500 test boolean and number json param parsing M actionpack/test/dispatch/request/json_params_parsing_test.rb commit a7680ab refs/remotes/origin/fxn/string-pools Merge: 6ef0569 db95c7d Author: Godfrey Chan Date: 2014-01-23 08:30:04 -0800 Merge pull request #13795 from bobbus/errors-has-key Fix ActiveModel::Errors#has_key? returning nil commit 6ef0569 refs/remotes/origin/fxn/string-pools Merge: 0d24946 8cbd500 Author: Jeremy Kemper Date: 2014-01-22 13:44:11 -0800 Merge pull request #13799 from kbrock/better_dirty Better ActiveRecord hierarchy for Dirty and others commit db95c7d refs/remotes/origin/fxn/string-pools Author: Adrien Coquio Date: 2014-01-22 21:25:58 +0100 Update ActiveModel::Errors.has_key? test M activemodel/test/cases/errors_test.rb commit b97035d refs/remotes/origin/fxn/string-pools Author: Adrien Coquio Date: 2014-01-22 15:49:31 +0100 Fix ActiveModel::Errors#has_key? return value M activemodel/lib/active_model/errors.rb commit 8cbd500 refs/remotes/origin/fxn/string-pools Author: Keenan Brock Date: 2014-01-22 12:55:46 -0500 Move changed_attributes into dirty.rb Move serialization dirty into serialization.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/timestamp.rb commit 0d24946 refs/heads/master Merge: 8f17a83 ce91efe Author: Carlos Antonio da Silva Date: 2014-01-22 08:28:45 -0800 Merge pull request #13791 from kei-s/remove_duplicate_merge Remove duplicate merge commit 8f17a83 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-22 13:25:12 -0200 Improve the CHANGELOG entry [ci skip] M activerecord/CHANGELOG.md commit 2a29c7d refs/heads/master Author: Rafael Mendonça França Date: 2014-01-22 13:24:48 -0200 Make CollectionProxy#reset return self M activerecord/lib/active_record/associations/collection_proxy.rb commit 66aa5e2 refs/heads/master Merge: 75cd7bc 43675f0 Author: Rafael Mendonça França Date: 2014-01-22 13:16:35 -0200 Merge pull request #13790 from kschlarman/collection_association_reset_fix Calling reset on a collection association should unload the assocation commit 1c2c552 refs/remotes/origin/fxn/string-pools Author: Adrien Coquio Date: 2014-01-22 15:22:35 +0100 Add failing test for ActiveModel::Errors#has_key? method From the doc, this method should return false and not nil if there is no errors for this key M activemodel/test/cases/errors_test.rb commit 7240300 refs/remotes/origin/fxn/string-pools Author: Keenan Brock Date: 2014-01-22 09:28:19 -0500 put core at the beginning so other classes can modify the behavior M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/timestamp.rb commit ce91efe refs/heads/master Author: kei Date: 2014-01-22 22:13:38 +0900 Remove duplicate merge M activerecord/lib/active_record/relation.rb commit 75cd7bc refs/heads/master Merge: a4ce065 9e63ead Author: Yves Senn Date: 2014-01-22 01:53:30 -0800 Merge pull request #13728 from semenyukdmitriy/master Added missing `file` delivery method to the Configuration Guide commit 9e63ead refs/heads/master Author: Semenyuk Dmitriy Date: 2014-01-22 15:27:54 +0600 [ci skip] Added missing `file` delivery method M guides/source/action_mailer_basics.md M guides/source/configuring.md commit 43675f0 refs/heads/master Author: Kelsey Schlarman Date: 2014-01-21 18:19:51 -0800 Calling reset on a collection association should unload the assocation Need to define #reset on CollectionProxy. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/associations_test.rb commit a4ce065 refs/heads/master Merge: fc913d4 03855e7 Author: Rafael Mendonça França Date: 2014-01-21 16:45:08 -0800 Merge pull request #13786 from terracatta/master Ensure AR #second, #third, etc. finders work through associations commit fc913d4 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-21 22:38:07 -0200 Fix typo M activemodel/test/cases/dirty_test.rb commit 03855e7 refs/heads/master Author: Jason Meller Date: 2014-01-21 17:34:39 -0500 Ensure AR #second, #third, etc. finders work through associations This commit fixes two regressions introduced in cafe31a078 where newly created finder methods #second, #third, #forth, and #fifth caused a NoMethodError error on reload associations and where we were pulling the wrong element out of cached associations. Examples: some_book.authors.reload.second # Before # => NoMethodError: undefined method 'first' for nil:NilClass # After # => # some_book.first.authors.first some_book.first.authors.second # Before # => # # => # # After # => # # => # Fixes #13783. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/calculations_test.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/fixtures/companies.yml commit 9383de4 refs/heads/master Merge: c6ecfc1 55f6c8c Author: Rafael Mendonça França Date: 2014-01-21 20:37:45 -0200 Merge pull request #13776 from rails/dirty-enum Implement the Dirty API with the Enum feature correctly. Conflicts: activerecord/CHANGELOG.md commit 55f6c8c refs/heads/master Author: Rafael Mendonça França Date: 2014-01-21 20:35:21 -0200 Use string as keys M activerecord/lib/active_record/enum.rb commit 5620e62 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-21 20:32:52 -0200 Store the enum values in the DEFINED_ENUM constant This will make simpler to compare if the values changed in the save_changed_attribute method. M activerecord/lib/active_record/enum.rb commit c6ecfc1 refs/remotes/origin/fxn/string-pools Merge: b0a8ef1 7e25da9 Author: Rafael Mendonça França Date: 2014-01-21 13:39:55 -0800 Merge pull request #13784 from kuldeepaggarwal/fix-doc-collection-proxy Add missing information for `id` field when used with `select` [ci skip] commit 7e25da9 refs/remotes/origin/fxn/string-pools Author: Kuldeep Aggarwal Date: 2014-01-22 02:50:23 +0530 add missing information for `id` field when used with `select` [ci skip] M activerecord/lib/active_record/associations/collection_proxy.rb commit e3130a3 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-21 14:33:16 -0200 `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore. Since Rails 4.0, we add an ORDER BY in the `first` method to ensure consistent results among different database engines. But for singular associations this behavior is not needed since we will have one record to return. As this ORDER BY option can lead some performance issues we are removing it for singular associations accessors. Fixes #12623. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/singular_association.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/singular_association.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb commit b0a8ef1 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-21 14:33:16 -0200 `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore. Since Rails 4.0, we add an ORDER BY in the `first` method to ensure consistent results among different database engines. But for singular associations this behavior is not needed since we will have one record to return. As this ORDER BY option can lead some performance issues we are removing it for singular associations accessors. Fixes #12623. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/singular_association.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb commit e011258 refs/heads/master Author: Yves Senn Date: 2014-01-21 17:17:13 +0100 prepend table name for `Relation#select` columns. This fixes a bug where `select(:id)` combined with `joins()` raised: ``` ActiveRecord::StatementInvalid: SQLite3::SQLException: ambiguous column name: id: SELECT id, authors.author_address_id FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY posts.id LIMIT 3 ``` The `select_values` are still String and Symbols because other parts (mainly calculations.rb) rely on that fact. /cc @tenderlove M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit a0520fc refs/heads/master Author: Rafael Mendonça França Date: 2014-01-20 23:10:48 -0200 Add more tests for the dirty feature for enums M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb M activerecord/test/models/book.rb M activerecord/test/schema/schema.rb commit a57a2bc refs/heads/master Author: Rafael Mendonça França Date: 2014-01-20 21:59:20 -0200 Make enum feature work with dirty methods To make this possible we have to override the save_changed_attribute hook. M activerecord/CHANGELOG.md M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit a4cc88d refs/heads/master Author: Rafael Mendonça França Date: 2014-01-20 21:57:47 -0200 Extract all attribute changed work to its own method This will make easier to hook on this feature to customize the behavior M activerecord/lib/active_record/attribute_methods/dirty.rb commit e74e96a refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-21 05:58:01 -0800 Merge pull request #13696 from senny/engine_bin_rails_load_bundler setup Bundler in engines `bin/rails` stub. M railties/lib/rails/generators/rails/plugin_new/templates/bin/rails.tt commit c60e062 refs/heads/master Merge: 6f0aa1d 755fd79 Author: Yves Senn Date: 2014-01-21 05:58:01 -0800 Merge pull request #13696 from senny/engine_bin_rails_load_bundler setup Bundler in engines `bin/rails` stub. commit df5a873 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-21 05:31:27 -0800 Merge pull request #9969 from divineforest/fix-find-in-batches Fail early with "Primary key not included in the custom select clause" i... Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit 6f0aa1d refs/heads/master Author: Yves Senn Date: 2014-01-21 14:35:33 +0100 Active Record changelog wording and formatting. [ci skip] M activerecord/CHANGELOG.md commit 6a8a7f8 refs/heads/master Merge: 9322e07 691709d Author: Yves Senn Date: 2014-01-21 05:31:27 -0800 Merge pull request #9969 from divineforest/fix-find-in-batches Fail early with "Primary key not included in the custom select clause" i... commit 691709d refs/heads/master Author: Alexander Balashov Date: 2013-03-28 16:03:02 +0400 Fail early with "Primary key not included in the custom select clause" in find_in_batches Before this patch find_in_batches raises this error only on second iteration. So you will know about the problem only when you get the batch size threshold. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit 9322e07 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-21 09:46:01 -0200 Remove missed usage of @first variable With the introduction of `#second` method and friends, we added an offsets hash which replaced the @first variable, so removing it from the reset method to avoid creating an unused variable now. Introduced in bc625080308e4853ae3036f2ad74fe3826e463ef. M activerecord/lib/active_record/relation.rb commit b8302bc refs/heads/master Author: Rafael Mendonça França Date: 2014-01-20 23:00:17 -0200 Forgot to push this change in the parent commit M activemodel/lib/active_model/dirty.rb commit 06a0003 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-20 22:58:14 -0200 When applying changes or reseting changes create the right class Before this patch after the changes are applied the changes can be only accessed using string keys, but before symbols are also accepted. After this change every state of the model will be consistent. M activemodel/lib/active_model/dirty.rb M activemodel/test/cases/dirty_test.rb commit de3bf3e refs/heads/master Author: Rafael Mendonça França Date: 2014-01-20 20:45:08 -0200 Remove unneded argument This variable is internal and should not be exposed to end users M activerecord/lib/active_record/relation.rb commit bc62508 refs/heads/master Merge: 5a09f13 cafe31a Author: Rafael Mendonça França Date: 2014-01-20 20:44:02 -0200 Merge pull request #13757 from terracatta/master Ensure #second (and others) acts like #first AR finder commit cafe31a refs/heads/master Author: Jason Meller Date: 2014-01-18 00:51:34 -0500 Ensure #second acts like #first AR finder This commit bring the famous ordinal Array instance methods defined in ActiveSupport into ActiveRecord as fully-fledged finders. These finders ensure a default ascending order of the table's primary key, and utilize the OFFSET SQL verb to locate the user's desired record. If an offset is defined in the query, calling #second adds to the offset to get the actual desired record. Fixes #13743. M activerecord/CHANGELOG.md M activerecord/lib/active_record/querying.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/calculations_test.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/relations_test.rb M activerecord/test/cases/scoping/named_scoping_test.rb M activerecord/test/fixtures/topics.yml commit 5a09f13 refs/heads/master Merge: bf19131 41722dd Author: Rafael Mendonça França Date: 2014-01-20 16:51:14 -0200 Merge branch 'anilmaurya-master' commit 41722dd refs/heads/master Author: anilmaurya Date: 2014-01-20 14:37:53 +0530 moving controller_name assignment before model name condition M railties/lib/rails/generators/resource_helpers.rb commit bf19131 refs/heads/master Author: Andrew White Date: 2014-01-20 16:34:22 +0000 Tidy up tests and CHANGELOG for #12598 M actionpack/CHANGELOG.md M actionpack/test/dispatch/routing/inspector_test.rb M actionpack/test/dispatch/routing/route_set_test.rb M actionpack/test/dispatch/routing_test.rb commit f9f32e0 refs/heads/master Author: Mikko Johansson Date: 2014-01-20 17:31:11 +0200 Automatically convert dashes to underscores in shorthand routes M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 746abbc refs/heads/master Author: Amr Tamimi Date: 2013-10-21 15:40:39 +0300 Automatically convert dashes to underscores for url helpers M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing/inspector_test.rb M actionpack/test/dispatch/routing/route_set_test.rb commit 080fc9c refs/heads/master Author: Yves Senn Date: 2014-01-20 15:04:36 +0100 docs should say `email` not `Email`. [ci skip] M actionmailer/lib/action_mailer/base.rb M guides/source/3_0_release_notes.md M guides/source/action_mailer_basics.md commit dfac4ce refs/heads/master Author: Yves Senn Date: 2014-01-20 14:47:40 +0100 docs, hyperlink the `Mail gem` in Action Mailer guide. [ci skip] M guides/source/action_mailer_basics.md commit 079ffc9 refs/heads/master Author: Yves Senn Date: 2014-01-20 14:03:48 +0100 let's link to the gem README not to the upgrading guide. [ci skip] The PR #13767 added link to the upgrading guide to explain details about activerecord_deprecated-finders. However the link target features a stack of changes not releated at all. Also the relevant details are not very informative. I think we better link to the README so people can see what the gem is about and how to use it. /cc @chancancode @zzak M guides/source/4_1_release_notes.md commit f63c6e5 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-20 08:56:08 -0200 Fix secrets.yml path in exception message The file is config/secrets.yml, not config/initializers/secrets.yml. M activesupport/lib/active_support/key_generator.rb commit 06849fd refs/heads/master Merge: 54befc6 9040e04 Author: Godfrey Chan Date: 2014-01-20 02:03:58 -0800 Merge pull request #13767 from zzak/doc_4_1_release_notes_deprecated_finders Add link to upgrade guide for full list of deprecated finders [ci skip] commit 54befc6 refs/heads/master Merge: 27f1fd0 7f25524 Author: Godfrey Chan Date: 2014-01-19 21:41:29 -0800 Merge pull request #13769 from arelenglish/fix_typo_upgrad_guide Fix a typo that says you application [ci skip] commit 7f25524 refs/heads/master Author: Arel English Date: 2014-01-20 00:37:48 -0500 Fix a typo that says you application [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 27f1fd0 refs/heads/master Merge: 18e9188 610a3e8 Author: Godfrey Chan Date: 2014-01-19 21:14:34 -0800 Merge pull request #13768 from rajeshthummalapally/rails_blog_correct_patch_link Fix for incorrect link that is pointing to Rails blog [ci skip] commit 610a3e8 refs/heads/master Author: Rajesh Thummalapally Date: 2014-01-19 23:34:33 -0500 Correcting link that is pointing to Rails blog [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 18e9188 refs/heads/master Merge: b1b21f9 90228a1 Author: Guillermo Iguaran Date: 2014-01-19 20:08:32 -0800 Merge pull request #13765 from robertomiranda/secrets_token Update Error Message when secrets.secret_key_base isn't given commit 90228a1 refs/heads/master Author: robertomiranda Date: 2014-01-19 20:59:54 -0500 Update Error Message when secrets.secret_key_base isn't given M activesupport/lib/active_support/key_generator.rb commit 9040e04 refs/heads/master Author: Zachary Scott Date: 2014-01-19 18:43:51 -0800 Add link to upgrade guide for full list of deprecated finders [ci skip] M guides/source/4_1_release_notes.md commit b1b21f9 refs/heads/master Merge: 935d235 0e9144d Author: Rafael Mendonça França Date: 2014-01-19 10:24:22 -0800 Merge pull request #13745 from nextgearcapital/master set encoding for pipe to binary mode commit 935d235 refs/heads/master Merge: 0c96f8a 7671590 Author: Robin Dupret Date: 2014-01-19 06:55:39 -0800 Merge pull request #13762 from robertomiranda/spring-under-rails Update Changelog, Spring is under rails/spring [ci skip] commit 7671590 refs/heads/master Author: robertomiranda Date: 2014-01-19 08:46:43 -0500 Update Changelog, Spring is under rails/spring [ci skip] M railties/CHANGELOG.md commit 0c96f8a refs/heads/master Merge: ab91bc3 b20d445 Author: Robin Dupret Date: 2014-01-19 02:02:02 -0800 Merge pull request #13759 from raysrashmi/rails-spring Spring in now under rails/spring [ci skip] commit b20d445 refs/heads/master Author: Rashmi Yadav Date: 2014-01-19 10:51:23 +0100 Spring in now under rails/spring [ci skip] M guides/code/getting_started/Gemfile M guides/source/4_1_release_notes.md M guides/source/upgrading_ruby_on_rails.md commit ab91bc3 refs/heads/master Merge: 3c354bd e05c791 Author: Andrew White Date: 2014-01-19 01:36:09 -0800 Merge pull request #13756 from huoxito/rails-spring spring gem moved to rails/spring commit e05c791 refs/heads/master Author: Washington Luiz Date: 2014-01-18 20:22:51 -0300 spring gem moved to rails/spring M railties/lib/rails/generators/app_base.rb commit c4083cb refs/remotes/origin/4-0-stable Author: Richard Schneeman Date: 2014-01-17 20:24:47 -0800 Merge pull request #13748 from summerblue/master Correct the version number to 4 in guides[ci skip] M guides/source/documents.yaml commit 5621c0c refs/remotes/origin/4-0-stable Author: Godfrey Chan Date: 2014-01-18 14:26:17 -0800 Merge pull request #13751 from chancancode/ar_rollback_fix Restore ActiveRecord states after a rollback for models w/o callbacks Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/transactions_test.rb commit 3c354bd refs/heads/master Merge: 35b85d2 7386ffc Author: Godfrey Chan Date: 2014-01-18 14:26:17 -0800 Merge pull request #13751 from chancancode/ar_rollback_fix Restore ActiveRecord states after a rollback for models w/o callbacks commit 7386ffc refs/heads/master Author: Godfrey Chan Date: 2014-01-18 04:36:45 -0800 Restore ActiveRecord states after a rollback for models w/o callbacks This fixes a regression (#13744) that was caused by 67d8bb9. In 67d8bb9, we introduced lazy rollback for records, such that the record's internal states and attributes are not restored immediately after a transaction rollback, but deferred until they are first accessed. This optimization is only performed when the model does not have any transactional callbacks (e.g. `after_commit` and `after_create`). Unfortunately, the models used to test the affected codepaths all comes with some sort of transactional callbacks. Therefore this codepath remains largely untested until now and as a result there are a few issues in the implementation that remains hidden until now. First, the `sync_with_transaction_state` (or more accurately, `update_attributes_from_transaction_state`) would perform the synchronization prematurely before a transaction is finalized (i.e. comitted or rolled back). As a result, when the actuall rollback happens, the record will incorrectly assumes that its internal states match the transaction state, and neglect to perform the restore. Second, `update_attributes_from_transaction_state` calls `committed!` in some cases. This in turns checks for the `destroyed?` state which also requires synchronization with the transaction stae, which causes an infnite recurrsion. This fix works by deferring the synchronization until the transaction has been finalized (addressing the first point), and also unrolled the `committed!` and `rolledback!` logic in-place (addressing the second point). It should be noted that the primary purpose of the `committed!` and `rolledback!` methods are to trigger the relevant transactional callbacks. Since this code path is only entered when there are no transactional callbacks on the model, this shouldn't be necessary. By unrolling the method calls, the intention here (to restore the states when necessary) becomes more clear. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/transactions_test.rb commit 35b85d2 refs/heads/master Merge: 1543863 bf89bfd Author: Richard Schneeman Date: 2014-01-17 20:24:47 -0800 Merge pull request #13748 from summerblue/master Correct the version number to 4 in guides[ci skip] commit bf89bfd refs/heads/master Author: Charlie Jade Date: 2014-01-18 12:14:21 +0800 Correct the version number to 4 in guides[ci skip] M guides/source/documents.yaml commit 5ac2879 refs/heads/master Merge: 15ff426 1543863 Author: Aaron Patterson Date: 2014-01-17 14:10:39 -0800 Merge branch 'master' into adequaterecord * master: fix exception translation translate exceptions on prepared statement failure test to ensure bad prepared statements raise a StatementInvalid exception commit 1543863 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 17:58:17 -0800 fix exception translation M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 9bc303c refs/heads/master Author: Aaron Patterson Date: 2014-01-14 17:38:43 -0800 translate exceptions on prepared statement failure M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit c1bbf1b refs/heads/master Author: Aaron Patterson Date: 2014-01-17 14:08:00 -0800 test to ensure bad prepared statements raise a StatementInvalid exception M activerecord/test/cases/adapters/postgresql/schema_test.rb commit 0e9144d refs/heads/master Author: Anna Carey Date: 2014-01-17 16:49:10 -0500 set encoding to binmode for pipe M activerecord/test/cases/base_test.rb M activerecord/test/cases/connection_management_test.rb M activesupport/lib/active_support/testing/isolation.rb commit 15ff426 refs/heads/master Author: Aaron Patterson Date: 2014-01-17 12:02:07 -0800 fix the method signature M activerecord/lib/active_record/statement_cache.rb commit cf3840e refs/heads/master Author: Aaron Patterson Date: 2014-01-17 12:01:13 -0800 run the damn tests @tenderlove M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb commit 3281d5a refs/heads/master Merge: d091c8f fe4758a Author: Aaron Patterson Date: 2014-01-17 11:41:31 -0800 Merge branch 'adequaterecord' of github.com:rails/rails into adequaterecord * 'adequaterecord' of github.com:rails/rails: Remove outdated comment. commit d091c8f refs/heads/master Author: Aaron Patterson Date: 2014-01-17 11:40:05 -0800 oops! M activerecord/lib/active_record/statement_cache.rb commit fe4758a refs/heads/master Author: Rafael Mendonça França Date: 2014-01-17 17:35:03 -0200 Remove outdated comment. The code duplication was removed and this comment is pointing to the wrong line. [ci skip] M activerecord/lib/active_record/relation/query_methods.rb commit a0d704a refs/heads/master Author: Aaron Patterson Date: 2014-01-17 11:22:45 -0800 don't cache the connection (because we don't need to) M activerecord/lib/active_record/statement_cache.rb commit 9c04b55 refs/heads/master Author: Aaron Patterson Date: 2014-01-17 11:14:50 -0800 fixing explain tests for sqlite3 M activerecord/test/cases/adapters/sqlite3/explain_test.rb commit 5927f55 refs/heads/master Author: Aaron Patterson Date: 2014-01-17 11:01:00 -0800 Revert "adding set_binds" This reverts commit 474ebc55bd13ad58626a49dfc44c8e6407813935. M activerecord/lib/active_record/relation.rb commit ed5b076 refs/heads/master Author: Aaron Patterson Date: 2014-01-17 11:00:04 -0800 remove dead code M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/statement_cache.rb commit c71df74 refs/heads/master Merge: e7f5317 486db21 Author: Aaron Patterson Date: 2014-01-17 10:49:47 -0800 Merge branch 'master' into adequaterecord * master: Fix eager load of Serializers on Active Model Consistence in the block style Remove warnings on Ruby 2.1 Only some dynamic finders are deprecated. clean up security guide: his => their [ci skip] Remove warning Extract a method to simplify setup code Use minitest's skip rather than conditionals + early returns Move AR test classes inside the test case Do not set up a variable used only in two tests No need for instance vars on single tests Cleanup duplicated setup of callbacks in transactions tests No need to use #send with public methods Update deprecation warning to give more information about caller Update changelog Avoid scanning multiple render calls as a single match. Improve ERB dependency detection. commit 59b6686 refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2014-01-17 15:24:48 -0200 Fix eager load of Serializers on Active Model M activemodel/lib/active_model.rb commit 486db21 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-17 15:24:48 -0200 Fix eager load of Serializers on Active Model M activemodel/lib/active_model.rb commit a497272 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-17 00:30:41 -0200 Consistence in the block style M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/lib/active_support/ordered_hash.rb commit 5402b72 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-17 00:10:25 -0200 Remove warnings on Ruby 2.1 M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/lib/active_support/ordered_hash.rb commit d725728 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-16 22:09:37 -0200 Only some dynamic finders are deprecated. find_by_* and find_by_*! are not deprecated for example, so lets add a note only where it is needed [ci skip] M guides/source/active_record_querying.md commit 7252b43 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-16 22:09:37 -0200 Only some dynamic finders are deprecated. find_by_* and find_by_*! are not deprecated for example, so lets add a note only where it is needed [ci skip] M guides/source/active_record_querying.md commit b9acc4a refs/heads/master Merge: bcd6def beeb896 Author: Lauro Caetano Date: 2014-01-16 16:04:22 -0800 Merge pull request #13735 from xta/cleanup_security_guide clean up security guide: his => their [ci skip] commit beeb896 refs/heads/master Author: Rex Feng Date: 2014-01-16 18:52:44 -0500 clean up security guide: his => their [ci skip] M guides/source/security.md commit e7f5317 refs/heads/master Author: Aaron Patterson Date: 2014-01-16 15:38:05 -0800 change query strategy based on adapter M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/statement_cache_test.rb commit 17944b3 refs/remotes/origin/4-0-stable Merge: 0a66a47 1240338 Author: Rafael Mendonça França Date: 2014-01-16 21:33:01 -0200 Merge pull request #13723 from BlakeMesdag/add-back-syck-deserialization-hook Add back yaml_initialize hook to AR::Core for Syck deserialization support Conflicts: activerecord/CHANGELOG.md commit a099d7d refs/heads/master Author: Jonathan Baudanza Date: 2014-01-12 17:53:16 -0500 psql implementation of #index_name_exists? M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb commit bcd6def refs/heads/master Author: Rafael Mendonça França Date: 2014-01-16 20:36:38 -0200 Remove warning M activesupport/test/core_ext/module_test.rb commit 9130324 refs/remotes/origin/fxn/string-pools Merge: fc422d3 662f8de Author: Xavier Noria Date: 2014-01-16 23:19:07 +0100 Merge branch 'master' into fxn/string-pools Conflicts: actionpack/lib/action_dispatch/journey/router.rb actionview/lib/action_view/dependency_tracker.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 1240338 refs/remotes/origin/4-0-stable Author: Blake Mesdag Date: 2014-01-15 16:35:02 -0500 Add back yaml_initialize hook to AR::Core for Syck deserialization support Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb commit 662f8de refs/heads/master Merge: 49223c9 e987dcd Author: Rafael Mendonça França Date: 2014-01-16 13:38:12 -0800 Merge pull request #13414 from britto/jb-fix-dependency-matching Improve ERB dependency detection commit 49223c9 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-16 18:52:43 -0200 Extract a method to simplify setup code M activerecord/test/cases/associations/eager_singularization_test.rb commit 740cf33 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-16 18:48:51 -0200 Use minitest's skip rather than conditionals + early returns M activerecord/test/cases/associations/eager_singularization_test.rb commit 44e5551 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-16 18:45:03 -0200 Move AR test classes inside the test case M activerecord/test/cases/associations/eager_singularization_test.rb commit c9c4a42 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 22:03:53 -0200 Do not set up a variable used only in two tests Just create a local variable whenever we need the record, rather than doing an extra find for every test on the setup method. M activerecord/test/cases/transaction_callbacks_test.rb commit 07ff352 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 21:59:33 -0200 No need for instance vars on single tests M activerecord/test/cases/transaction_callbacks_test.rb commit da4b5e8 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 21:58:29 -0200 Cleanup duplicated setup of callbacks in transactions tests M activerecord/test/cases/transaction_callbacks_test.rb commit 7b11b06 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 21:43:20 -0200 No need to use #send with public methods M activerecord/test/cases/transaction_callbacks_test.rb commit c253b8e refs/heads/master Merge: 44c51fc e47203d Author: Carlos Antonio da Silva Date: 2014-01-16 12:39:26 -0800 Merge pull request #13734 from tjschuck/fixture_class_name_deprecation_warning Update fixture class name deprecation warning to give more information about caller commit e47203d refs/heads/master Author: T.J. Schuck Date: 2014-01-16 14:57:22 -0500 Update deprecation warning to give more information about caller M activerecord/lib/active_record/fixtures.rb commit 060fbd6 refs/heads/master Merge: f19ba68 44c51fc Author: Aaron Patterson Date: 2014-01-16 11:57:03 -0800 Merge branch 'master' into adequaterecord * master: define the delegate methods on one line. fixes #13724 commit 44c51fc refs/heads/master Author: Aaron Patterson Date: 2014-01-16 11:55:48 -0800 define the delegate methods on one line. fixes #13724 sup haters M activesupport/lib/active_support/core_ext/module/delegation.rb M activesupport/test/core_ext/module_test.rb commit f19ba68 refs/heads/master Merge: f3e379f 73ba2c1 Author: Aaron Patterson Date: 2014-01-16 11:19:08 -0800 Merge branch 'master' into adequaterecord * master: Make AR::Base#touch fire the after_commit and after_rollback callbacks Fix test for cache_key + touched Revert "methods are defined right after the module_eval, so we don't need to do" Revert "Don't remove trailing slash from PATH_INFO for mounted apps" Add failing test for #13369 reset column information after fiddling with `Encoding.default_internal` we have `with_env_tz` as global test helper. Remove duplicate. isolate class attribute assignment in `migration_test.rb` use `teardown` for cleanup, not `setup`. tests without transactional fixtures need to cleanup afterwards. no need to `return skip` in tests. `skip` is enough. methods are defined right after the module_eval, so we don't need to do any line number maths Get rid of unused TransactionError constant Avoid converting :on option to array twice when defining commit/rollback callbacks Unify changelog entries about single quotes [ci skip] Use single quotes in generated files commit 3d5c4a1 refs/heads/master Author: Zachary Scott Date: 2014-01-16 11:06:10 -0800 Remove duplicate configuration option for ActiveSupport [ci skip] Fixes rails/rails#13732 M guides/source/configuring.md commit 0a66a47 refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2014-01-16 09:24:18 -0200 Merge branch 'ca-touch-commit-callbacks' Make AR::Base#touch fire the after_commit and after_rollback callbacks. Closes #12031. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/integration_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/transaction_callbacks_test.rb M activerecord/test/models/car.rb M activerecord/test/models/owner.rb commit 73ba2c1 refs/heads/master Merge: fbab7b2 177989c Author: Carlos Antonio da Silva Date: 2014-01-16 09:24:18 -0200 Merge branch 'ca-touch-commit-callbacks' Make AR::Base#touch fire the after_commit and after_rollback callbacks. Closes #12031. commit 177989c refs/heads/master Author: Harry Brundage Date: 2013-08-26 13:15:37 -0400 Make AR::Base#touch fire the after_commit and after_rollback callbacks M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transaction_callbacks_test.rb M activerecord/test/models/car.rb M activerecord/test/models/owner.rb commit 38fcee3 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 21:34:19 -0200 Fix test for cache_key + touched Ensure the child can actually be touched. The `Bulb` model has no timestamp column, thus trying to touch it would return `nil`. M activerecord/test/cases/integration_test.rb commit fbab7b2 refs/heads/master Author: Piotr Sarnacki Date: 2014-01-16 10:45:53 +0100 Revert "methods are defined right after the module_eval, so we don't need to do" This change breaks tests in activesupport/test/core_ext/module_test.rb: * test_delegation_exception_backtrace * test_delegation_exception_backtrace_with_allow_nil This reverts commit 0167765e3f84260522bc2f32d926c1f5dd44957c. M activesupport/lib/active_support/core_ext/module/delegation.rb commit 2e0f9ed refs/heads/master Author: Piotr Sarnacki Date: 2014-01-16 10:13:05 +0100 Revert "Don't remove trailing slash from PATH_INFO for mounted apps" The revert is needed because of a regression described in #13369, routes with trailing slash are no longer recognized properly. This reverts commit 50311f1391ddd8e0349d74eb57f04b7e0045a27d. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/router.rb M actionpack/test/dispatch/mount_test.rb commit 73d8a90 refs/heads/master Author: Piotr Sarnacki Date: 2014-01-16 10:07:51 +0100 Add failing test for #13369 After introducing 50311f1 a regression was introduced: routes with trailing slash are no longer recognized properly. This commit provides a failing test for this situation. M actionpack/test/dispatch/routing_test.rb commit 2a0ba91 refs/heads/master Merge: 0167765 6eab530 Author: Yves Senn Date: 2014-01-16 10:05:30 +0100 Merge branch 'fix_order_dependent_tests_in_active_record_suite' This gets the whole Active Record suite working without calling `self.i_suck_and_my_tests_are_order_dependent!` on `ActiveSupport::TestCase`. Note that the test files themselves still run in order. This means that only order dependencies within a single test file were addressed. commit 6eab530 refs/heads/master Author: Yves Senn Date: 2014-01-15 20:53:05 +0100 reset column information after fiddling with `Encoding.default_internal` This solves order depndent problems in `base_test.rb`. The leaked column information crashed test cases using the `Weird` class later on: ``` 2) Error: BasicsTest#test_group_weirds_by_from: SyntaxError: /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ... attribute_before_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *arg... ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ...te_before_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *args) ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ...e_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *args) ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:385:in `module_eval' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:385:in `define_proxy_call' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:294:in `block in define_attribute_method' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:285:in `each' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:285:in `define_attribute_method' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `block in define_attribute_methods' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `each' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `define_attribute_methods' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:72:in `block in define_attribute_methods' /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/2.0.0/mutex_m.rb:73:in `synchronize' /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/2.0.0/mutex_m.rb:73:in `mu_synchronize' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:69:in `define_attribute_methods' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:174:in `method_missing' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:45:in `public_send' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:45:in `_assign_attribute' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:32:in `block in assign_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `each' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `assign_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:458:in `init_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:191:in `initialize' /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:30:in `new' /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:30:in `new' /Users/senny/Projects/rails/activerecord/lib/active_record/persistence.rb:33:in `create' test/cases/base_test.rb:646:in `test_group_weirds_by_from' ``` M activerecord/test/cases/base_test.rb commit fca8b03 refs/heads/master Author: Yves Senn Date: 2014-01-15 20:34:53 +0100 we have `with_env_tz` as global test helper. Remove duplicate. M activerecord/test/cases/finder_test.rb M activerecord/test/cases/migration_test.rb commit a713900 refs/heads/master Author: Yves Senn Date: 2014-01-15 20:33:37 +0100 isolate class attribute assignment in `migration_test.rb` This makes the tests inside `migration_test.rb` order independent. The assignments to `Reminder.table_name_prefix` and `Reminder.table_name_suffix` previously leaked and had impact on following test cases. This patch isolates the assignments on a throw-away subclass. M activerecord/test/cases/migration_test.rb commit f005243 refs/heads/master Author: Yves Senn Date: 2014-01-15 14:08:45 +0100 use `teardown` for cleanup, not `setup`. This solves order dependent issues where the last test leaked the query cache state. This resulted in the following error: ``` QueryCacheExpiryTest#test_cache_is_expired_by_habtm_delete [test/cases/query_cache_test.rb:275]: not all expectations were satisfied unsatisfied expectations: - expected exactly twice, invoked once: #.clear_query_cache(any_parameters) ``` M activerecord/test/cases/query_cache_test.rb commit 8e1735e refs/heads/master Author: Yves Senn Date: 2014-01-15 11:42:26 +0100 tests without transactional fixtures need to cleanup afterwards. This fixes test order issues. M activerecord/test/cases/autosave_association_test.rb commit a6512cb refs/heads/master Author: Yves Senn Date: 2014-01-15 11:30:55 +0100 no need to `return skip` in tests. `skip` is enough. M activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/adapters/postgresql/range_test.rb M activerecord/test/cases/adapters/postgresql/xml_test.rb M activerecord/test/cases/base_test.rb commit 0167765 refs/heads/master Author: Aaron Patterson Date: 2014-01-15 16:06:56 -0800 methods are defined right after the module_eval, so we don't need to do any line number maths M activesupport/lib/active_support/core_ext/module/delegation.rb commit f2f723b refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 21:15:25 -0200 Get rid of unused TransactionError constant This has been added 9 years ago in a677da209b16f43198b3485dda89dce862fb9bfb, and removed 6 years ago in 38f8252e2d0a109d1b833d6b289cd989e7bfffe4. M activerecord/lib/active_record/transactions.rb commit 885f3ae refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 21:06:53 -0200 Avoid converting :on option to array twice when defining commit/rollback callbacks M activerecord/lib/active_record/transactions.rb commit f3e379f refs/heads/master Author: Aaron Patterson Date: 2014-01-15 14:24:11 -0800 use a params hash so we know what bind parameters are used M activerecord/lib/active_record/relation/query_methods.rb M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/statement_cache_test.rb commit 1c88b36 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-15 19:26:00 -0200 Unify changelog entries about single quotes [ci skip] M railties/CHANGELOG.md commit b59204d refs/heads/master Merge: 8d146c8 1ab6c65 Author: Carlos Antonio da Silva Date: 2014-01-15 13:24:56 -0800 Merge pull request #13713 from chulkilee/use-single-quotes Use single quotes in generated files commit 7fff71b refs/heads/master Author: Aaron Patterson Date: 2014-01-15 11:20:28 -0800 use edge arel M Gemfile commit 6f16513 refs/heads/master Author: Timur Alperovich Date: 2014-01-08 15:08:25 -0800 SQLite3: Always close statements. SQLite3 adapter must make sure to close statements after queries. Fixes: #13631 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 2c4c523 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 18:05:00 -0800 some databases do not have bind params (mysql2) so take that in to account M activerecord/test/cases/explain_test.rb commit 5e5118a refs/heads/master Author: Aaron Patterson Date: 2014-01-14 17:58:17 -0800 fix exception translation M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 438fce7 refs/heads/master Merge: 07a9f47 8d146c8 Author: Aaron Patterson Date: 2014-01-14 17:48:13 -0800 Merge branch 'master' into set_binds * master: rm dup code Conflicts: activerecord/test/cases/relations_test.rb commit 8d146c8 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 17:47:10 -0800 rm dup code https://github.com/rails/rails/blob/e64a83cdbd3ce836f3339c600c1006b20c23d8fd/activerecord/test/cases/relation/merging_test.rb#L80-91 M activerecord/test/cases/relations_test.rb commit 07a9f47 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 17:42:45 -0800 test bind value equality M activerecord/test/cases/relations_test.rb commit e0b623a refs/heads/master Author: Aaron Patterson Date: 2014-01-14 17:38:43 -0800 translate exceptions on prepared statement failure M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 7d14e03 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 17:24:28 -0800 reorder bind indexes if joins produced bind values M activerecord/lib/active_record/relation/query_methods.rb commit 03118bc refs/heads/master Author: Aaron Patterson Date: 2014-01-14 16:55:59 -0800 expliticly make STI column a bind value M activerecord/lib/active_record/associations/join_dependency/join_association.rb commit 2fff094 refs/heads/master Merge: 58e5ba0 3204bbf Author: Aaron Patterson Date: 2014-01-14 16:46:57 -0800 Merge branch 'master' into set_binds * master: directly create the ARel AST Updated comment to mention the enum mapping class method [ci skip] commit 3204bbf refs/heads/master Author: Aaron Patterson Date: 2014-01-14 16:46:06 -0800 directly create the ARel AST rather than allocating a new Relation, just make the AST directly M activerecord/lib/active_record/associations/join_dependency/join_association.rb commit 58e5ba0 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 16:21:10 -0800 take in to account existing bind parameters when building the bind list M activerecord/lib/active_record/relation/query_methods.rb commit e64a83c refs/heads/master Author: Godfrey Chan Date: 2014-01-14 15:41:44 -0800 Updated comment to mention the enum mapping class method [ci skip] M activerecord/lib/active_record/enum.rb commit b6c7275 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 14:47:31 -0800 match against bind values M activerecord/test/cases/adapters/postgresql/explain_test.rb commit 9c290db refs/heads/master Author: Aaron Patterson Date: 2014-01-14 14:40:26 -0800 comment out the sqlite3 debug code (for now) M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit fd2d144 refs/remotes/origin/4-0-stable Author: Ujjwal Thaakar Date: 2014-01-14 18:53:45 +0530 Don't try to get the subclass if the inheritance column doesn't exist The `subclass_from_attrs` method is called even if the column specified by the `inheritance_column` setting doesn't exist. This prevents setting associations via the attributes hash if the association name clashes with the value of the setting, typically `:type`. This worked previously in Rails 3.2. (cherry picked from commit e8d1d84837a59ef7d73b29b16ee05cd610d30a90) Conflicts: activerecord/CHANGELOG.md activerecord/test/schema/schema.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/inheritance.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/models/shop.rb M activerecord/test/schema/schema.rb commit 2de1bb8 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 14:33:03 -0800 fix statement cache execution M activerecord/test/cases/statement_cache_test.rb commit 74bfbfd refs/heads/master Author: Aaron Patterson Date: 2014-01-14 14:26:00 -0800 fix cache class interface M activerecord/lib/active_record/statement_cache.rb M activerecord/test/cases/statement_cache_test.rb commit a924e0d refs/heads/master Author: Aaron Patterson Date: 2014-01-14 14:12:34 -0800 unscoping a where should remove bind values M activerecord/lib/active_record/relation/query_methods.rb commit 8b9ddab refs/heads/master Author: Aaron Patterson Date: 2014-01-14 14:03:33 -0800 remove dead code M activerecord/lib/active_record/relation/query_methods.rb commit 9bdaba8 refs/heads/master Merge: 40be2ea ce95fb2 Author: Aaron Patterson Date: 2014-01-14 14:01:30 -0800 Merge branch 'master' into set_binds * master: "string" isn't a valid column type for ActiveRecord commit ce95fb2 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 13:59:07 -0800 "string" isn't a valid column type for ActiveRecord Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 40be2ea refs/heads/master Author: Aaron Patterson Date: 2014-01-14 13:59:07 -0800 drop the dual encodings table M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit f5a635e refs/heads/master Author: Aaron Patterson Date: 2014-01-14 12:01:57 -0800 where needs to bring the bind params when creating a new relation M activerecord/lib/active_record/relation/spawn_methods.rb commit b5f679b refs/heads/master Author: Aaron Patterson Date: 2014-01-14 11:56:05 -0800 `where` makes bind values, so stop manually creating them M activerecord/test/cases/relations_test.rb commit c65cfd7 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 11:52:35 -0800 switch to arrays for bind removal test we can't make bind values for arrays yet M activerecord/test/cases/relations_test.rb commit 2f88530 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 11:51:04 -0800 `where` creates binds, so do not create them manually M activerecord/test/cases/relations_test.rb commit 6392cd9 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 11:49:44 -0800 we should not be copying these. fixes test_find_all_using_where_with_relation_with_bound_values M activerecord/lib/active_record/relation/query_methods.rb commit 09035e6 refs/heads/master Merge: c7cf7f4 b233307 Author: Aaron Patterson Date: 2014-01-14 11:43:57 -0800 Merge branch 'master' into set_binds * master: don't establish a new connection when testing with `sqlite3_mem`. sqlite >= 3.8.0 supports partial indexes Don't try to get the subclass if the inheritance column doesn't exist Enum mappings are now exposed via class methods instead of constants. Fix fields_for documentation with index option [ci skip] quick pass through Active Record CHANGELOG. [ci skip] [ci skip] Grammar correction single quotes for controller generated routes [ci skip] Added alias to CSRF Set NameError#name commit c7cf7f4 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 11:26:46 -0800 remove dead code M activerecord/test/cases/relation/where_chain_test.rb commit 034762a refs/heads/master Author: Aaron Patterson Date: 2014-01-14 11:26:00 -0800 adjust AST tests to respect bind values M activerecord/test/cases/relation/where_chain_test.rb commit 1ab6c65 refs/heads/master Author: Chulki Lee Date: 2014-01-14 09:57:40 -0800 Use single quotes in generated files M guides/code/getting_started/app/views/layouts/application.html.erb M guides/code/getting_started/config/environments/test.rb M guides/source/upgrading_ruby_on_rails.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt M railties/lib/rails/generators/rails/app/templates/test/test_helper.rb M railties/test/generators/app_generator_test.rb commit 25bc0fb refs/heads/master Author: Aaron Patterson Date: 2014-01-14 10:43:53 -0800 where uses bind values so we don't need to manually create them M activerecord/test/cases/relation/merging_test.rb commit f4d6008 refs/heads/master Author: Aaron Patterson Date: 2014-01-14 10:41:33 -0800 remove test that does not apply anymore M activerecord/test/cases/relation/merging_test.rb commit b233307 refs/heads/master Author: Yves Senn Date: 2014-01-14 18:00:58 +0100 don't establish a new connection when testing with `sqlite3_mem`. This fixes broken `rake test_sqlite3_mem` suite for Active Record. The problem is that that the old database with the schema is lost when establishing a new connection. Upon reconnting we are left with a blank database and tests down the line start failing. M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 93b38d5 refs/heads/master Merge: 8a60f47 547ed45 Author: Yves Senn Date: 2014-01-14 07:58:06 -0800 Merge pull request #13350 from ccutrer/sqlite-partial-indexes sqlite >= 3.8.0 supports partial indexes commit 547ed45 refs/heads/master Author: Cody Cutrer Date: 2013-12-17 10:10:23 -0700 sqlite >= 3.8.0 supports partial indexes M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/schema_dumper_test.rb commit 8a60f47 refs/heads/master Merge: b242b2d e8d1d84 Author: Andrew White Date: 2014-01-14 07:05:54 -0800 Merge pull request #13710 from ujjwalt/hotfix/sti Active Record's subclass_from_attributes shouldn't assume :type is for STI unless there is a type column. commit e8d1d84 refs/heads/master Author: Ujjwal Thaakar Date: 2014-01-14 18:53:45 +0530 Don't try to get the subclass if the inheritance column doesn't exist The `subclass_from_attrs` method is called even if the column specified by the `inheritance_column` setting doesn't exist. This prevents setting associations via the attributes hash if the association name clashes with the value of the setting, typically `:type`. This worked previously in Rails 3.2. M activerecord/CHANGELOG.md M activerecord/lib/active_record/inheritance.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/models/shop.rb M activerecord/test/schema/schema.rb commit b242b2d refs/heads/master Author: Godfrey Chan Date: 2014-01-14 03:58:22 -0800 Enum mappings are now exposed via class methods instead of constants. Example: class Conversation < ActiveRecord::Base enum status: [ :active, :archived ] end Before: Conversation::STATUS # => { "active" => 0, "archived" => 1 } After: Conversation.statuses # => { "active" => 0, "archived" => 1 } M activerecord/CHANGELOG.md M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit 028029c refs/heads/master Merge: c2a6fc4 9cdc7c0 Author: Carlos Antonio da Silva Date: 2014-01-14 02:13:28 -0800 Merge pull request #13705 from mess110/controller_generator_route_quotes Single quotes for controller generated routes. This is more consistent with all other Rails generated code. commit fc93b5b refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-14 01:16:34 -0800 Merge pull request #13706 from prathamesh-sonpatki/issue-13125 Fix fields_for documentation with index option [ci skip] M guides/source/form_helpers.md commit c2a6fc4 refs/heads/master Merge: d901699 3cf5d2b Author: Yves Senn Date: 2014-01-14 01:16:34 -0800 Merge pull request #13706 from prathamesh-sonpatki/issue-13125 Fix fields_for documentation with index option [ci skip] commit 3cf5d2b refs/heads/master Author: Prathamesh Sonpatki Date: 2014-01-14 10:46:29 +0530 Fix fields_for documentation with index option [ci skip] - fields_for documentation with index option was wrong. - It does not work with passing model as it is. - Changed the example by passing id of the address object. - Fixes #13125. M guides/source/form_helpers.md commit d901699 refs/heads/master Merge: 66f3d5b a71a8e2 Author: Yves Senn Date: 2014-01-14 00:29:32 -0800 Merge pull request #13709 from akshay-vishnoi/typo [ci skip] Grammar correction commit 66f3d5b refs/heads/master Author: Yves Senn Date: 2014-01-14 09:19:37 +0100 quick pass through Active Record CHANGELOG. [ci skip] M activerecord/CHANGELOG.md commit a71a8e2 refs/heads/master Author: Akshay Vishnoi Date: 2014-01-14 13:43:47 +0530 [ci skip] Grammar correction M activesupport/lib/active_support/core_ext/hash/conversions.rb commit f6ca00b refs/heads/master Merge: 5873036 bea44cb Author: Yves Senn Date: 2014-01-14 00:12:54 -0800 Merge pull request #13669 from chulkilee/name-error-name Set NameError#name commit 5873036 refs/heads/master Merge: f1764a2 ad04c2e Author: Damien Mathieu <42@dmathieu.com> Date: 2014-01-13 23:48:38 -0800 Merge pull request #13707 from udaykadaboina/docModification [ci skip] Added alias to CSRF commit 9cdc7c0 refs/heads/master Author: Cristian Mircea Messel Date: 2014-01-13 21:11:15 +0200 single quotes for controller generated routes Write routes in route.rb with single quotes get 'welcome/index' instead of get "welcome/index" M guides/source/getting_started.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/controller/controller_generator.rb M railties/test/generators/controller_generator_test.rb M railties/test/generators/namespaced_generators_test.rb commit ad04c2e refs/heads/master Author: Uday Kadaboina Date: 2014-01-14 01:31:23 -0500 [ci skip] Added alias to CSRF M guides/source/security.md commit e2e9a13 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 17:25:09 -0800 explains for prepared statements should never have binds in SQLite3 M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit fd97f35 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 16:51:59 -0800 fixing column alias resolution M activerecord/lib/active_record/relation/query_methods.rb commit 91d3d00 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 16:42:12 -0800 fix tests for explain plan + binds M activerecord/test/cases/explain_test.rb M activerecord/test/cases/hot_compatibility_test.rb commit b8264ef refs/heads/master Author: Aaron Patterson Date: 2014-01-13 16:33:31 -0800 replace bind values on calls to to_sql M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/relation.rb commit 5f2dd14 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 16:19:52 -0800 do not clear out bind parameters on unscope M activerecord/lib/active_record/relation/query_methods.rb commit bf48af5 refs/heads/master Merge: aec4aa1 f1764a2 Author: Aaron Patterson Date: 2014-01-13 16:16:19 -0800 Merge branch 'master' into set_binds * master: (24 commits) unscope should remove bind values associated with the where reverse_order_value= is not private, so no need to send avoid more dynamic symbols no need to to_sym recover from test runs that leave the database in a bad state updates screenshot data [ci skip] "serie" => "series" revises a few things in the getting started guide [ci skip] Favor canonical environment variables for secrets removed extra comma [ci skip] Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665. Updated Changelog to reflect removal of :dependent => :restrict standardize on jruby_skip & rbx_skip fix bug in becomes! when changing from base to subclass. Closes #13272. highlight http://localhost:3000 in README.md. Closes #13643. [ci skip] doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] Skip Spring App Generator tests on JRuby fixes a typo in a CHANGELOG upgrade SDoc fixes the Gemfile generator templates ... Conflicts: activerecord/test/cases/hot_compatibility_test.rb commit f1764a2 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 16:15:20 -0800 unscope should remove bind values associated with the where M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit 1e2d7c2 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 16:10:57 -0800 reverse_order_value= is not private, so no need to send It's not public API, but is not private scoped. M activerecord/lib/active_record/relation/query_methods.rb commit 81d10b9 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 15:25:47 -0800 avoid more dynamic symbols M activerecord/lib/active_record/relation/query_methods.rb commit 492bad7 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 15:08:06 -0800 no need to to_sym M activerecord/lib/active_record/relation/query_methods.rb commit 7e02eff refs/heads/master Merge: d220e8a fd68adc Author: Rafael Mendonça França Date: 2014-01-13 15:10:45 -0800 Merge pull request #13704 from waynn/patch-4 "serie" => "series" commit d220e8a refs/heads/master Author: Aaron Patterson Date: 2014-01-13 15:02:28 -0800 recover from test runs that leave the database in a bad state M activerecord/test/cases/hot_compatibility_test.rb commit e992cd4 refs/heads/master Author: Xavier Noria Date: 2014-01-13 23:29:11 +0100 updates screenshot data [ci skip] M guides/source/getting_started.md commit fd68adc refs/heads/master Author: Waynn Lue Date: 2014-01-13 14:23:58 -0800 "serie" => "series" M actionview/test/template/form_collections_helper_test.rb commit 7524a91 refs/heads/master Author: Xavier Noria Date: 2014-01-13 23:10:22 +0100 revises a few things in the getting started guide [ci skip] More to come. A guides/assets/images/getting_started/rails_welcome.jpg D guides/assets/images/getting_started/rails_welcome.png M guides/code/getting_started/Gemfile M guides/code/getting_started/Gemfile.lock M guides/source/getting_started.md commit bea44cb refs/heads/master Author: Chulki Lee Date: 2014-01-10 16:27:18 -0800 Set NameError#name M activerecord/CHANGELOG.md M activerecord/lib/active_record/inheritance.rb M activerecord/test/cases/base_test.rb commit 8b70319 refs/heads/master Merge: fe24a38 b9095ec Author: Rafael Mendonça França Date: 2014-01-13 12:33:04 -0800 Merge pull request #13703 from schneems/schneems/rail-secrets-key Favor canonical environment variables for secrets commit b9095ec refs/heads/master Author: schneems Date: 2014-01-13 14:01:24 -0600 Favor canonical environment variables for secrets Prefixing an environment variable with `RAILS_` should be used when there is otherwise a conflict, such as `RAILS_ENV` or if it is being used for a very Rails specific value. If we remove the prefix of `RAILS_` in the case of `RAILS_SECRET_KEY_BASE` then we can push for a pseudo standard among other frameworks that will accept a common environment key `SECRET_KEY_BASE` to keep your app secure. This is beneficial for containerized deployments such as docker, Heroku, etc. So that the container need to know one less thing about your app (it can just set it no-matter what language or framework you are using). This change also allows the defaults to be consistent with the way the secret key is accessed so `secrets.secret_key_base` is aliased to `SECRET_KEY_BASE` instead of `RAILS_SECRET_KEY_BASE`. M railties/lib/rails/generators/rails/app/templates/config/secrets.yml M railties/test/isolation/abstract_unit.rb commit 6900b3e refs/heads/master Author: Waynn Lue Date: 2014-01-13 12:15:52 -0800 add punctuation M actionpack/RUNNING_UNIT_TESTS.rdoc commit 4dbc62d refs/heads/master Author: Waynn Lue Date: 2014-01-13 11:56:00 -0800 e-mail => email, and subject/verb agreement M actionmailer/README.rdoc commit fe24a38 refs/heads/master Merge: e0a521c 1ea0ae6 Author: Rafael Mendonça França Date: 2014-01-13 11:52:01 -0800 Merge pull request #13702 from kuldeepaggarwal/docs-fix removed extra comma [ci skip] commit aec4aa1 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 11:50:42 -0800 check bind parameter uniqueness M activerecord/test/cases/associations/association_scope_test.rb commit 1ea0ae6 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-01-14 01:18:00 +0530 removed extra comma [ci skip] M actionmailer/lib/action_mailer/base.rb commit 9b5d603 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 11:44:38 -0800 adding bind values to the manager object M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/lib/active_record/relation/query_methods.rb commit 3086881 refs/heads/master Author: Aaron Patterson Date: 2014-01-13 10:58:48 -0800 bubble bind parameters up when building join dependencies M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/associations/join_dependency/join_association.rb M activerecord/lib/active_record/relation/query_methods.rb commit e2b2539 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-13 18:30:48 +0100 Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665. This prevents Rails from assigning meaningless log levels to third party loggers like log4r. If `Rails.logger` is not `kind_of?(::Logger)` we simply assign the `config.log_level` as is. This bug was introduced by #11665. Conflicts: railties/CHANGELOG.md railties/test/application/configuration_test.rb M railties/CHANGELOG.md M railties/lib/rails/application/bootstrap.rb M railties/test/application/configuration_test.rb commit e0a521c refs/heads/master Author: Yves Senn Date: 2014-01-13 18:30:48 +0100 Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665. This prevents Rails from assigning meaningless log levels to third party loggers like log4r. If `Rails.logger` is not `kind_of?(::Logger)` we simply assign the `config.log_level` as is. This bug was introduced by #11665. M railties/CHANGELOG.md M railties/lib/rails/application/bootstrap.rb M railties/test/application/configuration_test.rb commit 4f779e3 refs/heads/master Merge: 050f100 25a9623 Author: Rafael Mendonça França Date: 2014-01-13 09:46:50 -0800 Merge pull request #13699 from rystraum/dependent-restrict-removal Updated Changelog to reflect removal of :dependent => :restrict commit 25a9623 refs/heads/master Author: Rystraum Gamonez Date: 2014-01-14 01:29:26 +0800 Updated Changelog to reflect removal of :dependent => :restrict Based on https://github.com/rails/rails/issues/2502, the option has been removed. M guides/source/upgrading_ruby_on_rails.md commit 755fd79 refs/heads/master Author: Yves Senn Date: 2014-01-13 15:42:10 +0100 setup Bundler in engines `bin/rails` stub. This is necessary when bundling gems locally using `BUNDLE_PATH`. Without this patch `bin/rails` fails with: ``` /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rails/all (LoadError) from /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require' from bin/rails:7:in `
' ``` M railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt commit 050f100 refs/heads/master Merge: e95031f 35e56f6 Author: Yves Senn Date: 2014-01-13 06:33:25 -0800 Merge pull request #13693 from gaurish/typo [JRuby] Fix incorrect RUBY_ENGINE value commit 35e56f6 refs/heads/master Author: Gaurish Sharma Date: 2014-01-13 16:54:06 +0530 standardize on jruby_skip & rbx_skip This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use these helpers instead of calls directly to RUBY_ENGINE/RbConfig/JRUBY_VERSION M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionpack/test/dispatch/static_test.rb M actionview/test/abstract_unit.rb M activesupport/test/abstract_unit.rb M railties/test/abstract_unit.rb M railties/test/generators/app_generator_test.rb commit 68cd3bc refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-13 15:04:23 +0100 fix bug in becomes! when changing from base to subclass. Closes #13272. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/inheritance_test.rb commit e95031f refs/heads/master Author: Yves Senn Date: 2014-01-13 15:04:23 +0100 fix bug in becomes! when changing from base to subclass. Closes #13272. M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/inheritance_test.rb commit ee4b5f1 refs/heads/master Author: Yves Senn Date: 2014-01-13 11:47:29 +0100 highlight http://localhost:3000 in README.md. Closes #13643. [ci skip] This has no effect on the API docs. The main API page is taken from: railties/RDOC_MAIN.rdoc M README.md commit 6860082 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-13 11:25:58 +0100 doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] M activemodel/lib/active_model/validations/inclusion.rb commit 8c0d5e0 refs/heads/master Author: Yves Senn Date: 2014-01-13 11:25:58 +0100 doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] M activemodel/lib/active_model/validations/inclusion.rb commit 3a521bc refs/heads/master Merge: 2b4ed72 4aca806 Author: Yves Senn Date: 2014-01-12 23:44:36 -0800 Merge pull request #13687 from gaurish/spring-has-no-love-for-jruby Skip Spring App Generator tests on JRuby commit 2b4ed72 refs/heads/master Merge: c0577eb 7ce6840 Author: Godfrey Chan Date: 2014-01-12 20:50:38 -0800 Merge pull request #13646 from jenseng/json_escape Clarify behavior of json_escape [ci skip] commit c0577eb refs/heads/master Merge: db11682 792c66f Author: David Heinemeier Hansson Date: 2014-01-12 20:06:12 -0800 Merge pull request #13673 from senny/use_enum_label_in_forms use enum labels as form values. Achieved by `_before_type_cast`. commit 4aca806 refs/heads/master Author: Gaurish Sharma Date: 2014-01-13 02:33:05 +0530 Skip Spring App Generator tests on JRuby Spring makes extensive use of Process.fork, so won't be able to provide JRuby Support, hence skip these tests on JRuby. M railties/test/generators/app_generator_test.rb commit db11682 refs/heads/master Author: Xavier Noria Date: 2014-01-12 22:24:28 +0100 fixes a typo in a CHANGELOG M railties/CHANGELOG.md commit 6049249 refs/heads/master Author: Xavier Noria Date: 2014-01-12 01:12:12 +0100 upgrade SDoc Kudos to @zzak for taking over SDoc and make it work with RDoc 4. M Gemfile M guides/code/getting_started/Gemfile M guides/code/getting_started/Gemfile.lock M railties/CHANGELOG.md M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit 20a795f refs/heads/master Author: Xavier Noria Date: 2014-01-12 21:25:16 +0100 fixes the Gemfile generator templates The templates were written as if for a given gem you could either pass a version or options, but not both. But you may want to specify a version and also a group or whether the gem has to be required, for example. M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/plugin/templates/Gemfile commit 9c946be refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-01-12 11:18:27 +0000 Add CHANGELOG entry for #13668 M activesupport/CHANGELOG.md commit ecd0707 refs/remotes/origin/4-0-stable Author: Prathamesh Sonpatki Date: 2014-01-10 22:29:42 +0530 Fix iterating over DateTime by doing strict checking for Time objects - Fixes #13667 (cherry picked from commit 1842a6920f6205262407ca893d31577f050b6b87) M activesupport/lib/active_support/core_ext/range/each.rb M activesupport/test/core_ext/range_ext_test.rb commit 75c2711 refs/heads/master Merge: 4ae3da6 1842a69 Author: Andrew White Date: 2014-01-12 00:24:50 -0800 Merge pull request #13668 from prathamesh-sonpatki/issue-13667 Fix iterating over DateTime by doing strict checking for Time objects commit c4e9dc2 refs/heads/master Author: Aaron Patterson Date: 2014-01-11 17:31:15 -0800 force table creation M activerecord/test/cases/hot_compatibility_test.rb commit 11e8bad refs/heads/master Merge: 474ebc5 caa981d Author: Aaron Patterson Date: 2014-01-11 17:28:43 -0800 Merge branch 'master' into set_binds * master: (2794 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: activerecord/lib/active_record/associations/join_dependency/join_association.rb activerecord/lib/active_record/relation/query_methods.rb commit 1842a69 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-01-10 22:29:42 +0530 Fix iterating over DateTime by doing strict checking for Time objects - Fixes #13667 M activesupport/lib/active_support/core_ext/range/each.rb M activesupport/test/core_ext/range_ext_test.rb commit 4ae3da6 refs/heads/master Merge: caa981d b4f9377 Author: Andrew White Date: 2014-01-11 03:58:25 -0800 Merge pull request #13671 from arunagw/upgrade-bundler Removing without_thor_debug commit 792c66f refs/heads/master Author: Yves Senn Date: 2014-01-11 12:57:09 +0100 use enum labels as form values. Achieved by `_before_type_cast`. Closes #13650, #13672 This is an alternate implementation to solve #13650. Currently form fields contain the enum value (eg. "1"). This breaks because the setter `enum=` expects the label (eg. "active"). ActiveRecord::Enum allows you to use labels in your application but store numbers. We should make sure that all parts after AR are dealing with labels and not the underlying mapping to a number. This patch defines `_before_type_cast` on every enum column to return the label. This method is later used to fetch the value to display in form fields. I deliberately copied the implementation of the enum getter instead of delegating to it. This allows you to overwrite the getter and for example return a `Value Object` but have it still work for form fields. M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit b4f9377 refs/heads/master Author: Arun Agrawal Date: 2014-01-11 08:50:31 +0100 Removing without_thor_debug a1d0c0fa3d8ca97edc8f2a1d6ba96af19221dbad as bundler 1.5.2 is out now M railties/lib/rails/generators/testing/behaviour.rb commit caa981d refs/heads/master Merge: 71d19f1 bd1bf2c Author: Aaron Patterson Date: 2014-01-10 11:00:30 -0800 Merge branch 'master' into laurocaetano-fix_send_file * master: (536 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: actionpack/CHANGELOG.md commit fc422d3 refs/remotes/origin/fxn/string-pools Merge: ba6e7a0 bd1bf2c Author: Xavier Noria Date: 2014-01-10 18:46:22 +0100 Merge branch 'master' into fxn/string-pools commit bd1bf2c refs/heads/master Merge: 35cc328 2af5303 Author: Aaron Patterson Date: 2014-01-10 09:30:32 -0800 Merge branch 'ruby-2.2' * ruby-2.2: Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 commit 35cc328 refs/heads/master Author: Yves Senn Date: 2014-01-10 09:59:19 +0100 doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Refs #13658 M activerecord/lib/active_record/relation/finder_methods.rb commit 7d3a336 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-10 09:52:08 +0100 document implicit readonly. Closes #13660. [ci skip] This behavior was removed for Rails `4.1` (aff928bacfb26f164c3f0ccbee7bcfa8228941cb). M guides/source/active_record_querying.md commit e842a22 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-09 23:45:33 -0800 Merge pull request #13657 from leriksen/master [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets re... M guides/source/layouts_and_rendering.md commit 8ad1612 refs/heads/master Merge: 07f6a1c 951bb84 Author: Yves Senn Date: 2014-01-09 23:45:33 -0800 Merge pull request #13657 from leriksen/master [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets re... commit 07f6a1c refs/heads/master Merge: 8a5b480 e633cdb Author: Guillermo Iguaran Date: 2014-01-09 20:45:14 -0800 Merge pull request #13659 from prathamesh-sonpatki/fix-build Restore DATABASE_URL even if it's nil in connection_handler test commit e633cdb refs/heads/master Author: Prathamesh Sonpatki Date: 2014-01-10 09:42:40 +0530 Restore DATABASE_URL even if it's nil in connection_handler test - We have to restore DATABASE_URL to its previous state irrespective of previous value is nil or not M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 7ce6840 refs/heads/master Author: Jon Jensen Date: 2014-01-08 20:50:06 -0700 Clarify behavior of json_escape, update examples The behavior of json_escape was fixed in 2f1c5789, but the doc changes and example in that commit incorrectly indicated that the return value would be html-safe. Since quotation marks are preserved, the raw value is not safe to use in other contexts (specifically HTML attributes). M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 951bb84 refs/heads/master Author: leriksen Date: 2014-01-10 12:08:17 +1100 [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users M guides/source/layouts_and_rendering.md commit e987dcd refs/heads/master Author: João Britto Date: 2014-01-09 20:47:14 -0200 Update changelog M actionview/CHANGELOG.md commit 8a5b480 refs/heads/master Merge: da65fe9 6cc0367 Author: Rafael Mendonça França Date: 2014-01-09 14:37:51 -0800 Merge pull request #13582 from schneems/schneems/preserve-connection-behavior Ensure Active Record connection consistency commit ccbba3f refs/heads/master Author: João Britto Date: 2013-12-21 22:14:07 -0200 Avoid scanning multiple render calls as a single match. Each chunk of text coming after `render` is now handled individually as a possible list of arguments. M actionview/lib/action_view/dependency_tracker.rb M actionview/test/template/dependency_tracker_test.rb commit c2afa05 refs/heads/master Author: João Britto Date: 2013-12-16 00:51:35 -0200 Improve ERB dependency detection. The current implementation can't handle some special cases of oddly-formatted Ruby. Now we are able to detect them: * Multi-line arguments on the `render` call * Strings containing quotes, e.g. `"something's wrong"` * Multiple kinds of identifiers - instance variables, class variables and globals * Method chains as arguments for the `render` call Also, this fix reduces the rate of "false positives" which showed up when we had calls/access to identifiers containing `render`, like `surrender` and `rendering`. M actionview/lib/action_view/dependency_tracker.rb M actionview/test/template/dependency_tracker_test.rb commit 6cc0367 refs/heads/master Author: schneems Date: 2014-01-01 17:33:59 -0500 Ensure Active Record connection consistency Currently Active Record can be configured via the environment variable `DATABASE_URL` or by manually injecting a hash of values which is what Rails does, reading in `database.yml` and setting Active Record appropriately. Active Record expects to be able to use `DATABASE_URL` without the use of Rails, and we cannot rip out this functionality without deprecating. This presents a problem though when both config is set, and a `DATABASE_URL` is present. Currently the `DATABASE_URL` should "win" and none of the values in `database.yml` are used. This is somewhat unexpected to me if I were to set values such as `pool` in the `production:` group of `database.yml` they are ignored. There are many ways that active record initiates a connection today: - Stand Alone (without rails) - `rake db:` - ActiveRecord.establish_connection - With Rails - `rake db:` - `rails | ` - `rails dbconsole` We should make all of these behave exactly the same way. The best way to do this is to put all of this logic in one place so it is guaranteed to be used. Here is my prosed matrix of how this behavior should work: ``` No database.yml No DATABASE_URL => Error ``` ``` database.yml present No DATABASE_URL => Use database.yml configuration ``` ``` No database.yml DATABASE_URL present => use DATABASE_URL configuration ``` ``` database.yml present DATABASE_URL present => Merged into `url` sub key. If both specify `url` sub key, the `database.yml` `url` sub key "wins". If other paramaters `adapter` or `database` are specified in YAML, they are discarded as the `url` sub key "wins". ``` ### Implementation Current implementation uses `ActiveRecord::Base.configurations` to resolve and merge all connection information before returning. This is achieved through a utility class: `ActiveRecord::ConnectionHandling::MergeAndResolveDefaultUrlConfig`. To understand the exact behavior of this class, it is best to review the behavior in activerecord/test/cases/connection_adapters/connection_handler_test.rb though it should match the above proposal. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/connection_handling.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/test/cases/connection_adapters/connection_handler_test.rb M guides/source/configuring.md M railties/lib/rails/application/configuration.rb M railties/lib/rails/commands/dbconsole.rb M railties/test/commands/dbconsole_test.rb commit 2af5303 refs/heads/master Merge: b0acc77 da65fe9 Author: Aaron Patterson Date: 2014-01-09 14:19:43 -0800 Merge branch 'master' into ruby-2.2 * master: Revert "ask the fixture set for the sql statements" commit da65fe9 refs/heads/master Author: Aaron Patterson Date: 2014-01-09 14:17:04 -0800 Revert "ask the fixture set for the sql statements" This reverts commit 026d0555685087845b74dd87a0417b5a164b1c13. Conflicts: activerecord/lib/active_record/fixtures.rb Fixes #13383 M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/fixtures.rb commit b0acc77 refs/heads/master Author: Aaron Patterson Date: 2014-01-09 14:12:05 -0800 Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/values/time_zone.rb commit a67f25d refs/heads/master Merge: 4c32b72 5121593 Author: Rafael Mendonça França Date: 2014-01-09 10:14:25 -0800 Merge pull request #13632 from tinogomes/master Adding Hash#compact and Hash#compact! methods commit 5121593 refs/heads/master Author: tinogomes Date: 2014-01-08 15:46:42 -0200 Adding Hash#compact and Hash#compact! methods * Adding Hash#compact and Hash#compact! methods * Using Ruby 1.9 syntax on documentation * Updating guides for `Hash#compact` and `Hash#compact!` methods * Updating CHANGELOG for ActiveSupport * Removing unecessary protected method and lambda for `Hash#compact` implementations * Performing `Hash#compact` implementation - https://gist.github.com/tinogomes/8332883 * fixing order position * Fixing typo M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash.rb A activesupport/lib/active_support/core_ext/hash/compact.rb M activesupport/test/core_ext/hash_ext_test.rb M guides/source/active_support_core_extensions.md commit 4c32b72 refs/heads/master Merge: e176353 7d414ea Author: Guillermo Iguaran Date: 2014-01-08 18:42:09 -0800 Merge pull request #13644 from zzak/doc_mysql_config_template MySQL version 4.1 was EOL on December 31, 2009 [ci-skip] commit 7d414ea refs/heads/master Author: Zachary Scott Date: 2014-01-08 18:38:38 -0800 MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml commit 6a45a69 refs/heads/master Author: Waynn Lue Date: 2014-01-08 18:02:25 -0800 change to "check out" M actionpack/RUNNING_UNIT_TESTS.rdoc commit e176353 refs/heads/master Author: Aaron Patterson Date: 2014-01-08 15:48:19 -0800 clear cache on body close so that cache remains during rendering fixes #13547 The body may use the local cache during rendering. `call`ing the app doesn't mean that rendering is finished, so we need to wait until `close` is called on the body. M activesupport/lib/active_support/cache/strategy/local_cache.rb M activesupport/test/caching_test.rb commit 2875b4a refs/heads/master Author: Aaron Patterson Date: 2014-01-08 15:06:53 -0800 add a more restricted codepath for templates fixes #13390 M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit e4e750b refs/heads/master Merge: 6525182 8762865 Author: Rafael Mendonça França Date: 2014-01-08 13:37:12 -0800 Merge pull request #13637 from craftsmen/app-generator-minor-fix Move finish_template as the last public method defined in the generator commit 6525182 refs/heads/master Author: Aaron Patterson Date: 2014-01-08 12:05:40 -0800 refactor generator tests to use block form of Tempfile M railties/test/generators/app_generator_test.rb commit 8bbd21c refs/heads/master Merge: f4fc9e6 de53522 Author: Carlos Antonio da Silva Date: 2014-01-08 11:57:31 -0800 Merge pull request #13634 from jwworth/master Fix typo [ci skip] commit de53522 refs/heads/master Author: Jake Worth Date: 2014-01-08 13:47:20 -0600 Fix typo [ci skip] M guides/source/4_1_release_notes.md commit 8762865 refs/heads/master Author: Mehdi Lahmam Date: 2014-01-08 19:51:05 +0100 Move finish_template as the last public method in the generator M railties/lib/rails/generators/rails/app/app_generator.rb commit f4fc9e6 refs/heads/master Author: Robin Dupret Date: 2014-01-08 16:40:49 +0100 Minor typos fix [ci skip] M activerecord/CHANGELOG.md commit 724509a refs/heads/master Author: Yves Senn Date: 2014-01-08 15:51:06 +0100 make `change_column_null` reversible. Closes #13576. Closes #13623. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/change_schema_test.rb commit b502e3d refs/heads/master Merge: a03fed8 a334425 Author: Yves Senn Date: 2014-01-08 05:39:35 -0800 Merge pull request #13629 from dmathieu/drop_test Be more explicit about the default of db:drop and db:create commit a334425 refs/heads/master Author: Damien Mathieu <42@dmathieu.com> Date: 2014-01-08 11:08:08 +0100 create/drop test and development databases only if RAILS_ENV is nil Closes #13625 M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/test/cases/tasks/database_tasks_test.rb M guides/source/4_1_release_notes.md commit 6c252b5 refs/remotes/origin/fxn/string-pools Author: seapy Date: 2014-01-08 21:57:25 +0900 Fixed typo [ci skip] singular is more suited to M guides/source/layouts_and_rendering.md commit a03fed8 refs/heads/master Author: Yves Senn Date: 2014-01-08 11:20:56 +0100 Revert "Speedup String#to" This reverts commit 2ef1fb2c455ca53a0c1e1768f50824926ce28bd3. As described in PR #13627 this commit broke functionality when passing a negative Fixnum to the `String#to` method: ```ruby assert_equal "hell", s.to(-2) ``` Before the revert, this failed with: ``` 1) Failure: StringAccessTest#test_#to_with_negative_Fixnum,_position_is_counted_from_the_end [test/core_ext/string_ext_test.rb:275]: Expected: "hell" Actual: nil ``` This revert is to keep the functionality on `master` working. If there is another way to get the performance benefit and keep the documented functionality we can add that. /cc @amatsuda @carlosantoniodasilva M activesupport/lib/active_support/core_ext/string/access.rb M activesupport/test/core_ext/string_ext_test.rb commit 40a83d7 refs/heads/master Author: Yves Senn Date: 2014-01-08 11:15:59 +0100 typo fix in test name. [ci skip]. M activesupport/test/core_ext/string_ext_test.rb commit e37f164 refs/heads/master Author: Yves Senn Date: 2014-01-08 10:25:40 +0100 `core_ext/string/access.rb` test what we are documenting. I also extracted the tests from a single bulk method into a separate test-case. The new tests cover the API described in the docs. There are two skipped tests, which are broken as of 2ef1fb2c455ca53a0c1e1768f50824926ce28bd3 * #to with negative Fixnum, position is counted from the end * #from and #to can be combined This was brought to my attention by #13627. Closes #13627. M activesupport/test/core_ext/string_ext_test.rb commit ba6e7a0 refs/remotes/origin/fxn/string-pools Merge: 4de20ee f124132 Author: Xavier Noria Date: 2014-01-08 00:49:43 +0100 Merge branch 'master' into fxn/string-pools Conflicts: actionpack/lib/action_dispatch/journey/visitors.rb actionpack/lib/action_dispatch/routing/mapper.rb actionview/lib/action_view/helpers/form_tag_helper.rb commit aa887c1 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-07 03:08:03 -0800 Merge pull request #13597 from prathamesh-sonpatki/hstore_migration Make change_table use object of current database adapter Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/migration/command_recorder_test.rb commit 3307346 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-07 18:44:00 -0200 Merge pull request #13355 from dylanahsmith/migration-version activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb A activerecord/test/migrations/version_check/20131219224947_migration_version_check.rb commit f124132 refs/heads/master Merge: 032ab50 06ace1e Author: Rafael Mendonça França Date: 2014-01-07 18:44:00 -0200 Merge pull request #13355 from dylanahsmith/migration-version activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md commit 9330631 refs/heads/master Author: Roderick van Domburg Date: 2013-08-25 11:22:36 +0200 Auto-generate stable fixture UUIDs on PostgreSQL. Fixes: #11524 M activerecord/CHANGELOG.md M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb M activerecord/test/cases/fixtures_test.rb M activerecord/test/cases/helper.rb M activerecord/test/cases/schema_dumper_test.rb A activerecord/test/fixtures/uuid_children.yml A activerecord/test/fixtures/uuid_parents.yml A activerecord/test/models/uuid_child.rb A activerecord/test/models/uuid_parent.rb M activerecord/test/schema/schema.rb M activesupport/CHANGELOG.md A activesupport/lib/active_support/core_ext/securerandom.rb A activesupport/test/core_ext/securerandom_test.rb commit 032ab50 refs/heads/master Merge: ab21f42 98c3586 Author: Xavier Noria Date: 2014-01-07 03:48:25 -0800 Merge pull request #13621 from Intrepidd/patch-1 Fix typo in image_tag documentation [ci skip] commit 98c3586 refs/heads/master Author: Adrien Date: 2014-01-07 12:38:24 +0100 Fix typo in image_tag documentation image_tag only supports :alt and :size as additional keys, not three. M actionview/lib/action_view/helpers/asset_tag_helper.rb commit ab21f42 refs/heads/master Merge: 3a33e8e eb589fe Author: Yves Senn Date: 2014-01-07 03:08:03 -0800 Merge pull request #13597 from prathamesh-sonpatki/hstore_migration Make change_table use object of current database adapter commit eb589fe refs/heads/master Author: Nishant Modak Date: 2014-01-06 14:34:22 +0530 Make change_table use object of current database adapter - Earlier, change_table was creating database-agnostic object. - After this change, it will create correct object based on current database adapter. - This will ensure that create_table and change_table will get same objects. - This makes update_table_definition method public and nodoc. - Fixes #13577 and #13503 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/migration/command_recorder_test.rb commit 3a33e8e refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-07 07:59:24 -0200 Use a better method name to check the requirement of password confirmation Also improve changelog entries related to secure password to proper highlight. M activemodel/CHANGELOG.md M activemodel/lib/active_model/secure_password.rb commit 2051231 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-07 10:30:14 +0100 doc backport for getting started - "Showing Posts" section. [ci skip] Closes #13619. M guides/source/getting_started.md commit bfbf8ab refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-06 09:50:58 -0800 Merge pull request #13617 from arthurnn/error_var Add 'e' var on rescue DalliError, in order to log it M activesupport/lib/active_support/cache/mem_cache_store.rb commit 017b0fb refs/heads/master Merge: ca98d0d f3748c8 Author: Rafael Mendonça França Date: 2014-01-06 09:50:58 -0800 Merge pull request #13617 from arthurnn/error_var Add 'e' var on rescue DalliError, in order to log it commit f3748c8 refs/heads/master Author: Arthur Neves Date: 2014-01-06 12:47:47 -0500 Add 'e' var on rescue DalliError, in order to log it M activesupport/lib/active_support/cache/mem_cache_store.rb commit 06ace1e refs/heads/master Author: Dylan Thacker-Smith Date: 2013-12-17 16:02:52 -0500 activerecord: Initialize Migration with version from MigrationProxy. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb A activerecord/test/migrations/version_check/20131219224947_migration_version_check.rb commit ca98d0d refs/heads/master Merge: f2b80a4 2a0fdde Author: Rafael Mendonça França Date: 2014-01-06 07:44:14 -0800 Merge pull request #13616 from zirni/remove_warnings Remove warnings in test suite commit 2a0fdde refs/heads/master Author: Matthias Zirnstein Date: 2014-01-06 16:40:32 +0100 Remove warnings in test suite lib/active_record/store.rb:79: warning: method redefined; discarding old color= lib/active_record/store.rb:79: warning: previous definition of color= was here lib/active_record/store.rb:83: warning: method redefined; discarding old color lib/active_record/store.rb:83: warning: previous definition of color was here M activerecord/test/models/admin/user.rb commit 5a84d3e refs/tags/v3.2.19 Merge: 3a429e6 c13eb1c Author: Damien Mathieu <42@dmathieu.com> Date: 2014-01-06 06:29:25 -0800 Merge pull request #13613 from simi/patch-1 Fix force_ssl.rb documentation. Close tt tag. commit c13eb1c refs/tags/v3.2.19 Author: Josef Šimánek Date: 2014-01-06 15:28:35 +0100 Fix force_ssl.rb documentation. Close tt tag. [ci skip] M actionpack/lib/action_controller/metal/force_ssl.rb commit 7678ab6 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2014-01-06 05:43:14 -0800 Merge pull request #13593 from oliveiraethales/store_yaml_coder Fix: ActiveRecord::Store TypeError conversion when using YAML coder Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/store.rb activerecord/test/schema/schema.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb M activerecord/test/models/admin/user.rb M activerecord/test/schema/schema.rb commit f2b80a4 refs/heads/master Merge: 2d1d426 901a0c8 Author: Yves Senn Date: 2014-01-06 05:43:14 -0800 Merge pull request #13593 from oliveiraethales/store_yaml_coder Fix: ActiveRecord::Store TypeError conversion when using YAML coder commit 901a0c8 refs/heads/master Author: Thales Oliveira Date: 2014-01-05 20:55:02 -0200 Fix: ActiveRecord::Store TypeError conversion when using YAML coder Renaming the test accordingly to its behaviour Adding 'Fixes' statement to changelog Improving tests legibility & changelog Undoing mistakenly removed empty line & further improving changelog M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb M activerecord/test/models/admin/user.rb M activerecord/test/schema/schema.rb commit 2d1d426 refs/heads/master Author: Yves Senn Date: 2014-01-06 14:18:25 +0100 add example to the CHANGELOG entry from 3a48b83e5 [ci skip]. /cc @pixeltrix M actionpack/CHANGELOG.md commit 6bf93b2 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-06 10:28:44 -0200 Fix typo in AS changelog, improve highlight [ci skip] M activesupport/CHANGELOG.md commit 5d238ea refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-06 09:15:11 -0200 Fix AR connection resolver docs to return a hash with string keys [ci skip] M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 28161b7 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-06 09:07:44 -0200 Fix typo [ci skip] M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 16a27b6 refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-06 08:47:49 -0200 Fix rdoc markup [ci skip] Wrapping symbols with + does not work, we must use instead. M railties/lib/rails/paths.rb commit 1ce0a2a refs/heads/master Merge: a6da73f 6cc087b Author: Yves Senn Date: 2014-01-06 02:49:40 -0800 Merge pull request #13611 from robinboening/plugin_generator_tests Add missing tests for invalid names in `rails plugin new` generator commit a6da73f refs/heads/master Author: Carlos Antonio da Silva Date: 2014-01-06 08:45:21 -0200 Fix typo in AMo docs [ci skip] M activemodel/lib/active_model/attribute_methods.rb commit 6cc087b refs/heads/master Author: Robin Böning Date: 2014-01-05 21:48:05 +0100 Add missing tests for invalid names in `rails plugin new` * Test for: Invalid plugin name, because of reserved rails word. * Test for: Invalid plugin name because of constant name that is already in use. M railties/test/generators/plugin_generator_test.rb commit 535bd55 refs/heads/master Author: Yves Senn Date: 2014-01-06 10:57:00 +0100 quick formatting pass through CHANGELOGS. [ci skip]. M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md commit 2229c52 refs/heads/master Author: Yves Senn Date: 2014-01-06 10:00:40 +0100 update 4.1 release notes with deprecation commit link. [ci skip] M guides/source/4_1_release_notes.md commit ad142ae refs/heads/master Merge: d2cee1e a5d92e6 Author: Guillermo Iguaran Date: 2014-01-05 21:55:55 -0800 Merge pull request #13607 from huoxito/actionview-version Require actionview/version commit a5d92e6 refs/heads/master Author: Washington Luiz Date: 2014-01-06 02:51:51 -0300 Require actionview/version just like all the other modules do require their version file M actionview/lib/action_view.rb commit d2cee1e refs/heads/master Merge: 3a48b83 44473e4 Author: Rafael Mendonça França Date: 2014-01-05 16:41:32 -0800 Merge pull request #13604 from randomecho/docs-getting-started Ruby is a proper noun here, not part of code fragment [ci skip] commit 44473e4 refs/heads/master Author: Soon Van Date: 2014-01-05 18:42:14 -0500 Ruby is a proper noun here, not part of code fragment [ci skip] Last line of note also relates heavily to first part and parenthesis broke reading flow. M guides/source/getting_started.md commit 3a48b83 refs/heads/master Author: Andrew White Date: 2014-01-05 19:58:04 +0000 Allow an absolute controller path inside a module scope Fixes #12777 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb M guides/source/routing.md commit a1564d4 refs/heads/master Author: Andrew White Date: 2014-01-05 19:23:53 +0000 Add CHANGELOG entry for #10634 [ci skip] M activesupport/CHANGELOG.md commit ffc2735 refs/heads/master Merge: 6e867a4 0c6ddbe Author: Andrew White Date: 2014-01-05 11:19:00 -0800 Merge pull request #10634 from teleological/time_advance_gregorian Maintain proleptic gregorian in Time#advance commit 6e867a4 refs/heads/master Merge: 7a085da bf55688 Author: Rafael Mendonça França Date: 2014-01-05 09:24:34 -0800 Merge pull request #13598 from zirni/remove_ar_warnings Remove method redefined warnings for test suite Closes #13526 commit bf55688 refs/heads/master Author: Matthias Zirnstein Date: 2014-01-05 17:55:39 +0100 Remove method redefined warnings for test suite has_many definitions with "name" as singular and as plural e.g. has_many :welcome_posts_with_comment has_many :welcome_posts_with_comments Ruby mentions it with: lib/active_record/associations/builder/collection_association.rb:65: warning: method redefined; discarding old welcome_posts_with_comment_ids lib/active_record/associations/builder/collection_association.rb:65: warning: previous definition of welcome_posts_with_comment_ids was here lib/active_record/associations/builder/collection_association.rb:75: warning: method redefined; discarding old welcome_posts_with_comment_ids= lib/active_record/associations/builder/collection_association.rb:75: warning: previous definition of welcome_posts_with_comment_ids= was here M activerecord/test/cases/associations/inner_join_association_test.rb M activerecord/test/models/author.rb commit 7a085da refs/heads/master Author: Gaelian Ditchburn Date: 2012-06-03 19:07:54 +1000 Switched to use `display:none` in extra_tags_for_form method. The use of `display:inline` with the content_tag call in the extra_tags_for_form method potentially causes display issues with some browsers, namely Internet Explorer. IE's behaviour of not collapsing the line height on divs with ostensibly no content means that the automatically added div containing the hidden authenticity_token, utf8 and _method form input tags may interfere with other visible form elements in certain circumstances. The use of `display:none` rather than `display:inline` fixes this problem. Fixes #6403 M actionview/CHANGELOG.md M actionview/lib/action_view/helpers/form_helper.rb M actionview/lib/action_view/helpers/form_tag_helper.rb M actionview/test/activerecord/form_helper_activerecord_test.rb M actionview/test/template/form_helper_test.rb M actionview/test/template/form_tag_helper_test.rb commit 5d3a8f1 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-01-05 11:57:50 +0000 Unique the segment keys array for non-optimized url helpers In Rails 3.2 you only needed pass an argument for dynamic segment once so unique the segment keys array to match the number of args. Since the number of args is less than required parts the non-optimized code path is selected. This means to benefit from optimized url generation the arg needs to be specified as many times as it appears in the path. Fixes #12808 (cherry picked from commit 6b548830828e4e910de7854d21717c17303e089c) M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 6b54883 refs/heads/master Author: Andrew White Date: 2014-01-05 11:57:50 +0000 Unique the segment keys array for non-optimized url helpers In Rails 3.2 you only needed pass an argument for dynamic segment once so unique the segment keys array to match the number of args. Since the number of args is less than required parts the non-optimized code path is selected. This means to benefit from optimized url generation the arg needs to be specified as many times as it appears in the path. Fixes #12808 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 2df304c refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-01-05 10:24:06 +0000 Show full route constraints in error message When an optimized helper fails to generate, show the full route constraints in the error message. Previously it would only show the contraints that were required as part of the path. Fixes #13592 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 892c539 refs/heads/master Author: Andrew White Date: 2014-01-05 10:05:54 +0000 Show full route constraints in error message When an optimized helper fails to generate, show the full route constraints in the error message. Previously it would only show the contraints that were required as part of the path. Fixes #13592 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit b9efc74 refs/heads/master Author: Andrew White Date: 2014-01-05 08:43:12 +0000 Simplify arg parameterization M actionpack/lib/action_dispatch/routing/route_set.rb commit d017e92 refs/heads/master Author: Andrew White Date: 2014-01-05 00:24:57 +0000 Use a custom route vistor for optimized route generation Using a Regexp to replace dynamic segments in a path string is fraught with difficulty and can lead to odd edge cases like #13349. Since we already have a parsed representation of the path it makes sense to use that to generate an array of segments that can be used to build an optimized route's path quickly. Tests on a simple route (e.g. /posts/:id) show a speedup of 35%: https://gist.github.com/pixeltrix/8261932 Calculating ------------------------------------- Current Helper: 5274 i/100ms New Helper: 8050 i/100ms ------------------------------------------------- Current Helper: 79263.6 (±3.7%) i/s - 395550 in 4.997252s New Helper: 153464.5 (±4.9%) i/s - 772800 in 5.047834s Tests on a more complex route show even an greater performance boost: https://gist.github.com/pixeltrix/8261957 Calculating ------------------------------------- Current Helper: 2367 i/100ms New Helper: 5382 i/100ms ------------------------------------------------- Current Helper: 29506.0 (±3.2%) i/s - 149121 in 5.059294s New Helper: 78815.5 (±4.1%) i/s - 398268 in 5.062161s It also has the added benefit of fixing the edge cases described above. Fixes #13349 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/visitors.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit c5b446c refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-04 11:21:53 -0800 Merge pull request #13590 from kuldeepaggarwal/fix-date-helper-doc provide correct example of `datetime_select` helper [ci skip] M actionpack/lib/action_view/helpers/date_helper.rb commit 339ce7f refs/heads/master Merge: 3713e43 e9bfeb0 Author: Rafael Mendonça França Date: 2014-01-04 11:21:53 -0800 Merge pull request #13590 from kuldeepaggarwal/fix-date-helper-doc provide correct example of `datetime_select` helper [ci skip] commit 3713e43 refs/heads/master Author: Andrew White Date: 2014-01-04 18:42:34 +0000 Add preview_path to autoload_paths in after_initialize Only config.autoload_paths is frozen, so add the preview_path to ActiveSupport::Dependencies.autoload_paths directly in an after_initialize block. Also protect against a blank preview_path being added to autoload_paths which can cause a serious slowdown as Dir[] tries to load all *_preview.rb files under / Fixes #13372 M actionmailer/lib/action_mailer/preview.rb M actionmailer/lib/action_mailer/railtie.rb M railties/test/application/mailer_previews_test.rb commit e9bfeb0 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-01-04 23:59:20 +0530 provide correct example of `datetime_select` helper [ci skip] M actionview/lib/action_view/helpers/date_helper.rb commit 5390187 refs/remotes/origin/4-0-stable Author: Konstantin Wlasow Date: 2014-01-04 16:18:16 +0600 Fixed documentation. [ci skip] M actionpack/lib/action_view/helpers/text_helper.rb commit 81066b1 refs/heads/master Merge: 27bcec2 9882ec4 Author: Robin Dupret Date: 2014-01-04 04:04:12 -0800 Merge pull request #13587 from kud86/change_truncate_examples Fixed truncate documentation. [ci skip] commit 9882ec4 refs/heads/master Author: Konstantin Wlasow Date: 2014-01-04 16:18:16 +0600 Fixed documentation. [ci skip] M actionview/lib/action_view/helpers/text_helper.rb commit 27bcec2 refs/heads/master Author: Jon Leighton Date: 2014-01-04 09:30:01 +0000 Fix mergefail in changelog The line was duplicated M activerecord/CHANGELOG.md commit 9ea54b2 refs/heads/master Author: Jon Leighton Date: 2014-01-04 09:29:20 +0000 Add deprecation I accidentally missed M activerecord/lib/active_record/railties/databases.rake commit 77d18ed refs/heads/master Merge: 88c3fd1 72bb3fc Author: Xavier Noria Date: 2014-01-03 14:37:04 -0800 Merge pull request #13584 from tjschuck/cannot_cannot_be_can_not Change all "can not"s to the correct "cannot" commit 72bb3fc refs/heads/master Author: T.J. Schuck Date: 2014-01-03 17:02:31 -0500 Change all "can not"s to the correct "cannot". M actionview/lib/action_view/helpers/form_helper.rb M activemodel/README.rdoc M activemodel/lib/active_model/errors.rb M activemodel/test/cases/errors_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/inheritance_test.rb M guides/code/getting_started/config/environments/production.rb M guides/source/action_controller_overview.md M guides/source/i18n.md M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 88c3fd1 refs/heads/master Merge: 05a81c5 e7f56a7 Author: Guillermo Iguaran Date: 2014-01-03 13:43:16 -0800 Merge pull request #13583 from arthurnn/mem_cache_store_fix mem_cache_store requires dalli, so only accept dalli/client commit e7f56a7 refs/heads/master Author: Arthur Neves Date: 2014-01-03 16:39:50 -0500 Raise if MemCacheStore doenst receive a Dalli obj :mem_cache_store should receive a list of hosts or a dalli client, otherwise raise it. Also adding a changelog. M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache/mem_cache_store.rb M activesupport/test/caching_test.rb commit 05a81c5 refs/heads/master Author: Robin Dupret Date: 2014-01-03 22:33:21 +0100 Minor typo fix [ci skip] M activerecord/lib/active_record/enum.rb commit 19b2188 refs/heads/master Merge: f89266a a8ede36 Author: Rafael Mendonça França Date: 2014-01-03 13:03:19 -0800 Merge pull request #10134 from derikson/collection_proxy_select_with_multiple_args Change CollectionProxy#select to take the same arguments as ActiveRecord::select commit 98458ee refs/heads/master Author: Arthur Neves Date: 2014-01-03 15:39:33 -0500 mem_cache_store requires dalli, so only accept dalli/client :mem_cache_store require dalli, rescue Dalli exceptions, and follow Dalli API. Memcached gem, for instance, doesnt work anymore, as the API are different. As we already require one client, we should make sure that client works, and not accept others, and if someone wants to use another memcache client they can write their own store adapter. M activesupport/lib/active_support/cache/mem_cache_store.rb M activesupport/test/caching_test.rb commit 4e5f0e7 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-03 16:41:33 -0200 Merge pull request #13579 from prathamesh-sonpatki/issue-13552 Fix documentation for end_year option of date_helper [ci skip] Conflicts: actionpack/lib/action_view/helpers/date_helper.rb M actionpack/lib/action_view/helpers/date_helper.rb commit f89266a refs/heads/master Author: Rafael Mendonça França Date: 2014-01-03 16:42:30 -0200 No need to use fixed size font [ci skip] M actionview/lib/action_view/helpers/date_helper.rb commit 0cd7b7b refs/heads/master Merge: 96c4bd6 2126c24 Author: Rafael Mendonça França Date: 2014-01-03 16:41:33 -0200 Merge pull request #13579 from prathamesh-sonpatki/issue-13552 Fix documentation for end_year option of date_helper [ci skip] commit 96c4bd6 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-03 16:33:39 -0200 Whitespace [ci skip] M activerecord/lib/active_record/enum.rb commit 788bb40 refs/heads/master Author: Godfrey Chan Date: 2014-01-03 09:31:01 -0800 Building new records with enum scopes now works as expected Previously, this would give an `ArgumentError`: class Issue < ActiveRecord::Base enum :status, [:open, :finished] end Issue.open.build # => ArgumentError: '0' is not a valid status Issue.open.create # => ArgumentError: '0' is not a valid status PR #13542 muted the error, but the issue remains. This commit fixes the issue by allowing the enum value to be written directly via the setter: Issue.new.status = 0 # This now sets status to :open Assigning a value directly via the setter like this is not part of the documented public API, so users should not rely on this behavior. Closes #13530. M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb M activerecord/test/schema/schema.rb commit 2126c24 refs/heads/master Author: Prathamesh Sonpatki Date: 2014-01-03 03:00:58 +0530 Fix documentation for end_year option of date_helper [ci skip] - While editing an existing record, end_year is equal to current selected year plus 5 by default. - While editing an existing record, start_year is equal to current selected year value minus 5 by default. - Fixes #13552 Acked-by: Prathamesh Sonpatki Acked-by: Prathamesh Sonpatki M actionview/lib/action_view/helpers/date_helper.rb commit 97e7ca4 refs/heads/master Author: Yves Senn Date: 2014-01-03 16:31:20 +0100 Deprecate unused `symbolized_base_class` and `symbolized_sti_name`. These methods were only used for the `IdentityMap` which was removed. They are no longer used internally and should be removed without replacement. As they were not `:nodoc:`'ed it's better to deprecate them before removal. M activerecord/CHANGELOG.md M activerecord/lib/active_record/inheritance.rb M guides/source/4_1_release_notes.md commit 4de20ee refs/remotes/origin/fxn/string-pools Merge: d15e62b 5aa8698 Author: Xavier Noria Date: 2014-01-03 00:00:20 +0100 Merge branch 'master' into fxn/string-pools Conflicts: activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 5aa8698 refs/heads/master Merge: 96288e8 f642b18 Author: Rafael Mendonça França Date: 2014-01-02 13:02:28 -0800 Merge pull request #13578 from schneems/schneems/database_url-env-default Use DATABASE_URL by default commit f642b18 refs/heads/master Author: schneems Date: 2014-01-02 15:00:30 -0600 Use DATABASE_URL by default See https://github.com/rails/rails/pull/13463#issuecomment-31480799 for full conversation. M railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml M railties/test/application/rake/dbs_test.rb commit 96288e8 refs/heads/master Merge: d740438 ed62584 Author: Rafael Mendonça França Date: 2014-01-02 11:52:13 -0800 Merge pull request #13573 from kuldeepaggarwal/doc-fix-default-values provide correct information [ci skip] commit d740438 refs/heads/master Merge: a1d0c0f ff7ab3b Author: Jon Leighton Date: 2014-01-02 10:05:46 -0800 Merge pull request #13528 from jonleighton/maintain_test_schema Automatically maintain test database schema commit ed62584 refs/heads/master Author: Kuldeep Aggarwal Date: 2014-01-02 19:28:28 +0530 provide correct information [ci skip] M actionview/lib/action_view/helpers/date_helper.rb commit ff7ab3b refs/heads/master Author: Jon Leighton Date: 2013-12-29 11:05:04 +0000 Automatically maintain test database schema * Move check from generated helper to test_help.rb, so that all applications can benefit * Rather than just raising when the test schema has pending migrations, try to load in the schema and only raise if there are pending migrations afterwards * Opt out of the check by setting config.active_record.maintain_test_schema = false * Deprecate db:test:* tasks. The test helper is now fully responsible for maintaining the test schema, so we don't need rake tasks for this. This is also a speed improvement since we're no longer reloading the test database on every call to "rake test". M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb M guides/source/4_1_release_notes.md M guides/source/configuring.md M guides/source/plugins.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/test/test_helper.rb M railties/lib/rails/test_help.rb M railties/test/application/rake/dbs_test.rb M railties/test/application/rake_test.rb M railties/test/application/test_test.rb commit b2e3a90 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-01-02 10:41:44 +0000 Disable THOR_DEBUG while running generators Bundler 1.5 enables THOR_DEBUG so that it doesn't fail silently but this breaks the railties tests as we can't capture the error output. It will be fixed in Bundler 1.5.2 but until then disable THOR_DEBUG whilst we are running generators in the railties tests. M railties/lib/rails/generators/testing/behaviour.rb commit a1d0c0f refs/heads/master Author: Andrew White Date: 2014-01-02 10:06:29 +0000 Reverse 821525e and wrap run_generator call Ruby 2.1.0 includes the json gem 1.8.1 by default so we need bundler 1.5.1 for `bundle install` to work. To fix this reverse the downgrade to 1.3.5 and wrap the `run_generator` call with a block that resets `THOR_DEBUG`. M .travis.yml M railties/lib/rails/generators/testing/behaviour.rb commit 02d3668 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-02 00:52:47 -0200 Adding missing require M railties/test/application/rake/dbs_test.rb commit 0c73408 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-02 00:35:51 -0200 Enable fast_finish in the travis configuration Since rbx and jruby builds are being allowed to fail lets receive the build information early enabling this option See http://about.travis-ci.org/blog/2013-11-27-fast-finishing-builds/ Conflicts: .travis.yml M .travis.yml commit f9d8548 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-02 00:35:51 -0200 Enable fast_finish in the travis configuration Since rbx and jruby builds are being allowed to fail lets receive the build information early enabling this option See http://about.travis-ci.org/blog/2013-11-27-fast-finishing-builds/ M .travis.yml commit 55dc36b refs/heads/master Merge: 821525e 9749e0e Author: Rafael Mendonça França Date: 2014-01-01 17:16:56 -0800 Merge pull request #13569 from schneems/schneems/default-url-sub-key Move default production database to URL sub key commit 821525e refs/heads/master Author: Andrew White Date: 2014-01-01 23:20:57 +0000 Downgrade bundler until 1.5.2 is available Bundler sets the THOR_DEBUG environment variable causing Thor to re-raise exceptions on exit. This is breaking the railties tests for generators where we are trying to capture error output. The PR bundler/bundler#2794 fixes this by adding a per-instance config `:debug` but this has not been released yet so to prevent errors going unnoticed downgrade bundler to 1.3.5 until such a time that 1.5.2 has been released. M .travis.yml commit 9749e0e refs/heads/master Author: schneems Date: 2014-01-01 14:21:56 -0500 Move default production database to URL sub key By using the URL sub key in the `database.yml` by default we are exposing the ability to set other attributes such as `pool` or `reap_frequency` without need of modifying the URL to contain non-connection specific information. M railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml M railties/test/application/rake/dbs_test.rb commit 358abe4 refs/heads/master Merge: f141919 50060e9 Author: Rafael Mendonça França Date: 2014-01-01 19:17:59 -0200 Merge pull request #13542 from robin850/issue-13530 Fix enum writers when using integers commit 20b12c9 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-01 19:04:29 -0200 Merge pull request #13557 from gmarik/patch-1 Use `Array#wrap` instead `Array()` M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/presence.rb M activerecord/test/cases/validations/presence_validation_test.rb commit f141919 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-01 19:08:28 -0200 Add CHANGELOG entry for #13557 [ci skip] M activerecord/CHANGELOG.md M activerecord/test/cases/validations/presence_validation_test.rb commit a28f1c2 refs/heads/master Merge: 6fc59d3 aaf1af3 Author: Rafael Mendonça França Date: 2014-01-01 19:04:29 -0200 Merge pull request #13557 from gmarik/patch-1 Use `Array#wrap` instead `Array()` commit 6fc59d3 refs/heads/master Author: Mo Omer Date: 2014-01-01 12:57:59 -0600 Removed elipsis indicating that the reader should have more code than what is pasted. [ci skip] M guides/source/getting_started.md commit 0b4905d refs/heads/master Author: Rafael Mendonça França Date: 2014-01-01 18:57:18 -0200 Make explicit that the view file need to be created [ci skip] Closes #13566 M guides/source/getting_started.md commit a7094f5 refs/heads/master Author: Rafael Mendonça França Date: 2014-01-01 18:54:55 -0200 Do not highlight rake routes output as ruby code [ci skip] Closes #13565 M guides/source/getting_started.md commit 75ad0e6 refs/heads/master Author: Andrew White Date: 2014-01-01 20:29:56 +0000 Don't lazy load the tzinfo library Lazy loading the tzinfo library doesn't really buy us anything because the gem is installed as a dependency via the gemspec and if a developer is using Active Support outside of Rails then they can cherry pick which files to load anyway. Fixes #13553 M activesupport/CHANGELOG.md M activesupport/lib/active_support/values/time_zone.rb commit e97d48f refs/heads/master Merge: da0463c 98cb3e6 Author: Lauro Caetano Date: 2014-01-01 10:47:24 -0800 Merge pull request #13563 from vipulnsward/2014-is-here 2014 is here. commit 98cb3e6 refs/heads/master Author: Vipul A M Date: 2014-01-01 23:59:49 +0530 update copyright notices to 2014. [ci skip] M actionmailer/MIT-LICENSE M actionmailer/lib/action_mailer.rb M actionpack/MIT-LICENSE M actionpack/lib/action_dispatch.rb M actionpack/lib/action_pack.rb M actionview/MIT-LICENSE M actionview/lib/action_view.rb M activemodel/MIT-LICENSE M activemodel/lib/active_model.rb M activerecord/MIT-LICENSE M activerecord/lib/active_record.rb M activesupport/MIT-LICENSE M activesupport/lib/active_support.rb M railties/MIT-LICENSE commit 50060e9 refs/heads/master Author: Robin Dupret Date: 2013-12-30 17:47:11 +0100 Improve enum documentation Add a mention about the automatic generation of scopes based on the allowed values of the field on the enum documentation. M activerecord/lib/active_record/enum.rb commit 7aebcb6 refs/heads/master Author: Robin Dupret Date: 2013-12-30 16:56:13 +0100 Fix the enums writer methods Previously, the writer methods would simply check whether the passed argument was the symbol representing the integer value of an enum field. Therefore, it was not possible to specify the numeric value itself but the dynamically defined scopes generate where clauses relying on this kind of values so a chained call to a method like `find_or_initialize_by` would trigger an `ArgumentError`. Reference #13530 M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb M activerecord/test/schema/schema.rb commit da0463c refs/heads/master Author: Rafael Mendonça França Date: 2014-01-01 14:15:01 -0200 Improve the tests to not call assert_nothing_raised M activerecord/test/cases/associations/cascaded_eager_loading_test.rb commit b94e2dd refs/heads/master Merge: e015f4e bb17c3b Author: Rafael Mendonça França Date: 2014-01-01 14:14:45 -0200 Merge pull request #13550 from vipulnsward/13437-fix Fix for #13437 Conflicts: activerecord/CHANGELOG.md commit 6612de4 refs/remotes/origin/4-0-stable Merge: 5827374 eea0fe6 Author: Rafael Mendonça França Date: 2014-01-01 08:06:10 -0800 Merge pull request #13562 from robin850/travis Update the Travis configuration file commit eea0fe6 refs/remotes/origin/4-0-stable Author: Robin Dupret Date: 2014-01-01 17:00:15 +0100 Update the Travis configuration file Let's update the Rubinius and JRuby versions on Travis to make it gives more useful feedback. M .travis.yml commit 5827374 refs/remotes/origin/4-0-stable Merge: c263a9a aabf209 Author: Rafael Mendonça França Date: 2014-01-01 07:58:20 -0800 Merge pull request #12759 from dmarkow/backport-9675c7d Backport relation merger updates from 9675c7d to 4-0-stable commit e015f4e refs/heads/master Merge: 3e1e36b 85a1f7a Author: Rafael Mendonça França Date: 2014-01-01 07:38:15 -0800 Merge pull request #13556 from yahonda/update_mysql_grant Update grant statement to address #13549 commit c263a9a refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2014-01-01 06:36:43 -0800 Merge pull request #13561 from robin850/issue-11723 Avoid raising a NameError on FreeBSD using Date Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date/conversions.rb commit 3e1e36b refs/heads/master Merge: 224d3a6 afc98ea Author: Rafael Mendonça França Date: 2014-01-01 06:36:43 -0800 Merge pull request #13561 from robin850/issue-11723 Avoid raising a NameError on FreeBSD using Date commit 224d3a6 refs/heads/master Merge: 97ddfb4 aa22ab8 Author: Robin Dupret Date: 2014-01-01 06:31:05 -0800 Merge pull request #13559 from JuanitoFatas/action-controller [ci skip] Add missing flash message in block filter example. commit afc98ea refs/heads/master Author: Robin Dupret Date: 2014-01-01 15:24:54 +0100 Avoid raising a NameError on FreeBSD using Date The Date object has a xmlschema method starting with Ruby 1.9 so we were assuming that we could safely remove this method and redefine it later but the call to remove_method throws a NameError on FreeBSD so we should rely on remove_possible_method instead. This call is actually needed to avoid warnings when running the test suite. Fixes #11723 M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date/conversions.rb commit aa22ab8 refs/heads/master Author: Juanito Fatas Date: 2014-01-01 21:49:40 +0800 [ci skip] Add missing flash message in block filter example. Also make all three examples consistent. M guides/source/action_controller_overview.md commit 97ddfb4 refs/heads/master Merge: b64bac4 9e8592c Author: Arun Agrawal Date: 2014-01-01 04:47:06 -0800 Merge pull request #13558 from bcardarella/bc-fix-example-syntax Fix comment syntax commit 2ff4933 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2014-01-01 11:15:31 +0000 Allow engine root relative redirects using an empty string. Example: # application routes.rb mount BlogEngine => '/blog' # engine routes.rb get '/welcome' => redirect('') This now redirects to the path `/blog`, whereas before it would redirect to the application root path. In the case of a path redirect or a custom redirect if the path returned contains a host then the path is treated as absolute. Similarly for option redirects, if the options hash returned contains a `:host` or `:domain` key then the path is treated as absolute. Fixes #7977 (cherry picked from commit b64bac489c58ce1169941f77f4d633cb4eb87cd8) M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/redirection.rb M actionpack/test/dispatch/prefix_generation_test.rb commit b64bac4 refs/heads/master Author: Andrew White Date: 2014-01-01 11:15:31 +0000 Allow engine root relative redirects using an empty string. Example: # application routes.rb mount BlogEngine => '/blog' # engine routes.rb get '/welcome' => redirect('') This now redirects to the path `/blog`, whereas before it would redirect to the application root path. In the case of a path redirect or a custom redirect if the path returned contains a host then the path is treated as absolute. Similarly for option redirects, if the options hash returned contains a `:host` or `:domain` key then the path is treated as absolute. Fixes #7977 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/redirection.rb M actionpack/test/dispatch/prefix_generation_test.rb commit 9e8592c refs/heads/master Author: Brian Cardarella Date: 2013-12-31 21:58:04 -0500 Fix comment syntax The code syntax in the comment example is invalid M railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb commit 85a1f7a refs/heads/master Author: Yasuo Honda Date: 2014-01-01 09:38:37 +0900 Change the inexistent database name to inexistent_activerecord_unittest to make this grant statement described in the document works GRANT ALL PRIVILEGES ON inexistent_activerecord_unittest.* to 'rails'@'localhost'; M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit eb9ced8 refs/heads/master Author: Yasuo Honda Date: 2014-01-01 00:04:56 +0900 Update grant statement to address #13549 M guides/source/development_dependencies_install.md commit 0d4614c refs/heads/master Merge: ec46699 e0ad9ae Author: Godfrey Chan Date: 2013-12-31 15:53:24 -0800 Merge pull request #13419 from amrnt/nullize-enum Add the ability to nullize the enum column commit e0ad9ae refs/heads/master Author: Amr Tamimi Date: 2013-12-20 14:12:59 +0200 Add the ability to nullify the `enum` column M activerecord/CHANGELOG.md M activerecord/lib/active_record/enum.rb M activerecord/test/cases/enum_test.rb commit ec46699 refs/heads/master Merge: 13c18fe b5fdeaa Author: Rafael Mendonça França Date: 2013-12-31 21:05:07 -0200 Merge remote-tracking branch 'origin/master' commit 13c18fe refs/heads/master Author: Rafael Mendonça França Date: 2013-12-31 21:04:11 -0200 Improve tests to use only public API M activerecord/test/cases/relation_test.rb commit aaf1af3 refs/heads/master Author: gmarik Date: 2013-12-31 13:46:33 -0600 add test case M activerecord/test/cases/validations/presence_validation_test.rb commit b5fdeaa refs/heads/master Merge: c4fb191 a288cc1 Author: David Heinemeier Hansson Date: 2013-12-31 09:57:09 -0800 Merge pull request #13470 from strzalek/variants-all-any Add any/all support for variants commit 8ea00ed refs/heads/master Author: gmarik Date: 2013-12-31 11:51:33 -0600 Use `Array#wrap` instead `Array()` - since `Array()` calls `to_ary` or `to_a` on a subject - the intent is to 'wrap' subject into an array M activerecord/lib/active_record/validations/presence.rb commit c4fb191 refs/heads/master Merge: f3a8be3 6e2d35d Author: Vijay Dev Date: 2013-12-31 22:44:34 +0530 Merge branch 'master' of github.com:lifo/docrails commit b953b2f refs/heads/master Merge: f3a8be3 8e1f26c Author: Rafael Mendonça França Date: 2013-12-31 11:48:35 -0200 Merge pull request #13525 from huoxito/make-outer-joins-on-proper-parent Make outer joins on proper parent commit f3a8be3 refs/heads/master Merge: 969a077 da2b05b Author: Godfrey Chan Date: 2013-12-30 22:05:56 -0800 Merge pull request #13131 from gja/changed-accepts-values Allows you to check if a field has changed to a particular value commit 8e1f26c refs/heads/master Author: Washington Luiz Date: 2013-12-28 23:46:21 -0300 Make outer joins on proper parent Outer joins were being built on the root relation klass rather than the one specified in the join dependency root M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/test/cases/relation_test.rb commit 969a077 refs/heads/master Merge: 16e9356 5b96027 Author: Rafael Mendonça França Date: 2013-12-30 19:36:06 -0800 Merge pull request #13541 from schneems/schneems/db-url-sub-key Allow "url" sub key in database.yml configuration commit bb17c3b refs/heads/master Author: Vipul A M Date: 2013-12-31 02:44:27 +0530 https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a8 introduced a regression in includes/preloades by calling `read_attribute` on an association when preloading takes places, instead of using loaded records in `association.target`. tl;dr Records are not made properly available via `read_attribute` when preloding in simultaneous, but value of `@loaded` is already set true, and records concatenated in `association.target` on an association object. When `@loaded` is true we return an object of `AlreadyLoaded` in preload_for. In `AlreadyLoaded` to return preloaded records we make wrong use of `read_attribute`, instead of `target` records. The regression is fixed by making use of the loaded records in `association.target` when the preloading takes place. Fixes #13437 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader.rb M activerecord/test/cases/associations/cascaded_eager_loading_test.rb commit 5b96027 refs/heads/master Author: schneems Date: 2013-12-30 11:26:28 -0500 Allow "url" sub key in database.yml configuration Currently a developer can pass in a YAML configuration that fully specifies connection information: ``` production: database: triage_production adapter: password pool: 5 ``` They can also pass in a string that specifies a connection URL directly to an environment key: ``` production: postgresql://localhost/foo ``` This PR allows the use of both a connection url and specifying connection attributes via YAML through the use of the "url" sub key: ``` production: url: postgresql://localhost/foo pool: 3 ``` This will allow developers to inherit Active Record options such as `pool` from `&defaults` and still use a secure connection url such as `<%= ENV['DATABASE_URL'] %>`. The URL is expanded into a hash and then merged back into the YAML hash. If there are any conflicts, the values from the connection URL are preferred. Talked this over with @josevalim M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit 16e9356 refs/heads/master Merge: 08a87c1 8c82ee8 Author: Richard Schneeman Date: 2013-12-30 07:54:24 -0800 Merge pull request #13536 from schneems/schneems/connection-spec-docs [ci skip] ConnectionSpecification::Resolver Docs commit 8c82ee8 refs/heads/master Author: schneems Date: 2013-12-29 21:57:55 -0500 [ci skip] ConnectionSpecification::Resolver Docs Document the internal interfaces of `ConnectionSpecification::Resolver` Change method name from `config` to `env` to better match the most common use case. M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 08a87c1 refs/heads/master Merge: 2ab3bd1 ff47b05 Author: Xavier Noria Date: 2013-12-30 07:30:16 -0800 Merge pull request #13539 from StevenNunez/patch-1 Update explanation to match example [ci skip] commit ff47b05 refs/heads/master Author: Steven Nunez Date: 2013-12-30 09:51:19 -0500 Update explanation to match example M guides/source/routing.md commit 2ab3bd1 refs/heads/master Author: Yves Senn Date: 2013-12-30 12:18:45 +0100 tidy AR CHANGELOG. [ci skip] M activerecord/CHANGELOG.md commit d2aa332 refs/heads/master Merge: 3d865c1 ec4b44b Author: Yves Senn Date: 2013-12-30 03:16:02 -0800 Merge pull request #13538 from robin850/patch-14 Add a missing changelog entry for #13534 [ci skip] commit ec4b44b refs/heads/master Author: Robin Dupret Date: 2013-12-30 11:40:21 +0100 Add a missing changelog entry for #13534 [ci skip] M activerecord/CHANGELOG.md commit 3d865c1 refs/heads/master Author: Piotr Sarnacki Date: 2013-12-30 09:59:13 +0100 Remove deprecation warning for FIXTURES_PATH FIXTURES_PATH has a bit different case than DatabaseTasks.fixtures_path, which was added along with deprecation. A use case for FIXTURES_PATH could be loading fixtures from a different directory just for a given test run. The implementation is fairly simple, so leaving it as it is won't hurt. M activerecord/lib/active_record/railties/databases.rake commit 2be2003 refs/heads/master Author: Piotr Sarnacki Date: 2013-12-30 09:50:28 +0100 Revert "Install bundle gems to the system not to vendor/bundle" This reverts commit 875dd3edfd34eaa20120b6589b0d1905230e948f. The issue was fixed in rbx-2.2.3 M .travis.yml commit 8276a35 refs/remotes/origin/fix-rbx-on-travis (origin/fix-rbx-on-travis) Author: Piotr Sarnacki Date: 2013-12-30 09:50:28 +0100 Revert "Install bundle gems to the system not to vendor/bundle" This reverts commit 875dd3edfd34eaa20120b6589b0d1905230e948f. The issue was fixed in rbx-2.2.3 M .travis.yml commit 4a3e2a0 refs/heads/master Merge: 1072145 137c0e5 Author: Rafael Mendonça França Date: 2013-12-29 17:23:09 -0800 Merge pull request #13535 from schneems/schneems/extract-url-logic Extract db url connection logic to class commit 137c0e5 refs/heads/master Author: schneems Date: 2013-12-29 18:56:32 -0500 Extract db url connection logic to class M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit d15e62b refs/remotes/origin/fxn/string-pools Merge: 803c531 1072145 Author: Xavier Noria Date: 2013-12-29 21:47:03 +0100 Merge branch 'master' into fxn/string-pools commit 1072145 refs/heads/master Merge: 524ad8f 143da09 Author: José Valim Date: 2013-12-29 12:32:06 -0800 Merge pull request #13527 from kuldeepaggarwal/f-independent-specs Use user-defined configurations in mysql tests commit 524ad8f refs/heads/master Merge: 436ed51 a2985e2 Author: José Valim Date: 2013-12-29 12:25:21 -0800 Merge pull request #13534 from kuldeepaggarwal/f-where-not raise ArgumentError for nil in .where.not commit a2985e2 refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-30 01:53:02 +0530 raise `ArgumentError` exception if `Model.where.not` is called with `nil` argument M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_chain_test.rb commit 2612248 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2013-12-29 20:01:54 +0000 Test with 2.1.0 M .travis.yml commit 1e37945 refs/remotes/origin/4-0-stable Author: Andrew White Date: 2013-12-29 18:24:02 +0000 Fix Encoding::CompatibilityError when public path is UTF-8 In #5337 we forced the path encoding to ASCII-8BIT to prevent static file handling from blowing up before an application has had chance to deal with possibly invalid urls. However this has a negative side effect of making it an incompatible encoding if the application's public path has UTF-8 characters in it. To work around the problem we check to see if the path has a valid encoding once it has been unescaped. If it is not valid then we can return early since it will not match any file anyway. Fixes #13518 (cherry picked from commit 436ed5171199ae1764ce413044dad8d1556b7791) M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/dispatch/static_test.rb A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/bar.html" A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/baz.css" A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/index.html" A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257.html" A "actionpack/test/fixtures/\345\205\254\345\205\261/index.html" commit 436ed51 refs/heads/master Author: Andrew White Date: 2013-12-29 18:24:02 +0000 Fix Encoding::CompatibilityError when public path is UTF-8 In #5337 we forced the path encoding to ASCII-8BIT to prevent static file handling from blowing up before an application has had chance to deal with possibly invalid urls. However this has a negative side effect of making it an incompatible encoding if the application's public path has UTF-8 characters in it. To work around the problem we check to see if the path has a valid encoding once it has been unescaped. If it is not valid then we can return early since it will not match any file anyway. Fixes #13518 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/dispatch/static_test.rb A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/bar.html" A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/baz.css" A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/index.html" A "actionpack/test/fixtures/\345\205\254\345\205\261/foo/\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257.html" A "actionpack/test/fixtures/\345\205\254\345\205\261/index.html" commit 54ccc58 refs/heads/master Author: Andrew White Date: 2013-12-29 17:55:54 +0000 Fix method redefined warning message in mapper.rb M actionpack/lib/action_dispatch/routing/mapper.rb commit 15e2eb4 refs/heads/master Author: Piotr Sarnacki Date: 2013-12-29 15:05:35 +0100 Install bundle gems to the system not to vendor/bundle Rubinius has problems with bundling when shared gems are disabled (ie. when --path or --deployhment is used). There is no real reason to install it with --path on TravisCI, so I'm dropping it. M .travis.yml commit 875dd3e refs/remotes/origin/fix-rbx-on-travis Author: Piotr Sarnacki Date: 2013-12-29 15:05:35 +0100 Install bundle gems to the system not to vendor/bundle M .travis.yml commit 353eda6 refs/remotes/origin/fix-rbx-on-travis Author: Piotr Sarnacki Date: 2013-12-29 15:05:27 +0100 Remove everything apart from rbx for now M .travis.yml commit 143da09 refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-29 13:57:52 +0530 used user-defined configurations for running tests that might depend on user's system configuration M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 126dc47 refs/heads/master Author: Xavier Noria Date: 2013-12-28 19:59:52 +0100 blank? and present? commit to return singletons [Xavier Noria & Pavel Pravosud] The contract of blank? and present? was in principle to return Object, as we generally do, the test suite and description was consistent with that, but some examples had comments like "# => true". This cannot be unclear, we either fix the examples, or update the contract. Since users may be already assuming singletons due to the examples and the fact that they were returned before 30ba7ee, the safest option seems to be to revise the contract and the implementation of String#blank? The motivation for 30ba7ee was to improve the performance of the predicate, the refactor based on === is on par regarding speed. With this commit we start documenting return types using YARD conventions. We plan to document return types gradually. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/object/blank.rb M activesupport/test/core_ext/blank_test.rb commit 7b89446 refs/heads/master Merge: f66f483 37513b1 Author: Xavier Noria Date: 2013-12-28 06:54:16 -0800 Merge pull request #13517 from jetthoughts/13516_blank_to_return_true_false String#blank? returns True/False commit 37513b1 refs/heads/master Author: Paul Nikitochkin Date: 2013-12-28 16:26:26 +0200 Extracted blank matcher regexp to constant M activesupport/lib/active_support/core_ext/object/blank.rb commit f66f483 refs/heads/master Merge: c60eddd e8253d3 Author: Yves Senn Date: 2013-12-28 04:42:31 -0800 Merge pull request #13514 from kuldeepaggarwal/f-removed-warnings Removed warnings: setting `changed_attributes` instance variable if it is already initialized. commit e8253d3 refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-28 17:05:51 +0530 setting `changed_attributes` instance variable if it is already initialized. M activerecord/lib/active_record/persistence.rb commit c60eddd refs/heads/master Merge: 04108f2 1196bec Author: Arun Agrawal Date: 2013-12-28 02:39:13 -0800 Merge pull request #13513 from ilja/master Typo fix [ci skip] commit 1196bec refs/heads/master Author: Ilja Krijger Date: 2013-12-28 11:24:01 +0100 Typo fix [ci skip] M guides/source/engines.md commit 04108f2 refs/heads/master Merge: ef28028 4fd3204 Author: Guillermo Iguaran Date: 2013-12-27 15:02:57 -0500 Merge branch 'master' of github.com:rails/rails commit 803c531 refs/remotes/origin/fxn/string-pools Merge: 28b0895 4fd3204 Author: Xavier Noria Date: 2013-12-27 21:00:54 +0100 Merge branch 'master' into fxn/string-pools commit 4fd3204 refs/heads/master Merge: b33555d b7bf025 Author: Yves Senn Date: 2013-12-27 11:15:19 -0800 Merge pull request #13474 from jdelStrother/becomes Copy changed_attributes across to newly become'd records commit ef28028 refs/heads/master Author: Norman Clarke Date: 2013-12-27 14:56:54 -0300 Update to Unicode 6.3.0 6.3.0 was released on September 30, 2013. http://unicode-inc.blogspot.com.ar/2013/09/announcing-unicode-standard-version-63.html M activesupport/lib/active_support/multibyte/unicode.rb M activesupport/lib/active_support/values/unicode_tables.dat commit b7bf025 refs/heads/master Author: Jonathan del Strother Date: 2013-12-24 17:23:47 +0000 Copy changed_attributes across to newly become'd records Without this, the original record's values won't get saved, since the partial insertions support (https://github.com/rails/rails/commit/144e8691cbfb8bba77f18cfe68d5e7fd48887f5e) checks for changed values and thinks there are none. M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit b33555d refs/heads/master Merge: 864514a a944491 Author: Yves Senn Date: 2013-12-27 02:34:37 -0800 Merge pull request #13505 from robin850/patch-13 Ensure backward compatibility between Minitest 5 and 4 commit a944491 refs/heads/master Author: Robin Dupret Date: 2013-12-27 11:30:53 +0100 Ensure backward compatibility between Minitest 5 and 4 Define Minitest::Test in case we are running the gist under Minitest 4 and avoid relying on MiniTest::Unit::TestCase to avoid displaying warning on version five. [ci skip] M guides/bug_report_templates/action_controller_gem.rb M guides/bug_report_templates/active_record_gem.rb commit 864514a refs/heads/master Merge: aabfba7 fe49f43 Author: Yves Senn Date: 2013-12-27 01:13:02 -0800 Merge pull request #13483 from aditya-kapoor/add-missing-slashes Adding missing backslashes in active_model files so as to avoid unwanted [ci skip] commit a0024e3 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2013-12-27 09:35:14 +0100 doc fix. Use `sess.path` within `open_session`. Closes #13490. [ci skip] Conflicts: guides/source/testing.md M guides/source/testing.md commit aabfba7 refs/heads/master Author: Yves Senn Date: 2013-12-27 09:35:14 +0100 doc fix. Use `sess.path` within `open_session`. Closes #13490. [ci skip] M guides/source/testing.md commit fe49f43 refs/heads/master Author: aditya-kapoor Date: 2013-12-25 18:50:44 +0530 Adding missing backslashes in active_model files so as to avoid unwanted links in rdoc [ci skip] M activemodel/lib/active_model/conversion.rb M activemodel/lib/active_model/model.rb M activemodel/lib/active_model/serializers/json.rb M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validations/callbacks.rb M activemodel/lib/active_model/validations/length.rb commit eff8196 refs/heads/master Merge: 7d1d11e f593b69 Author: Yves Senn Date: 2013-12-26 23:58:58 -0800 Merge pull request #13500 from arunagw/remove-unused-require rbconfig is not used in these files remove unused requires commit 7d1d11e refs/heads/master Merge: 037665c fd1c515 Author: Guillermo Iguaran Date: 2013-12-26 14:57:27 -0800 Merge pull request #13502 from arunagw/bug-report-template-warning Minitest::Unit::TestCase is Minitest::Test [ci skip] commit fd1c515 refs/heads/master Author: Arun Agrawal Date: 2013-12-26 23:54:03 +0100 Minitest::Unit::TestCase is Minitest::Test [ci skip] M guides/bug_report_templates/action_controller_gem.rb M guides/bug_report_templates/active_record_gem.rb commit 28b0895 refs/remotes/origin/fxn/string-pools Merge: dea3371 037665c Author: Xavier Noria Date: 2013-12-26 21:54:23 +0100 Merge branch 'master' into fxn/string-pools commit f593b69 refs/heads/master Author: Arun Agrawal Date: 2013-12-26 21:18:14 +0100 rbconfig is not used in these files remove unused requires M railties/lib/rails/engine.rb M railties/lib/rails/test_unit/testing.rake commit 037665c refs/heads/master Merge: cef8c8f ab19584 Author: Jeremy Kemper Date: 2013-12-26 12:14:30 -0800 Merge pull request #13495 from norman/tidy_bytes Use String#scrub when available to tidy bytes commit cef8c8f refs/heads/master Merge: 8003c54 46096a0 Author: Arun Agrawal Date: 2013-12-26 11:43:33 -0800 Merge pull request #13498 from dmitrydims/master Fixed typo in Rails 4.1 Release Notes [CI skip] commit a288cc1 refs/heads/master Author: Łukasz Strzałkowski Date: 2013-12-24 16:53:10 +0100 Add any/all support for variants Like `format.any`, you can do the same with variants. It works for both inline: respond_to do |format| format.html.any { render text: "any" } format.html.phone { render text: "phone" } end and block syntax: respond_to do |format| format.html do |variant| variant.any(:tablet, :phablet){ render text: "any" } variant.phone { render text: "phone" } end end M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/test/controller/mime/respond_to_test.rb A actionpack/test/fixtures/respond_to/variant_any_implicit_render.html+phablet.erb A actionpack/test/fixtures/respond_to/variant_any_implicit_render.html+tablet.erb commit 46096a0 refs/heads/master Author: Semenyk Dmitriy Date: 2013-12-27 00:28:47 +0500 Fixed typo [CI skip] M guides/source/4_1_release_notes.md commit ab19584 refs/heads/master Author: Norman Clarke Date: 2013-12-26 12:36:52 -0300 Use String#scrub when available to tidy bytes M activesupport/lib/active_support/multibyte/unicode.rb commit 8003c54 refs/heads/master Merge: 8732348 fbbd4e1 Author: Xavier Noria Date: 2013-12-26 03:20:19 -0800 Merge pull request #13493 from Domon/improve-some-code-font-in-api-doc Improve font of some code in API documentation [ci skip] commit fbbd4e1 refs/heads/master Author: Chun-wei Kuo Date: 2013-12-26 18:14:38 +0800 Improve font of some code in API documentation [ci skip] * Add "" or "+" to improve font of some code and filenames in API documentation * Does not contain wording changes M actionmailer/lib/action_mailer/base.rb M actionpack/lib/action_controller/metal/renderers.rb M railties/lib/rails/generators/actions.rb M railties/lib/rails/paths.rb M railties/lib/rails/railtie.rb commit 2b4d71b refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2013-07-09 01:00:25 -0700 Merge pull request #11368 from Amit-Thawait/master Fixed Travis CI link for rails M guides/source/contributing_to_ruby_on_rails.md commit 8732348 refs/heads/master Merge: c99d969 1dae89c Author: Godfrey Chan Date: 2013-12-26 02:02:53 -0800 Merge pull request #13442 from aditya-kapoor/update-docs Updated documentation for Attribute Methods [ci skip] commit c99d969 refs/heads/master Merge: d80ad96 2409c61 Author: Guillermo Iguaran Date: 2013-12-25 16:38:49 -0800 Merge pull request #13485 from schneems/schneems/fix-more-railties-tests Partial fix of database url tests commit 2409c61 refs/heads/master Author: schneems Date: 2013-12-25 18:45:26 -0500 Fix failure introduced from #13488 M activerecord/test/cases/tasks/database_tasks_test.rb commit d0926d3 refs/heads/master Author: schneems Date: 2013-12-25 18:27:09 -0500 fix 2.1.0 bug :( M railties/test/application/rake/dbs_test.rb commit 707be60 refs/heads/master Author: schneems Date: 2013-12-25 17:25:38 -0500 ensure environment is run before db:structure:load Right now `db:drop` depends on `load_config` since so when `db:drop` gets executed `load_config` gets run. `db:structure:load` depends on `[:environment, :load_config]`. So before it runs, it executes `environment` but because `load_config` has already executed it is skipped. Note `db:load_config` is "invoke"-d twice, but only "execute"-d once: ``` ** Invoke db:drop (first_time) ** Invoke db:load_config (first_time) ** Execute db:load_config ** Execute db:drop ** Invoke db:structure:load (first_time) ** Invoke environment (first_time) ** Execute environment ** Invoke db:load_config ** Execute db:structure:load ``` The fix for this is making sure that the environment is run before any `load_config`: ``` ** Invoke environment (first_time) ** Execute environment ** Invoke db:drop (first_time) ** Invoke db:load_config (first_time) ** Execute db:load_config ** Execute db:drop ** Invoke db:structure:load (first_time) ** Invoke environment ** Invoke db:load_config ** Execute db:structure:load ``` M railties/test/application/rake/dbs_test.rb commit ba88293 refs/heads/master Author: schneems Date: 2013-12-25 09:47:57 -0500 Partial fix of database url tests Prior to #13463 when `DATABASE_URL` was set, Rails automagically used that value instead of the database.yml. There are tests in dbs_test that expect this to still be true. After that PR, `RAILS_DATABASE_URL` is expected to be read into the YAML file via ERB, this PR fixes that behavior. Note: this does not entirely fix the tests. It seems that `ActiveRecord::Tasks::DatabaseTasks.current_config` does not process the url string correctly (convert it into a hash), and ` ActiveRecord::Tasks::DatabaseTasks.structure_load(current_config, filename)` as well as other methods in `DatabaseTasks` expect a hash. It seems like we should involve the resolver somewhere in this process to correctly convert the database url, I do not know the best place for that /cc @josevalim M railties/test/application/rake/dbs_test.rb commit d80ad96 refs/heads/master Author: Guillermo Iguaran Date: 2013-12-25 17:34:25 -0500 Fix tests names: tokens.yml => secrets.yml M railties/test/application/configuration_test.rb commit e9f8fe2 refs/heads/master Merge: 278bbfd dd55033 Author: Guillermo Iguaran Date: 2013-12-25 14:31:29 -0800 Merge pull request #13488 from strzalek/fix-railties-warnings Fix railties warnings commit dd55033 refs/heads/master Author: Łukasz Strzałkowski Date: 2013-12-25 23:09:31 +0100 Cast env to symbol, fixes deprecation warning Warning: DEPRECATION WARNING: Passing a string to ActiveRecord::Base.establish_connection for a configuration lookup is deprecated, please pass a symbol (:development) instead. M activerecord/lib/active_record/tasks/database_tasks.rb commit 7a9d292 refs/heads/master Author: Łukasz Strzałkowski Date: 2013-12-25 23:04:20 +0100 Avoid getting redefined method warning Warning: ~/projects/rails/activerecord/lib/active_record/railtie.rb:140: warning: method redefined; discarding old extend_message ~/projects/rails/activerecord/lib/active_record/errors.rb:104: warning: previous definition of extend_message was here M activerecord/lib/active_record/railtie.rb commit 278bbfd refs/heads/master Merge: 2aceccf 8e2c080 Author: Guillermo Iguaran Date: 2013-12-25 12:21:38 -0800 Merge pull request #13478 from schneems/schneems/fix-mysql Move mysql2 test for when adapter will be loaded commit 2aceccf refs/heads/master Author: Guillermo Iguaran Date: 2013-12-25 15:17:08 -0500 Test with 2.1.0 M .travis.yml commit 1dae89c refs/heads/master Author: aditya-kapoor Date: 2013-12-22 05:10:50 +0530 Added Backslashes to ActiveModel::AttributeMethods to prevent unwanted links in the rdoc + some other doc fixes.[ci skip] M activemodel/lib/active_model/attribute_methods.rb commit ed072bd refs/heads/master Merge: 84d47d0 db7065b Author: Arun Agrawal Date: 2013-12-25 05:00:24 -0800 Merge pull request #13482 from aayushkhandelwal11/typo Typo rectified commom => common[ci skip] commit db7065b refs/heads/master Author: Aayush khandelwal Date: 2013-12-25 18:22:26 +0530 Typo rectified commom => common[ci skip] M activerecord/lib/active_record/persistence.rb commit 84d47d0 refs/heads/master Merge: ccc1a7b b9d79b1 Author: José Valim Date: 2013-12-25 04:48:56 -0800 Merge pull request #13480 from kuldeepaggarwal/f-removed-depricated-config using symbol instead of string in establish_connection commit b9d79b1 refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-25 15:24:25 +0530 using symbol instead of string in establish_connection M activerecord/test/cases/adapter_test.rb M railties/test/application/rake/dbs_test.rb commit ccc1a7b refs/heads/master Author: Akira Matsuda Date: 2013-12-25 16:29:04 +0900 Unused classes in AP tests M actionpack/test/abstract_unit.rb M actionpack/test/controller/filters_test.rb commit f57e5f2 refs/heads/master Author: Akira Matsuda Date: 2013-12-25 10:33:42 +0900 Unused class in AV test M actionview/test/actionpack/controller/render_test.rb commit 8e2c080 refs/heads/master Author: schneems Date: 2013-12-24 17:28:40 -0500 Move mysql2 test for when adapter will be loaded When run with only the Mysql adapter, we get this failure: https://travis-ci.org/rails/rails/jobs/15937907#L2416 Porting the test over to only run when mysql2 is loaded M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb commit f89c5f4 refs/heads/master Author: José Valim Date: 2013-12-24 19:29:24 +0100 Revert "Ensure secret_key_base is set for all environments" A better solution has been pushed to master. This reverts commit 959cfcef7255bba720ce3f15323056533ea7b50a. M railties/test/isolation/abstract_unit.rb commit db22a5a refs/heads/master Merge: df09ce9 14c175c Author: José Valim Date: 2013-12-24 10:20:51 -0800 Merge pull request #13472 from schneems/schneems/fix-master-database-url-tests Fix railties tests in master commit dea3371 refs/remotes/origin/fxn/string-pools Merge: 6551310 df09ce9 Author: Xavier Noria Date: 2013-12-24 18:26:33 +0100 Merge branch 'master' into fxn/string-pools Conflicts: activerecord/lib/active_record/connection_adapters/connection_specification.rb activerecord/lib/active_record/connection_adapters/postgresql/cast.rb commit df09ce9 refs/heads/master Merge: 9705df5 d641a0c Author: José Valim Date: 2013-12-24 08:22:30 -0800 Merge pull request #13471 from schneems/schneems/better-secrets-error-message Better missing `secret_key_base` error message commit 9705df5 refs/heads/master Merge: 959cfce f0311c2 Author: José Valim Date: 2013-12-24 08:17:21 -0800 Merge pull request #13469 from schneems/schneems/no-database-errors-all Raise NoDatabaseError when db does not exist commit 14c175c refs/heads/master Author: schneems Date: 2013-12-24 11:13:47 -0500 Fix railties tests in master Tests are failing due to missing env var on master https://travis-ci.org/rails/rails/jobs/15930622#L641 This adds an environment variable `ENV['RAILS_SECRET_KEY_BASE']` so these tests will pass. M railties/test/isolation/abstract_unit.rb commit d641a0c refs/heads/master Author: schneems Date: 2013-12-24 11:08:16 -0500 Better missing `secret_key_base` error message Previously the error was: ``` RuntimeError: You must set secret_key_base in your app's config ``` Will now be: ``` RuntimeError: Missing `secret_key_base` for 'production' environment, set this value in `config/secrets.yml` ``` M railties/lib/rails/application.rb commit 959cfce refs/heads/master Author: José Valim Date: 2013-12-24 16:35:43 +0100 Ensure secret_key_base is set for all environments M railties/test/isolation/abstract_unit.rb commit f0311c2 refs/heads/master Author: schneems Date: 2013-12-24 10:12:08 -0500 Raise NoDatabaseError when db does not exist Building on the work of #13427 this PR adds a helpful error message to the adapters: mysql, mysql2, and sqlite3 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 6570448 refs/heads/master Merge: ec11807 b58c8d3 Author: Arun Agrawal Date: 2013-12-24 04:51:43 -0800 Merge pull request #13467 from JuanitoFatas/getting-started [ci skip] Update getting started Ruby version. commit b58c8d3 refs/heads/master Author: Juanito Fatas Date: 2013-12-24 20:33:23 +0800 [ci skip] Update getting started Ruby version. M guides/source/getting_started.md commit 6e2d35d refs/heads/master Author: Robin Dupret Date: 2013-12-24 12:39:41 +0100 Fix few typos and improve markup at some levels M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/lint.rb M activemodel/lib/active_model/secure_password.rb M activemodel/lib/active_model/serialization.rb commit ec11807 refs/heads/master Author: José Valim Date: 2013-12-24 10:18:54 +0100 Deprecate use of string in establish_connection as connection lookup M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/connection_handling.rb M activerecord/test/cases/adapter_test.rb M activerecord/test/cases/multiple_db_test.rb M activerecord/test/cases/transaction_isolation_test.rb M activerecord/test/support/connection.rb commit d2ed433 refs/heads/master Author: José Valim Date: 2013-12-24 10:02:07 +0100 Only build a ConnectionSpecification if required M Gemfile M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/connection_handling.rb M activerecord/lib/active_record/railtie.rb M activerecord/test/cases/connection_specification/resolver_test.rb M railties/lib/rails/commands/dbconsole.rb commit d8336ca refs/heads/master Author: José Valim Date: 2013-12-24 09:26:34 +0100 Fix build failures related to the new ENV options in yml M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/railtie.rb M railties/test/isolation/abstract_unit.rb commit b23d3ff refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2013-12-23 05:50:51 -0800 Merge pull request #13455 from jetthoughts/13445_fix_touch_destroyed_record On destroying do not touch destroyed belongs to association. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/belongs_to.rb The code that raises an error when touching destroyed records is not on `4-0-stable`. It's only on `master`: e52ff809606323f7370cfaf6e63b083f9b108d6c I modified the CHANGELOG entry to explain the bug rather the exception raising behavior. I also had to modify the test-case to use the same instance. Otherwise `destroy` did not result on a `destroyed?` association record. /cc @pftg M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 222f00b refs/heads/master Author: Akira Matsuda Date: 2013-12-24 11:04:49 +0900 Unused classes in AV tests M actionview/test/actionpack/controller/layout_test.rb M actionview/test/fixtures/developer.rb M actionview/test/template/asset_tag_helper_test.rb commit 8530f4b refs/remotes/origin/4-0-stable Author: Xavier Noria Date: 2013-12-23 22:55:03 +0100 AC::Parameters#permit! permits hashes in array values M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit fa0380c refs/heads/master Author: Xavier Noria Date: 2013-12-23 22:55:03 +0100 AC::Parameters#permit! permits hashes in array values M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 33cb2f3 refs/heads/master Merge: 7530c82 2d4cfb2 Author: José Valim Date: 2013-12-23 12:28:04 -0800 Merge pull request #13463 from josevalim/jv-env Do not store production information in .yml files commit 7530c82 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-23 17:50:59 -0200 Disable locale checks to avoid warnings in Active Model tests [ci skip] Missed AMo when adding to the other components in ae196e85ee7169700afac2eecdc276bc06b10b8d. M activemodel/test/cases/helper.rb commit 887757a refs/remotes/origin/4-0-stable Author: Jared Beck Date: 2013-12-05 12:25:57 -0500 Update configuring guide with I18n options regarding available locales Add information about 'available_locales' and 'enforce_available_locales' to the configuring guide. Closes #13202. [ci skip] M guides/source/configuring.md commit d5a8b04 refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2013-12-17 08:22:26 -0800 Merge pull request #13341 from carlosantoniodasilva/ca-i18n Default I18n.enforce_available_locales to true We will default this option to true from now on to ensure users properly handle their list of available locales whenever necessary. This option was added as a security measure and thus Rails will follow it defaulting to secure option. Also improve the handling of I18n config options in its railtie, taking the new enforce_available_locales option into account, by setting it as the last one in the process. This ensures no other configuration will trigger a deprecation warning due to that setting. Conflicts: actionview/test/abstract_unit.rb activesupport/CHANGELOG.md activesupport/activesupport.gemspec activesupport/lib/active_support/i18n_railtie.rb activesupport/test/abstract_unit.rb guides/source/upgrading_ruby_on_rails.md railties/test/application/initializers/i18n_test.rb M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M activemodel/test/cases/helper.rb M activerecord/test/cases/helper.rb M activesupport/CHANGELOG.md M activesupport/activesupport.gemspec M activesupport/lib/active_support/i18n_railtie.rb M activesupport/test/abstract_unit.rb M railties/test/application/initializers/i18n_test.rb commit 2d4cfb2 refs/heads/master Author: José Valim Date: 2013-12-23 20:34:11 +0100 Update CHANGELOG [ci skip] M railties/CHANGELOG.md commit f6e3633 refs/heads/master Author: José Valim Date: 2013-12-23 20:32:44 +0100 Use the new Resolver API in dbconsole M railties/lib/rails/commands/dbconsole.rb commit facf2b4 refs/heads/master Author: José Valim Date: 2013-12-23 20:27:15 +0100 Add examples and namespace ENV options with "RAILS_" M railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml M railties/lib/rails/generators/rails/app/templates/config/secrets.yml commit c390e60 refs/heads/master Author: José Valim Date: 2013-12-23 20:15:52 +0100 Guarantee the connection resolver handles string values This commit also cleans up the rake tasks that were checking for DATABASE_URL in different places. In fact, it would be nice to deprecate DATABASE_URL usage in the long term, considering the direction we are moving of allowing those in .yml files. M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/connection_handling.rb M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit 956d05e refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2013-12-19 17:39:20 -0200 Fix a couple issues on PostgreSQL with array columns This is a combination of 3 commits: --- 56510091fb8d178ec7c2391bed9fbdb9e3a54287 Do not consider PG array columns as number or text columns The code uses these checks in several places to know what to do with a particular column, for instance AR attribute query methods has a branch like this: if column.number? !value.zero? end This should never be true for array columns, since it would be the same as running [].zero?, which results in a NoMethodError exception. Fixing this by ensuring that array columns in PostgreSQL never return true for number?/text? checks. Since most of the array support was based on the postgres_ext lib, it's worth noting it does the same thing for numeric array columns too: https://github.com/dockyard/postgres_ext/blob/v1.0.0/lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb#L72 This extended the same logic for text columns to ensure consistency. --- 73bba4c1e1f7fa23aa1a126971338d94ae42398f Serialize postgres' hstore, json and array types correctly in AR update methods. Fixes #12261. Closes #12395. --- 9e1740af9c1a00980b30c66aba3c223c33e646e4 Tidy up fix for PG extensions quoting Always pass in the column for quote_bound_value and quote using it in case it exists there. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/sanitization.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 9e1740a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-20 08:45:54 -0200 Tidy up fix for PG extensions quoting Always pass in the column for quote_bound_value and quote using it in case it exists there. M activerecord/CHANGELOG.md M activerecord/lib/active_record/sanitization.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 73bba4c refs/heads/master Author: Tadas Tamosauskas Date: 2013-09-28 16:10:59 +0100 Serialize postgres' hstore, json and array types correctly in AR update methods. Fixes #12261. Closes #12395. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/adapters/postgresql/array_test.rb activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/sanitization.rb M activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 5651009 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-19 17:39:20 -0200 Do not consider PG array columns as number or text columns The code uses these checks in several places to know what to do with a particular column, for instance AR attribute query methods has a branch like this: if column.number? !value.zero? end This should never be true for array columns, since it would be the same as running [].zero?, which results in a NoMethodError exception. Fixing this by ensuring that array columns in PostgreSQL never return true for number?/text? checks. Since most of the array support was based on the postgres_ext lib, it's worth noting it does the same thing for numeric array columns too: https://github.com/dockyard/postgres_ext/blob/v1.0.0/lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb#L72 This extended the same logic for text columns to ensure consistency. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 56962ba refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2013-12-19 16:30:48 -0200 Move the null mime type to request.format TLDR: always return an object that responds to the query methods from request.format, and do not touch Mime::Type[] lookup to avoid bugs. --- Long version: The initial issue was about being able to do checks like request.format.html? for request with an unknown format, where request.format would be nil. This is where the issue came from at first in #7837 and #8085 (merged in cba05887dc3b56a46a9fe2779b6b228880b49622), but the implementation went down the path of adding this to the mime type lookup logic. This unfortunately introduced subtle bugs, for instance in the merged commit a test related to send_file had to be changed to accomodate the introduction of the NullType. Later another bug was found in #13064, related to the content-type being shown as # for templates with localized extensions but no format included. This one was fixed in #13133, merged in 43962d6ec50f918c9970bd3cd4b6ee5c7f7426ed. Besides that, custom handlers were not receiving the proper template formats anymore when passing through the rendering process, because of the NullType addition. That was found while migrating an application from 3.2 to 4.0 that uses the Markerb gem (a custom handler that generates both text and html emails from a markdown template). --- This changes the implementation moving away from returning this null object from the mime lookup, and still fixes the initial issue where request.format.zomg? would raise an exception for unknown formats due to request.format being nil. Conflicts: actionpack/CHANGELOG.md actionpack/lib/abstract_controller/rendering.rb actionpack/lib/action_controller/metal/rendering.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/rendering.rb M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/test/controller/send_file_test.rb commit 618d531 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-19 16:30:48 -0200 Move the null mime type to request.format TLDR: always return an object that responds to the query methods from request.format, and do not touch Mime::Type[] lookup to avoid bugs. --- Long version: The initial issue was about being able to do checks like request.format.html? for request with an unknown format, where request.format would be nil. This is where the issue came from at first in #7837 and #8085 (merged in cba05887dc3b56a46a9fe2779b6b228880b49622), but the implementation went down the path of adding this to the mime type lookup logic. This unfortunately introduced subtle bugs, for instance in the merged commit a test related to send_file had to be changed to accomodate the introduction of the NullType. Later another bug was found in #13064, related to the content-type being shown as # for templates with localized extensions but no format included. This one was fixed in #13133, merged in 43962d6ec50f918c9970bd3cd4b6ee5c7f7426ed. Besides that, custom handlers were not receiving the proper template formats anymore when passing through the rendering process, because of the NullType addition. That was found while migrating an application from 3.2 to 4.0 that uses the Markerb gem (a custom handler that generates both text and html emails from a markdown template). --- This changes the implementation moving away from returning this null object from the mime lookup, and still fixes the initial issue where request.format.zomg? would raise an exception for unknown formats due to request.format being nil. M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/rendering.rb M actionpack/lib/action_controller/metal/rendering.rb M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/test/controller/send_file_test.rb commit ed334d9 refs/heads/master Merge: f4f496d 7c09ac7 Author: Godfrey Chan Date: 2013-12-23 10:13:51 -0800 Merge pull request #13462 from JuanitoFatas/getting-started [ci skip] a destroy action in controller, not delete [getting_stated.md]. commit d22a359 refs/heads/master Author: José Valim Date: 2013-12-23 18:54:39 +0100 Do not store production information in .yml files Instead, read information from environment variables. M railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml M railties/lib/rails/generators/rails/app/templates/config/secrets.yml commit 7c09ac7 refs/heads/master Author: Juanito Fatas Date: 2013-12-24 01:45:15 +0800 [ci skip] a destroy action in controller, not delete [getting_stated.md]. M guides/source/getting_started.md commit f4f496d refs/heads/master Merge: b4d7be9 0ec45cd Author: Yves Senn Date: 2013-12-23 07:28:40 -0800 Merge pull request #13427 from schneems/schneems/cannot-connect-postgres-error Tell how to Create a Database in Error Message commit 0ec45cd refs/heads/master Author: schneems Date: 2013-11-11 15:56:09 -0500 Tell how to Create a Database in Error Message Currently if you attempt to use a database that does not exist you get an error: ``` PG::ConnectionBad FATAL: database "db_error" does not exist ``` The solution is easy, create and migrate your database however new developers may not know these commands by memory. Instead of requiring the developer to search for a solution, tell them how to fix the problem in the error message: ``` ActiveRecord::NoDatabase: FATAL: database "db_error" does not exist Run `$ bin/rake db:create db:migrate` to create your database ``` Active Record should not know about `rake db:migrate` so this additional information needs to come from the railtie. Potential alternative implementation suggestions are welcome. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/errors.rb M activerecord/lib/active_record/railtie.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit b4d7be9 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-23 13:18:06 -0200 Fix comment example in AR enum [ci skip] M activerecord/lib/active_record/enum.rb commit 32c8aee refs/heads/master Merge: 00fc64a 2bcf715 Author: Yves Senn Date: 2013-12-23 05:50:51 -0800 Merge pull request #13455 from jetthoughts/13445_fix_touch_destroyed_record On destroying do not touch destroyed belongs to association. commit 2bcf715 refs/heads/master Author: Paul Nikitochkin Date: 2013-12-22 18:18:40 +0200 On destroying do not touch destroyed belongs to association. Fixes: #13445 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 00fc64a refs/heads/master Merge: 72503e6 34f17b8 Author: Yves Senn Date: 2013-12-23 05:14:14 -0800 Merge pull request #13446 from kuldeepaggarwal/resolver-test-cases Resolver test cases commit 34f17b8 refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-23 16:45:00 +0530 added test cases for Resolver#connection_url_to_hash M activerecord/test/cases/connection_specification/resolver_test.rb commit 72503e6 refs/heads/master Merge: 1a6089f 2e033e2 Author: José Valim Date: 2013-12-23 00:03:47 -0800 Merge pull request #13457 from strzalek/add-missing-av-railtie Add missing av/railtie require commit 8dd4aca refs/heads/master Author: Birkir A. Barkarson Date: 2013-11-13 12:31:02 +0900 Fix breakage in XmlMini - Boolean parsing breaks on non strings (i.e. integer 1|0) - Symbol parsing breaks on non strings. - BigDecimal parsing breaks due to missing require. - Update changelog. M activesupport/CHANGELOG.md M activesupport/lib/active_support/xml_mini.rb M activesupport/test/xml_mini_test.rb commit 2e033e2 refs/heads/master Author: Łukasz Strzałkowski Date: 2013-12-22 22:54:51 +0100 Add missing av/railtie require M actionpack/lib/action_controller/railtie.rb commit 9571dc4 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2013-12-22 21:58:07 +0100 build fix for #13451. Declare missing attribute. M activerecord/test/cases/adapters/postgresql/array_test.rb commit fb78c1e refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2013-12-22 18:44:42 +0100 CHANGELOG entry for #13451. [ci skip] Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md commit 1a6089f refs/heads/master Author: Yves Senn Date: 2013-12-22 18:44:42 +0100 CHANGELOG entry for #13451. [ci skip] M activerecord/CHANGELOG.md commit 44051e2 refs/remotes/origin/4-0-stable Author: Yves Senn Date: 2013-12-22 09:14:06 -0800 Merge pull request #13451 from dmathieu/quoting_non_strings Fix typecasting array of integers M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit c0a6ffb refs/heads/master Merge: 7432d32 1f6a9b5 Author: Yves Senn Date: 2013-12-22 09:14:06 -0800 Merge pull request #13451 from dmathieu/quoting_non_strings Fix typecasting array of integers commit 1f6a9b5 refs/heads/master Author: Damien Mathieu <42@dmathieu.com> Date: 2013-12-22 17:00:40 +0100 fix quoting non-strings Closes #13444 M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/test/cases/adapters/postgresql/array_test.rb commit 7432d32 refs/heads/master Author: Godfrey Chan Date: 2013-12-22 03:53:39 -0800 Use the same enum definition in the docs and in the comments [ci skip] M activerecord/lib/active_record/enum.rb commit cbd4bc8 refs/heads/master Author: Andrew White Date: 2013-12-22 10:06:12 +0000 Add comments with urls for email previews M railties/lib/rails/generators/test_unit/mailer/templates/preview.rb M railties/test/generators/mailer_generator_test.rb commit 6f4a556 refs/heads/master Merge: 6d255b7 dd93a5f Author: Guillermo Iguaran Date: 2013-12-21 22:53:05 -0800 Merge pull request #13443 from schneems/schneems/fix-master-tests Fix DB Console tests commit dd93a5f refs/heads/master Author: schneems Date: 2013-12-22 00:41:04 -0500 Use Full path to sqlite database in tests M railties/test/application/initializers/frameworks_test.rb M railties/test/application/rake/dbs_test.rb commit a1f9ae5 refs/heads/master Author: schneems Date: 2013-12-21 23:09:01 -0500 Fix DB Console tests The build is broken: https://travis-ci.org/rails/rails/builds/15824530 This commit fixes it. The problem: Sqlite expects the `database` part to be an absolute path. That prompted this change to be committed to master: https://github.com/rails/rails/commit/fbb79b517f3127ba620fedd01849f9628b78d6ce This change provides correct behavior. Unfortunately tests were introduced in https://github.com/rails/rails/commit/971d5107cd4cd08c22a85d34546f4ba03ed5c925 that were relying on the incorrect behavior. We can avoid the fix by changing to another database url such as `mysql` or `postgresql` In addition to fixing the failure, the assertions are changed so that the "expected" value comes before "actual" value. M railties/test/commands/dbconsole_test.rb commit 6d255b7 refs/heads/master Merge: 82053be 5724464 Author: Guillermo Iguaran Date: 2013-12-21 10:59:04 -0800 Merge pull request #13438 from vipulnsward/enable-memache-on-travis Enable memcached service on travis for running cache tests. commit 82053be refs/heads/master Merge: b9c9766 b894b7b Author: Guillermo Iguaran Date: 2013-12-21 10:56:29 -0800 Merge pull request #13436 from robin850/patch-11 Add missing changelog entries and fix few typos commit 5724464 refs/heads/master Author: Vipul A M Date: 2013-12-22 00:16:34 +0530 Enable memcached service on travis for running cache tests. M .travis.yml commit b894b7b refs/heads/master Author: Robin Dupret Date: 2013-12-21 17:44:43 +0100 Fix few typos in the documentation [ci skip] M activemodel/lib/active_model/callbacks.rb M activesupport/lib/active_support/callbacks.rb commit b9c9766 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-21 15:03:32 -0200 Fix typo [ci skip] M activesupport/lib/active_support/i18n_railtie.rb commit ad9570e refs/remotes/origin/4-0-stable Author: Guillermo Iguaran Date: 2013-12-20 22:21:28 -0500 Test with 2.1.0-rc1 Conflicts: .travis.yml M .travis.yml commit d39db9d refs/heads/master Author: Robin Dupret Date: 2013-12-21 14:49:16 +0100 Add a changelog entry for #13326 [ci skip] M railties/CHANGELOG.md commit 32a8940 refs/remotes/origin/4-0-stable Author: Xavier Noria Date: 2013-12-21 14:22:08 +0100 optimizes array conversion in AC::Parameters M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 273045d refs/heads/master Author: Xavier Noria Date: 2013-12-21 14:22:08 +0100 optimizes array conversion in AC::Parameters M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 2bc88d4 refs/heads/master Author: Robin Dupret Date: 2013-12-21 14:02:47 +0100 Add a changelog entry for #13363 [ci skip] M actionview/CHANGELOG.md commit ba02e8b refs/remotes/origin/4-0-stable Author: Xavier Noria Date: 2013-12-21 13:41:46 +0100 refactors AC::Parameters#fetch AC::Parameters#fetch was refactored in 7171111 to prevent self mutation, but in doing so it hardcodes logic #convert_hashes_to_parameters is supposed to encapsulate. Better leave the delegation, and add a way to avoid mutating self in there. M actionpack/lib/action_controller/metal/strong_parameters.rb commit 269424b refs/heads/master Author: Xavier Noria Date: 2013-12-21 13:41:46 +0100 refactors AC::Parameters#fetch AC::Parameters#fetch was refactored in 7171111 to prevent self mutation, but in doing so it hardcodes logic #convert_hashes_to_parameters is supposed to encapsulate. Better leave the delegation, and add a way to avoid mutating self in there. M actionpack/lib/action_controller/metal/strong_parameters.rb commit e219bf0 refs/heads/master Author: Guillermo Iguaran Date: 2013-12-20 22:21:28 -0500 Test with 2.1.0-rc1 M .travis.yml commit f39fce5 refs/heads/master Merge: 92f9ff8 02c814c Author: David Heinemeier Hansson Date: 2013-12-20 17:23:38 -0800 Merge pull request #13425 from kassio/master Generates html and text templates for mailers by default. commit 72c353f refs/remotes/origin/4-0-stable Author: Xavier Noria Date: 2013-12-21 01:11:47 +0100 converts hashes in arrays of unfiltered params to unpermitted params [fixes #13382] Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 92f9ff8 refs/heads/master Author: Xavier Noria Date: 2013-12-21 01:11:47 +0100 converts hashes in arrays of unfiltered params to unpermitted params [fixes #13382] M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit fbb79b5 refs/heads/master Author: Aaron Patterson Date: 2013-12-20 16:13:34 -0800 fix url connections for sqlite3 M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 02c814c refs/heads/master Author: Kassio Borges Date: 2013-12-19 22:12:55 -0200 `html` and `text` templates for mailers by default M railties/CHANGELOG.md M railties/lib/rails/generators/erb.rb M railties/lib/rails/generators/erb/controller/controller_generator.rb M railties/lib/rails/generators/erb/mailer/mailer_generator.rb A railties/lib/rails/generators/erb/mailer/templates/view.html.erb M railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb M railties/test/generators/mailer_generator_test.rb commit d0ffa7f refs/heads/master Merge: 15e442b e1aaa2f Author: Rafael Mendonça França Date: 2013-12-20 07:47:42 -0800 Merge pull request #13422 from rwz/master Bump Jbuilder version to 2.0.0 commit e1aaa2f refs/heads/master Author: Pavel Pravosud Date: 2013-12-20 10:35:32 -0500 Bump Jbuilder version to 2.0.0 M guides/code/getting_started/Gemfile M guides/code/getting_started/Gemfile.lock M railties/lib/rails/generators/app_base.rb commit 15e442b refs/heads/master Merge: 9e997e9 dece621 Author: Yves Senn Date: 2013-12-19 23:37:48 -0800 Merge pull request #13415 from schneems/schneems/database-no-username Do not expect database user with app name to exist commit 9e997e9 refs/heads/master Author: Kenta Murata & Akira Matsuda Date: 2013-12-20 15:35:13 +0900 Fix AS::NumberHelper results with large precisions before: ActiveSupport::NumberHelper.number_to_rounded '3.14159', precision: 50 => "3.14158999999999988261834005243144929409027099609375" after: ActiveSupport::NumberHelper.number_to_rounded '3.14159', precision: 50 => "3.14159000000000000000000000000000000000000000000000" M activesupport/CHANGELOG.md M activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb M activesupport/test/number_helper_test.rb commit c437a98 refs/heads/master Merge: 0516841 e8572cf Author: Jeremy Kemper Date: 2013-12-19 23:39:17 -0700 Merge pull request #13188 from imanel/skip_deep_munge Add configuration option to optionally disable deep_munge Conflicts: actionpack/CHANGELOG.md commit 0516841 refs/heads/master Merge: fdb67eb 15ad573 Author: Guillermo Iguaran Date: 2013-12-19 21:13:37 -0800 Merge pull request #13418 from ma2gedev/update_sass_rails_4_0_0 Use sass-rails 4.0.0 commit 15ad573 refs/heads/master Author: Takayuki Matsubara Date: 2013-12-20 12:02:20 +0900 Use sass-rails 4.0.1 M railties/lib/rails/generators/app_base.rb commit fdb67eb refs/heads/master Merge: d6ac7d7 855ded6 Author: Richard Schneeman Date: 2013-12-19 18:53:22 -0800 Merge pull request #13417 from TalkativeTree/comments_change fix CollectionAssociation's comments commit dece621 refs/heads/master Author: schneems Date: 2013-11-11 15:56:09 -0500 Do not expect database user with app name to exist By default when creating a project with `--database=postgresql` the `config/database.yml` file that is generated has a user specified that is the same as the app name ``` development: adapter: postgresql encoding: unicode database: <%= app_name %>_development pool: 5 username: <%= app_name %> password: ``` This is counterintuitive and would rarely be valid. By default postgres creates a user with the current user name (http://www.postgresql.org/docs/9.3/static/database-roles.html) "it will have the same name as the operating system user that initialized the database cluster": ``` $ whoami schneems ``` If the `username` is left out postgresql will assume that you wish to log in as the default user ``` $ psql -c '\du' List of roles Role name | Attributes | Member of -----------+------------------------------------------------+----------- schneems | Superuser, Create role, Create DB, Replication | {} ``` A good sensible default then for auto generated `database.yml` files is to remove the `username`, and have postgres attempt to connect to the database as the currently logged in user. Instead of submitting with a blank password, don't submit a password. M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml commit 855ded6 refs/heads/master Author: Ben Angel Date: 2013-12-19 18:35:24 -0800 change CollectionAssociation's comments to say Association instead of AssociationProxy to match changes for 3.1 removing Association proxy. M activerecord/lib/active_record/associations/collection_association.rb commit 6f1d0b5 refs/heads/master Author: schneems Date: 2013-12-19 20:41:48 -0500 [ci skip] trailing documentation whitespace M guides/source/asset_pipeline.md commit d6ac7d7 refs/heads/master Merge: 6de454f 2ff2f1b Author: Guillermo Iguaran Date: 2013-12-19 17:39:53 -0800 Merge pull request #13326 from schneems/schneems/add-asset-flag Flag `config.assets.raise_runtime_errors` in dev commit 2ff2f1b refs/heads/master Author: schneems Date: 2013-11-11 15:56:09 -0500 Flag `config.assets.raise_runtime_errors` in dev By default `config.assets.raise_runtime_errors` should be set to `true` in development for new apps. Source: https://github.com/rails/sprockets-rails/pull/100 M guides/source/asset_pipeline.md M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt commit 6de454f refs/heads/master Merge: ccaa3e4 e2c17cf Author: Lauro Caetano Date: 2013-12-19 14:51:39 -0800 Merge pull request #13357 from taryneast/master Describe precision + scale in migrations guide commit 294d418 refs/remotes/origin/4-0-stable Author: Rafael Mendonça França Date: 2013-12-19 13:57:14 -0800 Merge pull request #13412 from arthurnn/quote_id_not_id quoting: Check if id is a valid method before using it M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb commit ccaa3e4 refs/heads/master Merge: ecde74e 4a720a2 Author: Rafael Mendonça França Date: 2013-12-19 13:57:14 -0800 Merge pull request #13412 from arthurnn/quote_id_not_id quoting: Check if id is a valid method before using it commit ecde74e refs/heads/master Merge: cf15e02 3fa4e16 Author: Rafael Mendonça França Date: 2013-12-19 13:55:52 -0800 Merge pull request #13411 from schneems/schneems/runner-command-dash-c Make `rails runner` command options more obvious commit e2c17cf refs/heads/master Author: Taryn East Date: 2013-12-18 11:48:37 +1100 [ci skip] Describe precision + scale in migrations Telling somebody that "precision sets the precision" is not very helpful. Newbies want to know what precision is *for*, likewise with scale. So I've added a very brief description for each. M guides/source/migrations.md commit cf15e02 refs/heads/master Author: Rafael Mendonça França Date: 2013-12-19 19:53:26 -0200 Improve CHANGELOG entry [ci skip] M activerecord/CHANGELOG.md commit 4a720a2 refs/heads/master Author: Arthur Neves Date: 2013-12-19 16:51:28 -0500 quoting: Check if id is a valid method before using it Need to check if valud also respond_to :id before calling it, otherwise things could explode. M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb commit 3ea8403 refs/heads/master Merge: e4cde5d 847e9a9 Author: Rafael Mendonça França Date: 2013-12-19 19:48:46 -0200 Merge pull request #13344 from ccutrer/fix-from-default-select fix default select when from is used commit 3fa4e16 refs/heads/master Author: schneems Date: 2013-11-11 17:35:04 -0500 Make `rails runner` command options more obvious We're surrounding the options in angle brackets `<>` as is convention in `curl`: ``` $ curl --help Usage: curl [options...] ``` And then in square brackets `[]` with bars `|` as in `tar`: ``` $ tar --help ... Create: tar -c [options] [ | | @ | -C ] ``` To further clarify that the command can be used with both, we now show examples: ``` Examples: rails runner 'puts Rails.env' This runs the code `puts Rails.env` after loading the app rails runner path/to/filename.rb This runs the Ruby file located at `path/to/filename.rb` after loading the app ``` This format was taken from the `find` man pages: ``` EXAMPLES The following examples are shown as given to the shell: find / \! -name "*.c" -print Print out a list of all the files whose names do not end in .c. find / -newer ttt -user wnj -print Print out a list of all the files owned by user ``wnj'' that are newer than the file ttt. ``` The the text at the bottom is also shifted to improve readability. M railties/lib/rails/commands/runner.rb commit 847e9a9 refs/heads/master Author: Cody Cutrer Date: 2013-12-16 21:26:37 -0700 fix default select when from is used M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit e4cde5d refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-19 19:14:05 -0200 Fix indent in PG array tests [ci skip] M activerecord/test/cases/adapters/postgresql/array_test.rb commit 04ad814 refs/heads/master Author: Rafael Mendonça França Date: 2013-12-19 17:27:52 -0200 Make sure multiline string is not accepted by the regexp M activesupport/lib/active_support/configurable.rb M activesupport/test/configurable_test.rb commit bfdae17 refs/heads/master Author: Rafael Mendonça França Date: 2013-12-19 17:04:07 -0200 Make possible to use symbol as the verifier name M guides/source/4_1_release_notes.md M railties/CHANGELOG.md M railties/lib/rails/application.rb M railties/test/application/configuration_test.rb commit 61f6b47 refs/heads/master Author: Rafael Mendonça França Date: 2013-12-19 17:00:53 -0200 Change the message verifier argument to verifier_name M railties/CHANGELOG.md M railties/lib/rails/application.rb commit 87fc20a refs/heads/master Author: Xavier Noria Date: 2013-12-19 20:01:24 +0100 revises the release notes about message verifiers (second take) [ci skip] M guides/source/4_1_release_notes.md commit d0829f4 refs/heads/master Author: Xavier Noria Date: 2013-12-19 19:59:48 +0100 Revert "revises the release notes about message verifiers [ci skip]" This reverts commit 293a1a68992ba3e3e80f9f0f685e866ff79bf11a. M activesupport/lib/active_support/key_generator.rb M guides/source/4_1_release_notes.md commit 293a1a6 refs/heads/master Author: Xavier Noria Date: 2013-12-19 19:57:23 +0100 revises the release notes about message verifiers [ci skip] Example code does not run yet with beta1. M activesupport/lib/active_support/key_generator.rb M guides/source/4_1_release_notes.md commit 3356677 refs/heads/master Merge: a3b1105 729f45a Author: Rafael Mendonça França Date: 2013-12-19 10:51:20 -0800 Merge pull request #13408 from JuanitoFatas/remove-tt Remove tag in 4_1_release notes. [ci skip]. commit 729f45a refs/heads/master Author: Juanito Fatas Date: 2013-12-20 02:43:58 +0800 Remove tag in 4_1_release notes. [ci skip]. M guides/source/4_1_release_notes.md commit a3b1105 refs/heads/master Merge: 3968870 4dd8b0b Author: Vijay Dev Date: 2013-12-20 00:10:30 +0530 Merge branch 'master' of github.com:lifo/docrails commit 3968870 refs/heads/master Author: Xavier Noria Date: 2013-12-19 18:24:07 +0100 couple of tweaks to the release notes [ci skip] M guides/source/4_1_release_notes.md commit 4dd8b0b refs/heads/master Author: Vijay Dev Date: 2013-12-19 22:51:17 +0530 Revert "Update contributing_to_ruby_on_rails.md" This reverts commit 41ba51f4850a8cd2fe69789011ac33366366d32f. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 3351c2d refs/heads/master Author: Vijay Dev Date: 2013-12-19 22:51:01 +0530 Revert "Update security.md" This reverts commit f4804fafecdc057988575b4516afe9ca1d5f42fc. [ci skip] M guides/source/security.md commit 1406630 refs/heads/master Author: Vijay Dev Date: 2013-12-19 22:50:25 +0530 Revert "Fix on-site markdown rendering [ci skip]" This reverts commit 427db6b9d2b35a72f3c017eb19a2e1e800b0a7a3. [ci skip] M guides/source/i18n.md commit f858691 refs/heads/master Author: Vijay Dev Date: 2013-12-19 22:49:18 +0530 Revert "Underscore in markdown should be escaped with backslash [ci skip]" This reverts commit b58f3a641795e1777aa3e12a853c34ff512acfb9. Reason: Discussion in https://github.com/rails/docrails/commit/b58f3a641795e1777aa3e12a853c34ff512acfb9 [ci skip] M guides/source/i18n.md commit 320ac8e refs/heads/master Author: Xavier Noria Date: 2013-12-19 18:08:16 +0100 pass over half of the release notes [ci skip] M guides/source/4_1_release_notes.md commit f70e94c refs/heads/master Merge: 3b10ad0 4cb30d9 Author: Rafael Mendonça França Date: 2013-12-19 08:35:48 -0800 Merge pull request #13406 from hincupetru/master Fixed configurable.rb regular expression name check commit 4cb30d9 refs/heads/master Author: Hincu Petru Date: 2013-12-19 17:30:01 +0000 Fixed configurable.rb regular expression name check M activesupport/lib/active_support/configurable.rb M activesupport/test/configurable_test.rb commit 9a3c8f8 refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2013-12-19 13:49:54 -0200 Fix assertions for testing unknown formats using Mime::NullType M actionpack/test/dispatch/request_test.rb commit 3b10ad0 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-19 13:49:54 -0200 Fix assertions for testing unknown formats using Mime::NullType M actionpack/test/dispatch/request_test.rb commit 553b2a7 refs/heads/master Merge: 21fe17a f4e744d Author: Rafael Mendonça França Date: 2013-12-19 07:57:25 -0800 Merge pull request #13404 from JuanitoFatas/remove-tt [ci skip] Remove tag in 4_1_release notes. commit f4e744d refs/heads/master Author: Juanito Fatas Date: 2013-12-19 23:53:16 +0800 [ci skip] Remove tag in 4_1_release notes. M guides/source/4_1_release_notes.md commit 21fe17a refs/heads/master Merge: cc1f0b4 d4197bc Author: Rafael Mendonça França Date: 2013-12-19 07:39:13 -0800 Merge pull request #13401 from akshay-vishnoi/refactor Prevent creation of instance methods when `instance_reader = false`, Grammar checks, Conditional statements combined commit a5434dd refs/remotes/origin/4-0-stable Author: Carlos Antonio da Silva Date: 2013-12-19 13:35:42 -0200 Fix changelog indent [ci skip] M actionpack/CHANGELOG.md commit d4197bc refs/heads/master Author: Akshay Vishnoi Date: 2013-12-19 19:35:13 +0530 Prevent creation of instance methods when `instance_reader = false`, Grammar checks, Conditional statements combined M activesupport/lib/active_support/core_ext/class/delegating_attributes.rb M activesupport/test/core_ext/class/delegating_attributes_test.rb commit cc1f0b4 refs/heads/master Merge: d54bc03 b082bec Author: Carlos Antonio da Silva Date: 2013-12-19 05:22:28 -0800 Merge pull request #13395 from kuldeepaggarwal/postgres-table-ref-regex modified regex for finding table_name from a multiline sql query in postgresql commit b082bec refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-19 18:46:17 +0530 Fix PostgreSQL insert to properly extract table name from multiline string SQL. Previously, executing an insert SQL in PostgreSQL with a command like this: insert into articles( number) values( 5152 ) would not work because the adapter was unable to extract the correct articles table name. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 0585ba0 refs/remotes/origin/4-0-stable Author: Ryunosuke SATO Date: 2013-12-07 01:32:25 +0900 Show routes defined under assets prefix Closes #9625 Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/test/dispatch/routing/inspector_test.rb commit d54bc03 refs/heads/master Author: Ryunosuke SATO Date: 2013-12-07 01:32:25 +0900 Show routes defined under assets prefix Closes #9625 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/test/dispatch/routing/inspector_test.rb commit c5b76b5 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-19 09:03:39 -0200 Prefer assert_raise instead of flunk + rescue to test for exceptions Change most tests to make use of assert_raise returning the raised exception rather than relying on a combination of flunk + rescue to check for exception types/messages. M actionpack/test/controller/action_pack_assertions_test.rb M actionpack/test/controller/routing_test.rb M actionview/test/actionpack/abstract/helper_test.rb M actionview/test/actionpack/controller/render_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/validations_test.rb M activesupport/test/core_ext/duration_test.rb M activesupport/test/core_ext/name_error_test.rb M activesupport/test/dependencies_test.rb M activesupport/test/deprecation_test.rb M activesupport/test/multibyte_chars_test.rb commit d799b9c refs/heads/master Author: Carlos Antonio da Silva Date: 2013-12-19 08:47:06 -0200 Fix asserting the correct exception message in dependencies test In Minitest, the second argument of assert_raise(s) accepts a string as the message that should be shown in case of a failure in the assertion (eg nothing was raised when it should), and not the exception message to be matched. To do that we need to save the exception returned from assert_raise(s) into a local variable and check for the exception message using it. M activesupport/test/dependencies_test.rb commit 813ab76 refs/heads/master Author: Jared Beck Date: 2013-12-05 12:25:57 -0500 Update configuring guide with I18n options regarding available locales Add information about 'available_locales' and 'enforce_available_locales' to the configuring guide. Closes #13202. [ci skip] M guides/source/configuring.md commit 5b0fc1a refs/heads/master Merge: a3ebe7f f8b4110 Author: Carlos Antonio da Silva Date: 2013-12-19 01:44:01 -0800 Merge pull request #13393 from matthewd/fix_pg_range_tests Fix PostgreSQL range tests on fresh DB Correcting the name of the table we're creating is self-explanatory. But we must also move away from the low IDs, because we're not touching the freshly-created primary key sequence; when the time comes, @new_range will be assigned an ID of 1. commit a3ebe7f refs/heads/master Author: Akira Matsuda Date: 2013-12-19 18:31:11 +0900 Unused classes in AMo tests D activemodel/test/models/administrator.rb commit 4e68765 refs/heads/master Author: Akira Matsuda Date: 2013-12-19 16:30:16 +0900 Unused classes in AS tests M activesupport/test/callbacks_test.rb M activesupport/test/core_ext/module_test.rb D activesupport/test/fixtures/custom.rb M activesupport/test/testing/constant_lookup_test.rb commit 86dcb55 refs/heads/master Merge: 947efd4 517caa8 Author: Guillermo Iguaran Date: 2013-12-18 22:33:49 -0800 Merge pull request #13400 from nishant-cyro/docs fix typos and grammar mistake [ci skip] commit 517caa8 refs/heads/master Author: nishant-cyro Date: 2013-12-19 12:02:01 +0530 fix typos and grammar mistake [ci skip] M activerecord/lib/active_record/attribute_methods.rb M activesupport/lib/active_support/core_ext/thread.rb commit 947efd4 refs/heads/master Merge: f5a324e ff4673b Author: Guillermo Iguaran Date: 2013-12-18 22:23:22 -0800 Merge pull request #13398 from kuldeepaggarwal/build-fixes set encoding UTF-8 for accepting multibyte character commit f5a324e refs/heads/master Merge: e63748c ed768ee Author: Guillermo Iguaran Date: 2013-12-18 22:21:15 -0800 Merge pull request #13399 from ghiculescu/patch-1 Fix typo: data --> date [ci-skip] commit ed768ee refs/heads/master Author: Alex Ghiculescu Date: 2013-12-19 16:13:18 +1000 Fix typo: data --> date M activerecord/lib/active_record/attribute_methods/read.rb commit ff4673b refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-19 11:00:38 +0530 set encoding UTF-8 for accepting multibyte character M activerecord/test/cases/integration_test.rb commit e63748c refs/heads/master Merge: c454fc2 7bae292 Author: Godfrey Chan Date: 2013-12-18 19:22:30 -0800 Merge pull request #13366 from vipulnsward/minitest-namespace-change Change all `MiniTest` to `Minitest` commit f8b4110 refs/heads/master Author: Matthew Draper Date: 2013-12-19 13:27:45 +1030 Fix PostgreSQL range tests The changes in c4044b2 meant the tests would error on a fresh DB. M activerecord/test/cases/adapters/postgresql/range_test.rb commit c454fc2 refs/heads/master Author: Akira Matsuda Date: 2013-12-19 08:14:32 +0900 Unused classes in test case M activesupport/test/core_ext/object_and_class_ext_test.rb commit 4779aaa refs/heads/master Merge: 6d894cf ee738f9 Author: Rafael Mendonça França Date: 2013-12-18 12:38:29 -0800 Merge pull request #13386 from rono23/fix-to-param Fix to_param when attribute has multibyte character commit ee738f9 refs/heads/master Author: rono23 Date: 2013-12-19 01:35:30 +0900 Fix to_param when attribute has multibyte character M activerecord/lib/active_record/integration.rb M activerecord/test/cases/integration_test.rb commit 6d894cf refs/heads/master Author: Xavier Noria Date: 2013-12-18 19:16:32 +0100 make clear that config/secrets.yml passes through ERB and therefore supports ENV M railties/lib/rails/generators/rails/app/templates/config/secrets.yml commit 7b5cf7e refs/heads/master Author: Santiago Pastorino Date: 2013-12-18 13:34:28 -0200 Always point to latest rbx and jruby in travis M .travis.yml commit 69b5dc7 refs/heads/master Author: Yves Senn Date: 2013-12-18 14:36:31 +0100 document how to access mail previews. [ci skip] /cc @pixeltrix M actionmailer/lib/action_mailer/base.rb commit 01162b3 refs/heads/master Author: Jeremy Kemper Date: 2013-12-18 04:52:24 -0700 Fix nil assignment to polymorphic belongs_to Assigning nil to a polymorphic belongs_to would nullify its _id field by not its _type field. Fixes failing test from c141dfc838a5dca9f197814410fa5d44c143129c. Regression from 1678e959e973de32287b65c52ebc6cce87148951. M activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb commit 06dc51a refs/heads/master Merge: aaea0d8 21f0c58 Author: Yves Senn Date: 2013-12-18 03:02:24 -0800 Merge pull request #13370 from abhishekjain16/refactor_rails duplication removed(DRY) commit 21f0c58 refs/heads/master Author: abhishek Date: 2013-12-18 16:17:11 +0530 duplication removed(DRY) M actionview/lib/action_view/helpers/asset_tag_helper.rb commit aaea0d8 refs/heads/master Merge: 8a6d40f 0add074 Author: Damien Mathieu <42@dmathieu.com> Date: 2013-12-18 02:38:18 -0800 Merge pull request #13373 from sbagdat/patch-1 Fix typo [ci skip] commit 0add074 refs/heads/master Author: Sıtkı Bağdat Date: 2013-12-18 12:34:45 +0200 Fix typo [ci skip] M guides/source/action_controller_overview.md commit 8a6d40f refs/heads/master Author: Godfrey Chan Date: 2013-12-18 01:57:36 -0800 Added a link to the Module#concerning docs from the 4.1 release notes [ci skip] M guides/source/4_1_release_notes.md commit 8ac78d8 refs/heads/master Merge: 2c9cb49 29712f0 Author: Yves Senn Date: 2013-12-18 01:12:08 -0800 Merge pull request #13367 from abhishekjain16/new_branch change to DateTime.civil_from_format from DateTime.civil_from_fromat in ... [ci skip] commit 7bae292 refs/heads/master Author: Vipul A M Date: 2013-12-18 13:21:24 +0530 Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been renamed to `Minitest` Ref: https://github.com/seattlerb/minitest/blob/master/History.txt M actionpack/lib/action_dispatch/testing/assertions/routing.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/assertions/response_assertions_test.rb M activerecord/test/cases/migration/change_table_test.rb M activesupport/test/deprecation_test.rb M activesupport/test/test_test.rb M guides/bug_report_templates/action_controller_gem.rb M guides/bug_report_templates/active_record_gem.rb M railties/lib/rails/test_help.rb M railties/test/configuration/middleware_stack_proxy_test.rb commit 29712f0 refs/heads/master Author: abhishek Date: 2013-12-18 14:21:10 +0530 change to DateTime.civil_from_format from DateTime.civil_from_fromat in changelog [ci skip] M activesupport/CHANGELOG.md commit 2fb582f refs/remotes/origin/4-0-stable Author: Akshay Vishnoi Date: 2013-12-18 11:52:54 +0530 #none documentation updated [ci skip] M activerecord/lib/active_record/relation/query_methods.rb commit 2c9cb49 refs/heads/master Merge: 092e113 db765ec Author: Godfrey Chan Date: 2013-12-18 00:02:48 -0800 Merge pull request #13340 from akshay-vishnoi/typo #none documentation updated [ci skip] commit 092e113 refs/heads/master Author: Jeremy Kemper Date: 2013-12-18 00:59:20 -0700 Use annotated git tags for release task M RELEASING_RAILS.rdoc M tasks/release.rb commit 3de1999 refs/heads/master Author: Yves Senn Date: 2013-12-18 08:56:19 +0100 we should use annotated tags for releases. Annotated tags will provide us with Tagger and Time information. M RELEASING_RAILS.rdoc M tasks/release.rb commit 76f8d31 refs/heads/master Merge: 9fb6008 cd58745 Author: Guillermo Iguaran Date: 2013-12-17 23:42:05 -0800 Merge pull request #13363 from kuldeepaggarwal/f-video-options allow video_tag to accept `size` as `Number` for square shaped videos commit 9fb6008 refs/heads/master Merge: c141dfc 55f7c8d Author: Arun Agrawal Date: 2013-12-17 23:39:07 -0800 Merge pull request #13364 from corprew/patch-1 typo: should be 'DateTime.civil_from_format' and not 'DateTime.civil_from_fromat' commit 55f7c8d refs/heads/master Author: Corprew Reed Date: 2013-12-17 23:18:14 -0800 typo: should be 'DateTime.civil_from_format' and not 'DateTime.civil_from_fromat' M guides/source/4_1_release_notes.md commit cd58745 refs/heads/master Author: Kuldeep Aggarwal Date: 2013-12-18 12:24:08 +0530 allow video_tag to accept `size` as `Number` for square shaped videos M actionview/lib/action_view/helpers/asset_tag_helper.rb M actionview/test/template/asset_tag_helper_test.rb commit db765ec refs/heads/master Author: Akshay Vishnoi Date: 2013-12-18 11:52:54 +0530 #none documentation updated [ci skip] M activerecord/lib/active_record/relation/query_methods.rb commit c141dfc refs/heads/master Author: Jeremy Kemper Date: 2013-12-17 21:45:55 -0700 Add a failing test for assigning nil to a polymorphic belongs_to not nullifying its _type column M activerecord/test/cases/associations/belongs_to_associations_test.rb commit b641542 refs/heads/master Merge: f706d5f 24195d1 Author: Carlos Antonio da Silva Date: 2013-12-17 17:26:46 -0800 Merge pull request #13358 from JuanitoFatas/patch/release-notes Prettify the removals from Action Controller in 4.1 release notes. [ci skip] commit 24195d1 refs/heads/master Author: Juanito Fatas Date: 2013-12-18 09:15:40 +0800 [ci skip] Prettify the removals from Action Controller in 4.1 release notes. M guides/source/4_1_release_notes.md commit f706d5f refs/tags/v4.1.0.beta1 (tag: v4.1.0.beta1) Author: David Heinemeier Hansson Date: 2013-12-17 16:10:57 -0800 Its beta1 all around M railties/lib/rails/version.rb M version.rb commit dc90709 refs/tags/v4.1.0.beta1 Author: David Heinemeier Hansson Date: 2013-12-17 16:10:52 -0800 Fix dependency order M tasks/release.rb commit c0a2d47 refs/tags/v4.1.0.beta1 Author: David Heinemeier Hansson Date: 2013-12-17 16:05:28 -0800 Get ready to release 4.1.0.beta1 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M actionview/lib/action_view/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb commit 98fe2ac refs/tags/v4.1.0.beta1 Author: David Heinemeier Hansson Date: 2013-12-17 15:27:24 -0800 Remove the navigator for now. Its ugly and it promises more than it can deliver. These other views (properties, routes) are not designed to be loaded in isolation M railties/lib/rails/templates/layouts/application.html.erb commit 4f4fdd6 refs/tags/v4.1.0.beta1 Author: Jeremy Kemper Date: 2013-12-17 16:02:04 -0700 Clearly limit new CSRF protection to GET requests M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/test/controller/request_forgery_protection_test.rb commit d3fcaba refs/tags/v4.1.0.beta1 Author: Jeremy Kemper Date: 2013-12-17 15:40:11 -0700 Mention new CSRF protection gotcha in upgrade guide M guides/source/upgrading_ruby_on_rails.md commit 626ced2 refs/tags/v4.1.0.beta1 Author: Jeremy Kemper Date: 2013-12-17 15:20:28 -0700 Discuss Action Pack's new CSRF protection from remote script tags and what it means for your app. In short, update your tests if they don't already use the 'xhr :post' style. M guides/source/4_1_release_notes.md commit cf56dcf refs/tags/v4.1.0.beta1 Author: Jeremy Kemper Date: 2013-12-17 15:04:59 -0700 Fix integration test to pass same-origin verification M actionview/test/actionpack/controller/render_test.rb commit 39ca25f refs/tags/v4.1.0.beta1 Merge: 2b096c7 1650bb3 Author: Jeremy Kemper Date: 2013-12-17 12:29:57 -0800 Merge pull request #13345 from jeremy/get-csrf CSRF protection from cross-origin If U+2028 or U+2029 are part of any attributes output in the to_json call, you will end up with an exception. In Chrome: Uncaught SyntaxError: Unexpected token ILLEGAL  # Why not? This is JSON encoding, and the JSON spec is specific about how to  encode strings. U+2028 and U+2029 don't get special treatment. Just trying to start a discussion... what do you do in your apps to deal with this? Is there a convention I'm missing? M activesupport/lib/active_support/json/encoding.rb commit 952289a refs/heads/master Author: Steve Klabnik Date: 2013-04-02 12:26:32 -0700 Remove rails.png. No reason to have a file, we've got data-URIs now! It didn't make sense to me that you no longer have to remove public/index.html, but you still need to remove rails.png. This means that you won't have to any more when making a new Rails app. D railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png M railties/lib/rails/templates/rails/welcome/index.html.erb commit 4ae089b refs/heads/master Merge: defb5a2 04cda18 Author: Santiago Pastorino Date: 2013-04-02 12:24:21 -0700 Merge pull request #10054 from rubys/use_find_by_in_rdoc Prefer find_by over dynamic finders in rdoc commit defb5a2 refs/heads/master Merge: 6871b2e 0beec24 Author: Santiago Pastorino Date: 2013-04-02 12:23:51 -0700 Merge pull request #10055 from vipulnsward/remove_each_with_index_in_test each_with_index => each as we dont use index commit 04cda18 refs/heads/master Author: Sam Ruby Date: 2013-04-02 15:09:15 -0400 Prefer find_by over dynamic finders in rdoc M actionpack/lib/abstract_controller/helpers.rb M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_controller/test_case.rb M activemodel/lib/active_model/dirty.rb M activemodel/lib/active_model/secure_password.rb M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/integration.rb M activerecord/lib/active_record/relation/calculations.rb commit 1bf4088 refs/heads/master Author: Neeraj Singh Date: 2013-04-02 15:08:53 -0400 show name of the klass that has missing association M activerecord/lib/active_record/associations/join_dependency.rb commit 0beec24 refs/heads/master Author: Vipul A M Date: 2013-04-03 00:36:16 +0530 each_with_index => each as we dont use index M actionpack/test/template/form_options_helper_test.rb commit 6303cef refs/heads/master Author: Neeraj Singh Date: 2013-04-02 13:51:30 -0400 not a relation. it's an arel select manager M activerecord/lib/active_record/associations/join_dependency/join_association.rb commit 6871b2e refs/heads/master Merge: 62affac de12a6a Author: Steve Klabnik Date: 2013-04-02 11:53:48 -0700 Merge pull request #10053 from wangjohn/change_docs_for_associations_distinctness Changed the guides for associations, warning about race conditions when checking for distinctness commit de12a6a refs/heads/master Author: wangjohn Date: 2013-04-02 13:36:25 -0400 Changed the guides to use distinct instead of uniq for associations (see commit a1bb6c8b which changes the naming). I've also provided an example of how distinctness when inserting into an association can be achieved. M guides/source/association_basics.md commit 2c22376 refs/tags/v3.2.15 Author: Dmitry Vorotilin Date: 2012-07-11 12:18:52 +0400 Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer M actionpack/lib/action_view/lookup_context.rb M actionpack/lib/action_view/renderer/abstract_renderer.rb M actionpack/lib/action_view/renderer/partial_renderer.rb M actionpack/lib/action_view/renderer/template_renderer.rb A actionpack/test/fixtures/test/_changing_priority.html.erb A actionpack/test/fixtures/test/_changing_priority.json.erb A actionpack/test/fixtures/test/_first_json_partial.json.erb A actionpack/test/fixtures/test/_json_change_priority.json.erb A actionpack/test/fixtures/test/_second_json_partial.json.erb A actionpack/test/fixtures/test/change_priorty.html.erb A actionpack/test/fixtures/test/html_template.html.erb M actionpack/test/template/render_test.rb commit 62affac refs/heads/master Merge: 22fee7c 9be7ad9 Author: Santiago Pastorino Date: 2013-04-02 09:43:38 -0700 Merge pull request #3782 from arunagw/warning_mode_on Turning on warnings in "rake test" for railties commit 22fee7c refs/heads/master Merge: f95111e 1bf6b53 Author: Aaron Patterson Date: 2013-04-02 09:38:36 -0700 Merge pull request #9975 from mmangino/raise_when_attributes_cant_be_unserialized Unserializing YAML attributes can silently fail in development mode commit f95111e refs/heads/master Merge: 1b6ac82 4140d7c Author: Rafael Mendonça França Date: 2013-04-02 09:17:32 -0700 Merge pull request #9971 from kennyj/refactor_tasks Extract Firebird / Sqlserver / Oracle database tasks, and They should be deprecated. commit 4140d7c refs/heads/master Author: kennyj Date: 2013-04-03 01:01:58 +0900 Add CHANGELOG entry about extracting and deprecating Firebird/Sqlserver/Oracle database tasks. M activerecord/CHANGELOG.md commit 67994ef refs/heads/master Author: Yasuo Honda Date: 2013-04-01 23:42:57 +0900 Show deprecated messages only when target database adapters defined M activerecord/test/cases/tasks/firebird_rake_test.rb M activerecord/test/cases/tasks/oracle_rake_test.rb M activerecord/test/cases/tasks/sqlserver_rake_test.rb commit 0074d7d refs/heads/master Author: kennyj Date: 2013-03-28 14:00:19 +0900 Fix tiny problem: change method order for consistency and fix wrong method name. M activerecord/lib/active_record/railties/databases.rake M activerecord/test/cases/tasks/postgresql_rake_test.rb commit 1b6ac82 refs/heads/master Merge: 196af50 e267c0e Author: Rafael Mendonça França Date: 2013-04-02 09:04:04 -0700 Merge pull request #10052 from neerajdotname/stdout-in-log write sql queries to terminal commit e267c0e refs/heads/master Author: Neeraj Singh Date: 2013-04-02 11:55:58 -0400 write sql queries to terminal M guides/bug_report_templates/active_record_gem.rb M guides/bug_report_templates/active_record_master.rb commit 17c4158 refs/heads/master Author: kennyj Date: 2013-03-31 19:07:27 +0900 Suppress deprecation messages for deprecated database tasks, when executing rails's testcases. M activerecord/test/cases/tasks/firebird_rake_test.rb M activerecord/test/cases/tasks/oracle_rake_test.rb M activerecord/test/cases/tasks/sqlserver_rake_test.rb commit d481e05 refs/heads/master Author: kennyj Date: 2013-03-28 03:53:49 +0900 Add deprecation message on Firebird / Sqlserver / Oracle database tasks. M activerecord/lib/active_record/tasks/firebird_database_tasks.rb M activerecord/lib/active_record/tasks/oracle_database_tasks.rb M activerecord/lib/active_record/tasks/sqlserver_database_tasks.rb commit 742d090 refs/heads/master Author: kennyj Date: 2013-03-28 03:17:52 +0900 Extract Oracle database tasks. M activerecord/lib/active_record.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb A activerecord/lib/active_record/tasks/oracle_database_tasks.rb A activerecord/test/cases/tasks/oracle_rake_test.rb commit 0f313fc refs/heads/master Author: kennyj Date: 2013-03-28 03:07:51 +0900 Extract Sqlserver database tasks. M activerecord/lib/active_record.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb A activerecord/lib/active_record/tasks/sqlserver_database_tasks.rb A activerecord/test/cases/tasks/sqlserver_rake_test.rb commit 4a370f9 refs/heads/master Author: kennyj Date: 2013-03-28 02:58:23 +0900 Extract Firebird database tasks. M activerecord/lib/active_record.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb A activerecord/lib/active_record/tasks/firebird_database_tasks.rb A activerecord/test/cases/tasks/firebird_rake_test.rb commit 196af50 refs/heads/master Merge: 9030015 2c45db1 Author: Rafael Mendonça França Date: 2013-04-02 08:46:26 -0700 Merge pull request #10050 from neerajdotname/no-need-of-to_s-before-intern no need to invoke to_s before applying intern commit 1bf6b53 refs/heads/master Author: Mike Mangino Date: 2013-04-02 11:45:14 -0400 Remove all error masking when decoding serialized data fails? M activerecord/lib/active_record/coders/yaml_column.rb M activerecord/test/cases/coders/yaml_column_test.rb commit 2c45db1 refs/heads/master Author: Neeraj Singh Date: 2013-04-02 11:34:50 -0400 no need to invoke to_s before applying intern M activerecord/lib/active_record/associations/join_dependency.rb commit 4b8ea37 refs/heads/master Merge: bff281e 62b9723 Author: Grayson Wright Date: 2013-04-02 08:31:45 -0700 Merge pull request #131 from lazylester/master Edge rails new syntax for importing engine migration commit 9030015 refs/heads/master Merge: 6fee836 be73626 Author: Rafael Mendonça França Date: 2013-04-02 08:00:33 -0700 Merge pull request #10048 from senny/replace_merge_with_relation_calls_in_count_api replace #merge with relation API calls in calculations_test. commit be73626 refs/heads/master Author: Yves Senn Date: 2013-04-02 16:11:14 +0200 replace #merge with relation API calls in calculations_test. M activerecord/test/cases/calculations_test.rb commit 6fee836 refs/heads/master Merge: 299ddbd ab157ac Author: Rafael Mendonça França Date: 2013-04-02 07:04:15 -0700 Merge pull request #10038 from nateberkopec/sti-new-with-complex-inheritance Fix regression re: #new with an STI object & complex inheritance commit ab157ac refs/heads/master Author: Nate Berkopec Date: 2013-04-01 19:19:11 -0400 Fix #new with an STI object with complex inheritance M activerecord/lib/active_record/inheritance.rb M activerecord/test/cases/inheritance_test.rb commit 299ddbd refs/heads/master Author: Santiago Pastorino Date: 2013-04-02 10:28:19 -0300 Use released sdoc M Gemfile commit 2a27485 refs/heads/master Merge: a18c9f0 1879690 Author: Santiago Pastorino Date: 2013-04-02 05:24:16 -0700 Merge pull request #10041 from vipulnsward/more_destructive_merge change merge to merge! in AS on new hashes commit a18c9f0 refs/heads/master Merge: 98b5282 ae984cb Author: Santiago Pastorino Date: 2013-04-02 05:23:29 -0700 Merge pull request #10042 from choudhuryanupam/fix_activesupport_test Added missing assert commit ae984cb refs/heads/master Author: Anupam Choudhury Date: 2013-04-02 11:50:25 +0530 Added missing assert M activesupport/test/xml_mini/jdom_engine_test.rb M activesupport/test/xml_mini/libxml_engine_test.rb M activesupport/test/xml_mini/libxmlsax_engine_test.rb M activesupport/test/xml_mini/nokogiri_engine_test.rb M activesupport/test/xml_mini/nokogirisax_engine_test.rb M activesupport/test/xml_mini/rexml_engine_test.rb commit 1879690 refs/heads/master Author: Vipul A M Date: 2013-04-02 11:13:56 +0530 change merge to merge! in AS on new hashes M activesupport/lib/active_support/xml_mini/libxmlsax.rb M activesupport/lib/active_support/xml_mini/nokogirisax.rb commit 98b5282 refs/heads/master Author: Santiago Pastorino Date: 2013-04-02 00:02:09 -0300 Revert "Use jquery-rails from github" This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/app_base.rb commit 3b6f611 refs/heads/master Author: Santiago Pastorino Date: 2013-04-01 23:59:52 -0300 Revert "Use jquery-rails from github (fix Gem::Version error)" This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980. M Gemfile commit abad4f7 refs/heads/master Merge: 78defbb a605c44 Author: Rafael Mendonça França Date: 2013-04-01 15:39:02 -0700 Merge pull request #10036 from wangjohn/norecord_error_message_consistency_issues Updated the error message for find to stay consistent across Rails commit a605c44 refs/heads/master Author: wangjohn Date: 2013-04-01 18:16:47 -0400 Updated the error message for +find+ on an inverse_of association so that it is consistent with the error thrown for +find+ without an inverse_of association. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/inverse_associations_test.rb commit 78defbb refs/heads/master Author: Santiago Pastorino Date: 2013-04-01 18:26:34 -0300 Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184a M railties/lib/rails/version.rb M tasks/release.rb M version.rb commit 0eec487 refs/heads/master Author: Rafael Mendonça França Date: 2013-04-01 17:23:18 -0300 Revert more Rails.version changes Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc M railties/lib/rails/commands/application.rb M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec M railties/lib/rails/generators/rails/plugin_new/templates/Gemfile commit 264001d refs/heads/master Merge: 3073c3d 6c5032f Author: Rafael Mendonça França Date: 2013-04-01 13:00:48 -0700 Merge pull request #10022 from wangjohn/find_on_nonexistent_id_raises_error Throwing a RecordNotFound exception when a record is scanned using the inverse_of option commit 6c5032f refs/heads/master Author: wangjohn Date: 2013-03-31 21:23:53 -0400 Throwing a RecordNotFound exception when a record is scanned using the inverse_of option. I've also refactored the code for raising a RecordNotFound exception when searching for records with ids. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/inverse_associations_test.rb commit 3073c3d refs/heads/master Author: Rafael Mendonça França Date: 2013-04-01 16:55:35 -0300 :scissors: [ci skip] M railties/CHANGELOG.md commit 93302dc refs/heads/master Merge: 38bda38 6de92c8 Author: Rafael Mendonça França Date: 2013-04-01 12:38:55 -0700 Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_test Fixed typo on AP dispatch Mime::Type test commit 38bda38 refs/heads/master Author: Rafael Mendonça França Date: 2013-04-01 16:34:12 -0300 Remove CHANGELOG entry for #10002 [ci skip] M railties/CHANGELOG.md commit ed8df3f refs/heads/master Merge: c311447 ceb3b87 Author: Jeremy Kemper Date: 2013-04-01 12:32:22 -0700 Merge pull request #10002 from charliesome/revert-version-method-on-rails Reverts changes to Rails.version made in #8501 commit 6de92c8 refs/heads/master Author: KalabiYau Date: 2013-04-01 23:25:15 +0400 Fixed typo on AP dispatch Mime::Type test M actionpack/test/dispatch/mime_type_test.rb commit c311447 refs/heads/master Author: Rafael Mendonça França Date: 2013-04-01 16:14:59 -0300 :uniq is still a valid relation option since it was only silently deprecated Fixes activerecord-deprecated_finders build. https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703 M activerecord/lib/active_record/relation.rb commit e456ad5 refs/heads/master Merge: 456bd7b ca58bf1 Author: Santiago Pastorino Date: 2013-04-01 10:45:55 -0700 Merge pull request #10031 from trevorturk/cookie-store-auto-upgrade-docs Improve documentation around the cookie store auto-upgrade to encryption commit 456bd7b refs/heads/master Merge: b2f62f5 ad90620 Author: Rafael Mendonça França Date: 2013-04-01 10:29:46 -0700 Merge pull request #10010 from pwnall/fix_ref_index_true Make references with index:true pass Hash options to add_index commit ad90620 refs/heads/master Author: Victor Costan Date: 2013-04-01 13:14:38 -0400 Make references with index:true pass Hash options to add_index. M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit bff281e refs/heads/master Author: Jonathan Roes Date: 2013-04-01 13:53:21 -0300 Proofreading tweaks to the Mailer guide M guides/source/action_mailer_basics.md commit 29ac0fb refs/heads/master Merge: f266535 69c5b40 Author: Vijay Dev Date: 2013-04-01 09:45:35 -0700 Merge pull request #129 from rafBM/master Remove “Sweepers” from Caching TOC and mention Page/Action caching removal commit ca58bf1 refs/heads/master Author: Trevor Turk Date: 2013-04-01 11:38:06 -0500 Improve documentation around the cookie store auto-upgrade to encryption M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M guides/source/upgrading_ruby_on_rails.md commit b2f62f5 refs/heads/master Author: Rafael Mendonça França Date: 2013-04-01 13:06:38 -0300 Move the class methods to above the protected section M railties/lib/rails/generators/testing/assertions.rb M railties/lib/rails/generators/testing/behaviour.rb M railties/lib/rails/generators/testing/setup_and_teardown.rb commit 5f370eb refs/heads/master Merge: 3aadda9 57f71c2 Author: Rafael Mendonça França Date: 2013-04-01 13:00:26 -0300 Merge pull request #10021 from pabloh/refactor_rails_generator_test_case Refactor Rails::Generator::TestCase into modules commit 3aadda9 refs/heads/master Merge: f9d23b3 eab657b Author: Rafael Mendonça França Date: 2013-04-01 08:56:18 -0700 Merge pull request #10025 from masarakki/fix_detect_enum_column_on_mysql fix detect column type of enum commit f9d23b3 refs/heads/master Merge: 40f9ca9 274a3aa Author: Santiago Pastorino Date: 2013-04-01 08:10:34 -0700 Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade Cookie-base session store auto-upgrade commit 4483815 refs/heads/master Author: Michal Cichra Date: 2013-03-29 10:03:56 +0100 fix inverse_of association in block of new child This fixes inconsistency when building children of association which has inverse_of set properly. When creating new association object with a block: parent.association.build do |child| child.parent.equal?(parent) # false end So the block the `child.parent` did not point to the same object. But when the object is created it points to same instance: child = parent.association.build child.parent.equal?(parent) # true M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/association.rb M activerecord/test/cases/associations/inverse_associations_test.rb commit 40f9ca9 refs/heads/master Merge: 3f35924 d4d3d05 Author: Santiago Pastorino Date: 2013-04-01 05:13:03 -0700 Merge pull request #10026 from ogawaso/typo typo recomend -> recommend commit d4d3d05 refs/heads/master Author: ogawaso Date: 2013-04-01 19:54:46 +0900 typo recomend -> recommend M actionpack/lib/action_view/helpers/javascript_helper.rb commit 9be7ad9 refs/heads/master Author: Arun Agrawal Date: 2011-11-28 16:28:07 +0530 Turning on warnings in "rake test" for railties M railties/Rakefile commit eab657b refs/heads/master Author: masarakki Date: 2013-04-01 16:48:26 +0900 fix detect column type of enum enum includes text or blob or ... hooked by wrong regex M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/enum_test.rb M activerecord/test/cases/adapters/mysql2/enum_test.rb M activerecord/test/schema/mysql2_specific_schema.rb M activerecord/test/schema/mysql_specific_schema.rb commit 3f35924 refs/heads/master Author: Xavier Noria Date: 2013-04-01 09:42:23 +0200 gist for Active Record issues [Neeraj Singh & Xavier Noria] This commit closes issue #9775. A guides/bug_report_templates/active_record_gem.rb A guides/bug_report_templates/active_record_master.rb M guides/source/contributing_to_ruby_on_rails.md commit f266535 refs/heads/master Merge: da9031a 8429a75 Author: Ken Date: 2013-03-31 20:51:51 -0700 Merge pull request #132 from hlee/master Fixed an article link at sitepoint commit 8429a75 refs/heads/master Author: Ken Lu Date: 2013-03-31 23:48:32 -0400 fixed a article link at sitepoint M guides/source/debugging_rails_applications.md commit 62b9723 refs/heads/master Author: Les Nightingill Date: 2013-03-31 18:21:41 -0700 as of Rails 3.2.13 it appears that importing an engine's migration into the host app is achieved by rake blorgh_engine:install:migrations M guides/source/engines.md commit 57f71c2 refs/heads/master Author: Pablo Herrero Date: 2013-03-31 20:24:01 -0300 Break down Rails::Generator::TestCase into modules M railties/lib/rails/generators/test_case.rb A railties/lib/rails/generators/testing/assertions.rb A railties/lib/rails/generators/testing/behaviour.rb A railties/lib/rails/generators/testing/setup_and_teardown.rb commit 0a16cf1 refs/heads/master Merge: 31216ec 53d68bd Author: Carlos Antonio da Silva Date: 2013-03-31 15:46:48 -0700 Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select Revert grep to select since they are not the same commit da9031a refs/heads/master Author: Jonathan Roes Date: 2013-03-31 19:12:06 -0300 Remove unnecessary / confusing code in example M guides/source/action_controller_overview.md commit 31216ec refs/heads/master Merge: d535249 d0b8f4c Author: Santiago Pastorino Date: 2013-03-31 12:36:39 -0700 Merge pull request #10013 from vipulnsward/fix_request_method_test fix request methods test commit d0b8f4c refs/heads/master Author: Vipul A M Date: 2013-03-31 17:30:12 +0530 fix request methods test M actionpack/test/controller/routing_test.rb commit d535249 refs/heads/master Merge: 2f53c27 c0be6c9 Author: Steve Klabnik Date: 2013-03-31 09:18:24 -0700 Merge pull request #10017 from vipulnsward/railties_cleanups cleanup railties test; fix typos commit 2f53c27 refs/heads/master Merge: fb613cb f23e7eb Author: Steve Klabnik Date: 2013-03-31 08:53:01 -0700 Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get remove unused variable and assignment commit fb613cb refs/heads/master Merge: fa2e45e 01ac925 Author: Steve Klabnik Date: 2013-03-31 08:42:43 -0700 Merge pull request #10014 from vipulnsward/remove_unused_match_var remove unused match variables in selector commit fa2e45e refs/heads/master Merge: 3b0b573 1f84997 Author: Steve Klabnik Date: 2013-03-31 08:41:28 -0700 Merge pull request #10012 from vipulnsward/fix_AP_error_message_error fix wrong argument error message [ci skip] commit c0be6c9 refs/heads/master Author: Vipul A M Date: 2013-03-31 20:50:21 +0530 cleanup railties test; fix typos M railties/test/application/console_test.rb M railties/test/generators_test.rb M railties/test/railties/engine_test.rb commit f23e7eb refs/heads/master Author: Vipul A M Date: 2013-03-31 19:34:40 +0530 remove unused variable and assignment M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/abstract_unit.rb commit 01ac925 refs/heads/master Author: Vipul A M Date: 2013-03-31 19:08:40 +0530 remove unused match variables in selector M actionpack/lib/action_view/vendor/html-scanner/html/selector.rb commit 75afe19 refs/heads/master Author: Carson McDonald Date: 2013-03-31 09:38:14 -0400 Fix typo M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 1f84997 refs/heads/master Author: Vipul A M Date: 2013-03-31 16:49:23 +0530 fix wrong argument error message M actionpack/lib/action_dispatch/routing/route_set.rb commit ffd899f refs/heads/master Author: Andre Arko Date: 2013-03-30 13:02:26 -0700 fix binstub typo M railties/lib/rails/app_rails_loader.rb commit 060fca7 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-30 16:42:52 -0300 Fix formatting and minor review in AP changelog Sentences starting with # are considered headings. M actionpack/CHANGELOG.md commit 3b0b573 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 16:00:51 -0300 Make comment about uglifier in generated Gemfile consistent between branches Introduced in 59d20af2238f7ab553f41b96282722889d8d4393. M railties/lib/rails/generators/app_base.rb commit 9e4bbce refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 15:53:49 -0300 Fix indent and change "or" usage to "||" in schema dumper tests M activerecord/test/cases/schema_dumper_test.rb commit 6ee1791 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 15:46:05 -0300 Improve AP changelog entry about layout method with nil return Add a note about getting the "no layout" behavior by returning "false" to make it easier for people that might need to change their code. Related to #8458. [ci skip] M actionpack/CHANGELOG.md commit 2d1eebf refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 15:26:45 -0300 Refactor index algorithm lookup so that it only builds the available options once This way the available options are only built for actually fetching the algorithm in case the option is given. The options are going to be necessary a second time only in case the option is given but does not exist, which is supposed to be due to a typo or something like that, so no problem. M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 07dfc0a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 15:22:08 -0300 Minor doc improvement about index algorithms [ci skip] M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 0c5552a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 15:17:08 -0300 Fix typos in AP: "overriden" => "overridden" M actionpack/lib/abstract_controller/rendering.rb M actionpack/test/controller/new_base/render_partial_test.rb M actionpack/test/controller/new_base/render_test.rb M actionpack/test/controller/show_exceptions_test.rb M actionpack/test/template/url_helper_test.rb commit 09c55dc refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 15:04:08 -0300 Review some tests from AMo::Errors to remove "should" usage Also remove duplicated tests for Errors#as_json and minor improvements in some tests. M activemodel/test/cases/errors_test.rb commit 3d0c0c6 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 14:38:12 -0300 Improve changelog entry for ActiveModel::Errors#full_messages_for [ci skip] Add a working example of how to use this new method. M activemodel/CHANGELOG.md M activemodel/lib/active_model/errors.rb commit 7860bf1 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 14:11:40 -0300 Do not calculate values if they are not going to be used When building the indexes list in PostgreSQL, IndexDefinition objects are only created if the query for the related attributes really returns something matching the attributes. In case it does not, the variables for building the definition objects were being created but not used. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit cbfa91a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 13:59:38 -0300 Make docs a little bit more consistent with colons [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 5ad8660 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 13:57:54 -0300 Fix code examples indent in new index options docs [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit d9ac2af refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 13:56:03 -0300 Use new hash style in doc examples [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit ec55f37 refs/heads/master Merge: e0b2271 737f618 Author: Rafael Mendonça França Date: 2013-03-30 10:03:24 -0700 Merge pull request #9991 from Passionate/patch-1 improve readability commit e0b2271 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-30 13:54:20 -0300 Minor reviews in AR changelog [ci skip] M activerecord/CHANGELOG.md commit d98ab53 refs/heads/master Author: Guillermo Iguaran Date: 2013-03-30 11:44:27 -0500 Use last released version of thor M Gemfile M railties/railties.gemspec commit 6e170e1 refs/heads/master Merge: bacae87 2ff2f83 Author: Rafael Mendonça França Date: 2013-03-30 09:46:09 -0700 Merge pull request #10004 from choudhuryanupam/master Refactored to remove unnecessary setup commit bacae87 refs/heads/master Merge: 6a3794b 7be9e88 Author: Carlos Antonio da Silva Date: 2013-03-30 09:12:35 -0700 Merge pull request #10003 from tkhr/refactor-scoping-test-files Reorganize scoping test files commit 6a3794b refs/heads/master Merge: 2432469 bd674fd Author: Carlos Antonio da Silva Date: 2013-03-30 08:55:16 -0700 Merge pull request #9997 from vipulnsward/hash_destructive_merge Change merge to merge! to avoid creating new objects commit 2432469 refs/heads/master Merge: 92d6dac 5a0e583 Author: Carlos Antonio da Silva Date: 2013-03-30 08:47:06 -0700 Merge pull request #10007 from vipulnsward/fix_AS_typos Fix some typos in AS commit 805c4c1 refs/heads/master Author: Neeraj Singh Date: 2013-03-30 08:12:53 -0400 minor copy editing M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/reflection.rb commit 92d6dac refs/heads/master Author: Xavier Noria Date: 2013-03-30 11:27:53 +0100 configure API generation lazily Do the absolute bare minimum needed to define this task, no need to compute gem paths everytime you call rake. M railties/lib/rails/api/task.rb commit 2645f68 refs/heads/master Author: Xavier Noria Date: 2013-03-30 11:24:51 +0100 be lazy configuring the RDoc files This code is executed every time you run a rake task, there is no need to, specially adding a penalty to test suites. M railties/lib/rails/api/task.rb commit f01b757 refs/heads/master Author: Xavier Noria Date: 2013-03-30 11:22:40 +0100 be lazy loading SDoc M guides/code/getting_started/Gemfile M railties/lib/rails/api/task.rb M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/test/generators/app_generator_test.rb commit 5190871 refs/heads/master Author: Vijay Dev Date: 2013-03-30 15:58:38 +0530 fix upgrading guide [ci skip] I see no need to list the Gemfile contents (twice!) to convey this message. M guides/source/upgrading_ruby_on_rails.md commit e63086c refs/heads/master Merge: 06e22c0 6d8c070 Author: Vijay Dev Date: 2013-03-30 15:47:38 +0530 Merge branch 'master' of github.com:rails/rails commit 6d8c070 refs/heads/master Merge: 022ed6c 6bd1bbe Author: Vijay Dev Date: 2013-03-30 15:46:14 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] commit 06e22c0 refs/heads/master Author: Vijay Dev Date: 2013-03-30 15:12:23 +0530 Revert "Using American English spellings over British style spellings" This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832. Reason: changelog edits aren't allowed in docrails. [ci skip] M activesupport/CHANGELOG.md M guides/source/upgrading_ruby_on_rails.md commit 5a0e583 refs/heads/master Author: Vipul A M Date: 2013-03-30 14:01:42 +0530 fix some typos in AS M activesupport/lib/active_support/core_ext/string/indent.rb M activesupport/test/descendants_tracker_with_autoloading_test.rb M activesupport/test/ordered_options_test.rb commit 2ff2f83 refs/heads/master Author: Anupam Choudhury Date: 2013-03-30 13:16:31 +0530 Refactored to remove unnecessary setup M actionmailer/test/asset_host_test.rb M actionmailer/test/url_test.rb commit 7be9e88 refs/heads/master Author: Takehiro Adachi Date: 2013-03-30 13:23:01 +0900 split relation_scoping_test.rb's default scoping tests into another file A activerecord/test/cases/scoping/default_scoping_test.rb M activerecord/test/cases/scoping/relation_scoping_test.rb commit e4da432 refs/heads/master Author: Takehiro Adachi Date: 2013-03-30 13:15:37 +0900 rename named_scope_test.rb to a proper file name The file name should be name_scoping_test.rb and the class should be `NamedScopingTest` according to ActiveRecord::Scoping::Name D activerecord/test/cases/scoping/named_scope_test.rb A activerecord/test/cases/scoping/named_scoping_test.rb commit 1fde758 refs/heads/master Author: Takehiro Adachi Date: 2013-03-30 13:13:18 +0900 move tests for NamedScope and DefaultScope under test/cases/scoping/ The scoping/default.rb and scoping/named.rb got moved under scoping/ in commit 2b22564c4efaa63d4bbc006762838c4025c1bdca, but the tests never did. D activerecord/test/cases/named_scope_test.rb D activerecord/test/cases/relation_scoping_test.rb A activerecord/test/cases/scoping/named_scope_test.rb A activerecord/test/cases/scoping/relation_scoping_test.rb commit ceb3b87 refs/heads/master Author: Charlie Somerville Date: 2013-03-30 14:16:46 +1100 reverts changes to Rails.version made in #8501 M railties/lib/rails.rb M railties/lib/rails/version.rb M version.rb commit 022ed6c refs/heads/master Author: Xavier Noria Date: 2013-03-30 01:03:02 +0100 adds the API home page to the gemspec, needed for doc:rails M railties/railties.gemspec commit 4ecf1f8 refs/heads/master Author: Xavier Noria Date: 2013-03-30 00:38:59 +0100 typo M railties/lib/rails/api/task.rb commit bac6928 refs/tags/v3.2.15 Author: Steve Klabnik Date: 2013-03-29 16:28:04 -0700 Add attr_accessible to the Getting Started Guide. This was brought up in #9995, but is only present in 3-2-stable, since mass assignment is removed from Rails 4. M railties/guides/source/getting_started.textile commit 2cc934a refs/heads/master Author: Xavier Noria Date: 2013-03-30 00:10:25 +0100 registers the new doc:rails behaviour in the changelog M railties/CHANGELOG.md commit 2595611 refs/heads/master Author: Xavier Noria Date: 2013-03-30 00:05:30 +0100 rdoc is no longer a gem dependency, sdoc becomes a runtime dependency M guides/code/getting_started/Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/railties.gemspec commit 84c0ac3 refs/heads/master Author: Xavier Noria Date: 2013-03-29 23:40:48 +0100 unifies API generation M Rakefile M railties/lib/rails/api/task.rb M railties/lib/rails/tasks/documentation.rake commit 3235537 refs/heads/master Author: Xavier Noria Date: 2013-03-29 21:29:52 +0100 moves RDOC_MAIN.rdoc to railties The goal of these refactors is to have the same code generating edge and doc:rails APIs, and the rails gem is not available in LOAD_PATHS because it has no lib directory. D RDOC_MAIN.rdoc A railties/RDOC_MAIN.rdoc M railties/lib/rails/api/task.rb commit 7a5aa72 refs/heads/master Author: Xavier Noria Date: 2013-03-29 21:16:12 +0100 encapsulates API generation in Rails::API::Task M .gitignore A RDOC_MAIN.rdoc M Rakefile A railties/lib/rails/api/task.rb commit ab6cdf7 refs/heads/master Author: Xavier Noria Date: 2013-03-29 13:11:47 +0100 changes the RDoc title of the API Nowadays the documentation of Ruby on Rails is more than the API. M Rakefile commit 6bd1bbe refs/heads/master Author: Jonathan Roes Date: 2013-03-29 19:53:34 -0300 More typo / wording fixes M guides/source/action_controller_overview.md commit 8fcc1be refs/heads/master Author: Jonathan Roes Date: 2013-03-29 19:43:10 -0300 Proofreading tweaks - Consistent hash structure - Rewording / typo fixes M guides/source/action_controller_overview.md commit d4dad04 refs/heads/master Author: Neeraj Singh Date: 2013-03-29 15:38:16 -0400 explain method invertible_for [ci skip] M activerecord/lib/active_record/associations/association.rb commit b22ec86 refs/heads/master Merge: 1003f5b f3cabb3 Author: Steve Klabnik Date: 2013-03-29 12:06:34 -0700 Merge pull request #9998 from neerajdotname/association-doc fixes for association doc commit f3cabb3 refs/heads/master Author: Neeraj Singh Date: 2013-03-29 15:02:54 -0400 Do not use deprecate method [ci skip] M activerecord/lib/active_record/associations/association.rb commit 6807114 refs/heads/master Author: Neeraj Singh Date: 2013-03-29 15:02:13 -0400 fix broken sentence [ci skip] M activerecord/lib/active_record/associations/association.rb commit bd674fd refs/heads/master Author: Vipul A M Date: 2013-03-29 20:58:46 +0530 change merge to merge! M activesupport/lib/active_support/callbacks.rb M activesupport/lib/active_support/hash_with_indifferent_access.rb commit 1003f5b refs/heads/master Author: Xavier Noria Date: 2013-03-29 13:27:56 +0100 removes bindir from the rails gemspec Nowadays the rails gem itself has no executables. M rails.gemspec commit 8db99d3 refs/heads/master Author: Xavier Noria Date: 2013-03-29 12:00:26 +0100 removes activerecord/examples/associations.png This seems to be a legacy file, I cannot find any place where it is used. M Rakefile D activerecord/examples/associations.png commit 0462276 refs/heads/master Merge: edebf26 9c6ccb3 Author: Vinicius Quaiato Date: 2013-03-28 23:09:22 -0700 Merge pull request #130 from crafters/master Adding info that Gemfile group :assets doesn't exists anymore commit 9c6ccb3 refs/heads/master Author: Vinicius Quaiato Date: 2013-03-29 03:04:50 -0300 info that Gemfile *group :assets* was removed Adding info that Gemfile *group :assets* was removed on upgrading_ruby_on_rails.md M guides/source/upgrading_ruby_on_rails.md commit 737f618 refs/heads/master Author: Paritosh Piplewar Date: 2013-03-29 05:29:08 +0530 improve readability M railties/CHANGELOG.md commit 178a685 refs/heads/master Merge: 33f6a4b dbb00f2 Author: Guillermo Iguaran Date: 2013-03-28 15:15:07 -0700 Merge pull request #9989 from robertomiranda/group-assets Update Gemfile since group assets doesn't exist anymore in Gemfile commit dbb00f2 refs/heads/master Author: robertomiranda Date: 2013-03-28 17:07:18 -0500 Update Gemfile since group assets doesn't exist anymore in Gemfile M guides/code/getting_started/Gemfile commit 33f6a4b refs/heads/master Merge: e2df5d0 bbaa8ab Author: Rafael Mendonça França Date: 2013-03-28 15:04:32 -0700 Merge pull request #9987 from robertomiranda/group-assets Update Bundler require in getting started application commit bbaa8ab refs/heads/master Author: robertomiranda Date: 2013-03-28 16:59:42 -0500 Update Bundler require in getting started application M guides/code/getting_started/config/application.rb commit e2df5d0 refs/heads/master Author: Guillermo Iguaran Date: 2013-03-28 16:41:18 -0500 Update the call to Bundler.require in application.rb since assets group doesn't exist anymore in Gemfile M railties/lib/rails/generators/rails/app/templates/config/application.rb commit 59d20af refs/heads/master Author: Guillermo Iguaran Date: 2013-03-28 16:35:20 -0500 Add better comments to assets gems M railties/lib/rails/generators/app_base.rb commit 274a3aa refs/heads/master Author: Trevor Turk Date: 2013-03-28 14:35:48 -0500 Allow transparent upgrading of legacy signed cookies to encrypted cookies; Automatically configure cookie-based sessions to use the best cookie jar given the app's config M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M actionpack/test/dispatch/cookies_test.rb M guides/code/getting_started/config/initializers/session_store.rb M guides/source/upgrading_ruby_on_rails.md M railties/lib/rails/application.rb M railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt M railties/test/application/middleware/session_test.rb M railties/test/generators/app_generator_test.rb commit 69c6513 refs/heads/master Merge: 0639d95 7c5e003 Author: Rafael Mendonça França Date: 2013-03-28 12:01:46 -0700 Merge pull request #9984 from ranjaykrishna/col-prob valid_type? added to super class abstract_adapter commit 7c5e003 refs/heads/master Author: Ranjay Krishna Date: 2013-03-27 00:52:26 -0400 added comments to test_invalid_type in sqlite3 adapter test and added valid_type? method to abstract_adapter.rb and removed unnecessary method from sqlite3 adapter M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 0639d95 refs/heads/master Merge: b77b95e c6605c5 Author: Carlos Antonio da Silva Date: 2013-03-28 11:29:09 -0700 Merge pull request #9982 from prathamesh-sonpatki/railite-typo Fix typo commit c6605c5 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-28 23:51:54 +0530 Fix typo M railties/test/railties/railtie_test.rb commit 9ec0cf8 refs/tags/v4.0.0.rc1 Author: Stephen Touset Date: 2013-03-28 10:17:31 -0700 Improve poor security recommendation in docs As reported in #9960, the current documentation recommends an insecure practice for key generation from a password (a single round of SHA-256). The modified documentation uses ActiveSupport::KeyGenerator to perform proper key stretching. M activesupport/lib/active_support/message_encryptor.rb commit b77b95e refs/heads/master Author: Xavier Noria Date: 2013-03-28 18:04:32 +0100 contrib guide: documents guidelines for running the test suite M guides/source/contributing_to_ruby_on_rails.md commit 3eebc14 refs/heads/master Author: Xavier Noria Date: 2013-03-28 17:52:23 +0100 contrib guide: documents how to generate a --dev application M guides/source/contributing_to_ruby_on_rails.md commit 27d12bd refs/heads/master Merge: 56edecb 77a7382 Author: Rafael Mendonça França Date: 2013-03-28 09:35:22 -0700 Merge pull request #9977 from vipulnsward/fix_column_test_typo anual_salary => annual_salary commit e06b4fa refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-03-28 13:20:07 -0300 Removing explain support warning from the Railtie This is causing a regression since the Active Record Railtie is trying to connect to the development database in the application boot. See https://github.com/rails/rails/pull/6197#issuecomment-15199273 M activerecord/CHANGELOG.md M activerecord/lib/active_record/railtie.rb commit 77a7382 refs/heads/master Author: Vipul A M Date: 2013-03-28 21:45:08 +0530 anual_salary => annual_salary M activerecord/test/cases/migration/columns_test.rb commit 56edecb refs/heads/master Merge: 9802cbe 48a80f3 Author: Steve Klabnik Date: 2013-03-28 08:36:28 -0700 Merge pull request #9974 from prathamesh-sonpatki/change_log Removed unused variable in proc [ci skip] commit a474396 refs/heads/master Author: Mike Mangino Date: 2013-03-28 11:19:01 -0400 Raise an exception when unserialization fails due to a missing class M activerecord/lib/active_record/coders/yaml_column.rb M activerecord/test/cases/coders/yaml_column_test.rb commit 48a80f3 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-28 20:43:25 +0530 Removed unused variable in proc * This unused variable is already removed from the code here. d18e8b1a3839c5c214e96c7e37e0d86febe15f99 * So removing it from CHANGELOG to be consistent with code M actionpack/CHANGELOG.md commit 9802cbe refs/heads/master Merge: 15d9711 cec0343 Author: Rafael Mendonça França Date: 2013-03-28 07:58:57 -0700 Merge pull request #9972 from divineforest/fix-overriden-typo Fix typo: overriden => overriDDen commit 15d9711 refs/heads/master Merge: 51ba66b 6943497 Author: Rafael Mendonça França Date: 2013-03-28 07:58:31 -0700 Merge pull request #9973 from prathamesh-sonpatki/AR-typos Fixed typos in ActiveRecord commit 6943497 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-28 20:25:43 +0530 Fixed typos in ActiveRecord M activerecord/test/cases/adapter_test.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/batches_test.rb commit cec0343 refs/heads/master Author: Alexander Balashov Date: 2013-03-28 18:52:14 +0400 Fix typo: overriden => overriDDen M activerecord/lib/active_record/core.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/dup_test.rb M activerecord/test/cases/relation_scoping_test.rb commit 51ba66b refs/heads/master Merge: 60e50d6 cfe92c8 Author: Rafael Mendonça França Date: 2013-03-28 07:05:41 -0700 Merge pull request #9970 from divineforest/fix-typo Fix typo commit cfe92c8 refs/heads/master Author: Alexander Balashov Date: 2013-03-28 17:45:14 +0400 Fix typo M activerecord/test/cases/batches_test.rb commit 60e50d6 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-28 09:20:16 -0300 Use snake case variable names, stick with the convention M activerecord/test/cases/persistence_test.rb commit aca15b4 refs/heads/master Merge: 011c8ee d18e8b1 Author: Carlos Antonio da Silva Date: 2013-03-28 05:14:36 -0700 Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_cases Refactored to remove unused loop variable commit 011c8ee refs/heads/master Merge: 5533994 482f8c1 Author: Carlos Antonio da Silva Date: 2013-03-28 05:14:00 -0700 Merge pull request #9963 from obrie/fix/after_create_updates Fix updates not working within after_create hooks commit 5533994 refs/heads/master Merge: 341e611 a895b40 Author: Carlos Antonio da Silva Date: 2013-03-28 05:04:53 -0700 Merge pull request #9968 from choudhuryanupam/fix_typo_n_grammar Fixed grammar commit a895b40 refs/heads/master Author: Anupam Choudhury Date: 2013-03-28 16:43:14 +0530 Fixed grammar M actionpack/lib/abstract_controller/rendering.rb commit d18e8b1 refs/heads/master Author: Anupam Choudhury Date: 2013-03-28 15:58:03 +0530 Refactored to remove unused variable M actionpack/test/abstract/layouts_test.rb M actionpack/test/controller/layout_test.rb commit 341e611 refs/heads/master Author: Xavier Noria Date: 2013-03-28 10:04:39 +0100 determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn] M activesupport/lib/active_support/testing/constant_lookup.rb M activesupport/test/testing/constant_lookup_test.rb commit 0417bc8 refs/heads/master Author: Rafael Mendonça França Date: 2013-03-28 00:36:11 -0300 Add coffee-rails and javascript runtime to gemfile if skip_javascript is provided M railties/lib/rails/generators/app_base.rb commit cf46c31 refs/heads/master Merge: 0739d14 9600e0b Author: Rafael Mendonça França Date: 2013-03-27 20:46:07 -0700 Merge pull request #9944 from where/rebased-fulltext-spacial Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL commit 9600e0b refs/heads/master Author: Ken Mazaika Date: 2013-03-27 00:30:11 -0400 Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql/schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/schema_test.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/schema/mysql2_specific_schema.rb M activerecord/test/schema/mysql_specific_schema.rb commit 99e1a4d refs/heads/master Author: Andre Arko Date: 2013-03-27 20:24:04 -0700 need to delete bin, not binstub, update wording M railties/lib/rails/app_rails_loader.rb commit b77bbab refs/heads/master Author: Andre Arko Date: 2013-03-27 20:23:13 -0700 script/rails could never be from bundler M railties/lib/rails/app_rails_loader.rb commit 0739d14 refs/heads/master Merge: 57fbcc5 a89e9f7 Author: Rafael Mendonça França Date: 2013-03-27 20:13:37 -0700 Merge pull request #9964 from where/using-schema-dump Dump the 'using' options for a SQL index into the schema. commit edebf26 refs/heads/master Author: Jonathan Roes Date: 2013-03-27 23:41:48 -0300 Minor proofing M guides/source/debugging_rails_applications.md commit a89e9f7 refs/heads/master Author: Ken Mazaika Date: 2013-03-27 22:38:53 -0400 Dump the 'using' options for a SQL index into the schema. M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/schema/schema.rb commit 057ae0b refs/heads/master Author: Jonathan Roes Date: 2013-03-27 23:30:51 -0300 Remove unnecessary hyphen. M guides/source/debugging_rails_applications.md commit d083193 refs/heads/master Author: Jonathan Roes Date: 2013-03-27 23:28:36 -0300 Extraneous syntax on guides path. M guides/source/ruby_on_rails_guides_guidelines.md commit 482f8c1 refs/heads/master Author: Aaron Pfeifer Date: 2013-03-27 22:27:47 -0400 Fix updates not working within after_create hooks M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 53d68bd refs/heads/master Author: Brian McManus Date: 2013-03-27 14:08:18 -0700 Add regression test for TZ grep Added a regression test that will fail if anyone tries to change time_zone_select to use grep again thinking it will work when it does not. M actionpack/test/template/form_options_helper_test.rb commit 1cc991b refs/heads/master Author: Brian McManus Date: 2013-03-27 14:03:49 -0700 Revert grep to select since they are not the same A previous commit swapped out a call to select for a call to grep in time_zone_options_for_select. This behavior actually causes the regexp priority option to stop working. ActiveSupport::TimeZone overrides the =~ operator which is what the select block was using previously. Enumerable#grep checks pattern === element and in this case that would be /US/ === ActiveSupport::TimeZone which does not work because ActiveSupport::TimeZone does not supply an implicit converting to_str method, only an explicit to_s method. It would be impossible to provide a to_str method that behaves identically to the =~ method provided on ActiveSupport::TimeZone so the only option is to revert back to using select with =~. M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/template/form_options_helper_test.rb commit 57fbcc5 refs/heads/master Merge: d684de4 a007800 Author: Rafael Mendonça França Date: 2013-03-27 17:43:33 -0300 Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md commit d684de4 refs/heads/master Merge: 328c292 4e35dc0 Author: Rafael Mendonça França Date: 2013-03-27 13:09:39 -0700 Merge pull request #9955 from rubys/cleanup_app_gemfile Cosmetic cleanup of generated Gemfile commit 4e35dc0 refs/heads/master Author: Sam Ruby Date: 2013-03-27 16:01:33 -0400 Remove buggy and unnecessary logic based on a discussion with @rafaelfranca M railties/lib/rails/generators/app_base.rb commit 49c4af4 refs/heads/master Author: Sam Ruby Date: 2013-03-27 15:12:26 -0400 Cosmetic cleanup of generated Gemfile - Remove obsolete/misleading comment about assets only being used production - Remove unnecessary group :assets - Eliminate blank lines if options[:skip_javascript] is not specified M railties/lib/rails/generators/app_base.rb commit 328c292 refs/heads/master Author: Rafael Mendonça França Date: 2013-03-27 16:55:48 -0300 Fix syntax error M activerecord/test/cases/named_scope_test.rb commit 7b0402f refs/heads/master Merge: e743850 72de894 Author: Rafael Mendonça França Date: 2013-03-27 16:38:54 -0300 Merge pull request #9274 from KrzysiekJ/spaces_in_scope_names Use define_method when method name contains weird characters. commit e743850 refs/heads/master Merge: 1250985 ef27bba Author: Rafael Mendonça França Date: 2013-03-27 16:09:12 -0300 Merge pull request #8458 from lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md commit 1250985 refs/heads/master Merge: 30fbbb4 3e3e81b Author: Rafael Mendonça França Date: 2013-03-27 11:28:05 -0700 Merge pull request #9954 from neerajdotname/space_after_entirely entirelyby => 'entirely by' commit 3e3e81b refs/heads/master Author: Neeraj Singh Date: 2013-03-27 14:24:27 -0400 entirelyby => 'entirely by' M activerecord/lib/active_record/relation.rb commit ef27bba refs/heads/master Author: Chris Nicola Date: 2012-12-07 15:55:54 -0800 Provides standard layout lookup behavior for method and proc cases When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method. M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/layouts.rb M actionpack/test/abstract/layouts_test.rb M actionpack/test/controller/layout_test.rb commit 30fbbb4 refs/heads/master Merge: 642ecd5 b2f7c46 Author: Rafael Mendonça França Date: 2013-03-27 08:56:04 -0700 Merge pull request #9949 from vipulnsward/drop_yaml_error_constant drop errors constant commit 642ecd5 refs/heads/master Merge: 2a05343 b0ac116 Author: Rafael Mendonça França Date: 2013-03-27 08:52:49 -0700 Merge pull request #9952 from prathamesh-sonpatki/AR-typos Fixed typos in activerecord commit b0ac116 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-27 21:14:58 +0530 Fixed typos in activerecord M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb commit b2f7c46 refs/heads/master Author: Vipul A M Date: 2013-03-27 20:22:05 +0530 drop errors constant M activerecord/lib/active_record/coders/yaml_column.rb M activerecord/lib/active_record/fixture_set/file.rb commit 2a05343 refs/heads/master Merge: 4a6059b 1a5c3f4 Author: Rafael Mendonça França Date: 2013-03-27 07:54:21 -0700 Merge pull request #9947 from senny/strong_params_doc_for_complex_forms mention strong parameters in complex forms section of the guides. commit 4a6059b refs/heads/master Merge: 22caf39 b37399a Author: Rafael Mendonça França Date: 2013-03-27 07:50:42 -0700 Merge pull request #8368 from SamSaffron/master Allow connection_handler to be overriden per-thread commit 1a5c3f4 refs/heads/master Author: Yves Senn Date: 2013-03-27 15:18:02 +0100 mention strong parameters in complex forms section of the guides. Closes #9921. M guides/source/form_helpers.md commit 22caf39 refs/heads/master Author: Rafael Mendonça França Date: 2013-03-27 10:49:15 -0300 Use thor master since 0.18.0 has a regression See https://github.com/wycats/thor/commit/08265a380d0ff3fce014e98e87bb8c2330858e4a for the discussion and https://github.com/wycats/thor/pull/316 for the fix M Gemfile commit 81b7ebf refs/heads/master Merge: c56e620 c082e3f Author: Carlos Antonio da Silva Date: 2013-03-27 05:56:27 -0700 Merge pull request #9945 from vipulnsward/drop_var_in_validations Drop variable assignment in validations commit c082e3f refs/heads/master Author: Vipul A M Date: 2013-03-27 11:09:40 +0530 drop variable assignment in validations M activerecord/lib/active_record/validations.rb commit b37399a refs/heads/master Author: Sam Saffron Date: 2013-03-27 04:28:28 -0700 Make connection_handler overridable per thread M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/test/cases/base_test.rb commit 164af1f refs/heads/master Author: sthollmann Date: 2013-03-27 10:46:19 +0100 ReCAPTCHA plug-in link now points to Github repo. Plug-in is no longer available at the previous location M guides/source/security.md commit 75d0a81 refs/tags/v3.2.15 Merge: df37c91 dee5915 Author: Carlos Antonio da Silva Date: 2013-03-26 19:43:14 -0700 Merge pull request #9943 from fredwu/test_fix_for_74e59ea Fixed test failures on 1.8.7 caused by 74e59ea commit dee5915 refs/tags/v3.2.15 Author: Fred Wu Date: 2013-03-27 11:29:37 +1100 Fixed test failures on 1.8.7 caused by 74e59ea M actionpack/lib/action_controller/test_case.rb commit df37c91 refs/tags/v3.2.15 Merge: dbd26e9 8bd56f0 Author: Rafael Mendonça França Date: 2013-03-26 15:22:05 -0700 Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable [Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly. commit 8bd56f0 refs/tags/v3.2.15 Author: Fred Wu Date: 2013-03-27 09:20:04 +1100 Added changelog for 55e2954 M activerecord/CHANGELOG.md commit 55e2954 refs/tags/v3.2.15 Author: Fred Wu Date: 2013-03-06 10:45:29 +1100 Don't reset inheritance_column when setting explicitly. This is backported from master (cdfcbc4). M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/base_test.rb commit c56e620 refs/heads/master Merge: 1707763 524ce56 Author: Rafael Mendonça França Date: 2013-03-26 13:39:03 -0700 Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_test Restore columns dropped by hstore test commit 524ce56 refs/heads/master Author: Mack Earnhardt Date: 2013-03-22 11:07:21 -0400 Combine tests and restore columns dropped by hstore testing Disabling the hstore extension during testing created order dependent test failures. M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit 1707763 refs/heads/master Merge: b6e5971 437961b Author: Rafael Mendonça França Date: 2013-03-26 11:55:12 -0700 Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_mysql respect auto_increment in rename_column for mysql commit 437961b refs/heads/master Author: Vipul A M Date: 2013-03-26 02:00:53 +0530 respect auto_increment in rename_column for mysql M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/test/cases/migration/columns_test.rb commit b6e5971 refs/heads/master Merge: 18a0d9f 231b109 Author: Rafael Mendonça França Date: 2013-03-26 11:14:19 -0700 Merge pull request #9939 from dchapman1988/master Fixing some typo(s)/grammar. commit 231b109 refs/heads/master Author: David Chapman Date: 2013-03-26 13:04:52 -0500 s/and and run/and runs/ Fixing some typos/grammar. M railties/test/application/assets_test.rb commit 18a0d9f refs/heads/master Merge: 2d33796 d2a8f7e Author: Rafael Mendonça França Date: 2013-03-26 09:32:57 -0700 Merge pull request #9937 from zolzaya/master Asia/Ulaanbaatar is incorrect mapping Fixes #9936 commit d2a8f7e refs/heads/master Author: Zolzaya Date: 2013-03-27 00:23:50 +0800 Fixed timezone mapping of Ulaanbaatar. M activesupport/lib/active_support/values/time_zone.rb commit 1595ab6 refs/heads/master Author: Carson McDonald Date: 2013-03-26 10:42:45 -0400 Fix typo M actionpack/lib/action_view/template/resolver.rb commit 2d33796 refs/heads/master Merge: 078bfbf 203e0e0 Author: Rafael Mendonça França Date: 2013-03-26 07:18:21 -0700 Merge pull request #9923 from danmcclain/psql-concurrent-indexes Adds support for concurrent indexing in PostgreSQL adapter commit 203e0e0 refs/heads/master Author: Dan McClain Date: 2013-03-25 22:41:29 -0400 Checks :algorithm argument for valid values M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb M activerecord/test/cases/adapters/postgresql/active_schema_test.rb commit 69e87f5 refs/heads/master Author: Yves Senn Date: 2013-03-26 12:19:46 +0100 routing shorthand syntax works with multiple paths Closes #9913. We need to expand the match shorthand syntax for every path. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit d5f4cac refs/heads/master Author: Yves Senn Date: 2013-03-26 12:14:21 +0100 bugfix, when matching multiple paths with `get`, `post`, ... This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 078bfbf refs/heads/master Merge: 2e68ecc 4ed4cfd Author: Santiago Pastorino Date: 2013-03-25 20:16:00 -0700 Merge pull request #9930 from kennyj/bump_tzinfo Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data. commit 2e68ecc refs/heads/master Author: Aaron Patterson Date: 2013-03-25 16:06:13 -0700 default RAILS_ENV to test if we're in a test task M railties/lib/rails/all.rb commit e199dc1 refs/heads/master Author: Dan McClain Date: 2013-03-25 13:33:37 -0400 Adds support for concurrent indexing in PostgreSQL adapter Adds support for algorithm option in MySQL indexes Moves USING and algorithm options upstream The syntax is still specific to the Adapter, so the actual executed string happens in the corresponding adapter M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb M activerecord/test/cases/adapters/postgresql/active_schema_test.rb commit 1a838cc refs/heads/master Author: Rafael Mendonça França Date: 2013-03-25 17:18:07 -0300 Fix typo M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 7e91c9a refs/heads/master Merge: be71b0e 441fa86 Author: Steve Klabnik Date: 2013-03-25 12:02:30 -0700 Merge pull request #9925 from senny/relative_guide_links use relative links inside guides [ci skip] commit be71b0e refs/heads/master Author: Rafael Mendonça França Date: 2013-03-25 16:00:16 -0300 The sql_type method called here is from ActiveRecord::ConnectionAdapters::Column See https://github.com/rails/rails/blob/28b8ca766e3e7c6c43d3ae900c99f8377153c62/activerecord/lib/active_record/connection_adapters/column.rb#L16 M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 441fa86 refs/heads/master Author: Yves Senn Date: 2013-03-25 20:00:13 +0100 use relative links inside guides [ci skip] M guides/source/2_2_release_notes.md M guides/source/engines.md M guides/source/upgrading_ruby_on_rails.md commit c28b8ca refs/heads/master Merge: fc8411a b662cb8 Author: Steve Klabnik Date: 2013-03-25 11:50:34 -0700 Merge pull request #9920 from senny/clean_up_testing_examples_for_action_mailer move mailer testing examples into the testing guide. commit b662cb8 refs/heads/master Author: Yves Senn Date: 2013-03-25 16:58:47 +0100 move mailer testing examples into the testing guide. Closes #9325. I adjusted the example and the description in the testing guide and simply linked from the mailer to the testing guide. This way we don't have to maintain two separate places. M guides/source/action_mailer_basics.md M guides/source/testing.md commit fc8411a refs/heads/master Merge: c2e2031 f8675eb Author: Rafael Mendonça França Date: 2013-03-25 11:45:31 -0700 Merge pull request #7324 from MSch/pg-geometric Add support for pg geometric datatypes point and box commit f8675eb refs/heads/master Author: Martin Schürrer Date: 2013-03-25 19:41:09 +0100 Move away from column.sql_type in untested code too M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 336b376 refs/heads/master Author: Martin Schürrer Date: 2013-01-09 18:36:03 +0100 Make Postgres point type correspond to ruby array with two floats inside M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/base_test.rb commit 4ed4cfd refs/heads/master Author: kennyj Date: 2013-03-26 01:56:42 +0900 Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data. M actionpack/actionpack.gemspec M activesupport/activesupport.gemspec commit c2e2031 refs/heads/master Author: Ranjay Krishna Date: 2013-03-07 17:57:15 -0500 Created a layer of abstraction for the valid type checking in schema dumper. Now, connection handles the check for valid types so that each database can handle the changes individually. M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 7219c5f refs/heads/master Merge: b8b3df0 d67f761 Author: Rafael Mendonça França Date: 2013-03-25 09:27:22 -0700 Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5 Skipping test for OpenSSL::PKCS5 JRuby commit b8b3df0 refs/heads/master Merge: ba012fa ec1b715 Author: Rafael Mendonça França Date: 2013-03-25 09:04:25 -0700 Merge pull request #8527 from shockone/patch-1 Add a method full_messages_for to the Errors class commit ba012fa refs/heads/master Merge: 1d45419 24fee97 Author: Rafael Mendonça França Date: 2013-03-25 08:56:29 -0700 Merge pull request #9864 from vipulnsward/fix_test_AR_v2 Introduce test on Error#full_message for attribute with underscores; Fix... commit f09bf78 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-25 21:09:46 +0530 localised => localized M guides/source/active_support_core_extensions.md commit 1d45419 refs/heads/master Merge: 3450eff 5546081 Author: Steve Klabnik Date: 2013-03-25 08:19:03 -0700 Merge pull request #9918 from prathamesh-sonpatki/railties-typos Fixed typo in railties/test commit 5546081 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-25 20:47:26 +0530 Fixed typo in railties/test M railties/test/application/asset_debugging_test.rb M railties/test/application/initializers/i18n_test.rb commit 3450eff refs/heads/master Merge: 8caafd9 d36cfa2 Author: Rafael Mendonça França Date: 2013-03-25 08:13:58 -0700 Merge pull request #9916 from neerajdotname/no-exception-when-cookie-is-tampered-with nil is retuned if cookie is tampered with [ci skip] commit d36cfa2 refs/heads/master Author: Neeraj Singh Date: 2013-03-25 09:40:57 -0400 if cookie is tampered with then nil is returned [ci skip] if the given key is not found then verifier does raise `ActiveSupport::MessageVerifier::InvalidSignature` exception but this exception is resuced and finally nil is returned. M actionpack/lib/action_dispatch/middleware/cookies.rb commit ea5daeb refs/heads/master Author: Akira Matsuda Date: 2013-03-25 22:43:26 +0900 Fix some typos M activesupport/lib/active_support/notifications/instrumenter.rb M guides/source/active_support_instrumentation.md commit e21f6c1 refs/heads/master Author: Akira Matsuda Date: 2013-03-25 21:01:40 +0900 s/Textmate/TextMate/ M guides/source/getting_started.md commit 0725007 refs/heads/master Author: Akira Matsuda Date: 2013-03-25 20:54:34 +0900 s/Github/GitHub/ M guides/source/contributing_to_ruby_on_rails.md commit d67f761 refs/heads/master Author: Arun Agrawal Date: 2013-03-22 15:37:33 +0100 Skipping test for OpenSSL::PKCS5 JRuby M actionpack/test/dispatch/cookies_test.rb commit 8caafd9 refs/heads/master Merge: 3b2a241 6a499cd Author: Xavier Noria Date: 2013-03-25 02:24:12 -0700 Merge pull request #9914 from prathamesh-sonpatki/controller-pluralize Controller name pluralized commit 6a499cd refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-25 14:40:31 +0530 Controller name pluralized M railties/test/application/assets_test.rb commit 3b2a241 refs/heads/master Author: Jeremy Kemper Date: 2013-03-25 00:01:38 -0700 Fix jquery-as-default test to account for switch from gem to github source in #9904 M railties/test/generators/app_generator_test.rb commit 32ec8eb refs/heads/master Author: Jeremy Kemper Date: 2013-03-24 23:26:11 -0700 Update tests for #9704, named route collisions * Fix named route collision in mount test fixture * Update controller named route precedence test M actionpack/test/controller/routing_test.rb M actionpack/test/dispatch/mount_test.rb commit b3e08f2 refs/heads/master Author: Jeremy Kemper Date: 2013-03-24 22:59:36 -0700 Tender love for #9909 :heart: M actionpack/CHANGELOG.md commit 15d8e79 refs/heads/master Merge: 825b91b 0190cba Author: Jeremy Kemper Date: 2013-03-24 22:57:23 -0700 Merge pull request #9909 from trevorturk/9740 Transparently upgrade signed cookies when setting secret_key_base commit 825b91b refs/heads/master Merge: 592b4b4 940da7d Author: Jeremy Kemper Date: 2013-03-24 22:55:39 -0700 Merge pull request #9881 from gkop/master Support .js.coffee views by default commit 940da7d refs/heads/master Author: Gabe Kopley Date: 2013-03-24 22:31:48 -0700 Put coffee-rails in top-level of generated Gemfile v3 of pull request based on additional feedback from @jeremy M railties/CHANGELOG.md M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit 592b4b4 refs/heads/master Merge: 558f320 2b660f1 Author: Guillermo Iguaran Date: 2013-03-24 22:24:46 -0700 Merge pull request #9912 from rwz/jbuilder-bump Relaxed jbuilder dependency and bumped version number commit 2b660f1 refs/heads/master Author: Pavel Pravosud Date: 2013-03-25 12:15:30 +0700 Relaxed jbuilder dependency and bumped version number Newer version contains some generator bugfixes M guides/code/getting_started/Gemfile commit 69c5b40 refs/heads/master Author: Rafaël Blais Masson Date: 2013-03-24 23:15:37 -0400 Remove “Sweepers” from Caching TOC and mention Page/Action caching are removed M guides/source/caching_with_rails.md commit 0190cba refs/heads/master Author: Trevor Turk Date: 2013-03-24 18:20:24 -0500 Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb M guides/source/upgrading_ruby_on_rails.md M railties/lib/rails/application.rb commit 558f320 refs/heads/master Merge: 822dd13 a240e52 Author: Jeremy Kemper Date: 2013-03-24 15:42:50 -0700 Merge pull request #9489 from obrie/fix/overridden_defaults_changed_attributes Fix ActiveRecord locking column defaults not getting persisted commit dbd26e9 refs/tags/v3.2.15 Merge: 029dd43 74e59ea Author: Jeremy Kemper Date: 2013-03-24 13:19:20 -0700 Merge pull request #9899 from macksmind/backport_5808 Backport #5808 commit 822dd13 refs/heads/master Merge: 2cc3648 1a25ebf Author: Jeremy Kemper Date: 2013-03-24 12:55:43 -0700 Merge pull request #9704 from trevorturk/warn-about-skipped-routes Raise an ArgumentError when a clashing named route is defined commit 2cc3648 refs/heads/master Merge: b78f77f 0788d35 Author: Carlos Antonio da Silva Date: 2013-03-24 11:53:34 -0700 Merge pull request #9905 from docunext/master ActiveSupport::MessageVerifier: Updated docs due to removal of serializer accessor commit 0db928a refs/heads/master Author: Vipul A M Date: 2013-03-25 00:20:25 +0530 fix some typos M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md commit b78f77f refs/heads/master Merge: d28247b 7a9a700 Author: Guillermo Iguaran Date: 2013-03-24 11:48:46 -0700 Merge pull request #9904 from rubys/jquery-rails-github Use jquery-rails from github commit 0788d35 refs/heads/master Author: Albert Lash Date: 2013-03-24 15:46:46 -0300 Updated docs due to removal of serializer accessor M activesupport/lib/active_support/message_verifier.rb commit 7a9a700 refs/heads/master Author: Sam Ruby Date: 2013-03-24 14:38:06 -0400 Use jquery-rails from github completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980 M railties/lib/rails/generators/app_base.rb commit d28247b refs/heads/master Merge: 0c7a283 7142e92 Author: Guillermo Iguaran Date: 2013-03-24 09:26:55 -0700 Merge pull request #9902 from robertomiranda/fix-release-task Fix update_version_rb task commit 0c7a283 refs/heads/master Merge: 1f1adb8 a8df5bd Author: Vijay Dev Date: 2013-03-24 06:52:56 -0700 Merge pull request #9901 from vipulnsward/fix_some_typos Fix some typos commit 7142e92 refs/heads/master Author: robertomiranda Date: 2013-03-24 08:43:10 -0500 Fix update_version_rb task M tasks/release.rb commit a8df5bd refs/heads/master Author: Vipul A M Date: 2013-03-24 19:05:41 +0530 Fix some typos M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_dispatch/middleware/remote_ip.rb M railties/test/application/configuration_test.rb M railties/test/application/initializers/load_path_test.rb M railties/test/application/middleware/cookies_test.rb commit 74e59ea refs/tags/v3.2.15 Author: Mack Earnhardt Date: 2013-03-24 07:54:55 -0400 Backport #5808 df36c5f - Fix assert_template assertion with :layout option 4bd05a7 - Fix assert_template :layout => nil assertion 0d19a08 - Improve assert_template layout checking M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb A actionpack/test/fixtures/test/hello_world_with_partial.html.erb commit 5d5ade2 refs/heads/master Author: Deshi Xiao Date: 2013-03-24 17:19:10 +0800 correct some typo in earlier commit. M guides/source/testing.md commit 11c5883 refs/heads/master Author: Deshi Xiao Date: 2013-03-24 17:16:06 +0800 correct test command's typo M guides/source/testing.md commit 64dc614 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-24 13:26:02 +0530 view/views, asset/assets M guides/source/action_view_overview.md M guides/source/getting_started.md commit ec1b715 refs/heads/master Author: shock_one Date: 2013-03-24 09:34:27 +0200 Add a method full_messages_for to the Errors class M activemodel/CHANGELOG.md M activemodel/lib/active_model/errors.rb M activemodel/test/cases/errors_test.rb commit 9a5d428 refs/heads/master Author: Akira Matsuda Date: 2013-03-24 15:59:33 +0900 s/app\/model\//app\/models\//g M guides/source/command_line.md M guides/source/migrations.md commit 1f1adb8 refs/heads/master Author: Guillermo Iguaran Date: 2013-03-24 00:41:13 -0500 Fix test: ActiveSupport.version is returning now a Gem::Version instead of a String M railties/test/rails_info_test.rb commit 6f3f0f8 refs/heads/master Author: Guillermo Iguaran Date: 2013-03-23 23:52:37 -0500 Use jquery-rails from github (fix Gem::Version error) M Gemfile commit abcdafe refs/heads/master Author: Guillermo Iguaran Date: 2013-03-23 23:19:28 -0500 Ignore all pkg folders (including also top level one) M .gitignore commit a2bb672 refs/heads/master Author: Chao Ren Date: 2013-03-23 20:57:14 -0700 Typo: Migration class name would use plural M guides/source/association_basics.md commit c3e2f3d refs/heads/master Merge: e600384 9c940e5 Author: Rafael Mendonça França Date: 2013-03-23 20:35:58 -0700 Merge pull request #9897 from robertomiranda/ignore-pkg-folders Ignore pkg folders commit 9c940e5 refs/heads/master Author: robertomiranda Date: 2013-03-23 22:31:55 -0500 Ignore pkg folders M .gitignore commit e600384 refs/heads/master Merge: e96fa89 8f05fee Author: Rafael Mendonça França Date: 2013-03-23 18:51:16 -0700 Merge pull request #8501 from charliesome/version-to-s Add #to_s method to VERSION modules commit 8f05fee refs/heads/master Author: Charlie Somerville Date: 2013-03-24 12:43:31 +1100 add changelog entry M railties/CHANGELOG.md commit 0c96169 refs/tags/v3.2.15 Author: Jon Rowe Date: 2013-03-24 12:32:11 +1300 test case to assert that associations do not overwrite after create, fixes #9310 M activerecord/test/cases/autosave_association_test.rb commit e96fa89 refs/heads/master Merge: 31388fa 2c93048 Author: Rafael Mendonça França Date: 2013-03-23 19:06:01 -0300 Merge branch 'jlxw-patch-2' Closes #9184 commit 2c93048 refs/heads/master Author: jlxw Date: 2013-02-05 16:49:33 +0800 Fix regex to strip quotations from hstore values Previously regex did not strip quotation marks where hstore values were multi-line strings. M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit 31388fa refs/heads/master Merge: 8641467 8094156 Author: Rafael Mendonça França Date: 2013-03-23 14:37:16 -0700 Merge pull request #9891 from doabit/additional_index_support Custom index type support with :using. Closes #9451 commit 8094156 refs/heads/master Author: doabit Date: 2013-03-24 05:09:54 +0800 Custom index type support with :using. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/adapters/mysql/schema_test.rb M activerecord/test/cases/adapters/mysql2/active_schema_test.rb M activerecord/test/cases/adapters/mysql2/schema_test.rb M activerecord/test/cases/adapters/postgresql/active_schema_test.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb commit 8641467 refs/heads/master Merge: 93c498b ba7c9d7 Author: Rafael Mendonça França Date: 2013-03-23 14:01:57 -0700 Merge pull request #9890 from prathamesh-sonpatki/CL-Typos activemodel/CHANGELOG typo and change in test description commit ba7c9d7 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-24 02:26:06 +0530 Changed 'args' to 'arguments' in test description M actionpack/test/abstract/callbacks_test.rb M actionpack/test/abstract/collector_test.rb commit 5f59317 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-24 02:25:22 +0530 Fixed typo in activemodel/CHANGELOG M activemodel/CHANGELOG.md commit 33d1e37 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-24 02:14:21 +0530 Reverted change in activemodel/CHANGELOG.md introduced by d45145acdc576e46a1f1719d69bec96b5bf07b0a M activemodel/CHANGELOG.md commit 93c498b refs/heads/master Author: Rafael Mendonça França Date: 2013-03-23 17:36:55 -0300 Better styles for the CSS [ci skip] M guides/code/getting_started/public/404.html M guides/code/getting_started/public/422.html M guides/code/getting_started/public/500.html M railties/lib/rails/generators/rails/app/templates/public/404.html M railties/lib/rails/generators/rails/app/templates/public/422.html M railties/lib/rails/generators/rails/app/templates/public/500.html commit 49760c1 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-24 01:53:01 +0530 Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0a M actionpack/test/abstract/callbacks_test.rb M actionpack/test/abstract/collector_test.rb commit bad0b81 refs/heads/master Merge: 9e8b7d9 36a4523 Author: Rafael Mendonça França Date: 2013-03-23 13:04:09 -0700 Merge pull request #9889 from neerajdotname/unscoped Unscoped works with other named scope even without block form commit 36a4523 refs/heads/master Author: Neeraj Singh Date: 2013-03-23 14:57:07 -0400 enhance unscoped tests Make it obvious that using unscoped with another scope without the block works M activerecord/test/cases/relation_scoping_test.rb commit d45145a refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-24 00:34:06 +0530 Changed 'args' to 'arguments' when used in places other than code with fixing few more typos M actionpack/test/abstract/callbacks_test.rb M actionpack/test/abstract/collector_test.rb M activemodel/CHANGELOG.md M guides/source/active_support_instrumentation.md M guides/source/command_line.md commit a1a2951 refs/heads/master Author: Neeraj Singh Date: 2013-03-23 14:58:21 -0400 unscoped works with named scope [ci skip] Update comment to reflect that unscoped works with named scope even when named scope is using without block form M activerecord/lib/active_record/scoping/default.rb commit 9e8b7d9 refs/heads/master Author: Rafael Mendonça França Date: 2013-03-23 15:38:11 -0300 Fix documentation markup [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 4e363b1 refs/heads/master Author: Rafael Mendonça França Date: 2013-03-23 15:09:53 -0300 Review some CHANGELOG entries [ci skip] M activerecord/CHANGELOG.md commit 727e286 refs/heads/master Merge: 6ff36de 3650edf Author: Rafael Mendonça França Date: 2013-03-23 10:27:17 -0700 Merge pull request #9880 from wangjohn/refactoring_attribute_assignment Refactoring validate_missing_parameters to validate_required_parameters. commit 6ff36de refs/heads/master Author: Rafael Mendonça França Date: 2013-03-23 13:54:20 -0300 Autoload the AlterTable class M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 246dc17 refs/heads/master Merge: dd271ff 3cfbee6 Author: Rafael Mendonça França Date: 2013-03-23 09:29:36 -0700 Merge pull request #9888 from zzak/patch-1 Don't use hash fragment for travis link commit 3cfbee6 refs/heads/master Author: Zachary Scott Date: 2013-03-23 13:15:25 -0300 Don't use hash fragment for travis link M RELEASING_RAILS.rdoc commit dd271ff refs/heads/master Merge: 7a872e9 d543394 Author: Rafael Mendonça França Date: 2013-03-23 08:42:40 -0700 Merge pull request #9883 from prathamesh-sonpatki/AR-Typos Fixed typos in activerecord CHANGELOG commit d543394 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-23 20:54:11 +0530 Spelling 'PostgreSQL' correctly M activerecord/CHANGELOG.md commit 14ce0c6 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-23 16:23:58 +0530 Fixed typos in activerecord CHANGELOG M activerecord/CHANGELOG.md commit 3650edf refs/heads/master Author: wangjohn Date: 2013-03-23 01:10:50 -0400 Refactoring validate_missing_parameters to validate_required_parameters. M activerecord/lib/active_record/attribute_assignment.rb commit 12cecdd refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-23 09:40:32 +0530 Fixed typo : contraints -> constraints M activerecord/test/cases/adapter_test.rb commit 7a872e9 refs/heads/master Merge: db3a6e6 bc8ebef Author: Aaron Patterson Date: 2013-03-22 19:41:29 -0700 Merge branch 'schema' * schema: add uuid primary key support separate primary key from column type push the mysql add_column up to the abstract adapter allow multiple add columns pull add_column_options! off the pg connection class add a pg visitor for dealing with schema modification push alter table add column sql in to the schema modification visitor there is no reason to check for an already defined column push column initialization down to the factory method @columns list is no longer necessary keep ivars private, do not manipulate them outside their owner object factory methods should not alter object state push SQL generation inside the schema creation object mostly decouple TableDefinition from the database connection remove to_sql from TableDefinition decouple column definition from the database connection stop depending on sql_type in pg remove knowledge of SQL from the column definition object commit db3a6e6 refs/heads/master Author: Aaron Patterson Date: 2013-03-22 19:41:13 -0700 squelch an unused variable warning M activerecord/test/cases/counter_cache_test.rb commit bc8ebef refs/heads/master Author: Aaron Patterson Date: 2013-03-22 19:30:24 -0700 add uuid primary key support M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/uuid_test.rb commit d25e407 refs/heads/master Author: Aaron Patterson Date: 2013-03-22 19:24:30 -0700 separate primary key from column type M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 2ac300b refs/heads/master Author: Aaron Patterson Date: 2013-03-16 17:04:04 -0700 push the mysql add_column up to the abstract adapter M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 739a720 refs/heads/master Author: Aaron Patterson Date: 2013-03-16 16:41:14 -0700 allow multiple add columns M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 072dbbf refs/heads/master Author: Aaron Patterson Date: 2013-03-16 16:19:48 -0700 pull add_column_options! off the pg connection class M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 6b7fdf3 refs/heads/master Author: Aaron Patterson Date: 2013-03-16 16:17:12 -0700 add a pg visitor for dealing with schema modification M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit f20b2f4 refs/heads/master Author: Aaron Patterson Date: 2013-03-16 16:01:03 -0700 push alter table add column sql in to the schema modification visitor M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit f84cf41 refs/heads/master Author: Aaron Patterson Date: 2013-03-16 15:17:32 -0700 there is no reason to check for an already defined column M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit d43edf6 refs/heads/master Author: Aaron Patterson Date: 2013-03-16 15:17:05 -0700 push column initialization down to the factory method M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit b8a533d refs/heads/master Author: Aaron Patterson Date: 2013-03-16 15:08:49 -0700 @columns list is no longer necessary M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit c5e03e8 refs/heads/master Author: Aaron Patterson Date: 2013-03-16 15:08:41 -0700 keep ivars private, do not manipulate them outside their owner object M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit a724096 refs/heads/master Author: Aaron Patterson Date: 2013-03-16 14:51:52 -0700 factory methods should not alter object state M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 14d7dc0 refs/heads/master Author: Aaron Patterson Date: 2013-03-15 20:20:35 -0700 push SQL generation inside the schema creation object M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit a80bcc3 refs/heads/master Author: Aaron Patterson Date: 2013-03-15 19:49:13 -0700 mostly decouple TableDefinition from the database connection M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 1c9f7fa refs/heads/master Author: Aaron Patterson Date: 2013-03-15 19:37:44 -0700 remove to_sql from TableDefinition M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit cd07f19 refs/heads/master Author: Aaron Patterson Date: 2013-03-15 19:34:20 -0700 decouple column definition from the database connection M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/column_definition_test.rb commit 4b4c8bd refs/heads/master Author: Aaron Patterson Date: 2013-03-15 19:29:23 -0700 stop depending on sql_type in pg M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit 69ef76a refs/heads/master Author: Aaron Patterson Date: 2013-03-15 19:22:07 -0700 remove knowledge of SQL from the column definition object M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/test/cases/column_definition_test.rb commit a03ab8c refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-22 14:00:06 -0300 Remove exception variable from rescue block Just raising from the rescue block will re-raise the exception, so the variable is not necessary. M activemodel/lib/active_model/secure_password.rb commit d24fb61 refs/heads/master Merge: 39c26bc ae41ca8 Author: Carlos Antonio da Silva Date: 2013-03-22 07:57:31 -0700 Merge pull request #9866 from choudhuryanupam/fix_connection_test Removed unused loop variable commit 39c26bc refs/heads/master Merge: f34c226 c989073 Author: Carlos Antonio da Silva Date: 2013-03-22 07:51:11 -0700 Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_test Removed unnecessary block commit f34c226 refs/heads/master Merge: c91789c 28afe45 Author: Guillermo Iguaran Date: 2013-03-22 07:44:25 -0700 Merge pull request #9871 from arunagw/stringio-require-jruby StringIO is not required by default in JRuby commit c91789c refs/heads/master Author: Jon Leighton Date: 2013-03-22 14:24:36 +0000 Don't kill the console Use the "quit" command instead. This seems to prevents some weirdness on OS X. See #9761. M railties/test/application/console_test.rb commit 029dd43 refs/tags/v3.2.15 Merge: ae2baab 845cc5c Author: Jon Leighton Date: 2013-03-22 07:25:24 -0700 Merge pull request #9873 from senny/use_old_hash_syntax use ruby 1.8 Hash syntax [ci skip] commit d8d6dad refs/heads/master Merge: a1d0b8c 22a819a Author: Jon Leighton Date: 2013-03-22 07:24:51 -0700 Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_reset test-case to prevent resetting associations when preloading twice. commit 845cc5c refs/tags/v3.2.15 Author: Yves Senn Date: 2013-03-22 15:23:57 +0100 use ruby 1.8 Hash syntax [ci skip] M activerecord/test/cases/associations/eager_test.rb commit 22a819a refs/heads/master Author: Yves Senn Date: 2013-03-22 15:18:18 +0100 test-case to prevent resetting associations when preloading twice. Conflicts: activerecord/lib/active_record/associations/preloader/through_association.rb activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/associations/eager_test.rb commit 28afe45 refs/heads/master Author: Arun Agrawal Date: 2013-03-22 15:16:02 +0100 StringIO is not required by default in JRuby M actionpack/lib/action_controller/metal/strong_parameters.rb commit ae2baab refs/tags/v3.2.15 Merge: 69599b6 c8edd4f Author: Jon Leighton Date: 2013-03-22 07:14:17 -0700 Merge pull request #9870 from senny/9806_eager_loading_regression do not reset associations when preloading twice. commit a1d0b8c refs/heads/master Merge: 7748d64 89828a4 Author: Jon Leighton Date: 2013-03-22 07:13:10 -0700 Merge pull request #9707 from route/updates_another_record When strong_parameters had been included, this case of update became possible commit c8edd4f refs/tags/v3.2.15 Author: Yves Senn Date: 2013-03-22 15:02:49 +0100 do not reset associations when preloading twice. Closes #9806. As the `through_options` always contained `{:order=>nil}` the second time, the preloader ran, the association was always reset. This patch only adds the `:order` to the `through_options` if it is set. M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/test/cases/associations/eager_test.rb commit 89828a4 refs/heads/master Author: Dmitry Vorotilin Date: 2013-03-14 01:19:27 +0400 When we pass id to update_attributes it will try to set new id for that record M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 5be6122 refs/heads/master Author: Ken Collins Date: 2013-03-22 10:27:41 -0300 Add minitest-spec-rails to guide's testing options M guides/source/testing.md commit c989073 refs/heads/master Author: Anupam Choudhury Date: 2013-03-22 18:14:46 +0530 Removed unnecessary block M activerecord/test/cases/adapters/mysql2/active_schema_test.rb commit 6645dc3 refs/heads/master Author: Carson McDonald Date: 2013-03-22 08:41:38 -0400 Fix typo [ci skip] M activerecord/lib/active_record/relation/query_methods.rb commit 7748d64 refs/heads/master Author: Jon Leighton Date: 2013-03-22 12:04:29 +0000 Send SIGTERM, not SIGQUIT. SIGTERM is the correct signal for a graceful exit. This will hopefully resolve #9761. M railties/test/application/console_test.rb commit 79c02e8 refs/heads/master Author: Jon Leighton Date: 2013-03-22 11:55:17 +0000 Delete failing test I don't think this is testing anything useful, and the test code is exceedingly brittle. It is broken since 34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes assumptions about the implementation of PostgreSQLAdapter#active? which are incorrect after the commit. I could fix this test but it would be even more brittle (by stubbing the underlying @connection.connect_poll) and it doesn't test any complex logic. I conclude that it's not worth it. M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 24fee97 refs/heads/master Author: Vipul A M Date: 2013-03-22 10:00:17 +0530 Add Error#full_message test; Fix typos Introduce test on Error#full_message for attribute with underscores; Fix some typos M activemodel/test/cases/errors_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/nested_attributes_test.rb commit ae41ca8 refs/heads/master Author: Anupam Choudhury Date: 2013-03-22 14:21:46 +0530 Removed unused loop variable M activerecord/test/cases/adapters/mysql/connection_test.rb commit 18f9d46 refs/heads/master Author: Carlos Puchol Date: 2013-03-22 00:56:39 -0700 fix the initializer block example and clarify clarify that the contents of the block is expected to return a string. the previous example executed puts and the initializer got nothing. also, made it consistent with the single-line example to be more clear as to what's going on M guides/source/generators.md commit 0d3cb00 refs/heads/master Merge: a7391f5 7e07b7b Author: Guillermo Iguaran Date: 2013-03-21 21:04:07 -0700 Merge pull request #9863 from robertomiranda/require-bcrypt-ruby Change Standard error when is required bcrypt-ruby and fails commit 7e07b7b refs/heads/master Author: robertomiranda Date: 2013-03-21 22:51:08 -0500 Change Standard error when is required bcrypt-ruby and fails M activemodel/lib/active_model/secure_password.rb commit a7391f5 refs/heads/master Merge: ecfdc84 018fc5f Author: Jeremy Kemper Date: 2013-03-21 16:42:37 -0700 Merge pull request #9861 from pivotalcommon/master Allow fixture_path to be a Pathname commit 018fc5f refs/heads/master Author: Alexander Murmann and Can Berk Güder Date: 2013-03-21 14:10:44 -0700 Allows setting fixture_path to a Pathname M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/fixtures_test.rb commit ea2336b refs/heads/master Author: Josh Goebel Date: 2013-03-21 14:23:46 -0400 failure to parse params should trigger a 400 Bad Request M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/test/dispatch/show_exceptions_test.rb A actionpack/test/fixtures/public/400.html commit ecfdc84 refs/heads/master Merge: 34d9aed 53b76c1 Author: Rafael Mendonça França Date: 2013-03-21 09:08:37 -0700 Merge pull request #9853 from wangjohn/adding_bang_to_raise_method Adding a bang to method name of raise_on_type_mismatch. commit 6f9baae refs/heads/master Author: ma2gedev Date: 2013-03-22 00:52:37 +0900 Remove duplicated accepts_nested_attributes description there are just the same description about accepts_nested_attributes [ci skip] M actionpack/lib/action_view/helpers/form_helper.rb commit 53b76c1 refs/heads/master Author: wangjohn Date: 2013-03-21 11:56:02 -0400 Adding a bang to method name of raise_on_type_mismatch. M activerecord/lib/active_record/associations/association.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/associations/collection_association.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/associations/has_one_association.rb commit 573df1c refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-21 20:41:45 +0530 Using American English spellings over British style spellings M activesupport/CHANGELOG.md M guides/source/upgrading_ruby_on_rails.md commit b9b8b24 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-21 20:37:09 +0530 Added link to Turbolinks Railscast M guides/source/working_with_javascript_in_rails.md commit 34d9aed refs/heads/master Merge: b1b9de3 9c025ab Author: Carlos Antonio da Silva Date: 2013-03-21 05:37:48 -0700 Merge pull request #9836 from Intrepidd/tidy-require Tidying up some require and removing overhead caused by sorting commit 69599b6 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-03-21 09:33:00 -0300 Fix test to Ruby 1.8 Pathname doesn't respond to to_path M actionpack/test/template/sprockets_helper_test.rb commit b1b9de3 refs/heads/master Merge: 70d0537 5b673f3 Author: Rafael Mendonça França Date: 2013-03-21 05:30:25 -0700 Merge pull request #9847 from vipulnsward/fix_sqlite_test Fix copy table index test; Change == to ! on false in travis.rb commit afe5880 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-03-21 09:16:48 -0300 Improve CHANGELOG entry [ci skip] M actionpack/CHANGELOG.md commit f0e6ab5 refs/heads/master Author: Charlie Somerville Date: 2013-03-20 20:48:58 +1100 remove references to *::VERSION, replace with *.version M Rakefile M railties/lib/rails.rb M railties/lib/rails/commands/application.rb M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec M railties/lib/rails/generators/rails/plugin_new/templates/Gemfile M railties/lib/rails/info.rb M railties/test/generators/plugin_new_generator_test.rb M railties/test/rails_info_test.rb commit c07e151 refs/heads/master Author: Charlie Somerville Date: 2013-03-20 20:42:05 +1100 Add version method to top level modules M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 5b673f3 refs/heads/master Author: Vipul A M Date: 2013-03-21 10:57:52 +0530 Fix copy table index test; Change == to ! on false in travis.rb M activerecord/test/cases/adapters/sqlite3/copy_table_test.rb M ci/travis.rb commit c6fd1fc refs/heads/master Author: Andre Arko Date: 2013-03-20 17:16:25 -0700 rails commands even if bin/rails is a gem stub M railties/lib/rails/app_rails_loader.rb commit d1577cf refs/tags/v3.2.15 Merge: 38d0647 2c8f349 Author: Aaron Patterson Date: 2013-03-20 16:41:01 -0700 Merge branch '3-2-stable' into fredwu-slow_view_loading_fix * 3-2-stable: Merge pull request #9802 from newsline/fix-broken-action-missing Remove bad changelog entry from AR [ci skip] Wrong exception is occured when raising no translatable exception Don't crash exception translation w/ nil result attribute. Conflicts: actionpack/CHANGELOG.md commit 70d0537 refs/heads/master Merge: 066907d 66679c8 Author: Jeremy Kemper Date: 2013-03-20 15:51:30 -0700 Merge pull request #7706 from iangreenleaf/multiple_counter_caches Update other counter caches on destroy commit 38d0647 refs/tags/v3.2.15 Author: Fred Wu Date: 2013-03-21 09:26:07 +1100 Added changelog for 687e68d M actionpack/CHANGELOG.md commit 2c8f349 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-03-20 18:14:41 -0300 Merge pull request #9802 from newsline/fix-broken-action-missing Fix missing action_missing Conflicts: actionpack/CHANGELOG.md Conflicts: actionpack/test/controller/base_test.rb Fixes #9799 M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/hide_actions.rb M actionpack/test/controller/base_test.rb commit 066907d refs/heads/master Merge: f73c52c 0dfa6cb Author: Rafael Mendonça França Date: 2013-03-20 18:14:41 -0300 Merge pull request #9802 from newsline/fix-broken-action-missing Fix missing action_missing Conflicts: actionpack/CHANGELOG.md commit f73c52c refs/heads/master Merge: 34c7e73 2e5f49d Author: Guillermo Iguaran Date: 2013-03-20 13:56:01 -0700 Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets Don't generate a scaffold.css when --no-assets is specified commit 66679c8 refs/heads/master Author: Ian Young Date: 2012-09-17 14:57:13 -0700 Update other counter caches on destroy M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/counter_cache_test.rb M activerecord/test/fixtures/dog_lovers.yml M activerecord/test/fixtures/dogs.yml M activerecord/test/models/dog.rb M activerecord/test/models/dog_lover.rb M activerecord/test/schema/schema.rb commit 2e5f49d refs/heads/master Author: Kevin Glowacz Date: 2013-03-20 15:09:15 -0500 Don't generate a scaffold.css if no-assets M railties/CHANGELOG.md M railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb M railties/test/generators/scaffold_generator_test.rb commit 9c025ab refs/heads/master Author: Intrepidd Date: 2013-03-20 18:24:48 +0000 Tidying up some require : removing useless sort and homogenizing with the rest of the code the wat the includes are done M activemodel/lib/active_model/validations.rb M activesupport/lib/active_support/core_ext.rb commit 34c7e73 refs/heads/master Author: Aaron Patterson Date: 2013-03-20 11:21:13 -0700 use `connect_poll` on pg so that reaping does not hurt the connection M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 7150a9d refs/heads/master Author: Aaron Patterson Date: 2013-03-20 11:20:09 -0700 Revert "default the reaping frequency to 10 seconds" mysql can't handle a parallel thread pinging the connection, so we can get wrong results or segvs This reverts commit 7cc588b684f6d1af3e7fab1edfa6715e269e41a2. M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit 1a25ebf refs/heads/master Author: Trevor Turk Date: 2013-03-20 12:48:35 -0500 Tweak exception message to avoid giving potentially misleading suggestions M actionpack/lib/action_dispatch/routing/route_set.rb commit acb78c2 refs/heads/master Merge: 9d8ac71 5f7c351 Author: Carlos Antonio da Silva Date: 2013-03-20 08:36:59 -0700 Merge pull request #9833 from choudhuryanupam/fix_active_schema_test Removed unnecessary block commit 5f7c351 refs/heads/master Author: Anupam Choudhury Date: 2013-03-20 21:02:21 +0530 Removed unnecessary block M activerecord/test/cases/adapters/mysql/active_schema_test.rb commit 7e8a74d refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-20 12:09:55 -0300 Remove bad changelog entry from AR [ci skip] Introduced in dc2bc388bc8c6c345337052bf0d60f5243d899d4. M activerecord/CHANGELOG.md commit 9d8ac71 refs/heads/master Author: Anupam Choudhury Date: 2013-03-20 13:28:50 +0530 Properly named variable inside block Closes #9824. M activerecord/lib/active_record/associations/collection_association.rb commit dc2bc38 refs/tags/v3.2.15 Author: kennyj Date: 2013-03-01 01:55:20 +0900 Wrong exception is occured when raising no translatable exception Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit be913c3 refs/tags/v3.2.15 Author: Steve Jorgensen Date: 2012-05-21 09:50:29 -0700 Don't crash exception translation w/ nil result attribute. Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit c81dc8e refs/heads/master Merge: eda3908 abd89f9 Author: Vijay Dev Date: 2013-03-20 01:11:57 -0700 Merge pull request #9821 from vipulnsward/fix_typos_in_AR Fix some typos in AR- CHANGELOG, tests, method doc. fixed commit eda3908 refs/heads/master Merge: e61cdf0 b0f7278 Author: Vijay Dev Date: 2013-03-20 01:10:19 -0700 Merge pull request #9825 from rShetty/patch-1 Fix a typo commit b0f7278 refs/heads/master Author: Rajeev N Bharshetty Date: 2013-03-20 13:37:02 +0530 Fix a typo M activerecord/CHANGELOG.md commit 0dfa6cb refs/heads/master Author: Janko Luin Date: 2013-03-19 12:55:26 +0100 Fix broken ActionController#action_missing A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/hide_actions.rb M actionpack/test/controller/base_test.rb commit abd89f9 refs/heads/master Author: Vipul A M Date: 2013-03-20 11:17:01 +0530 Fix some typos in AR- CHANGELOG, tests, method doc. fixed M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/join_model_test.rb M activerecord/test/cases/callbacks_test.rb commit 687e68d refs/tags/v3.2.15 Author: Fred Wu Date: 2013-03-20 16:13:30 +1100 Fixed assets loading performance in 3.2.13 The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten. Fixes #9803 M actionpack/lib/sprockets/helpers/rails_helper.rb M actionpack/test/template/sprockets_helper_test.rb commit a2b7c0e refs/heads/master Author: Trevor Turk Date: 2013-03-19 23:23:55 -0500 Raise an ArgumentError when a clashing named route is defined M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb M guides/source/upgrading_ruby_on_rails.md commit e61cdf0 refs/heads/master Merge: 148b2c5 7952eaf Author: Carlos Antonio da Silva Date: 2013-03-19 19:55:57 -0700 Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_version Changed the call to .sort.last to .max when computing the migration version commit 148b2c5 refs/heads/master Merge: 730f725 9a62711 Author: Carlos Antonio da Silva Date: 2013-03-19 19:54:46 -0700 Merge pull request #9817 from knewter/fix-test-case-name-typo-in-ar Commas aren't comas. commit 9a62711 refs/heads/master Author: Josh Adams Date: 2013-03-19 21:12:44 -0500 Commas aren't comas. Type a fixo. M activerecord/test/cases/base_test.rb commit 7952eaf refs/heads/master Author: wangjohn Date: 2013-03-19 22:09:17 -0400 Changed the call to .sort.last to .max when computing the migration version. You do not actually need to sort everything (incurs more cost than just a simple max). M activerecord/lib/active_record/migration.rb commit 730f725 refs/heads/master Merge: bdf1a2e 334549b Author: Andrew White Date: 2013-03-19 18:48:49 -0700 Merge pull request #9794 from schneems/schneems/email-host Fix improperly configured host in generated urls commit bdf1a2e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-19 20:46:42 -0300 Remove mentions of "app" from http request docs [ci skip] M actionpack/lib/action_dispatch/http/request.rb commit c08e6e0 refs/heads/master Merge: 0fe4ae9 acd5255 Author: Guillermo Iguaran Date: 2013-03-19 15:40:18 -0700 Merge pull request #9816 from sebasoga/strong_parameters_guide_fix Fix guides error on error class name commit acd5255 refs/heads/master Author: Sebastian Sogamoso Date: 2013-03-19 17:38:01 -0500 Fix guides error on error class name The error that's raised in case the required key is missing it's actually `ActionController::ParameterMissing` not `ActionController::MissingParameter`. It's important to fix so that people reading the guides knows what error to rescue from when needed. M guides/source/action_controller_overview.md commit 5dfaf8b refs/heads/master Author: Ryan Sandridge Date: 2013-03-19 18:05:44 -0400 Update documentation for Where chained modifiers. where.like and where.not_like were removed in 8d02afeaee, but the guide was not updated. M guides/source/active_record_querying.md commit 0fe4ae9 refs/heads/master Merge: 67a2c73 840ca09 Author: Jeremy Kemper Date: 2013-03-19 14:00:04 -0700 Merge pull request #9529 from wangjohn/find_on_inverse_of_bugfix_9470 Find() on an association with an inverse will now scan existing in-memory records commit 517060a refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-19 17:57:22 -0300 Be consistent with quotes in smtp example guide [ci skip] M railties/guides/source/action_mailer_basics.textile commit 67a2c73 refs/heads/master Merge: a6c5ee3 ca9fc5a Author: Jeremy Kemper Date: 2013-03-19 13:48:27 -0700 Merge pull request #9807 from vipulnsward/remove_unused_payloads remove unused payloads in blocks in caching instrumentation commit 840ca09 refs/heads/master Author: wangjohn Date: 2013-03-19 16:33:49 -0400 Calling find() on an association with an inverse will now check to see if the association already holds that record in memory before checking the database for the specified ids. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/inverse_associations_test.rb commit 9263570 refs/heads/master Author: Vipul A M Date: 2013-03-20 01:50:53 +0530 fix introduced `:` ; fix another typo M guides/source/active_support_instrumentation.md M guides/source/form_helpers.md commit 61cd377 refs/heads/master Author: Steve Klabnik Date: 2013-03-19 13:04:02 -0700 Undo bad change in cf0931166be13dbbe660 I didn't know that this was about RDoc! M actionpack/lib/action_dispatch/middleware/cookies.rb commit 428ff5a refs/heads/master Author: Vipul A M Date: 2013-03-20 01:23:34 +0530 more typos in guides M guides/source/asset_pipeline.md M guides/source/form_helpers.md commit a6c5ee3 refs/heads/master Merge: a46cda1 a3d7f2c Author: Rafael Mendonça França Date: 2013-03-19 12:17:52 -0700 Merge pull request #9811 from neerajdotname/fix-secret-token-sentence fix sentence [ci skip] commit a3d7f2c refs/heads/master Author: Neeraj Singh Date: 2013-03-19 15:13:24 -0400 fix sentence [ci skip] M railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt commit cf09311 refs/heads/master Author: Prathamesh Sonpatki Date: 2013-03-19 23:10:54 +0530 Fixed small typos M actionpack/lib/action_dispatch/http/upload.rb M actionpack/lib/action_dispatch/middleware/cookies.rb commit 334549b refs/heads/master Author: schneems Date: 2013-03-18 16:09:15 -0500 Fix improperly configured host in generated urls If the host in `default_url_options` is accidentally set with a protocol such as ``` host: "http://example.com" ``` then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention. This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host. I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted. This is based off of work in #7415 cc/ @pixeltrix ATP Action Mailer and Action Pack M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/url_generation_test.rb commit ca9fc5a refs/heads/master Author: Vipul A M Date: 2013-03-19 22:09:47 +0530 remove unused payloads in blocks in caching instrumentation M activesupport/lib/active_support/cache.rb commit a46cda1 refs/heads/master Merge: 7d659ae 3ee30ca Author: Aaron Patterson Date: 2013-03-19 09:27:28 -0700 Merge pull request #9363 from wangjohn/fix_repair_validations Fixed the repair_validations helper method. commit 3ee30ca refs/heads/master Author: wangjohn Date: 2013-02-21 13:40:48 -0500 The repair_validations helper was not working correctly before because it only cleared the validations that created :validate callbacks. This didn't include the validates created by validates_with, so I've added a method to clear all validations. M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations.rb M activerecord/test/cases/validations_repair_helper.rb commit 2011cc6 refs/tags/v3.2.15 Merge: 493c10e ca6a12d Author: Rafael Mendonça França Date: 2013-03-19 09:21:01 -0700 Merge pull request #9796 from dembskoi/clone_structure Reset postgreSQL search path in db:test:clone_structure. commit ca6a12d refs/tags/v3.2.15 Author: Alexander Date: 2013-03-19 19:34:56 +0400 Reset postgreSQL search path in db:test:clone_structure. This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945 M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake commit 493c10e refs/tags/v3.2.15 Merge: 2cf38ae 1b12d08 Author: Rafael Mendonça França Date: 2013-03-19 07:59:15 -0700 Merge pull request #9804 from samsonasu/backport_number_to_human_fixes Backport #9347 to rails 3.2 commit 1b12d08 refs/tags/v3.2.15 Author: hoffm Date: 2013-02-20 16:15:59 -0500 Backport #9347 to rails 3.2 M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/number_helper.rb M actionpack/test/template/number_helper_test.rb commit 7d659ae refs/heads/master Merge: 66ac0c5 445bc3a Author: Santiago Pastorino Date: 2013-03-19 05:17:41 -0700 Merge pull request #9800 from kennyj/fix_warning_20130319 Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' commit 445bc3a refs/heads/master Author: kennyj Date: 2013-03-19 20:52:20 +0900 Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' M activesupport/test/xml_mini/jdom_engine_test.rb commit 66ac0c5 refs/heads/master Merge: f0d5e32 6893c23 Author: Steve Klabnik Date: 2013-03-18 22:34:02 -0700 Merge pull request #9792 from vipulnsward/drop_unused_hash drop an unused hash; change slang to SPECIAL commit 6893c23 refs/heads/master Author: Vipul A M Date: 2013-03-19 10:53:32 +0530 drop an unused hash; change slang to SPECIAL M actionmailer/test/mailers/base_mailer.rb M actionpack/lib/action_dispatch/http/cache.rb commit f0d5e32 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-19 01:11:01 -0300 Initialize @app_env_config now that the var name has changed Check 862389c9537dbb6f65fd26c4325e07607ed437b5 for more background. M railties/lib/rails/application.rb commit 862389c refs/heads/master Author: José Valim Date: 2013-03-18 21:00:39 -0600 Use @app_env_config instead of @env_config Check pull request #9789 for more information. M railties/lib/rails/application.rb commit 2cf38ae refs/tags/v3.2.15 Merge: ef5faeb 8aadc6f Author: José Valim Date: 2013-03-18 19:54:12 -0700 Merge pull request #9789 from puma/3-2-stable Change @env_config to @app_env_config commit 8aadc6f refs/tags/v3.2.15 Author: Evan Phoenix Date: 2013-03-18 19:21:13 -0700 Change @env_config to @app_env_config Moral of the story: One must be careful about lazily initializing instance variables when subclassing. I would like to draw your attention to https://github.com/rails/rails/issues/4652 where the reader will see that there appears to be some kind of initialization issue in rails. The source of this issue is that: 1) Engine#env_config contains "@env_config ||= ..." 2) Application#env_config contains "@env_config ||= ..." 3) Threads are in the picture 4) Thread A calls Application#env_config, which super's to Engine#env_config 5) After Engine#env_config returns but before Application#env_config sets @env_config again, Thread B begins running 6) Thread B calls Application#env_config 7) Thread B finds @env_config to contain a value (the one set by Engine#env_config) and returns it 8) Thread B blows up because key set by Application#env_config are there. 9) People report bugs with puma, thin, rainbows, webrick, etc 10) Evan becomes tired of seeing these bugs 11) Evan pours himself a stiff drink, puts on Top Gear(tm), and begins debugging 12) Evan finds the source of the bug 13) Evan authors a PR 14) RIGHT NOW. The bug is fixed by simply using a different ivar name in the methods. Alternately, Engine#env_config could just return a new Hash each time, not memoizing into @env_config. I bid you adieu. M railties/lib/rails/application.rb commit a240e52 refs/heads/master Author: Aaron Pfeifer Date: 2013-02-26 09:35:03 -0500 Fix ActiveRecord locking column defaults not getting persisted When partial inserts are enabled, overridden db defaults are ignored. This results in locking columns having a nil value for new records if the db default is null. This happens because the list of changed attributes for new records is always assumed to be empty. Solution: When a new record's default attributes are set, also initialize the list of changed attributes by comparing current values against what's stored as the column defaults in the database. M activerecord/lib/active_record/core.rb M activerecord/test/cases/locking_test.rb commit f1563f4 refs/heads/master Author: Waynn Lue Date: 2013-03-18 15:47:41 -0700 "overwritten" is one word M actionmailer/README.rdoc commit ef5faeb refs/tags/v3.2.15 Merge: 167b645 0e56c1d Author: Rafael Mendonça França Date: 2013-03-18 14:57:13 -0700 Merge pull request #9785 from claudiob/add-3-2-13-release-date-to-changelogs Add release dates to documentation [ci skip] commit 0e56c1d refs/tags/v3.2.15 Author: claudiob Date: 2013-03-18 14:51:46 -0700 Add release dates to documentation [ci skip] Set "March 18, 2013" as the release date for 3.2.13 M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit 111611b refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-18 18:46:48 -0300 Revert "Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string" This reverts commit 9c4c05fc82e997b722dec4068c3aa27eaee69eb8, reversing changes made to 4620bdcefd0c88905a005f191496df887877b8f3. Reason: They're not completely interchangeable, since blank? will also check for strings containing spaces. M activerecord/lib/active_record/connection_adapters/column.rb commit 9c4c05f refs/heads/master Merge: 4620bdc 9ff33fb Author: Carlos Antonio da Silva Date: 2013-03-18 14:44:29 -0700 Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string Change from blank? to empty? on obvious string values to save extra calls commit bd34e5c refs/remotes/origin/3-1-stable Author: Prem Sichanugrist Date: 2013-02-21 18:47:18 -0500 Add in missing requires M activesupport/lib/active_support/core_ext/kernel/reporting.rb M railties/test/application/assets_test.rb commit 9ff33fb refs/heads/master Author: Vipul A M Date: 2013-03-19 03:03:19 +0530 change from blank? to empty? on obvious string values to save extra method calls M activerecord/lib/active_record/connection_adapters/column.rb commit 167b645 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-18 18:25:45 -0300 Bring back test and changelog entry from #pluck method and select clause M activerecord/CHANGELOG.md M activerecord/test/cases/calculations_test.rb commit 9194221 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-18 18:27:35 -0300 Fix method name indent [ci skip] M activesupport/test/xml_mini/jdom_engine_test.rb commit a8e7a00 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-18 18:18:55 -0300 Fix changelog conflicts and remove release dates [ci skip] M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md commit 4620bdc refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-18 17:58:44 -0300 Fix failing tests related to where values change to strings Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d. M activerecord/test/cases/relation_scoping_test.rb commit ddd2c75 refs/heads/master Author: Xavier Noria Date: 2013-03-18 21:18:36 +0100 Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M activemodel/activemodel.gemspec M activerecord/activerecord.gemspec M activesupport/activesupport.gemspec M railties/railties.gemspec commit 8621b69 refs/heads/master Merge: c24528f aee5424 Author: Rafael Mendonça França Date: 2013-03-18 13:04:38 -0700 Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm Change from each to each_value;drop assignment in habtm commit 72de894 refs/heads/master Author: Krzysztof Jurewicz Date: 2013-02-13 03:40:24 +0100 Use define_method when method name contains weird characters. M activerecord/lib/active_record/relation/delegation.rb M activerecord/test/cases/named_scope_test.rb commit aee5424 refs/heads/master Author: Vipul A M Date: 2013-03-19 01:15:25 +0530 1. Change from each to each_value since we did not use key 2. drop assignment of value to sum in test M activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb M activerecord/test/cases/associations/eager_test.rb commit c24528f refs/heads/master Author: Xavier Noria Date: 2013-03-18 20:35:49 +0100 instruct RDoc to only parse Ruby files under lib [Fixes #9779] M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M activemodel/activemodel.gemspec M activerecord/activerecord.gemspec M activesupport/activesupport.gemspec M railties/railties.gemspec commit 2a5521e refs/heads/master Merge: bfdd3c2 95332ab Author: Steve Klabnik Date: 2013-03-18 11:56:26 -0700 Merge pull request #9022 from braddunbar/digest-basic-auth Digest auth should not 500 when given a basic header. commit 95332ab refs/heads/master Author: Brad Dunbar Date: 2013-01-21 15:31:34 -0500 Digest auth should not 500 when given a basic header. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_digest_authentication_test.rb commit bfdd3c2 refs/heads/master Merge: 3b68f21 55686dd Author: Steve Klabnik Date: 2013-03-18 11:40:00 -0700 Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1 fix typos in AR. lots of them. commit 55686dd refs/heads/master Author: Vipul A M Date: 2013-03-19 00:04:39 +0530 fix typos in AR. lots of them. M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/explain.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/batches_test.rb M activerecord/test/cases/dup_test.rb M activerecord/test/cases/nested_attributes_test.rb commit 3b68f21 refs/heads/master Merge: 2392535 b055738 Author: Steve Klabnik Date: 2013-03-18 10:59:47 -0700 Merge pull request #9202 from gkop/more_helpful_message_when_starting_server More helpful message when starting server commit b055738 refs/heads/master Author: Gabe Kopley Date: 2013-03-18 10:42:24 -0700 More helpful message when starting server v2 of pull request based on feedback from @rafaelfranca, @schneems, and @carlosantoniodasilva M guides/source/initialization.md M railties/lib/rails/commands/server.rb commit 2392535 refs/heads/master Merge: 0053c21 e115ace Author: Aaron Patterson Date: 2013-03-18 10:17:32 -0700 Merge branch 'master-sec' * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] commit afcd01b refs/tags/v3.2.15 Merge: 491d691 a4b5582 Author: Aaron Patterson Date: 2013-03-18 10:17:04 -0700 Merge branch '3-2-13' into 3-2-stable * 3-2-13: bumping to 3.2.13 fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md commit 0053c21 refs/heads/master Merge: 341f9a0 9b5c085 Author: Jeremy Kemper Date: 2013-03-18 10:02:09 -0700 Merge pull request #9669 from senny/rails_method_missing_call config.ru uses the effective Rack app commit 3773c2f refs/tags/v2.3.18 (tag: v2.3.18) Author: Aaron Patterson Date: 2013-03-18 10:01:40 -0700 bumping to 2.3.18 M actionmailer/Rakefile M actionmailer/actionmailer.gemspec M actionmailer/lib/action_mailer/version.rb M actionpack/Rakefile M actionpack/actionpack.gemspec M actionpack/lib/action_pack/version.rb M activerecord/Rakefile M activerecord/activerecord.gemspec M activerecord/lib/active_record/version.rb M activeresource/Rakefile M activeresource/activeresource.gemspec M activeresource/lib/active_resource/version.rb M activesupport/activesupport.gemspec M activesupport/lib/active_support/version.rb M railties/Rakefile M railties/lib/rails/version.rb M railties/railties.gemspec commit af7da4d refs/tags/v2.3.18 Author: Aaron Patterson Date: 2013-03-18 09:57:57 -0700 Revert "Revert "Switched to newer rdoc and gem package tasks (and their requires)."" I can't build the gems without reverting this commit. This reverts commit dad31097a21e0f2249820a756eafe792076ced9c. M Rakefile M actionmailer/Rakefile M actionpack/Rakefile M activemodel/Rakefile M activerecord/Rakefile M activeresource/Rakefile M activesupport/Rakefile M railties/Rakefile commit 341f9a0 refs/heads/master Merge: eb32b36 836ea9f Author: Andrew White Date: 2013-03-18 09:49:44 -0700 Merge pull request #9774 from senny/9772_reraise_no_method_error_in_proper_context `TimeWithZone` raises `NoMethodError` in proper context. commit 836ea9f refs/heads/master Author: Yves Senn Date: 2013-03-18 16:24:40 +0100 `TimeWithZone` raises `NoMethodError` in proper context. Closes #9772. `TimeWithZone` delegates everything to the wrapped `Time` object using `method_missing`. The result is that `NoMethodError` error will be raised in the context of `Time` which leads to a misleading debug output. M activesupport/CHANGELOG.md M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit c01d080 refs/heads/master Author: Sean Griffin Date: 2013-03-07 15:49:03 -0700 Exception handling for controllers using ActionController::Live Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed. M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit a4b5582 refs/tags/v3.2.13 (tag: v3.2.13) Author: Aaron Patterson Date: 2013-03-18 09:23:04 -0700 bumping to 3.2.13 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 0c510c7 refs/tags/v3.1.12 (tag: v3.1.12) Author: Aaron Patterson Date: 2013-03-18 09:17:13 -0700 bumping to 3.1.12 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit eb32b36 refs/heads/master Merge: 4e7292c cecbf5d Author: Carlos Antonio da Silva Date: 2013-03-18 09:14:15 -0700 Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks i18n locale fallback for localized views commit 491d691 refs/tags/v3.2.15 Merge: 1c2717d f662a74 Author: Carlos Antonio da Silva Date: 2013-03-18 08:53:48 -0700 Merge pull request #9768 from senny/do_not_freeze_number_helper_defaults Do not freeze NumberHelper defaults commit f662a74 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-03-18 09:34:56 +0100 do not freeze NumberHelper defaults. Closes #9767. M actionpack/lib/action_view/helpers/number_helper.rb commit 4e7292c refs/heads/master Merge: 2ce4af4 4bd8ccd Author: Carlos Antonio da Silva Date: 2013-03-18 08:48:53 -0700 Merge pull request #9763 from vipulnsward/fix_transliterate_test Fix repeat of test; remove unused variable by use of each_key commit 2ce4af4 refs/heads/master Merge: f08edab 85261a5 Author: Carlos Antonio da Silva Date: 2013-03-18 08:43:38 -0700 Merge pull request #9766 from senny/remove_ancient_todos Remove ancient TODOs [ci skip] commit f08edab refs/heads/master Merge: 10bed60 2337377 Author: Carlos Antonio da Silva Date: 2013-03-18 08:42:59 -0700 Merge pull request #9771 from vipulnsward/fix_typos_activemodel_v1 Fix some typos found in activemodel commit 85261a5 refs/heads/master Author: Yves Senn Date: 2013-03-18 08:25:18 +0100 remove ancient TODOs [ci skip]. M actionpack/test/controller/output_escaping_test.rb M actionpack/test/template/url_helper_test.rb M activerecord/test/cases/locking_test.rb commit 10bed60 refs/heads/master Merge: ddecdde 4666108 Author: Carlos Antonio da Silva Date: 2013-03-18 08:41:09 -0700 Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrb Move tests out from base_test.rb to inheritance_test.rb commit ddecdde refs/heads/master Merge: ad72bca afe38b1 Author: Carlos Antonio da Silva Date: 2013-03-18 08:38:57 -0700 Merge pull request #9677 from neerajdotname/update-comments-about-kotori SQLite3 3.6.8+ supports nested transactions [ci skip] commit 4bd8ccd refs/heads/master Author: Vipul A M Date: 2013-03-18 00:19:57 +0530 fix repeat of test; remove unused variable by use of each_key M activesupport/test/inflector_test.rb M activesupport/test/transliterate_test.rb commit ad72bca refs/heads/master Merge: c4a7c31 09fced4 Author: Xavier Noria Date: 2013-03-18 07:21:07 -0700 Merge pull request #9773 from senny/how_to_report_an_issue refer to the contributing guide on how to create issues. commit 09fced4 refs/heads/master Author: Yves Senn Date: 2013-03-18 15:12:15 +0100 refer to the contributing guide on how to create issues. M CONTRIBUTING.md commit b5c6a9e refs/heads/master Author: Carson McDonald Date: 2013-03-18 09:27:23 -0400 Fix typo, ording to ordering [ci skip] M activerecord/lib/active_record/relation/finder_methods.rb commit afe38b1 refs/heads/master Author: Neeraj Singh Date: 2013-03-11 21:07:17 -0400 SQLite3 3.6.8+ supports nested transactions [ci skip] http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132 M activerecord/lib/active_record/transactions.rb commit 2337377 refs/heads/master Author: Vipul A M Date: 2013-03-18 17:20:05 +0530 fix some typos found in activemodel M activemodel/test/cases/callbacks_test.rb M activemodel/test/cases/validations/with_validation_test.rb M activemodel/test/cases/validations_test.rb commit 455948c refs/heads/master Author: Trevor Turk Date: 2013-03-18 06:38:10 -0500 The default route has been removed M guides/source/routing.md commit 7305ef8 refs/heads/master Author: Trevor Turk Date: 2013-03-18 06:35:19 -0500 The HTTP method helpers are preferred over match and should be explained before named routes M actionpack/lib/action_dispatch/routing.rb commit 70ff810 refs/heads/master Author: Trevor Turk Date: 2013-03-18 06:22:08 -0500 The default route has been removed M actionpack/lib/action_dispatch/routing.rb commit efea57a refs/heads/master Author: Trevor Turk Date: 2013-03-18 06:21:38 -0500 Using match without via is deprecated M actionpack/lib/action_dispatch/routing.rb commit 396bb77 refs/heads/master Author: Tatsuro Baba Date: 2013-03-18 18:31:24 +0900 Capitalize the first letter of sentence M actionpack/lib/abstract_controller/base.rb commit 4666108 refs/heads/master Author: Takehiro Adachi Date: 2013-03-18 15:45:39 +0900 move tests out from base_test.rb These tests should be in inheritance_test.rb since its testing a feature which is implemented in inheritance.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/inheritance_test.rb commit c4a7c31 refs/heads/master Merge: 8744632 274e966 Author: Rafael Mendonça França Date: 2013-03-17 12:35:54 -0700 Merge pull request #9762 from senny/8079_do_not_grant_on_root_user `rake db:create` does not change permissions of root user. commit 274e966 refs/heads/master Author: Yves Senn Date: 2013-03-17 16:27:04 +0100 `rake db:create` does not change permissions of root user. Closes #8079. I had to rework some of the tests because the mock allowed any arguments for `connection.exeucte`. I think this is very dangerous as there could anything be executed without the tests noticing it. M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/tasks/mysql_rake_test.rb commit 8744632 refs/heads/master Author: Xavier Noria Date: 2013-03-17 20:29:58 +0100 sets limit 191 for schema_migrations#version in mysql2 if the encoding is "utf8mb4" Please, see rationale in the included CHANGELOG patch. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/schema_migration.rb A activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb commit b365354 refs/heads/master Merge: 28cb110 c23f3aa Author: Rafael Mendonça França Date: 2013-03-17 09:18:09 -0700 Merge pull request #9754 from macksmind/fix_actionpack_warnings Fix rake test warnings in actionpack commit c23f3aa refs/heads/master Author: Mack Earnhardt Date: 2013-03-16 23:24:27 -0400 Fix rake test warnings in actionpack M actionpack/lib/action_view/template.rb M actionpack/test/controller/test_case_test.rb commit 28cb110 refs/heads/master Merge: e4807f0 c7ea42c Author: Carlos Antonio da Silva Date: 2013-03-17 08:35:06 -0700 Merge pull request #9757 from vipulnsward/remove_message_param remove unused parameter passed to assert_query_equal method commit e4807f0 refs/heads/master Merge: be1a7eb 3ab7ddb Author: Carlos Antonio da Silva Date: 2013-03-17 08:19:11 -0700 Merge pull request #9745 from madmax/allow_pass_multipart_to_form_for Fix regression: allow pass multipart option to form_for commit be1a7eb refs/heads/master Merge: 226d169 3d10b7a Author: Carlos Antonio da Silva Date: 2013-03-17 07:19:14 -0700 Merge pull request #9758 from vipulnsward/remove_from_rakefile Remove extra lines from Rakefile, which threw warning commit 226d169 refs/heads/master Merge: f5ecb13 b9f7e63 Author: Carlos Antonio da Silva Date: 2013-03-17 07:17:28 -0700 Merge pull request #9759 from vipulnsward/remove_hash_from_tests refactor test to drop unnecessary hash creation, test directly instead commit b9f7e63 refs/heads/master Author: Vipul A M Date: 2013-03-17 16:21:33 +0530 refactor test to drop unnecessary hash creation, test directly instead M activesupport/test/core_ext/numeric_ext_test.rb commit 3d10b7a refs/heads/master Author: Vipul A M Date: 2013-03-17 15:32:47 +0530 extra lines from Rakefile removed, which also threw warning M activesupport/Rakefile commit 3ab7ddb refs/heads/master Author: Grzegorz Derebecki Date: 2013-03-16 15:26:42 +0100 Allow pass multipart option to form_for M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/test/template/form_helper_test.rb commit c7ea42c refs/heads/master Author: Vipul A M Date: 2013-03-17 15:15:00 +0530 remove unused parameter passed to assert_query_equal method M activesupport/test/core_ext/object/to_query_test.rb commit f5ecb13 refs/heads/master Merge: 0770316 1d6eabb Author: Rafael Mendonça França Date: 2013-03-16 23:14:11 -0700 Merge pull request #9747 from macksmind/refactor_friend_follower Refactor Person/Friendship relationships to be more intuitive commit 1d6eabb refs/heads/master Author: Mack Earnhardt Date: 2013-03-16 12:32:07 -0400 Refactor Person/Friendship relationships to be more intuitive PR #5210 added a Friendship model to illustrate a bug, but in doing so created a confusing structure because both belongs_to declarations in Friendship referred to the same side of the join. The new structure maintains the integrity of the bug test while changing the follower relationship to be more useful for other testing. M activerecord/test/cases/counter_cache_test.rb M activerecord/test/fixtures/friendships.yml M activerecord/test/fixtures/people.yml M activerecord/test/models/friendship.rb M activerecord/test/models/person.rb M activerecord/test/schema/schema.rb commit cecbf5d refs/heads/master Author: Juan Barreneche Date: 2013-03-14 18:02:20 -0300 Include I18n fallbacks in :locale lookup context M actionpack/CHANGELOG.md M actionpack/lib/action_view/lookup_context.rb M actionpack/test/controller/localized_templates_test.rb commit 0770316 refs/heads/master Author: Steve Klabnik Date: 2013-03-16 16:32:26 -0700 Getting Started Guide: typo fix. [ci skip] There was an s missing in 'views'. Fixes #9752. M guides/source/getting_started.md commit feaa6e2 refs/heads/master Author: Steve Klabnik Date: 2013-03-16 15:24:36 -0700 Revert "Merge pull request #8156 from fredwu/acronym_fix-master" This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930. This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065 Please see comments on #8156 for some discussion. M activesupport/CHANGELOG.md M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/inflector_test.rb commit fa63f83 refs/heads/master Author: Bryan Ricker Date: 2013-03-16 15:21:42 -0700 Remove :all from *args options in AbstractController.helper M actionpack/lib/abstract_controller/helpers.rb commit 19797df refs/heads/master Author: Steve Klabnik Date: 2013-03-16 14:14:50 -0700 Update image in Getting Started Guide [ci skip] When I updated these images, I must have gotten this one wrong. Now it's right. Fixes #9749. M guides/assets/images/getting_started/unknown_action_create_for_posts.png commit e958eab refs/heads/master Author: Xavier Noria Date: 2013-03-16 16:03:09 +0100 revises the CHANGELOG entry from 26aa265 [ci skip] M activesupport/CHANGELOG.md commit 867dc17 refs/heads/master Merge: 9a421aa 26aa265 Author: Xavier Noria Date: 2013-03-16 07:59:47 -0700 Merge pull request #8156 from fredwu/acronym_fix-master Fix for inflector's incorrect camelCase replacement for acronyms commit 26aa265 refs/heads/master Author: Fred Wu Date: 2012-11-12 09:15:18 +1100 Added Inflector#underscore fix to the changelog M activesupport/CHANGELOG.md commit 515feb1 refs/heads/master Author: Fred Wu Date: 2012-11-09 22:09:01 +1100 Fixed a bug where the inflector would replace camelCase strings and disregarding specified acronyms, fixes #8015 M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/inflector_test.rb commit 9a421aa refs/heads/master Author: Xavier Noria Date: 2013-03-16 12:00:50 +0100 fixes markup of the CHANGELOG entry from 455d710 M activerecord/CHANGELOG.md commit 387928c refs/heads/master Author: Mikhail Dieterle Date: 2013-03-16 11:08:01 +0300 Capitalize first letter in sentence M guides/source/routing.md commit 34be804 refs/heads/master Merge: ae8e84e 455d710 Author: Jeremy Kemper Date: 2013-03-15 19:25:31 -0700 Merge pull request #9737 from wangjohn/counter_cache_update_attributes_fix The counter cache will now work correctly when the foreign key is changed. Fixes #9722. commit 455d710 refs/heads/master Author: John Wang Date: 2013-03-15 11:48:53 -0400 If a counter_cache is defined, then using update_attributes and changing the primary key on an association will make sure that the corresponding counter on the association is changed properly. Fixes #9722. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 10f0e6f refs/tags/v2.3.18 Author: Aaron Patterson Date: 2013-03-15 15:04:00 -0700 fix protocol checking in sanitization [CVE-2013-1857] Conflicts: actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb actionpack/test/controller/html-scanner/sanitizer_test.rb M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/controller/html-scanner/sanitizer_test.rb commit f67851a refs/tags/v2.3.18 Author: Charlie Somerville Date: 2013-02-13 09:09:53 +1100 fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] Conflicts: actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/controller/html-scanner/sanitizer_test.rb commit ef9f053 refs/tags/v2.3.18 Author: Aaron Patterson Date: 2013-03-05 14:52:08 -0800 stop calling to_sym when building arel nodes [CVE-2013-1854] M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/reflection.rb M activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb commit 77403a9 refs/remotes/origin/3-0-stable Author: Aaron Patterson Date: 2013-03-15 15:04:00 -0700 fix protocol checking in sanitization [CVE-2013-1857] Conflicts: actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit fa5bafc refs/remotes/origin/3-0-stable Author: Ben Murphy Date: 2013-02-08 02:48:22 +0000 JDOM XXE Protection [CVE-2013-1856] Conflicts: activesupport/test/xml_mini/jdom_engine_test.rb M activesupport/lib/active_support/xml_mini/jdom.rb A activesupport/test/fixtures/xml/jdom_doctype.dtd A activesupport/test/fixtures/xml/jdom_entities.txt A activesupport/test/fixtures/xml/jdom_include.txt M activesupport/test/xml_mini/jdom_engine_test.rb commit 0075f36 refs/remotes/origin/3-0-stable Author: Charlie Somerville Date: 2013-02-13 09:09:53 +1100 fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit 735bb98 refs/tags/v3.1.12 Author: Aaron Patterson Date: 2013-03-15 15:04:00 -0700 fix protocol checking in sanitization [CVE-2013-1857] Conflicts: actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit a7d252b refs/tags/v3.1.12 Author: Ben Murphy Date: 2013-02-08 02:48:22 +0000 JDOM XXE Protection [CVE-2013-1856] Conflicts: activesupport/test/xml_mini/jdom_engine_test.rb M activesupport/lib/active_support/xml_mini/jdom.rb A activesupport/test/fixtures/xml/jdom_doctype.dtd A activesupport/test/fixtures/xml/jdom_entities.txt A activesupport/test/fixtures/xml/jdom_include.txt M activesupport/test/xml_mini/jdom_engine_test.rb commit 36bcc93 refs/tags/v3.1.12 Author: Charlie Somerville Date: 2013-02-13 09:09:53 +1100 fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit 5ff6012 refs/tags/v3.1.12 Author: Aaron Patterson Date: 2013-03-05 14:52:08 -0800 stop calling to_sym when building arel nodes [CVE-2013-1854] M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/method_scoping_test.rb M activerecord/test/cases/relation_test.rb commit 99123ad refs/tags/v3.2.13 Author: Aaron Patterson Date: 2013-03-15 15:04:00 -0700 fix protocol checking in sanitization [CVE-2013-1857] Conflicts: actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit c0d0663 refs/tags/v3.2.13 Author: Ben Murphy Date: 2013-02-08 02:48:22 +0000 JDOM XXE Protection [CVE-2013-1856] Conflicts: activesupport/test/xml_mini/jdom_engine_test.rb M activesupport/lib/active_support/xml_mini/jdom.rb A activesupport/test/fixtures/xml/jdom_doctype.dtd A activesupport/test/fixtures/xml/jdom_entities.txt A activesupport/test/fixtures/xml/jdom_include.txt M activesupport/test/xml_mini/jdom_engine_test.rb commit ff3b9ca refs/tags/v3.2.13 Author: Charlie Somerville Date: 2013-02-13 09:09:53 +1100 fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit f980289 refs/tags/v3.2.13 Author: Aaron Patterson Date: 2013-03-05 14:52:08 -0800 stop calling to_sym when building arel nodes [CVE-2013-1854] M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/method_scoping_test.rb M activerecord/test/cases/relation_test.rb commit e115ace refs/heads/master Author: Aaron Patterson Date: 2013-03-15 15:04:00 -0700 fix protocol checking in sanitization [CVE-2013-1857] M actionpack/lib/action_view/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit db8b636 refs/heads/master Author: Ben Murphy Date: 2013-02-08 02:48:22 +0000 JDOM XXE Protection [CVE-2013-1856] M activesupport/lib/active_support/xml_mini/jdom.rb A activesupport/test/fixtures/xml/jdom_doctype.dtd A activesupport/test/fixtures/xml/jdom_entities.txt A activesupport/test/fixtures/xml/jdom_include.txt M activesupport/test/xml_mini/jdom_engine_test.rb commit 8be6913 refs/heads/master Author: Charlie Somerville Date: 2013-02-13 09:09:53 +1100 fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] M actionpack/lib/action_view/vendor/html-scanner/html/sanitizer.rb M actionpack/test/template/html-scanner/sanitizer_test.rb commit 5dc2e35 refs/heads/master Author: Aaron Patterson Date: 2013-03-05 14:52:08 -0800 stop calling to_sym when building arel nodes [CVE-2013-1854] M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_chain_test.rb commit 79af9e9 refs/heads/master Author: Francesco Rodriguez Date: 2013-03-15 19:20:53 -0500 nodoc AR::ConnectionHandling for adapters [ci skip] M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/connection_handling.rb commit 65d681f refs/heads/master Author: Mikhail Dieterle Date: 2013-03-16 01:14:54 +0300 Update action_controller_overview.md M guides/source/action_controller_overview.md commit 3aa3880 refs/heads/master Author: Mikhail Dieterle Date: 2013-03-16 01:02:21 +0300 fix markup of controllers guide M guides/source/action_controller_overview.md commit 0ddae9f refs/heads/master Author: Mikhail Dieterle Date: 2013-03-15 22:48:41 +0300 fix typo in form helpers guide M guides/source/form_helpers.md commit ae8e84e refs/heads/master Merge: 1a90550 b88c96b Author: Rafael Mendonça França Date: 2013-03-15 12:12:56 -0700 Merge pull request #9734 from choudhuryanupam/master Method #primary_key? is not reused commit e42d607 refs/heads/master Author: Robin Dupret Date: 2013-03-15 19:28:43 +0100 Unmatched parenthesis fix M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 1a90550 refs/heads/master Author: Steve Klabnik Date: 2013-03-15 10:38:00 -0700 Revert "make new rails apps log to STDOUT" This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire. M activesupport/lib/active_support/tagged_logging.rb M activesupport/test/tagged_logging_test.rb M railties/CHANGELOG.md M railties/lib/rails/application/bootstrap.rb M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/test/application/configuration_test.rb commit aec466e refs/heads/master Author: Tim Lowrimore Date: 2013-03-15 12:36:16 -0500 added details to section 4.1.2 of the Asset Pipeline guide, describing how to configure Apache to serve the gzipped version of the precompiled assets M guides/source/asset_pipeline.md commit 29030d3 refs/heads/master Merge: a662a78 b307210 Author: Steve Klabnik Date: 2013-03-15 10:25:15 -0700 Merge pull request #5606 from teohm/multipart_unicode_param_name multipart POST - utf8 param name not encoded commit a662a78 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-15 14:17:59 -0300 Fix implicit join references option reversion in test M activerecord/test/cases/relations_test.rb commit 9caba41 refs/heads/master Merge: 5558bb0 b7d9d6e Author: Steve Klabnik Date: 2013-03-15 10:09:09 -0700 Merge pull request #9691 from hone/stdout_logging Rails default logging to STDOUT commit b7d9d6e refs/heads/master Author: Terence Lee Date: 2013-03-15 04:07:22 -0700 make new rails apps log to STDOUT M activesupport/lib/active_support/tagged_logging.rb M activesupport/test/tagged_logging_test.rb M railties/CHANGELOG.md M railties/lib/rails/application/bootstrap.rb M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/test/application/configuration_test.rb commit 9b5c085 refs/heads/master Author: Yves Senn Date: 2013-03-11 20:46:21 +0100 config.ru uses the effective Rack app We used to pass the Rails::Application subclass to #run. The Rails server then called #to_app to convert that class to the actual Rack application. if you surround `#run` with a call to `#map` the server no longer convertes the class to the instance and we end up with unnecessary delegation calls on every request. M railties/lib/rails/commands/server.rb M railties/lib/rails/generators/rails/app/templates/config.ru commit 5558bb0 refs/heads/master Merge: 133a175 34402c7 Author: Jon Leighton Date: 2013-03-15 08:12:09 -0700 Merge pull request #9733 from senny/9712_option_to_turn_references_deprecation_off make it possible to disable implicit join references. commit 34402c7 refs/heads/master Author: Yves Senn Date: 2013-03-15 14:44:48 +0100 make it possible to disable implicit join references. Closes #9712. M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relations_test.rb commit b88c96b refs/heads/master Author: Anupam Choudhury Date: 2013-03-15 19:28:14 +0530 Refactored to reuse method M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 133a175 refs/heads/master Author: Jon Leighton Date: 2013-03-15 13:46:39 +0000 Cache the association proxy object This reimplements the behaviour of Rails 3, as I couldn't see why we shouldn't cache the object, and @alindeman had a good use case for caching it: https://github.com/rails/rails/commit/c86a32d7451c5d901620ac58630460915292f88b#commitcomment-2784312 M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations_test.rb commit 0721d3b refs/heads/master Merge: df21d1e cd87c85 Author: Jon Leighton Date: 2013-03-15 06:21:53 -0700 Merge pull request #9683 from senny/deprecate_count_distinct_option rename `Relation#uniq` to `Relation#distinct` commit cd87c85 refs/heads/master Author: Yves Senn Date: 2013-03-12 10:52:25 +0100 Deprecate the `:distinct` option for `Relation#count`. We moved more and more away from passing options to finder / calculation methods. The `:distinct` option in `#count` was one of the remaining places. Since we can now combine `Relation#distinct` with `Relation#count` the option is no longer necessary and can be deprecated. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/associations/cascaded_eager_loading_test.rb M activerecord/test/cases/associations/inner_join_association_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/calculations_test.rb M activerecord/test/cases/relations_test.rb commit a1bb6c8 refs/heads/master Author: Yves Senn Date: 2013-03-12 10:23:08 +0100 rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works. The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our Relation API is close to SQL terms I renamed `#uniq` to `#distinct`. There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue to work. I also updated the documentation to promote the use of `#distinct`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/associations/preloader/has_many_through.rb M activerecord/lib/active_record/querying.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/cases/associations/join_model_test.rb M activerecord/test/cases/associations/nested_through_associations_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/calculations_test.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/relation_test.rb M activerecord/test/cases/relations_test.rb M activerecord/test/models/author.rb M activerecord/test/models/book.rb M activerecord/test/models/liquid.rb M activerecord/test/models/project.rb M guides/source/active_record_querying.md commit df21d1e refs/heads/master Merge: 962604f 29dcf09 Author: Carlos Antonio da Silva Date: 2013-03-15 05:50:54 -0700 Merge pull request #9728 from vipulnsward/fix_em_typos Small typos here and there. commit 962604f refs/heads/master Merge: cd6a9f8 aae89ee Author: Jon Leighton Date: 2013-03-15 05:50:17 -0700 Merge pull request #9686 from strzalek/cast_number_to_string_in_pg Cast number to string in Postgres commit 1c2717d refs/tags/v3.2.15 Author: Justin Date: 2013-03-15 13:26:08 +0530 Typo fix [ci ski] Closes #9730. M railties/guides/source/caching_with_rails.textile commit cd6a9f8 refs/heads/master Merge: bfee706 106e159 Author: Andrew White Date: 2013-03-15 05:46:32 -0700 Merge pull request #9732 from arunagw/warning_fix_unused_variable Warning removed unused variable task_name commit bfee706 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-15 09:34:58 -0300 Fix typos and improve docs a bit [ci skip] M actionpack/lib/action_controller/test_case.rb commit 106e159 refs/heads/master Author: Arun Agrawal Date: 2013-03-15 13:33:07 +0100 Warning removed unused variable task_name warning: assigned but unused variable - task_name M railties/lib/rails/test_unit/testing.rake commit aa07318 refs/heads/master Merge: ddb9040 b601399 Author: Andrew White Date: 2013-03-15 03:31:30 -0700 Merge pull request #9731 from senny/9724_argument_error_on_reset_counters `#reset_counters` verifies counter names. commit b601399 refs/heads/master Author: Yves Senn Date: 2013-03-15 11:22:01 +0100 `#reset_counters` verifies counter names. Closes #9724. Raise an `ArgumentError` when the name of the counter does not match an association name. M activerecord/lib/active_record/counter_cache.rb M activerecord/test/cases/counter_cache_test.rb commit ddb9040 refs/heads/master Merge: c1003d9 e8598a5 Author: Andrew White Date: 2013-03-15 02:16:52 -0700 Merge pull request #9716 from senny/rework_headers_functional_tests Rework headers functional tests commit e8598a5 refs/heads/master Author: Yves Senn Date: 2013-03-14 11:48:33 +0100 document request simulation methods in functional tests. M actionpack/lib/action_controller/test_case.rb commit 41a14dc refs/heads/master Author: Yves Senn Date: 2013-03-13 18:05:01 +0100 `Http::Headers` directly modifies the passed environment. The env hash passed to `Http::Headers#new` must be in env format. Also be aware that the passed hash is modified directly. docs and test-cases for setting headers/env in functional tests. Follow up to #9700. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/headers.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/controller/test_case_test.rb M actionpack/test/dispatch/header_test.rb M guides/source/testing.md commit c1003d9 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 23:49:00 -0700 ask column if it is a pk M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 2394d28 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 23:36:57 -0700 fix hash duping on 1.9 M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit 29dcf09 refs/heads/master Author: Vipul A M Date: 2013-03-15 11:55:03 +0530 Small typos here and there. M activemodel/CHANGELOG.md M activemodel/test/cases/attribute_methods_test.rb M activemodel/test/cases/naming_test.rb M activemodel/test/cases/validations_test.rb commit 5e0e415 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 23:22:35 -0700 clean up pk delclaration in `create_table` M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit aac00ed refs/heads/master Author: Aaron Patterson Date: 2013-03-14 23:08:11 -0700 bumping arel M activerecord/activerecord.gemspec commit ab379b5 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 22:49:22 -0700 oops! M Gemfile commit 19ca04a refs/heads/master Author: Aaron Patterson Date: 2013-03-14 22:45:05 -0700 just access the ivars rather than rb_iv_get M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit 8d3e5c8 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 22:42:12 -0700 hide more data in the schema cache M Gemfile M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/connection_adapters/schema_cache.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/connection_adapters/schema_cache_test.rb commit a0dfd84 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 22:27:59 -0700 safely publish columns and columns hash info M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/lib/active_record/connection_adapters/schema_cache.rb M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/connection_adapters/schema_cache_test.rb commit 6e0aafb refs/heads/master Author: Limon Lin Date: 2013-03-15 13:14:26 +0800 Should be a symbol not string to defer the choice of layout. [ci skip] M guides/source/layouts_and_rendering.md commit 258f1e5 refs/heads/master Author: Steve Klabnik Date: 2013-03-14 22:11:19 -0700 Getting Started Guide: 3.2.9 -> 4.0.0. [ci skip] Brought up in https://github.com/rails/rails/issues/9727 M guides/source/getting_started.md commit fef2104 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 18:40:09 -0700 dup and set the default proc to nil rather than looping through everything M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit d758794 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 18:21:00 -0700 you can provide uuid_generate_v4 as the default value for uuid columns M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb A activerecord/test/cases/adapters/postgresql/uuid_test.rb commit b307210 refs/heads/master Author: Teo Hui Ming Date: 2012-03-27 11:54:24 +0800 UTF-8 encode all keys and values in nested params hash. M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/http/upload.rb M actionpack/test/dispatch/request/multipart_params_parsing_test.rb A actionpack/test/fixtures/multipart/bracketed_utf8_param A actionpack/test/fixtures/multipart/single_utf8_param commit c9f7546 refs/heads/master Author: Waynn Lue Date: 2013-03-14 18:03:17 -0700 make the headers consistent M activerecord/README.rdoc commit cf06577 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 17:53:51 -0700 pg is the only adapter that supports the xml type, so push the method down M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit ee46011 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 17:48:35 -0700 Apparently people were mutating this array. :'( This reverts commit abba61e2bbe320894ba8449ebdf778a1d2af545b. M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit abba61e refs/heads/master Author: Aaron Patterson Date: 2013-03-14 17:33:44 -0700 hashes are ordered, so just use the columns_hash ivar M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 772c18e refs/heads/master Author: Aaron Patterson Date: 2013-03-14 17:23:55 -0700 use the method so we do not depend on internal ivars M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit d5f4b53 refs/heads/master Author: Aaron Patterson Date: 2013-03-14 17:15:24 -0700 extract factory method and push common code up to abstract adapter M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 9d5699a refs/tags/v3.2.15 Merge: 3d4d742 ce75569 Author: Steve Klabnik Date: 2013-03-14 14:07:19 -0700 Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacks i18n locale fallback for localized views commit ce75569 refs/tags/v3.2.15 Author: Juan Barreneche Date: 2013-03-14 18:02:20 -0300 Extract hardcoded lists to Redo::RestaurantsList M actionpack/CHANGELOG.md M actionpack/lib/action_view/lookup_context.rb M actionpack/test/controller/localized_templates_test.rb commit b7b6c22 refs/heads/master Merge: 36f7732 2651b59 Author: Aaron Patterson Date: 2013-03-14 13:39:51 -0700 Merge pull request #9713 from imanel/live_stale Handle conditional get in live requests commit 8fccbc1 refs/heads/master Author: Adam Gamble Date: 2013-01-31 21:54:41 -0600 Modifies belong_to touch callback to touch old associations also #9091 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/test/cases/timestamp_test.rb commit 7fc3390 refs/heads/master Author: PikachuEXE Date: 2013-01-30 12:55:37 +0800 + Add test for auto timestamps update of both old & new parent records M activerecord/test/cases/timestamp_test.rb M activerecord/test/fixtures/toys.yml commit 2651b59 refs/heads/master Author: Bernard Potocki Date: 2013-03-14 09:13:10 +0100 Handle conditional get in live requests - this will prevent error when using stale on live streams(issue #9636) M actionpack/lib/action_controller/metal/live.rb M actionpack/test/controller/live_stream_test.rb commit 36f7732 refs/heads/master Merge: a3c8e4a d338a0f Author: Steve Klabnik Date: 2013-03-13 22:59:23 -0700 Merge pull request #9711 from vipulnsward/moar_cleanups MOAR cleanups of unused variables. commit d338a0f refs/heads/master Author: Vipul A M Date: 2013-03-14 10:47:13 +0530 MOAR cleanups. M activerecord/lib/active_record/railtie.rb M activerecord/test/cases/adapters/mysql2/reserved_word_test.rb M activerecord/test/cases/associations_test.rb M activerecord/test/cases/connection_pool_test.rb commit d41c279 refs/heads/master Author: Vipul A M Date: 2013-03-14 10:12:54 +0530 do some typo fixing M guides/source/active_record_querying.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/form_helpers.md commit a3c8e4a refs/heads/master Author: Steve Klabnik Date: 2013-03-13 15:27:49 -0700 Add extra clarifying line in docs. [ci skip] M actionpack/lib/action_dispatch/http/request.rb commit 5bf6d8e refs/heads/master Author: Steve Klabnik Date: 2013-03-13 15:20:23 -0700 Fix docs: response -> request. Even though I read it carefully, my brain tricked me. :cry: M actionpack/lib/action_dispatch/http/request.rb commit 02caa02 refs/heads/master Merge: a0920bc f4d9f33 Author: Steve Klabnik Date: 2013-03-13 15:16:26 -0700 Merge pull request #9698 from garethrees/request_documentation Add documentation to ActionDispatch::Request commit a0920bc refs/heads/master Merge: 16466e1 d717882 Author: Rafael Mendonça França Date: 2013-03-13 13:44:13 -0700 Merge pull request #9690 from trevorturk/upgrade-notes Rails 4 upgrade notes about clashing named route selection changes commit e23413b refs/heads/master Author: Vipul A M Date: 2013-03-14 02:02:56 +0530 fix missing to M guides/source/action_controller_overview.md commit 16466e1 refs/heads/master Merge: cd9f750 3008994 Author: Carlos Antonio da Silva Date: 2013-03-13 13:12:21 -0700 Merge pull request #9699 from rubys/scaffold_password_digest Add support for generate scaffold password:digest * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture commit 3008994 refs/heads/master Author: Sam Ruby Date: 2013-03-13 08:08:56 -0400 Add support for generate scaffold password:digest * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password entirely from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture M activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb M activerecord/lib/rails/generators/active_record/model/templates/model.rb M railties/CHANGELOG.md M railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb M railties/lib/rails/generators/erb/scaffold/templates/index.html.erb M railties/lib/rails/generators/erb/scaffold/templates/show.html.erb M railties/lib/rails/generators/generated_attribute.rb M railties/lib/rails/generators/named_base.rb M railties/lib/rails/generators/test_unit/model/templates/fixtures.yml M railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb M railties/test/generators/scaffold_generator_test.rb commit cd9f750 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-13 14:00:11 -0300 Move some railties changelog entries to the top [ci skip] M railties/CHANGELOG.md commit 0248267 refs/heads/master Merge: b5493c8 a709246 Author: Andrew White Date: 2013-03-13 08:42:26 -0700 Merge pull request #9700 from senny/6513_integration_test_headers rework passing headers and env variables in integration tests commit a709246 refs/heads/master Author: Yves Senn Date: 2013-03-13 16:25:28 +0100 `Http::Headers` respects dotted env vars, symbols, headers with numbers. M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit 9af59b2 refs/heads/master Author: Yves Senn Date: 2013-03-13 12:25:32 +0100 allow headers and env to be passed in `IntegrationTest`. Closes #6513. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/headers.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/controller/integration_test.rb M actionpack/test/dispatch/header_test.rb commit e2a5de2 refs/heads/master Author: Yves Senn Date: 2013-03-13 11:30:45 +0100 refactor, `Http::Headers` stores headers in env notation Also: cleanup, use consistent syntax for `Http::Header` and test. M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit 8945be4 refs/heads/master Author: Yves Senn Date: 2013-03-13 11:14:49 +0100 Http::Headers respects headers that are not prefixed with HTTP_ M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit 74c3b7f refs/heads/master Author: Angelo capilleri Date: 2013-03-13 14:18:37 +0100 fix absence validator doc for boolean field M guides/source/active_record_validations.md commit 8b3483f refs/heads/master Author: Angelo capilleri Date: 2013-03-13 14:11:46 +0100 absence validator doc M guides/source/active_record_validations.md commit b5493c8 refs/heads/master Merge: 14a9a4a 0c61d97 Author: Carlos Antonio da Silva Date: 2013-03-13 04:33:04 -0700 Merge pull request #9694 from vipulnsward/change_from_each_to_each_value_in_http_params Change from each to each_value in http/parameters since we don't use key commit f4d9f33 refs/heads/master Author: Gareth Rees Date: 2013-03-13 10:21:47 +0000 Add documentation to ActionDispatch::Request M actionpack/lib/action_dispatch/http/request.rb commit 14a9a4a refs/heads/master Merge: dff86e6 5ed4696 Author: Andrew White Date: 2013-03-13 01:21:54 -0700 Merge pull request #9696 from senny/typo_in_changelog fix typo in Active Record CHANGELOG [ci skip] commit 5ed4696 refs/heads/master Author: Yves Senn Date: 2013-03-13 09:09:05 +0100 fix typo in Active Record CHANGELOG [ci skip] M activerecord/CHANGELOG.md commit 3d4d742 refs/tags/v3.2.15 Author: Andrew White Date: 2013-03-13 07:24:21 +0000 Fix ar:mysql2 build on Ruby 1.8.7 The `skip` method is a no-op on Ruby 1.8.7 so we still need to force skip by returning early from each test. M activerecord/test/cases/bind_parameter_test.rb commit dff86e6 refs/heads/master Author: Andrew White Date: 2013-03-13 05:46:34 +0000 Add regression tests for #9678 The bug with `ActiveSupport::TimeZone.parse` described in #9678 was unwittingly fixed in 005d910 so add some tests to prevent regression. M activesupport/test/time_zone_test.rb commit ba910d7 refs/tags/v3.2.15 Author: Andrew White Date: 2013-03-13 04:45:47 +0000 Fix `ActiveSupport::TimeZone.parse` when time is a local DST jump The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse` which applies the system time DST rules to the parsed time. Instead we now use `Time.utc` and manually apply the offset. Backport tests from: 005d910624bbfa724b638426a000c8074d4201a2 c89b6c4cdce7ee55ed3665c099d914222fe0344a 03becb13099c439f6aea5058546bc8b0b19b8db8 Fixes #9678. M activesupport/CHANGELOG.md M activesupport/lib/active_support/values/time_zone.rb M activesupport/test/time_zone_test.rb commit 0c61d97 refs/heads/master Author: Vipul A M Date: 2013-03-13 08:52:07 +0530 Change from each to each_value in http/parameters since we don't use key M actionpack/lib/action_dispatch/http/parameters.rb commit 008fd54 refs/heads/master Author: Waynn Lue Date: 2013-03-12 18:44:10 -0700 clarify verbiage M activemodel/README.rdoc commit 4886991 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-09 06:48:04 -0800 Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/tags/base.rb actionpack/test/template/form_options_helper_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/test/template/form_options_helper_test.rb commit 7169e4c refs/heads/master Author: Aaron Patterson Date: 2013-03-12 14:15:01 -0700 removing out of date comment. :heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart: @pixeltrix M activesupport/lib/active_support/core_ext/class/attribute.rb commit ed9e3f6 refs/heads/master Author: Aaron Patterson Date: 2013-03-12 14:10:21 -0700 drop memory consumption and startup speed by switching to define_method M activesupport/lib/active_support/core_ext/class/attribute.rb commit d717882 refs/heads/master Author: Trevor Turk Date: 2013-03-12 15:07:17 -0500 Document change to clashing named route selection from journey commit 98a9802a M guides/source/upgrading_ruby_on_rails.md commit 680fab8 refs/heads/master Author: Patrick Helm Date: 2013-03-12 18:18:09 +0100 Fix missing closing tag M railties/lib/rails/engine.rb commit 694c9ed refs/heads/master Author: Alexey Muranov Date: 2013-03-12 18:02:00 +0100 Fix my typo M activerecord/lib/active_record/nested_attributes.rb commit 9ca55c2 refs/heads/master Merge: d25a822 2076a93 Author: Rafael Mendonça França Date: 2013-03-12 09:30:42 -0700 Merge pull request #9687 from stouset/patch-1 Also quote extension name in disable_extension commit 2076a93 refs/heads/master Author: Stephen Touset Date: 2013-03-12 09:29:06 -0700 Also quote extension name in disable_extension A patch was committed recently which quoted the extension name in the SQL for `enable_extension`. But the same wasn't done for `disable_extension`. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit b6cf111 refs/heads/master Author: Alexey Muranov Date: 2013-03-12 17:22:07 +0100 Align indentation in comments M activerecord/lib/active_record/nested_attributes.rb commit 99c741e refs/heads/master Author: Alexey Muranov Date: 2013-03-12 17:21:39 +0100 Document nested attributes as hash of hashes Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes). M activerecord/lib/active_record/nested_attributes.rb commit aae89ee refs/heads/master Author: Łukasz Strzałkowski Date: 2013-03-12 16:05:01 +0100 Cast number to string in Postgres fixes #9170 M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit d25a822 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-12 10:09:03 -0300 Stop calling "super" twice in Rails::Server#app Cache the value of "super" in a variable and use it instead. M railties/lib/rails/commands/server.rb commit 6e07658 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-12 09:59:44 -0300 Remove manual "return true" from AS::TZ match method M activesupport/lib/active_support/values/time_zone.rb commit 824a58a refs/heads/master Merge: 8881723 c3829d3 Author: Rafael Mendonça França Date: 2013-03-12 06:01:07 -0700 Merge pull request #9676 from neerajdotname/9567-destroy-should-call-destroy-all dependent: :destroy should call destroy_all commit 8881723 refs/heads/master Merge: 466ff93 d3e5118 Author: Carlos Antonio da Silva Date: 2013-03-12 04:30:37 -0700 Merge pull request #9615 from mmb/copy_table_binary_sqlite Pass column to quote when copying a sqlite table. To make quote escape binary data correctly it needs the column passed in. commit 466ff93 refs/heads/master Merge: f278deb 8778e1c Author: Carlos Antonio da Silva Date: 2013-03-12 03:55:30 -0700 Merge pull request #9681 from vipulnsward/fix_typo_in_module_name Fix typo in DependenciesTestHelpers module name commit 672ffd4 refs/heads/master Author: Daniel Lobato Date: 2013-03-12 11:11:43 +0100 Uniq cannot be used directly on an ActiveRecord model. 'DISTINCT field' is the only pluck query that translates into the aforementioned SQL M activerecord/lib/active_record/relation/calculations.rb commit d3e5118 refs/heads/master Author: Matthew M. Boedicker Date: 2013-03-08 08:22:33 -0800 Pass column to quote when copying a sqlite table. To make quote escape binary data correctly it needs the column passed in. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/copy_table_test.rb commit 8778e1c refs/heads/master Author: Vipul A M Date: 2013-03-12 10:33:32 +0530 Fix typo in DependenciesTestHelpers module name M activesupport/test/caching_test.rb M activesupport/test/core_ext/marshal_test.rb D activesupport/test/dependecies_test_helpers.rb M activesupport/test/dependencies_test.rb A activesupport/test/dependencies_test_helpers.rb commit f278deb refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-11 23:04:34 -0300 Fix typo [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit c3829d3 refs/heads/master Author: Neeraj Singh Date: 2013-03-11 20:50:22 -0400 dependent: :destroy should call destroy_all Commit https://github.com/rails/rails/pull/9668 shows warning when `delete_all` is invoked with `:dependent` option `:destroy`. Unfortunately invoking `Post.destroy_all` invokes `post.comments.delete_all` as part of `has_many` callbacks. This commit ensures that instead `post.comments.destroy_all` is invoked and in the process no warning is generated. See issue #9567 for details . M activerecord/lib/active_record/associations/has_many_association.rb commit dbafd36 refs/heads/master Author: Waynn Lue Date: 2013-03-11 15:41:44 -0700 update README since email-service isn't a word M actionmailer/README.rdoc commit cae93be refs/heads/master Author: Xavier Noria Date: 2013-03-11 23:05:59 +0100 promotes change_column_null to the migrations API M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit efa5307 refs/heads/master Author: Xavier Noria Date: 2013-03-11 22:36:41 +0100 quick pass over the RDoc of schema_statements.rb [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit efb534e refs/heads/master Author: Xavier Noria Date: 2013-03-11 22:15:08 +0100 documents how to DROP DEFAULT [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 402a899 refs/heads/master Author: Neeraj Singh Date: 2013-03-11 16:41:29 -0400 Minor copy editing M activerecord/lib/active_record/associations.rb commit 67b4861 refs/heads/master Merge: 816e7d1 d71eaf3 Author: Xavier Noria Date: 2013-03-11 13:33:22 -0700 Merge pull request #9668 from neerajdotname/9567-delete-all-warning Show warning message if delete_all is firing callbacks commit d71eaf3 refs/heads/master Author: Neeraj Singh Date: 2013-03-11 15:17:08 -0400 Show warning message if delete_all is firing callbacks `post.comments.delete_all` will fire callbacks if :dependent option is :destroy . It will be fixed in Rails 4.1 . In the meantime display a warning . Look at #9567 for details . M activerecord/lib/active_record/associations/collection_association.rb commit 816e7d1 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-11 15:48:23 -0300 Replace assert_(no_)match args from regexps to strings to remove warnings Using regexps as arguments without parentheses end up raising: warning: ambiguous first argument; put parentheses or even spaces M railties/test/application/test_runner_test.rb commit c7ba4c7 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-10 19:36:27 -0300 Skip fetching path if the iteration is going to be skipped M actionpack/lib/action_controller/test_case.rb commit 5da8c16 refs/heads/master Author: Santiago Pastorino Date: 2013-03-11 15:50:31 -0300 There's no need to install test group in travis M .travis.yml M Gemfile commit 4076288 refs/heads/master Author: Santiago Pastorino Date: 2013-03-11 15:49:05 -0300 Move benchmark-ips to test group M Gemfile commit de1354f refs/heads/master Author: Santiago Pastorino Date: 2013-03-11 15:48:30 -0300 Use platforms instead of conditionals in Gemfile M Gemfile commit 99a8252 refs/heads/master Merge: dbd8bec 7734254 Author: Rafael Mendonça França Date: 2013-03-11 11:35:00 -0700 Merge pull request #9666 from sikachu/master-fix-test_test_failure Make sure that the test case is run under test env commit 7734254 refs/heads/master Author: Prem Sichanugrist Date: 2013-03-11 14:28:43 -0400 Make sure that the test case is run under test env * Unset $RAILS_ENV that got set by abstract_unit to trigger the default. * split out environment setting since Ruby 1.9.3 doesn't support inline ENV setting. M railties/test/application/test_runner_test.rb commit dbd8bec refs/heads/master Author: Steve Klabnik Date: 2013-03-11 11:28:28 -0700 Mention that debugging can be slow. https://github.com/rails/rails/pull/3180\#issuecomment-14705821 has mention of rendering going from 1-2ms to 4 seconds with this on, which seems reasonable: debugging is slow. M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt commit 7cc588b refs/heads/master Author: Aaron Patterson Date: 2013-03-11 11:14:39 -0700 default the reaping frequency to 10 seconds M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit b98efa2 refs/heads/master Author: Aaron Patterson Date: 2013-03-11 11:10:33 -0700 debugger does not work on trunk M Gemfile commit 464cd9d refs/heads/master Merge: 90a9715 1f89533 Author: Andrew White Date: 2013-03-11 09:06:42 -0700 Merge pull request #9664 from sikachu/master-fix-test_test_failure Fix test failure introduced in 3ed41e57 commit 1f89533 refs/heads/master Author: Prem Sichanugrist Date: 2013-03-11 11:58:36 -0400 Fix test failure introduced in 3ed41e57 I forgot to run the test suit after changing the task name. :bomb: M railties/test/application/test_runner_test.rb commit 90a9715 refs/heads/master Merge: 8fc3915 3ed41e5 Author: Rafael Mendonça França Date: 2013-03-11 08:15:54 -0700 Merge pull request #9080 from sikachu/master-rails-test Add `rails test` command to run the test suite commit d5c7257 refs/heads/master Author: capps Date: 2013-03-11 08:10:43 -0700 I think "uniq" is more Rails-y than select("distinct(categories.id)") M guides/source/active_record_querying.md commit b3f894c refs/heads/master Author: Sebastian Sogamoso Date: 2013-03-11 08:00:19 -0500 Change ActionController::Parameters#require behavior when value is empty When the value for the required key is empty an ActionController::ParameterMissing is raised which gets caught by ActionController::Base and turned into a 400 Bad Request reply with a message in the body saying the key is missing, which is misleading. With these changes, ActionController::EmptyParameter will be raised which ActionController::Base will catch and turn into a 400 Bad Request reply with a message in the body saying the key value is empty. M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/test/controller/parameters/parameters_require_test.rb M actionpack/test/controller/required_params_test.rb M actionpack/test/dispatch/debug_exceptions_test.rb commit 8fc3915 refs/heads/master Merge: 46c3a57 647a9ab Author: Rafael Mendonça França Date: 2013-03-11 06:17:34 -0700 Merge pull request #9657 from vipulnsward/cleanup_tests Cleanup tests for unused variables commit 46c3a57 refs/heads/master Merge: 51af1b1 8b80311 Author: Rafael Mendonça França Date: 2013-03-11 06:16:16 -0700 Merge pull request #9658 from tkhr/add-assert-to-test_company_descends_from_active_record add an missing assertion to inheritance_test.rb commit 8b80311 refs/heads/master Author: Takehiro Adachi Date: 2013-03-11 20:27:13 +0900 add an missing assertion to inheritance_test.rb assertion for https://github.com/rails/rails/blob/ad624345e54bd20802de67b2b5c9ef29ecf5 d5f4/activerecord/lib/active_record/inheritance.rb#L32 M activerecord/test/cases/inheritance_test.rb commit 647a9ab refs/heads/master Author: Vipul A M Date: 2013-03-11 16:03:10 +0530 Cleanup tests for unused variables M activesupport/test/dependencies_test.rb M activesupport/test/inflector_test.rb M railties/test/railties/engine_test.rb commit 51af1b1 refs/heads/master Merge: 618b38e 20ae0d0 Author: Carlos Antonio da Silva Date: 2013-03-10 15:11:04 -0700 Merge pull request #9653 from jetthoughts/master Fixed tests `to_time` returning an instance of `Time` in the local system timezone. Tests for to_time returning an instance of Time in the local system timezone did not take in account DST when they used mixed timezone declarations like 'US/Eastern' and '-0500'. Replaced timezone with DST by timezone without DST. commit 20ae0d0 refs/heads/master Author: Paul Nikitochkin Date: 2013-03-10 23:57:11 +0200 Fixed tests for returning an instance of `Time` in the local system timezone. M activesupport/test/core_ext/string_ext_test.rb commit 618b38e refs/heads/master Merge: 9432c55 a0906da Author: Carlos Antonio da Silva Date: 2013-03-10 14:14:22 -0700 Merge pull request #9651 from vipulnsward/change_to_each_value_intest Change from each to each_value on hash to avoid unused variable warning commit 9432c55 refs/heads/master Merge: 5522fd9 5571e83 Author: Rafael Mendonça França Date: 2013-03-10 14:12:18 -0700 Merge pull request #9650 from yahonda/group_by_oracle Address ActiveRecord::StatementInvalid: OCIError: ORA-00979 commit a0906da refs/heads/master Author: Vipul A M Date: 2013-03-11 00:26:23 +0530 Change from each to each_value on hash to avoid unused variable warning M actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb commit 5571e83 refs/heads/master Author: Yasuo Honda Date: 2013-03-11 00:47:46 +0900 Address ActiveRecord::StatementInvalid: OCIError: ORA-00979 M activerecord/test/cases/base_test.rb commit 5522fd9 refs/heads/master Merge: dff4d4a 12d57ca Author: Carlos Antonio da Silva Date: 2013-03-10 09:30:14 -0700 Merge pull request #9645 from senny/9643_habtm_wrong_table_name document habtm join-table name with custom prefix [ci skip] commit 12d57ca refs/heads/master Author: Yves Senn Date: 2013-03-10 11:48:27 +0100 document habtm join-table name with custom prefix [ci skip]. Closes #9643. The logic was introduced with 46492949 M activerecord/lib/active_record/associations.rb commit dff4d4a refs/heads/master Merge: 6e5ab6f 72cf273 Author: Carlos Antonio da Silva Date: 2013-03-09 18:19:25 -0800 Merge pull request #9638 from siong1987/debugger Make sure that debugger isn't included in production environment. commit 72cf273 refs/heads/master Author: Teng Siong Ong Date: 2013-03-09 17:35:14 -0800 Make sure that debugger isn't included in production environment. M railties/lib/rails/generators/rails/app/templates/Gemfile commit 3ed41e5 refs/heads/master Author: Prem Sichanugrist Date: 2013-03-09 16:03:09 -0500 Make sure that `rails test` load test in test env M railties/lib/rails/commands.rb M railties/lib/rails/commands/test_runner.rb M railties/lib/rails/generators/rails/app/templates/test/test_helper.rb M railties/test/application/test_runner_test.rb commit b51673f refs/heads/master Author: Prem Sichanugrist Date: 2013-02-25 17:04:01 -0500 Update Rake tasks to call `rails test` instead Also, print out deprecation warning for other rake tasks except `rake test` and `rake` (default) M railties/lib/rails/test_unit/testing.rake M railties/test/application/rake_test.rb commit 6e5ab6f refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-09 19:20:48 -0300 Change uniq validation with conditions examples to use where with hashes Take the opportunity to showcase where.not. M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb commit f56cdbd refs/heads/master Merge: bbc87db 0bfaa2c Author: Carlos Antonio da Silva Date: 2013-03-09 14:15:29 -0800 Merge pull request #9637 from GSI/master Include Montevideo time zone in list of aliases. Closes #9628 commit bbc87db refs/heads/master Merge: ddd034f ad1a24f Author: Carlos Antonio da Silva Date: 2013-03-09 14:11:21 -0800 Merge pull request #9633 from senny/5321_make_it_lazy Uniqueness validation uses a proc to specify the `:conditions` option. This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated. commit ad1a24f refs/heads/master Author: Yves Senn Date: 2013-03-09 21:22:12 +0100 Uniqueness validation uses a proc to specify the `:conditions` option. This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated. M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb commit 0bfaa2c refs/heads/master Author: Gernot Date: 2013-03-09 20:08:32 -0200 included "Montevideo" in list of time zone aliases (closes Issue #9628) M activesupport/lib/active_support/values/time_zone.rb commit ddd034f refs/heads/master Merge: a6bd507 511c5ec Author: Carlos Antonio da Silva Date: 2013-03-09 13:42:07 -0800 Merge pull request #9618 from manvsmachine/fix-postgres-enable-extension-error Bugfix for enable_extension in postgresql_adapter. The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp). commit a6bd507 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-09 18:22:47 -0300 Fix "ActiveRecord" => "Active Record" in changelog [ci skip] M activerecord/CHANGELOG.md commit df85dfa refs/heads/master Author: Dalibor Nasevic Date: 2013-02-08 00:53:11 +0100 Improve wording for rails test command M guides/source/testing.md M railties/CHANGELOG.md M railties/lib/rails/commands/test_runner.rb M railties/lib/rails/generators/rails/app/templates/test/test_helper.rb M railties/test/application/test_runner_test.rb commit 1a0c58b refs/heads/master Author: Prem Sichanugrist Date: 2013-02-06 01:03:17 -0500 Load fixtures only when running suites, or `-f` * `rails test -f` will run the test suites with all fixtures loaded * New application will now generated without `fixtures :all` line enabled by default. M railties/CHANGELOG.md M railties/lib/rails/commands/test_runner.rb M railties/lib/rails/generators/rails/app/templates/test/test_helper.rb M railties/test/application/test_runner_test.rb commit 176b57c refs/heads/master Author: Prem Sichanugrist Date: 2013-02-01 17:21:09 -0500 Add support for MiniTest flags in TestRunner Any flags that got set will be passed through to MiniTest::Unit.runner, such as `-n`, `-s-, and `-v`. M guides/source/testing.md M railties/lib/rails/commands.rb M railties/lib/rails/commands/test_runner.rb M railties/test/application/test_runner_test.rb commit 9f75f77 refs/heads/master Author: Prem Sichanugrist Date: 2013-01-25 17:41:13 -0500 Update testing documentation * Update test invocation to use `rails test` instead. * Update all the test command previews (since we're now using MiniTest.) * Mentioning MiniTest instead of Test::Unit. * Update list of test suites. M guides/source/testing.md commit b4df253 refs/heads/master Author: Prem Sichanugrist and Chris Toomey Date: 2013-01-25 13:44:36 -0500 Add `rails test` command to run the test suite To run the whole test suite: $ rails test To run the test file(s): $ rails test test/unit/foo_test.rb [test/unit/bar_test.rb ...] To run the test suite $ rails test [models,helpers,units,controllers,mailers,...] For more information, see `rails test --help`. This command will eventually replacing `rake test:*`, and `rake test` command will actually invoking `rails test` instead. M railties/CHANGELOG.md M railties/lib/rails/commands.rb A railties/lib/rails/commands/test_runner.rb A railties/test/application/test_runner_test.rb commit 15970ef refs/heads/master Merge: 6a18ec0 992d87d Author: Jon Leighton Date: 2013-03-09 12:36:53 -0800 Merge pull request #9371 from benmoss/access-connection-via-class Access an instance's connection via its class, rather than via #connection commit 6a18ec0 refs/heads/master Merge: 9ae81be d552d8f Author: José Valim Date: 2013-03-09 12:35:23 -0800 Merge pull request #9626 from dasch/dasch/instrument-strong-params Use AS::Notifications to instrument Strong Params commit 9ae81be refs/heads/master Author: Jon Leighton Date: 2013-03-09 20:32:01 +0000 Fix race condition in test This should fix travis. For real this time! This is the one! The readpartial(100) meant that an earlier assert_stdout could chomp up the output that a later assert_stdout wants, meaning that the later assertion fails. Reading only 1 byte at a time ensure that we don't read any more than is necessary to verify the assertion. M railties/test/application/console_test.rb commit dc7b9d2 refs/remotes/origin/fix_ci (origin/fix_ci) Author: Jon Leighton Date: 2013-03-09 19:53:53 +0000 Experiment to try to fix the build M .travis.yml D railties/test/app_rails_loader_test.rb D railties/test/application/asset_debugging_test.rb D railties/test/application/assets_test.rb D railties/test/application/build_original_fullpath_test.rb D railties/test/application/configuration_test.rb M railties/test/application/console_test.rb D railties/test/application/generators_test.rb D railties/test/application/initializers/frameworks_test.rb D railties/test/application/initializers/hooks_test.rb D railties/test/application/initializers/i18n_test.rb D railties/test/application/initializers/load_path_test.rb D railties/test/application/initializers/notifications_test.rb D railties/test/application/loading_test.rb D railties/test/application/middleware/cache_test.rb D railties/test/application/middleware/cookies_test.rb D railties/test/application/middleware/exceptions_test.rb D railties/test/application/middleware/remote_ip_test.rb D railties/test/application/middleware/sendfile_test.rb D railties/test/application/middleware/session_test.rb D railties/test/application/middleware/static_test.rb D railties/test/application/middleware_test.rb D railties/test/application/paths_test.rb D railties/test/application/rack/logger_test.rb D railties/test/application/rackup_test.rb D railties/test/application/rake/dbs_test.rb D railties/test/application/rake/migrations_test.rb D railties/test/application/rake/notes_test.rb D railties/test/application/rake_test.rb D railties/test/application/routing_test.rb D railties/test/application/runner_test.rb D railties/test/application/test_test.rb D railties/test/application/url_generation_test.rb D railties/test/backtrace_cleaner_test.rb D railties/test/code_statistics_calculator_test.rb D railties/test/commands/console_test.rb D railties/test/commands/dbconsole_test.rb D railties/test/commands/server_test.rb D railties/test/configuration/middleware_stack_proxy_test.rb D railties/test/engine_test.rb D railties/test/generators/actions_test.rb D railties/test/generators/app_generator_test.rb D railties/test/generators/assets_generator_test.rb D railties/test/generators/controller_generator_test.rb D railties/test/generators/generated_attribute_test.rb D railties/test/generators/generator_generator_test.rb D railties/test/generators/helper_generator_test.rb D railties/test/generators/integration_test_generator_test.rb D railties/test/generators/mailer_generator_test.rb D railties/test/generators/migration_generator_test.rb D railties/test/generators/model_generator_test.rb D railties/test/generators/named_base_test.rb D railties/test/generators/namespaced_generators_test.rb D railties/test/generators/orm_test.rb D railties/test/generators/plugin_new_generator_test.rb D railties/test/generators/resource_generator_test.rb D railties/test/generators/scaffold_controller_generator_test.rb D railties/test/generators/scaffold_generator_test.rb D railties/test/generators/task_generator_test.rb D railties/test/generators_test.rb D railties/test/initializable_test.rb D railties/test/paths_test.rb D railties/test/rack_logger_test.rb D railties/test/rails_info_controller_test.rb D railties/test/rails_info_test.rb D railties/test/railties/engine_test.rb D railties/test/railties/generators_test.rb D railties/test/railties/mounted_engine_test.rb D railties/test/railties/railtie_test.rb commit 992d87d refs/heads/master Author: Ben Moss Date: 2013-03-09 14:54:19 -0500 Deprecate #connection in favour of accessing it via the class This allows end-users to have a `connection` method on their models without clashing with ActiveRecord internals. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/fixtures_test.rb M activerecord/test/cases/transaction_callbacks_test.rb commit ca35454 refs/heads/master Merge: 2357fa8 a58e660 Author: Carlos Antonio da Silva Date: 2013-03-09 11:58:29 -0800 Merge pull request #9632 from senny/unify_the_changelogs Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip] commit a58e660 refs/heads/master Author: Yves Senn Date: 2013-03-09 19:04:57 +0100 Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]. M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M railties/CHANGELOG.md commit 2357fa8 refs/heads/master Merge: b938f08 3dffa0d Author: Carlos Antonio da Silva Date: 2013-03-09 10:46:12 -0800 Merge pull request #9630 from robertjwhitney/update_collection_docs Update documentation for collection<< to reflect behavior for new parent objects. commit b938f08 refs/heads/master Merge: b3a31e9 be3e402 Author: Vijay Dev Date: 2013-03-10 00:09:26 +0530 Merge branch 'master' of github.com:lifo/docrails commit be3e402 refs/heads/master Author: Vijay Dev Date: 2013-03-10 00:06:51 +0530 copy edits [ci skip] M guides/source/action_mailer_basics.md M guides/source/active_record_querying.md commit 3dffa0d refs/heads/master Author: Robert Whitney Date: 2013-03-09 12:34:32 -0500 Update documentation for collection<< to reflect << on new records. collection<< does not automatically fire update sql unless the parent object is not a new record (and thus has a primary key). eg: p = Post.new p.comments << Comment.new does not call update sql until: p.save at which point it saves the parent object and then the collection object. changes that to the M activerecord/lib/active_record/associations.rb commit b3a31e9 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-09 14:57:10 -0300 Fix AMo code example indent, add missing author to entry [ci skip] M activemodel/CHANGELOG.md commit 72be5bb refs/remotes/origin/fix_ci Author: Jon Leighton Date: 2013-03-09 17:48:48 +0000 Bump up timeouts This should fix travis. Also ensuring that we don't try to kill when pid is nil. M railties/test/application/console_test.rb commit c614b76 refs/remotes/origin/fix_ci Merge: afd3ade ff25b0e Author: Steve Klabnik Date: 2013-03-09 09:43:42 -0800 Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_off Renumbering the comments in the application boot process. commit ff25b0e refs/remotes/origin/fix_ci Author: wangjohn Date: 2013-03-09 12:42:02 -0500 Renumbering the comments in the application boot process. M railties/lib/rails/application.rb commit afd3ade refs/remotes/origin/fix_ci Merge: 0b93c25 c41b768 Author: Carlos Antonio da Silva Date: 2013-03-09 09:22:45 -0800 Merge pull request #9627 from rubys/master ensure response.stream is closed commit c41b768 refs/remotes/origin/fix_ci Author: Sam Ruby Date: 2013-03-09 12:08:37 -0500 ensure response.stream is closed M actionpack/lib/action_controller/metal/live.rb commit 0b93c25 refs/heads/master Merge: 3a210da c3a26c5 Author: Jeremy Kemper Date: 2013-03-09 08:23:21 -0800 Merge pull request #9621 from sakuro/migration-magic-comment-fix Preserve magic comments and content encoding of copied migrations. commit a0c3c1e refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-03-09 06:48:04 -0800 Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/tags/base.rb actionpack/test/template/form_options_helper_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/test/template/form_options_helper_test.rb commit 3a210da refs/heads/master Merge: 01c8918 8e05a6f Author: Carlos Antonio da Silva Date: 2013-03-09 06:48:04 -0800 Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => commit 01c8918 refs/heads/master Merge: 11dd15a 3e61a55 Author: Carlos Antonio da Silva Date: 2013-03-09 05:45:07 -0800 Merge pull request #9623 from Agis-/patch-2 Remove extra whitespace and fix a comment commit 3e61a55 refs/heads/master Author: Agis Anastasopoulos Date: 2013-03-09 15:32:54 +0200 Remove extra whitespace and fix a comment minor comment fix for consistency M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 41b9e86 refs/heads/master Author: Yves Senn Date: 2013-03-09 12:21:28 +0100 fixed typo in strong parameters example M guides/source/action_controller_overview.md commit 1d8b566 refs/heads/master Author: Yves Senn Date: 2013-03-09 12:17:32 +0100 strong parameter example for hashes with integer keys. This replicates the situation described in https://github.com/rails/strong_parameters/issues/114 M guides/source/action_controller_overview.md commit c3a26c5 refs/heads/master Author: OZAWA Sakuro Date: 2013-03-09 15:37:26 +0900 Preserve magic comments and content encoding of copied migrations. During insertion of "# This migration comes from ... " comment at the beginning of a migration, presence of magic comment was not considered. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb A activerecord/test/migrations/magic/1_currencies_have_symbols.rb commit 511c5ec refs/heads/master Author: Darren Woodley Date: 2013-03-08 15:35:13 -0500 fixes enable_extension bug in postgresql_adapter The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp). removes CHANGELOG entry Deemed unnecessary. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 11dd15a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-08 21:48:27 -0300 Fix failing test regarding console change to fix sandboxing Introduced in be3e10cd26bc8ec29c6474d03a08a8e733108e7d. M railties/test/commands/console_test.rb commit 1fe5d36 refs/heads/master Author: Fabrizio Regini Date: 2013-03-08 23:29:58 +0100 Adding a note for :body option in `mail` method. M guides/source/action_mailer_basics.md commit e3c56ad refs/heads/master Merge: 6183fa7 3b98fb7 Author: Vijay Dev Date: 2013-03-08 11:21:01 -0800 Merge pull request #8670 from sanemat/fix/rake-desc Add rake test description commit 8e05a6f refs/heads/master Author: Olek Janiszewski Date: 2013-03-08 18:07:09 +0100 Fix incorrectly appended square brackets to a multiple select box If an explicit name has been given and it already ends with "[]" Before: select(:category, [], {}, multiple: true, name: "post[category][]") # => M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/tags/base.rb M actionpack/test/template/form_options_helper_test.rb commit 6183fa7 refs/heads/master Merge: a2d57fd dbc4134 Author: Rafael Mendonça França Date: 2013-03-08 08:55:16 -0800 Merge pull request #9614 from wangjohn/refactoring_nested_associations_for_readability Refactored nested associations so they are more readable. commit dbc4134 refs/heads/master Author: wangjohn Date: 2013-03-08 11:22:31 -0500 Refactored nested associations so they are more readable. Added comments which make it clearer about what's going on. M activerecord/lib/active_record/nested_attributes.rb commit 348d693 refs/tags/v3.2.15 Merge: 8f5c750 c8918c6 Author: Carlos Antonio da Silva Date: 2013-03-08 07:43:24 -0800 Merge pull request #9613 from arunagw/remove_fixme Removing FIXME commit a2d57fd refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-08 12:35:45 -0300 Fix changelog indent, remove self from method call in changelog/doc examples [ci skip] M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb commit e5fc096 refs/heads/master Author: Jon Leighton Date: 2013-03-08 15:10:00 +0000 The console --sandbox transaction should not be joinable Thanks @neerajdotname for noticing this bug. M activerecord/lib/active_record/railties/console_sandbox.rb M railties/test/application/console_test.rb commit c8918c6 refs/tags/v3.2.15 Author: Arun Agrawal Date: 2013-03-08 15:50:34 +0100 Removing FIXME As we did in master. M activerecord/test/cases/bind_parameter_test.rb commit 8f9c81b refs/heads/master Author: Rafael Mendonça França Date: 2013-03-08 11:55:50 -0300 Make sure options is a hash M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit ad62434 refs/heads/master Author: Rafael Mendonça França Date: 2013-03-08 11:55:31 -0300 Avoid short-circuit return M activerecord/lib/active_record/inheritance.rb commit 74d24ea refs/heads/master Merge: dd1d309 b04051d Author: Rafael Mendonça França Date: 2013-03-08 11:59:29 -0300 Merge pull request #9497 from route/subclass_from_attrs Fix ActiveRecord `subclass_from_attrs` when eager_load is false. Conflicts: activerecord/CHANGELOG.md commit dd1d309 refs/heads/master Merge: be3e10c 1231eb8 Author: Rafael Mendonça França Date: 2013-03-08 06:22:41 -0800 Merge pull request #9611 from choudhuryanupam/master Refactored test case with standard variable names commit 1231eb8 refs/heads/master Author: Anupam Choudhury Date: 2013-03-08 19:45:20 +0530 Refactored test case with standard variable naming M activerecord/test/cases/associations/belongs_to_associations_test.rb commit be3e10c refs/heads/master Author: Jon Leighton Date: 2013-03-08 13:34:58 +0000 Fix rails console --sandbox I've also added a proper acceptance test which reproduced the issue. Closes #9513, #9515. M activerecord/lib/active_record/railties/console_sandbox.rb M railties/lib/rails/commands/console.rb M railties/test/application/console_test.rb commit 4314d2b refs/heads/master Author: Neeraj Singh Date: 2013-03-08 08:47:38 -0500 fixing typo in the merging scopes section M guides/source/active_record_querying.md commit 2b8a05f refs/heads/master Author: Neeraj Singh Date: 2013-03-08 08:38:43 -0500 Explained how merging of scope works M guides/source/active_record_querying.md commit ba6b3c1 refs/heads/master Merge: 22f3121 b6226c3 Author: Rafael Mendonça França Date: 2013-03-08 10:35:16 -0300 Merge pull request #8868 from tehgeekmeister/master Use the index name explicitly provided in a migration when reverting. Fixes #8868 Conflicts: activerecord/CHANGELOG.md commit 22f3121 refs/heads/master Merge: de28157 9f54921 Author: Rafael Mendonça França Date: 2013-03-08 10:19:58 -0300 Merge pull request #8966 from cfabianski/disable_prepared_statement_when_preparing_a_query Unprepared Visitor + unprepared_statement Conflicts: activerecord/CHANGELOG.md commit de28157 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-08 04:41:21 -0800 Merge pull request #9609 from arunagw/using-latest-arjdbc Using latest AR-JDBC for JRuby M Gemfile commit 8f5c750 refs/tags/v3.2.15 Merge: 075d0e2 3033dbe Author: Carlos Antonio da Silva Date: 2013-03-08 04:41:21 -0800 Merge pull request #9609 from arunagw/using-latest-arjdbc Using latest AR-JDBC for JRuby commit 9588924 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-08 09:32:36 -0300 Update test name to reflect change in how scopes merging works Introduced in f1082b8588a9144eedb34d511f0074031f692d98. Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986. [ci skip] M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/named_scope_test.rb commit 9f007d7 refs/heads/master Author: Jon Leighton Date: 2013-03-08 10:44:42 +0000 Write a more comprehensive CHANGELOG message [ci skip] M activerecord/CHANGELOG.md commit f1082b8 refs/heads/master Merge: b670433 cd26b6a Author: Jon Leighton Date: 2013-03-08 02:35:06 -0800 Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-where 7365 merging scopes for where clauses commit 3033dbe refs/tags/v3.2.15 Author: Arun Agrawal Date: 2013-03-08 11:22:27 +0100 Using latest AR-JDBC for JRuby 1.2.5 and 1.2.6 are bad ones M Gemfile commit c27f948 refs/heads/master Author: Hendy Tanata Date: 2013-03-01 20:16:40 +0800 Some copy edit and formatting for upgrading guide. M guides/source/upgrading_ruby_on_rails.md commit 9f54921 refs/heads/master Author: Cédric FABIANSKI Date: 2013-01-16 20:08:07 +0100 Unprepared Visitor + unprepared_statement M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/relations_test.rb commit 9b27e13 refs/heads/master Author: Alex Robbin Date: 2013-03-07 23:24:27 -0500 remove the new metadata note in Rails 4 upgrade guide this was pulled out of Rails 4, see rails/rails#8399 for the discussion M guides/source/4_0_release_notes.md commit b6226c3 refs/heads/master Author: Ezekiel Smithburg Date: 2013-01-10 00:50:52 -0800 If an index can't be found by column, use the index name. schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858. this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration_test.rb commit b670433 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-07 21:32:51 -0300 Fix warnings M actionpack/test/controller/action_pack_assertions_test.rb commit a4c9538 refs/heads/master Merge: 087ce9d c132841 Author: Carlos Antonio da Silva Date: 2013-03-07 16:23:15 -0800 Merge pull request #9605 from neerajdotname/sqlite-support-savepoint SQLite3 3.6.8+ supports savepoints commit c132841 refs/heads/master Author: Neeraj Singh Date: 2013-03-07 17:13:01 -0500 SQLite3 3.6.8+ supports savepoints http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132 M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit cd26b6a refs/heads/master Author: Neeraj Singh and John Leighton Date: 2013-03-07 18:35:02 -0500 Combine scope conditions using AND Currently Post.active.inactive will result in Post.inactive since the last where clause wins when scopes are merged. This pull request will merge all scopes ( barring defaul scope) using AND. The default scope will be overridden if another scope acts on the same where clause. closes #7365 M activerecord/CHANGELOG.md M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/named_scope_test.rb commit 087ce9d refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-07 20:17:30 -0300 Fix hash spaces and use 1.9 style hash [ci skip] M actionpack/lib/action_view/template.rb commit a049631 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-07 20:15:49 -0300 Move AP changelog entry to the top [ci skip] M actionpack/CHANGELOG.md commit de4a60c refs/heads/master Merge: c683927 73deb3a Author: Rafael Mendonça França Date: 2013-03-07 14:00:39 -0800 Merge pull request #9464 from jcoyne/assert_template_file Allow use of assert_template with the :file option. commit 075d0e2 refs/tags/v3.2.15 Merge: 9bd5c86 f01f03e Author: Rafael Mendonça França Date: 2013-03-07 11:49:56 -0800 Merge pull request #9600 from larrylv/fix-load-target-with-identity-map-on @target might be nil when Identity Map is enabled. commit f01f03e refs/tags/v3.2.15 Author: Larry Lv Date: 2013-03-08 03:37:01 +0800 @target might be nil when Identity Map is enabled. * With Identity Map enabled, NameError might be raised and @target is nil. So we should always ensure `@target ||= find_target`. * Only force reload target when it is stale. M activerecord/lib/active_record/associations/association.rb commit b045b5c refs/heads/master Author: awilliams Date: 2013-03-07 19:05:27 +0100 fixes active_record_querying #pluck example M guides/source/active_record_querying.md commit c683927 refs/heads/master Merge: 2e3e171 fa18c61 Author: Rafael Mendonça França Date: 2013-03-07 08:31:14 -0800 Merge pull request #9597 from senny/9110_serialized_not_null_default test case for `serialize` default values. commit 2e3e171 refs/heads/master Merge: d3adfd6 1dc98c1 Author: Rafael Mendonça França Date: 2013-03-07 13:28:46 -0300 Merge pull request #9105 from bemurphy/cache_key_updated_on cache_key consults updated_on timestamp if present Conflicts: activerecord/CHANGELOG.md commit fa18c61 refs/heads/master Author: Yves Senn Date: 2013-02-04 09:48:21 +0100 test case for `serialize` default values. Closes #9110 M activerecord/test/cases/serialized_attribute_test.rb M activerecord/test/fixtures/traffic_lights.yml M activerecord/test/models/traffic_light.rb M activerecord/test/schema/schema.rb commit d3adfd6 refs/heads/master Merge: cf09ac3 53f18f2 Author: Rafael Mendonça França Date: 2013-03-07 13:26:03 -0300 Merge pull request #9474 from HonoreDB/master More helpful error message when instantiating an abstract class Conflicts: activerecord/CHANGELOG.md commit 9bd5c86 refs/tags/v3.2.15 Merge: bb0007f 939b896 Author: Rafael Mendonça França Date: 2013-03-07 08:23:23 -0800 Merge pull request #9549 from larrylv/reload-stable-target-before-saving Fix issue #7526. Reload the association target if it's stale. commit cf09ac3 refs/heads/master Merge: 7039fdd 8c1687b Author: Rafael Mendonça França Date: 2013-03-07 08:05:05 -0800 Merge pull request #9545 from senny/9535_secure_password_blank `has_secure_password` is not invalid when assigning empty Strings commit 7039fdd refs/heads/master Merge: 7a32495 239f0d0 Author: Rafael Mendonça França Date: 2013-03-07 07:47:25 -0800 Merge pull request #9595 from senny/remove_non_breaking_spaces replace non-breaking spaces with normal spaces [ci skip] commit 7a32495 refs/heads/master Merge: 173e0e0 f15d9bd Author: Rafael Mendonça França Date: 2013-03-07 07:44:02 -0800 Merge pull request #9596 from choudhuryanupam/master Refactored the code to remove irrelevant lines commit f15d9bd refs/heads/master Author: Anupam Choudhury Date: 2013-03-07 20:42:38 +0530 Refactored and removed unnecessary lines in the test case M activerecord/test/cases/associations/belongs_to_associations_test.rb commit 239f0d0 refs/heads/master Author: Yves Senn Date: 2013-03-07 16:05:32 +0100 replace non-breaking spaces with normal spaces [ci skip] M guides/code/getting_started/app/controllers/comments_controller.rb M guides/code/getting_started/app/controllers/posts_controller.rb commit bb0007f refs/tags/v3.2.15 Merge: 51ae6f4 5d57b82 Author: Rafael Mendonça França Date: 2013-03-07 06:07:24 -0800 Merge pull request #9594 from yahonda/3-2-stable_prefix_suffix Use shorter prefix and suffix to support Oracle adapter commit 173e0e0 refs/heads/master Author: Rafael Mendonça França Date: 2013-03-07 11:01:48 -0300 Remove regression test added in 0268b5d8cdc3c5a1337462135f0a326a2654ba1a It was added because a regression caused by a712e08ebe21f6d8653a0e6602df2e0f5d40d9ca Closes #9255 M activerecord/test/cases/persistence_test.rb commit 5d57b82 refs/tags/v3.2.15 Author: Yasuo Honda Date: 2013-03-07 06:41:41 +0900 Use shorter prefix and suffix as in Oracle database identifier cannot be larger than 30 characters M activerecord/test/cases/ar_schema_test.rb commit d552d8f refs/heads/master Author: Daniel Schierbeck Date: 2013-03-07 10:41:05 +0100 Use the instrumentation framework to instrument Strong Params M actionpack/lib/action_controller/log_subscriber.rb M actionpack/lib/action_controller/metal/strong_parameters.rb commit ccf256d refs/tags/v3.2.13.rc2 (tag: v3.2.13.rc2) Author: Aaron Patterson Date: 2013-03-06 15:05:13 -0800 bumping to rc2 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit b956771 refs/heads/master Author: Santiago Pastorino Date: 2013-03-06 18:25:47 -0200 debugger 1.4.0 works in Ruby 2.0 M Gemfile commit bac3777 refs/heads/master Merge: a8bc72e 482b076 Author: Rafael Mendonça França Date: 2013-03-06 12:02:58 -0800 Merge pull request #9586 from robertomiranda/useless_tr Change useless tr to gsub commit c5b5c68 refs/heads/master Author: Jess Brown Date: 2013-03-06 14:52:23 -0500 Update capture_helper.rb if there's content for the right column, then we need the two-column class, if not the one-column M actionpack/lib/action_view/helpers/capture_helper.rb commit 482b076 refs/heads/master Author: robertomiranda Date: 2013-03-06 14:50:17 -0500 Change useless tr to gsub M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb commit a8bc72e refs/heads/master Merge: 4ce9843 0a5fdcd Author: Rafael Mendonça França Date: 2013-03-06 07:03:04 -0800 Merge pull request #9538 from senny/remove_structure_dump `Connection#structure_dump` is no longer used commit 0a5fdcd refs/heads/master Author: Yves Senn Date: 2013-03-04 13:02:38 +0100 rake db:structure:dump warns when `mysqldump` is not in PATH. Closes #9518. The rake task used to fail silently and left an empty `structure.sql`. It's confusing for users to get to the root of the problem. The warning message tells them where to look. M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/tasks/mysql_rake_test.rb commit 854b742 refs/heads/master Author: Yves Senn Date: 2013-03-04 10:41:56 +0100 `Connection#structure_dump` is no longer used. #9518 As of ccc6910c we use `mysqldump` to create the `structure.sql`. The old `#structure_dump` code is still in AR but never used. I removed all relevant parts from the code-base. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/test/cases/adapters/mysql/reserved_word_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/mysql2/reserved_word_test.rb commit 4ce9843 refs/heads/master Merge: ac13b4d b337390 Author: Rafael Mendonça França Date: 2013-03-06 06:05:47 -0800 Merge pull request #9507 from senny/9483_migrations_without_transactions Transactions can be turned off per Migration commit ac13b4d refs/heads/master Merge: 12f785f 1ffaa7a Author: Carlos Antonio da Silva Date: 2013-03-06 05:28:19 -0800 Merge pull request #9585 from RKushnir/patch-1 Typo in comment to ActionView::Resolver#find_all commit 1ffaa7a refs/heads/master Author: RKushnir Date: 2013-03-06 15:20:09 +0200 Typo in comment to ActionView::Resolver#find_all M actionpack/lib/action_view/template/resolver.rb commit 12f785f refs/heads/master Merge: ee16932 f8b0e54 Author: Xavier Noria Date: 2013-03-06 00:33:02 -0800 Merge pull request #9581 from senny/9559_changelog_singularizing_singular CHANGELOG entry for improved singularizing of singulars. commit b04051d refs/heads/master Author: Dmitry Vorotilin Date: 2013-03-01 02:32:38 +0400 Fix ActiveRecord `subclass_from_attrs` when eager_load is false. It cannot find subclass because all classes are loaded automatically when it needs. M activerecord/CHANGELOG.md M activerecord/lib/active_record/inheritance.rb M activerecord/test/cases/inheritance_test.rb A activerecord/test/models/autoloadable/extra_firm.rb commit f8b0e54 refs/heads/master Author: Yves Senn Date: 2013-03-06 08:28:23 +0100 CHANGELOG entry for improved singularizing of singulars. Closes #9559. The actual patch was added with #4719 M activesupport/CHANGELOG.md commit ee16932 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-05 22:00:10 -0300 Add missing require to debug helper test M actionpack/test/template/debug_helper_test.rb commit 8b6e7fa refs/heads/master Merge: cfa9e61 8404925 Author: Rafael Mendonça França Date: 2013-03-05 14:35:59 -0800 Merge pull request #9574 from robertomiranda/debug_helper_test Add DebugHelperTest commit 8404925 refs/heads/master Author: robertomiranda Date: 2013-03-05 17:20:02 -0500 Add DebugHelperTest A actionpack/test/template/debug_helper_test.rb commit cfa9e61 refs/heads/master Merge: 9e43ce5 e9fc2d3 Author: Xavier Noria Date: 2013-03-05 13:55:36 -0800 Merge pull request #9565 from kennyj/remove_unused_return_value Remove unused return value, because collecting_queries_for_explain isn't public API. commit 9e43ce5 refs/heads/master Merge: 6ea48eb 8a189d0 Author: Guillermo Iguaran Date: 2013-03-05 13:15:41 -0800 Merge pull request #9573 from robertomiranda/useless_gsub Use gsub intead of tr when the to_str is longer than the from_str commit 8a189d0 refs/heads/master Author: robertomiranda Date: 2013-03-05 16:06:51 -0500 Use gsub intead of tr when the to_str is longer than the from_str M actionpack/lib/action_view/helpers/debug_helper.rb commit 1b699fc refs/tags/v3.2.13.rc2 Author: Aaron Patterson Date: 2013-03-05 11:33:16 -0800 Revert "Merge pull request #8209 from senny/backport_8176" This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb M activerecord/CHANGELOG.md M activerecord/test/cases/calculations_test.rb commit 51ae6f4 refs/tags/v3.2.15 Author: Steve Klabnik Date: 2013-03-05 11:22:55 -0800 Update CHANGELOGs for 3.2.13.rc1 M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit b544524 refs/tags/v3.2.13.rc2 Author: Santiago Pastorino Date: 2012-09-20 12:59:31 -0300 Freeze columns only once per Result Conflicts: activerecord/lib/active_record/result.rb M activerecord/lib/active_record/result.rb commit 2fb1cdd refs/heads/master Author: Akira Matsuda Date: 2013-03-06 03:56:36 +0900 Typppo M activerecord/lib/active_record/associations.rb M guides/source/active_support_instrumentation.md M guides/source/association_basics.md commit 6ea48eb refs/heads/master Merge: 588f267 b9b609e Author: Vijay Dev Date: 2013-03-05 22:51:48 +0530 Merge branch 'master' of github.com:lifo/docrails commit e9fc2d3 refs/heads/master Author: kennyj Date: 2013-03-06 00:35:55 +0900 Remove unused return value, because collecting_queries_for_explain isn't public API. M activerecord/lib/active_record/explain.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/explain_test.rb commit b337390 refs/heads/master Author: Yves Senn Date: 2013-03-01 11:39:39 +0100 transactions can be turned off per Migration. Closes #9483. There are SQL Queries that can't run inside a transaction. Since the Migrator used to wrap all Migrations inside a transaction there was no way to run these queries within a migration. This patch adds `self.disable_ddl_transaction!` to the migration to turn transactions off when necessary. M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration/logger_test.rb M activerecord/test/cases/migration_test.rb M guides/source/migrations.md commit 588f267 refs/heads/master Merge: 09d1fb2 3bf961d Author: Guillermo Iguaran Date: 2013-03-05 06:45:09 -0800 Merge pull request #9564 from robertomiranda/useless_gsub change useless gsub to tr commit 3bf961d refs/heads/master Author: robertomiranda Date: 2013-03-05 09:26:31 -0500 change useless gsub to tr M actionpack/lib/abstract_controller/translation.rb M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb M actionpack/lib/action_view/helpers/debug_helper.rb commit f1241ef refs/heads/master Author: Yves Senn Date: 2013-03-01 11:15:16 +0100 transactional migration test-case was broken. The cleanup commit a85625d broke the test-case. The schema was no longer modified so there was no way to check that the rollback actually happened. M activerecord/test/cases/migration_test.rb commit 09d1fb2 refs/heads/master Merge: 5cf472e 4b7a33e Author: Carlos Antonio da Silva Date: 2013-03-05 05:15:22 -0800 Merge pull request #9042 from senny/9034_float_0_0_is_always_dirty Assigning '0.0' to a nullable numeric column does not make it dirty Example: product = Product.create price: 0.0 product.price = '0.0' product.changed? # => false (this used to return true) product.changes # => {} (this used to return { price: [0.0, 0.0] }) commit 4b7a33e refs/heads/master Author: Yves Senn Date: 2013-01-23 10:57:05 +0100 assigning '0.0' to a nullable numeric column does not make it dirty M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/test/cases/dirty_test.rb commit 5cf472e refs/heads/master Merge: ee44469 3ef641e Author: Carlos Antonio da Silva Date: 2013-03-05 04:38:58 -0800 Merge pull request #9561 from inossidabile/explicit_match_via_requirement_exception_message Routing match `via` option requirement exception message made more explicit commit 3ef641e refs/heads/master Author: Boris Staal Date: 2013-03-05 19:05:14 +0700 Routing match `via` option requirement exception message made more explicit M actionpack/lib/action_dispatch/routing/mapper.rb commit 0df9647 refs/tags/v3.2.15 Merge: 927e649 d0f22a9 Author: Carlos Antonio da Silva Date: 2013-03-05 04:18:02 -0800 Merge pull request #9543 from maximerety/backport_fix_7774 Backported #7774 to 3-2-stable commit b9b609e refs/heads/master Author: Carson McDonald Date: 2013-03-05 07:10:41 -0500 Fix typo M activerecord/lib/active_record/associations.rb commit d0f22a9 refs/tags/v3.2.15 Author: maximerety Date: 2013-03-04 16:41:07 +0100 Backport fixes about #7774 to 3-2-stable Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is an empty string. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/dispatch/request_test.rb commit ee44469 refs/heads/master Merge: 57c516f c614711 Author: Carlos Antonio da Silva Date: 2013-03-05 03:38:46 -0800 Merge pull request #9557 from bonsaiben/useless_gsub Change useless gsub to delete commit 57c516f refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-05 08:31:44 -0300 Fix typo in AC overview guide [ci skip] M guides/source/action_controller_overview.md commit 3f490ca refs/heads/master Merge: 40936da 0e7abf2 Author: Xavier Noria Date: 2013-03-05 02:04:31 -0800 Merge pull request #9556 from senny/strong_params_examples strong parameters example for default values using `fetch`. commit 0e7abf2 refs/heads/master Author: Yves Senn Date: 2013-03-05 10:56:36 +0100 example for `accepts_nested_attribtues_for` and strong parameters. Closes #9558. M guides/source/action_controller_overview.md commit aeb48c3 refs/heads/master Author: Yves Senn Date: 2013-03-05 09:41:45 +0100 strong parameters example for default values using `fetch`. [ci skip] Origin: #9534. M guides/source/action_controller_overview.md commit c614711 refs/heads/master Author: Benjamin Sullivan Date: 2013-03-05 17:32:37 +0900 change useless gsub to delete M actionpack/lib/action_view/helpers/form_tag_helper.rb commit 55269f9 refs/heads/master Author: Jonathan Roes Date: 2013-03-05 00:15:07 -0500 Remove reference to BugMash. Link hasn't been updated in 4 years. M guides/source/contributing_to_ruby_on_rails.md commit 939b896 refs/tags/v3.2.15 Author: larrylv Date: 2013-03-04 17:38:22 +0800 Fix issue #7526. Reload the target if it's stale. * This has been fixed at master via `365b8b6`, but not at 3-2-stable branch. * @stale_state should be nil when a model isn't saved. via `0f3901e`. * set @stale_state to nil when reset the target. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/association.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/associations/through_association.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb commit bd308a0 refs/heads/master Author: Aman Gupta Date: 2013-03-04 20:40:58 -0800 avoid extra method calls for appending newlines before: ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' '); after: ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append=' ';@output_buffer.append=( spinner_img );@output_buffer.safe_append=' ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append=' '; M actionpack/lib/action_view/template/handlers/erb.rb commit b1c4469 refs/heads/master Author: Aman Gupta Date: 2013-03-04 20:36:25 -0800 Use ActionView::OutputBuffer#safe_append= from templates M actionpack/lib/action_view/buffers.rb M actionpack/lib/action_view/template/handlers/erb.rb commit 40936da refs/heads/master Merge: 5807513 cc986db Author: José Valim Date: 2013-03-04 20:17:17 -0800 Merge pull request #9554 from tmm1/string-gsub-hash Use 1.9 String#gsub syntax commit cc986db refs/heads/master Author: Aman Gupta Date: 2013-03-04 20:07:39 -0800 Call String#gsub with Hash directly M activesupport/lib/active_support/core_ext/string/output_safety.rb commit 0c39987 refs/heads/master Author: Ernie Miller Date: 2013-03-04 19:02:24 -0500 Fix WhereChain docs to mention only not M activerecord/lib/active_record/relation/query_methods.rb commit 5807513 refs/heads/master Author: Xavier Noria Date: 2013-03-04 22:27:58 +0100 adds guides/.document to tell rdoc not to process this directory When the Rails 4 gem is installed rdoc sees markdown files below the guides directory and processes them. With an empty .document file we prevent that from happening. Thanks to @drbrain for the tip. A guides/.document commit c5be90e refs/heads/master Merge: 54f9b75 8c7d401 Author: Rafael Mendonça França Date: 2013-03-04 12:26:50 -0800 Merge pull request #9467 from senny/9459_include_json_root_out_of_sync `ActiveRecord::Base.include_root_in_json` is `false` by default. commit 8c7d401 refs/heads/master Author: Yves Senn Date: 2013-03-04 20:30:05 +0100 `ActiveRecord::Base.include_root_in_json` is `false` by default. Closes #9459. The PR #6597 unified the configuration for `include_root_in_json` in AM and AR to `false`. Later on with the refactoring commit: e030f26 the value in AR was set to `true` but I think this was not on purpose. With this commit both AM and AR will have the same configuration for `include_root_in_json`, which is `false`. M activerecord/lib/active_record/serialization.rb M activerecord/test/cases/serialization_test.rb commit eeba679 refs/heads/master Author: Yves Senn Date: 2013-03-04 21:12:18 +0100 rewrite tests to have no side-effects on `include_root_in_json`. M activerecord/test/cases/json_serialization_test.rb commit 54f9b75 refs/heads/master Author: Aaron Patterson Date: 2013-02-22 15:32:35 +1100 only calculate next_id when we need a new method defined M activesupport/lib/active_support/callbacks.rb commit 8c1687b refs/heads/master Author: Yves Senn Date: 2013-03-04 18:56:05 +0100 `has_secure_password` is not invalid when assigning empty Strings. Closes #9535. With 692b3b6 the `password=` setter does no longer set blank passwords. This triggered validation errors when assigning empty Strings to `password` and `password_confirmation`. This patch only sets the confirmation if it is not `blank?`. M activemodel/CHANGELOG.md M activemodel/lib/active_model/secure_password.rb M activemodel/test/cases/secure_password_test.rb commit b501ee4 refs/heads/master Author: Yves Senn Date: 2013-03-04 18:50:56 +0100 `validates_confirmation_of` does not override writer methods. M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations/confirmation.rb M activemodel/test/cases/validations/confirmation_validation_test.rb commit b359c5d refs/heads/master Merge: 9025f49 1d217ab Author: José Valim Date: 2013-03-04 07:26:17 -0800 Merge pull request #9541 from maximerety/fix_7774 Fix formats on xhr requests when HTTP_ACCEPT is empty string commit 9025f49 refs/heads/master Merge: 2e28045 71e4dfc Author: Xavier Noria Date: 2013-03-04 07:00:11 -0800 Merge pull request #9540 from dimko/patch-1 Fixed typo in active record's changelog commit 71e4dfc refs/heads/master Author: Dimko Date: 2013-03-04 18:16:21 +0400 Fixed typo in active record's changelog M activerecord/CHANGELOG.md commit 1d217ab refs/heads/master Author: maximerety Date: 2013-03-04 14:43:31 +0000 Fix formats on xhr requests when HTTP_ACCEPT is empty string Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT header is empty string. About issue #7774, same fix as in commit bebb02f but for xhr requests. M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/dispatch/request_test.rb commit 2e28045 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-04 09:06:32 -0300 Remove .all usage from unscope doc examples [ci skip] M activerecord/lib/active_record/relation/query_methods.rb commit 96050e1 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-03-04 09:04:48 -0300 Use 1.9 hash style in changelog and doc examples [ci skip] M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb commit 8d69cd3 refs/heads/master Merge: 1909808 f9be80f Author: Steve Klabnik Date: 2013-03-04 03:22:53 -0800 Merge pull request #9537 from NARKOZ/patch-6 add prompt to 422 page to check logs commit f9be80f refs/heads/master Author: Nihad Abbasov Date: 2013-03-04 13:06:06 +0400 add prompt to 422 page to check logs M guides/code/getting_started/public/422.html M railties/lib/rails/generators/rails/app/templates/public/422.html commit 50b3b96 refs/heads/master Author: Lebin Sebastian F Date: 2013-03-04 13:23:23 +0530 Small Typo M activemodel/lib/active_model/conversion.rb commit 1909808 refs/heads/master Merge: d3fa025 2938754 Author: Jeremy Kemper Date: 2013-03-03 19:47:48 -0800 Merge pull request #9200 from wangjohn/unscoping_activerecord_merging Introduce relation #unscope commit d3fa025 refs/heads/master Merge: 9ee6f3c 1173138 Author: Carlos Antonio da Silva Date: 2013-03-03 17:47:57 -0800 Merge pull request #9532 from neerajdotname/fix-sql-in-example In example fix sql that is generated from scoping commit 2938754 refs/heads/master Author: wangjohn Date: 2013-02-11 23:23:01 -0500 Created an unscope method for removing relations from a chain of relations. Specific where values can be unscoped, and the unscope method still works when relations are merged or combined. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation_scoping_test.rb M guides/source/active_record_querying.md commit 9ee6f3c refs/heads/master Author: José Valim Date: 2013-03-03 13:20:44 -0700 Bring config.allow_concurrency back Since the Rack::Lock still exists in development, let's provide a way to disable it explicitly. M railties/lib/rails/application.rb M railties/lib/rails/application/configuration.rb M railties/test/application/middleware_test.rb commit 927e649 refs/tags/v3.2.15 Merge: 0108eaf 1129cb3 Author: Guillermo Iguaran Date: 2013-03-03 11:35:33 -0800 Merge pull request #9531 from erik-escobedo/patch-1 Fix typo on ActionPack's ChangeLog commit 0108eaf refs/tags/v3.2.15 Merge: d2b9862 98739cf Author: Andrew White Date: 2013-03-03 11:34:23 -0800 Merge pull request #9528 from korny/patch-1 Fix unused variable warning in mapper.rb commit 1129cb3 refs/tags/v3.2.15 Author: Érik Escobedo Date: 2013-03-03 13:33:45 -0600 Fix typo on CHANGELOG.md M actionpack/CHANGELOG.md commit 86cf7a2 refs/heads/master Author: Andrew White Date: 2013-03-03 19:18:01 +0000 Use custom visitor class for optimized url helpers Rather than trying to use gsub to remove the optional route segments, which will fail with nested optional segments, use a custom visitor class that returns a empty string for group nodes. Closes #9524 M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/visitors.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 98739cf refs/tags/v3.2.15 Author: Kornelius Kalnbach Date: 2013-03-03 19:14:37 +0100 remove unused path_without_format variable Was forgotten in a72dab0. M actionpack/lib/action_dispatch/routing/mapper.rb commit 53f18f2 refs/heads/master Author: Aaron Weiner Date: 2013-02-27 18:17:29 -0500 More helpful error message when instantiating an abstract class Calling a literal ActiveRecord::Base.new raises NoMethodError, since it ends up calling Class.abstract_class? which does not exist. Similarly, instantiating an actual abstract class hits the database, when conventionally it should immediately throw NotImplementedError. ActiveRecord::Base can't be made abstract without breaking many, many things, so check for it separately. M activerecord/CHANGELOG.md M activerecord/lib/active_record/inheritance.rb M activerecord/test/cases/base_test.rb commit 1173138 refs/heads/master Author: Neeraj Singh Date: 2013-03-03 11:55:20 -0500 fix the sql that is generated from scoping M activerecord/lib/active_record/relation.rb commit d2b9862 refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2012-09-20 12:59:31 -0300 Freeze columns only once per Result Conflicts: activerecord/lib/active_record/result.rb M activerecord/lib/active_record/result.rb commit 48c21e3 refs/heads/master Merge: 8fe904b fb63753 Author: Xavier Noria Date: 2013-03-03 04:49:58 -0800 Merge pull request #9465 from senny/document_strong_params_in_ac_guide integrate the strong params README into the AC guide. commit fb63753 refs/heads/master Author: Yves Senn Date: 2013-02-27 17:59:38 +0100 integrate the strong params README into the AC guide. The current ActionController guide does not mention strong parameters at all. I integrated the README into the guide to explain the API. I also included a section to illustrate that the API does not solve all possible whitelisting scenarios. The origin was #9454. M guides/source/action_controller_overview.md commit a007800 refs/heads/master Author: stopdropandrew Date: 2013-03-02 15:50:41 -0800 ActiveSupport::Notifications::Instrumenter#instrument should yield its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name. M activesupport/CHANGELOG.md M activesupport/lib/active_support/notifications/instrumenter.rb M activesupport/test/notifications/instrumenter_test.rb M activesupport/test/notifications_test.rb commit 8fe904b refs/heads/master Merge: dd5a80d 40f1642 Author: Guillermo Iguaran Date: 2013-03-02 14:06:37 -0800 Merge pull request #9512 from Jacke/master New 404, 422, 500 pages, they are more stylish and bring ruby essence… commit dd5a80d refs/heads/master Author: José Valim Date: 2013-03-02 13:52:32 -0700 Remove hard coded references to Active Record in railties M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/railties/databases.rake M railties/lib/rails/application/configuration.rb M railties/test/application/rake/dbs_test.rb commit c09f934 refs/heads/master Merge: 2d4068d 2cc0944 Author: Andrew White Date: 2013-03-02 10:03:04 +0000 Merge pull request #9431 from troyk/patch-2 Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time commit 2d4068d refs/heads/master Author: Akira Matsuda Date: 2013-03-02 11:16:14 +0900 :scissors: extra blank line M railties/lib/rails/generators/erb/scaffold/templates/show.html.erb commit b7d50f3 refs/heads/master Author: David Deller Date: 2013-03-01 18:05:18 -0500 Add explanation of :dependent => :restrict Based on information here: http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#method-i-has_many M guides/source/association_basics.md commit 35050ab refs/heads/master Merge: 99775fd b9399c4 Author: Rafael Mendonça França Date: 2013-03-01 12:31:43 -0800 Merge pull request #9510 from senny/7364_warn_when_appending_prepending_to_an_association deal with `#append` and `#prepend` on association collections commit b9399c4 refs/heads/master Author: Yves Senn Date: 2013-03-01 15:30:22 +0100 deal with `#append` and `#prepend` on association collections. Closes #7364. Collection associations behave similar to Arrays. However there is no way to prepend records. And to append one should use `<<`. Before this patch `#append` and `#prepend` did not add the record to the loaded association. `#append` now behaves like `<<` and `#prepend` is not defined. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/associations_test.rb commit 3dde99d refs/heads/master Author: Christine Hertzel Date: 2013-03-01 14:26:54 -0500 Reverting commit regarding public/index.html (no longer in Rails 4.) This reverts commit f8461f73c77c186ad0aa735fe9877990bffe1990. M guides/source/getting_started.md commit 99775fd refs/heads/master Author: Jeremy Kemper Date: 2013-03-01 11:47:04 -0700 Restore note about nested SCRIPT_NAME handling. M guides/source/upgrading_ruby_on_rails.md commit 40f1642 refs/heads/master Author: Stanislav Date: 2013-03-02 00:09:34 +0600 New beauty pages(404, 422, 500) moving changelog note to unreleased section New beauty pages(404, 422, 500) M guides/CHANGELOG.md M guides/code/getting_started/public/404.html M guides/code/getting_started/public/422.html M guides/code/getting_started/public/500.html M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/public/404.html M railties/lib/rails/generators/rails/app/templates/public/422.html M railties/lib/rails/generators/rails/app/templates/public/500.html commit a243f84 refs/heads/master Author: Christine Hertzel Date: 2013-03-01 13:05:00 -0500 Fixed grammatical error and simplified paragraph concerning controllers. Signed-off-by: Chelsea Macaluso M guides/source/getting_started.md commit 2cc0944 refs/heads/master Author: Troy Kruthoff Date: 2013-03-01 09:12:30 -0800 Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time In an AR model a timestamptz attribute would return a ruby string and AR tests did not check for any type casting. Previous tests would pass only because an assert_equal was being used on a Time.utc object, which will parse the right side of the eq to a valid Time instance for comparision. switch to test instance of Time instead of ActiveSupport::TimeWithZone M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit f8461f7 refs/heads/master Author: Chelsea Macaluso Date: 2013-03-01 12:32:40 -0500 Clarified removal of public/index.html file Signed-off-by: Trent Michaels M guides/source/getting_started.md commit baa32a5 refs/heads/master Author: Trent Michaels Date: 2013-03-01 12:08:12 -0500 Clarified need to remove existing code in welcome index. Signed-off-by: Chelsea Macaluso M guides/source/getting_started.md commit ce7133b refs/heads/master Author: Yves Senn Date: 2013-03-01 15:18:29 +0100 don't use non-ascii ' chars in documentation M activerecord/lib/active_record/associations/collection_proxy.rb commit 73deb3a refs/heads/master Author: Justin Coyne Date: 2013-02-27 09:44:25 -0600 Allow use of assert_template with the :file option. This worked in Rails 3.2, but was a regression in 4.0.0.beta1 M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/template.rb M actionpack/lib/action_view/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb commit b49a2a7 refs/heads/master Merge: bb9f831 20e0415 Author: Carlos Antonio da Silva Date: 2013-03-01 04:23:21 -0800 Merge pull request #8652 from codeodor/create_table_migration Support creating a table migration generator Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code. commit 20e0415 refs/heads/master Author: Sammy Larbi Date: 2012-12-26 13:02:28 -0600 Support creating a table migration generator Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code. M activerecord/CHANGELOG.md M activerecord/lib/rails/generators/active_record/migration/migration_generator.rb A activerecord/lib/rails/generators/active_record/migration/templates/create_table_migration.rb M activerecord/lib/rails/generators/active_record/model/model_generator.rb D activerecord/lib/rails/generators/active_record/model/templates/migration.rb M guides/source/migrations.md M railties/test/generators/migration_generator_test.rb commit bb9f831 refs/heads/master Author: Jeremy Kemper Date: 2013-02-28 21:22:34 -0700 Wordsmithing @trevorturk's upgrade notes Removed the bit about `SCRIPT_NAME` handling, since setting `default_url_options[:script_name]` does work correctly. We ran into an issue with it but it was an app bug. M guides/source/upgrading_ruby_on_rails.md commit 1823c2d refs/heads/master Merge: 2c33628 7874c9b Author: Jeremy Kemper Date: 2013-02-28 14:01:32 -0800 Merge pull request #9495 from trevorturk/upgrade-guide Add some more documentation to the upgrade guide commit 7874c9b refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:55:27 -0600 Document introduction of ActionDispatch::ParamsParser::ParseError M guides/source/upgrading_ruby_on_rails.md commit 5b8b977 refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:53:24 -0600 Document that scopes require a callable object M guides/source/upgrading_ruby_on_rails.md commit bbe6948 refs/heads/master Author: Mike Munroe Date: 2013-02-28 16:52:07 -0500 fix broken links to README docs in intro M README.rdoc commit 5187627 refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:50:28 -0600 Document common deprecations M guides/source/upgrading_ruby_on_rails.md commit 0407ef5 refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:45:37 -0600 Document the deprecation of ActionView::RecordIdentifier M guides/source/upgrading_ruby_on_rails.md commit 731aac7 refs/heads/master Author: Mike Munroe Date: 2013-02-28 16:42:39 -0500 change log4r link to most recent, updated location M activerecord/README.rdoc commit a1d8b03 refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:41:20 -0600 Document ActiveRecord::Fixtures becoming ActiveRecord::FixtureSet M guides/source/upgrading_ruby_on_rails.md commit 74d471a refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:40:25 -0600 Document change in routes using match M guides/source/upgrading_ruby_on_rails.md commit 2c33628 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-28 18:35:07 -0300 Improve the CHANGELOG entry [ci skip] M activerecord/CHANGELOG.md commit 97d9843 refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:34:38 -0600 Document removal of assets:precompile:primary M guides/source/upgrading_ruby_on_rails.md commit 12cbc57 refs/heads/master Merge: c4f2f5b e2a4b7a Author: Rafael Mendonça França Date: 2013-02-28 13:32:36 -0800 Merge pull request #9493 from kennyj/fix_wrong_exception Wrong exception is occured when raising no translatable exception Closes #8617 commit c4f2f5b refs/heads/master Author: Rafael Mendonça França Date: 2013-02-28 18:31:46 -0300 Improve the CHANGELOG entry [ci skip] M actionpack/CHANGELOG.md commit cfb04a6 refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:29:05 -0600 Document sass-rails asset_url deprecation M guides/source/upgrading_ruby_on_rails.md commit fae2e4d refs/heads/master Merge: dc53fe9 371a5f2 Author: Rafael Mendonça França Date: 2013-02-28 13:28:50 -0800 Merge pull request #9366 from killthekitten/fix-content_for-regression Fix for #9360 content_for regression commit 8ecc2ed refs/heads/master Author: Trevor Turk Date: 2013-02-28 15:19:54 -0600 Document caveat from 5b3bb61 which fixed handling SCRIPT_NAME from within mounted engine M guides/source/upgrading_ruby_on_rails.md commit 1525268 refs/heads/master Author: Trevor Turk Date: 2013-02-28 14:25:07 -0600 Document rails-observers extraction M guides/source/upgrading_ruby_on_rails.md commit 3dd5444 refs/heads/master Author: Trevor Turk Date: 2013-02-28 14:17:47 -0600 Document the switch from memcache-client to dalli M guides/source/upgrading_ruby_on_rails.md commit decff78 refs/heads/master Author: Trevor Turk Date: 2013-02-28 14:16:36 -0600 Improve docs for UpgradeSignatureToEncryptionCookieStore M guides/source/upgrading_ruby_on_rails.md commit 27a304d refs/heads/master Author: Trevor Turk Date: 2013-02-28 14:06:15 -0600 Document extraction of actionpack-xml_parser M guides/source/upgrading_ruby_on_rails.md commit 43ab015 refs/heads/master Author: Trevor Turk Date: 2013-02-28 14:02:56 -0600 Document introduction of the ActionController::UnknownFormat exception M guides/source/upgrading_ruby_on_rails.md commit dc53fe9 refs/heads/master Author: José Valim Date: 2013-02-28 12:09:04 -0700 Ensure plugins generated with plugin new can boot the dummy application M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb M railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec M railties/lib/rails/generators/rails/plugin_new/templates/Gemfile A railties/lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js A railties/lib/rails/generators/rails/plugin_new/templates/rails/stylesheets.css M railties/test/generators/plugin_new_generator_test.rb commit e2a4b7a refs/heads/master Author: kennyj Date: 2013-03-01 01:55:20 +0900 Wrong exception is occured when raising no translatable exception M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 2e2f8c0 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-02-28 08:59:07 +0100 Update docs, change_table does not use TableDefinition. [ci skip] Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 8f6b70f refs/heads/master Merge: a389438 5d0ca74 Author: Carlos Antonio da Silva Date: 2013-02-28 04:49:47 -0800 Merge pull request #9484 from senny/9480_change_table_and_hstore Support PostgreSQL specific column types when using `change_table`. We use `TableDefinition` for `#create_table` and `Table` for `#change_table`. The PostgreSQL sepcific types were only defined on `TableDefinition` so they needed to be added to `Table` as well. commit 5d0ca74 refs/heads/master Author: Yves Senn Date: 2013-02-28 10:05:13 +0100 Support PostgreSQL specific column types when using `change_table`. Closes #9480. We use `TableDefinition` for `#create_table` and `Table` for `#change_table`. The PostgreSQL sepcifc types were only defined on `TableDefinition` so I also added them to `Table`. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/adapters/postgresql/json_test.rb commit 9756aa6 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-28 09:03:37 -0300 Improve AR changelog [ci skip] M activerecord/CHANGELOG.md commit 5e1d629 refs/tags/v3.2.15 Merge: 641a27d 3170d2b Author: Carlos Antonio da Silva Date: 2013-02-28 04:00:38 -0800 Merge pull request #9485 from authorNari/backport-6755-to-3-2-stable Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load. CSV fixtures have already been removed some time ago in 1716da07204193c8acf967e2d75a53a82e4c7c28, but the task was still loading them, even though later it tried to find the related yaml file. commit a389438 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-28 08:41:53 -0300 Minor changelog improvement [ci skip] M actionpack/CHANGELOG.md commit 3170d2b refs/tags/v3.2.15 Author: Narihiro Nakamura Date: 2013-02-28 18:00:15 +0900 Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load. M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake M railties/test/application/rake_test.rb commit 36abb55 refs/heads/master Author: Yves Senn Date: 2013-02-28 08:59:07 +0100 update docs, change_table does not use TableDefinition. M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit cf278a6 refs/heads/master Author: Andrew White Date: 2013-02-28 03:37:52 +0000 Remove redundant method M actionpack/lib/action_dispatch/routing/mapper.rb commit 17cff2c refs/heads/master Merge: 9126d53 afddc04 Author: Andrew White Date: 2013-02-27 19:17:31 -0800 Merge pull request #9469 from senny/9466_format_enforcing_routes `format: true` does not override existing format constraints. commit 3f8eb4e refs/tags/v3.1.12 Merge: 2821f95 d3dc2a7 Author: Guillermo Iguaran Date: 2013-02-27 16:59:56 -0800 Merge pull request #9475 from queso/update-mail Update gemspec to get mail 2.4 as the main version, 2.3.3 has security i... commit 9126d53 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-27 21:03:59 -0300 Enforce i18n version >= v0.6.4 Keep in sync with 3-2-stable. M activesupport/activesupport.gemspec commit 641a27d refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-27 21:03:59 -0300 Enforce i18n version >= v0.6.4 v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see https://github.com/svenfuchs/i18n/issues/192 for more info. M activesupport/activesupport.gemspec commit d3dc2a7 refs/tags/v3.1.12 Author: Josh Owens Date: 2013-02-27 15:59:30 -0800 Update gemspec to get mail 2.4 as the main version, 2.3.3 has security issues. M actionmailer/actionmailer.gemspec commit a1f18d3 refs/tags/v3.2.15 Merge: 6a65a8c c27da1f Author: Rafael Mendonça França Date: 2013-02-27 13:12:47 -0800 Merge pull request #9472 from yahonda/revert_7544c7a9 Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated ... commit c27da1f refs/tags/v3.2.15 Author: Yasuo Honda Date: 2013-02-28 05:43:01 +0900 Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle adapter." This reverts commit 7544c7a9f290a3ea25099ae38d52795458391785. Oracle enhanced adapter is supporting remove_column with Array. M activerecord/test/cases/migration_test.rb commit 6a65a8c refs/tags/v3.2.15 Merge: 197b9f4 97df33d Author: Rafael Mendonça França Date: 2013-02-27 12:36:04 -0800 Merge pull request #9471 from yahonda/5837_32-stable Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix commit 97df33d refs/tags/v3.2.15 Author: Yasuo Honda Date: 2013-02-28 05:22:08 +0900 Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix backport pull request#5837 to 3-2-stable M activerecord/test/cases/migration_test.rb commit 5ca59b0 refs/tags/v3.2.13.rc1 (tag: v3.2.13.rc1) Author: Steve Klabnik Date: 2013-02-27 12:19:06 -0800 Preparing for 3.2.13.rc1 release M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit afddc04 refs/heads/master Author: Yves Senn Date: 2013-02-27 19:57:41 +0100 `format: true` does not override existing format constraints. Closes #9466. Passing `format: true` used to override the constraints: { format: /json/ } with `/.+/`. This patch only sets the format if there is no constraint present. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 23434f6 refs/tags/v3.2.13.rc1 Author: Steve Klabnik Date: 2013-02-27 10:01:29 -0800 Update CHANGELOGs for 3.2.13 release. M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit afd4a14 refs/heads/master Author: Steve Klabnik Date: 2013-02-27 08:46:40 -0800 Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric" This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/quoting_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/schema/schema.rb commit 9fdd56c refs/remotes/origin/3-0-stable Author: Steve Klabnik Date: 2013-02-27 08:31:29 -0800 Revert "Merge pull request #9210 from dylanahsmith/3-0-mysql-quote-numeric" This reverts commit 663c9a6335b39f3b63d32619cbb11bece248f982, reversing changes made to 10513d2eb9892c9e2bfe0ae04c9c16165c5c1544. M activerecord/CHANGELOG M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/schema/schema.rb commit 2821f95 refs/tags/v3.1.12 Author: Steve Klabnik Date: 2013-02-26 16:57:18 -0800 Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric" This reverts commit 921a296a3390192a71abeec6d9a035cc6d1865c8. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/quoting_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/schema/schema.rb commit 5c13549 refs/heads/master Author: José Valim Date: 2013-02-27 08:30:35 -0700 Improve docs for AbsC::Rendering M actionpack/lib/abstract_controller/rendering.rb commit 45aabe6 refs/heads/master Author: Santiago Pastorino Date: 2013-02-27 13:11:43 -0200 There's no need to access Railties through self.class Closes #9386 M railties/lib/rails/engine.rb commit 02037c3 refs/heads/master Merge: ab87689 dd0bbd2 Author: Carlos Antonio da Silva Date: 2013-02-27 11:47:24 -0300 Merge pull request #9218 from Fivell/master Fix calculation of db_runtime property in ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime. Previously, after raising ActionView::MissingTemplate, db_runtime was not populated. Closes #9218, Fixes #9215. Conflicts: activerecord/CHANGELOG.md commit dd0bbd2 refs/heads/master Author: Igor Date: 2013-02-08 00:54:46 +0200 fix db_runtime attribute value after raising ActionView::MissingTemplate exception M actionpack/test/activerecord/controller_runtime_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/controller_runtime.rb commit ab87689 refs/heads/master Merge: a87687e a689482 Author: Carlos Antonio da Silva Date: 2013-02-27 04:49:46 -0800 Merge pull request #9457 from senny/remove_duplicated_number_helper_tests Remove duplicated number_helper tests in AP. They are already in AS. With 155cd5e the number_helpers were moved into AS all the tests were copied over but the tests in AP were not deleted. This is confusing. This removes all duplicated tests and reorganized the tests in AP to only test the functionality, that is added in AP. Also cleanup some of the number helper tests. commit a689482 refs/heads/master Author: Yves Senn Date: 2013-02-27 13:40:24 +0100 cleanup AP number_helpers_test * use 1.9 style hash syntax * don't use brances on assert_equal * prefere " over ' M actionpack/test/template/number_helper_test.rb commit 152f2f3 refs/heads/master Author: Yves Senn Date: 2013-02-27 10:19:17 +0100 remove duplicated number_helper tests in AP. They are already in AS. With 155cd5e6 the number_helpers were moved into AS all the tests were copied over but the tests in AP were not deleted. This is confusing. I removed all duplicated tests and reorganized the tests in AP to only test the functionality, that is added in AP. M actionpack/test/template/number_helper_test.rb commit a87687e refs/heads/master Merge: b080ad3 063ba21 Author: Carlos Antonio da Silva Date: 2013-02-27 04:31:06 -0800 Merge pull request #9359 from justinwb/master Removed template_root as a configuration option commit 197b9f4 refs/tags/v3.2.15 Author: Steve Klabnik Date: 2013-02-26 20:28:35 -0800 Tighten up AS.gemspec. Apparently 0.6.2 has a call to force_encoding, which is not around in 1.8.7. M activesupport/activesupport.gemspec commit 1a88523 refs/tags/v3.2.15 Author: Steve Klabnik Date: 2013-02-26 17:09:23 -0800 CHANGELOG entry for ee291b9. Since we released it, it should go in the CHANGELOG. M activerecord/CHANGELOG.md commit ee291b9 refs/tags/v3.2.15 Author: Steve Klabnik Date: 2013-02-26 16:57:18 -0800 Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric" This reverts commit 921a296a3390192a71abeec6d9a035cc6d1865c8. M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/quoting_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/schema/schema.rb commit b080ad3 refs/heads/master Merge: 6a235fa 16bd04f Author: Steve Klabnik Date: 2013-02-26 16:08:00 -0800 Merge pull request #9452 from frodsan/remove_private_attribute_warning remove private attribute? warning commit 16bd04f refs/heads/master Author: Francesco Rodriguez Date: 2013-02-26 18:56:56 -0500 remove private attribute? warning M actionpack/lib/action_view/dependency_tracker.rb commit 6a235fa refs/heads/master Merge: 923ec86 794cbf3 Author: Andrew White Date: 2013-02-26 12:59:11 -0800 Merge pull request #9439 from senny/9435_router_params_as_integers convert non-string default params to strings in the router. commit 794cbf3 refs/heads/master Author: Yves Senn Date: 2013-02-26 14:30:19 +0100 allow non-String default params in the router. Closes #9435. Skip valid encoding checks for non-String parameters that come from the matched route's defaults. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 923ec86 refs/heads/master Merge: ffeb7dd 09d9f04 Author: Andrew White Date: 2013-02-26 12:26:06 -0800 Merge pull request #9437 from senny/9432_undefined_method_source_in_routes the router allows String contraints. commit 09d9f04 refs/heads/master Author: Yves Senn Date: 2013-02-26 11:42:55 +0100 the router allows String contraints. Closes #9432. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit ffeb7dd refs/heads/master Merge: 5112a6c 72a4670 Author: Aaron Patterson Date: 2013-02-26 11:42:47 -0800 Merge pull request #8010 from subwindow/postgres_inet_default_fix Fix default output for postgres network address types commit 72a4670 refs/heads/master Author: Erik Peterson Date: 2012-10-22 13:48:57 -0400 Fix default output for postgres network address types M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 5112a6c refs/heads/master Author: Steve Klabnik Date: 2013-02-26 11:21:37 -0800 Move AS CHANGELOG entry up. I merged b883706 but forgot to move the entry past beta1. M activesupport/CHANGELOG.md commit 95883ca refs/heads/master Merge: 2fa9c88 b883706 Author: Steve Klabnik Date: 2013-02-26 11:15:29 -0800 Merge pull request #9329 from chuckbjones/fix-cache-delete-rc Fix deletion of empty directories commit 55a1765 refs/tags/v3.2.15 Author: Hiroshige Umino Date: 2013-02-26 11:32:04 +0900 Do not override attributes on `dup` by default scopes M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/dup_test.rb commit 2fa9c88 refs/heads/master Author: Santiago Pastorino Date: 2013-02-26 16:14:00 -0200 We want i18n >= 0.6.2 but < 1.0 M activesupport/activesupport.gemspec commit 00f8002 refs/heads/master Merge: fcf8d6e a025cd7 Author: Carlos Antonio da Silva Date: 2013-02-26 09:49:50 -0800 Merge pull request #9446 from bemurphy/enhance_root_route_guide Add routing guide doc on root with namespaces. [ci skip] commit fcf8d6e refs/heads/master Merge: e24e086 dce4383 Author: Rafael Mendonça França Date: 2013-02-26 09:47:33 -0800 Merge pull request #9443 from exviva/belongs_to_touch_new_record Fix touching an invalid parent record for belongs_to commit dce4383 refs/heads/master Author: Olek Janiszewski Date: 2013-02-26 16:55:18 +0100 Fix touching an invalid parent record for belongs_to If the parent of a `belongs_to` record fails to be saved due to validation errors, `touch` will be called on a new record, which causes an exception (see https://github.com/rails/rails/pull/9320). Example: class Owner < ActiveRecord::Base validates_presence_of :name end class Pet < ActiveRecord::Base belongs_to :owner, touch: true end pet = Pet.new(owner: Owner.new) # Before, this line would raise ActiveRecord::ActiveRecordError # "can not touch on a new record object" pet.save M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/belongs_to.rb M activerecord/test/cases/timestamp_test.rb commit a025cd7 refs/heads/master Author: Brendon Murphy Date: 2013-02-26 09:43:32 -0800 Add routing guide doc on root with namespaces. I read #9419 and realized I didn't know you could have namespaced roots, checked around, and a few friends didn't either. Figured this makes it guide worthy. M guides/source/routing.md commit e24e086 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-26 14:16:55 -0300 Move the CHANGELOG entry to the proper place [ci skip] M actionpack/CHANGELOG.md commit 28bebb2 refs/heads/master Merge: 62b783e 35f38b7 Author: Rafael Mendonça França Date: 2013-02-26 09:15:43 -0800 Merge pull request #9434 from zires/dev Journey::Path::Pattern#new raise more meaningful exception message. commit 35f38b7 refs/heads/master Author: zires Date: 2013-02-26 13:09:13 +0800 Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful exception message. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/test/journey/path/pattern_test.rb commit 62b783e refs/heads/master Merge: 3d9cfe0 3f9baeb Author: Xavier Noria Date: 2013-02-26 08:57:48 -0800 Merge pull request #9442 from czarneckid/adjust-generator-language Use less hyperbole in the language re: allowed parameters commit 3d9cfe0 refs/heads/master Merge: 0f75e2c 7487e79 Author: Rafael Mendonça França Date: 2013-02-26 08:55:48 -0800 Merge pull request #9444 from frodsan/add_test_for_977455cc Add tests for #9441 commit 7487e79 refs/heads/master Author: Francesco Rodriguez Date: 2013-02-26 11:50:48 -0500 Add tests for #9441 M actionpack/test/controller/routing_test.rb commit 0f75e2c refs/heads/master Author: Rafael Mendonça França Date: 2013-02-26 13:45:20 -0300 Update CHANGELOGS M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M guides/CHANGELOG.md M railties/CHANGELOG.md commit 7184e3e refs/heads/master Merge: b1dee8c b21a73d Author: Vijay Dev Date: 2013-02-26 21:53:38 +0530 Merge branch 'master' of github.com:lifo/docrails commit 3f9baeb refs/heads/master Author: David Czarnecki Date: 2013-02-26 10:49:47 -0500 Use less hyperbole in the language re: allowed parameters M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit b1dee8c refs/heads/master Merge: 8bc5e71 977455c Author: Guillermo Iguaran Date: 2013-02-26 06:56:06 -0800 Merge pull request #9441 from rubys/master This is a small thing, motivated by https://github.com/rails/rails/issues/9419 commit 977455c refs/heads/master Author: Sam Ruby Date: 2013-02-26 09:51:35 -0500 Allow both a path and an option on root in config/routes M actionpack/lib/action_dispatch/routing/mapper.rb commit 8bc5e71 refs/heads/master Merge: 39394ab e035699 Author: Rafael Mendonça França Date: 2013-02-26 05:15:14 -0800 Merge pull request #9414 from senny/9275_order_with_symbol_and_join Expand order(:symbol) to "table".symbol to prevent broken queries on PG. commit c90e24d refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-26 08:38:12 -0300 Improve changelog entry [ci skip] M activerecord/CHANGELOG.md commit 06eb872 refs/tags/v3.2.15 Merge: 0761bb0 905b7df Author: Carlos Antonio da Silva Date: 2013-02-26 03:36:06 -0800 Merge pull request #9430 from authorNari/backport-7072-to-3-2-stable Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope commit 1dc98c1 refs/heads/master Author: Brendon Murphy Date: 2013-01-23 01:47:23 -0800 cache_key consults updated_on timestamp if present - Extract max timestamp retrieval for cache_key - Update changelog for cache_key changes M activerecord/CHANGELOG.md M activerecord/lib/active_record/integration.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/base_test.rb M activerecord/test/schema/schema.rb commit 39394ab refs/heads/master Author: Akira Matsuda Date: 2013-02-26 16:59:12 +0900 No need to send public methods M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/join_dependency/join_part.rb M activerecord/lib/active_record/autosave_association.rb commit 905b7df refs/tags/v3.2.15 Author: Narihiro Nakamura Date: 2013-02-26 14:39:26 +0900 Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope. M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb commit 92aa789 refs/heads/master Merge: 30859a0 066ae49 Author: Guillermo Iguaran Date: 2013-02-25 21:12:00 -0800 Merge pull request #9429 from frodsan/racc_jruby_incompatibility JRuby does not support racc, include it only in ruby platform commit 066ae49 refs/heads/master Author: Francesco Rodriguez Date: 2013-02-26 00:10:03 -0500 JRuby does not support racc, include it only in ruby platform M Gemfile commit 30859a0 refs/heads/master Merge: 670a267 33d92bf Author: Guillermo Iguaran Date: 2013-02-25 20:03:08 -0800 Merge pull request #9419 from banyan/change-default-root-route-helper Change default root route helper commit 670a267 refs/heads/master Author: José Valim Date: 2013-02-25 20:42:36 -0700 Apparently we can't get away from adding lib to the load path M railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb commit 882f2da refs/heads/master Author: José Valim Date: 2013-02-25 19:49:13 -0700 Plugins can use a similar bootscript to Rails apps M railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb commit 987daa7 refs/heads/master Merge: 202041e 212153c Author: Rafael Mendonça França Date: 2013-02-25 18:02:11 -0800 Merge pull request #9425 from dickeyxxx/patch-1 small typo on upgrade guide commit 212153c refs/heads/master Author: Jeff Dickey Date: 2013-02-25 17:57:42 -0800 small typo small typo fix M guides/source/upgrading_ruby_on_rails.md commit b883706 refs/heads/master Author: Charles Jones Date: 2013-02-18 18:37:48 -0600 Fix deletion of empty directories: 1. When comparing the directory to delete against the top level cache_path, use File.realpath to make sure we aren't comparing two unequal strings that point to the same path. This occurs, for example, when cache_path has a trailing slash, which it does in the default Rails configuration. Since the input to delete_empty_directories never has a trailing slash, the comparison will never be true and the top level cache directory (and above) may be deleted. However… 2. File.delete raises EPERM when trying to delete a directory, so no directories have ever been deleted. Changing the code to Dir.delete fixes that. M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache/file_store.rb M activesupport/test/caching_test.rb commit 202041e refs/tags/v4.0.0.beta1 (tag: v4.0.0.beta1) Author: Jeremy Kemper Date: 2013-02-25 17:05:20 -0600 Bundler 1.3.0 released. We prefer it for new binstub behavior. M rails.gemspec commit 80f7975 refs/tags/v4.0.0.beta1 Author: Guillermo Iguaran Date: 2013-02-25 18:03:27 -0500 Bump i18n version to 0.6.2 M activesupport/activesupport.gemspec commit bd36f18 refs/tags/v4.0.0.beta1 Author: Rafael Mendonça França Date: 2013-02-25 18:44:19 -0300 Are was release M Gemfile M activerecord/activerecord.gemspec commit 94bebde refs/tags/v4.0.0.beta1 Author: Guillermo Iguaran Date: 2013-02-25 16:39:25 -0500 Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile M Gemfile M railties/lib/rails/generators/app_base.rb commit a44a5e4 refs/tags/v4.0.0.beta1 Author: Xavier Noria Date: 2013-02-25 22:16:10 +0100 removes redundant require It turns out this file is required in active_record.rb. M activerecord/lib/active_record/dynamic_matchers.rb commit 46bb302 refs/tags/v4.0.0.beta1 Merge: 25f90a4 ed6d8f0 Author: Guillermo Iguaran Date: 2013-02-25 12:35:34 -0800 Merge pull request #9420 from robertomiranda/remove-sprockets-rails Remove sprockets-rails from the Gemfile generator commit ed6d8f0 refs/tags/v4.0.0.beta1 Author: robertomiranda Date: 2013-02-25 15:32:00 -0500 Remove sprockets-rails from the Gemfile generator M railties/lib/rails/generators/app_base.rb commit 25f90a4 refs/tags/v4.0.0.beta1 Author: Xavier Noria Date: 2013-02-25 21:31:54 +0100 typo M activerecord/CHANGELOG.md commit 3d303f5 refs/tags/v4.0.0.beta1 Author: Xavier Noria Date: 2013-02-25 21:31:03 +0100 AR loads activerecord-deprecated_finders, no need to add it to the Gemfile M activerecord/CHANGELOG.md M activerecord/lib/active_record/dynamic_matchers.rb commit e75ce25 refs/tags/v4.0.0.beta1 Author: Guillermo Iguaran Date: 2013-02-25 14:45:56 -0500 sprockets 2.0.0.rc3 is in rails gemspec already M Gemfile commit 612ebbc refs/tags/v4.0.0.beta1 Author: José Valim Date: 2013-02-25 12:35:14 -0700 ar-deprecated_finders is already in the gemspec M Gemfile commit efabcb4 refs/tags/v4.0.0.beta1 Author: Rafael Mendonça França Date: 2013-02-25 16:29:20 -0300 I released 0.0.3 some time ago M Gemfile commit cf863ce refs/tags/v4.0.0.beta1 Author: Rafael Mendonça França Date: 2013-02-25 16:26:24 -0300 jquery-rails 2.2.1 was released M Gemfile commit 6730272 refs/tags/v4.0.0.beta1 Author: José Valim Date: 2013-02-25 12:23:46 -0700 Remove rack-test git dependency The dependency was introduced in this commit: 002713c64568114f3754799acc0723ea0d442f7a which has been released a long time ago M Gemfile commit 33d92bf refs/heads/master Author: Kohei Hasegawa Date: 2013-02-26 03:25:06 +0900 Change default root route helper M guides/code/getting_started/config/routes.rb M railties/lib/rails/generators/actions.rb M railties/lib/rails/generators/rails/app/templates/config/routes.rb commit e035699 refs/heads/master Author: Yves Senn Date: 2013-02-25 11:40:30 +0100 Expand order(:symbol) to "table".symbol to prevent broken queries on PG. Fixes #9275. When `#order` is called with a Symbol this patch will prepend the quoted_table_name. Before the postgresql adapter failed to build queries containg a join and an order with a symbol. This expansion happens for all adapters. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/relation_test.rb commit 371a5f2 refs/heads/master Author: Nikolay Shebanov Date: 2013-02-22 02:22:27 +0400 Fix #9360 regression in content_for M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/capture_helper.rb M actionpack/test/template/capture_helper_test.rb commit d100560 refs/tags/v4.0.0.beta1 Author: Rafael Mendonça França Date: 2013-02-25 12:56:54 -0300 New CHANGELOG entries always on top [ci skip] M activerecord/CHANGELOG.md commit d8dd965 refs/tags/v4.0.0.beta1 Merge: 2eb8962 ec9aa3c Author: Rafael Mendonça França Date: 2013-02-25 07:56:07 -0800 Merge pull request #9197 from yaotti/fix/overriden-attr-on-dup Fix: Overriding attributes on `dup` by default scopes commit ec9aa3c refs/tags/v4.0.0.beta1 Author: Hiroshige Umino Date: 2013-02-26 00:30:49 +0900 Do not override attributes on `dup` by default scopes M activerecord/CHANGELOG.md M activerecord/lib/active_record/core.rb M activerecord/test/cases/dup_test.rb commit 2eb8962 refs/tags/v4.0.0.beta1 Author: Rafael Mendonça França Date: 2013-02-25 11:51:06 -0300 Do not use --local option when installing the gems M install.rb commit c0bc9ce refs/tags/v4.0.0.beta1 Author: David Heinemeier Hansson Date: 2013-02-25 08:31:50 -0600 Preparing for 4.0.0.beta1 release M RAILS_VERSION M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/version.rb M actionpack/CHANGELOG.md M actionpack/lib/action_pack/version.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/version.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/version.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/version.rb M guides/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/version.rb M version.rb commit ebe9590 refs/tags/v4.0.0.beta1 Author: Guillermo Iguaran Date: 2013-02-25 09:20:22 -0500 Revert "Use sass compressor as the default CSS compressor" This reverts commit 3eef1c7c5d0c4538efb9e061b6fe68011f0352b1. The css compressor should be set in sass-rails plugin. Check https://github.com/rails/sass-rails/commit/339529f9f6433047df6358c0439e6641cb74f045 for the fix. M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 3eef1c7 refs/tags/v4.0.0.beta1 Author: Rafael Mendonça França Date: 2013-02-25 10:19:02 -0300 Use sass compressor as the default CSS compressor With the new sprockets-rails we need to explicitly set the CSS compressor. See https://github.com/rails/sprockets-rails#changes-from-rails-3x M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit fa8a78d refs/tags/v4.0.0.beta1 Author: Rafael Mendonça França Date: 2013-02-25 10:18:55 -0300 :scissors: M activerecord/test/cases/associations/eager_test.rb commit 2b7b5f5 refs/tags/v4.0.0.beta1 Merge: add8b51 ec23296 Author: David Heinemeier Hansson Date: 2013-02-25 05:11:56 -0800 Merge pull request #8530 from dasch/dependency-trackers Custom dependency trackers for the template digestor commit add8b51 refs/tags/v4.0.0.beta1 Merge: 4e286bf 82e345d Author: David Heinemeier Hansson Date: 2013-02-25 05:09:28 -0800 Merge pull request #9072 from htanata/statistics Improve `rake stats` for JavaScript and CoffeeScript commit 82e345d refs/tags/v4.0.0.beta1 Author: Hendy Tanata Date: 2013-01-25 04:19:51 +0800 Improve `rake stats` for JavaScript and CoffeeScript. Ignore block comments and calculates number of functions. M railties/CHANGELOG.md M railties/lib/rails/code_statistics.rb A railties/lib/rails/code_statistics_calculator.rb A railties/test/code_statistics_calculator_test.rb commit b21a73d refs/heads/master Author: Carson McDonald Date: 2013-02-25 07:12:34 -0500 Typo fix M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb commit 4e286bf refs/tags/v4.0.0.beta1 Merge: 82c361e 536b3f0 Author: Carlos Antonio da Silva Date: 2013-02-25 02:47:37 -0800 Merge pull request #9412 from senny/clean_ar_changelog Some minor AR changelog modifications [ci skip] commit 536b3f0 refs/tags/v4.0.0.beta1 Author: Yves Senn Date: 2013-02-25 11:42:40 +0100 some minor AR changelog modifications [ci skip] M activerecord/CHANGELOG.md commit 82c361e refs/tags/v4.0.0.beta1 Merge: d5141f2 3edccfb Author: Carlos Antonio da Silva Date: 2013-02-25 02:36:55 -0800 Merge pull request #9409 from wangjohn/adding_documentation_to_touch Added documentation to touch throwing an error commit d5141f2 refs/tags/v4.0.0.beta1 Merge: f80a6a5 fa891a2 Author: Andrew White Date: 2013-02-25 02:11:46 -0800 Merge pull request #9390 from chris-baynes/datetime_sec_fraction Keep second fraction when DateTime#change is called. commit fa891a2 refs/tags/v4.0.0.beta1 Author: Chris Baynes Date: 2013-02-23 15:51:57 +0100 Keep second fraction when DateTime#change is called. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/test/core_ext/date_time_ext_test.rb commit f80a6a5 refs/tags/v4.0.0.beta1 Merge: 45321a6 2777844 Author: Xavier Noria Date: 2013-02-25 01:37:04 -0800 Merge pull request #9411 from senny/add_auto_explain_removal_as_notable_change update 4.0 release notes to reflect the removal of auto explain. commit 2777844 refs/tags/v4.0.0.beta1 Author: Yves Senn Date: 2013-02-25 09:51:20 +0100 update 4.0 release notes to reflect the removal of auto explain. M guides/source/4_0_release_notes.md commit 45321a6 refs/heads/master Merge: 3285c76 a53935d Author: Aaron Patterson Date: 2013-02-24 22:16:52 -0800 Merge pull request #9246 from Noemj/update_prepared_statements Changed update to use prepared statements commit 3edccfb refs/tags/v4.0.0.beta1 Author: wangjohn Date: 2013-02-25 01:07:19 -0500 Added documentation about how touch now throws an error when one tries to use it on an unpersisted object. M activerecord/lib/active_record/persistence.rb commit 5c9d430 refs/heads/master Author: libin Date: 2013-02-25 11:30:50 +0530 BELONGS TO ASSOCIATION | Typo fix M activerecord/lib/active_record/associations/belongs_to_association.rb commit 3285c76 refs/heads/master Merge: 3762ee0 e52ff80 Author: Guillermo Iguaran Date: 2013-02-24 21:30:54 -0800 Merge pull request #9320 from wangjohn/touch_handling_on_new_instances Raising an ActiveRecordError when one tries to use touch on a new record object commit e52ff80 refs/heads/master Author: wangjohn Date: 2013-02-18 20:07:05 -0500 Raising an ActiveRecordError when one tries to use .touch(name) on a new object that has not yet been persisted. This behavior follows the precedent set by update_columns. M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/base_test.rb commit 3762ee0 refs/heads/master Author: Guillermo Iguaran Date: 2013-02-25 00:21:45 -0500 Revert "Simplify code in AS json encoder" This reverts commit 046e27a7338f2961c10e9d133e0e2229b51c2ba8. Check https://github.com/rails/rails/pull/8815#issuecomment-14026122 for details. M activesupport/lib/active_support/json/encoding.rb commit 15d693d refs/tags/v4.0.0.beta1 Merge: 0bc301e 046e27a Author: Steve Klabnik Date: 2013-02-24 20:29:26 -0800 Merge pull request #8815 from bogdan/simplified-to-json-args AS JSON encoder: remove monkey patch of Array commit 0761bb0 refs/tags/v3.2.15 Merge: e9d6592 6df2db3 Author: Rafael Mendonça França Date: 2013-02-24 18:58:25 -0800 Merge pull request #9408 from mikeycgto/origin/3-2-stable Update RUBY_VERSION check for performance testing to handle 2.0.0 commit 6df2db3 refs/tags/v3.2.15 Author: mikeycgto Date: 2013-02-24 21:43:32 -0500 Update RUBY_VERSION check for performance testing to handle 2.0.0 M activesupport/lib/active_support/testing/performance/ruby.rb commit e9d6592 refs/tags/v3.2.15 Merge: 2647a3c 2a12a04 Author: Rafael Mendonça França Date: 2013-02-24 15:12:13 -0800 Merge pull request #9406 from rails/3-2-stable-ruby-2 Rails 3.2.x is now compatible with Ruby 2.0.0 commit 0bc301e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-24 19:33:18 -0300 Improve AR changelog [ci skip] M activerecord/CHANGELOG.md commit 51e9637 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-24 18:36:45 -0300 Add more information to the CHANGELOG entry [ci skip] M activesupport/CHANGELOG.md commit 2a12a04 refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-02-24 16:33:18 -0500 Rails 3.2.x is now compatible with Ruby 2.0.0 M .travis.yml commit 621b5b7 refs/tags/v3.2.15 Author: SHIBATA Hiroshi Date: 2012-12-29 14:07:09 +0900 added marshal_load and marshal_dump for ProxyTestResult. Behavior of method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later. M activesupport/lib/active_support/testing/isolation.rb commit 8598633 refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-02-22 17:29:08 -0500 Do not redirect cache logger to /dev/null in test For some reason, redirecting cache's logger to '/dev/null' resulting in a test failures and LoadError. I think it's because of Thread issue. Instead of trying to make every logger threadsafe for Rails 3.2, I think it's better to just don't set the logger for now. (Note: resetting the logger back to original value in the teardown block didn't fix the problem.) M activesupport/test/caching_test.rb commit 5693d44 refs/tags/v3.2.15 Author: Jeremy Kemper Date: 2012-10-06 20:57:22 -0700 Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af M activesupport/test/ordered_hash_test.rb commit 0190dca refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-05 15:12:09 -0200 Make the tests pass with minitest 4.2 M activesupport/test/test_case_test.rb commit 979e198 refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-02-22 14:26:20 -0500 Check for `method_missing` in public and protected Ruby 2.0 changed the behavior of `respond_to?` without argument to return only search for public method. We actually want to perform the action only if `method_missing` is either in public or protected. M actionpack/lib/action_controller/metal/compatibility.rb commit abf0c71 refs/tags/v3.2.15 Author: thedarkone Date: 2012-06-30 17:09:12 +0200 There is already a Set of non-hidden action_names lying around. M actionpack/lib/action_controller/metal/hide_actions.rb commit 42d7927 refs/tags/v3.2.15 Author: Jeremy Kemper Date: 2012-10-06 21:06:10 -0700 Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a few times, so fix up the test to work with however it chooses to escape. M actionpack/test/template/html-scanner/sanitizer_test.rb commit 2a5f6d8 refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-11-12 18:17:06 -0800 Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag this file with us-ascii M actionpack/test/template/template_test.rb commit 7cc26fd refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-03-20 09:58:42 -0700 search private and protected methods for convert_key M activesupport/lib/active_support/core_ext/hash/indifferent_access.rb M activesupport/lib/active_support/core_ext/hash/slice.rb M activesupport/lib/active_support/hash_with_indifferent_access.rb commit 45e9cac refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-02-21 21:24:02 -0500 Define #inspect instead of #to_s Ruby 2.0 Object#inspect does not call #to_s by default anymore. M railties/test/application/route_inspect_test.rb commit b59b72a refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-02-21 20:21:24 -0500 Fix failing test case when no database.yml M railties/test/application/initializers/active_record_test.rb commit a066236 refs/heads/master Merge: 70ec7e0 cb100ca Author: Rafael Mendonça França Date: 2013-02-24 13:27:32 -0800 Merge pull request #9403 from stopdropandrew/TimeWithZone#to_r Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. Closes #9404 commit cb100ca refs/heads/master Author: stopdropandrew Date: 2013-02-24 13:07:20 -0800 Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. M activesupport/CHANGELOG.md M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 70ec7e0 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-24 18:00:54 -0300 Remove warning M activerecord/test/cases/associations/has_many_associations_test.rb commit 5cbee32 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-24 17:58:11 -0300 Make explicit the method will raise an exception Taking the wise advice of @carlosantoniodasilva M activerecord/lib/active_record/relation/query_methods.rb commit 9a0cdc6 refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-05-24 14:55:38 -0700 `name` should be public. M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb commit fe4fce8 refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-02-21 18:47:18 -0500 Add in missing requires M activesupport/lib/active_support/core_ext/kernel/reporting.rb M railties/test/application/assets_test.rb commit 1509844 refs/heads/master Author: Xavier Noria Date: 2013-02-24 21:25:51 +0100 did a pass over the AS changelog [ci skip] M activesupport/CHANGELOG.md commit 99d3ec5 refs/heads/master Merge: aff6232 4ef75b6 Author: Rafael Mendonça França Date: 2013-02-24 11:53:52 -0800 Merge pull request #9391 from senny/8663_broken_hmt_ordering_with_includes don't apply invalid ordering when preloading hmt associations. commit 4ef75b6 refs/heads/master Author: Yves Senn Date: 2013-02-15 08:57:33 +0100 don't apply invalid ordering when preloading hmt associations. closes #8663. When preloading a hmt association there two possible scenarios: 1.) preload with 2 queries: first hm association, then hmt with id IN () 2.) preload with join: hmt association is loaded with a join on the hm association The bug was happening in scenario 1.) with a normal order clause on the hmt association. The ordering was also applied when loading the hm association, which resulted in the error. This patch only applies the ordering the the hm-relation if we are performing a join (2). Otherwise the order will only appear in the second query (1). M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/test/cases/associations/eager_test.rb commit aff6232 refs/heads/master Merge: 05857ec 74bc0d0 Author: Rafael Mendonça França Date: 2013-02-24 11:47:27 -0800 Merge pull request #9402 from senny/9356_update_guides update the example for `after_commit` in the guides. commit 74bc0d0 refs/heads/master Author: Yves Senn Date: 2013-02-24 20:43:09 +0100 update the example for `after_commit` in the guides. This is a follow up to #9356. M guides/source/active_record_callbacks.md commit 05857ec refs/heads/master Author: Xavier Noria Date: 2013-02-24 20:37:05 +0100 did a pass over the AM changelog [ci skip] M activemodel/CHANGELOG.md commit bce6cbd refs/heads/master Merge: d65376f 2da5ea1 Author: Rafael Mendonça França Date: 2013-02-24 11:35:05 -0800 Merge pull request #9401 from sikachu/master-remove-builder-option Remove `--builder` option from `rails` command commit 2da5ea1 refs/heads/master Author: Prem Sichanugrist Date: 2013-02-24 13:46:27 -0500 Remove `--builder` option from `rails` command Ability to use a custom builder by passing `--builder` (or `-b`) has been removed. Consider using application template instead. See this guide for more detail: http://guides.rubyonrails.org/rails_application_templates.html M railties/CHANGELOG.md M railties/lib/rails/generators/app_base.rb D railties/test/fixtures/lib/app_builders/empty_builder.rb D railties/test/fixtures/lib/app_builders/simple_builder.rb D railties/test/fixtures/lib/app_builders/tweak_builder.rb D railties/test/fixtures/lib/plugin_builders/empty_builder.rb D railties/test/fixtures/lib/plugin_builders/simple_builder.rb D railties/test/fixtures/lib/plugin_builders/spec_builder.rb D railties/test/fixtures/lib/plugin_builders/tweak_builder.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/plugin_new_generator_test.rb M railties/test/generators/shared_generator_tests.rb commit d65376f refs/heads/master Merge: 40111c5 d3688e0 Author: Xavier Noria Date: 2013-02-24 11:16:35 -0800 Merge pull request #9400 from senny/remove_auto_explain_threshold_in_seconds remove config.auto_explain_threshold_in_seconds commit d3688e0 refs/heads/master Author: Yves Senn Date: 2013-02-24 18:59:34 +0100 remove AR auto-explain (config.auto_explain_threshold_in_seconds) We discussed that the auto explain feature is rarely used. This PR removes only the automatic explain. You can still display the explain output for any given relation using `ActiveRecord::Relation#explain`. As a side-effect this should also fix the connection problem during asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie` forced a connection. M activerecord/CHANGELOG.md M activerecord/lib/active_record/explain.rb M activerecord/lib/active_record/querying.rb M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/delegation.rb M activerecord/test/cases/explain_test.rb M guides/code/getting_started/config/environments/development.rb M guides/code/getting_started/config/environments/production.rb M guides/source/active_record_querying.md M guides/source/configuring.md M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/test/generators/app_generator_test.rb commit 40111c5 refs/heads/master Author: Guillermo Iguaran Date: 2013-02-24 13:31:29 -0500 Use sprockets-rails 2.0.0.rc3 in new apps M rails.gemspec M railties/lib/rails/generators/app_base.rb commit e06aae7 refs/heads/master Merge: a06b1d0 5a7e6b6 Author: Rafael Mendonça França Date: 2013-02-24 10:10:19 -0800 Merge pull request #9399 from neerajdotname/7832-dependent-option Updated doc to clarify about update_all and delete_all commit a06b1d0 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-24 15:07:47 -0300 Mention the extraction of Active Resource in the upgrading guide [ci skip] M guides/source/upgrading_ruby_on_rails.md commit d1c5f87 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-24 15:03:29 -0300 Mention the removal of attr_accessible and attr_protected in the upgrading guide Point to the Protected Attributes gem to those who want a smoothly upgrade path before to change to use Strong Parameters. [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 5a7e6b6 refs/heads/master Author: Neeraj Singh Date: 2013-02-24 12:50:45 -0500 Updated doc to clarify about update_all and delete_all delete_all will call callbacks if depdent option is specified as :destroy. This behavior is not very clear from the documetation and hence issue #7832 was raised. closes #7832 M activerecord/lib/active_record/associations.rb commit d5ec8ef refs/heads/master Author: Rafael Mendonça França Date: 2013-02-21 11:59:34 -0300 Skip connection url test when the machine is using socket configuration. The connection url parssing don't accept the socket option M activerecord/test/cases/adapters/mysql/connection_test.rb commit e54acf1 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-21 11:58:33 -0300 Do not type cast all the database url values. We should only type cast when we need to use. Related to 4b005fb371c2e7af80df7da63be94509b1db038c M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit 5fc3b87 refs/heads/master Merge: 149e3cd 6bd1cae Author: Guillermo Iguaran Date: 2013-02-24 09:03:42 -0800 Merge pull request #9398 from senny/revert_precompile_config_move Revert "move config.assets.precompile into config/application.rb" commit 6bd1cae refs/heads/master Author: Yves Senn Date: 2013-02-24 18:01:43 +0100 Revert "move config.assets.precompile into config/application.rb" This reverts commit 304f4d4c25ccabdbf97d37dd7a92a54d0b63a9c9. As it turns out everything should behave as it did and we don't need to move this configuration option. M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 149e3cd refs/heads/master Author: grosser Date: 2012-10-02 09:22:26 -0700 fix respond_to without blocks not working if one of the blocks is all M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/test/controller/mime_responds_test.rb A actionpack/test/fixtures/respond_to/using_defaults_with_all.html.erb commit c3d001b refs/heads/master Merge: 83a9efb d98763a Author: Steve Klabnik Date: 2013-02-24 08:30:48 -0800 Merge pull request #9356 from senny/988_multiple_actions_for_after_commit multiple actions for :on option with `after_commit` and `after_rollback` commit 83a9efb refs/heads/master Merge: fb40358 96c1caf Author: Rafael Mendonça França Date: 2013-02-24 07:51:01 -0800 Merge pull request #9397 from senny/9201_duplicate_associations_with_natural_key test case to prevent duplicated associations with custom PK. commit 96c1caf refs/heads/master Author: Yves Senn Date: 2013-02-08 10:32:46 +0100 test case to prevent duplicated associations with custom PK. closes #9201 M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/speedometer.rb commit 5d63147 refs/heads/master Author: Qihuan Piao Date: 2013-02-25 00:38:46 +0900 Update guide doc to use migration shortcuts M guides/source/action_mailer_basics.md commit a1dd468 refs/heads/master Author: Qihuan Piao Date: 2013-02-25 00:29:03 +0900 Wrap `around_action` word with tag M guides/source/action_mailer_basics.md commit fb40358 refs/heads/master Merge: da5ca96 6fad6b5 Author: Carlos Antonio da Silva Date: 2013-02-23 19:31:51 -0800 Merge pull request #9395 from yahonda/oracle_index_length Address failure test_rename_column_with_multi_column_index with Oracle commit 6fad6b5 refs/heads/master Author: Yasuo Honda Date: 2013-02-24 11:54:18 +0900 Oracle enhanced adapter shortens its name if it is longer than 30 bytes because of Oracle database index length spec. M activerecord/test/cases/migration/columns_test.rb commit da5ca96 refs/heads/master Merge: a628dd5 e7f0716 Author: Rafael Mendonça França Date: 2013-02-23 17:35:13 -0800 Merge pull request #9394 from senny/actually_rename_the_test_case also rename the test-case class inside columns_test.rb commit e7f0716 refs/heads/master Author: Yves Senn Date: 2013-02-24 02:26:01 +0100 also rename the test-case class inside columns_test.rb M activerecord/test/cases/migration/columns_test.rb commit a628dd5 refs/heads/master Author: Xavier Noria Date: 2013-02-24 01:22:45 +0100 Revert "prevent minitest from printing a --seed run option" Reason: on a second thought, minitest prints a seed as run option regardless of the test order, and it actually calls srand, so albeit it might be misleading I believe, it is the way it is and should be left that way. This reverts commit c15862ae0cb876d745609170f0f90a9bb9b5e0ae. M activesupport/lib/active_support/test_case.rb commit c15862a refs/heads/master Author: Xavier Noria Date: 2013-02-24 01:12:45 +0100 prevent minitest from printing a --seed run option See the first FIXME comment in the patch for the rationale. M activesupport/lib/active_support/test_case.rb commit c9c5656 refs/heads/master Author: Xavier Noria Date: 2013-02-23 23:46:16 +0100 registers the encrypted session store in the AP changelog M actionpack/CHANGELOG.md commit dcfa320 refs/heads/master Merge: 87c029e 549ced9 Author: Guillermo Iguaran Date: 2013-02-23 13:10:28 -0800 Merge pull request #9393 from rubys/master guides/rails_guides moved up and out of the railties directory commit 549ced9 refs/heads/master Author: Sam Ruby Date: 2013-02-23 16:06:05 -0500 guides/rails_guides moved up and out of the railties directory M railties/lib/rails/tasks/documentation.rake commit 87c029e refs/heads/master Author: Xavier Noria Date: 2013-02-23 20:49:31 +0100 adds a missing LIMIT 1 in #take docs M activerecord/lib/active_record/relation/finder_methods.rb commit 2304855 refs/heads/master Merge: cad397e d03928c Author: Carlos Antonio da Silva Date: 2013-02-23 07:16:04 -0800 Merge pull request #9389 from senny/forwardport_9388 Forwardport #9388 rename/remove column preserves custom PK. commit d03928c refs/heads/master Author: Yves Senn Date: 2013-02-23 15:42:55 +0100 rename_column_test.rb -> columns_test.rb to reveal intent. I renamed the test to better communicate it's intention. Since it also tests: - add_column - remove_column - change_column There is no reason to call it rename_column_test. A activerecord/test/cases/migration/columns_test.rb D activerecord/test/cases/migration/rename_column_test.rb commit 2d4e3fe refs/heads/master Author: Yves Senn Date: 2013-02-23 15:32:18 +0100 forwardport #9388 rename/remove column preserves custom PK. M activerecord/test/cases/migration/rename_column_test.rb commit 2647a3c refs/tags/v3.2.15 Merge: 0c1558d 8f6fa34 Author: Carlos Antonio da Silva Date: 2013-02-23 06:26:20 -0800 Merge pull request #9388 from senny/9367_wrong_schema_after_remove_column Sqlite preserves primary keys when copying/altering tables. commit 8f6fa34 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-02-23 14:00:02 +0100 Sqlite preserves primary keys when copying/altering tables. Backport #2312. Fixes #9367. I also added a test-case to make sure that renaming or removing a column preserves the primary key. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb M activerecord/test/cases/adapters/sqlite3/copy_table_test.rb M activerecord/test/cases/migration_test.rb commit cad397e refs/heads/master Merge: 38f347a de47fc2 Author: Carlos Antonio da Silva Date: 2013-02-23 05:04:35 -0800 Merge pull request #9387 from boukevanderbijl/master Fix debug helper not inspecting when it can't convert to YAML commit de47fc2 refs/heads/master Author: Bouke van der Bijl Date: 2013-02-23 13:54:17 +0100 Fix debug helper not inspecting on Exception The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534. M actionpack/lib/action_view/helpers/debug_helper.rb commit 38f347a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-22 19:37:10 -0300 Move number_to_human test from AP to AS Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well. M actionpack/test/template/number_helper_test.rb M activesupport/test/number_helper_test.rb commit 1fbfdf5 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-22 19:44:37 -0300 Changelog improvements, use 1.9 style hash in examples [ci skip] M actionpack/CHANGELOG.md M activesupport/CHANGELOG.md commit 4ffcd83 refs/heads/master Merge: e4c2a13 4e3ceed Author: Steve Klabnik Date: 2013-02-22 14:00:24 -0800 Merge pull request #9347 from hoffm/number_to_human_bug Address edge case for number_to_human with units option. commit e4c2a13 refs/heads/master Merge: c5a9c02 eb1c5c4 Author: Carlos Antonio da Silva Date: 2013-02-22 12:00:56 -0800 Merge pull request #9384 from eval/documentation_of_minute Correct comment for (beginning|end)_of_minute [ci skip] commit eb1c5c4 refs/heads/master Author: Gert Goet Date: 2013-02-22 20:49:24 +0100 Correct comment for (beginning|end)_of_minute M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/core_ext/time/calculations.rb commit c5a9c02 refs/heads/master Author: Steve Klabnik Date: 2013-02-22 14:09:43 -0500 Fix backwards compatibility with Rails 3 apps. When we removed script/rails and introduced bin/rails, we accidentally introduced a regression. If you install Rails 4 as a gem, then try to do something in a Rails 3 application: $ rails g This will throw the 'please type rails new foo' message rather than the proper generator documentation message. This is because older apps don't have bin/rails. Therefore, we now *prefer* bin/rails, but still search for script/rails, and exec the one we find. M railties/lib/rails/app_rails_loader.rb M railties/lib/rails/cli.rb M railties/test/app_rails_loader_test.rb commit 0c1558d refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-22 14:42:35 -0300 Use 1.8 hash style M actionpack/test/dispatch/routing_test.rb commit f7a0a95 refs/heads/master Author: Gagan Awhad Date: 2013-02-22 10:10:42 -0600 Added documentation for beginning_of_minute and end_of_minute to Active Support Core Extensions guide M guides/source/active_support_core_extensions.md commit 4e3ceed refs/heads/master Author: hoffm Date: 2013-02-20 16:15:59 -0500 Address edge case for number_to_human with units option. ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when the units hash does not contain the needed key, e.g. when the number provided is less than the largest key provided. M actionpack/test/template/number_helper_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/number_helper.rb commit e55b0f6 refs/tags/v3.2.15 Merge: fdcd7c0 a72dab0 Author: Andrew White Date: 2013-02-22 00:35:28 -0800 Merge pull request #9374 from senny/improved_match_shorthand_syntax determine the match shorthand target early. commit a72dab0 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-02-21 17:43:49 +0100 determine the match shorthand target early. Backport #9361. Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 31f807c refs/heads/master Merge: b5df957 dc142f9 Author: Andrew White Date: 2013-02-21 23:33:36 -0800 Merge pull request #9334 from NARKOZ/time_tag use ISO 8601 format in time_tag helper commit dc142f9 refs/heads/master Author: Nihad Abbasov Date: 2013-02-20 15:06:01 +0400 document setting custom datetime attribute for time_tag helper M actionpack/lib/action_view/helpers/date_helper.rb commit e8e92c7 refs/heads/master Author: Nihad Abbasov Date: 2013-02-20 12:49:20 +0400 fix time_tag helper and update tests to not rely on dynamically generated values Before `time_tag Date.today` will return ``. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute. M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_test.rb commit 7ded3b8 refs/heads/master Author: bobbus Date: 2013-02-22 00:24:35 +0100 Link is not relevant anymore Cannot find the screencast on the internet, guess it was removed M guides/source/caching_with_rails.md commit b5df957 refs/heads/master Merge: 4b48a75 6f380d3 Author: Andrew White Date: 2013-02-21 14:22:36 -0800 Merge pull request #9365 from gaganawhad/core-ext-beginning-of-minute Added beginning_of_minute support to core_ext calculations for Time and DateTime commit 6f380d3 refs/heads/master Author: Gagan Awhad Date: 2013-02-21 14:22:50 -0600 Added beginning_of_minute support to core_ext calculations for Time and DateTime M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/test/core_ext/date_time_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 4b48a75 refs/heads/master Author: Xavier Noria Date: 2013-02-21 21:17:01 +0100 completes pass over the AP changelog [ci skip] M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/form_tag_helper.rb commit 29927df refs/heads/master Author: Xavier Noria Date: 2013-02-21 18:00:34 +0100 tweaks to the AP changelog [ci skip] M actionpack/CHANGELOG.md commit f4b506f refs/heads/master Merge: 3893979 c88ee76 Author: Andrew White Date: 2013-02-21 11:36:15 -0800 Merge pull request #9361 from senny/improved_match_shorthand_syntax determine the match shorthand target early. commit 3893979 refs/heads/master Author: Santiago Pastorino Date: 2013-02-21 15:34:02 -0200 Revert "Revert "Merge pull request #4803 from lucascaton/master"" This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit c60be72 refs/heads/master Author: Santiago Pastorino Date: 2013-02-21 15:25:26 -0200 This cache is not needed M actionpack/lib/action_controller/metal/request_forgery_protection.rb commit 765006d refs/heads/master Author: Santiago Pastorino Date: 2013-02-21 15:16:43 -0200 Use composition to figure out the forgery protection strategy M actionpack/lib/action_controller/metal/request_forgery_protection.rb commit c88ee76 refs/heads/master Author: Yves Senn Date: 2013-02-21 17:43:49 +0100 determine the match shorthand target early. Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit b4051ed refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-21 13:31:13 -0300 Use #grep to filter priority zones when a regexp is given M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/template/form_options_helper_test.rb commit 953e19e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-21 13:17:38 -0300 Use Array Difference to calculate the zones array, instead of iterating It's faster, and doesn't force us to dup the timezones array. M actionpack/lib/action_view/helpers/form_options_helper.rb commit 1323374 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-21 13:07:32 -0300 Fix test name and refactor fake timezones creation in form options test M actionpack/test/template/form_options_helper_test.rb commit b20823b refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-21 12:52:03 -0300 Remove not necessary changelog about time zone array mutation This seemed to be introduced in master by 9dd64f2e0c1b3ce85b503b0f81c50c93f89ffbcd, so there's no need to add a changelog entry for fixing it. [ci skip] M actionpack/CHANGELOG.md commit e2096e8 refs/heads/master Author: Xavier Noria Date: 2013-02-21 17:29:39 +0100 tweaks to the AP changelog [ci skip] M actionpack/CHANGELOG.md commit c1b4b3b refs/heads/master Merge: ea544e9 7b6f2a0 Author: Xavier Noria Date: 2013-02-21 07:57:26 -0800 Merge pull request #9358 from iwiznia/patch-1 Update railties/lib/rails/application/configuration.rb commit fdcd7c0 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-21 12:48:45 -0300 Change tabs to spaces in form options helper [ci skip] M actionpack/lib/action_view/helpers/form_options_helper.rb commit 7b6f2a0 refs/heads/master Author: iwiznia Date: 2013-02-21 16:41:26 +0100 Update railties/lib/rails/application/configuration.rb Better comment for database_configuration method M railties/lib/rails/application/configuration.rb commit 063ba21 refs/heads/master Author: Justin Bingham Date: 2013-02-21 10:40:34 -0500 Removed template_root as a configuration option Removed template root from actionmailer configuration options as it seems to have been pulled out completely in favor of explicit definition via template_path / template_name. M guides/source/action_mailer_basics.md commit d0dfe16 refs/heads/master Author: iwiznia Date: 2013-02-21 16:11:28 +0100 Update railties/lib/rails/application/configuration.rb Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"] M railties/lib/rails/application/configuration.rb commit ea544e9 refs/heads/master Merge: 91d1ac0 5e52905 Author: Steve Klabnik Date: 2013-02-21 06:58:16 -0800 Merge pull request #9354 from NARKOZ/remove-warnings remove assigned but unused variables commit 3206495 refs/heads/master Author: Carson McDonald Date: 2013-02-21 09:37:45 -0500 Typo fix. M actionpack/lib/action_dispatch/middleware/remote_ip.rb commit 91d1ac0 refs/heads/master Merge: b0fa9b5 fa9ec0a Author: Xavier Noria Date: 2013-02-21 06:26:20 -0800 Merge pull request #9357 from fabiokr/rack_test_uploaded_file Rack::Test::UploadedFile is a permitted scalar commit 5e52905 refs/heads/master Author: Nihad Abbasov Date: 2013-02-21 17:39:28 +0400 remove assigned but unused variable warning M actionpack/test/template/form_options_helper_test.rb commit d98763a refs/heads/master Author: Yves Senn Date: 2013-02-21 14:54:17 +0100 multiple actions for :on option with `after_commit` and `after_rollback` Closes #988. M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transaction_callbacks_test.rb commit fa9ec0a refs/heads/master Author: Fabio Kreusch Date: 2013-02-21 11:00:26 -0300 Rack::Test::UploadedFile is a permitted scalar M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit b0fa9b5 refs/heads/master Merge: 34c133a 5b5f7a6 Author: Xavier Noria Date: 2013-02-21 04:04:12 -0800 Merge pull request #9348 from schuetzm/doc_no_indices_with_create_join_table Add more documentation for create_join_table. commit 34c133a refs/heads/master Merge: 6614471 2dffe37 Author: Carlos Antonio da Silva Date: 2013-02-21 03:40:05 -0800 Merge pull request #9352 from senny/remove_uncommented_boot_test Remove commented railties boot_test.rb commit 2dffe37 refs/heads/master Author: Yves Senn Date: 2013-02-21 10:22:12 +0100 remove uncommented railties boot_test.rb D railties/test/application/initializers/boot_test.rb commit 5b5f7a6 refs/heads/master Author: Marc Schütz Date: 2013-02-21 08:15:40 +0100 Indent comment block by two spaces. As requested by @fxn https://github.com/schuetzm/rails/commit/743d15bba182df80d003d205690ead988970299c#commitcomment-2661417 M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 6614471 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-21 00:51:39 -0300 Fix warning M activerecord/test/cases/migration/index_test.rb commit a0d8422 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-02-20 22:31:02 -0300 Use order to get the first record since postgresql returns in the desired order M activerecord/test/cases/associations/eager_test.rb commit 743d15b refs/heads/master Author: Marc Schütz Date: 2013-02-20 22:18:06 +0100 Add more documentation for create_join_table. Explain that it doesn't create indices by default and that it also has a block form. M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M guides/source/migrations.md commit 8fc6b9b refs/heads/master Author: Xavier Noria Date: 2013-02-20 21:08:24 +0100 ActiveRecord -> Active Record [ci skip] M activerecord/CHANGELOG.md commit 24b7a76 refs/heads/master Merge: aeb4592 7b30cec Author: Rafael Mendonça França Date: 2013-02-20 12:02:01 -0800 Merge pull request #9345 from wangjohn/change_name_of_query_method_argument_checker_for_clarity Renaming the check_empty_arguments method to something more descriptive. commit aeb4592 refs/heads/master Author: Xavier Noria Date: 2013-02-20 20:36:38 +0100 removes relation bang methods from the AR changelog [ci skip] M activerecord/CHANGELOG.md commit 3ff639a refs/heads/master Author: Xavier Noria Date: 2013-02-20 20:35:44 +0100 removes some remaining relation bang methods documentation [ci skip] M activerecord/lib/active_record/relation/query_methods.rb commit 36113d0 refs/heads/master Author: Xavier Noria Date: 2013-02-20 19:51:34 +0100 puts a lambda around a default scope [ci skip] M activerecord/CHANGELOG.md commit 6b42e0f refs/heads/master Author: Xavier Noria Date: 2013-02-20 18:35:31 +0100 adds an example in the docs of #not with multiple conditions [ci skip] M activerecord/lib/active_record/relation/query_methods.rb commit c5115b0 refs/heads/master Author: Xavier Noria Date: 2013-02-20 18:34:30 +0100 database.yml -> config/database.yml [ci skip] M activerecord/CHANGELOG.md commit 6871bd9 refs/heads/master Author: Santiago Pastorino Date: 2013-02-20 15:47:56 -0200 Revert "Merge pull request #4803 from lucascaton/master" This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit d3563bd refs/heads/master Author: Rafael Mendonça França Date: 2013-02-20 14:31:40 -0300 Skip failing test and add a FIXME note M activerecord/test/cases/persistence_test.rb commit 73988bc refs/heads/master Merge: 0916f88 de615b3 Author: Rafael Mendonça França Date: 2013-02-20 09:30:48 -0800 Merge pull request #9344 from senny/changelog_cleanup unify AR changelog entries [ci skip] commit de615b3 refs/heads/master Author: Yves Senn Date: 2013-02-20 18:27:46 +0100 unify AR changelog entries [ci skip] M activerecord/CHANGELOG.md commit 0916f88 refs/heads/master Merge: 20ed3e0 39eef1a Author: Rafael Mendonça França Date: 2013-02-20 09:23:09 -0800 Merge pull request #8645 from senny/rename_index_on_rename_column also rename indexes when a table or column is renamed commit 39eef1a refs/heads/master Author: Yves Senn Date: 2012-12-28 22:56:44 +0100 also rename indexes when a table or column is renamed When a table or a column is renamed related indexes kept their name. This will lead to confusing names. This patch renames related indexes when a column or a table is renamed. Only indexes with names generated by rails will be renamed. Indexes with custom names will not be renamed. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/migration/rename_column_test.rb M activerecord/test/cases/migration/rename_table_test.rb commit 7b30cec refs/heads/master Author: wangjohn Date: 2013-02-20 12:17:04 -0500 Renaming the check_empty_arguments method to something more descriptive. The function is now called has_arguments? so that it's easier to tell that it's just checking to see if the args are blank or not. M activerecord/lib/active_record/relation/query_methods.rb commit 20ed3e0 refs/heads/master Author: Xavier Noria Date: 2013-02-20 18:06:50 +0100 moves the new :nsec date format to the Active Support changelog [ci skip] M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md commit 1b776b9 refs/heads/master Author: Xavier Noria Date: 2013-02-20 18:02:29 +0100 revises the documentation of AR::Base.cache_timestamp_format [ci skip] M activerecord/lib/active_record/integration.rb commit 92949d2 refs/heads/master Merge: 7bae72c 72ca2d7 Author: Rafael Mendonça França Date: 2013-02-20 09:06:31 -0800 Merge pull request #8613 from senny/8264_character_limit_for_indices deal with long index names and internal sqlite3 operations commit 72ca2d7 refs/heads/master Author: Yves Senn Date: 2012-12-28 13:31:02 +0100 reserve less chars for internal sqlite3 operations M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit cca4352 refs/heads/master Author: Yves Senn Date: 2012-12-28 01:27:26 +0100 reserve index name chars for internal rails operations Some adapter (SQLite3) need to perform renaming operations to support the rails DDL. These rename prefixes operate with prefixes. When an index name already uses up the full space provieded by `index_name_length` these internal operations will fail. This patch introduces `allowed_index_name_length` which respects the amount of characters used for internal operations. It will always be <= `index_name_length` and every adapter can define how many characters need to be reserved. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/migration/index_test.rb M activerecord/test/cases/migration/rename_column_test.rb commit 7bae72c refs/heads/master Merge: a5bf96a d49f862 Author: Rafael Mendonça França Date: 2013-02-20 08:38:50 -0800 Merge pull request #9332 from wangjohn/adding_documentation_to_error_raising_in_query_methods Tests to make sure empty arguments in WhereChain raise errors commit a5bf96a refs/heads/master Merge: 82a5432 7099194 Author: Rafael Mendonça França Date: 2013-02-20 08:27:51 -0800 Merge pull request #9342 from hone/db_migrate_with_database_url Fix ActiveRecord::ConnectionAdapters::ConnectionSpecification::ResolverTest commit 7099194 refs/heads/master Author: Terence Lee Date: 2013-02-21 03:01:04 +1100 make type_cast_value a class level method M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 82a5432 refs/heads/master Merge: b85f63b 67d8bb9 Author: Rafael Mendonça França Date: 2013-02-20 08:20:26 -0800 Merge pull request #9068 from wangjohn/transaction_callback_patch Reduced memory leak problem in transactions by lazily updating AR objects commit b85f63b refs/heads/master Merge: 3a0b6c8 304f4d4 Author: Rafael Mendonça França Date: 2013-02-20 08:18:08 -0800 Merge pull request #9341 from senny/move_precompiled_asset_config_to_application move config.assets.precompile into config/application.rb commit d49f862 refs/heads/master Author: wangjohn Date: 2013-02-19 14:36:42 -0500 Added comments about the check_empty_arguments method which is called for query methods in a where_clause. Also, modified the CHANGELOG entry because it had false information and added tests. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit 67d8bb9 refs/heads/master Author: wangjohn Date: 2013-01-24 23:42:39 -0500 Reduced memory leak problem in transactions by lazily updating AR objects with new transaction state. If AR object has a callback, the callback will be performed immediately (non-lazily) so the transaction still has to keep records with callbacks. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/transactions_test.rb commit ec23296 refs/tags/v4.0.0.beta1 Author: Daniel Schierbeck Date: 2013-02-20 16:42:30 +0100 Register trackers on extensions, not handlers M actionpack/lib/action_view/dependency_tracker.rb M actionpack/test/template/dependency_tracker_test.rb M actionpack/test/template/digestor_test.rb commit 5070370 refs/tags/v4.0.0.beta1 Author: Daniel Schierbeck Date: 2012-12-17 21:29:15 +0100 Rename ErbTracker to ERBTracker M actionpack/lib/action_view/dependency_tracker.rb commit 4452849 refs/tags/v4.0.0.beta1 Author: Daniel Schierbeck Date: 2012-12-17 21:26:55 +0100 Return an empty array if no tracker is found M actionpack/lib/action_view/dependency_tracker.rb M actionpack/test/template/dependency_tracker_test.rb commit 9ca8c63 refs/tags/v4.0.0.beta1 Author: Daniel Schierbeck Date: 2012-12-17 21:21:16 +0100 Use a thread safe hash M actionpack/lib/action_view/dependency_tracker.rb commit 1879a33 refs/tags/v4.0.0.beta1 Author: Daniel Schierbeck Date: 2012-12-16 23:38:46 +0100 Allow registering custom dependency trackers M actionpack/lib/action_view/dependency_tracker.rb A actionpack/test/template/dependency_tracker_test.rb M actionpack/test/template/digestor_test.rb commit 889bf19 refs/tags/v4.0.0.beta1 Author: Daniel Schierbeck Date: 2012-12-16 23:17:53 +0100 Extract dependency tracking from Digestor A actionpack/lib/action_view/dependency_tracker.rb M actionpack/lib/action_view/digestor.rb commit 3a0b6c8 refs/heads/master Merge: ebae71a b1de189 Author: Rafael Mendonça França Date: 2013-02-20 07:10:36 -0800 Merge pull request #9120 from hone/db_migrate_with_database_url fix rake db:migrate when used with ENV['DATABASE_URL'] commit 304f4d4 refs/heads/master Author: Yves Senn Date: 2013-02-20 15:48:54 +0100 move config.assets.precompile into config/application.rb M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit b1de189 refs/heads/master Author: Terence Lee Date: 2013-02-21 01:02:00 +1100 update changelog M railties/CHANGELOG.md commit e3f5d02 refs/heads/master Author: Terence Lee Date: 2013-02-21 00:44:26 +1100 run the load_structure test in the test environment M railties/test/application/rake/dbs_test.rb commit 44298c3 refs/heads/master Author: Terence Lee Date: 2013-02-21 00:44:06 +1100 test DATABASE_URL without database.yml around M railties/test/application/rake/dbs_test.rb commit 4bdaf95 refs/heads/master Author: Terence Lee Date: 2013-02-21 01:13:10 +1100 standardize database_configuration to a hash make connection_url_to_hash a class method This als prevents loading database.yml if it doesn't exist but DATABASE_URL does M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/railtie.rb M railties/lib/rails/application/configuration.rb commit ebae71a refs/heads/master Merge: e1456ad c9909db Author: Guillermo Iguaran Date: 2013-02-20 05:50:01 -0800 Merge pull request #9328 from sikachu/ps-remove-xml-parser Remove XML Parser from ActionDispatch commit c9909db refs/heads/master Author: Prem Sichanugrist Date: 2013-02-19 15:41:03 -0500 Remove XML Parser from ActionDispatch If you want an ability to parse XML parameters, please install `actionpack-xml_parser` gem. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/controller/webservice_test.rb D actionpack/test/dispatch/request/xml_params_parsing_test.rb M guides/source/action_controller_overview.md commit e1456ad refs/heads/master Author: Rafael Mendonça França Date: 2013-02-20 10:27:18 -0300 Whitespace :heart: and hash syntax change M activerecord/test/cases/connection_specification/resolver_test.rb commit ac0285e refs/heads/master Author: Arne Brasseur Date: 2013-02-20 13:19:35 +0100 Update the "upgrading" guide for people coming from 3.0 and 3.1. The latest versions for 3.1 and 3.2 are now 3.2.12 and 3.1.11 respectively. M guides/source/upgrading_ruby_on_rails.md commit e5c26ee refs/heads/master Merge: c3f1b1d 0a6b61a Author: Xavier Noria Date: 2013-02-20 01:55:53 -0800 Merge pull request #8060 from senny/7313_descriptive_error_message_for_missing_adapter descriptive error message when AR adapter was not found. Closes #7313 commit 0a6b61a refs/heads/master Author: Yves Senn Date: 2012-10-29 09:02:48 +0100 descriptive error message when AR adapter was not found. Closes #7313. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit c3f1b1d refs/heads/master Merge: 862e751 5c73f0d Author: Andrew White Date: 2013-02-19 23:26:48 -0800 Merge pull request #9330 from bdmac/time_zone_select_dup Fix time_zone_options_for_select to not mutate TimeZones array commit e466a58 refs/heads/master Author: Weston Platter Date: 2013-02-19 22:29:30 -0600 improve grammar describing ActionDispatch::Cookies::CookieJar#delete M actionpack/lib/action_dispatch/middleware/cookies.rb commit 862e751 refs/heads/master Merge: c2c203c cb5ccf4 Author: Guillermo Iguaran Date: 2013-02-19 20:19:14 -0800 Merge pull request #9331 from robertomiranda/upgrading-guide Improve upgrading guide with ActionDispatch::BestStandardsSupport remova... commit cb5ccf4 refs/heads/master Author: robertomiranda Date: 2013-02-19 22:07:50 -0500 Improve upgrading guide with ActionDispatch::BestStandardsSupport removal M guides/source/upgrading_ruby_on_rails.md commit 5c73f0d refs/heads/master Author: Brian McManus Date: 2013-02-19 17:51:23 -0800 Fix time_zone_options_for_select to not mutate TimeZones array Previous implementation of time_zone_options_for_select did not dup the ActiveSupport::TimeZone.all array. When :priority_zones were provided the method would reject! the zones from the memoized TimeZones array thus affecting future requests to the server. Essentially whatever zones were specified as :priority_zones would show up for the first request but then disappear from the time zone options on future requests. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/template/form_options_helper_test.rb commit c2c203c refs/heads/master Author: Akira Matsuda Date: 2013-02-20 09:35:02 +0900 Better not use tab chars in the generator template M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit ab27e9b refs/heads/master Author: Weston Platter Date: 2013-02-19 15:39:38 -0600 improve grammar describing ActionDispatch::Cookies::CookieJar#delete M actionpack/lib/action_dispatch/middleware/cookies.rb commit 45547a1 refs/heads/master Merge: 2769180 40c1ee8 Author: Steve Klabnik Date: 2013-02-19 12:12:06 -0800 Merge pull request #9324 from acapilleri/add_on_empty added more accurate test for add_on_empty commit 40c1ee8 refs/heads/master Author: Angelo capilleri Date: 2013-02-19 18:24:31 +0100 added more accurate test for add_on_empty with the current tests, if delete the assignment of is_empty in add_on_empty method the tests not fail. With this test, if we delete is_empty, the test fails M activemodel/test/cases/errors_test.rb commit 2769180 refs/heads/master Author: Xavier Noria Date: 2013-02-19 18:04:19 +0100 s/revertible/reversible/ M activerecord/CHANGELOG.md commit 26eb1e4 refs/heads/master Author: Xavier Noria Date: 2013-02-19 17:56:36 +0100 fixes a typo in the migrations guide M guides/source/migrations.md commit b749124 refs/heads/master Merge: ff259b5 6797778 Author: Steve Klabnik Date: 2013-02-19 08:52:04 -0800 Merge pull request #9315 from Takehiro-Adachi/remove-unecessary-tests-from-ar-base_testrb delete duplicated tests in AR base_test.rb commit ff259b5 refs/heads/master Author: Xavier Noria Date: 2013-02-19 17:32:05 +0100 moves a CHANGELOG entry from AR to AP M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md commit 2abf217 refs/heads/master Author: Xavier Noria Date: 2013-02-19 15:48:22 +0100 small tweaks in the AR CHANGELOG M activerecord/CHANGELOG.md commit 8991083 refs/heads/master Merge: 00147c8 4033c50 Author: Rafael Mendonça França Date: 2013-02-19 08:20:01 -0800 Merge pull request #9258 from wangjohn/blank_argument_errors_in_arel Raising an error when query methods have blank arguments. commit 4033c50 refs/heads/master Author: John J Wang Date: 2013-02-11 13:56:26 -0500 Raise an error when query methods have blank arguments, and when blank arguments are meaningless. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb commit 336dae0 refs/heads/master Author: Doug Yun Date: 2013-02-19 11:11:42 -0500 Corrected link anchor and added colons for continuity M activerecord/RUNNING_UNIT_TESTS.rdoc M activesupport/README.rdoc commit 3143620 refs/tags/v3.2.15 Merge: b4e053e 9be7f63 Author: Rafael Mendonça França Date: 2013-02-19 05:58:08 -0800 Merge pull request #9323 from senny/build_fix_from_9252 keep the build :green_heart:, #first on 1.8.7 and pg is different commit 9be7f63 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-02-19 14:42:45 +0100 keep the build :green_heart:, #first on 1.8.7 and pg is different The build only failed for ruby-1.8.7 and pg. The problem was that the statement: ```ruby author = Author.includes(:comments_with_order_and_conditions, :posts).first ``` resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1 was retunred. Of course this breaks the assertions. M activerecord/test/cases/associations/eager_test.rb commit 6797778 refs/heads/master Author: Takehiro Adachi Date: 2013-02-19 21:38:25 +0900 delete duplicated tests in AR base_test.rb These are duplicated with the tests which are in relations_test.rb M activerecord/test/cases/base_test.rb commit 00147c8 refs/heads/master Author: Santiago Pastorino Date: 2013-02-19 10:35:03 -0200 InvalidMessage is in ActiveSupport::MessageEncryptor namespace Closes #9302 M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb commit b4e053e refs/tags/v3.2.15 Merge: 46b65ba 587f563 Author: Rafael Mendonça França Date: 2013-02-19 04:33:42 -0800 Merge pull request #9322 from senny/backport_9252 don't cache invalid subsets when preloading hmt associations. commit a700917 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-19 09:21:03 -0300 Fix rake routes output in railties test M railties/test/application/rake_test.rb commit 66237cd refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-19 08:58:29 -0300 Fix AP tests related to routes inspector output and the new column titles M actionpack/test/dispatch/routing/inspector_test.rb commit f994530 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-19 08:48:19 -0300 Add missing require to routes inspector M actionpack/lib/action_dispatch/routing/inspector.rb commit 7e7c9b3 refs/heads/master Merge: 212ef52 a66ce98 Author: Xavier Noria Date: 2013-02-19 02:53:02 -0800 Merge pull request #9321 from mfilej/action-dispatch-http-url-requires Require ActiveSupport dependencies in ActionDispatch::Http::URL commit a66ce98 refs/heads/master Author: Miha Filej Date: 2013-02-19 10:53:05 +0100 Require AS deps in ActionDispatch::Http::URL Allows us to use url_for and friends in isolation. M actionpack/lib/action_dispatch/http/url.rb commit 587f563 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-02-11 21:24:11 +0100 don't cache invalid subsets when preloading hmt associations. Backport #9252. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb The preloader code on 3-2-stable is not based on relations but on option hashes. I had to modify the original patch and comparing the option hashes could be more fuzzy than comparing the relations. All the tests passed though. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/test/cases/associations/eager_test.rb commit 212ef52 refs/heads/master Author: Andrew White Date: 2013-02-19 07:48:06 +0000 Remove config.autoload_paths from config/application.rb Most application developers shouldn't be adding paths to `config.autoload_paths` as it won't be eagerly loaded so remove it from the generated config/application.rb file. If a developer does want to autoload from paths outside of the app directory then they should add the path to `config.eager_load_paths` as these paths are also autoloaded as well. M railties/lib/rails/generators/rails/app/templates/config/application.rb commit a8bf129 refs/heads/master Author: Andrew White Date: 2013-02-19 07:28:11 +0000 Don't unhook autoloading in production Whilst autoloading is known to be not threadsafe, leaving it in place is a softer solution than failing hard when an application is deployed. Many older applications will have paths added to `autoload_paths` and ideally these should be eagerly loaded to be threadsafe. However one of these paths is quite often lib which could lead to unintended consequences due to the 'junk drawer' nature of this directory. Developers should refrain from adding paths to `autoload_paths` or `eager_load_paths` and use custom folders inside app for code that needs to be eagerly loaded and use `require` or `require_dependency` to explicitly load code from other locations. M railties/lib/rails/application/finisher.rb commit 9d9b22f refs/heads/master Author: Andrew White Date: 2013-02-19 07:22:37 +0000 Revert "Deprecate the `eager_load_paths` configuration" Because of the possibility of lib being unintentionally eager loaded it's been agreed that we'll leave autoload paths and eager load paths separate for Rails 4.0. This reverts commit 0757b3388ffe4f44b60de950d40e18ef05055931. Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/engine.rb M railties/lib/rails/engine/configuration.rb M railties/lib/rails/paths.rb M railties/test/application/initializers/load_path_test.rb M railties/test/application/paths_test.rb M railties/test/paths_test.rb commit 0122134 refs/heads/master Author: Steve Klabnik Date: 2013-02-18 20:37:53 -0800 Duck typing is hard. Add header to HtmlTableFormatter. Somehow I missed this method, which was then throwing an error when viewing routes as HTML. Make @rubys happy: ✔ M actionpack/lib/action_dispatch/routing/inspector.rb commit 40a1027 refs/heads/master Author: Xavier Noria Date: 2013-02-19 01:33:50 +0100 editorial tweaks M actionpack/lib/action_dispatch/routing/inspector.rb M railties/test/application/rake_test.rb commit f4f0264 refs/heads/master Author: Steve Klabnik Date: 2013-02-18 16:26:25 -0800 Use strip_heredoc in the tests as well. Thanks @sikachu. :sweat_smile: M railties/test/application/rake_test.rb commit 13c9195 refs/heads/master Author: Steve Klabnik Date: 2013-02-18 16:20:04 -0800 use strip_heredoc to keep indentation consistent. Thanks @sikachu. :heart: M actionpack/lib/action_dispatch/routing/inspector.rb commit 33310fb refs/heads/master Merge: 8fd17e0 d3b836a Author: Xavier Noria Date: 2013-02-18 16:12:35 -0800 Merge pull request #9316 from steveklabnik/no_routes Print message on stderr when no routes are defined. commit d3b836a refs/heads/master Author: Steve Klabnik Date: 2013-02-18 10:26:59 -0800 Add message when you have no routes defined. Print a message in both `rake routes` and at GET "/rails/info/routes" that lets you know you have no routes defined, as well as linking to the Rails Guide on the topic. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/inspector.rb M railties/test/application/rake_test.rb commit 8fd17e0 refs/heads/master Merge: a2322a5 a627762 Author: Xavier Noria Date: 2013-02-18 16:03:28 -0800 Merge pull request #9318 from steveklabnik/router_headings Add headings to rake routes table commit 46b65ba refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-02-18 18:48:39 -0300 Allow failures to 2.0.0 M .travis.yml commit f9f6fc7 refs/heads/master Author: Brian Kim Date: 2013-02-18 14:20:37 -0500 Fix bug in code example from layouts and rendering guide The code in 2.3.2 assumed that render has an alert option like redirect_to to create a flash alert message, but it doesn't. M guides/source/layouts_and_rendering.md commit a627762 refs/heads/master Author: Steve Klabnik Date: 2013-02-18 10:45:14 -0800 Add headings to rake routes table M actionpack/lib/action_dispatch/routing/inspector.rb commit a2322a5 refs/heads/master Merge: 18c57c7 0dcecd2 Author: Rafael Mendonça França Date: 2013-02-18 10:32:32 -0800 Merge pull request #9317 from balexand/patch-1 Document changes from #7968 in Upgrading Guide commit 0dcecd2 refs/heads/master Author: Brian Alexander Date: 2013-02-18 11:26:52 -0700 Document changes in #7968 M guides/source/upgrading_ruby_on_rails.md commit 8743f80 refs/heads/master Author: Hanfei Shen Date: 2013-02-19 00:41:09 +0800 Update guides/source/active_record_querying.md Fix missing `ORDER BY id ASC` for Client.first(2); Uppercase the little y in the SQL equivalent of the Client.last(2). M guides/source/active_record_querying.md commit 18c57c7 refs/heads/master Author: Akira Matsuda Date: 2013-02-19 00:08:16 +0900 Bump up minitest dependency and remove our own reinvented version of ParallelEach M activesupport/activesupport.gemspec M activesupport/lib/active_support/testing/isolation.rb commit 57b0ae8 refs/heads/master Author: Akira Matsuda Date: 2013-02-18 23:57:37 +0900 Gist URLs are now namespaced see: https://github.com/blog/1406-namespaced-gists M actionpack/lib/action_dispatch/middleware/remote_ip.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M guides/source/generators.md M guides/source/kindle/KINDLE.md M railties/test/generators/shared_generator_tests.rb commit 72118ba refs/heads/master Author: Noam Gagliardi Date: 2013-02-18 04:45:58 -0500 clarify singular and plural routes Found the wording on line 158 somewhat confusing. Added short example to clarify. M guides/source/routing.md commit b04c81d refs/heads/master Merge: ef5d93d 5015368 Author: Guillermo Iguaran Date: 2013-02-17 12:53:21 -0800 Merge pull request #9313 from bkzl/return-false-on-toggle-on-error-pages Return false in toggle function on error pages commit 5015368 refs/heads/master Author: Bartlomiej Kozal Date: 2013-02-17 21:32:23 +0100 Return false on toggle on error pages M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb commit ef5d93d refs/heads/master Merge: bd328f4 2db91fb Author: Guillermo Iguaran Date: 2013-02-17 09:27:22 -0800 Merge pull request #9312 from Takehiro-Adachi/add_tests_for_ar_create Add test for ActiveRecord::Base#create commit 2db91fb refs/heads/master Author: Takehiro Adachi Date: 2013-02-18 02:12:08 +0900 add tests for ActiveRecord::Base#create M activerecord/test/cases/base_test.rb commit bd328f4 refs/heads/master Author: Andrew White Date: 2013-02-17 16:48:01 +0000 Add CHANGELOG entry for 41ff6a10216f48f43605a1f9cd6094765cab750f [ci skip] M activerecord/CHANGELOG.md commit 3c5f631 refs/tags/v3.2.15 Author: Lilibeth De La Cruz Date: 2013-01-25 04:14:27 -0400 Fix handling of dirty time zone aware attributes Previously, when `time_zone_aware_attributes` were enabled, after changing a datetime or timestamp attribute and then changing it back to the original value, `changed_attributes` still tracked the attribute as changed. This caused `[attribute]_changed?` and `changed?` methods to return true incorrectly. Example: in_time_zone 'Paris' do order = Order.new original_time = Time.local(2012, 10, 10) order.shipped_at = original_time order.save order.changed? # => false # changing value order.shipped_at = Time.local(2013, 1, 1) order.changed? # => true # reverting to original value order.shipped_at = original_time order.changed? # => false, used to return true end (cherry picked from commit bc982cbcb34129ea2cfe8aa1f8e0b40e444e68db) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb Backport of #9073 Fixes #8898 M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/dirty_test.rb commit 7a32c63 refs/heads/master Merge: 69d08eb fcdfb2b Author: Xavier Noria Date: 2013-02-16 11:25:32 -0800 Merge pull request #9307 from wangjohn/remove_unneeded_md5_digest Removed an old require of an MD5 digest which is no longer used. commit 7e90a8e refs/tags/v3.1.12 Merge: 967591b b7ee5caf Author: Xavier Noria Date: 2013-02-16 11:24:42 -0800 Merge pull request #9309 from joernchen/patch-2 Update activemodel/CHANGELOG.md commit f7c8457 refs/tags/v3.2.15 Merge: 7f4975f 01b63c7 Author: Xavier Noria Date: 2013-02-16 11:24:20 -0800 Merge pull request #9308 from joernchen/patch-1 Update activemodel/CHANGELOG.md commit b7ee5caf refs/tags/v3.1.12 Author: joernchen of Phenoelit Date: 2013-02-16 20:06:45 +0100 Update activemodel/CHANGELOG.md Fixed a typo ;) M activemodel/CHANGELOG.md commit 01b63c7 refs/tags/v3.2.15 Author: joernchen of Phenoelit Date: 2013-02-16 20:01:54 +0100 Update activemodel/CHANGELOG.md Fixed a typo M activemodel/CHANGELOG.md commit 69d08eb refs/heads/master Author: Xavier Noria Date: 2013-02-16 10:53:23 +0100 copy-edits RDoc in fba496f This revision makes the terminology uniform with the rest of the file. In general we describe these methods in terms of the adapter, rather than the database. (As a side note, if we wanted to refer to the database we would write "PostgreSQL".) M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit fcdfb2b refs/heads/master Author: wangjohn Date: 2013-02-15 20:18:25 -0500 Removed an old require of an MD5 digest which is no longer used. M actionpack/lib/action_dispatch/http/response.rb commit dad3109 refs/tags/v2.3.18 Author: Xavier Noria Date: 2013-02-16 00:26:13 +0100 Revert "Switched to newer rdoc and gem package tasks (and their requires)." This is a manual revert of commit 79aa54d, since the commit itself touches in addition some version numbers. API generation before Rails 3 uses the Jamis template, which requires an old version of RDoc. To generate the API you need Rake 0.8.x or 0.9.x, and the RDoc distributed with 1.8.7 (version 1.0.1). M Rakefile M actionmailer/Rakefile M actionpack/Rakefile M activemodel/Rakefile M activerecord/Rakefile M activeresource/Rakefile M activesupport/Rakefile M railties/Rakefile commit 7d93d91 refs/heads/master Author: Jon Leighton Date: 2013-02-15 16:30:59 +0000 Remove valid_type? method It was supposed to be removed by the preceding two reversions but I did them in the wrong order. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 0c14544 refs/heads/master Merge: 520a16c 2008fe6 Author: Vijay Dev Date: 2013-02-15 22:06:17 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: guides/source/upgrading_ruby_on_rails.md commit 2008fe6 refs/heads/master Author: Vijay Dev Date: 2013-02-15 22:01:11 +0530 copy edits [ci skip] M activerecord/lib/active_record/relation/calculations.rb M guides/source/testing.md commit 520a16c refs/heads/master Author: Jon Leighton Date: 2013-02-15 16:21:59 +0000 Revert "Make valid_type? public" This reverts commit 5d528f835e871f5f9d4b68e8a81cfbe900b7e718. Relates to f8c8ad5 which is also getting reverted due to failing test. M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit c65b076 refs/heads/master Author: Jon Leighton Date: 2013-02-15 16:19:08 +0000 Revert "checking in the abstractions for valid type checking:" This reverts commit c321b309a9a90bbfa0912832c11b3fef52e71840. Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column' M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 2f99779 refs/heads/master Author: Jon Leighton Date: 2013-02-15 16:10:27 +0000 Revert "Revert "Merge pull request #9206 from ranjaykrishna/use_define_method"" This reverts commit 8aa4603a5adaa56c818a7bd1c0b761b4ecca3d3e. Reverting the revert because I reverted the wrong thing! Fail. M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 8aa4603 refs/heads/master Author: Jon Leighton Date: 2013-02-15 16:08:47 +0000 Revert "Merge pull request #9206 from ranjaykrishna/use_define_method" This reverts commit 1fc6876b57f2e1d31731e74eb4271b5655e746d2, reversing changes made to 0268b5d8cdc3c5a1337462135f0a326a2654ba1a. Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column' M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit a159f47 refs/heads/master Merge: 9d023c8 b4c99ea Author: Jeremy Kemper Date: 2013-02-15 07:45:45 -0800 Merge pull request #9298 from wangjohn/add_documentation_to_migration_collision Added extra comment when a migration already exists of the same name commit 7f4975f refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-02-15 13:00:53 -0200 Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug" This reverts commit c5451777b038c5e48567f69256986ae42a2cde48. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/test/cases/associations/eager_test.rb commit b4c99ea refs/heads/master Author: wangjohn Date: 2013-02-15 08:24:41 -0500 Added extra comment when a migration already exists of the same name. User should know that he can overwrite the previous migration. This comes in handy especially when generating models which were previously created then removed. M railties/lib/rails/generators/migration.rb commit 9d023c8 refs/heads/master Merge: cdbd64d 19e9e67 Author: Aaron Patterson Date: 2013-02-14 09:59:16 -0800 Merge pull request #8704 from senny/remove_regexp_global_from_url_for replace regexp global in #url_for commit de83b01 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-02-14 15:46:28 -0200 Do not put the version in unreleased changes [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit b972035 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-02-14 15:36:45 -0200 Fix the CHANGELOG headers [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit c545177 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-02-14 09:28:55 -0800 Merge pull request #9252 from senny/8423_hmt_preloading_bug don't cache invalid subsets when preloading hmt associations Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/test/cases/associations/eager_test.rb commit cdbd64d refs/heads/master Merge: a254e4b 4a4ff50 Author: Rafael Mendonça França Date: 2013-02-14 09:28:55 -0800 Merge pull request #9252 from senny/8423_hmt_preloading_bug don't cache invalid subsets when preloading hmt associations commit ee3e3a9 refs/tags/v3.2.15 Merge: 4bb579a 6996a04 Author: Rafael Mendonça França Date: 2013-02-14 09:19:29 -0800 Merge pull request #9289 from rails/3-2-stable-test-with-ruby-2 Add Ruby 2.0 RC to Travis CI build matrix commit 6996a04 refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-02-14 12:18:33 -0500 Add Ruby 2.0 RC to Travis CI build matrix M .travis.yml commit 4a4ff50 refs/heads/master Author: Yves Senn Date: 2013-02-11 21:24:11 +0100 don't cache invalid subsets when preloading hmt associations. closes #8423. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/through_association.rb M activerecord/test/cases/associations/eager_test.rb commit 4bb579a refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-14 13:45:57 -0200 Fix typo in railties changelog [ci skip] Other changelogs were fixed in f15581b1bab8fa042f4614f9b2709c3c580ad9d1. M railties/CHANGELOG.md commit 967591b refs/tags/v3.1.12 Author: Carlos Antonio da Silva Date: 2013-02-14 13:43:26 -0200 Fix changelog typos [ci skip] Thanks to @jmccartie. M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit b63eb67 refs/tags/v3.2.15 Merge: d1904af f15581b Author: Rafael Mendonça França Date: 2013-02-14 07:38:56 -0800 Merge pull request #9288 from jmccartie/jm/typos Fixed changelog typos [ci skip] commit f15581b refs/tags/v3.2.15 Author: Jon McCartie Date: 2013-02-14 09:14:46 -0600 Fixed changelog typos [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md commit a254e4b refs/heads/master Merge: 9aa96f7 1c0ace4 Author: Guillermo Iguaran Date: 2013-02-14 06:14:48 -0800 Merge pull request #9285 from rahul100885/master Bump rack-test dependency to 0.6.2 commit 1c0ace4 refs/heads/master Author: Rahul P. Chaudhari Date: 2013-02-14 19:41:13 +0530 Bump rack-test dependency to 0.6.2 M actionpack/actionpack.gemspec commit 9aa96f7 refs/heads/master Merge: 1fd7830 5d528f8 Author: Carlos Antonio da Silva Date: 2013-02-14 04:02:04 -0800 Merge pull request #9283 from rubys/master Make valid_type? public commit 5d528f8 refs/heads/master Author: Sam Ruby Date: 2013-02-14 06:55:40 -0500 Make valid_type? public M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 1fd7830 refs/heads/master Merge: f36b80b 0c0ee13 Author: Carlos Antonio da Silva Date: 2013-02-13 17:49:15 -0800 Merge pull request #9254 from warnickr/9253_avoid_bigdecimal_performance_issue Before writing a numeric attribute value, ActiveRecord does an implicit conversion of boolean types (true => 1 and false => 0). If the numeric value being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to true and false. This is known to be very slow in Ruby 1.9.3 (see http://www.ruby-forum.com/topic/4409452 and https://bugs.ruby-lang.org/issues/7645#change-35188). The Ruby core team has implemented a fix for this issue that will be included in Ruby 2, but they appear to have no intention of back-porting this fix to Ruby 1.9.3. In my case, the performance impact of this issue was enormous (200% - 300% performance hit) for some of the pages in my application. See c75b5a88a82c79fdf95dfea4d72bf3c5a829930e applied to 3-2-stable branch for more reasoning and a benchmark. commit 0c0ee13 refs/heads/master Author: Ryan Warnick Date: 2013-02-11 17:31:25 -0700 9253: Before writing a numeric attribute value, ActiveRecord does an implicit conversion of boolean types (true => 1 and false => 0). If the numeric value being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to true and false. This is known to be very slow in Ruby 1.9.3. M activerecord/lib/active_record/connection_adapters/column.rb commit d1904af refs/tags/v3.2.15 Merge: c0022f8 18ffe50 Author: Carlos Antonio da Silva Date: 2013-02-13 17:32:10 -0800 Merge pull request #9278 from matthewrobertson/backport-hmt-counter-cache-bug Backport of #8400 to fix for issue #7630, a bug in has_many :through counter caches. commit 18ffe50 refs/tags/v3.2.15 Author: Matthew Robertson Date: 2012-12-01 17:56:28 -0800 backport of fix for issue #7630 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit f36b80b refs/heads/master Merge: 5d58948 caabed6 Author: Steve Klabnik Date: 2013-02-13 12:30:01 -0800 Merge pull request #9115 from bensie/issue_5802 Don't call after_commit when creating through an association and save fails, fixes #5802 commit caabed6 refs/heads/master Author: James Miller Date: 2013-02-13 12:27:06 -0800 Don't call after_commit when creating through an association and save fails, fixes #5802 M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transaction_callbacks_test.rb commit 3a388da refs/heads/master Author: Rafael Mendonça França Date: 2013-02-13 18:00:20 -0200 Revert "incorrect content of models/comment.rb after 'rails generate'" This reverts commit 0f0803fda5df60319d8646bb4f3e71f2e596316a. Reason: The content was correct since attr_accessible was removed from rails master. M guides/source/getting_started.md commit 0f0803f refs/heads/master Author: Kuba Brecka Date: 2013-02-13 20:57:06 +0100 incorrect content of models/comment.rb after 'rails generate' M guides/source/getting_started.md commit 5d58948 refs/heads/master Author: Santiago Pastorino Date: 2013-02-13 16:21:25 -0200 Avoid to_sym calls M actionpack/lib/action_dispatch/http/response.rb commit 09d7ead refs/heads/master Author: Tim "Roger" Harvey Date: 2013-02-12 13:57:20 -0800 Correct bullet content line wrapping The `:prefix` bullet content was not properly wrapping, dropping to the following line because the additional content was not indented properly. With this change, it will now display properly the way `:discard_type` does. M actionpack/lib/action_view/helpers/date_helper.rb commit f8c8ad5 refs/heads/master Merge: 1fc6876 c321b30 Author: Aaron Patterson Date: 2013-02-12 13:26:40 -0800 Merge pull request #9204 from ranjaykrishna/col-prob schema dumper tests now conducted by ActiveRecord::Base.Connection commit 6530d42 refs/heads/master Author: Americo Savinon Date: 2013-02-12 14:56:19 -0500 Detail Ruby 1.8 ships with TestUnit and Ruby 1.9 with MiniTest M guides/source/testing.md commit 1fc6876 refs/heads/master Merge: 0268b5d a69345e Author: Carlos Antonio da Silva Date: 2013-02-12 06:06:56 -0800 Merge pull request #9206 from ranjaykrishna/use_define_method Use define method instead of class_eval commit c321b30 refs/heads/master Author: Ranjay Krishna Date: 2013-02-12 02:10:48 -0500 checking in the abstractions for valid type checking: M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit a69345e refs/heads/master Author: Ranjay Krishna Date: 2013-02-12 00:59:21 -0500 reverted back our changes and added in the new define_method M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 0268b5d refs/heads/master Author: Aaron Patterson Date: 2013-02-11 18:36:46 -0800 test for regression from a712e08ebe21f6d8653a0e6602df2e0f5d40d9ca M activerecord/test/cases/persistence_test.rb commit c0022f8 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-11 23:41:17 -0200 Add note about attr_protected fix in Active Model changelog [ci skip] M activemodel/CHANGELOG.md commit 16ed3d5 refs/tags/v3.1.12 Author: Carlos Antonio da Silva Date: 2013-02-11 23:39:06 -0200 Update changelogs with version/release dates [ci skip] Also add note about attr_protected change. M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit e0da95b refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-02-11 23:32:59 -0200 Update changelogs with version/release dates [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit f2839f1 refs/remotes/origin/3-0-stable Author: Aaron Patterson Date: 2013-02-11 14:19:19 -0800 Revert "Merge pull request #9126 from mbarb0sa/bugfix/json-decoding-in-rails-3-0-stable" This reverts commit 360af4eba60823c978bd5791d40f85c7c7739c80, reversing changes made to f93d04677066b74ebb69f57028586126fc19228c. M activesupport/lib/active_support/json/backends/jsongem.rb M activesupport/lib/active_support/json/backends/okjson.rb M activesupport/test/json/decoding_test.rb commit 1737f94 refs/tags/v2.3.18 Merge: ae61bf4 02d553d Author: Aaron Patterson Date: 2013-02-11 10:20:24 -0800 Merge branch '2-3-sec' into 2-3-stable * 2-3-sec: bumping to 2.3.17 fix serialization vulnerability fixing attr_protected CVE-2013-0276 commit 182d4e3 refs/remotes/origin/3-0-stable Merge: 360af4e 073d5a6 Author: Aaron Patterson Date: 2013-02-11 10:19:54 -0800 Merge branch '3-0-sec' into 3-0-stable * 3-0-sec: fix serialization vulnerability Fix issue with attr_protected where malformed input could circumvent protection commit f1efecf refs/tags/v3.2.15 Merge: 62f01be 1dccd44 Author: Aaron Patterson Date: 2013-02-11 10:19:31 -0800 Merge branch '3-2-sec' into 3-2-stable * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md commit 67444ba refs/heads/master Merge: 65dde28 9e23399 Author: Steve Klabnik Date: 2013-02-11 10:14:49 -0800 Merge pull request #9250 from senny/8583_fix_engines_documentation_example_code fix example code in engines guide commit 360af4e refs/remotes/origin/3-0-stable Merge: f93d046 fdc42ad Author: Aaron Patterson Date: 2013-02-11 09:21:36 -0800 Merge pull request #9126 from mbarb0sa/bugfix/json-decoding-in-rails-3-0-stable fixed failing JSON decoding in rails 3-0-stable commit ae61bf4 refs/tags/v2.3.18 Author: Carlos Antonio da Silva Date: 2013-02-11 14:57:19 -0200 Revert "Merge pull request #9251 from Davidslv/patch-1" This reverts commit d6adcb4ed35b5626780f7e6130631fe2dfe2ac43, reversing changes made to 2e4aa39ee6cd56b8d544fda01670f5a48548f13e. Reason: merged to unmaintained branch. M activesupport/lib/active_support/core_ext/time/calculations.rb commit d6adcb4 refs/tags/v2.3.18 Merge: 2e4aa39 41cf359 Author: Carlos Antonio da Silva Date: 2013-02-11 08:51:36 -0800 Merge pull request #9251 from Davidslv/patch-1 Add alias to maintain coherence with other methods, in end_of_day commit 41cf359 refs/tags/v2.3.18 Author: David Silva Date: 2013-02-11 16:36:22 +0000 Update activesupport/lib/active_support/core_ext/time/calculations.rb Just maintaining the coherence with other methods, since everything has "at_" as prefix. M activesupport/lib/active_support/core_ext/time/calculations.rb commit 4e02a69 refs/heads/master Author: Carson McDonald Date: 2013-02-11 11:32:12 -0500 Fix typo. [ci skip] M actionpack/lib/action_dispatch/middleware/remote_ip.rb commit 65dde28 refs/heads/master Merge: b1c72a3 9dfef5a Author: Carlos Antonio da Silva Date: 2013-02-11 08:03:09 -0800 Merge pull request #9247 from lest/store-module define Active Record Store accessors in a module commit 9e23399 refs/heads/master Author: Yves Senn Date: 2013-02-11 15:19:38 +0100 fix the example code in the engines guide. closes #8583. M guides/source/engines.md commit fdf04fe refs/heads/master Author: Yves Senn Date: 2013-02-11 15:19:09 +0100 remove trailing whitespace from engines guide M guides/source/engines.md commit 9dfef5a refs/heads/master Author: Sergey Nartimov Date: 2013-02-11 17:00:55 +0300 define Active Record Store accessors in a module Allow store accessors to be overrided like other attribute methods, e.g.: class User < ActiveRecord::Base store :settings, accessors: [ :color, :homepage ], coder: JSON def color super || 'red' end end M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb M activerecord/test/models/admin/user.rb commit b1c72a3 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-11 11:37:17 -0200 Improve changelog entry from #9221 [ci skip] M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 7765ee0 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-11 11:24:38 -0200 Add changelog entry for #9177 [ci skip] Add test:all and test:all:db rake tests to speed up full test runs. M railties/CHANGELOG.md commit a53935d refs/heads/master Author: Noemj Date: 2013-01-30 14:55:01 +0200 Changed update_record to use prepared statements. M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/adapter_test.rb commit 7596792 refs/heads/master Merge: cdd293c dd9f8bc Author: Carlos Antonio da Silva Date: 2013-02-11 04:21:53 -0800 Merge pull request #9221 from thenickcox/image_alt_attribute Improve img alt attribute for screen readers commit cdd293c refs/heads/master Author: Aaron Patterson Date: 2013-02-10 22:50:01 -0800 fixing bit string test M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit 17a69c7 refs/heads/master Merge: 3900a16 2098525 Author: Steve Klabnik Date: 2013-02-10 19:21:59 -0800 Merge pull request #9245 from vasconcelloslf/fix_guide_typo fix a typo on the engine guide commit 02d553d refs/tags/v2.3.17 (tag: v2.3.17) Author: Aaron Patterson Date: 2013-02-10 19:14:02 -0800 bumping to 2.3.17 M actionmailer/Rakefile M actionmailer/actionmailer.gemspec M actionmailer/lib/action_mailer/version.rb M actionpack/Rakefile M actionpack/actionpack.gemspec M actionpack/lib/action_pack/version.rb M activerecord/Rakefile M activerecord/activerecord.gemspec M activerecord/lib/active_record/version.rb M activeresource/Rakefile M activeresource/activeresource.gemspec M activeresource/lib/active_resource/version.rb M activesupport/activesupport.gemspec M activesupport/lib/active_support/version.rb M railties/Rakefile M railties/lib/rails/version.rb M railties/railties.gemspec commit 5cfe833 refs/tags/v2.3.17 Author: Tobias Kraze Date: 2013-02-08 12:52:10 +0100 fix serialization vulnerability M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/base_test.rb commit 073d5a6 refs/remotes/origin/3-0-stable Author: Tobias Kraze Date: 2013-02-08 12:52:10 +0100 fix serialization vulnerability M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/test/cases/base_test.rb commit 415bf3d refs/tags/v3.1.11 (tag: v3.1.11) Author: Aaron Patterson Date: 2013-02-10 19:08:23 -0800 bumping to 3.1.11 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 1dccd44 refs/tags/v3.2.12 (tag: v3.2.12) Author: Aaron Patterson Date: 2013-02-10 19:05:41 -0800 bumping version M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 9b9be48 refs/tags/v3.2.12 Author: Aaron Patterson Date: 2013-02-10 19:02:55 -0800 remove ruby-prof M Gemfile commit 2098525 refs/heads/master Author: Luis Vasconcellos Date: 2013-02-11 00:59:47 -0200 fix a typo on the engine guide M guides/source/engines.md commit 3900a16 refs/heads/master Merge: a429d9e cfd8525 Author: Guillermo Iguaran Date: 2013-02-10 09:33:41 -0800 Merge pull request #9240 from tricknotes/supress-warning Supress warning about method redifinition commit cfd8525 refs/heads/master Author: Ryunosuke SATO Date: 2013-02-11 02:21:59 +0900 Supress warning about method redifinition In i18n gem, the following methods are defined. - `Hash#except` - `Hash#slice` But if there are defined already, i18n skips these definitions. So these definition by `active_support` are required before `require 'i18n'`. M activesupport/lib/active_support/i18n.rb commit 62f01be refs/tags/v3.2.15 Merge: d29235d baeafb4 Author: Guillermo Iguaran Date: 2013-02-10 09:07:46 -0800 Merge pull request #9239 from senny/use_ruby_version_on_3_2 ignore .ruby-version instead of tool specifc config on 3-2-stable commit baeafb4 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-02-10 18:03:13 +0100 use .ruby-version instead of tool specifc config M .gitignore commit a429d9e refs/heads/master Merge: 5aff218 65bf094 Author: Carlos Antonio da Silva Date: 2013-02-10 07:39:52 -0800 Merge pull request #9238 from norman/unicode_62 Update to latest Unicode data. commit 5aff218 refs/heads/master Merge: 95dd699 c112721 Author: Andrew White Date: 2013-02-10 07:37:41 -0800 Merge pull request #8643 from tricknotes/remove-method-redefined-warning Remove method redefined warning commit c112721 refs/heads/master Author: Ryunosuke SATO Date: 2012-12-29 04:38:14 +0900 Remove method redefined warning In `i18n` gem, the method definition of `Hash#deep_merge!` is skipped when it is already defined. - warning: method redefined; discarding old deep_merge! M activesupport/lib/active_support/i18n.rb commit 65bf094 refs/heads/master Author: Norman Clarke Date: 2013-02-10 12:05:28 -0300 Update to latest Unicode data. Release notes at: http://www.unicode.org/versions/Unicode6.2.0/ M activesupport/lib/active_support/multibyte/unicode.rb M activesupport/lib/active_support/values/unicode_tables.dat commit 95dd699 refs/heads/master Merge: a0380e8 d59a877 Author: Xavier Noria Date: 2013-02-10 03:30:34 -0800 Merge pull request #7730 from beyond/gzip added compress options for gzip commit d59a877 refs/heads/master Author: Beyond Date: 2012-09-22 18:07:50 +0900 added compress options for gzip added test for compress options of gzip update changelog M activesupport/CHANGELOG.md M activesupport/lib/active_support/gzip.rb M activesupport/test/gzip_test.rb commit dd9f8bc refs/heads/master Author: thenickcox Date: 2013-02-07 23:07:42 -0800 Improve img alt attribute for screen readers Currently, the img_alt method in ActionView keeps underscores in the alt attribute. Because underscores are pronounced in Apple's VoiceOver Utility, this has serious implications for accessibility. This patch makes underscored or hyphenated file names (both common in projects) read more naturally in screen readers by replacing them with spaces. See method documentation for details. Added documentation to image_alt method M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit f8a2ec2 refs/remotes/origin/2-3-stable Author: Aaron Patterson Date: 2013-02-09 17:23:41 -0800 adding test for CVE M activerecord/test/cases/base_test.rb commit 9a48f4c refs/tags/v2.3.17 Author: Aaron Patterson Date: 2013-02-09 16:31:04 -0800 fixing attr_protected CVE-2013-0276 M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/base.rb commit b0bf30c refs/remotes/origin/3-1-stable Author: Aaron Patterson Date: 2013-02-09 17:02:44 -0800 adding test for CVE M activerecord/test/cases/mass_assignment_security_test.rb commit 647afdb refs/tags/v3.1.11 Author: joernchen of Phenoelit Date: 2013-02-09 15:46:44 -0800 Fix issue with attr_protected where malformed input could circumvent protection Fixes: CVE-2013-0276 M activemodel/lib/active_model/attribute_methods.rb M activemodel/lib/active_model/mass_assignment_security/permission_set.rb commit c35d913 refs/tags/v3.2.15 Author: Aaron Patterson Date: 2013-02-09 17:00:59 -0800 adding test for CVE M activerecord/test/cases/mass_assignment_security_test.rb commit 060bb72 refs/tags/v3.2.12 Author: joernchen of Phenoelit Date: 2013-02-09 15:46:44 -0800 Fix issue with attr_protected where malformed input could circumvent protection Fixes: CVE-2013-0276 M activemodel/lib/active_model/attribute_methods.rb M activemodel/lib/active_model/mass_assignment_security/permission_set.rb commit 2f0ff75 refs/tags/v3.2.12 Author: Aaron Patterson Date: 2013-02-09 16:54:48 -0800 fixing call to columns hash. run the damn tests when you backport! M activerecord/lib/active_record/relation/predicate_builder.rb commit 638e247 refs/tags/v3.2.12 Author: Santiago Pastorino Date: 2013-02-08 17:54:25 -0200 Bump rack dependency to 1.4.5 Conflicts: actionpack/actionpack.gemspec M actionpack/actionpack.gemspec commit b00fe01 refs/tags/v3.2.12 Author: Guillermo Iguaran Date: 2013-02-08 07:11:37 -0800 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string [3.2] Fix test failure for ruby 1.8. M activerecord/test/cases/relation/where_test.rb commit 921a296 refs/tags/v3.2.12 Author: Guillermo Iguaran Date: 2013-02-07 18:45:25 -0800 Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric [3.2] active_record: Quote numeric values compared to string columns. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/quoting_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/schema/schema.rb commit d29235d refs/tags/v3.2.15 Author: Aaron Patterson Date: 2013-02-09 16:54:48 -0800 fixing call to columns hash. run the damn tests when you backport! M activerecord/lib/active_record/relation/predicate_builder.rb commit a0380e8 refs/heads/master Author: Jeremy Kemper Date: 2013-02-09 17:41:07 -0700 Prefer Ruby 2.0; require 1.9.3+ M guides/source/4_0_release_notes.md M guides/source/getting_started.md M guides/source/upgrading_ruby_on_rails.md M railties/lib/rails/ruby_version_check.rb commit 2dfd512 refs/remotes/origin/3-0-stable Author: joernchen of Phenoelit Date: 2013-02-09 15:46:44 -0800 Fix issue with attr_protected where malformed input could circumvent protection Fixes: CVE-2013-0276 Conflicts: activemodel/lib/active_model/attribute_methods.rb activerecord/test/cases/mass_assignment_security_test.rb M activemodel/lib/active_model/attribute_methods.rb M activemodel/lib/active_model/mass_assignment_security/permission_set.rb commit 56f5188 refs/heads/master Merge: 3423842 9e10d59 Author: Carlos Antonio da Silva Date: 2013-02-09 13:37:46 -0800 Merge pull request #9234 from senny/9231_no_numbers_in_route_namespaces_allowed The `:controller` option for routes can contain numbers. closes #9231. commit 9e10d59 refs/heads/master Author: Yves Senn Date: 2013-02-09 21:10:53 +0100 the `:controller` option for routes can contain numbers. closes #9231. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 3423842 refs/heads/master Merge: 9c5cc89 afdb84a Author: Carlos Antonio da Silva Date: 2013-02-09 13:24:17 -0800 Merge pull request #9233 from rahul100885/master Added notice message for destroy method in scaffold commit afdb84a refs/heads/master Author: Rahul P. Chaudhari Date: 2013-02-09 22:40:45 +0530 Added notice message for destroy method in scaffold M railties/CHANGELOG.md M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb commit 24e0845 refs/heads/master Author: Ryunosuke SATO Date: 2013-02-10 04:11:52 +0900 Fix supported ruby version for Rails 4 M guides/source/upgrading_ruby_on_rails.md commit 07f533a refs/heads/master Author: Ryunosuke SATO Date: 2013-02-10 03:53:27 +0900 Fix CoffeeScript example `a[data-color]` is not used in example html. M guides/source/working_with_javascript_in_rails.md commit 9c5cc89 refs/heads/master Author: Guillermo Iguaran Date: 2013-02-09 12:23:32 -0500 Update activerecord/CHANGELOG.md M activerecord/CHANGELOG.md commit 1c2b185 refs/heads/master Merge: da483d3 34eee28 Author: Guillermo Iguaran Date: 2013-02-09 09:22:27 -0800 Merge pull request #9232 from robertomiranda/where-with-empty-hash Use IN operator like Arel for empty hash in where clause commit 34eee28 refs/heads/master Author: robertomiranda Date: 2013-02-09 12:06:49 -0500 Use IN operator like arel for empty hash in where clause M activerecord/lib/active_record/relation/predicate_builder.rb commit 53c22e0 refs/heads/master Author: Henrik Nyh Date: 2013-02-09 15:54:14 +0100 Clarify ActiveModel::Validator initialization in docs. As discussed with @josevalim on Ruby Rogues Parley. M activemodel/lib/active_model/validator.rb commit 045f019 refs/heads/master Author: Henrik Nyh Date: 2013-02-09 15:47:22 +0100 Validations guide: validates_with init clarification. As discussed with @josevalim on Ruby Rogues Parley. M guides/source/active_record_validations.md commit da483d3 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-08 22:12:06 -0200 Add missing require to AP M actionpack/lib/action_dispatch/middleware/cookies.rb commit 29f3a03 refs/heads/master Author: Guillermo Iguaran Date: 2013-02-08 16:53:49 -0500 Reverting e170014113 (Change behaviour with empty hash in where clause) M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb commit b5645d0 refs/heads/master Author: Santiago Pastorino Date: 2013-02-08 18:30:53 -0200 We don't need a CHANGELOG entry for an issue of something that was not released yet M actionpack/CHANGELOG.md commit 86bfdbb refs/heads/master Merge: 10d301e 4127332 Author: Santiago Pastorino Date: 2013-02-08 12:27:11 -0800 Merge pull request #9196 from AndreyChernyh/fix-cookies-with-null-session Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator commit 697f31c refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2013-02-08 17:54:25 -0200 Bump rack dependency to 1.4.5 M actionpack/actionpack.gemspec commit 10d301e refs/heads/master Author: Santiago Pastorino Date: 2013-02-08 17:53:41 -0200 Bump rack dependency to 1.5.2 M actionpack/actionpack.gemspec commit fa987cb refs/heads/master Author: Guillermo Iguaran Date: 2013-02-08 14:22:10 -0500 Reverting 16f6f25 (Change behaviour with empty array in where clause) M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relations_test.rb commit 4127332 refs/heads/master Author: Andrey Chernih Date: 2013-02-08 22:22:16 +0400 Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/controller/request_forgery_protection_test.rb commit c470941 refs/tags/v3.1.11 Merge: ecfc26d 2372a1f Author: Guillermo Iguaran Date: 2013-02-08 08:05:01 -0800 Merge pull request #9226 from robertomiranda/fix-bigdecimal-test [3.1] Fix test failure for ruby 1.8 commit 2372a1f refs/tags/v3.1.11 Author: robertomiranda Date: 2013-02-08 10:27:09 -0500 Fix test failure for ruby 1.8 M activerecord/test/cases/relation/where_test.rb commit 54af52d refs/tags/v3.2.15 Merge: 00e0b25 cbdfaf2 Author: Guillermo Iguaran Date: 2013-02-08 07:11:37 -0800 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string [3.2] Fix test failure for ruby 1.8. commit cbdfaf2 refs/tags/v3.2.15 Author: Dylan Smith Date: 2013-02-08 09:43:53 -0500 Fix test failure for ruby 1.8. BigDecimal.new needs to take a string rather than an integer in ruby 1.8. M activerecord/test/cases/relation/where_test.rb commit f93d046 refs/remotes/origin/3-0-stable Merge: 663c9a6 a316c09 Author: Guillermo Iguaran Date: 2013-02-08 06:34:37 -0800 Merge pull request #9223 from robertomiranda/fix-bigdecimal-typecast Fix BigDecimal Typecast on 1.8.7 commit a316c09 refs/remotes/origin/3-0-stable Author: robertomiranda Date: 2013-02-08 09:27:53 -0500 Fix BigDecimal Typecast on 1.8.7 M activerecord/test/cases/relation/where_test.rb commit 01e6731 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-08 11:29:47 -0200 Improve changelog entries in AR Describe better the changes related to raising errors with empty array/hash values in where clauses. [ci skip] M activerecord/CHANGELOG.md commit 85e1c4a refs/heads/master Merge: bcf0e08 16f6f25 Author: Guillermo Iguaran Date: 2013-02-08 05:22:38 -0800 Merge pull request #9216 from robertomiranda/where-with-empty-array Activer Record: Change behaviour with empty array in where clause commit 16f6f25 refs/heads/master Author: robertomiranda Date: 2013-02-06 09:10:02 -0500 Change behaviour with empty array in where clause M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/finder_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relations_test.rb commit bcf0e08 refs/heads/master Merge: f163749 e170014 Author: Michael Koziarski Date: 2013-02-07 23:33:00 -0800 Merge pull request #9220 from robertomiranda/where-with-empty-hash Active Record: Change behaviour with empty hash in where clause commit e170014 refs/heads/master Author: robertomiranda Date: 2013-02-08 00:51:43 -0500 Change behaviour with empty hash in where clause M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb commit 00e0b25 refs/tags/v3.2.15 Merge: b4f189a 04c2d2e Author: Guillermo Iguaran Date: 2013-02-07 18:45:25 -0800 Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric [3.2] active_record: Quote numeric values compared to string columns. commit ecfc26d refs/tags/v3.1.11 Merge: 4ebe101 26e13c3 Author: Guillermo Iguaran Date: 2013-02-07 18:45:19 -0800 Merge pull request #9209 from dylanahsmith/3-1-mysql-quote-numeric [3.1] active_record: Quote numeric values compared to string columns. commit 663c9a6 refs/remotes/origin/3-0-stable Merge: 10513d2 b4be619 Author: Guillermo Iguaran Date: 2013-02-07 18:45:12 -0800 Merge pull request #9210 from dylanahsmith/3-0-mysql-quote-numeric [3.0] active_record: Quote numeric values compared to string columns. commit f163749 refs/heads/master Merge: 408227d 3b7b887 Author: Carlos Antonio da Silva Date: 2013-02-07 17:21:41 -0800 Merge pull request #9185 from tricknotes/fix-article-for-generator-name Fix article for generator name commit 7c663f5 refs/heads/master Author: Maurizio De Santis Date: 2013-02-07 23:01:19 +0100 Add example for ActiveRecord::Base.joins using a string as argument M activerecord/lib/active_record/relation/query_methods.rb commit cf5e0f4 refs/heads/master Author: Maurizio De Santis Date: 2013-02-07 22:50:17 +0100 Add example for ActiveRecord::Base.group using a string as argument M activerecord/lib/active_record/relation/query_methods.rb commit ba407c8 refs/heads/master Author: Maurizio De Santis Date: 2013-02-07 22:43:50 +0100 Add documentation for ActiveRecord.select when use strings as arguments M activerecord/lib/active_record/relation/query_methods.rb commit a8c2981 refs/heads/master Author: Maurizio De Santis Date: 2013-02-07 21:24:45 +0100 Add ActiveRecord.count documentation when used on group relations M activerecord/lib/active_record/relation/calculations.rb commit 408227d refs/heads/master Merge: dca0b57 a712e08 Author: Guillermo Iguaran Date: 2013-02-07 12:16:53 -0800 Merge pull request #9207 from dylanahsmith/mysql-quote-numeric active_record: Quote numeric values compared to string columns. commit b4be619 refs/remotes/origin/3-0-stable Author: Dylan Smith Date: 2013-02-07 14:31:16 -0500 mysql2 adapter fixed upstream to delegate quoting of BigDecimal. M activerecord/test/cases/relation/where_test.rb commit dca0b57 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-07 08:33:32 -0200 Skip schema dumper extensions test if connection does not support it Travis failed because the postgresql version installed there does not support extensions, so we just need to skip this for now. M activerecord/test/cases/schema_dumper_test.rb commit 26e13c3 refs/tags/v3.1.11 Author: Dylan Smith Date: 2013-02-06 13:19:09 -0500 active_record: Quote numeric values compared to string columns. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/quoting_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/schema/schema.rb commit 04c2d2e refs/tags/v3.2.15 Author: Dylan Smith Date: 2013-02-06 13:19:09 -0500 active_record: Quote numeric values compared to string columns. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/quoting_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/schema/schema.rb commit a712e08 refs/heads/master Author: Dylan Smith Date: 2013-02-06 13:19:09 -0500 active_record: Quote numeric values compared to string columns. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/quoting_test.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/schema/schema.rb commit 0fc58ca refs/remotes/origin/3-0-stable Author: Dylan Smith Date: 2013-02-06 13:19:09 -0500 active_record: Quote numeric values compared to string columns. M activerecord/CHANGELOG M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/schema/schema.rb commit 1b75666 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-06 23:01:39 -0200 Run schema dumper extensions without creating real extensions There is no need to create the extension in the database just to test if it's dumped, we can stub that instead. M activerecord/test/cases/schema_dumper_test.rb commit 86f4db9 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-06 22:57:07 -0200 Do not print anything related to extensions when they don't none exist When extensions are supported but there's no one enabled in the database, we should not print anything related to them in schema.rb. M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/schema_dumper_test.rb commit 73510b1 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-06 22:49:00 -0200 Add blank line after extensions to separate from tables in schema M activerecord/lib/active_record/schema_dumper.rb commit 3ee3edd refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-06 22:47:23 -0200 Fix indentation of extensions in schema M activerecord/lib/active_record/schema_dumper.rb commit f88c336 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-06 22:35:10 -0200 Call super to use the abstract adapter implementation instead M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 7173919 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-06 22:42:06 -0200 Add changelog entry for #9203 about schema dumper with db extensions [ci skip] M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 34ac46c refs/heads/master Merge: 2f0c26b fba496f Author: Aaron Patterson Date: 2013-02-06 16:18:06 -0800 Merge pull request #9203 from jaggederest/dumping_pgsql_extensions Adding database extension support to schema.rb commit fba496f refs/heads/master Author: Justin George Date: 2013-02-06 15:58:51 -0800 add ActiveRecord::AbstractAdapter#extensions and ActiveRecord::ConnectionAdapters::PostgreSQLAdapter#extensions to allow dumping of enabled extensions to schema.rb, add ActiveRecord::SchemaDumper#extensions to dump extensions to schema.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/schema_dumper.rb commit e2fdfa9 refs/heads/master Author: Justin George Date: 2013-02-06 15:55:58 -0800 improve tests to check for existence of extensions method, and skip testing dumped extensions if they are unsupported by the database M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/schema_dumper_test.rb commit c0990f0 refs/heads/master Author: Justin George Date: 2013-02-06 15:48:08 -0800 Add some tests to enumerate how extensions should be stored in the schema output M activerecord/test/cases/adapters/postgresql/hstore_test.rb M activerecord/test/cases/schema_dumper_test.rb commit d47b90e refs/heads/master Author: Dalibor Nasevic Date: 2013-02-06 23:31:02 +0100 Change Class#subclasses doc example M activesupport/lib/active_support/core_ext/class/subclasses.rb commit 2f0c26b refs/heads/master Author: Carlos Antonio da Silva Date: 2013-02-06 18:59:15 -0200 Update changelog from #9128 with author name And improve AS changelog a bit [ci skip] M activesupport/CHANGELOG.md commit c759813 refs/heads/master Merge: f14dcc0 28ab79d Author: Jeremy Kemper Date: 2013-02-06 12:33:28 -0800 Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy Modify TimeWithZone#as_json to return 3DP of sub-second accuracy. commit f14dcc0 refs/heads/master Author: Rafael Mendonça França Date: 2013-02-06 18:01:32 -0200 Update actionpack/CHANGELOG.md [ci skip] M actionpack/CHANGELOG.md commit 329c823 refs/heads/master Merge: 99bb2fd 69f28a7 Author: Rafael Mendonça França Date: 2013-02-06 11:59:58 -0800 Merge pull request #9039 from senny/warn_on_controller_option_with_ruby_constant_syntax ruby constant syntax is not supported as routing `:controller` option. commit 69f28a7 refs/heads/master Author: Yves Senn Date: 2013-01-23 09:31:16 +0100 ruby constant syntax is not supported as routing `:controller` option. The current implementation only works correctly if you supply the `:controller` with directory notation (eg. `:controller => 'admin/posts'`). The ruby constant notation (eg. `:controller => 'Admin::Posts`) leads to unexpected problems with `url_for`. This patch prints a warning for every non supported `:controller` option. I also added documentation how to work with namespaced controllers. The warning links to that documentation in the rails guide. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb M guides/source/routing.md commit 741b291 refs/heads/master Author: Marc Baumbach Date: 2013-02-06 13:15:09 -0500 Fixing the examples for button_to The examples do not generate the output they intend to due to not explicitly declaring the hash separations. This causes it to be treated as one parameter instead of the intended two parameters. M actionpack/lib/action_view/helpers/url_helper.rb commit 3b7b887 refs/heads/master Author: Ryunosuke SATO Date: 2013-02-07 01:31:50 +0900 Fix article for generator name Use 'some' instead of 'a/an'. M railties/lib/rails/generators/app_base.rb commit 2e4aa39 refs/tags/v2.3.18 Merge: c774a46 d61f83d Author: Xavier Noria Date: 2013-02-06 00:14:32 -0800 Merge pull request #9194 from kwstannard/2-3-stable Docs: Fixed bad exists? documentation. commit 99bb2fd refs/heads/master Author: José Valim Date: 2013-02-05 14:03:13 -0700 Update .gitignore Get rid of old .rvmrc and .rbenv-version files. M .gitignore commit b713f1b refs/heads/master Author: Rafael Mendonça França Date: 2013-02-05 17:46:53 -0200 Enable hstore extensions on tests if it is not enabled and database supports it M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit 655e95c refs/heads/master Merge: c163916 36acc0a Author: Rafael Mendonça França Date: 2013-02-05 09:00:16 -0800 Merge pull request #9192 from adammck/ignore-dot-ruby-version Ignore .ruby-version commit d61f83d refs/tags/v2.3.18 Author: Kelly Stannard Date: 2013-02-05 16:51:20 +0000 Docs: Fixed bad exists? documentation. Base#exists? does not actually take options like finder methods. Trying to use what the documentation suggests will return a PG error because it will look for a column named 'conditions'. I changed the documentation to reflect how the exists? method actually works. M railties/guides/source/active_record_querying.textile commit 36acc0a refs/heads/master Author: Adam Mckaig Date: 2013-02-05 11:46:51 -0500 Ignore .ruby-version M .gitignore commit 7290fb2 refs/heads/master Author: Ryunosuke SATO Date: 2013-02-05 09:53:28 +0900 Fix file name in document [ci skip] This file was renamed in c8a25386d. M guides/source/contributing_to_ruby_on_rails.md commit c163916 refs/heads/master Merge: 5efce21 ebcb53c Author: Carlos Antonio da Silva Date: 2013-02-04 15:50:10 -0800 Merge pull request #9178 from robertomiranda/best-standard-support-guide Update upgrading guide with ActionDispatch::BestStandardsSupport removal [ci skip] commit ebcb53c refs/heads/master Author: robertomiranda Date: 2013-02-04 18:00:18 -0500 Update upgrading guide with ActionDispatch::BestStandardsSupport removal M guides/source/upgrading_ruby_on_rails.md commit 5efce21 refs/heads/master Merge: cb48bbe 0e00637 Author: Aaron Patterson Date: 2013-02-04 14:59:44 -0800 Merge pull request #9177 from zenspider/master Added test:all and test:all:db tasks to speed up full test runs commit 0e00637 refs/heads/master Author: Ryan Davis Date: 2013-02-04 14:50:04 -0800 Added test:all and test:all:db tasks to speed up full test runs. Speed up depends on the number of test phases (N) you have for your app, but it is roughly a 1/N improvement. In my app, it goes from 15.51s to 5.56s. Inspired by http://ngauthier.com/2012/02/quick-tests-with-bash.html Reviewed by @tenderlove M railties/lib/rails/test_unit/testing.rake commit cb48bbe refs/heads/master Merge: 5720de7 3a5b38b Author: Guillermo Iguaran Date: 2013-02-04 13:30:15 -0800 Merge pull request #9175 from robertomiranda/add--rc-desc Add --rc description on the command line commit 3a5b38b refs/heads/master Author: robertomiranda Date: 2013-02-04 16:25:44 -0500 Add --rc description on the command line M railties/lib/rails/generators/app_base.rb commit 5720de7 refs/heads/master Merge: 65113fd 5103036 Author: Rafael Mendonça França Date: 2013-02-04 13:09:13 -0800 Merge pull request #9174 from robertomiranda/railsrc-cli-option Use --rc=PATH instead of --rc PATH commit 5103036 refs/heads/master Author: robertomiranda Date: 2013-02-04 12:57:12 -0500 Use --rc= instead of --rc M railties/lib/rails/commands/application.rb commit 65113fd refs/heads/master Merge: e16110c cce94e7 Author: Carlos Antonio da Silva Date: 2013-02-04 05:51:36 -0800 Merge pull request #8520 from senny/8516_assert_template_with_locals Improved `assert_template` when matching :locals with partials commit cce94e7 refs/heads/master Author: Yves Senn Date: 2012-12-15 20:21:40 +0100 partials inside directory work with `assert_template` previously when a partial was placed inside a directory (eg. '/dir/_partial'), `assert_template` did not replace the '_' prefix when looking through rendered tempaltes, which resulted in an error. I modified it to replace both, the leading '_' and the last '_' after a '/'. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/test_case.rb A actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb A actionpack/test/fixtures/test/render_partial_inside_directory.html.erb M actionpack/test/template/test_case_test.rb commit c21ab33 refs/heads/master Author: Yves Senn Date: 2012-12-15 20:20:34 +0100 descriptive `assert_template` error when partial wasn't rendered When `assert_template` is used with the :locals option, and the partial was not rendered, a method_missing error was raised. This changes first checks, if the partial actually was rendered and raises a descriptive error. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/test_case.rb M actionpack/test/template/test_case_test.rb commit e16110c refs/heads/master Author: Rafael Mendonça França Date: 2013-02-04 09:59:22 -0200 Take care of whitespaces and changing the hash syntax M activemodel/test/cases/validations/length_validation_test.rb commit 443be75 refs/heads/master Merge: 633d953 6e2cba1 Author: Aaron Patterson Date: 2013-02-03 22:07:40 -0800 Merge pull request #9152 from dahakawang/master test for issue 8931 commit b4f189a refs/tags/v3.2.15 Merge: bf794bb e835793 Author: Carlos Antonio da Silva Date: 2013-02-03 04:30:14 -0800 Merge pull request #9159 from lexmag/col_defaults-dup-fix Backport: Duplicate column_defaults properly commit e835793 refs/tags/v3.2.15 Author: Yasuo Honda Date: 2012-07-24 22:46:17 +0900 This pull requests addresses ORA-01400 errors and also supports #6115 issue tested. Issue #6115 has been fixed and tested with the attribute `:null => false, :default => ""` However `:null => false` attribute is not necessary to test this issue, which causes many ORA-01400 errors with Oracle enhanced adapter. M activerecord/test/schema/schema.rb commit 6a0a5f3 refs/tags/v3.2.15 Author: Piotr Sarnacki Date: 2013-02-03 15:27:42 +0400 Duplicate column_defaults properly Backport c517602 to fix #6115 Deleted: activerecord/lib/active_record/core.rb Conflicts: activerecord/test/cases/base_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/test/cases/base_test.rb M activerecord/test/schema/schema.rb commit 633d953 refs/heads/master Merge: ecd004e c8a2538 Author: Xavier Noria Date: 2013-02-03 00:06:21 -0800 Merge pull request #9164 from yuki24/put_rdoc_at_the_end_of_RUNNING_UNIT_TESTS Put .rdoc at the end of the files named RUNNING_UNIT_TESTS commit c8a2538 refs/heads/master Author: Yuki Nishijima Date: 2013-02-03 15:49:48 +0900 Put .rdoc at the end of the files named RUNNING_UNIT_TESTS So that they are printed nicely on GitHub. D actionpack/RUNNING_UNIT_TESTS A actionpack/RUNNING_UNIT_TESTS.rdoc D activerecord/RUNNING_UNIT_TESTS A activerecord/RUNNING_UNIT_TESTS.rdoc commit ecd004e refs/heads/master Merge: d352485 9e18ce7 Author: Guillermo Iguaran Date: 2013-02-02 07:15:38 -0800 Merge pull request #9154 from robertomiranda/add-rc-desc Add --no-rc description on the command line commit 9e18ce7 refs/heads/master Author: robertomiranda Date: 2013-02-02 09:51:17 -0500 Add --no-rc description on the command line M railties/lib/rails/generators/app_base.rb commit d352485 refs/heads/master Merge: 08b60fc 10c262c Author: Rafael Mendonça França Date: 2013-02-02 05:01:22 -0800 Merge pull request #9151 from gogogarrett/patch-1 Fix link to point to new RefineryCMS repo commit c774a46 refs/tags/v2.3.18 Author: Rafael Mendonça França Date: 2013-02-02 10:59:54 -0200 Fix the tests related with single quotes being escaped Closes #9144 Fixes #9145 M actionpack/test/template/active_record_helper_test.rb M actionpack/test/template/erb_util_test.rb M actionpack/test/template/form_helper_test.rb M actionpack/test/template/text_helper_test.rb commit 88331c5 refs/tags/v2.3.18 Author: Morgan Currie Date: 2013-02-01 10:44:23 -0400 use the decimal HTML escape code for single quotes instead of the hex one so webkit-based browsers properly translate the code in form fields M activesupport/lib/active_support/core_ext/string/output_safety.rb commit bf794bb refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-26 03:18:21 -0800 Merge pull request #9078 from senny/6865_ar_count_with_uniq `#count` in conjunction with `#uniq` performs distinct count. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 08b60fc refs/heads/master Merge: 784ed15 6a86873 Author: Xavier Noria Date: 2013-02-02 10:33:19 +0100 Merge remote-tracking branch 'docrails/master' commit 6a86873 refs/heads/master Author: Xavier Noria Date: 2013-02-02 10:27:52 +0100 Revert "Detail middleware initialization points in the initialization guide [ci skip]" I feel this is too detailed for the guide. Most of that is not public interface, and if tomorrow something is added or removed in those chains we do not want to come here to maintain it. Also, linking to a gist is not a good idea in a guide. We could have a more broad description of what goes in what order, the most key and public things. This reverts commit 862a05edf3af128f25a87999936262b733ed781e. M guides/source/initialization.md commit 784ed15 refs/heads/master Author: Guillermo Iguaran Date: 2013-02-02 00:36:43 -0500 Refactor --rc option M railties/lib/rails/commands/application.rb commit 9cb386d refs/heads/master Merge: 3e1f231 5f1dc8e Author: Guillermo Iguaran Date: 2013-02-01 21:27:06 -0800 Merge pull request #9147 from amparo-luna/custom_rc Add --rc option to support the load of a custom rc file commit 6e2cba1 refs/heads/master Author: David Date: 2013-02-02 13:00:52 +0800 test for issue 8931 M activemodel/test/cases/validations/length_validation_test.rb commit 5f1dc8e refs/heads/master Author: Amparo Luna Date: 2013-02-01 14:59:29 -0500 Add --rc option to support the load of a custom rc file M railties/CHANGELOG.md M railties/lib/rails/commands/application.rb commit 10c262c refs/heads/master Author: Garrett Heinlen Date: 2013-02-01 20:06:12 -0600 Fix link to point to new RefineryCMS repo M guides/source/engines.md commit 3e1f231 refs/heads/master Merge: f2c7a5d a83183c Author: Guillermo Iguaran Date: 2013-02-01 13:39:26 -0800 Merge pull request #9149 from robertomiranda/remove-ref-best-standards-support Remove BestStandardsSupport References commit a83183c refs/heads/master Author: robertomiranda Date: 2013-02-01 16:33:40 -0500 Remove BestStandardsSupport references M guides/source/command_line.md M guides/source/configuring.md M guides/source/rails_on_rack.md commit 8f8ae5f refs/tags/v3.2.15 Author: Steve Klabnik Date: 2013-02-01 11:33:31 -0800 Fix markdown syntax in actionpack CHANGELOG. Starting a line with an octothorpe makes an

M actionpack/CHANGELOG.md commit f2c7a5d refs/heads/master Author: Steve Klabnik Date: 2013-02-01 11:33:31 -0800 Fix markdown syntax in actionpack CHANGELOG. Starting a line with an octothorpe makes an

M actionpack/CHANGELOG.md commit 5342797 refs/heads/master Author: Steve Klabnik Date: 2013-02-01 11:16:28 -0800 Added extra note about when to email other rubies to RELEASING_RAILS.rdoc M RELEASING_RAILS.rdoc commit 9d2187e refs/heads/master Author: Akira Matsuda Date: 2013-02-01 22:11:40 +0900 Prefer File.read over File.open.read M railties/lib/rails/commands/application.rb commit 517cfbe refs/heads/master Author: Akira Matsuda Date: 2013-02-01 20:14:26 +0900 --no-rc in the railties tests so that the tester's local .railsrc file does not affect the test results M railties/test/generators/app_generator_test.rb M railties/test/isolation/abstract_unit.rb commit b40bd16 refs/heads/master Author: Akira Matsuda Date: 2013-02-01 14:01:04 +0900 Missing require hash/keys M actionpack/lib/action_controller/metal/conditional_get.rb M actionpack/lib/action_controller/test_case.rb commit 9c1cd6b refs/heads/master Author: Akira Matsuda Date: 2013-01-31 23:59:18 +0900 Missing or unneeded require extract_options M actionpack/lib/action_controller/metal.rb M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/lib/action_dispatch/routing/routes_proxy.rb M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/controller/layout_test.rb M actionpack/test/controller/resources_test.rb commit b0d4a20 refs/heads/master Merge: 83eccde a1e1af9 Author: Rafael Mendonça França Date: 2013-01-31 16:40:07 -0800 Merge pull request #9138 from amparo-luna/no_rc Add --no-rc option to skip the loading of railsrc file commit a1e1af9 refs/heads/master Author: Amparo Luna Date: 2013-01-31 19:30:47 -0500 Add --no-rc option to skip the loading of railsrc file M railties/CHANGELOG.md M railties/lib/rails/commands/application.rb commit 83eccde refs/heads/master Author: Rafael Mendonça França Date: 2013-01-31 21:51:02 -0200 Fix typo :bomb: M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 3bdfece refs/heads/master Author: Rafael Mendonça França Date: 2013-01-31 19:46:26 -0200 Fix typo M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb commit e072f82 refs/heads/master Merge: adb8fea baa240d Author: Rafael Mendonça França Date: 2013-01-31 12:10:44 -0800 Merge pull request #9133 from homakov/patch-6 Use \A in Regexps commit adb8fea refs/heads/master Author: Rafael Mendonça França Date: 2013-01-31 17:48:59 -0200 CHANGELOG review M activerecord/CHANGELOG.md commit 9442c3e refs/heads/master Author: Rafael Mendonça França Date: 2013-01-31 17:48:49 -0200 Strict regexp M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 2b60a6b refs/heads/master Author: Rafael Mendonça França Date: 2013-01-31 17:48:37 -0200 Extract the value casting to a method M activerecord/lib/active_record/connection_adapters/connection_specification.rb commit 45883a3 refs/heads/master Merge: ee4a2bb 4b005fb Author: Rafael Mendonça França Date: 2013-01-31 11:18:28 -0800 Merge pull request #9041 from sodabrew/patch-1 Convert int, float, and bools from ENV['DATABASE_URL'] query args commit 4b005fb refs/heads/master Author: Aaron Stone Date: 2013-01-23 01:05:23 -0800 DATABASE_URL parsing should turn numeric strings into numeric types, and the strings true and false into boolean types, in order to match how YAML would parse the same values from database.yml and prevent unexpected type errors in the database adapters. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit baa240d refs/heads/master Author: Egor Homakov Date: 2013-02-01 00:01:11 +0700 Use \A in Regexps So, if there is redirect_to params[:q] i can send ?q=javascript:asdf()%0A/localpath Or something more nasty, so please use \A M actionpack/lib/action_controller/metal/redirecting.rb commit ee4a2bb refs/heads/master Author: Akira Matsuda Date: 2013-01-31 23:44:04 +0900 Missing require extract_options M activemodel/lib/active_model/callbacks.rb commit 26db079 refs/heads/master Author: Nicholas Schultz-Møller Date: 2013-01-31 15:11:18 +0100 Fix formatting: ruby->erb. [ci skip] M guides/source/caching_with_rails.md commit 18e889f refs/heads/master Merge: 9ec14c2 a257d48 Author: Carlos Antonio da Silva Date: 2013-01-31 03:22:31 -0800 Merge pull request #9119 from dazuma/database_tasks_for_unknown_adapter Raise an exception with a useful message if a rake task is requested for an unknown adapter commit 9ec14c2 refs/heads/master Author: Akira Matsuda Date: 2013-01-31 14:03:42 +0900 Missing require extract_options M activesupport/lib/active_support/cache/mem_cache_store.rb M activesupport/lib/active_support/message_encryptor.rb M activesupport/test/ordered_hash_test.rb commit 28ab79d refs/heads/master Author: James Harton Date: 2013-01-31 13:59:09 +1300 Modify TimeWithZone#as_json to return 3DP of sub-second accuracy by default, since it's allowed by the spec and is very useful. M activesupport/CHANGELOG.md M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/time_with_zone_test.rb commit fdc42ad refs/remotes/origin/3-0-stable Author: Michel Barbosa Date: 2013-01-30 23:48:59 +0100 fixed failing JSON decoding in rails 3-0-stable M activesupport/lib/active_support/json/backends/jsongem.rb M activesupport/lib/active_support/json/backends/okjson.rb M activesupport/test/json/decoding_test.rb commit 162f7c1 refs/heads/master Merge: bb21d6e 551c923 Author: Carlos Antonio da Silva Date: 2013-01-30 11:48:24 -0800 Merge pull request #9125 from neerajdotname/master class_eval should use __FILE__ and __LINE__ commit 551c923 refs/heads/master Author: Neeraj Singh Date: 2013-01-30 14:26:02 -0500 class_eval should use __FILE__ and __LINE__ M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 10513d2 refs/remotes/origin/3-0-stable Merge: 20c3b4b f20b598 Author: Aaron Patterson Date: 2013-01-30 11:07:25 -0800 Merge pull request #9111 from jsomara/3-0-json-fix Fix #8832 - Parse '{"person":[]}' JSON/XML as {'person' => []}. commit a257d48 refs/heads/master Author: Daniel Azuma Date: 2013-01-29 17:59:08 -0800 Raise a specific exception with a useful message if a rake task is requested for an unknown adapter M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/test/cases/tasks/database_tasks_test.rb commit bb21d6e refs/heads/master Author: Aaron Patterson Date: 2013-01-25 11:48:22 -0800 remove dead code M actionpack/lib/action_dispatch/routing/route_set.rb commit 0cabcf9 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 11:06:50 -0800 change parameter name for positional args M actionpack/lib/action_dispatch/routing/route_set.rb commit cc00239 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 11:06:33 -0800 nodoc the helper classes, cache stuff for optimized helper M actionpack/lib/action_dispatch/routing/route_set.rb commit c337e87 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:39:23 -0800 cache path parts in the instance M actionpack/lib/action_dispatch/routing/route_set.rb commit 8e5b437 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:37:42 -0800 stop evaling a string every time M actionpack/lib/action_dispatch/routing/route_set.rb commit 27bccf0 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:35:31 -0800 moving helper classes outside the private block M actionpack/lib/action_dispatch/routing/route_set.rb commit 3bfdfc8 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:31:38 -0800 pushing specialization down to the optimized class M actionpack/lib/action_dispatch/routing/route_set.rb commit 026c40f refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:29:38 -0800 use polymorphism to remove conditional M actionpack/lib/action_dispatch/routing/route_set.rb commit 23b2d60 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:25:36 -0800 move conditionals to instance M actionpack/lib/action_dispatch/routing/route_set.rb commit 06f2ec4 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:19:37 -0800 pull stuff out of the caller and hide in the instance M actionpack/lib/action_dispatch/routing/route_set.rb commit 2cdbe22 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:16:50 -0800 moving more stuff on to the instance M actionpack/lib/action_dispatch/routing/route_set.rb commit d783ba2 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:14:37 -0800 move optimize_helper? to the helper instance M actionpack/lib/action_dispatch/routing/route_set.rb commit 532e122 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:08:53 -0800 moving more stuff to the instance M actionpack/lib/action_dispatch/routing/route_set.rb commit 621ca05 refs/heads/master Author: Aaron Patterson Date: 2013-01-25 10:04:46 -0800 moving some stuff to the initializer M actionpack/lib/action_dispatch/routing/route_set.rb commit 44dd44a refs/heads/master Author: Aaron Patterson Date: 2013-01-25 09:43:04 -0800 moved more evald code M actionpack/lib/action_dispatch/routing/route_set.rb commit fc8f45a refs/heads/master Author: Aaron Patterson Date: 2013-01-25 09:39:13 -0800 factored out some of the dynamic code M actionpack/lib/action_dispatch/routing/route_set.rb commit 19e5640 refs/heads/master Merge: aa20296 540ebe3 Author: Carlos Antonio da Silva Date: 2013-01-30 10:20:17 -0800 Merge pull request #9124 from semaperepelitsa/content_tag_for_class2 Fix content_tag_for with array :class option commit 540ebe3 refs/heads/master Author: Semyon Perepelitsa Date: 2013-01-24 04:26:49 +0800 Fix `content_tag_for` with array html option. It would embed array as string instead of joining it like `content_tag` does: content_tag(:td, class: ["foo", "bar"]){} #=> '' Before: content_tag_for(:td, item, class: ["foo", "bar"]){} #=> '' After: content_tag_for(:td, item, class: ["foo", "bar"]){} #=> '' M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/record_tag_helper.rb M actionpack/test/template/record_tag_helper_test.rb commit 20c3b4b refs/remotes/origin/3-0-stable Merge: b875be0 d46c6aa Author: Carlos Antonio da Silva Date: 2013-01-30 07:45:57 -0800 Merge pull request #9123 from renatosnrg/3-0-stable Fixing encoding to UTF-8 for OkJson backend. Closes #9122. commit d46c6aa refs/remotes/origin/3-0-stable Author: Renato Neves Date: 2013-01-30 13:24:01 -0200 Fixing encoding to UTF-8 for OkJson backend M activesupport/lib/active_support/json/backends/okjson.rb commit aa20296 refs/heads/master Merge: efd2be3 a374366 Author: Carlos Antonio da Silva Date: 2013-01-30 03:27:59 -0800 Merge pull request #9118 from dazuma/remove_adapter_names_from_databases_rake Fix to databases.rake so third party adapters can register rake task implementations commit a374366 refs/heads/master Author: Daniel Azuma Date: 2013-01-29 17:46:48 -0800 Remove pre-emptive adapter name check from databases.rake so third party adapters can register rake tasks M activerecord/lib/active_record/railties/databases.rake commit efd2be3 refs/heads/master Author: Aaron Patterson Date: 2013-01-29 15:49:21 -0800 reloading type map on extension changing M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 95e87bf refs/heads/master Author: Aaron Patterson Date: 2013-01-29 15:48:58 -0800 fixing comment M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 1337e92 refs/tags/v3.2.15 Merge: 1683afb b6d4931 Author: Carlos Antonio da Silva Date: 2013-01-29 15:37:16 -0800 Merge pull request #9043 from senny/backport_7536 Backport: Fix pluck when columns/tables are reserved words. commit 6739150 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-29 16:35:03 -0500 Changelog about BestStandardsSupport removal M actionpack/CHANGELOG.md commit 54a90a4 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-29 14:55:03 -0500 Add 'X-UA-Compatible' => 'chrome=1' to default headers M actionpack/lib/action_dispatch/railtie.rb M actionpack/test/dispatch/response_test.rb commit 3bccd12 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-28 12:14:28 -0500 Remove BestStandardsSupport middleware M actionpack/lib/action_dispatch.rb D actionpack/lib/action_dispatch/middleware/best_standards_support.rb M actionpack/lib/action_dispatch/railtie.rb D actionpack/test/dispatch/best_standards_support_test.rb M railties/lib/rails/application.rb M railties/lib/rails/configuration.rb M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt D railties/test/application/middleware/best_practices_test.rb M railties/test/application/middleware_test.rb commit 1683afb refs/tags/v3.2.15 Merge: 8593e0f d82b5db Author: Rafael Mendonça França Date: 2013-01-29 11:15:09 -0800 Merge pull request #9114 from rosenfeld/patch-2 Add another NumberHelper missing dependency commit d82b5db refs/tags/v3.2.15 Author: Rodrigo Rosenfeld Rosas Date: 2013-01-29 17:13:39 -0200 Add another NumberHelper missing dependency Another missing dependency, now affecting #number_to_percentage. It depends on reverse_merge. M actionpack/lib/action_view/helpers/number_helper.rb commit f409e05 refs/heads/master Author: manishval Date: 2013-01-29 14:58:52 -0400 Typo in code M guides/source/generators.md commit 8593e0f refs/tags/v3.2.15 Merge: c7d6cfb 56fd564 Author: Rafael Mendonça França Date: 2013-01-29 10:37:38 -0800 Merge pull request #9113 from rosenfeld/patch-1 Add NumberHelper missing dependency commit 56fd564 refs/tags/v3.2.15 Author: Rodrigo Rosenfeld Rosas Date: 2013-01-29 16:34:48 -0200 Add NumberHelper missing dependency symbolize_keys depends on hash/keys AS core extension M actionpack/lib/action_view/helpers/number_helper.rb commit f20b598 refs/remotes/origin/3-0-stable Author: Nathan Broadbent Date: 2013-01-10 12:34:31 +1300 Fix #8832 - Parse '{"person":[]}' JSON/XML as {'person' => []}. M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb M actionpack/test/dispatch/request/xml_params_parsing_test.rb commit 88e4ec6 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-29 11:53:40 -0200 Fix typo M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 610958a refs/heads/master Author: Rafael Mendonça França Date: 2013-01-29 10:18:45 -0200 Only search for enabled extension if the PostgreSQL version supports extensions M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit eba172f refs/heads/master Author: Akira Matsuda + Koichi Sasada Date: 2013-01-29 20:19:46 +0900 'minitest/parallel_each' might not always be available M activesupport/lib/active_support/testing/isolation.rb commit 29000a7 refs/heads/master Merge: 71862ca c302741 Author: Carlos Antonio da Silva Date: 2013-01-29 03:24:17 -0800 Merge pull request #9104 from bemurphy/remove_bad_idea_parser_test Remove yaml Proc param parser test commit 71862ca refs/heads/master Author: Akira Matsuda + Koichi Sasada Date: 2013-01-29 19:44:23 +0900 Needs to explicitly require 'minitest/parallel_each' Minitest has changed to require this since https://github.com/seattlerb/minitest/commit/728054b M activesupport/lib/active_support/testing/isolation.rb commit c302741 refs/heads/master Author: Brendon Murphy Date: 2013-01-28 23:18:16 -0800 Remove yaml Proc param parser test I don't believe this test is exercising any explicit params_parser behavior that the other two Proc tests aren't already doing. Given that we now know it's a bad idea to load user input via YAML.load, somebody reading this test might get a dangerous idea about building out a YAML params parser. M actionpack/test/controller/webservice_test.rb commit c385156 refs/heads/master Author: Akira Matsuda Date: 2013-01-28 18:57:13 +0900 s/ERb/ERB/ M actionpack/CHANGELOG.md commit 744307e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-28 23:22:50 -0200 Send paths argument as an array rather than converting it internally M actionmailer/lib/action_mailer/base.rb commit 2cb576e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-27 18:47:47 -0200 Refactor to use each_key, remove extra spaces M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/querying.rb M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/scoping.rb M activerecord/lib/active_record/scoping/default.rb commit 439ac72 refs/heads/master Author: Aaron Patterson Date: 2013-01-28 16:47:20 -0800 add API to pg for enabling / disabling hstore M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/hstore_test.rb commit ba6cae4 refs/heads/master Merge: b4fa651 8a13721 Author: Rafael Mendonça França Date: 2013-01-28 15:49:15 -0800 Merge pull request #9096 from tricknotes/fix-code-comment Fix code comment commit 8a13721 refs/heads/master Author: Ryunosuke SATO Date: 2013-01-29 01:31:32 +0900 Fix JavaScript syntax in code comment [ci skip] M actionpack/lib/action_view/helpers/form_helper.rb commit b4fa651 refs/heads/master Author: Xavier Noria Date: 2013-01-28 23:31:48 +0100 revamps the RDoc of Object#try M activesupport/lib/active_support/core_ext/object/try.rb commit d868a80 refs/tags/v2.3.18 Merge: 1169552 40fdc15 Author: Carlos Antonio da Silva Date: 2013-01-28 14:11:40 -0800 Merge pull request #9099 from pietro/2-3-gemspec-bump Bump version on 2.3 gemspecs too. commit 40fdc15 refs/tags/v2.3.18 Author: Pietro Monteiro Date: 2013-01-28 13:50:27 -0800 Bump version on gemspecs too. M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M activerecord/activerecord.gemspec M activeresource/activeresource.gemspec M activesupport/activesupport.gemspec M railties/railties.gemspec commit 68f69ec refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-28 19:39:17 -0200 Move AS changelog entry to the top, improve AP changelog a bit [ci skip] M actionpack/CHANGELOG.md M activesupport/CHANGELOG.md commit 3f11253 refs/heads/master Author: Xavier Noria Date: 2013-01-28 22:27:31 +0100 no need for \Z, \z is more concise M activesupport/lib/active_support/core_ext/string/filters.rb commit 30034df refs/heads/master Merge: 764397f b5245da Author: Xavier Noria Date: 2013-01-28 13:24:56 -0800 Merge pull request #8830 from antoinelyset/master Improve String#squish whitespaces matching commit 764397f refs/heads/master Merge: 8fff05a 4891388 Author: Rafael Mendonça França Date: 2013-01-28 13:20:52 -0800 Merge pull request #9098 from firmhouse/add-head-requests Make current_url? work with HEAD requests and remove caching_allowed? since it doesn't do anything commit b875be0 refs/tags/v3.0.20 (tag: v3.0.20) Author: Aaron Patterson Date: 2013-01-28 12:47:48 -0800 bumping to 3.0.20 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 5375dce refs/tags/v3.0.20 Author: Michael Koziarski Date: 2013-01-24 08:57:12 +1300 Add an OkJson backend and remove the YAML backend Fixes CVE-2013-0333. The ActiveSupport::JSON::Backends::Yaml class is present but the functionality has been removed entirely. A activesupport/lib/active_support/json/backends/okjson.rb M activesupport/lib/active_support/json/backends/yaml.rb M activesupport/lib/active_support/json/decoding.rb M activesupport/test/json/decoding_test.rb commit 1169552 refs/tags/v2.3.16 (tag: v2.3.16) Author: Aaron Patterson Date: 2013-01-28 12:41:56 -0800 bumping version M actionmailer/Rakefile M actionmailer/lib/action_mailer/version.rb M actionpack/Rakefile M actionpack/lib/action_pack/version.rb M activerecord/Rakefile M activerecord/lib/active_record/version.rb M activeresource/Rakefile M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/Rakefile M railties/lib/rails/version.rb commit bd6dee9 refs/tags/v2.3.16 Author: Michael Koziarski Date: 2013-01-24 09:33:37 +1300 Add an OkJson backend and remove the YAML backend Fixes CVE-2013-0333. The ActiveSupport::JSON::Backends::Yaml class is present but the functionality has been removed entirely. A activesupport/lib/active_support/json/backends/okjson.rb M activesupport/lib/active_support/json/backends/yaml.rb M activesupport/lib/active_support/json/decoding.rb M activesupport/test/json/decoding_test.rb commit 4891388 refs/heads/master Author: Michiel Sikkes Date: 2013-01-28 21:29:21 +0100 Added a Changelog entry for fixing HEAD requests. M actionpack/CHANGELOG.md commit f7277d9 refs/heads/master Author: Michiel Sikkes Date: 2013-01-28 21:18:57 +0100 Make current_url? work with a HEAD method ActionDispatch::Head was removed in favor of Rack::Head. But Rack::Head does not convert GET requests to HEAD requests so we need to do checking for HEAD requests ourselves. M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/test/template/url_helper_test.rb commit c4bc360 refs/heads/master Author: Michiel Sikkes Date: 2013-01-28 21:17:48 +0100 Remove caching_allowed? from ActionController::Caching Where is this used? No other code references to this method and it isn't being tested anywhere. No tests fail when commented out. M actionpack/lib/action_controller/caching.rb commit 8fff05a refs/heads/master Author: Xavier Noria Date: 2013-01-28 18:22:28 +0100 updates a dynamic method heredoc doc M activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb commit 249f58b refs/heads/master Author: Xavier Noria Date: 2013-01-28 18:14:33 +0100 explains why the query cache checks arel.locked M activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb commit 5f5a43e refs/heads/master Merge: 5f30b54 2ef138f Author: Santiago Pastorino Date: 2013-01-28 07:25:20 -0800 Merge pull request #9032 from firmhouse/head-breaks-csrf Make HEAD work / convert to GET once more commit 5f30b54 refs/heads/master Author: Akira Matsuda Date: 2013-01-28 16:59:50 +0900 Use Encoding::UTF_8 constant :do_not_litter: M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/lib/action_dispatch/http/upload.rb M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb M actionpack/lib/action_view/helpers/javascript_helper.rb M actionpack/test/dispatch/response_test.rb M actionpack/test/template/javascript_helper_test.rb M actionpack/test/template/text_helper_test.rb M activerecord/test/cases/adapters/sqlite3/quoting_test.rb M activerecord/test/cases/binary_test.rb M activesupport/test/core_ext/string_ext_test.rb commit 59deaec refs/heads/master Author: Akira Matsuda Date: 2013-01-28 15:23:31 +0900 Use already defined Encoding constants rather than creating one-trip Strings M actionpack/lib/action_view/template/error.rb M actionpack/lib/action_view/template/handlers/erb.rb M activesupport/lib/active_support/cache/mem_cache_store.rb commit 789df3b refs/heads/master Author: Aaron Patterson Date: 2013-01-27 14:17:56 -0800 add fetch to CookieJar M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb commit c8d8899 refs/heads/master Author: Jon Leighton Date: 2013-01-27 20:31:01 +0000 Prevent Relation#merge from collapsing wheres on the RHS This caused a bug with the new associations implementation, because now association conditions are represented as Arel nodes internally right up to when the whole thing gets turned to SQL. In Rails 3.2, association conditions get turned to raw SQL early on, which prevents Relation#merge from interfering. The current implementation was buggy when a default_scope existed on the target model, since we would basically end up doing: default_scope.merge(association_scope) If default_scope contained a where(foo: 'a') and association_scope contained a where(foo: 'b').where(foo: 'c') then the merger would see that the same column is representated on both sides of the merge and collapse the wheres to all but the last: where(foo: 'c') Now, the RHS of the merge is left alone. Fixes #8990 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/relation/merger.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/relations_test.rb M activerecord/test/fixtures/readers.yml M activerecord/test/models/person.rb M activerecord/test/models/reader.rb M activerecord/test/schema/schema.rb commit 7856230 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-27 16:54:07 -0200 Fix typo: adaptors => adapters [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb commit 0a71c7b refs/heads/master Author: Derek Kraan Date: 2013-01-14 15:39:51 -0500 Fix cases where delete_records on a has_many association caused errors because of an ambiguous column name. This happened if the association model had a default scope that referenced a third table, and the third table also referenced the original table (with an identical foreign_key). Mysql requires that ambiguous columns are deambiguated by using the full table.column syntax. Postgresql and Sqlite use a different syntax for updates altogether (and don't tolerate table.name syntax), so the fix requires always including the full table.column and discarding it later for Sqlite and Postgresql. M activerecord/lib/active_record/connection_adapters/abstract/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/sanitization.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/author.rb M activerecord/test/models/post.rb commit b49bf82 refs/heads/master Merge: 862a05e 879c18d Author: manishval Date: 2013-01-26 20:41:48 -0800 Merge pull request #125 from manishval/fix-typo-in-rails-guide Fix typo in rails plugins guide commit 879c18d refs/heads/master Author: Manish Valechha Date: 2013-01-27 00:26:43 -0400 Fix typo in rails plugins guide M guides/source/plugins.md commit 862a05e refs/heads/master Author: Michael de Silva Date: 2013-01-27 06:12:33 +0530 Detail middleware initialization points in the initialization guide [ci skip] M guides/source/initialization.md commit 709fbd3 refs/tags/v3.0.20 Author: Carlos Antonio da Silva Date: 2013-01-26 22:07:47 -0200 Fix failing test related to escaping include_blank in select_tag Rails 3.0.x doesn't have the :prompt option in select_tag, it was introduced in c5d54be746473ce5610e5e6de51f6b9d2495c935 that is only available from 3.1.x on. The test and related fix were introduced in c9795871baacbe85ed4f19c2b830006fc6faeffd for Rails 3.0.17, as a fix for a security vulnerability. The code is completely fine but the test was using the invalid :prompt option for this version, probably because it was cherry-picked from other branch which has the option. M actionpack/CHANGELOG M actionpack/test/template/form_tag_helper_test.rb commit c7d6cfb refs/tags/v3.2.15 Author: José Valim Date: 2012-03-09 22:19:55 +0100 Install latest bundler on Travis. Attempt to fix travis error on 1.8.7/1.9.2: $ bundle install --path vendor/bundle ERROR: Gem bundler is not installed, run `gem install bundler` first. The command "bundle install --path vendor/bundle" failed and exited with 127 during install. M .travis.yml commit e8ac985 refs/tags/v3.0.20 Author: Carlos Antonio da Silva Date: 2013-01-26 20:12:43 -0200 Remove obsolete rake/rdoctask require Requiring this now raises a RuntimeError, failing the test. It also seems that the require is unnecessary to pass the test. M railties/test/railties/plugin_test.rb commit 597a700 refs/tags/v3.0.20 Author: Carlos Antonio da Silva Date: 2013-01-26 20:07:20 -0200 Update failing tests overriding destroy method instead of using mocha expectation Mocha by default does not allow adding expectation to frozen objects, just applying a workaround to ensure the method is never called, making the tests pass without enabling this again in mocha. M activerecord/test/cases/autosave_association_test.rb commit bb80a87 refs/tags/v3.0.20 Author: kennyj Date: 2012-04-25 01:31:26 +0900 Fix build. It seems that the Mocha's behavior were changed. M activerecord/test/cases/autosave_association_test.rb commit 18bce29 refs/tags/v3.0.20 Author: dmathieu <42@dmathieu.com> Date: 2011-05-30 16:49:56 +0200 remove the warning when testing whiny_nil M activesupport/test/whiny_nil_test.rb commit dd3caf6 refs/tags/v3.0.20 Author: Carlos Antonio da Silva Date: 2013-01-26 19:56:10 -0200 Fix indentation to remove warning M activesupport/lib/active_support/gzip.rb commit ba6b243 refs/tags/v3.0.20 Author: Carlos Antonio da Silva Date: 2013-01-26 19:55:10 -0200 Remove not used variable warning M activesupport/lib/active_support/multibyte/chars.rb commit 4ebe101 refs/tags/v3.1.11 Author: kennyj Date: 2012-04-25 01:31:26 +0900 Fix build. It seems that the Mocha's behavior were changed. M activerecord/test/cases/autosave_association_test.rb commit d72c25e refs/tags/v3.1.11 Author: dmathieu <42@dmathieu.com> Date: 2011-05-30 16:49:56 +0200 remove the warning when testing whiny_nil M activesupport/test/whiny_nil_test.rb commit 871a7db refs/tags/v3.0.20 Author: Carlos Antonio da Silva Date: 2012-11-12 20:29:15 -0200 Update mocha version to 0.13.0 and change requires M Gemfile M activerecord/test/cases/helper.rb M activeresource/test/cases/base_test.rb M activesupport/lib/active_support/testing/setup_and_teardown.rb M activesupport/test/abstract_unit.rb M railties/test/generators_test.rb commit 0c58848 refs/heads/master Merge: 41ff6a1 70af2bd Author: José Valim Date: 2013-01-26 12:29:04 -0800 Merge pull request #9087 from lucasmazza/silence-migration-checks Use `silence` instead of `quietly` to silence the `CheckPending` middleware. commit 70af2bd refs/heads/master Author: Lucas Mazza Date: 2013-01-26 18:11:04 -0200 Use `silence` instead of `quietly` to silence the `CheckPending` middleware. `Kernel.quietly` silences `STDOUT` and `STDERR`, which is useless if the logger is writing to a file, while `AS::Logger#silence` swaps the logger level to `ERROR`. Related to #8820 and #8052. M activerecord/lib/active_record/migration.rb commit 41ff6a1 refs/heads/master Author: Andrew White Date: 2013-01-26 16:41:41 +0000 Simplify type casting code for timezone aware attributes With the addition of String#in_time_zone and Date#in_time_zone we can simplify the type casting code by checking if the value has an `in_time_zone` method. M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb commit bc982cb refs/heads/master Author: Lilibeth De La Cruz Date: 2013-01-25 04:14:27 -0400 Fix handling of dirty time zone aware attributes Previously, when `time_zone_aware_attributes` were enabled, after changing a datetime or timestamp attribute and then changing it back to the original value, `changed_attributes` still tracked the attribute as changed. This caused `[attribute]_changed?` and `changed?` methods to return true incorrectly. Example: in_time_zone 'Paris' do order = Order.new original_time = Time.local(2012, 10, 10) order.shipped_at = original_time order.save order.changed? # => false # changing value order.shipped_at = Time.local(2013, 1, 1) order.changed? # => true # reverting to original value order.shipped_at = original_time order.changed? # => false, used to return true end M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/dirty_test.rb commit 0b5d3f3 refs/heads/master Merge: 474e7dd 4313461 Author: Xavier Noria Date: 2013-01-26 17:41:56 +0100 Merge remote-tracking branch 'docrails/master' Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb commit 4313461 refs/heads/master Author: Xavier Noria Date: 2013-01-26 17:36:38 +0100 generic pass before merging docrails M actionpack/lib/action_dispatch/http/response.rb M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/template.rb M guides/source/caching_with_rails.md commit 474e7dd refs/heads/master Merge: 647d18c 18dceeb Author: José Valim Date: 2013-01-26 08:14:26 -0800 Merge pull request #9084 from senny/document_am_delivieries_reset document the behavior of `ActionMailer::Base.delivieries` in tests commit 18dceeb refs/heads/master Author: Yves Senn Date: 2013-01-26 17:04:06 +0100 document the behavior of `ActionMailer::Base.delivieries` in tests thanks @danielpuglisi M guides/source/action_mailer_basics.md commit 647d18c refs/heads/master Merge: 9df2584 648def4 Author: Rafael Mendonça França Date: 2013-01-26 03:18:21 -0800 Merge pull request #9078 from senny/6865_ar_count_with_uniq `#count` in conjunction with `#uniq` performs distinct count. commit 648def4 refs/heads/master Author: Yves Senn Date: 2013-01-23 16:28:17 +0100 `#count` in conjunction with `#uniq` performs distinct count. closes #6865 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 4e5a4cf refs/heads/master Author: Andrew Wilcox Date: 2013-01-25 23:45:55 -0500 Remove mass-assignment line from guide summary M guides/source/security.md commit 21e4113 refs/heads/master Author: Scott Bronson Date: 2013-01-25 20:27:33 -0800 avoid using alias in generators Ruby's alias produces public methods, causing a spurious Thor task to be created.  For example, this is the reason MigrationGenerator currently has two tasks:     > ActiveRecord::Generators::MigrationGenerator.all_tasks.keys     => ["singular_name", "create_migration_file"] singular_name was meant to be an attribute, not a task.  Because it's public, it gets called as a task every time the generator is invoked. The fix is to ensure all generator methods have the correct visibility. M railties/lib/rails/generators/named_base.rb commit fb2ecaa refs/heads/master Author: Akira Matsuda Date: 2013-01-26 12:25:42 +0900 :scissors: "raise" duplication M actionpack/lib/action_view/template.rb commit 550299a refs/heads/master Author: Juanjo Bazán Date: 2013-01-25 22:53:49 +0100 fix Active Record/Action Pack Changelog links M guides/source/4_0_release_notes.md commit 9df2584 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-25 18:25:47 -0200 Add keys/values methods to TestSession Bring back the same API we have with Request::Session. M actionpack/lib/action_controller/test_case.rb M actionpack/test/dispatch/session/test_session_test.rb commit 7d624e0 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-11 01:34:52 -0200 Integrate Action Pack with Rack 1.5 All ActionPack and Railties tests are passing. Closes #8891. [Carlos Antonio da Silva + Santiago Pastorino] M actionpack/actionpack.gemspec M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/request/session.rb M actionpack/test/dispatch/cookies_test.rb M actionpack/test/dispatch/response_test.rb M actionpack/test/dispatch/session/cookie_store_test.rb M actionpack/test/dispatch/test_request_test.rb commit 01341e3 refs/heads/master Merge: 9826823 57bfbc2 Author: Carlos Antonio da Silva Date: 2013-01-25 04:23:06 -0800 Merge pull request #9046 from exviva/actionmailer_subject_interpolations Allow passing interpolations to #default_i18n_subject in mailers commit 9826823 refs/heads/master Merge: 48d05bd c45980f Author: Rafael Mendonça França Date: 2013-01-25 10:21:48 -0200 Merge pull request #8303 from jeremywrowe/master Fixes improper database name when creating a new rails app with a '.' Conflicts: railties/CHANGELOG.md commit ae28f06 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-25 10:04:58 -0200 Fix the CHANGELOG entry order [ci skip] M activesupport/CHANGELOG.md commit 8422864 refs/tags/v3.2.15 Merge: 2a5d119 0b9c472 Author: Carlos Antonio da Silva Date: 2013-01-25 03:42:36 -0800 Merge pull request #9074 from gaynetdinov/replace_undefined_abcs_to_config_variable Undefined abcs variable inside structure:dump task. commit 48d05bd refs/heads/master Author: Jon Leighton Date: 2013-01-25 09:52:53 +0000 Remove obsolete test file https://github.com/rails/rails/commit/4beb4dececcf10c642c74fbcb8548c833e921a86#commitcomment-2482869 D activerecord/test/cases/associations/habtm_join_table_test.rb commit 0b9c472 refs/tags/v3.2.15 Author: Damir Gaynetdinov Date: 2013-01-25 13:00:09 +0400 Replaced abcs to config. M activerecord/lib/active_record/railties/databases.rake commit 0757b33 refs/heads/master Author: Andrew White Date: 2013-01-24 23:51:31 +0000 Deprecate the `eager_load_paths` configuration Since the default in Rails 4.0 is to run in 'threadsafe' mode we need to eager load all of the paths in `autoload_paths` so we alias `eager_load_paths` to it. This may have unintended consequences if you have added 'lib' to `autoload_paths` such as loading unneeded code or code intended only for development and/or test environments. If this applies to your application you should thoroughly check what is being eager loaded. M railties/CHANGELOG.md M railties/lib/rails/engine.rb M railties/lib/rails/engine/configuration.rb M railties/lib/rails/paths.rb M railties/test/application/initializers/load_path_test.rb M railties/test/application/paths_test.rb M railties/test/paths_test.rb commit ccaeb6b refs/heads/master Author: Aaron Patterson Date: 2013-01-24 15:43:08 -0800 use the helpers list rather than getting the methods from the module M actionpack/lib/action_dispatch/routing/route_set.rb commit 06573a3 refs/heads/master Author: Aaron Patterson Date: 2013-01-24 15:33:08 -0800 module_eval is not necessary here M actionpack/lib/action_dispatch/routing/route_set.rb commit 345fc3b refs/heads/master Author: Aaron Patterson Date: 2013-01-24 15:24:07 -0800 don't need to eval everything M actionpack/lib/action_dispatch/routing/route_set.rb commit ac94515 refs/tags/v2.3.16 Author: Aaron Patterson Date: 2013-01-24 14:46:51 -0800 removing [nil] from the params M actionpack/lib/action_controller/request.rb M actionpack/test/controller/request/query_string_parsing_test.rb commit 61eed87 refs/tags/v2.3.16 Author: Aaron Patterson Date: 2013-01-24 14:42:40 -0800 backporting deep_munge M actionpack/lib/action_controller/request.rb M actionpack/test/controller/request/query_string_parsing_test.rb commit d549df7 refs/tags/v2.3.16 Author: Aaron Patterson Date: 2012-08-08 11:05:31 -0700 Squashed commit of the following: commit 9ef905f19807c62fb549ae6fe3784be4bcda96dc Author: Rafael Mendonça França Date: Tue Aug 7 22:38:40 2012 -0300 Fix tests about single quote escaping commit 780a718723cf87b49cfe204d355948c4e0932d23 Author: Santiago Pastorino Date: Tue Jul 31 22:25:54 2012 -0300 html_escape should escape single quotes https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/controller/new_base/render_template_test.rb actionpack/test/template/asset_tag_helper_test.rb actionpack/test/template/erb_util_test.rb actionpack/test/template/javascript_helper_test.rb actionpack/test/template/template_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb activesupport/test/core_ext/string_ext_test.rb railties/test/application/assets_test.rb M activesupport/lib/active_support/core_ext/string/output_safety.rb commit cf48c9c refs/tags/v2.3.16 Author: Santiago Pastorino Date: 2012-08-08 14:33:39 -0700 Do not mark strip_tags result as html_safe Thanks to Marek Labos & Nethemba M actionpack/lib/action_view/helpers/sanitize_helper.rb M actionpack/test/template/sanitize_helper_test.rb commit 3dc0cd3 refs/tags/v2.3.16 Author: Aaron Patterson Date: 2013-01-24 14:37:49 -0800 fixing load error messages M activesupport/lib/active_support/core_ext/load_error.rb commit 170fb5c refs/heads/master Author: Aaron Patterson Date: 2013-01-24 14:29:03 -0800 reduce the number of queries on IN clauses, fix relation queries in `where` M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_test.rb commit de6a35b refs/heads/master Author: Aaron Patterson Date: 2013-01-24 13:47:46 -0800 stop converting strings to symbols M activerecord/lib/active_record/relation/predicate_builder.rb commit 57bfbc2 refs/heads/master Author: Olek Janiszewski Date: 2013-01-23 19:22:39 +0100 Allow passing interpolations to `#default_i18n_subject`, e.g.: # config/locales/en.yml en: user_mailer: welcome: subject: 'Hello, %{username}' # app/mailers/user_mailer.rb class UserMailer < ActionMailer::Base def welcome(user) mail(subject: default_i18n_subject(username: user.name)) end end M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb M actionmailer/test/mailers/base_mailer.rb commit a8eb13a refs/heads/master Author: Akira Matsuda Date: 2013-01-24 22:50:51 +0900 Default dead_connection_timeout to 5 or the ConnectionPool silently fails to close connections inside the Thread M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit 8dc7ef9 refs/heads/master Author: Akira Matsuda Date: 2013-01-24 22:07:43 +0900 Describing the reason for defining BlankTopic#blank? which will never be called M activerecord/test/models/topic.rb commit 0400139 refs/heads/master Author: Akira Matsuda Date: 2013-01-24 21:44:02 +0900 Revert "Unused methods, module, etc." This reverts commit 4e05bfb8e254c3360a3ca4a6cb332995314338fe. Reason: BlankTopic#blank? should not be removed to check that dynamic finder with a bang can find a model that responds to `blank?` M activerecord/test/models/company_in_module.rb M activerecord/test/models/person.rb M activerecord/test/models/task.rb M activerecord/test/models/topic.rb commit 4e05bfb refs/heads/master Author: Akira Matsuda Date: 2013-01-24 21:23:49 +0900 Unused methods, module, etc. M activerecord/test/models/company_in_module.rb M activerecord/test/models/person.rb M activerecord/test/models/task.rb M activerecord/test/models/topic.rb commit b7b27fc refs/heads/master Author: Akira Matsuda + Koichi Sasada Date: 2013-01-24 19:10:58 +0900 Set Thread.abort_on_exception for the whole AS, AP, and AR tests this would give us some more clues in case a test silently dies inside Thread M actionpack/test/abstract_unit.rb M activerecord/test/cases/helper.rb M activesupport/test/abstract_unit.rb commit 07c7cb4 refs/heads/master Author: Akira Matsuda Date: 2013-01-24 18:41:37 +0900 Unused test model M activerecord/test/models/post.rb commit f228ab5 refs/heads/master Author: Akira Matsuda Date: 2013-01-24 18:07:51 +0900 Goodbye there, very special rubbish! M activerecord/test/models/category.rb M activerecord/test/models/comment.rb M activerecord/test/models/post.rb M activerecord/test/models/project.rb commit 97b2491 refs/heads/master Author: Weston Platter Date: 2013-01-24 02:42:40 -0600 [engines guide] reformatted some stuff M guides/source/engines.md commit 9133aad refs/heads/master Author: Weston Platter Date: 2013-01-24 02:42:21 -0600 [engines guide] reworded a run on M guides/source/engines.md commit 4bdcd7a refs/heads/master Author: Akira Matsuda Date: 2013-01-24 15:41:54 +0900 proxy_{owner,reflection,target} are no more available M activerecord/test/models/author.rb commit 68418fb refs/heads/master Author: Akira Matsuda Date: 2013-01-24 15:40:37 +0900 Unused model DeprecatedPostWithComment M activerecord/test/models/post.rb commit fb3996f refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-23 23:08:22 -0200 Depend on thor >= 0.17.0 M Gemfile M railties/railties.gemspec commit c5989cc refs/heads/master Author: Andrew White Date: 2013-01-24 00:16:01 +0000 Fix PostgreSQL tests on Travis Travis only has PostgreSQL 9.1.x but 9.2 is required for range datatypes. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 8ac94d7 refs/heads/master Author: Xavier Noria Date: 2013-01-23 23:14:47 +0100 ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051] M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 3af85ed refs/heads/master Merge: 1b75b94 af1ef85 Author: Rafael Mendonça França Date: 2013-01-23 12:14:56 -0800 Merge pull request #7345 from slbug/master Postgresql range support commit d35b762 refs/heads/master Author: Vipul A M Date: 2013-01-23 20:45:31 +0530 Add new DB rake tasks to the contributing section. M guides/source/development_dependencies_install.md commit 1b75b94 refs/heads/master Author: Andrew White Date: 2013-01-23 14:54:56 +0000 Remove warning by using a custom coder The native JSON library bypasses the `to_json` overrides in active_support/core_ext/object/to_json.rb by calling its native implementation directly. However `ActiveRecord::Store` uses a HWIA so `JSON.dump` will call our `to_json` instead with a `State` object for options rather than a `Hash`. This generates a warning when the `:encoding`, `:only` & `:except` keys are accessed in `Hash#as_json` because the `State` object delegates unknown keys to `instance_variable_get` in its `:[]` method. Workaround this warning in the test by using a custom coder that calls `ActiveSupport::JSON.encode` directly. M activerecord/test/models/admin/user.rb commit b6d4931 refs/tags/v3.2.15 Author: Ian Lesperance Date: 2012-09-05 18:00:07 -0400 Fix pluck when columns/tables are reserved words. Backport #7536 to fix #8968. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb A activerecord/test/models/possession.rb M activerecord/test/schema/schema.rb commit af1ef85 refs/heads/master Author: bUg Date: 2012-08-13 12:54:59 +0200 Add postgresql range types support M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb D activerecord/test/cases/adapters/postgresql/intrange_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit e20c0e3 refs/heads/master Merge: 4beb4de 69b6129 Author: Carlos Antonio da Silva Date: 2013-01-23 03:50:53 -0800 Merge pull request #9035 from adomokos/aligning_tests Adding the route_key and param_key tests commit a9ba6a9 refs/heads/master Author: Philip Arndt Date: 2013-01-23 20:02:49 +1300 Made indentation consistent. M guides/code/getting_started/app/controllers/comments_controller.rb commit 4beb4de refs/heads/master Author: Akira Matsuda Date: 2013-01-23 15:22:13 +0900 A test case name needs to start with "test_" M activerecord/test/cases/associations/habtm_join_table_test.rb commit 9b0f3fa refs/heads/master Author: Akira Matsuda Date: 2013-01-23 01:02:28 +0900 Fix some wrong String extensions tests * ASCII_STRING was not an ASCII String * BYTE_STRING was not an in valid UTF-8 String * added an assertion for non-UTF-8 String M activesupport/test/core_ext/string_ext_test.rb commit 389ae05 refs/heads/master Author: Akira Matsuda Date: 2013-01-23 13:23:22 +0900 Test String#dasherize M activesupport/test/core_ext/string_ext_test.rb commit 740d363 refs/heads/master Author: Akira Matsuda Date: 2013-01-23 09:01:30 +0900 Test that rescue_from accepts a class name in String M activesupport/test/rescuable_test.rb commit ffd0dd3 refs/heads/master Author: Akira Matsuda Date: 2013-01-23 08:20:58 +0900 Test Kernel#quietly M activesupport/test/core_ext/kernel_test.rb commit 36ff09d refs/heads/master Author: Akira Matsuda Date: 2013-01-23 08:01:09 +0900 Test try! with a block M activesupport/test/core_ext/object_and_class_ext_test.rb commit ce0f977 refs/heads/master Author: Akira Matsuda Date: 2013-01-23 07:22:05 +0900 Test that DeprecatedConstantProxy does not warn when accessing its class M activesupport/test/deprecation_test.rb commit 4c5c98d refs/heads/master Author: Akira Matsuda Date: 2013-01-23 07:16:17 +0900 Missing AS::Deprecation::DeprecatedObjectProxy test M activesupport/test/deprecation_test.rb commit 6343227 refs/heads/master Author: Akira Matsuda Date: 2013-01-23 01:34:55 +0900 Test that a DateTime acts_like_date M activesupport/test/core_ext/date_time_ext_test.rb commit 69b6129 refs/heads/master Author: Attila Domokos Date: 2013-01-22 22:13:43 -0500 Adding the route_key and param_key tests This way all the tests are testing the same fields M activemodel/test/cases/naming_test.rb commit 3b75781 refs/tags/v2.3.16 Merge: 7763f39 06b33a8 Author: Steve Klabnik Date: 2013-01-22 15:31:01 -0800 Merge pull request #9030 from johndouthat/2-3-stable Add .gemspec files to 2-3-stable to help Bundler commit bceeeaa refs/heads/master Author: Brian Littmann Date: 2013-01-22 15:59:49 -0600 Typo, grammar, and comma love. M guides/source/engines.md commit 2a5d119 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-22 19:58:51 -0200 Add changelog entry for skipping explain from dbs that don't support it Backport of #6197 in 29d564add926307fea8cd3f77caf88d735e252a1. M activerecord/CHANGELOG.md commit 29d564a refs/tags/v3.2.15 Author: Xavier Noria Date: 2012-11-26 07:43:43 -0800 Merge pull request #6197 from blakesmith/connection_adapters_without_explain_support Don't run explain on slow queries for database adapters that don't support it M activerecord/lib/active_record/explain.rb M activerecord/lib/active_record/railtie.rb M activerecord/test/cases/explain_test.rb commit b5245da refs/heads/master Author: Antoine Lyset Date: 2013-01-22 22:44:53 +0100 Improve String#squish whitespaces matching M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/filters.rb M activesupport/test/core_ext/string_ext_test.rb M guides/source/active_support_core_extensions.md commit 634a2aa refs/heads/master Author: Brian Littmann Date: 2013-01-22 15:17:16 -0600 Typo fix in guides/source/engines.md M guides/source/engines.md commit 2ef138f refs/heads/master Author: Michiel Sikkes Date: 2013-01-22 22:01:57 +0100 Added request.head? to forgery protection code M actionpack/lib/action_controller/metal/request_forgery_protection.rb commit e35d0a6 refs/heads/master Merge: 5f41295 921305b Author: Guillermo Iguaran Date: 2013-01-22 12:36:48 -0800 Merge pull request #9031 from virusman/doc-no-asset-concat Remove old asset tags API from docs commit 921305b refs/heads/master Author: virusman Date: 2013-01-23 00:24:01 +0400 Remove old asset tags API from docs, reflecting changes from #7900 M guides/source/configuring.md M guides/source/layouts_and_rendering.md commit 06b33a8 refs/tags/v2.3.16 Author: John F. Douthat Date: 2013-01-21 10:33:52 -0600 Add gemspecs for bundler A actionmailer/actionmailer.gemspec A actionpack/actionpack.gemspec A activerecord/activerecord.gemspec A activeresource/activeresource.gemspec A activesupport/activesupport.gemspec A railties/railties.gemspec commit 64245e0 refs/heads/master Author: Michiel Sikkes Date: 2013-01-22 21:05:22 +0100 Added a test that shows that a HEAD request does not normally pass CSRF protection M actionpack/test/controller/request_forgery_protection_test.rb commit 5f41295 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-22 14:05:53 -0200 Less strict activerecord-deprecated_finders version M activerecord/activerecord.gemspec commit 97a4db9 refs/tags/v3.2.15 Author: Andrew White Date: 2013-01-22 14:24:42 +0000 Revert "Merge pull request #6986 from kennyj/fix_6975" This reverts commit 8905c1fb496641c3cdb7b3b816ae6d3d4b2c2b73. Closes #8460 Conflicts: activerecord/test/cases/dirty_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/dirty_test.rb commit 7ee7671 refs/tags/v3.2.15 Author: Andrew White Date: 2013-01-22 14:20:25 +0000 Add failing test case for #8460 Add a test case to ensure that fractional second updates are detected. M activerecord/test/cases/dirty_test.rb commit 5c4a186 refs/heads/master Author: Andrew White Date: 2013-01-22 13:18:56 +0000 Revert "Round usec when writing timestamp attribute." This reverts commit e9d2ad395ec2ef929d74752f3d71c80674044fbe. Closes #8460 Conflicts: activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb activerecord/test/cases/dirty_test.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/dirty_test.rb commit 1cf73a6 refs/heads/master Author: Andrew White Date: 2013-01-22 13:16:00 +0000 Add failing test case for #8460 Add a test case to ensure that fractional second updates are detected. M activerecord/test/cases/dirty_test.rb commit 94f7583 refs/heads/master Merge: cb56c39 6fcdcfe Author: Steve Klabnik Date: 2013-01-22 05:44:28 -0800 Merge pull request #9027 from carlosantoniodasilva/revert-locale Revert locale commit cb56c39 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-22 10:40:33 -0200 Lets kepp using Ruby 1.9 syntax M actionpack/test/controller/parameters/nested_parameters_test.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 16e0c88 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-22 10:36:46 -0200 Only check for unpermmited parameters if action_on_unpermitted_parameters is present M actionpack/lib/action_controller/metal/strong_parameters.rb commit 6fcdcfe refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-22 09:31:31 -0200 Revert "Merge pull request #7873 from steveklabnik/update_initializer" This reverts commit 43e14f8ff203c21646f733d35bdde4e68da70a3b, reversing changes made to bb17a0f085aba40a1952612f6c98b2a5804a1152. Conflicts: railties/lib/rails/generators/rails/app/templates/config/application.rb railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb Reason: setting the Time.zone in an after_initialize block can become a problem for people upgrading, since it's not going to be available when config/initializers run, and people might be relying on it. An example that I noticed was with the Chronic gem, for date/time parsing. It requires us to configure the time class to be Time.zone, and doing that in an initializer no longer worked with these changes, so reverting is the safer path for now. M railties/lib/rails/generators/rails/app/templates/config/application.rb D railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb commit b45c63b refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-22 09:29:20 -0200 Revert "Set the default timezone after the initialization since the configuration" This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b. M activesupport/lib/active_support/railtie.rb M railties/test/application/configuration_test.rb commit 2bca2f6 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-22 09:28:07 -0200 Revert "updating i18n guide with locale config location." This reverts commit 46902908910c041e268429d674bbe084399cc664. M guides/source/i18n.md commit 2d9c401 refs/heads/master Author: Xavier Noria Date: 2013-01-22 11:17:27 +0100 avoid creating an object in every call This was a suggestion of @carlosantoniodasilva, thanks! M actionpack/lib/action_controller/metal/strong_parameters.rb commit 00928bb refs/heads/master Merge: 2214237 94df6d8 Author: Xavier Noria Date: 2013-01-22 01:51:58 -0800 Merge pull request #9026 from tricknotes/remove-unnecessary-require Remove unnecessary require commit 94df6d8 refs/heads/master Author: Ryunosuke SATO Date: 2013-01-22 18:44:25 +0900 Remove unnecessary require `require 'rubygems'` is already required in Ruby 1.9 or later. M railties/lib/rails/generators/rails/app/templates/bin/bundle commit 2214237 refs/heads/master Author: Steve Klabnik Date: 2013-01-22 00:12:29 -0500 Re-do Getting Started application with Rails 4. The sample application with the Getting Started Guide was very out of date. I've re-done it on edge (as of 51b9def5bf108fb566e) so it should be good to go with Rails 4. It's also in synch with what the guide actually says. A guides/code/getting_started/.gitignore M guides/code/getting_started/Gemfile A guides/code/getting_started/Gemfile.lock M guides/code/getting_started/README.rdoc M guides/code/getting_started/Rakefile M guides/code/getting_started/app/assets/javascripts/application.js A guides/code/getting_started/app/assets/javascripts/comments.js.coffee A guides/code/getting_started/app/assets/javascripts/posts.js.coffee A guides/code/getting_started/app/assets/javascripts/welcome.js.coffee M guides/code/getting_started/app/assets/stylesheets/application.css A guides/code/getting_started/app/assets/stylesheets/comments.css.scss A guides/code/getting_started/app/assets/stylesheets/posts.css.scss A guides/code/getting_started/app/assets/stylesheets/welcome.css.scss M guides/code/getting_started/app/controllers/application_controller.rb M guides/code/getting_started/app/controllers/comments_controller.rb A guides/code/getting_started/app/controllers/concerns/.keep M guides/code/getting_started/app/controllers/posts_controller.rb D guides/code/getting_started/app/mailers/.gitkeep A guides/code/getting_started/app/mailers/.keep D guides/code/getting_started/app/models/.gitkeep A guides/code/getting_started/app/models/.keep A guides/code/getting_started/app/models/concerns/.keep M guides/code/getting_started/app/models/post.rb M guides/code/getting_started/app/views/comments/_comment.html.erb M guides/code/getting_started/app/views/layouts/application.html.erb M guides/code/getting_started/app/views/posts/_form.html.erb M guides/code/getting_started/app/views/posts/edit.html.erb M guides/code/getting_started/app/views/posts/index.html.erb M guides/code/getting_started/app/views/posts/new.html.erb M guides/code/getting_started/app/views/posts/show.html.erb M guides/code/getting_started/app/views/welcome/index.html.erb A guides/code/getting_started/bin/bundle A guides/code/getting_started/bin/rails A guides/code/getting_started/bin/rake M guides/code/getting_started/config/application.rb M guides/code/getting_started/config/environment.rb M guides/code/getting_started/config/environments/development.rb M guides/code/getting_started/config/environments/production.rb M guides/code/getting_started/config/environments/test.rb A guides/code/getting_started/config/initializers/filter_parameter_logging.rb M guides/code/getting_started/config/initializers/inflections.rb A guides/code/getting_started/config/initializers/locale.rb M guides/code/getting_started/config/initializers/secret_token.rb M guides/code/getting_started/config/initializers/session_store.rb M guides/code/getting_started/config/initializers/wrap_parameters.rb M guides/code/getting_started/config/locales/en.yml M guides/code/getting_started/config/routes.rb D guides/code/getting_started/db/migrate/20110901012815_create_comments.rb D guides/code/getting_started/db/migrate/20120420083127_create_posts.rb A guides/code/getting_started/db/migrate/20130122042648_create_posts.rb A guides/code/getting_started/db/migrate/20130122045842_create_comments.rb M guides/code/getting_started/db/schema.rb D guides/code/getting_started/lib/assets/.gitkeep A guides/code/getting_started/lib/assets/.keep D guides/code/getting_started/lib/tasks/.gitkeep A guides/code/getting_started/lib/tasks/.keep A guides/code/getting_started/log/.keep M guides/code/getting_started/public/404.html M guides/code/getting_started/public/422.html M guides/code/getting_started/public/500.html D guides/code/getting_started/script/rails A guides/code/getting_started/test/controllers/.keep A guides/code/getting_started/test/controllers/comments_controller_test.rb A guides/code/getting_started/test/controllers/posts_controller_test.rb A guides/code/getting_started/test/controllers/welcome_controller_test.rb D guides/code/getting_started/test/fixtures/.gitkeep A guides/code/getting_started/test/fixtures/.keep M guides/code/getting_started/test/fixtures/comments.yml M guides/code/getting_started/test/fixtures/posts.yml D guides/code/getting_started/test/functional/.gitkeep D guides/code/getting_started/test/functional/comments_controller_test.rb D guides/code/getting_started/test/functional/posts_controller_test.rb D guides/code/getting_started/test/functional/welcome_controller_test.rb A guides/code/getting_started/test/helpers/.keep A guides/code/getting_started/test/helpers/comments_helper_test.rb A guides/code/getting_started/test/helpers/posts_helper_test.rb A guides/code/getting_started/test/helpers/welcome_helper_test.rb D guides/code/getting_started/test/integration/.gitkeep A guides/code/getting_started/test/integration/.keep A guides/code/getting_started/test/mailers/.keep A guides/code/getting_started/test/models/.keep A guides/code/getting_started/test/models/comment_test.rb A guides/code/getting_started/test/models/post_test.rb M guides/code/getting_started/test/test_helper.rb D guides/code/getting_started/test/unit/.gitkeep D guides/code/getting_started/test/unit/comment_test.rb D guides/code/getting_started/test/unit/helpers/comments_helper_test.rb D guides/code/getting_started/test/unit/helpers/home_helper_test.rb D guides/code/getting_started/test/unit/helpers/posts_helper_test.rb D guides/code/getting_started/test/unit/post_test.rb D guides/code/getting_started/test/unit/tag_test.rb A guides/code/getting_started/vendor/assets/javascripts/.keep A guides/code/getting_started/vendor/assets/stylesheets/.keep D guides/code/getting_started/vendor/plugins/.gitkeep commit 51b9def refs/heads/master Author: Steve Klabnik Date: 2013-01-21 23:46:04 -0500 fixing link to validations guide in getting started guide M guides/source/getting_started.md commit aadd16f refs/heads/master Author: Steve Klabnik Date: 2013-01-21 23:42:06 -0500 Getting Started Guide: strong_parameters Stuff didn't work because of strong_parameters. Now the right calls are in place. A guides/assets/images/getting_started/forbidden_attributes_for_new_post.png M guides/source/getting_started.md commit a1748f3 refs/heads/master Author: Steve Klabnik Date: 2013-01-21 23:14:45 -0500 Fix images in getting started guide. We changed the error style, so they're all wrong. Now they're right. :smile: M guides/assets/images/getting_started/routing_error_no_controller.png M guides/assets/images/getting_started/routing_error_no_route_matches.png M guides/assets/images/getting_started/template_is_missing_posts_new.png M guides/assets/images/getting_started/unknown_action_create_for_posts.png M guides/assets/images/getting_started/unknown_action_new_for_posts.png commit bf112e5 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-22 00:35:14 -0200 Remove tabs, use spaces :scissors: [ci skip] M actionpack/test/dispatch/test_request_test.rb commit 4de3b3d refs/heads/master Author: Rafael Mendonça França Date: 2013-01-22 00:30:45 -0200 Whitespaces :scissors: [ci skip] M activerecord/lib/active_record/core.rb M activerecord/test/cases/connection_pool_test.rb commit 19bd2f2 refs/heads/master Merge: 1e8d5e6 48d5a33 Author: Rafael Mendonça França Date: 2013-01-22 00:00:20 -0200 Merge pull request #8557 from timraymond/add_back_engines_and_deprecate Adding Back Rails::Engine::Railties#engines Conflicts: railties/CHANGELOG.md commit 1e8d5e6 refs/heads/master Merge: 5e4fb4d 484a0fd Author: Akira Matsuda Date: 2013-01-22 10:27:12 +0900 Merge branch 'isolating_tests' Now we're almost ready to remove this: https://github.com/rails/rails/blob/5294ad8/activesupport/lib/active_support/test_case.rb#L29 commit 484a0fd refs/heads/master Author: Akira Matsuda Date: 2013-01-22 05:22:02 +0900 Just ignore all PRAGMA queries M activerecord/lib/active_record/test_case.rb commit e56c80a refs/heads/master Author: Akira Matsuda Date: 2013-01-22 05:19:14 +0900 Reset SchemaMigration after updating M activerecord/test/cases/ar_schema_test.rb commit 9b520d3 refs/heads/master Author: Akira Matsuda Date: 2013-01-21 23:24:03 +0900 Restore I18n.locale after running tests M actionpack/test/controller/localized_templates_test.rb commit 5e4fb4d refs/heads/master Author: Rafael Mendonça França Date: 2013-01-21 23:01:09 -0200 Stylistic pass at form_helper_test M actionpack/test/template/form_helper_test.rb commit cb413c7 refs/heads/master Author: Tatsuro Baba Date: 2013-01-22 09:48:38 +0900 Fix typo M activerecord/lib/active_record/associations.rb commit ee82ce7 refs/heads/master Author: José Mota Date: 2013-01-14 16:56:44 +0000 Capture block so content won't leak. The [following pull request](https://github.com/rails/rails/pull/8916) fixed the block being passed to the appropriate helper method. However, the content being passed into the block is generating repeated markup on the page due to some weird ERb evaluation. This commit tries to capture the block's generated output so the page isn't flooded with markup. [Rafael França + José Mota] Closes #8936 M actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb M actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb M actionpack/test/template/form_helper_test.rb commit 351b0d9 refs/heads/master Author: Piotr Sarnacki Date: 2013-01-21 21:51:03 +0100 Update actionpack's CHANGELOG for 445f14e M actionpack/CHANGELOG.md commit 03d8aa8 refs/heads/master Merge: f667f0f 445f14e Author: Guillermo Iguaran Date: 2013-01-21 12:41:05 -0800 Merge pull request #9021 from drogus/fix-asset-path Fix asset_path in mounted engine commit d1c02a7 refs/heads/master Author: Akira Matsuda Date: 2013-01-21 22:49:30 +0900 Make sure to reset default_url_options M actionpack/test/controller/integration_test.rb commit 1d7221c refs/heads/master Author: Akira Matsuda Date: 2013-01-21 23:23:25 +0900 Preload some join table schemas M activerecord/test/cases/associations/nested_through_associations_test.rb commit 31ccedd refs/heads/master Author: Akira Matsuda Date: 2013-01-19 02:07:27 +0900 Ignore schema queries on SQLite 3 as well M activerecord/lib/active_record/test_case.rb commit 5538a02 refs/heads/master Author: Akira Matsuda Date: 2013-01-18 19:26:01 +0900 Be sure to clear schema cache M activerecord/test/cases/migration_test.rb commit 5a350cd refs/heads/master Author: Akira Matsuda Date: 2013-01-18 18:59:22 +0900 Ignore "SHOW search_path" when counting PostgreSQL queries M activerecord/lib/active_record/test_case.rb commit 2c613f9 refs/heads/master Author: Akira Matsuda Date: 2013-01-09 15:05:10 +0900 Reset table_name_{prefix,suffix}, and table_name after each test because some tests were not resetting them, and thus the tests were order dependent M activerecord/test/cases/migration_test.rb commit 59e2630 refs/heads/master Author: Akira Matsuda Date: 2013-01-09 11:07:37 +0900 Missing repair_validations M activerecord/test/cases/dup_test.rb commit 445f14e refs/heads/master Author: Piotr Sarnacki Date: 2013-01-21 21:21:39 +0100 Fix asset_path in mounted engine Historically serving assets from a mountable engine could be achieved by running ActionDispatch::Static as a part of engine middleware stack or to copy assets prefixed with an engine name. After introduction of assets pipeline this is not needed as all of the assets are served or compiled into main application's assets. This commit removes the obsolete line making asset_path always generate paths relative to the root or config.relative_url_root if it's set. (closes #8119) M actionpack/lib/action_view/helpers/asset_url_helper.rb M railties/test/railties/mounted_engine_test.rb commit f667f0f refs/heads/master Author: Xavier Noria Date: 2013-01-21 21:14:42 +0100 copy-edits 7e6e4f2 [ci skip] Capitalization in the title of the section, enumerates the environments in the usual order, adds a paragraph, and tries to use less "you"s. M guides/source/configuring.md commit d812ad8 refs/heads/master Merge: 5984894 7e6e4f2 Author: Xavier Noria Date: 2013-01-21 12:01:44 -0800 Merge pull request #9019 from senny/doc_custom_rails_env document how to create custom rails environments commit 7e6e4f2 refs/heads/master Author: Yves Senn Date: 2013-01-21 20:38:04 +0100 document how to create custom rails environments M guides/source/action_mailer_basics.md M guides/source/configuring.md commit 5984894 refs/heads/master Merge: c4106d0 26853e8 Author: Rafael Mendonça França Date: 2013-01-21 09:32:47 -0800 Merge pull request #9011 from wangjohn/activerecord_transaction_state Refactored TransactionState into its own class commit 4317596 refs/tags/v3.2.15 Author: Andrew White Date: 2013-01-21 17:20:51 +0000 Duplicate possible frozen string from route Ruby 1.9 freezes Hash string keys by default so where a route is defined like this: get 'search' => 'search' then the Mapper will derive the action from the key. This blows up later when the action is added to the parameters hash and the encoding is forced. Closes #3429 M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 26853e8 refs/heads/master Author: wangjohn Date: 2013-01-20 13:19:05 -0500 Refactored transaction state into its own object. Each transaction creates a new transaction state object upon initialization. M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transactions_test.rb commit c4106d0 refs/heads/master Author: Andrew White Date: 2013-01-21 17:05:49 +0000 Duplicate possible frozen string from route Ruby 1.9 freezes Hash string keys by default so where a route is defined like this: get 'search' => 'search' then the Mapper will derive the action from the key. This blows up later when the action is added to the parameters hash and the encoding is forced. Closes #3429 M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 4e32722 refs/heads/master Author: Xavier Noria Date: 2013-01-21 17:44:48 +0100 resistance is futile M activesupport/lib/active_support/inflector/inflections.rb commit bde9653 refs/heads/master Author: Xavier Noria Date: 2013-01-21 17:39:02 +0100 slices less, reads better M activesupport/lib/active_support/inflector/inflections.rb commit 9aa8174 refs/heads/master Author: vertigoclinic Date: 2013-01-21 08:11:39 -0800 adding comma to separate clauses M README.rdoc commit 3f18f73 refs/heads/master Merge: c6a39c0 ef4ac7a Author: Xavier Noria Date: 2013-01-21 08:06:26 -0800 Merge pull request #8671 from xuanxu/fix_irregular Inflector irregular singularize rules commit c6a39c0 refs/heads/master Merge: ee34582 9047ca0 Author: Rafael Mendonça França Date: 2013-01-21 05:52:42 -0800 Merge pull request #9014 from virusman/form_helpers_ar_tests AR integration tests for form helpers commit 9047ca0 refs/heads/master Author: virusman Date: 2013-01-21 16:52:10 +0400 Added AR integration tests for form helpers A actionpack/test/activerecord/form_helper_activerecord_test.rb M actionpack/test/fixtures/developer.rb commit ee34582 refs/heads/master Author: Andrew White Date: 2013-01-21 12:30:48 +0000 Use `DateTime.parse` inside `String#to_datetime` Use the standard library's `DateTime.parse` because it's marginally faster and supports partial date/time strings. Benchmark: user system total real old 3.980000 0.000000 3.980000 ( 3.987606) new 3.640000 0.010000 3.650000 ( 3.641342) M activesupport/lib/active_support/core_ext/string/conversions.rb M activesupport/test/core_ext/string_ext_test.rb commit b79adc4 refs/heads/master Author: Andrew White Date: 2013-01-21 12:19:10 +0000 Standardise the return value of `to_time` This commit standardises the return value of `to_time` to an instance of `Time` in the local system timezone, matching the Ruby core and standard library behavior. The default form for `String#to_time` has been changed from :utc to :local but research seems to suggest the latter is the more common form. Also fix an edge condition with `String#to_time` where the string has a timezone offset in it and the mode is :local. e.g: # Before: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 05:00:00 -0500 # After: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 00:00:00 -0500 Closes #2453 M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/conversions.rb M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/date_ext_test.rb M activesupport/test/core_ext/date_time_ext_test.rb M activesupport/test/core_ext/string_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 68a6fb6 refs/heads/master Merge: 8b815b9 8b72d68 Author: Rafael Mendonça França Date: 2013-01-21 04:06:31 -0800 Merge pull request #9001 from schneems/schneems/routes-path-js In Browser Path Matching with Javascript commit 8b815b9 refs/heads/master Merge: 57b65ef 7f5dd5b Author: Rafael Mendonça França Date: 2013-01-21 03:49:54 -0800 Merge pull request #9010 from vipulnsward/remove_extra_sort_from_test Remove extra sort from test commit 57b65ef refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-21 09:29:01 -0200 Fix setting expected value in translation tests It was being set to nil instead due to the wrong assignment. M actionpack/test/abstract/translation_test.rb commit 7f5dd5b refs/heads/master Author: Vipul A M Date: 2013-01-21 14:04:55 +0530 Remove extra sort from test Cleanup change_schema tests to remove extra sorts on columns. M activerecord/test/cases/migration/change_schema_test.rb commit 8b72d68 refs/heads/master Author: schneems Date: 2013-01-18 15:18:23 -0600 In Browser Path Matching with Javascript When debugging routes ,it can sometimes be difficult to understand exactly how the paths are matched. This PR adds a JS based path matching widget to the `/rails/info/routes` output. You can enter in a path, and it will tell you which of the routes that path matches, while preserving order (top match wins). The matching widget in action: ![](http://f.cl.ly/items/3A2F0v2m3m1Z1p3P3O3k/path-match.gif) Prior to this PR the only way to check matching paths is via mental math, or typing in a path in the url bar and seeing where it goes. This feature will be an invaluable debugging tool by dramatically decreasing the time needed to check a path match. ATP actionpack M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb M actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/test/dispatch/routing/inspector_test.rb commit e4dbfce refs/heads/master Merge: 2e8b3d5 4685d75 Author: Rafael Mendonça França Date: 2013-01-20 20:26:17 -0800 Merge pull request #9007 from dpree/master Enhanced tests for AbstractController::Translation module commit 2e8b3d5 refs/heads/master Merge: 9a7411a 7f6872e Author: Carlos Antonio da Silva Date: 2013-01-20 16:58:41 -0800 Merge pull request #8913 from seejee/regression_test_for_chained_preloaded_scopes Added test case to prevent regression of chained, preloaded scopes. commit 2061c98 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-20 22:47:41 -0200 Review #translate docs [ci skip] M actionpack/lib/abstract_controller/translation.rb commit 9a7411a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-20 22:09:31 -0200 Refactor grep call to remove .each Grep already yields the matching keys to the given block. M actionpack/lib/action_controller/metal/strong_parameters.rb commit e0cc7ab refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-20 22:01:53 -0200 Add missing assert calls M actionpack/test/controller/parameters/parameters_permit_test.rb commit 5a69fe7 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-20 21:58:24 -0200 Use 1.9 hash style in docs/comments [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit f12f08d refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-20 21:45:05 -0200 Fix markdown formatting to highlight block in changelog [ci skip] M actionpack/CHANGELOG.md commit d4261d8 refs/heads/master Merge: a1c0e51 3e74012 Author: Guillermo Iguaran Date: 2013-01-20 11:11:21 -0800 Merge pull request #9008 from ranjaykrishna/dbcreate Added a new rake task in activerecord commit a1c0e51 refs/heads/master Merge: 5503796 bbcebb6 Author: Aaron Patterson Date: 2013-01-20 11:04:22 -0800 Merge pull request #9006 from wangjohn/activerecord_transaction_state Created state for a transaction and added tests. commit bbcebb6 refs/heads/master Author: wangjohn Date: 2013-01-20 14:02:12 -0500 Added a changelog entry. M activerecord/CHANGELOG.md commit 3e74012 refs/heads/master Author: Ranjay Krishna Date: 2013-01-20 11:00:26 -0800 added db:drop task that executes mysql:drop_databses and postgresql:drop_databases M activerecord/Rakefile commit 6ca3428 refs/heads/master Author: wangjohn Date: 2013-01-20 13:19:05 -0500 Removed reflects_transaction_state. M activerecord/lib/active_record/core.rb commit 37d15d4 refs/heads/master Author: Jens Bissinger Date: 2013-01-20 19:15:15 +0100 Add documentation for abstract controller #translate and #localize method. M actionpack/lib/abstract_controller/translation.rb commit 5503796 refs/heads/master Merge: 74c2af5 e470ebf Author: Aaron Patterson Date: 2013-01-20 09:53:38 -0800 Merge pull request #9005 from ranjaykrishna/dbcreate added a db create rake task. commit e470ebf refs/heads/master Author: Ranjay Krishna Date: 2013-01-20 09:48:55 -0800 removed the puts statement and simplified the execute statement M activerecord/Rakefile commit 9f78936 refs/heads/master Author: Ranjay Krishna Date: 2013-01-20 09:41:49 -0800 added rake db:create that executes mysql:build_databases and postgresql:build_databases M activerecord/Rakefile commit 56498b4 refs/heads/master Author: Matthew Stopa Date: 2013-01-20 10:41:02 -0700 Add documentation to ActionDispatch::Response M actionpack/lib/action_dispatch/http/response.rb commit 0355962 refs/heads/master Author: wangjohn Date: 2013-01-20 12:40:36 -0500 Created state for a transaction and added tests. M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/core.rb M activerecord/test/cases/transactions_test.rb commit 74c2af5 refs/heads/master Merge: cbec22c 53ea940 Author: Guillermo Iguaran Date: 2013-01-20 09:34:42 -0800 Merge pull request #9004 from arunagw/warning_removed_shadowing_outer Removing warning: shadowing outer local variable commit 53ea940 refs/heads/master Author: Arun Agrawal Date: 2013-01-20 23:02:02 +0530 Removing warning: shadowing outer local variable M actionpack/lib/action_controller/metal/strong_parameters.rb commit cbec22c refs/heads/master Author: Xavier Noria Date: 2013-01-20 17:59:53 +0100 strong parameters filters permitted scalars M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/nested_parameters_test.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 7763f39 refs/tags/v2.3.18 Author: Ernie Miller Date: 2013-01-08 18:41:59 -0500 Fix for CVE-2013-0155 M activerecord/lib/active_record/base.rb commit 4685d75 refs/heads/master Author: Jens Bissinger Date: 2013-01-20 15:53:43 +0100 Removed ActionController::Base dependency from abstract controller translation tests. M actionpack/test/abstract/translation_test.rb commit 1de60c5 refs/heads/master Author: Jens Bissinger Date: 2013-01-20 15:44:03 +0100 Test abstract controller's localize method. M actionpack/test/abstract/translation_test.rb commit 996aba3 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-19 22:13:05 -0500 Don't use anonymous classes in connection tests M activerecord/test/cases/adapters/mysql/connection_test.rb commit 03a3914 refs/heads/master Author: Cyril Jouve Date: 2013-01-20 03:38:45 +0100 consistently inherit from ApplicationController in guides exemples M guides/source/action_controller_overview.md M guides/source/caching_with_rails.md M guides/source/nested_model_forms.md commit f48a16b refs/heads/master Author: Guillermo Iguaran Date: 2013-01-19 20:33:14 -0500 Anonymous class is not allowed. For reference see #8934 and bc43763247e25 M activerecord/test/cases/adapter_test.rb commit ea6c9de refs/heads/master Merge: 760b8d3 bc43763 Author: Aaron Patterson Date: 2013-01-19 16:42:41 -0800 Merge pull request #9002 from dahakawang/master issue #8934 sovled commit bc43763 refs/heads/master Author: David Date: 2013-01-20 07:17:50 +0800 fix anonymous class issue M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/test/cases/connection_pool_test.rb commit 7f6872e refs/heads/master Author: Chris Geihsler Date: 2013-01-12 10:22:17 -0500 Added test case to prevent regression of chained, preloaded scopes. (#7490) M activerecord/test/cases/relations_test.rb M activerecord/test/models/post.rb commit 760b8d3 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-19 19:35:24 -0200 Remove warning: shadowing outer local variable M activesupport/lib/active_support/cache.rb commit 239a97a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-19 19:32:21 -0200 Fix failing test about date.order translation values Introduced in b718998f3e8e6f3d01ad138e40f08fbcc3736285. M activesupport/test/i18n_test.rb commit b718998 refs/heads/master Merge: 782ed88 60289ab Author: Aaron Patterson Date: 2013-01-19 11:20:50 -0800 Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency Remove i18n symbol dependency commit 782ed88 refs/heads/master Merge: 3d76e7f 7f6017c Author: Rafael Mendonça França Date: 2013-01-19 10:48:44 -0800 Merge pull request #8081 from JoeyButler/refactor_cache_store Refactor cache store commit 3d76e7f refs/heads/master Merge: 57126ee 90995ba Author: Rafael Mendonça França Date: 2013-01-19 10:47:53 -0800 Merge pull request #9000 from sherwu/master Updated Gemfile to use jQuery-rails v 2.2.0 commit 90995ba refs/heads/master Author: Sherwin Wu Date: 2013-01-19 10:43:44 -0800 Updated version of jQuery rails in gemfile M Gemfile commit 7f6017c refs/heads/master Author: Joey Butler Date: 2012-09-09 13:04:35 -0400 Refactor ActiveSupport::Cache::Store#fetch. M activesupport/lib/active_support/cache.rb commit 2b7a621 refs/heads/master Author: Lucas Caton Date: 2013-01-19 15:49:28 -0200 Replacing plugin to gem M guides/source/migrations.md commit 57126ee refs/heads/master Author: Rafael Mendonça França Date: 2013-01-19 15:32:27 -0200 Restore and adapt the implementation reverted at https://github.com/rails/rails/commit/cc1c3c5be061e7572018f734e5239750ab449e3f Now instead of raise, we log by default in development and test M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/railtie.rb M actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb M actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb M railties/test/application/configuration_test.rb commit af5edef refs/heads/master Merge: 0d65969 130370b Author: Rafael Mendonça França Date: 2013-01-19 08:46:43 -0800 Merge pull request #8999 from thomasfedb/raise_or_log_unpermitted_params Raise or log unpermitted params. commit 130370b refs/heads/master Author: Thomas Drake-Brockman Date: 2013-01-19 22:20:13 +0800 Added ability to raise or log on unpermitted params. M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/railtie.rb A actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb A actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb commit 4675209 refs/heads/master Author: Thomas Drake-Brockman Date: 2013-01-20 00:23:55 +0800 Replaced documentation for config.action_controller.raise_on_unpermitted_parameters with documentation for config.action_controller.action_on_unpermitted_params. M guides/source/configuring.md commit 0d65969 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-19 09:37:01 -0200 Improve relation docs about to_sql and where_values_hash * User class instead of Users. * #where_values_hash does not change the value to downcase as the example was showing. [ci skip] M activerecord/lib/active_record/relation.rb commit f209b17 refs/heads/master Merge: e636f55 bebb02f Author: Aaron Patterson Date: 2013-01-18 17:27:19 -0800 Merge pull request #8977 from Soylent/master Resovled issue rails#7774 commit e636f55 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-18 17:16:30 -0500 Fix syntax error :grin: M actionpack/lib/action_dispatch/routing/inspector.rb commit 5da8491 refs/heads/master Merge: 40e7978 f654c3c Author: Guillermo Iguaran Date: 2013-01-18 13:46:46 -0800 Merge pull request #8995 from schneems/schneems/formatting-the-formatters Remove "Application" section title from routes commit f654c3c refs/heads/master Author: schneems Date: 2013-01-18 15:26:13 -0600 Remove "Application" section title from routes This PR standardizes the output of the HTML and console based routes to not include the title for "Application Routes" those that are defined by the application. Instead only routes defined in engines get any special treatment. Based on this conversation: https://github.com/rails/rails/commit/af5c0fd85fce1adb311083dd1ecf96432ee8caa3#commitcomment-2458823 ATP actionpack /cc @carlosantoniodasilva M actionpack/lib/action_dispatch/routing/inspector.rb commit b8ef4f0 refs/heads/master Author: Francesco Rodriguez Date: 2013-01-18 12:26:03 -0500 fix broken examples format in image_tag helper [ci skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 40e7978 refs/heads/master Merge: 1d55e07 bc4edca Author: Jon Leighton Date: 2013-01-18 08:51:55 -0800 Merge pull request #8994 from Springest/fix_default_scope_update_all_delete_all Fix .update_all and .delete_all when using a condition on a joined table in a default_scope commit 1d55e07 refs/heads/master Author: Jon Leighton Date: 2013-01-18 16:07:07 +0000 The test setup is not threadsafe. Wrap in a mutex. M activesupport/lib/active_support/testing/isolation.rb commit 227cfe5 refs/heads/master Author: Jon Leighton Date: 2013-01-18 15:27:08 +0000 MiniTest already defines a ParallelEach class This may or may not fix the intermittent railties failures we've been seeing on the CI with Ruby 2.0. We'll see. M activesupport/lib/active_support/testing/isolation.rb commit 8aebe30 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-18 09:15:19 -0500 Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by" This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1. M actionpack/lib/abstract_controller/helpers.rb M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_controller/test_case.rb M activemodel/lib/active_model/dirty.rb M activemodel/lib/active_model/secure_password.rb M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/integration.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb M activerecord/test/cases/associations/join_model_test.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/callbacks_test.rb M activerecord/test/cases/deprecated_dynamic_methods_test.rb M activerecord/test/cases/dirty_test.rb M activerecord/test/cases/fixtures_test.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/cases/reload_models_test.rb M activerecord/test/cases/store_test.rb commit cb60a83 refs/heads/master Author: Akira Matsuda Date: 2013-01-18 22:18:33 +0900 "Asynchronous Mailers" will not be available in 4.0 M guides/source/4_0_release_notes.md commit 637a7d9 refs/heads/master Merge: 5937bd0 7baecc4 Author: Guillermo Iguaran Date: 2013-01-18 05:06:42 -0800 Merge pull request #8989 from robertomiranda/use-rails-4-find-by Replace deprecated find_by_* with find_by commit 7baecc4 refs/heads/master Author: robertomiranda Date: 2013-01-18 07:56:05 -0500 User Rails 4 find_by M actionpack/lib/abstract_controller/helpers.rb M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_controller/test_case.rb M activemodel/lib/active_model/dirty.rb M activemodel/lib/active_model/secure_password.rb M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/integration.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb M activerecord/test/cases/associations/join_model_test.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/callbacks_test.rb M activerecord/test/cases/deprecated_dynamic_methods_test.rb M activerecord/test/cases/dirty_test.rb M activerecord/test/cases/fixtures_test.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/cases/reload_models_test.rb M activerecord/test/cases/store_test.rb commit 5937bd0 refs/heads/master Author: Jon Leighton Date: 2013-01-18 12:30:47 +0000 Undeprecate the :extend option Suggested by @dhh. It doesn't affect the generated SQL, so seems reasonable to continue to allow it as an association option. M activerecord/CHANGELOG.md M activerecord/activerecord.gemspec M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/associations/builder/collection_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/post.rb commit 5f759ff refs/heads/master Author: Jon Leighton Date: 2013-01-18 11:25:00 +0000 CollectionProxy should be default scoped Fixes #8795 M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit e8d80f7 refs/heads/master Merge: 9da9763 ec07735 Author: Jon Leighton Date: 2013-01-18 02:08:13 -0800 Merge pull request #8912 from senny/8879_association_empty_method `CollectionAssociation#empty?` respects newly builded records commit 7bb34b1 refs/heads/master Author: Tatsuro Baba Date: 2013-01-18 18:14:18 +0900 Remove useless number sign I think that these signs are probably mistake. M activerecord/lib/active_record/base.rb commit 9da9763 refs/heads/master Author: Akira Matsuda Date: 2013-01-18 17:17:59 +0900 s/it's/its/ [ci skip] M guides/source/action_mailer_basics.md commit 8b0e525 refs/heads/master Author: Akira Matsuda Date: 2013-01-10 06:59:07 +0900 script => bin M guides/source/command_line.md M railties/test/application/runner_test.rb commit 02902e0 refs/heads/master Author: Akira Matsuda Date: 2013-01-18 17:04:13 +0900 use tap with block parameter M railties/lib/rails/info.rb commit f71467a refs/heads/master Author: Xavier Noria Date: 2013-01-18 08:44:19 +0100 iterates the RDoc of update_column(s) This revision makes crystal clear that the methods go straight to the database and update the receiver. It also adds and example, and removes the duplication in the singular and plural forms by referring one to the other. M activerecord/lib/active_record/persistence.rb commit 4095c08 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-17 21:09:43 -0200 Refactor predicate builder when receiving empty hash There's no need to create a new arel table or reflect on the column association if the value is empty, these attributes are not used. Also no need to concat a new array, just append the query value. M activerecord/lib/active_record/relation/predicate_builder.rb commit 3fa7332 refs/heads/master Author: Erik Johnson Date: 2013-01-17 14:25:18 -0700 for recommended Apache configuration of asset pipeline, use instead of , to avoid unnecessary reg ex parsing and code Date: 2013-01-17 13:45:16 -0500 repeating documentation for option form helpers M actionpack/lib/action_view/helpers/form_options_helper.rb commit d1238af refs/heads/master Author: Thiago Pinto Date: 2013-01-17 13:40:01 -0500 repeating documentation for date and time form helpers M actionpack/lib/action_view/helpers/date_helper.rb commit 28cfd79 refs/tags/v2.3.18 Author: Jeremy Kemper Date: 2013-01-17 10:21:41 -0700 Revert "bump up rack version to the one that includes the Hash DoS fix" Rack 1.1.3 also changes the Set-Cookie header to expects a newline-delimited string instead of an Array, which breaks Rails 2.3's expectations in a variety of ways. This reverts commit 27a508c91e04b619c8a1eb50ef115b226b21182c. Conflicts: actionpack/Rakefile M actionpack/Rakefile M actionpack/lib/action_controller.rb commit 60289ab refs/heads/master Author: Chris McGrath Date: 2013-01-17 16:01:19 +0000 Don't change the original i18n data M actionpack/lib/action_view/helpers/date_helper.rb commit 6bb784e refs/heads/master Author: Chris McGrath Date: 2013-01-17 15:21:26 +0000 Remove i18n symbol dependency date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_i18n_test.rb M activesupport/lib/active_support/locale/en.yml commit bebb02f refs/heads/master Author: Konstantin Papkovskiy Date: 2013-01-17 17:42:49 +0400 Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is empty string M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/dispatch/request_test.rb commit 13c0d8c refs/heads/master Merge: ee314a5 29a69cd Author: Xavier Noria Date: 2013-01-17 05:42:22 -0800 Merge pull request #8976 from senny/spelling_correction spelling correction for Action Mailer interceptors commit 29a69cd refs/heads/master Author: Yves Senn Date: 2013-01-17 14:25:56 +0100 spelling correction for AM interceptors M guides/source/action_mailer_basics.md commit a3aca81 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-17 10:28:16 -0200 Remove warning of not used variable M actionpack/lib/action_controller/metal/redirecting.rb commit 626d0b1 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-17 10:27:21 -0200 Do not run this streaming test in Ruby 1.8, fix syntax error M actionpack/test/controller/layout_test.rb commit ee314a5 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-17 09:20:02 -0200 Remove useless || operation M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/layout_test.rb commit a5013bb refs/tags/v3.2.15 Author: José Valim Date: 2012-03-05 11:27:14 -0800 Merge pull request #5288 from lest/patch-2 force response body to be read in assert_template Conflicts: actionpack/lib/action_controller/test_case.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/layout_test.rb commit 6bab1b4 refs/heads/master Merge: 038574a c936218 Author: Carlos Antonio da Silva Date: 2013-01-17 02:50:15 -0800 Merge pull request #8975 from arunagw/warning_removed_ambiguous_first_argument Removing : warning: ambiguous first argument; commit c936218 refs/heads/master Author: Arun Agrawal Date: 2013-01-17 14:43:11 +0530 Removing : warning: ambiguous first argument; M actionpack/test/controller/record_identifier_test.rb commit 69d395c refs/heads/master Author: Jonathan Garvin Date: 2013-01-16 20:22:23 -0700 fix example of setting DEFAULTS in fixtures M activerecord/lib/active_record/fixtures.rb commit f58e268 refs/heads/master Author: Jonathan Garvin Date: 2013-01-16 19:19:31 -0700 clarify awkward sentence re: email testing M guides/source/testing.md commit 038574a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-16 22:55:02 -0200 Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_class Also add some generic tests to ensure they're properly deprecated. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/record_identifier.rb A actionpack/test/controller/record_identifier_test.rb commit f5aa4d9 refs/heads/master Merge: 1a989d4 08ac4b9 Author: Carlos Antonio da Silva Date: 2013-01-16 15:52:55 -0800 Merge pull request #8964 from mattdbridges/specify-log-to-clear Clear specific logs when using `rake log:clear` commit 08ac4b9 refs/heads/master Author: Matt Bridges Date: 2013-01-16 12:27:06 -0600 clear specific logs when using rake log:clear M guides/source/command_line.md M railties/CHANGELOG.md M railties/lib/rails/tasks/log.rake commit 1a989d4 refs/heads/master Merge: 89b0f42 a777240 Author: Xavier Noria Date: 2013-01-16 15:04:37 -0800 Merge pull request #8967 from senny/add_interceptor_to_am_doc document Intercepters in ActionMailer guide commit 89b0f42 refs/heads/master Merge: 555cb0a 3daff05 Author: Carlos Antonio da Silva Date: 2013-01-16 13:56:37 -0800 Merge pull request #8965 from colinbm/date_select_value Fix date_select :selected option so you can pass it nil commit 3daff05 refs/heads/master Author: Colin Burn-Murdoch Date: 2013-01-16 18:51:34 +0000 Fix date_select :selected option so you can pass it nil M actionpack/lib/action_view/helpers/tags/date_select.rb M actionpack/test/template/date_helper_test.rb commit c45980f refs/heads/master Author: Jeremy W. Rowe Date: 2012-11-23 14:30:15 -0600 Fixes improper database name when a '.' is included while creating a new rails application. EG: `rails new something.awesome.com` Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/app_generator.rb M railties/test/generators/app_generator_test.rb commit a777240 refs/heads/master Author: Yves Senn Date: 2013-01-16 20:17:35 +0100 document Intercepters in ActionMailer guide M guides/source/action_mailer_basics.md commit 19e9e67 refs/heads/master Author: Yves Senn Date: 2013-01-02 21:37:56 +0100 replace regexp global in #url_for M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/request_test.rb commit ae6864e refs/tags/v3.1.11 Author: Carlos Antonio da Silva Date: 2012-11-12 20:29:15 -0200 Update mocha version to 0.13.0 and change requires Conflicts: Gemfile railties/test/application/route_inspect_test.rb railties/test/generators_test.rb M Gemfile M actionpack/test/template/sprockets_helper_test.rb M actionpack/test/template/sprockets_helper_with_routes_test.rb M activerecord/test/cases/helper.rb M activeresource/test/cases/base_test.rb M activesupport/lib/active_support/testing/mochaing.rb M activesupport/lib/active_support/testing/setup_and_teardown.rb M activesupport/test/abstract_unit.rb M railties/test/application/rack/logger_test.rb M railties/test/generators_test.rb commit 555cb0a refs/heads/master Merge: e5f5863 e1e5f30 Author: Rafael Mendonça França Date: 2013-01-16 05:59:40 -0800 Merge pull request #8959 from vitorbaptista/master Don't rely on Hash key's ordering to configure default options commit e1e5f30 refs/heads/master Author: Vitor Baptista Date: 2013-01-15 23:19:02 -0300 Don't rely on Hash key's ordering If we set encoding latin1 for a PostgreSQL database, it calls PostgreSQLAdapter::create_database with options that have, among other things: { 'encoding' => 'latin1' } Then, we use reverse_merge(:encoding => "utf8") to setup the default encoding. In the end, the hash looks like: { :encoding => 'utf8', 'encoding' => 'latin1' } The call to options.symbolize_keys calls to_sym on each_key of this Hash. It usually means that the encoding passed overwrites the default utf8, but it's not guaranteed. So, we shouldn't rely on it. The same was happening in ActiveRecord::ConnectionHandling. M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/active_schema_test.rb commit b0a2c67 refs/tags/v3.1.11 Merge: 8b3109a 0591f6d Author: Rafael Mendonça França Date: 2013-01-16 05:39:50 -0800 Merge pull request #8871 from freerange/3-1-stable-with-mocha-fixes Fix 3-1-stable to work with Mocha >= v0.13.0 commit d116e90 refs/tags/v3.0.20 Merge: 4c525b2 bf91545 Author: Rafael Mendonça França Date: 2013-01-16 05:39:30 -0800 Merge pull request #8872 from freerange/3-0-stable-with-mocha-fixes Fix 3-0-stable to work with Mocha >= v0.13.0 commit bf91545 refs/tags/v3.0.20 Author: James Mead Date: 2012-08-26 16:32:47 +0100 Fix 3-0-stable to work with Mocha >= v0.13.0 A) Update code in ActiveSupport which monkey-patches Test::Unit to include Mocha bug fix. A bug was fixed [1] in Mocha's integration with Test::Unit, but this monkey-patching code was copied before the fix. We need to copy the fixed version. The bug meant that an unexpected invocation against a mock within the teardown method caused a test *error* and not a test *failure*. B) Fix for Test::Unit/Mocha compatibility. Mocha is now using a single AssertionCounter which needs a reference to the testcase as opposed to the result. This change is an unfortunate consequence of the copying of a chunk of Mocha's internal code in order to monkey-patch Test::Unit. C) Avoid a Mocha deprecation warning. [1] https://github.com/freerange/mocha/commit/f1ff6475ca2871f2977ab84cabbbfe2adadbbee6#diff-5 commit 0591f6d1e0b4768877559f85394947f94565fabf 1 parent 8b3109a441 M activesupport/lib/active_support/test_case.rb M activesupport/lib/active_support/testing/setup_and_teardown.rb commit 0591f6d refs/tags/v3.1.11 Author: James Mead Date: 2012-08-26 16:32:47 +0100 Fix 3-1-stable to work with Mocha >= v0.13.0 A) Update code in ActiveSupport which monkey-patches Test::Unit to include Mocha bug fix. A bug was fixed [1] in Mocha's integration with Test::Unit, but this monkey-patching code was copied before the fix. We need to copy the fixed version. The bug meant that an unexpected invocation against a mock within the teardown method caused a test *error* and not a test *failure*. B) Fix for Test::Unit/Mocha compatibility. Mocha is now using a single AssertionCounter which needs a reference to the testcase as opposed to the result. This change is an unfortunate consequence of the copying of a chunk of Mocha's internal code in order to monkey-patch Test::Unit. C) Avoid a Mocha deprecation warning. [1] https://github.com/freerange/mocha/commit/f1ff6475ca2871f2977ab84cabbbfe2adadbbee6#diff-5 M activesupport/lib/active_support/testing/mochaing.rb M activesupport/lib/active_support/testing/setup_and_teardown.rb commit e5f5863 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-16 09:37:13 -0200 Remove warnings: "(...) interpreted as grouped expression" M actionpack/test/controller/required_params_test.rb commit c8b0a6f refs/heads/master Merge: 94384bd 3c19064 Author: Andrew White Date: 2013-01-16 03:40:30 -0800 Merge pull request #8963 from asanghi/regress_8631 adding regression test in master for #8631 commit 3c19064 refs/heads/master Author: Aditya Sanghi Date: 2013-01-16 16:59:45 +0530 adding regression test in master for #8631 M actionpack/test/dispatch/request_test.rb commit e7ffb5e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-16 09:26:17 -0200 Fix typo introduced in 0004ca3a [ci skip] M actionpack/lib/action_dispatch/http/response.rb commit d3dcb4b refs/tags/v3.2.15 Merge: fd990f2 5f3b40e Author: Andrew White Date: 2013-01-16 03:04:14 -0800 Merge pull request #8632 from asanghi/3-2-stable Fixes #8631 request post? detection should remain unaffected by local inflections such as POS for Point Of Sale commit 728f9c2 refs/heads/master Author: Nicholas Schultz-Møller Date: 2013-01-16 11:44:55 +0100 Fix formatting error introduced in cc585c8. M guides/source/caching_with_rails.md commit 5f3b40e refs/tags/v3.2.15 Author: Aditya Sanghi Date: 2012-12-27 19:24:16 +0530 fixes #8631 local inflections from interfereing with HTTP_METHOD_LOOKUP dispatch logic M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit 0004ca3 refs/heads/master Author: Matthew Stopa Date: 2013-01-16 00:48:13 -0700 More documentation for ActionDispatch::Response [ci skip] M actionpack/lib/action_dispatch/http/response.rb commit 7b1a58b refs/heads/master Author: Matthew Stopa Date: 2013-01-16 00:33:08 -0700 Document ActionDispatch::Response#body method M actionpack/lib/action_dispatch/http/response.rb commit fd990f2 refs/tags/v3.2.15 Merge: 9669aa7 48f9999 Author: Rafael Mendonça França Date: 2013-01-15 17:45:36 -0800 Merge pull request #8933 from freerange/3-2-stable-with-minitest-fix Make tests for the presence of MiniTest consistent commit 94384bd refs/heads/master Merge: e42b5f9 5a9b3b7 Author: Rafael Mendonça França Date: 2013-01-15 17:37:40 -0800 Merge pull request #8955 from burns/source_annotation Allow a `:dirs` option to `SourceAnnotationExtractor.enumerate` commit 9669aa7 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-15 17:26:22 -0800 Merge pull request #8914 from nilbus/fix-header-bloat Remove header bloat introduced by BestStandardsSupport middleware Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/best_standards_support.rb M actionpack/test/dispatch/best_standards_support_test.rb commit e42b5f9 refs/heads/master Merge: cfdd5cb 8e22112 Author: Rafael Mendonça França Date: 2013-01-15 17:28:29 -0800 Merge pull request #8958 from balexand/strong_parameters_exception_handling Strong parameters exception handling commit cfdd5cb refs/heads/master Merge: 8492396 7925884 Author: Rafael Mendonça França Date: 2013-01-15 17:26:22 -0800 Merge pull request #8914 from nilbus/fix-header-bloat Remove header bloat introduced by BestStandardsSupport middleware commit 8e22112 refs/heads/master Author: Brian Alexander Date: 2013-01-15 17:07:13 -0700 strong parameters exception handling M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/test/controller/required_params_test.rb M actionpack/test/dispatch/debug_exceptions_test.rb commit 7925884 refs/heads/master Author: Edward Anderson Date: 2013-01-12 10:33:01 -0500 Remove header bloat introduced by BestStandardsSupport middleware The same headers were being duplicated on every request. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/best_standards_support.rb M actionpack/test/dispatch/best_standards_support_test.rb commit 8492396 refs/heads/master Merge: 203f787 31143a4 Author: Carlos Antonio da Silva Date: 2013-01-15 13:05:18 -0800 Merge pull request #8954 from davetoxa/patch-1 Update guides/source/active_record_validations.md commit 203f787 refs/heads/master Merge: f1d8f2a 63333e6 Author: Carlos Antonio da Silva Date: 2013-01-15 13:02:57 -0800 Merge pull request #8940 from adomokos/adding_tests_for_changed_attributes Cleaning up ActiveModel::Dirty tests commit 3daa8e5 refs/heads/master Author: Xavier Noria Date: 2013-01-15 21:01:30 +0100 removes spurious file pushed in cc585c8 D guides/source/caching_with_rails.md~ commit cc585c8 refs/heads/master Author: davetoxa Date: 2013-01-16 01:26:47 +0600 revert to 814c9875ec4cf01e1348d1ab1c9d12eee5a9adac M guides/source/caching_with_rails.md A guides/source/caching_with_rails.md~ commit ffea97e refs/heads/master Author: davetoxa Date: 2013-01-16 01:14:22 +0600 Revert "fix history" This reverts commit dd319600010f4fdc4fac58e5b192bb96fe0d3d7e. D get.diff commit 5a9b3b7 refs/heads/master Author: Brian D. Burns Date: 2013-01-15 13:56:10 -0500 allow :dirs option for .enumerate Allows custom rake tasks to be defined using: SourceAnnotationExtractor.enumerate 'TODO|FIXME', dirs: %w(app lib), tag: true M railties/CHANGELOG.md M railties/lib/rails/source_annotation_extractor.rb M railties/test/application/rake/notes_test.rb commit 4dcc9dd refs/heads/master Author: davetoxa Date: 2013-01-16 01:12:37 +0600 Revert "Improves documentation about Fragment Caching. [ci skip]" This reverts commit 814c9875ec4cf01e1348d1ab1c9d12eee5a9adac. M guides/source/caching_with_rails.md commit 7fff04f refs/heads/master Author: Brian D. Burns Date: 2013-01-15 13:47:12 -0500 use case statement M railties/lib/rails/source_annotation_extractor.rb commit dd31960 refs/heads/master Author: davetoxa Date: 2013-01-16 00:10:03 +0600 fix history A get.diff commit f1d8f2a refs/heads/master Author: Andrew White Date: 2013-01-15 17:18:59 +0000 Change the behavior of route defaults This commit changes route defaults so that explicit defaults are no longer required where the key is not part of the path. For example: resources :posts, bucket_type: 'posts' will be required whenever constructing the url from a hash such as a functional test or using url_for directly. However using the explicit form alters the behavior so it's not required: resources :projects, defaults: { bucket_type: 'projects' } This changes existing behavior slightly in that any routes which only differ in their defaults will match the first route rather than the closest match. Closes #8814 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/controller/test_case_test.rb M actionpack/test/dispatch/routing_test.rb M actionpack/test/journey/route_test.rb commit 90d2802 refs/heads/master Author: Andrew White Date: 2013-01-15 13:38:10 +0000 Add support for other types of routing constraints This now allows the use of arrays like this: get '/foo/:action', to: 'foo', constraints: { subdomain: %w[www admin] } or constraints where the request method returns an Fixnum like this: get '/foo', to: 'foo#index', constraints: { port: 8080 } Note that this only applies to constraints on the request - path constraints still need to be specified as Regexps as the various constraints are compiled into a single Regexp. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit b28fc68 refs/heads/master Author: Andrew White Date: 2013-01-14 15:54:58 +0000 Ensure port is set when passed via the process method M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/test/controller/integration_test.rb commit db06d12 refs/heads/master Author: Andrew White Date: 2013-01-14 13:18:23 +0000 Raise correct exception now Journey is integrated. Now that Journey has been integrated into ActionDispatch we can raise the exception ActionController::UrlGenerationError directly rather than raising the internal Journey::Router::RoutingError and then have ActionDispatch::Routing::RouteSet#generate re-raise the exception. M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/journey/router_test.rb commit 31143a4 refs/heads/master Author: Anton Cherepanov Date: 2013-01-15 22:54:21 +0600 Update guides/source/active_record_validations.md Duplicated `update` M guides/source/active_record_validations.md commit c372eec refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-15 14:51:58 -0200 Revert "Merge pull request #8930 from cordawyn/ordered_railties" This reverts commit 8348f9ea72c9b50fc4d4462fd9ebe3bba932c783, reversing changes made to 9dfe2d6f9fabddf9a451a995678a9648c8aaf401. Reason: this broke railties tests as explained in the issue, and the author is going to review and report back. https://github.com/rails/rails/pull/8930#issuecomment-12272671 M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake commit 63333e6 refs/heads/master Author: Attila Domokos Date: 2013-01-14 15:03:42 -0500 Cleaning up ActiveModel::Dirty tests * Clarifying what the #changed method returns * Adding tests to describe what the #changed_attributes returns * Updating test name based on pull request comment * Moving the test lower in the file per pull request comment M activemodel/test/cases/dirty_test.rb commit 63970dc refs/tags/v3.2.15 Merge: 823604e cfa4c64 Author: Carlos Antonio da Silva Date: 2013-01-15 13:07:03 -0200 Merge branch 'revert-binds-3-2' into 3-2-stable This has been resulting in some hard to track bugs and is introducing a possible breackage in a stable version. The issue it currently "fixes" should be handled in some other way. Closes #8743. Related to #7983. commit cfa4c64 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-15 13:02:46 -0200 Revert "Work around undiagnosed bug that's draining a relation's bind_values" This reverts commit 06cc38a2b0d4778746e8a2a2e2b6aa07e1c1c075. M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit da5e5c5 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-15 13:01:13 -0200 Revert "Merge pull request #7983 from georgebrock/bug7950-squashed" This reverts commit 88a296dccc401da143d90cad54b693ff06bf2b58, reversing changes made to 666a7e34f553cef4c8878362eafc79c7e3f310c3. Conflicts: activerecord/CHANGELOG.md Reason: this has been resulting in some hard to track bugs and is introducing a possible breackage in a stable version. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/lib/active_record/relation/spawn_methods.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 8348f9e refs/heads/master Merge: 9dfe2d6 9dcd2a8 Author: Carlos Antonio da Silva Date: 2013-01-15 06:53:18 -0800 Merge pull request #8930 from cordawyn/ordered_railties rake railties:install:migrations respects the order of railties commit 9dfe2d6 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 12:08:18 -0200 Revert "log at debug level what line caused the redirect_to" This reverts commit 3fa00070047b5d019d39e691598ee2890283d052. Reason: This message is usually not accurate and annoying: Redirected by ~/.rbenv/versions/1.9.3-p327-perf/lib/ruby/1.9.1/logger.rb:371:in `add'` M actionpack/lib/action_controller/metal/redirecting.rb commit 814c987 refs/heads/master Author: Nicholas Schultz-Møller Date: 2013-01-15 14:44:08 +0100 Improves documentation about Fragment Caching. [ci skip] Adds documentation for: - Aggregate cache keys, - using an ActiveRecord model as cache key and - Russian Doll Caching. M guides/source/caching_with_rails.md commit e709134 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-15 09:20:43 -0200 Improve mysql database tasks handling to ensure we always rescue from an exception We were previously rescuing "nil" when no exception class was found. This does work in 1.9.3, but does not in 2.0, raising an exception asking for a class or module to be given to the rescue clause. Thanks @yahonda for catching this. M activerecord/lib/active_record/tasks/mysql_database_tasks.rb commit 5d06f8a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-15 09:18:55 -0200 Revert "Merge pull request #8942 from yahonda/tested_only_with_mysql" This reverts commit 1fc294f988e93ac59057a16b0e44b9cf93af9720, reversing changes made to fb9ac47c286fbdfe05263d4d0346e50892090603. Reason: these tests should run fine independent of database, since they should only take into account the configuration options. The problem was related to a change in the way "nil" is handled by the rescue clause, in Ruby 2.0 it raises an exception asking for class or module, in 1.9 it passes. M activerecord/test/cases/tasks/mysql_rake_test.rb commit 210cd9b refs/heads/master Merge: 390ad45 86c4fe8 Author: Xavier Noria Date: 2013-01-15 03:10:05 -0800 Merge pull request #8949 from joneslee85/patch-2 ActiveRecord <-> Active Record [ci skip] commit 86c4fe8 refs/heads/master Author: Trung Lê Date: 2013-01-15 10:52:02 +0000 ActiveRecord <-> Active Record [ci skip] M activemodel/README.rdoc commit 390ad45 refs/heads/master Merge: d040b3d dcb05f2 Author: David Heinemeier Hansson Date: 2013-01-14 23:47:30 -0800 Merge pull request #8946 from reednj77/rack-cache-headers Account for ignored cookie set by turbolinks commit d040b3d refs/heads/master Merge: 1fc294f 21df476 Author: Guillermo Iguaran Date: 2013-01-14 20:31:59 -0800 Merge pull request #8947 from joneslee85/patch-1 Use Rails 4 find_by in README [ci skip] commit 21df476 refs/heads/master Author: Trung Lê Date: 2013-01-15 04:21:03 +0000 Use Rails 4 find_by in README [ci skip] M actionmailer/README.rdoc commit dcb05f2 refs/heads/master Author: Nick Reed Date: 2013-01-14 21:55:35 -0600 Account for ignored cookie set by turbolinks M railties/test/application/middleware/cache_test.rb commit 1fc294f refs/heads/master Merge: fb9ac47 28ac50b Author: Rafael Mendonça França Date: 2013-01-14 12:48:09 -0800 Merge pull request #8942 from yahonda/tested_only_with_mysql Address test_create_when_database_exists_outputs_info_to_stderr failures commit fb9ac47 refs/heads/master Merge: 1dd8925 bc19c0d Author: Rafael Mendonça França Date: 2013-01-14 12:19:05 -0800 Merge pull request #8939 from senny/to_partial_path_test_to_prevent_regressions test case for ActiveModel::Conversion#to_partial_path and namespaced models commit 1dd8925 refs/heads/master Merge: bf09577 1fecaf1 Author: Steve Klabnik Date: 2013-01-14 12:18:36 -0800 Merge pull request #8938 from colinbm/date_select_value Rename :value to :selected for date_select, and add missing tests/docs commit bc19c0d refs/heads/master Author: Yves Senn Date: 2013-01-14 20:05:43 +0100 test for ActiveModel::Conversion#to_partial_path and namespaced models M activemodel/test/cases/conversion_test.rb M activemodel/test/models/helicopter.rb commit 28ac50b refs/heads/master Author: Yasuo Honda Date: 2013-01-15 00:43:10 +0900 Address test_create_when_database_exists_outputs_info_to_stderr failures When tested with ruby-2.0.0-rc1 `rake test` executes this test even if the target adapter is not mysql nor mysql2. M activerecord/test/cases/tasks/mysql_rake_test.rb commit 1fecaf1 refs/heads/master Author: Colin Burn-Murdoch Date: 2013-01-14 17:55:45 +0000 Rename :value option to :selected, in line with other select helpers Add tests for time & datetime. Add documentation. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/lib/action_view/helpers/tags/date_select.rb M actionpack/test/template/date_helper_test.rb commit bf09577 refs/heads/master Author: Jeremy Kemper Date: 2013-01-14 10:24:43 -0700 Revert benchmark helper regression. Use a #capture within a #benchmark block. Breaks benchmark calls that return non-String values otherwise. Revert "add benchmark helper that works in erb" This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de. Conflicts: actionpack/lib/action_view/helpers.rb actionpack/lib/action_view/helpers/benchmark_helper.rb actionpack/test/template/benchmark_helper_test.rb M actionpack/lib/action_view/helpers.rb D actionpack/lib/action_view/helpers/benchmark_helper.rb D actionpack/test/template/benchmark_helper_test.rb commit 823604e refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-14 14:02:44 -0200 Fix the TestCase class and make tests pass on ruby 2.0 M railties/test/application/middleware/static_test.rb commit 9dcd2a8 refs/heads/master Author: Slava Kravchenko Date: 2013-01-14 16:05:09 +0300 rake railties:install:migrations respects the order of railties M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake commit fa0d434 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-14 00:18:19 -0200 Add regression test to #8907 A railties/test/application/middleware/static_test.rb commit 48f9999 refs/tags/v3.2.15 Author: James Mead Date: 2013-01-14 13:59:24 +0000 Make tests for the presence of MiniTest consistent. There is an inconsistency between the conditional logic in the definition of ActiveSupport::TestCase and the conditional logic in ActiveSupport::Testing::SetupAndTeardown [1]. In some circumstances, it's possible for MiniTest to be defined, but for ActiveSupport::TestCase *not* to have MiniTest::Unit::TestCase or MiniTest::Assertions in its ancestor chain. e.g. in Ruby 1.8 with the minitest gem included in the bundle. In this case, the Test::Unit/MiniTest shim/wrapper is not present and so Test::Unit::TestCase (and therefore ActiveSupport::TestCase) is completely independent of MiniTest::Unit::TestCase. The conditional logic in the definition of ActiveSupport::TestCase does not take this scenario into account, whereas the logic in ActiveSupport::Testing::SetupAndTeardown does take it into account. The changes in this commit are an alternative to the change in [2] which was reverted in [3]. Similar conditional logic exists in ActiveSupport::Testing::Isolation [4], ActiveSupport::Testing::Pending [5], ActiveSupport::Testing::Performance [6], and in their respective tests. I have not addressed these, because I know less about what's going on there, but it would be worth bringing them all into line too. [1] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/setup_and_teardown.rb#L13 [2] https://github.com/rails/rails/commit/c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f [3] https://github.com/rails/rails/commit/267fb61277ac960ad443d239febcb3136a007d24 [4] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/isolation.rb#L41 [5] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/pending.rb#L14 [6] https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/performance.rb#L17 M activesupport/lib/active_support/test_case.rb commit 79a98d8 refs/tags/v3.2.15 Merge: 7c62a75 b1a501e Author: Rafael Mendonça França Date: 2013-01-14 03:32:34 -0800 Merge pull request #8927 from dkubb/issue-8178 Fix DateTime comparison with DateTime::Infinity object commit bc9433f refs/heads/master Author: Matt Bridges Date: 2013-01-13 23:59:14 -0600 fix reference to ActiveSupport::ProxyObject M activesupport/lib/active_support/proxy_object.rb commit b1a501e refs/tags/v3.2.15 Author: gsphanikumar Date: 2012-12-22 21:46:42 +0530 Test to allow Range including DateTime and DateTime::Infinity Closes #8587 M activesupport/test/core_ext/range_ext_test.rb commit 688d529 refs/tags/v3.2.15 Author: Dan Kubb Date: 2013-01-13 20:18:35 -0800 Fix DateTime comparison with DateTime::Infinity object M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/calculations.rb commit 0246712 refs/heads/master Author: gsphanikumar Date: 2012-12-22 21:46:42 +0530 Test to allow Range including DateTime and DateTime::Infinity Closes #8587 M activesupport/test/core_ext/range_ext_test.rb commit 242f125 refs/heads/master Merge: 5045455 8cc60d8 Author: Rafael Mendonça França Date: 2013-01-13 18:27:41 -0800 Merge pull request #8916 from josemota/collection-with-block Collection radio buttons and collection check boxes through FormBuilder render the provided block. Closes #8897 commit 5045455 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-14 00:18:19 -0200 Add regression test to #8907 A railties/test/application/middleware/static_test.rb commit 9b84dd4 refs/heads/master Merge: 2d35e58 01434a5 Author: Rafael Mendonça França Date: 2013-01-13 17:14:57 -0800 Merge pull request #8917 from adomokos/adding_more_tests_to_activemodel_model Adding tests for ActiveModel::Model commit 2d35e58 refs/heads/master Merge: 4e7c8f8 aea3820 Author: Steve Klabnik Date: 2013-01-13 13:15:19 -0800 Merge pull request #8925 from colinbm/date_select_value Allow to override the value on date_select commit aea3820 refs/heads/master Author: Colin Burn-Murdoch Date: 2013-01-13 20:35:15 +0000 Allow value to be set on date_select M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/tags/date_select.rb M actionpack/test/template/date_helper_test.rb commit 4e7c8f8 refs/heads/master Author: Steve Klabnik Date: 2013-01-13 13:34:36 -0500 Remove WIP from Working With JavaScript Guide. Now that we've fixed the fibs example, this is good to go. M guides/source/documents.yaml commit a0265b9 refs/heads/master Author: Steve Klabnik Date: 2013-01-13 10:43:24 -0500 Associaton -> Association M actionpack/test/template/form_helper_test.rb commit c22989d refs/heads/master Author: Jude Arasu Date: 2013-01-13 09:07:39 +0530 Fix simple expression M guides/source/working_with_javascript_in_rails.md commit 01434a5 refs/heads/master Author: Attila Domokos Date: 2013-01-12 14:31:33 -0500 Adding tests for ActiveModel::Model * Verifying persisted? is false when Model initialized * Passing nil to Model should not blow up * Changing test name to the one suggested in pull request comment M activemodel/test/cases/model_test.rb commit ec07735 refs/heads/master Author: Yves Senn Date: 2013-01-12 15:05:07 +0100 `CollectionAssociation#empty?` respects newly builded records M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 8cc60d8 refs/heads/master Author: José Mota Date: 2013-01-12 16:48:25 +0000 Collection radio buttons and collection check boxes through FormBuilder render the provided block. In the case of having a form_for method being called, the block for each collection would not be passed and thus the result expected was always the same. This patch passes the block to the original method like it would be assumed. M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/template/form_helper_test.rb commit 6581d79 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-12 11:19:02 -0200 Fix AR tests due to Mysql constant not being defined M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/lib/active_record/tasks/postgresql_database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb commit 2549a3b refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-12 10:52:13 -0200 Deprecate `Rails::Generators::ActiveModel#update_attributes` Deprecate #update_attributes in favor of `#update`. ORMs that implement `Generators::ActiveModel#update_attributes` should change to `#update`. Scaffold controller generators should change calls like: @orm_instance.update_attributes(...) to: @orm_instance.update(...) This goes along with the addition of `ActiveRecord::Base#update`, introduced in cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4. M railties/CHANGELOG.md M railties/lib/rails/generators/active_model.rb commit 9b636dc refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-09 00:58:23 -0200 Bring back "database already exists" messages when running rake tasks When running tasks such "rake db:setup", instead of showing messages like "db_development already exists", it was showing a big stack trace and a message "Couldn't create database for ..." with the configuration options, a very confusing message with a big trace. This brings back the functionality present in 3-2, showing the same message. M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/lib/active_record/tasks/postgresql_database_tasks.rb M activerecord/lib/active_record/tasks/sqlite_database_tasks.rb M activerecord/test/cases/tasks/database_tasks_test.rb M activerecord/test/cases/tasks/mysql_rake_test.rb M activerecord/test/cases/tasks/postgresql_rake_test.rb commit 7c62a75 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-11 15:37:21 -0800 Merge pull request #8907 from rubys/master Fix regression introduced in pull 8812 M actionpack/lib/action_dispatch/middleware/static.rb commit 4c525b2 refs/tags/v3.0.20 Author: Andrew White Date: 2013-01-12 02:04:10 +0000 Remove unnecessary caching of ParameterFilter M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 8b3109a refs/tags/v3.1.11 Author: Andrew White Date: 2013-01-12 02:03:12 +0000 Remove unnecessary caching of ParameterFilter M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 0db9b13 refs/tags/v3.2.15 Author: Andrew White Date: 2013-01-12 01:55:14 +0000 Remove unnecessary caching of ParameterFilter M actionpack/lib/action_dispatch/http/filter_parameters.rb commit c1d7225 refs/heads/master Merge: 7738222 c692774 Author: Rafael Mendonça França Date: 2013-01-11 15:37:21 -0800 Merge pull request #8907 from rubys/master Fix regression introduced in pull 8812 commit c692774 refs/heads/master Author: Sam Ruby Date: 2013-01-11 16:48:58 -0500 Fix regression introduced in pull request 8812 See https://github.com/rails/rails/pull/8812#commitcomment-2416514 M actionpack/lib/action_dispatch/middleware/static.rb commit d2d07b3 refs/heads/master Author: Zachary Porter Date: 2013-01-11 15:26:05 -0500 Fix typo in guides/source/engines.md M guides/source/engines.md commit 0a89d4d refs/heads/master Author: Zachary Porter Date: 2013-01-11 14:07:14 -0500 Fix typo in guides/source/engines.md M guides/source/engines.md commit 2222ebb refs/heads/master Author: Zachary Porter Date: 2013-01-11 13:53:25 -0500 Update engine application layout file path M guides/source/engines.md commit bc4edca refs/heads/master Author: Derek Kraan Date: 2013-01-11 12:29:30 -0500 Fix .update_all and .delete_all when using a condition on a joined table in a default_scope. `Model.joins(...).where(condition_on_joined_table).update_all` / `delete_all` worked, but the same operation implemented with a default_scope generated a SQL error because ActiveRecord ignored the join but implemented the where condition anyways. M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/models/developer.rb commit 2c5e0adef refs/tags/v3.2.15 Merge: 3211eb1 18b9187 Author: Rafael Mendonça França Date: 2013-01-11 07:34:53 -0800 Merge pull request #8895 from ernie/revert-hmt-on-unsaved-in-3-2 Revert hm:t on unsaved collection for 3.2 commit 18b9187 refs/tags/v3.2.15 Author: Ernie Miller Date: 2013-01-11 09:42:15 -0500 Revert "Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt" This reverts commit ee439895759b38431ad025f3c234831f30dadcdb. It would appear that #7661 had unintended consequences to the API. Until we can sort those out, this should not be in 3.2.x, and wait for 4.0.0. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 7738222 refs/heads/master Merge: 39a88f6 c6897b7 Author: Rafael Mendonça França Date: 2013-01-11 07:23:28 -0800 Merge pull request #8896 from NARKOZ/patch-5 remove_possible_method -> remove_method commit c6897b7 refs/heads/master Author: Nihad Abbasov Date: 2013-01-11 18:51:35 +0400 remove_possible_method -> remove_method Date#to_time and Date#xmlschema methods defined in Ruby 1.9.3 M activesupport/lib/active_support/core_ext/date/conversions.rb commit 39a88f6 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-11 09:26:48 -0200 Add changelog entry for scaffold generator and jbuilder changes Introduced in 3bfd99defb559af0b017ee920ca714aa1e367fdd. Related to #8840. [ci skip] M railties/CHANGELOG.md commit d61b49e refs/heads/master Merge: fc6f5a4 caa54db Author: Carlos Antonio da Silva Date: 2013-01-11 03:21:51 -0800 Merge pull request #8882 from goshakkk/clearer-conditional Clearer conditional in constraint match check commit fc6f5a4 refs/heads/master Merge: 94797ed 7171f9c Author: Carlos Antonio da Silva Date: 2013-01-11 03:18:36 -0800 Merge pull request #8866 from adomokos/adding_more_tests_to_errors_test Adding tests to cover untested methods in errors_tests.rb commit 94797ed refs/heads/master Merge: 15b7482 c009e86 Author: Jon Leighton Date: 2013-01-11 03:08:41 -0800 Merge pull request #8623 from virusman/form_helpers_collectionproxy_fix Fixed nested fields bug when called with AssociationProxy commit 5ff752d refs/heads/master Author: Benoit Caccinolo Date: 2013-01-11 11:38:52 +0100 Update guides/source/active_record_basics.md M guides/source/active_record_basics.md commit 15b7482 refs/heads/master Merge: 92fada9 1a7567d Author: Jon Leighton Date: 2013-01-11 01:34:43 -0800 Merge pull request #8568 from inossidabile/fix-in_clause_length Correct source for in_clause_length for eager loading (Fix for #8474) commit 9bc2b09 refs/tags/v3.0.20 Merge: e5f4a39 eede4ab Author: Jeremy Kemper Date: 2013-01-10 22:54:23 -0800 Merge pull request #8890 from dylanahsmith/3-0-parse-non-object-json-params 3-0-stable: Fix JSON params parsing regression for non-object JSON content. commit 18b8f90 refs/tags/v3.1.11 Merge: 1b35a85 c669a9c Author: Jeremy Kemper Date: 2013-01-10 22:54:01 -0800 Merge pull request #8889 from dylanahsmith/3-1-parse-non-object-json-params 3-1-stable: Fix JSON params parsing regression for non-object JSON content. commit 3211eb1 refs/tags/v3.2.15 Merge: d564ee0 7003b36 Author: Jeremy Kemper Date: 2013-01-10 22:53:44 -0800 Merge pull request #8888 from dylanahsmith/3-2-parse-non-object-json-params 3-2-stable: Fix JSON params parsing regression for non-object JSON content. commit 92fada9 refs/heads/master Merge: 8a7fad8 bae9268 Author: Jeremy Kemper Date: 2013-01-10 22:53:18 -0800 Merge pull request #8855 from dylanahsmith/parse-non-object-json-params Fix json params parsing regression for non-object JSON content. commit eede4ab refs/tags/v3.0.20 Author: Dylan Smith Date: 2013-01-09 15:26:12 -0500 Fix JSON params parsing regression for non-object JSON content. Backports #8855. M actionpack/CHANGELOG M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb commit bae9268 refs/heads/master Author: Dylan Smith Date: 2013-01-09 15:26:12 -0500 Fix json params parsing regression for non-object JSON content. Fixes #8845. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb commit c669a9c refs/tags/v3.1.11 Author: Dylan Smith Date: 2013-01-09 15:26:12 -0500 Fix JSON params parsing regression for non-object JSON content. Backports #8855. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb commit 7003b36 refs/tags/v3.2.15 Author: Dylan Smith Date: 2013-01-09 15:26:12 -0500 Fix JSON params parsing regression for non-object JSON content. Backports #8855. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb commit 8a7fad8 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-11 02:38:15 -0200 All green with Ruby 2.0 :green_heart: M .travis.yml commit da97bfe refs/heads/master Author: Rafael Mendonça França Date: 2013-01-11 02:37:51 -0200 Use thor master to make rails work with Ruby 2.0 M Gemfile commit 12283df refs/heads/master Author: Rafael Mendonça França Date: 2013-01-11 02:37:26 -0200 thread_safe is a dependency of active_support M Gemfile commit 563ebed refs/heads/master Merge: 2d75d6f cca1729 Author: Rafael Mendonça França Date: 2013-01-10 19:29:45 -0800 Merge pull request #8887 from rwz/controller-scaffold-codestyle Controller scaffold codestyle commit cca1729 refs/heads/master Author: Pavel Pravosud Date: 2013-01-11 10:26:39 +0700 More consistent quotes in scaffold generator M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb commit d643cbe refs/heads/master Author: Pavel Pravosud Date: 2013-01-11 10:20:43 +0700 Changed if ! to unless M railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb commit 2d75d6f refs/heads/master Merge: 8c2e4b6 7c8321c Author: Guillermo Iguaran Date: 2013-01-10 19:17:00 -0800 Merge pull request #8886 from rwz/specify-jbuilder-version Specified jbuilder version commit 7c8321c refs/heads/master Author: Pavel Pravosud Date: 2013-01-11 10:14:15 +0700 Specified jbuilder version M railties/lib/rails/generators/rails/app/templates/Gemfile commit 7171f9c refs/heads/master Author: Attila Domokos Date: 2013-01-10 14:49:47 -0500 Covering untested methods for ActiveModel::Errors M activemodel/test/cases/errors_test.rb commit 8c2e4b6 refs/heads/master Merge: 34126fa 139461f Author: Guillermo Iguaran Date: 2013-01-10 13:39:01 -0800 Merge pull request #8884 from mattdbridges/array-access-doc-fixes Updating Array access docs more consistent commit 139461f refs/heads/master Author: Matt Bridges Date: 2013-01-10 15:28:16 -0600 Updating Array access docs more consistent [ci skip] M activesupport/lib/active_support/core_ext/array/access.rb commit d564ee0 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-10 19:04:48 -0200 Reorder AP changelog and remove duplicated entry [ci skip] Duplicated entry added in 002dfba66490d289bac897d1ba886310a672e779. M actionpack/CHANGELOG.md commit 686307c refs/tags/v3.2.15 Merge: 002dfba 9bc5e65 Author: Guillermo Iguaran Date: 2013-01-10 12:43:57 -0800 Merge pull request #8756 from causes/js_include_tag_fix Fix javascript_include_tag when no js runtime is available commit 002dfba refs/tags/v3.2.15 Merge: 11f5deb f55ef82 Author: Guillermo Iguaran Date: 2013-01-10 12:43:31 -0800 Merge pull request #8735 from jejacks0n/duplicate_asset_fix Ensure assets aren't duplicated when using sprockets require. commit f55ef82 refs/tags/v3.2.15 Author: jejacks0n Date: 2013-01-03 20:51:44 -0700 Fixes issue where duplicate assets can be required with sprockets. - addresses the problem by calling flatten on asset array before calling uniq. - adds note to CHANGELOG. M actionpack/CHANGELOG.md M actionpack/lib/sprockets/helpers/rails_helper.rb M actionpack/test/fixtures/sprockets/app/javascripts/extra.js M actionpack/test/fixtures/sprockets/app/stylesheets/extra.css M actionpack/test/template/sprockets_helper_test.rb commit caa54db refs/heads/master Author: Gosha Arinich Date: 2013-01-10 23:40:57 +0300 clearer conditional in constraint match check M actionpack/lib/action_dispatch/routing/mapper.rb commit 34126fa refs/heads/master Merge: 5be6fa5 38efe87 Author: Guillermo Iguaran Date: 2013-01-10 11:38:16 -0800 Merge pull request #8869 from goshakkk/guides-asset-pipeline-tilt Add asset pipeline guides section on implementing & registering own engines commit 5be6fa5 refs/heads/master Author: Jeremy Kemper Date: 2013-01-10 12:34:03 -0700 Relax bundler dep until 1.3.0 is actually released. Revert "Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs '" This reverts commit e00b8ecf1ad8984b760f12e61247820613aec4ee. Revert "Use bundler --pre for travis builds" This reverts commit 4d240ec20a70122b7e69c790a37d2be14e1ff038. M .travis.yml M rails.gemspec commit 3bfd99d refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-10 20:21:22 +0100 Include jbuilder by default and rely on its scaffold generator to show json API. The default scaffold will now just create HTML if the user actively opts out of jbuilder M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit 6572499 refs/heads/master Merge: 416a179 d262fab Author: Guillermo Iguaran Date: 2013-01-10 08:55:16 -0800 Merge pull request #8878 from senny/add_performance_test_extraction_to_guide Mention performance test extraction in 4.0 guide commit d262fab refs/heads/master Author: Yves Senn Date: 2013-01-10 17:53:41 +0100 mention performance test extraction in 4.0 guide M guides/source/4_0_release_notes.md commit 416a179 refs/heads/master Merge: 2b5019e 5ca7ddc Author: Guillermo Iguaran Date: 2013-01-10 08:10:22 -0800 Merge pull request #8876 from senny/extract_performance_tests Extract ActionDispatch::PerformanceTest commit 5ca7ddc refs/heads/master Author: Yves Senn Date: 2013-01-06 17:17:41 +0100 remove the rails guide on performance testing D guides/code/getting_started/test/performance/browsing_test.rb M guides/source/documents.yaml D guides/source/performance_testing.md commit ce8e3d3 refs/heads/master Author: Yves Senn Date: 2013-01-06 00:42:57 +0100 remove performance tests from the default stack M guides/code/getting_started/README.rdoc M guides/source/configuring.md M guides/source/testing.md M railties/lib/rails/commands.rb M railties/lib/rails/generators.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/test_unit/railtie.rb M railties/lib/rails/test_unit/testing.rake M railties/test/application/test_test.rb M railties/test/generators/app_generator_test.rb commit 3e1ed78 refs/heads/master Author: Yves Senn Date: 2013-01-06 00:05:25 +0100 extract PerformanceTest into rails-performance_tests gem M actionpack/CHANGELOG.md M actionpack/lib/action_controller.rb D actionpack/lib/action_controller/deprecated/performance_test.rb M actionpack/lib/action_dispatch.rb D actionpack/lib/action_dispatch/testing/performance_test.rb M activesupport/CHANGELOG.md D activesupport/lib/active_support/testing/performance.rb D activesupport/lib/active_support/testing/performance/jruby.rb D activesupport/lib/active_support/testing/performance/rubinius.rb D activesupport/lib/active_support/testing/performance/ruby.rb D activesupport/test/testing/performance_test.rb D railties/lib/rails/commands/benchmarker.rb D railties/lib/rails/commands/profiler.rb D railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb D railties/lib/rails/generators/rails/performance_test/USAGE D railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb D railties/lib/rails/generators/test_unit/performance/performance_generator.rb D railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb D railties/lib/rails/performance_test_help.rb M railties/lib/rails/test_unit/testing.rake D railties/test/generators/performance_test_generator_test.rb commit 2b5019e refs/heads/master Merge: 8d926f5 0121377 Author: Rafael Mendonça França Date: 2013-01-10 13:34:40 -0200 Merge pull request #8821 from jamis/master Evaluate view_cache_dependencies at the instance level Conflicts: actionpack/lib/action_controller/caching.rb commit 8d926f5 refs/heads/master Merge: ffa9540 ff8f92b Author: Carlos Antonio da Silva Date: 2013-01-10 03:20:09 -0800 Merge pull request #8863 from zires/dev Remove redundant double quotation marks [ci skip] commit 9f487e7 refs/heads/master Author: Jakob Waller Date: 2013-01-10 12:13:54 +0100 Clarified the minute option on DateTime#change M activesupport/lib/active_support/core_ext/date_time/calculations.rb commit 38efe87 refs/heads/master Author: Gosha Arinich Date: 2013-01-10 14:00:31 +0300 add asset pipeline guides section on implementing & registering own engines M guides/source/asset_pipeline.md commit 00f68c5 refs/heads/master Author: Gosha Arinich Date: 2013-01-10 12:59:56 +0300 update assets guide code styling * 1.9 hash syntax * proper formatting around one line blocks * do-end for multiline blocks M guides/source/asset_pipeline.md commit ff8f92b refs/heads/master Author: zires Date: 2013-01-10 10:23:26 +0800 Remove redundant double quotation marks M actionpack/lib/action_view/helpers/url_helper.rb commit e5f4a39 refs/tags/v3.0.20 Author: Carlos Antonio da Silva Date: 2013-01-09 20:23:15 -0200 Update changelogs with release dates and minor improvements [ci skip] M actionmailer/CHANGELOG M actionpack/CHANGELOG M activemodel/CHANGELOG M activerecord/CHANGELOG M activeresource/CHANGELOG M activesupport/CHANGELOG M railties/CHANGELOG commit ffa9540 refs/heads/master Author: Aaron Patterson Date: 2013-01-09 15:34:36 -0800 fire a notification when the request stops / starts M railties/lib/rails/rack/logger.rb A railties/test/rack_logger_test.rb commit 8ae9b46 refs/heads/master Author: Aaron Patterson Date: 2013-01-09 15:33:32 -0800 adding missing requires M actionpack/lib/action_dispatch/http/filter_parameters.rb M actionpack/lib/action_dispatch/http/request.rb M activesupport/lib/active_support/log_subscriber.rb commit 23b69c9 refs/heads/master Author: Aaron Patterson Date: 2013-01-08 10:50:28 -0800 extract logger and development checks to methods M railties/lib/rails/rack/logger.rb commit 56f3d05 refs/heads/master Author: Aaron Patterson Date: 2013-01-08 10:45:44 -0800 adding start / finish on the instrumenter, adding tests for the class M activesupport/lib/active_support/notifications/instrumenter.rb A activesupport/test/notifications/instrumenter_test.rb commit 583e5fd refs/tags/v3.0.20 Merge: ca8b0bd 477f0e7 Author: Carlos Antonio da Silva Date: 2013-01-09 15:23:38 -0800 Merge pull request #8853 from zmoazeni/3-0-xml-serialization-fix Methods that return nil should not be considered YAML commit 477f0e7 refs/tags/v3.0.20 Author: Zach Moazeni Date: 2013-01-09 15:02:34 -0500 Methods that return nil should not be considered YAML This is a direct port of @jaw6's pull request https://github.com/rails/rails/pull/492. His cleanly applied to Rails v3.1 and v3.2, and this cleanly applies to v3.0. With yesterday's security patches http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/ there is now an issue with Rails v3.0 serving XML to any of the latest versions of ActiveResource. Without this, Rails v3.0 can serve XML to ActiveResource consumers that will see `Hash::DisallowedType: Disallowed type attribute: "yaml"` M activemodel/CHANGELOG M activemodel/lib/active_model/serializers/xml.rb M activemodel/test/cases/serializeration/xml_serialization_test.rb M activemodel/test/models/contact.rb M activerecord/test/cases/xml_serialization_test.rb commit 1b35a85 refs/tags/v3.1.11 Author: Carlos Antonio da Silva Date: 2013-01-09 20:23:15 -0200 Update changelogs with release dates and minor improvements [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit 11f5deb refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-09 20:05:47 -0200 Update changelogs with release date [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit f92c2b1 refs/heads/master Merge: 0fe64f4 77828e2 Author: Vijay Dev Date: 2013-01-09 13:53:24 -0800 Merge pull request #8859 from tehgeekmeister/master Fix a typo in a test. commit 77828e2 refs/heads/master Author: Ezekiel Smithburg Date: 2013-01-09 13:32:35 -0800 s/messqage/message/ in message_encryptor_test.rb M activesupport/test/message_encryptor_test.rb commit b816e8e refs/tags/v3.1.11 Merge: a97199d 7b9bab6 Author: Rafael Mendonça França Date: 2013-01-09 08:46:58 -0800 Merge pull request #8846 from AlexRiedler/revert_5861 Backport multi_json dependency revert of #5861 to 3-1-stable commit 7b9bab6 refs/tags/v3.1.11 Author: Jeremy Kemper Date: 2012-04-21 12:15:39 -0700 Merge pull request #5896 from sferik/revert_5861 Revert #5861. Feature-detect which MultiJson API to use. Conflicts: activesupport/activesupport.gemspec This backports multi_json version depedency changes as applied. Rationale: #5861 Patch by sferik M activesupport/CHANGELOG.md M activesupport/activesupport.gemspec M activesupport/lib/active_support/json/decoding.rb commit 0fe64f4 refs/heads/master Merge: a1610f5 d4f46ee Author: Carlos Antonio da Silva Date: 2013-01-09 08:12:40 -0800 Merge pull request #8848 from Irio/master Set default value to ActiveModel::Validator initializer attribute commit a1610f5 refs/heads/master Merge: 2d33d73 7342f14 Author: Carlos Antonio da Silva Date: 2013-01-09 08:11:55 -0800 Merge pull request #8849 from mattdbridges/contributing_to_rails Adding mention about single-line blocks in Contributing to Rails [ci skip] commit 7342f14 refs/heads/master Author: Matt Bridges Date: 2013-01-09 10:04:09 -0600 adding small mention one single line blocks in contributing to rails [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 2d33d73 refs/heads/master Merge: 66c8740 68ad9e3 Author: Rafael Mendonça França Date: 2013-01-09 08:00:17 -0800 Merge pull request #8839 from mattdbridges/clarify_chdir Clarify Dir.chdir definition commit 68ad9e3 refs/heads/master Author: Matt Bridges Date: 2013-01-08 22:22:18 -0600 use multiline do-end blocks and rearrange definition for clarity M railties/lib/rails/paths.rb commit d4f46ee refs/heads/master Author: Irio Irineu Musskopf Junior Date: 2013-01-09 13:50:27 -0200 Set default value to ActiveModel::Validator initializer attribute Makes it easier to test its objects. M activemodel/lib/active_model/validator.rb commit 8313f3c refs/tags/v3.2.15 Merge: 45b17ce 3d1a879 Author: Rafael Mendonça França Date: 2013-01-09 09:35:15 -0200 Merge pull request #8838 from yahonda/8806_3-2-stable Ignore binds payload with nil column in AR log subscriber commit 66c8740 refs/heads/master Merge: 5d0d829 d2f1ca2 Author: Rafael Mendonça França Date: 2013-01-09 02:09:44 -0800 Merge pull request #8842 from nthj/patch-1 Fix typo in deprecation warning commit d2f1ca2 refs/heads/master Author: Nathaniel Jones Date: 2013-01-09 04:04:57 -0600 Fix typo in deprecation warning M actionpack/lib/action_controller/record_identifier.rb commit 5d0d829 refs/heads/master Merge: 5fb5019 109a1b3 Author: Santiago Pastorino Date: 2013-01-08 17:27:13 -0800 Merge pull request #8824 from mjtko/fix/cookie-store-inheritance Modify CookieStore middleware inheritance to avoid subclassing Rack::Session::Cookie [Fix for #7372] commit ca8b0bd refs/tags/v3.0.20 Merge: 7909e7f f252755 Author: Carlos Antonio da Silva Date: 2013-01-08 17:09:21 -0800 Merge pull request #8836 from sikachu/3-0-stable-fix-ars Remove test for XML YAML parsing commit 5fb5019 refs/heads/master Merge: 50241eb 1d1722b Author: Carlos Antonio da Silva Date: 2013-01-08 17:06:58 -0800 Merge pull request #8833 from diogomafra/release_notes Correcting the command 'rake rails:update:bin' in the release notes. [ci skip] commit 1d1722b refs/heads/master Author: Diogo Mafra Date: 2013-01-08 22:39:58 -0200 Correcting the command 'rake rails:update:bin' in the release notes.[ci skip] M guides/source/4_0_release_notes.md commit f252755 refs/tags/v3.0.20 Author: Prem Sichanugrist Date: 2013-01-08 19:54:25 -0500 Remove test for XML YAML parsing The support for YAML parsing in XML has been removed from Active Support since it introduced an security risk. See a494824 for more detail. M activeresource/test/cases/base_test.rb M activeresource/test/cases/finder_test.rb commit 45b17ce refs/tags/v3.2.15 Merge: 48810a5 e134e17 Author: Carlos Antonio da Silva Date: 2013-01-08 16:48:31 -0800 Merge pull request #8834 from sikachu/3-2-stable-fix-ars Remove test for XML YAML parsing commit a97199d refs/tags/v3.1.11 Merge: 86cf7d3 3f3c35b Author: Carlos Antonio da Silva Date: 2013-01-08 16:48:27 -0800 Merge pull request #8835 from sikachu/3-1-stable-fix-ars Remove test for XML YAML parsing commit 3f3c35b refs/tags/v3.1.11 Author: Prem Sichanugrist Date: 2013-01-08 19:39:25 -0500 Remove test for XML YAML parsing The support for YAML parsing in XML has been removed from Active Support since it introduced an security risk. See 8133a81 for more detail. M activeresource/test/abstract_unit.rb M activeresource/test/cases/base_test.rb commit e134e17 refs/tags/v3.2.15 Author: Prem Sichanugrist Date: 2013-01-08 19:39:25 -0500 Remove test for XML YAML parsing The support for YAML parsing in XML has been removed from Active Support since it introduced an security risk. See 43109ec for more detail. M activeresource/test/abstract_unit.rb M activeresource/test/cases/base_test.rb commit 86cf7d3 refs/tags/v3.1.11 Author: Carlos Antonio da Silva Date: 2013-01-08 22:33:10 -0200 Fix a few warnings of unused variables M actionpack/lib/action_controller/caching/fragments.rb M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/lib/action_dispatch/middleware/head.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/lib/action_view/helpers/debug_helper.rb M actionpack/lib/action_view/renderer/template_renderer.rb M actionpack/lib/action_view/template/error.rb M actionpack/test/abstract/abstract_controller_test.rb M activerecord/lib/active_record/base.rb commit 5fb84c6 refs/heads/master Author: Juanjo Bazán Date: 2013-01-08 23:49:29 +0100 remove 'update' duplications M guides/source/active_record_callbacks.md M guides/source/active_record_validations.md commit 50241eb refs/heads/master Merge: d106925 7771595 Author: Carlos Antonio da Silva Date: 2013-01-08 14:44:42 -0800 Merge pull request #8823 from acapilleri/target_reflection_has_associated_record Refactor target_reflection_has_associated_record? commit d106925 refs/heads/master Merge: b28d6e2 3543fde Author: Carlos Antonio da Silva Date: 2013-01-08 14:32:51 -0800 Merge pull request #8826 from acapilleri/different_target Improved different_target conditions commit b28d6e2 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-08 20:26:04 -0200 Remove :yaml related tests and fix other related to parsing empty arrays All Action Pack tests are green. M actionpack/test/controller/webservice_test.rb M actionpack/test/dispatch/request/query_string_parsing_test.rb commit 21879c5 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-08 20:16:20 -0200 Fix warning: & interpreted as argument prefix M actionpack/lib/action_controller/caching.rb commit 507d23c refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-08 20:00:26 -0200 Fix syntax error and remove duplicated test M activerecord/test/cases/relation/where_test.rb commit c7a4fef refs/heads/master Merge: e80546c ec53106 Author: Aaron Patterson Date: 2013-01-08 14:00:27 -0800 Merge pull request #8827 from sikachu/master-remove-yaml-changelog Add CHANGELOG entry for YAML parsing removal commit ec53106 refs/heads/master Author: Prem Sichanugrist Date: 2013-01-08 16:56:36 -0500 Add CHANGELOG entry for YAML parsing removal This is for commit e80546cdec56a9c3fcaf6217cba08a02d789d2bc. M activerecord/CHANGELOG.md commit e80546c refs/heads/master Author: Aaron Patterson Date: 2013-01-08 13:50:22 -0800 remove yaml as a param parser :burn: If you revert this commit, I will hunt you down, I will make you regret ever terrible thing you've ever done, I will make you suffer. M actionpack/lib/action_dispatch/middleware/params_parser.rb commit 6b126e2 refs/heads/master Author: Xavier Noria Date: 2013-01-08 22:49:11 +0100 mv README README.rdoc as app template file M railties/lib/rails/generators/rails/app/app_generator.rb D railties/lib/rails/generators/rails/app/templates/README A railties/lib/rails/generators/rails/app/templates/README.rdoc commit 3543fde refs/heads/master Author: Angelo Capilleri Date: 2013-01-08 22:44:38 +0100 improved different_target conditions M activerecord/lib/active_record/associations/belongs_to_association.rb commit 3d1a879 refs/tags/v3.2.15 Author: Yasuo Honda Date: 2013-01-09 03:30:37 +0900 Ignore binds payload with nil column in AR log subscriber Some tests were raising the following error: Could not log "sql.active_record" event. NoMethodError: undefined method `type' for nil:NilClass` Due to the way binds were being logged, the column info was considered always present, but that is not true for some of the tests listed in the issue. Closes #8806. Conflicts: activerecord/lib/active_record/log_subscriber.rb activerecord/test/cases/log_subscriber_test.rb Conflict resolution: - Revert ruby 1.9 style hash to support ruby 1.8 - Do not include 8f59ffce into 3-2-stable M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/log_subscriber_test.rb commit 7771595 refs/heads/master Author: Angelo Capilleri Date: 2013-01-08 21:53:35 +0100 target_reflection_has_associated_record? refactoring M activerecord/lib/active_record/associations/has_many_through_association.rb commit 46e0d23 refs/heads/master Author: Jeremy Kemper Date: 2013-01-05 17:46:26 -0700 CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. M actionpack/test/controller/webservice_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 8e577fe refs/heads/master Author: Aaron Patterson Date: 2013-01-04 12:02:22 -0800 * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb M actionpack/test/dispatch/request/xml_params_parsing_test.rb M activerecord/test/cases/relation/where_test.rb commit c31cc96 refs/heads/master Author: Jeremy Kemper Date: 2013-01-05 17:46:26 -0700 Revert "Merge branch 'master-sec'" This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79. M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/controller/webservice_test.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb M actionpack/test/dispatch/request/xml_params_parsing_test.rb M activerecord/test/cases/relation/where_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 88cc168 refs/heads/master Merge: f049016 2ced6f2 Author: Aaron Patterson Date: 2013-01-08 12:11:18 -0800 Merge branch 'master-sec' * master-sec: CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu commit 2ced6f2 refs/heads/master Author: Jeremy Kemper Date: 2013-01-05 17:46:26 -0700 CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. M actionpack/test/controller/webservice_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 48810a5 refs/tags/v3.2.15 Merge: f64be7d 746dbd8 Author: Aaron Patterson Date: 2013-01-08 11:37:48 -0800 Merge branch '3-2-sec' into 3-2-secmerge * 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md commit f049016 refs/heads/master Merge: 64e3660 cab6ba4 Author: Vijay Dev Date: 2013-01-09 01:04:15 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: guides/source/getting_started.md commit 709af05 refs/tags/v2.3.15 (tag: v2.3.15) Author: Aaron Patterson Date: 2013-01-07 16:58:10 -0800 bumping to 2.3.15 :cry::gun: M actionmailer/Rakefile M actionmailer/lib/action_mailer/version.rb M actionpack/Rakefile M actionpack/lib/action_pack/version.rb M activerecord/Rakefile M activerecord/lib/active_record/version.rb M activeresource/Rakefile M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/Rakefile M railties/lib/rails/version.rb commit 70adb96 refs/tags/v2.3.15 Author: Jeremy Kemper Date: 2013-01-05 17:46:26 -0700 CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. M actionpack/test/controller/webservice_test.rb M activesupport/CHANGELOG M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 7909e7f refs/tags/v3.0.19 (tag: v3.0.19) Author: Aaron Patterson Date: 2013-01-07 16:22:08 -0800 bumping version M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit a494824 refs/tags/v3.0.19 Author: Jeremy Kemper Date: 2013-01-05 17:46:26 -0700 CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. M actionpack/test/controller/webservice_test.rb M activesupport/CHANGELOG M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 97b3b68 refs/tags/v3.0.19 Author: Aaron Patterson Date: 2013-01-04 12:02:22 -0800 * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb M actionpack/CHANGELOG M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb M actionpack/test/dispatch/request/xml_params_parsing_test.rb M activerecord/CHANGELOG M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb commit a7dd0bb refs/tags/v3.1.10 (tag: v3.1.10) Author: Aaron Patterson Date: 2013-01-07 16:17:52 -0800 bumping version M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 8133a81 refs/tags/v3.1.10 Author: Jeremy Kemper Date: 2013-01-05 17:46:26 -0700 CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. M actionpack/test/controller/webservice_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 746dbd8 refs/tags/v3.2.11 (tag: v3.2.11) Author: Aaron Patterson Date: 2013-01-07 16:15:56 -0800 bumping version M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 43109ec refs/tags/v3.2.11 Author: Jeremy Kemper Date: 2013-01-05 17:46:26 -0700 CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. M actionpack/test/controller/webservice_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 0121377 refs/heads/master Author: Jamis Buck Date: 2013-01-08 12:02:11 -0700 evaluate the dependency blocks at the instance level, not class level M actionpack/lib/action_controller/caching.rb M actionpack/test/controller/caching_test.rb commit 64e3660 refs/heads/master Merge: ac86cbe 70e684a Author: David Heinemeier Hansson Date: 2013-01-08 10:29:50 -0800 Merge pull request #8818 from jamis/master view_cache_dependency API commit 70e684a refs/heads/master Author: Jamis Buck Date: 2013-01-08 11:20:47 -0700 view_cache_dependency API A declarative API for specifying dependencies that affect template cache digest computation. In your controller, specify any of said dependencies: view_cache_dependency { "phone" if using_phone? } When the block is evaluated, the resulting value is included in the cache digest calculation, allowing you to generate different digests for effectively the same template. (Mostly useful if you're mucking with template load paths.) M actionpack/CHANGELOG.md M actionpack/lib/action_controller/caching.rb M actionpack/lib/action_view/digestor.rb M actionpack/lib/action_view/helpers/cache_helper.rb M actionpack/test/controller/caching_test.rb M actionpack/test/template/digestor_test.rb commit 7e5cc96 refs/tags/v3.1.10 Author: Aaron Patterson Date: 2013-01-04 12:02:22 -0800 * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb M actionpack/test/dispatch/request/xml_params_parsing_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb commit d5cd97b refs/tags/v3.2.11 Author: Aaron Patterson Date: 2013-01-04 12:02:22 -0800 * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb M actionpack/test/dispatch/request/xml_params_parsing_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb commit 95fe9ef refs/tags/v3.2.11 Author: Santiago Pastorino Date: 2013-01-08 00:25:24 -0200 Avoid Rack security warning no secret provided This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie." M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb commit ac86cbe refs/heads/master Merge: cc1c3c5 0f8f75c Author: Steve Klabnik Date: 2013-01-08 07:39:06 -0800 Merge pull request #8810 from NARKOZ/image-submit-tag set 'alt' attribute for image_submit_tag commit cc1c3c5 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-08 16:10:34 +0100 Revert "unpermitted params" exception -- it's just not going to work. See the discussion on https://github.com/rails/strong_parameters/pull/75. M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/railtie.rb D actionpack/test/controller/parameters/raise_on_unpermitted_parameters_test.rb M railties/test/application/configuration_test.rb commit ae3286b refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-08 15:52:00 +0100 Never treat action or controller as unpermitted params M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/raise_on_unpermitted_parameters_test.rb commit f64be7d refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-08 10:59:12 -0200 Changelog improvements [ci skip] M actionpack/CHANGELOG.md commit 3debd57 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-08 10:43:11 -0200 Bump rack dependency to 1.4.3 It includes security bug fixes and changes the initialization of Rack::File to accept a hash, otherwise generating warnings. See 295806e for the warnings fix. Conflicts: actionpack/actionpack.gemspec M actionpack/CHANGELOG.md M actionpack/actionpack.gemspec commit 54faddf refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-08 04:29:24 -0800 Merge pull request #8812 from rubys/master Eliminate Rack::File headers deprecation warning M actionpack/lib/action_dispatch/middleware/static.rb commit 4f002a1 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-08 10:43:11 -0200 Bump rack dependency to 1.4.3 It includes security bug fixes and changes the initialization of Rack::File to accept a hash, otherwise generating warnings. See 295806e for the warnings fix. M actionpack/actionpack.gemspec commit 295806e refs/heads/master Merge: c67005f 9cc82b7 Author: Carlos Antonio da Silva Date: 2013-01-08 04:29:24 -0800 Merge pull request #8812 from rubys/master Eliminate Rack::File headers deprecation warning commit 9cc82b7 refs/heads/master Author: Sam Ruby Date: 2013-01-08 07:22:48 -0500 Eliminate Rack::File headers deprecation warning See http://intertwingly.net/projects/AWDwR4/checkdepot/section-6.1.html rake test produces: "Rack::File headers parameter replaces cache_control after Rack 1.5." Despite what the message says, it appears that the hearders parameter change will be effective as of Rack 1.5: https://github.com/rack/rack/blob/rack-1.4/lib/rack/file.rb#L24 https://github.com/rack/rack/blob/master/lib/rack/file.rb#L24 M actionpack/lib/action_dispatch/middleware/static.rb commit 0f8f75c refs/heads/master Author: Nihad Abbasov Date: 2013-01-08 14:48:13 +0400 set 'alt' attribute for image_submit_tag M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/form_tag_helper.rb M actionpack/test/template/form_tag_helper_test.rb commit c67005f refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-12 00:20:07 -0200 Do not generate local vars for partials without object or collection Previously rendering a partial without giving :object or :collection would generate a local variable with the partial name by default. This was noticed due to warnings in Ruby 2.0 of not used variables, which turned out to be the generation of not used variables inside partials that do not contain objects related to them. M actionpack/CHANGELOG.md M actionpack/lib/action_view/renderer/partial_renderer.rb A actionpack/test/fixtures/test/_partial_name_local_variable.erb M actionpack/test/template/render_test.rb commit 77516a7 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-08 01:28:23 -0200 Ignore binds payload with nil column in AR log subscriber Some tests were raising the following error: Could not log "sql.active_record" event. NoMethodError: undefined method `type' for nil:NilClass` Due to the way binds were being logged, the column info was considered always present, but that is not true for some of the tests listed in the issue. Closes #8806. M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/log_subscriber_test.rb commit de21da5 refs/heads/master Merge: e3aa78a d9a9d31 Author: Andrew White Date: 2013-01-08 02:56:59 -0800 Merge pull request #8800 from acapilleri/primary_key refactor reset_primary_key and change !blank? to present? in get_primary... commit e3aa78a refs/heads/master Merge: 3e71f57 c7f6081 Author: Carlos Antonio da Silva Date: 2013-01-08 02:56:08 -0800 Merge pull request #8808 from tricknotes/use-absolute-path Use absolute path [ci skip] commit c7f6081 refs/heads/master Author: Ryunosuke SATO Date: 2013-01-07 18:22:05 +0900 Use absolute path It is semantically correct than relative path. M railties/lib/rails/templates/rails/welcome/index.html.erb commit d39d878 refs/tags/v3.2.15 Author: Vasiliy Ermolovich Date: 2012-05-06 23:33:12 +0300 Wrap time ranges with timezones, closes #8807 (cherry picked from commit e2e513621d732abb8efff9120bd9a444836720d6) (cherry picked from commit dcdde7da481e11660634278a8004175a1ce20f39) Backport of #6183, original issue was #6179 Conflicts: activesupport/lib/active_support/core_ext/time/calculations.rb activesupport/test/core_ext/time_ext_test Signed-off-by: Andrew White M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/core_ext/date_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 109a1b3 refs/heads/master Author: Mark J. Titorenko Date: 2013-01-08 10:07:04 +0000 Revert cb3181e - no longer required. M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb commit fc66b6b refs/heads/master Author: Mark J. Titorenko Date: 2013-01-08 10:06:14 +0000 Fix CookieStore middleware inheritance hierarchy s.t. it inherits from Rack::Session::Abstract::ID rather than Rack::Session::Cookie. M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit d9a9d31 refs/heads/master Author: Angelo capilleri Date: 2013-01-08 09:50:38 +0100 change unless !blank? to if blank? in get_primary_key M activerecord/lib/active_record/attribute_methods/primary_key.rb commit 3e71f57 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-07 23:51:57 -0500 Don't configure Turn output, we aren't using it since 3.2.0 M railties/lib/rails/test_help.rb commit 4200614 refs/heads/master Merge: cb3181e bc95767 Author: Guillermo Iguaran Date: 2013-01-07 20:19:21 -0800 Merge pull request #8801 from ktheory/dont_require_turn Don't require 'turn' from rails/test_help commit 4d5f950 refs/tags/v3.1.10 Author: Santiago Pastorino Date: 2013-01-08 00:25:24 -0200 Avoid Rack security warning no secret provided This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie." M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb commit d9a0480 refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2013-01-08 00:25:24 -0200 Avoid Rack security warning no secret provided This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie." M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb commit cb3181e refs/heads/master Author: Santiago Pastorino Date: 2013-01-08 00:25:24 -0200 Avoid Rack security warning no secret provided This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie." M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb commit cab6ba4 refs/heads/master Author: Doug Yun Date: 2013-01-07 20:43:11 -0500 Correct method notation for #acts_like? [ci skip] M activesupport/lib/active_support/core_ext/object/acts_like.rb commit d99e8c9 refs/heads/master Author: Aaron Patterson Date: 2013-01-04 12:02:22 -0800 * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb M actionpack/lib/action_dispatch/http/request.rb M actionpack/lib/action_dispatch/middleware/params_parser.rb M actionpack/test/dispatch/request/json_params_parsing_test.rb M actionpack/test/dispatch/request/xml_params_parsing_test.rb M activerecord/test/cases/relation/where_test.rb commit fa3f51f refs/heads/master Merge: b4ac65a 2651810 Author: Guillermo Iguaran Date: 2013-01-07 17:08:37 -0800 Merge pull request #8802 from claudiob/patch-1 Update guides/source/getting_started.md [ci skip] commit b4ac65a refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-07 22:51:16 -0200 Initialize instance variable to remove warning actions.rb:34: warning: instance variable @in_group not initialized M railties/lib/rails/generators/actions.rb commit a0730e0 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-07 22:31:11 -0200 Fix readme tests Related to the change introduced in 6cf47c533d7d6784d34fc31406a335555e0c32b8. M railties/test/generators/actions_test.rb commit 9b6de9c refs/heads/master Author: Akira Matsuda Date: 2013-01-08 08:51:18 +0900 Reset test data, and fix bug that the inserted data were not actually selected M activerecord/test/cases/adapters/postgresql/datatype_test.rb commit c0b49cf refs/heads/master Author: Akira Matsuda Date: 2013-01-08 08:06:25 +0900 Reset AR::Migration.verbose change to avoid depending on test run order M activerecord/test/cases/migrator_test.rb commit c75b5a8 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-07 21:39:10 -0200 Refactor write attribute logic to convert number column value This is an improvement for issue #8673: "Comparing a BigDecimal to true/false on write_attribute is slow" It seems to be an issue with Ruby itself, related to the "coerce" method being called in TrueClass/FalseClass due to the == condition, triggering method_missing, then raising a NameError that's later catched. This issue was also opened in Ruby tracker: https://bugs.ruby-lang.org/issues/7645. This refactoring avoid the coerce call by using a case statement, which gives us better readability as well. A simple benchmark: ---------- require 'benchmark/ips' require 'bigdecimal' Benchmark.ips do |x| x.report("== true") { BigDecimal('3') == true } x.report("TrueClass") { TrueClass === BigDecimal('3') } x.report("== 0") { BigDecimal('3') == 0 } x.report("Numeric") { Numeric === BigDecimal('3') } end Calculating ------------------------------------- == true 6427 i/100ms TrueClass 47297 i/100ms == 0 35923 i/100ms Numeric 55530 i/100ms ------------------------------------------------- == true 75878.5 (±21.6%) i/s - 359912 in 5.004392s TrueClass 1249547.0 (±13.1%) i/s - 6148610 in 5.035964s == 0 666856.3 (±13.3%) i/s - 3268993 in 5.013789s Numeric 1269300.9 (±11.3%) i/s - 6274890 in 5.028458s ---------- Master has a very different implementation, and there are apparently no similar conversions at this point, it's mainly delegated to the column type cast, but I'll check if something needs to be changed there as well. Closes #8673. M activerecord/lib/active_record/attribute_methods/write.rb commit 6cf47c5 refs/heads/master Author: Xavier Noria Date: 2013-01-08 00:50:12 +0100 new README generated for new apps M guides/code/getting_started/README.rdoc M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/templates/README commit 553b695 refs/heads/master Author: Xavier Noria Date: 2013-01-08 00:16:19 +0100 doc/README_FOR_APP is no longer generated D guides/code/getting_started/doc/README_FOR_APP M guides/source/getting_started.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/app_generator.rb D railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP M railties/lib/rails/tasks/documentation.rake M railties/test/generators/app_generator_test.rb commit 9c5fb00 refs/heads/master Author: Xavier Noria Date: 2013-01-07 23:27:53 +0100 let the rails gem ship with the README The doc:rails application rake task needs this README. M rails.gemspec commit 9bc5e65 refs/tags/v3.2.15 Author: Noah Silas Date: 2012-06-08 18:11:58 -0700 Fix javascript_include_tag when no js runtime is available In a production environment where the assets have been precompiled, we don't want an assets compile step to happen on the application server at all. To ensure this, a js runtime may not be available on the app servers. In this environment, pages using javascript_include_tag for assets with non-standard or chained extensions were throwing 500 errors. For instance, `javascript_include_tag('jquery.min')` would blow up. Sprockets was attempting to build the assets being included during the rewrite_extension step (responsible for appending a '.js' extension to assets being included by the basename rather than a fully qualified name). This was happening as a step to resolve #6310, which required checking for the presence of an asset with a non-standard extension before appending the extension. We can check for the presence of an asset without invoking the asset build step by using Sprockets' resolve method, which will search for the base file without building it (and is the method that find_asset uses internally to get the path to the asset before attempting to build it). When rewriting the extension on an asset, these are the steps: - If the source does not have an extension, assume that the default extension is desired and append it. - If there is an extension and it doesn't match the default extension, check to see if a file with the precise name specified exists amongst the assets; if it is present, do not append the default extension. (This is the step that resolves #6310). M actionpack/CHANGELOG.md M actionpack/lib/sprockets/helpers/rails_helper.rb M actionpack/test/template/sprockets_helper_test.rb commit 3aebe13 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-07 21:37:02 -0200 Remove not used variable in eager test M activerecord/test/cases/associations/eager_test.rb commit 040ff5b refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-07 21:22:43 -0200 Fix named scope + class method example Closes #8804 [ci skip] Conflicts: activerecord/lib/active_record/scoping/named.rb M activerecord/lib/active_record/scoping/named.rb commit 8242345 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-07 21:22:43 -0200 Fix named scope + class method example Closes #8804 [ci skip] M activerecord/lib/active_record/scoping/named.rb commit efbb041 refs/heads/master Merge: 1ce304f 2aa08e3 Author: Carlos Antonio da Silva Date: 2013-01-07 15:09:31 -0800 Merge pull request #8803 from frodsan/sp_docs Improve StrongParameters documentation [ci skip] commit 1ce304f refs/heads/master Merge: ded5f5b af660ee Author: Xavier Noria Date: 2013-01-07 13:54:19 -0800 Merge pull request #8773 from goshakkk/guides-page-titles Place article name in the beginning of guides page title commit ded5f5b refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-12 23:27:10 -0200 Revert some warning removals related to Ruby 2.0 These warnings were actually a bug in Ruby 2.0, the accessors should not be raising such warnings, they are only meant for ivars. - Revert "fix warnings in Ruby 2.0" This reverts commit 26702a6d3461f4a1c75165030b96886514ecb877. - Revert "Merge pull request #8282 from arunagw/warning_removed_for_ruby2" This reverts commit f63d6544e45e78cda29c0c56fbdf3d9e1f405340, reversing changes made to 3a890681fad8218305585036abed6d7463a44e41. M activesupport/lib/active_support/core_ext/date/calculations.rb M activesupport/lib/active_support/core_ext/time/zones.rb M railties/lib/rails/engine.rb commit 2aa08e3 refs/heads/master Author: Francesco Rodriguez Date: 2013-01-07 16:18:06 -0500 improve StrongParameters documentation [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 2651810 refs/heads/master Author: Claudio B. Date: 2013-01-07 13:07:23 -0800 Update guides/source/getting_started.md Reflect change in 009873a that renamed the script/ folder to bin/ M guides/source/getting_started.md commit bc95767 refs/heads/master Author: Aaron Suggs Date: 2013-01-07 14:51:38 -0500 Don't require 'turn' from rails/test_help If 'turn' is in the Gemfile with `:require => nil`, Rails should respect that. This supports the case where 'turn' may or may not be required depending on different developers' preference or environment. E.g., you require turn for local testing, but not on your CI server by putting this in `test/test_helper.rb`: require 'turn' if ENV['TURN'] M railties/lib/rails/test_help.rb commit 94a636f refs/heads/master Author: Akira Matsuda Date: 2013-01-08 02:04:29 +0900 Instance_variable_names are strings. That is the most important information IMO M activesupport/lib/active_support/core_ext/object/instance_variables.rb commit e274db9 refs/heads/master Merge: 411de5a ae1f86f Author: Steve Klabnik Date: 2013-01-07 06:40:16 -0800 Merge pull request #8799 from goshakkk/ivar-readers Access ivars via instance reader methods for consistency commit ae1f86f refs/heads/master Author: Gosha Arinich Date: 2013-01-07 16:09:22 +0300 access `@path` and `@routes` via reader methods in journey M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/routes.rb commit 411de5a refs/heads/master Merge: e63e280 a7f9c59 Author: José Valim Date: 2013-01-07 05:01:50 -0800 Merge pull request #8798 from goshakkk/show-exceptions-begin-rescue Refactor ShowExceptions' #call to use def-rescue instead of begin-rescue commit a7f9c59 refs/heads/master Author: Gosha Arinich Date: 2013-01-07 15:58:55 +0300 refactor ShowExceptions' #call to use def-rescue instead of begin-rescue M actionpack/lib/action_dispatch/middleware/show_exceptions.rb commit 1907409 refs/heads/master Author: Gosha Arinich Date: 2013-01-07 12:27:19 +0300 more woring improvements to the engines guide * "also in ... is ..." -> "in .. there is ..." * use "as well" instead of "also" in the end of the sentence * "has the ability" -> "can" M guides/source/engines.md commit a8d4e27 refs/heads/master Author: Gosha Arinich Date: 2013-01-07 12:14:02 +0300 improve wording of the engines guide * "very minor" -> "subtle" * reword successive sentences so that they don't begin with the same word ("this") * "also" is not used in the end of the sentence, use "as well" instead * "the reason is because" -> "the reason is that" M guides/source/engines.md commit e63e280 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-07 10:13:47 +0100 Use similar comment style M railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb M railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt commit 0acf921 refs/heads/master Author: Gosha Arinich Date: 2013-01-07 11:47:27 +0300 prefer american spelling of 'behavior' M actionpack/lib/action_controller/metal/strong_parameters.rb M activemodel/lib/active_model/attribute_methods.rb M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/deprecated_dynamic_methods_test.rb M activesupport/lib/active_support/core_ext/array/conversions.rb M activesupport/lib/active_support/json/encoding.rb M guides/source/configuring.md M guides/source/engines.md M guides/source/i18n.md M guides/source/layouts_and_rendering.md M guides/source/nested_model_forms.md commit f5da2e8 refs/heads/master Merge: 2c9d129 d73cc03 Author: Xavier Noria Date: 2013-01-07 00:33:45 -0800 Merge pull request #8788 from goshakkk/remove-begin-rescue Remove begin-rescue in favor of def-rescue commit 2c9d129 refs/heads/master Author: Jeremy Kemper Date: 2013-01-06 21:53:30 -0700 Take the heat :fire: M railties/CHANGELOG.md commit 41abe92 refs/heads/master Merge: 19b52d3 009873a Author: Jeremy Kemper Date: 2013-01-06 20:44:17 -0800 Merge pull request #8786 from jeremy/executables Introduce ./bin for your app's executables: bin/bundle, bin/rails, bin/rake commit 009873a refs/heads/master Author: Jeremy Kemper Date: 2013-01-06 16:13:47 -0700 Introduce ./bin for your app's executables: bin/bundle, bin/rails, bin/rake. Executable scripts are versioned code like the rest of your app. To generate a stub for a bundled gem: 'bundle binstubs unicorn' and 'git add bin/unicorn' M guides/source/4_0_release_notes.md M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/engines.md M guides/source/initialization.md M railties/CHANGELOG.md A railties/lib/rails/app_rails_loader.rb M railties/lib/rails/cli.rb M railties/lib/rails/commands.rb M railties/lib/rails/commands/runner.rb M railties/lib/rails/generators/actions.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/app/templates/README A railties/lib/rails/generators/rails/app/templates/bin/bundle A railties/lib/rails/generators/rails/app/templates/bin/rails A railties/lib/rails/generators/rails/app/templates/bin/rake D railties/lib/rails/generators/rails/app/templates/script/rails M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb A railties/lib/rails/generators/rails/plugin_new/templates/bin/rails.tt D railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt D railties/lib/rails/script_rails_loader.rb M railties/lib/rails/source_annotation_extractor.rb M railties/lib/rails/tasks/framework.rake A railties/test/app_rails_loader_test.rb M railties/test/application/generators_test.rb M railties/test/application/rake/notes_test.rb M railties/test/generators/actions_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/plugin_new_generator_test.rb M railties/test/generators/shared_generator_tests.rb M railties/test/isolation/abstract_unit.rb D railties/test/script_rails_loader_test.rb commit 19b52d3 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-06 23:01:28 -0300 Use whitelist to pass valid connection parameters to PGConn. All the valids parameters for libpq are used. See http://www.postgresql.org/docs/9.1/static/libpq-connect.html for the full list Fixes #8784 M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 831aad2 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-06 22:14:25 -0300 connection_parameters is an Array and will never have prepared_statements as value M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit d73cc03 refs/heads/master Author: Gosha Arinich Date: 2013-01-07 03:47:49 +0300 remove begin-rescue in favor of def-rescue M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit cc24eba refs/heads/master Author: Rafael Mendonça França Date: 2013-01-06 21:54:46 -0300 Fix operators precedence issue M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit ea26229 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-06 21:31:38 -0300 Remove the configuration key in the correct place M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit dc4b4c4 refs/heads/master Merge: fb7c093 f3101fd Author: Rafael Mendonça França Date: 2013-01-06 16:00:14 -0800 Merge pull request #8787 from tank-bohr/master masgn and response variable commit fb7c093 refs/heads/master Merge: 813e4cc c445b07 Author: Rafael Mendonça França Date: 2013-01-06 15:49:33 -0800 Merge pull request #8785 from goshakkk/refactor-debug-exceptions Refactor DebugExceptions commit c445b07 refs/heads/master Author: Gosha Arinich Date: 2013-01-07 01:52:50 +0300 refactor DebugExceptions by combining two conditionals into one M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit f3101fd refs/heads/master Author: tank-bohr Date: 2013-01-07 03:37:06 +0400 return multiple assingment and response variable M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit 80343f6 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-06 20:30:10 -0300 Test only with Ruby 1.9+ M activerecord/test/cases/column_test.rb commit 813e4cc refs/heads/master Author: Akira Matsuda Date: 2013-01-07 08:23:15 +0900 Fix failing test under sqlite3 M activerecord/test/cases/migration_test.rb commit 3c21237 refs/heads/master Author: Akira Matsuda Date: 2013-01-07 07:36:11 +0900 Reduce number of Strings a bit M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_dispatch/middleware/show_exceptions.rb M activemodel/lib/active_model/validations/clusivity.rb M activemodel/lib/active_model/validations/numericality.rb commit c8e632b refs/heads/master Author: Akira Matsuda Date: 2013-01-07 06:00:10 +0900 Namespace HashWithIndifferentAccess M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/lib/action_dispatch/http/upload.rb M actionpack/test/controller/url_for_test.rb M activemodel/lib/active_model/dirty.rb M activerecord/lib/active_record/store.rb M activerecord/test/cases/nested_attributes_test.rb M activerecord/test/cases/store_test.rb M activesupport/test/core_ext/hash_ext_test.rb M guides/source/action_controller_overview.md M guides/source/getting_started.md commit 033248b refs/heads/master Author: Akira Matsuda Date: 2013-01-07 05:42:08 +0900 Needs to reset SchemaMigration first, or the tests fail in sqlite3 M activerecord/test/cases/ar_schema_test.rb commit 4bfcae0 refs/heads/master Merge: 699bae6 2467ec8 Author: Rafael Mendonça França Date: 2013-01-06 14:30:35 -0800 Merge pull request #8783 from goshakkk/refactor-journey-routes Refactor Journey::Routes commit 2467ec8 refs/heads/master Author: Gosha Arinich Date: 2013-01-07 00:54:13 +0300 refactor Journey::Routes * prefer do-end for multiline blocks * prefer or-equals over returns with checks M actionpack/lib/action_dispatch/journey/routes.rb commit 699bae6 refs/heads/master Merge: 9ee65aa 8f18550 Author: Rafael Mendonça França Date: 2013-01-06 14:11:23 -0800 Merge pull request #8782 from tank-bohr/master doesn't work with rubinius commit 8f18550 refs/heads/master Author: tank-bohr Date: 2013-01-07 01:19:06 +0400 fix for rbx Rubinius returns a boolean after such assingment response = (_, headers, body = @app.call(env)) see https://github.com/rubinius/rubinius/issues/2117 get rid of a local variable M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit 7945661 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-06 18:43:48 -0300 Remove warnings M activerecord/test/cases/persistence_test.rb commit c147dd7 refs/tags/v3.2.15 Author: Tristan Harward Date: 2013-01-06 15:39:09 -0500 Fix error when assigning NaN to an integer column Also covers any non-castable case by returning nil, which is in-line with the intention of the former implementation, but covers the odd cases which respond to to_i but raise an error when it's called, such as NaN, Infinity and -Infinity. Fixes #8757 Backport of #8781 Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/column_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/column_test.rb commit 9ee65aa refs/heads/master Merge: 85afc11 807e176 Author: Rafael Mendonça França Date: 2013-01-06 13:15:56 -0800 Merge pull request #8781 from trisweb/tristan_8757_integer_column_nan_error_fix Fix error raised when assigning NaN to an integer column commit 807e176 refs/heads/master Author: Tristan Harward Date: 2013-01-06 15:39:09 -0500 Fix error when assigning NaN to an integer column Also covers any non-castable case by returning nil, which is in-line with the intention of the former implementation, but covers the odd cases which respond to to_i but raise an error when it's called, such as NaN, Infinity and -Infinity. Fixes #8757 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/column_test.rb commit 85afc11 refs/heads/master Author: Akira Matsuda Date: 2013-01-06 18:40:12 +0900 Missing require M activerecord/lib/active_record/inheritance.rb commit 24a202a refs/heads/master Author: Akira Matsuda Date: 2013-01-06 21:58:48 +0900 These are already required through AS/rails * dependencies/autoload * concern * deprecation M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/delegation.rb commit d6c732f refs/heads/master Merge: 7d36513 e63a97d Author: Yehuda Katz Date: 2013-01-06 10:57:51 -0800 Merge pull request #8263 from senny/refactor_plugin_new_generator refactor the naming within plugin new generator commit 046e27a refs/tags/v4.0.0.beta1 Author: Bogdan Gusiev Date: 2013-01-06 18:59:27 +0200 Simplify code in AS json encoder M activesupport/lib/active_support/json/encoding.rb commit 7d36513 refs/heads/master Merge: cea4f76 5322a3e Author: Xavier Noria Date: 2013-01-06 08:14:59 -0800 Merge pull request #8770 from goshakkk/guides-img-fix Fix img width in guides commit cea4f76 refs/heads/master Merge: 2f8e5f6 7003e71 Author: Carlos Antonio da Silva Date: 2013-01-06 07:31:44 -0800 Merge pull request #8780 from diogomafra/require_core_ext Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module When requiring 'active_support/core_ext', the following error is raised: undefined method `alias_method_chain' for Date:Class (NoMethodError) Adding the missing require to this module fixes the problem. commit 7003e71 refs/heads/master Author: Diogo Mafra Date: 2013-01-06 13:04:04 -0200 Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module M activesupport/lib/active_support/core_ext/infinite_comparable.rb commit 2f8e5f6 refs/heads/master Author: Akira Matsuda Date: 2013-01-06 18:38:42 +0900 Needless requires M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/routing/inspector_test.rb commit 5fd143e refs/heads/master Author: Akira Matsuda Date: 2013-01-06 23:58:48 +0900 Missing requires M actionpack/lib/action_dispatch/testing/assertions/routing.rb M actionpack/test/dispatch/routing/inspector_test.rb commit 15bd0f6 refs/heads/master Author: Akira Matsuda Date: 2013-01-06 23:57:25 +0900 These are already required through AS/rails * core_ext/object/blank * concern * core_ext/class/attribute * deprecation M actionpack/lib/action_controller/metal/conditional_get.rb M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/record_identifier.rb M actionpack/lib/action_view/template.rb M actionpack/lib/action_view/template/types.rb commit 15971c3 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-06 11:27:35 -0200 Rescue from LoadError when trying to load the debugger gem for console Avoid swallowing all exceptions that might happen when requiring debugger, just catch a LoadError if it cannot be loaded. Check for more background: https://github.com/rails/rails/commit/28fd867c9bc790636d37a28f288791cd0089a6fd#commitcomment-2386952 M railties/lib/rails/commands/console.rb commit b8d9319 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-06 11:22:25 -0200 Rename route_wrapper partial layout to table It is used by the table formatter only, and it's already inside a routes directory that namespaces it properly, so calling it just "table" seems simpler. D actionpack/lib/action_dispatch/middleware/templates/routes/_route_wrapper.html.erb A actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb M actionpack/lib/action_dispatch/routing/inspector.rb commit 3abb768 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-06 11:19:24 -0200 Move table routes formatter class to the inspector and rename it It feels more consistent to have this class called "HtmlTableFormatter", and to have it here with the routes inspector and console formatter, since it's used for both routing error exceptions and the rails info page. M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb M actionpack/lib/action_dispatch/routing/inspector.rb M railties/lib/rails/templates/rails/info/routes.html.erb commit 756188b refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-05 12:21:34 -0200 Do not call fields_for from form_for, to avoid instantiating two builders Conflicts: actionpack/lib/action_view/helpers/form_helper.rb actionpack/test/template/form_helper_test.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/test/template/form_helper_test.rb commit f180784 refs/heads/master Merge: 7843e00 7a439d2 Author: Andrew White Date: 2013-01-06 05:00:54 -0800 Merge pull request #8777 from goshakkk/delegate-class Delegate to :class rather than 'self.class' commit 7843e00 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-03 01:15:12 -0200 Refactor the logic that checks whether or not to emit the hidden id field By checking for object.persisted? first, we avoid the hash lookups for new objects. M actionpack/lib/action_view/helpers/form_helper.rb commit e56e3db refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-03 01:11:10 -0200 Move the hidden :id field logic to where it belongs to When dealing with nested forms, Rails automatically generates a hidden field with the id value of the current object being generated by fields_for. This logic was inside the method that's available from the template object, but we just need it when really dealing with nested attributes, so moving the code to here makes more sense. M actionpack/lib/action_view/helpers/form_helper.rb commit 04338b9 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-03 00:57:55 -0200 Eliminate the usage of parent_builder option from form_for Just use it internally from fields_for until we come up with a better solution. M actionpack/lib/action_view/helpers/form_helper.rb commit 115a37d refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 12:21:34 -0200 Do not call fields_for from form_for, to avoid instantiating two builders M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/test/template/form_helper_test.rb commit 94ecbb7 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-06 10:52:36 -0200 Refactor to not call path.ast twice M actionpack/lib/action_dispatch/journey/route.rb commit 706fb01 refs/heads/master Merge: a46e5ff c730bef Author: Carlos Antonio da Silva Date: 2013-01-06 04:49:44 -0800 Merge pull request #8779 from goshakkk/refactor-route-ast Refactor Route#ast to use or-equals and block, instead of return with a check commit c730bef refs/heads/master Author: Gosha Arinich Date: 2013-01-06 15:38:00 +0300 refactor Route#ast to use or-equals and block, instead of return with a cond M actionpack/lib/action_dispatch/journey/route.rb commit a46e5ff refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-06 10:37:22 -0200 Improve javascript in welcome page [ci skip] M railties/lib/rails/templates/rails/welcome/index.html.erb commit e05a504 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-06 12:42:51 +0100 This is not that common of a change to warrant top-line billing and you should read more about the consequences than just toggling a boolean to make best use of it M railties/lib/rails/generators/rails/app/templates/config/application.rb commit 26365d0 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-06 12:23:19 +0100 Include the standard reminder that you need to restart for changes in config/initializers to take effect M railties/lib/rails/generators/rails/app/templates/config/initializers/filter_parameter_logging.rb M railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb commit 7a439d2 refs/heads/master Author: Gosha Arinich Date: 2013-01-06 12:43:30 +0300 delegate to :class rather than 'self.class' M actionpack/lib/abstract_controller/layouts.rb M actionpack/lib/action_view/template/resolver.rb M guides/source/active_support_core_extensions.md M railties/lib/rails/engine.rb M railties/lib/rails/railtie.rb commit 253cdc8 refs/tags/v4.0.0.beta1 Author: Akira Matsuda Date: 2013-01-06 15:58:58 +0900 Update generated app's README [ci skip] * a controller that destroying Weblogs might be WeblogsController * a controller that indexing Posts might be PostsController * Post.all returns a Relation * modernize Model.inspect results M railties/lib/rails/generators/rails/app/templates/README commit 70ae89c refs/tags/v4.0.0.beta1 Author: Akira Matsuda Date: 2013-01-05 14:45:18 +0900 Remove unnecessary begin..rescue..end, use only rescue M actionpack/lib/action_dispatch/testing/assertions/routing.rb M actionpack/lib/action_view/helpers/debug_helper.rb M actionpack/test/abstract/abstract_controller_test.rb M actionpack/test/abstract/helper_test.rb M actionpack/test/controller/filters_test.rb M actionpack/test/controller/render_test.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb M activerecord/test/cases/adapters/mysql2/schema_test.rb M activerecord/test/cases/base_test.rb M activesupport/lib/active_support/core_ext/kernel/reporting.rb M activesupport/lib/active_support/core_ext/marshal.rb M activesupport/lib/active_support/inflector/methods.rb M activesupport/test/core_ext/duration_test.rb M activesupport/test/dependencies_test.rb commit 3e8134a refs/tags/v4.0.0.beta1 Author: Akira Matsuda Date: 2013-01-06 15:36:23 +0900 The controller generator invokes assets generator in addition M railties/lib/rails/generators/rails/controller/USAGE commit dc88d71 refs/tags/v4.0.0.beta1 Author: Akira Matsuda Date: 2013-01-06 15:14:08 +0900 Fix generated migration file name in model generator USAGE M railties/lib/rails/generators/rails/model/USAGE commit 930646b refs/tags/v4.0.0.beta1 Author: Akira Matsuda Date: 2013-01-06 14:42:46 +0900 Update mailer generator USAGE * it does not generate fixtures * it generates .text.erb templates M actionmailer/lib/rails/generators/mailer/USAGE commit bdffd1e refs/heads/master Merge: 2516a1d 732d350 Author: Carlos Antonio da Silva Date: 2013-01-05 16:26:52 -0800 Merge pull request #8774 from goshakkk/multiline-block-do-end Prefer do-end for multiline block [ci skip] commit 09626e2 refs/heads/master Author: Tim Raymond Date: 2013-01-05 18:56:27 -0500 The plural of apparatus is apparatuses M guides/source/getting_started.md commit 732d350 refs/heads/master Author: Gosha Arinich Date: 2013-01-06 01:57:03 +0300 prefer do-end for multiline block M guides/source/initialization.md M guides/source/rails_on_rack.md M railties/lib/rails/commands.rb commit af660ee refs/heads/master Author: Gosha Arinich Date: 2013-01-06 01:46:30 +0300 place article name in the beginning of guides page title M guides/rails_guides/markdown.rb commit 2516a1d refs/heads/master Merge: 9665f5e 76ab8be Author: Rafael Mendonça França Date: 2013-01-05 14:34:40 -0800 Merge pull request #8772 from goshakkk/guides-warning-fix Fix guides' warning bottom padding commit 76ab8be refs/heads/master Author: Gosha Arinich Date: 2013-01-06 01:18:21 +0300 fix guides' warning bottom padding M guides/assets/stylesheets/main.css commit 9665f5e refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 18:13:10 -0300 Remove the content_tag_for change from CHANGELOG since it was reverted M railties/CHANGELOG.md commit 0836b74 refs/heads/master Author: Chase DuBois Date: 2013-01-05 13:03:26 -0800 HTTP 302 means Found, not Moved M actionpack/lib/action_controller/metal/redirecting.rb commit 740c4e2 refs/heads/master Merge: 688dde2 d0676ad Author: Steve Klabnik Date: 2013-01-05 13:02:45 -0800 Merge pull request #8771 from lucasmazza/unobtrusive-javascript-examples New code examples on "Working with JavaScript in Rails" guide. commit d0676ad refs/heads/master Author: Lucas Mazza Date: 2013-01-05 18:12:39 -0200 Update some code examples on the "Working with JavaScript in Rails" guide. M guides/source/working_with_javascript_in_rails.md commit 688dde2 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 16:50:15 -0300 Fix documentation to content_tag_for [ci skip] M actionpack/lib/action_view/helpers/record_tag_helper.rb commit 23714ec refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 15:41:39 -0300 Move config.filter_parameters to you own initializer file This is very rarely changed and does not deserve to be in application.rb M railties/lib/rails/generators/rails/app/templates/config/application.rb A railties/lib/rails/generators/rails/app/templates/config/initializers/filter_parameter_logging.rb M railties/test/application/configuration_test.rb commit 1506d4d refs/tags/v3.2.15 Author: James Coglan Date: 2013-01-05 14:52:02 +0000 Remove suggestion that Procs can be used as session secrets. (cherry picked from commit 6500d7994e94af439587ba0b6088b14532940ad2) [ci skip] Signed-off-by: Andrew White M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit fa6e995 refs/heads/master Merge: 516f148 6500d79 Author: Andrew White Date: 2013-01-05 10:30:30 -0800 Merge pull request #8766 from jcoglan/session_token_docs Remove suggestion that Procs can be used as session secrets. [ci skip] commit 11f74f0 refs/heads/master Author: Gosha Arinich Date: 2013-01-05 20:08:55 +0300 wrap terminal prompt marks in a pre tag M guides/source/getting_started.md commit 516f148 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-05 19:06:48 +0100 Needless fancy structure that did not anything M railties/lib/rails/generators/erb/scaffold/templates/index.html.erb commit 89979ca refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 15:04:15 -0300 Assert config.filter_parameters should be able to be set in a initializer M railties/test/application/configuration_test.rb commit f17a631 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-05 19:05:05 +0100 Fix indention issue in generated template M railties/lib/rails/generators/erb/scaffold/templates/index.html.erb commit f2c0e57 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-05 18:47:36 +0100 Fix indention issue in generated template M railties/lib/rails/generators/erb/scaffold/templates/index.html.erb commit 5322a3e refs/heads/master Author: Gosha Arinich Date: 2013-01-05 20:16:31 +0300 fix img width in guides M guides/assets/stylesheets/main.css commit cbabd1b refs/heads/master Merge: 3d08614 947e1d5 Author: David Heinemeier Hansson Date: 2013-01-05 09:07:56 -0800 Merge pull request #8769 from senny/deprecate_assert_blank deprecate `assert_blank` and `assert_present`. commit 947e1d5 refs/heads/master Author: Yves Senn Date: 2013-01-05 17:59:36 +0100 deprecate `assert_blank` and `assert_present`. They don't add any benefits over `assert object.blank?` and `assert object.present?` M actionpack/test/controller/action_pack_assertions_test.rb M actionpack/test/controller/output_escaping_test.rb M actionpack/test/controller/render_test.rb M actionpack/test/controller/request_forgery_protection_test.rb M actionpack/test/controller/test_case_test.rb M actionpack/test/template/atom_feed_helper_test.rb M activerecord/test/cases/associations/join_model_test.rb M activerecord/test/cases/deprecated_dynamic_methods_test.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/cases/relations_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/testing/assertions.rb M activesupport/test/caching_test.rb M activesupport/test/deprecation_test.rb M activesupport/test/test_test.rb M guides/source/4_0_release_notes.md commit 2585259 refs/heads/master Author: Gosha Arinich Date: 2013-01-05 20:04:40 +0300 proper article in the getting started guide M guides/source/getting_started.md commit 3d08614 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-05 18:03:24 +0100 No need to give an example where there is generated code right there to serve as the example M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit 4017f6c refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 14:00:43 -0300 Make sure assets is disable when --skip-sprockets is used M railties/test/generators/app_generator_test.rb commit 201f8d7 refs/heads/master Author: David Heinemeier Hansson Date: 2013-01-05 17:55:57 +0100 config.assets.enabled is now true by default M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/test/generators/app_generator_test.rb commit fada87e refs/heads/master Merge: 0aadca2 434d9cb Author: Guillermo Iguaran Date: 2013-01-05 08:22:27 -0800 Merge pull request #8768 from goshakkk/about-env-toggling Allow toggling "about app's env", not just showing commit 434d9cb refs/heads/master Author: Gosha Arinich Date: 2013-01-05 19:13:14 +0300 allow toggling about env, not just showing M railties/lib/rails/templates/rails/welcome/index.html.erb commit 0aadca2 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 13:45:43 -0200 Remove warning, remove not used variable, and make methods private Warning: "shadowing outer local variable - routes". M actionpack/lib/action_dispatch/routing/inspector.rb commit 6500d79 refs/heads/master Author: James Coglan Date: 2013-01-05 14:52:02 +0000 Remove suggestion that Procs can be used as session secrets. M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit c1eaff0 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 12:02:18 -0200 Close container div tag in routing error page M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb commit 60e809c refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 11:57:13 -0200 Move style to head to make routes page valid html5 M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb M actionpack/lib/action_dispatch/middleware/templates/routes/_route_wrapper.html.erb M railties/lib/rails/templates/layouts/application.html.erb commit 8202353 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 11:52:04 -0200 Redirect using action hash instead of hardcoding full route M railties/lib/rails/info_controller.rb commit f2caf6e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 11:48:50 -0200 Change Rails Info controller to use the new table routes formatter M railties/lib/rails/info_controller.rb M railties/lib/rails/templates/rails/info/routes.html.erb commit 6cc4246 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 11:42:23 -0200 Action Pack changelog improvements [ci skip] M actionpack/CHANGELOG.md commit a6cec6e refs/heads/master Merge: 1e1c7af 80795e0 Author: Carlos Antonio da Silva Date: 2013-01-05 05:41:13 -0800 Merge pull request #8658 from senny/8649_unify_routes_output_for_console_and_web Unify routes output for console and web, ensure engine routes are shown in html routes table. Closes #8649. commit 80795e0 refs/heads/master Author: Yves Senn Date: 2013-01-05 13:59:00 +0100 display mountable engine routes on RoutingError. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb M actionpack/test/dispatch/debug_exceptions_test.rb commit af5c0fd refs/heads/master Author: Yves Senn Date: 2012-12-30 15:04:09 +0100 split formatting concerns from RoutesInspector M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/test/dispatch/routing/inspector_test.rb M railties/lib/rails/tasks/routes.rake commit 1e1c7af refs/heads/master Merge: a8637c8 eb34327 Author: Carlos Antonio da Silva Date: 2013-01-05 04:07:09 -0800 Merge pull request #8737 from tricknotes/info-page-style Fix info page style [ci skip] commit a8637c8 refs/heads/master Merge: 7a34e0b d60ed3d Author: Carlos Antonio da Silva Date: 2013-01-05 04:03:01 -0800 Merge pull request #8765 from mmb/join_table_usage Add join table migration generator to usage help. [ci skip] commit 7a34e0b refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-05 09:45:12 -0200 Remove warning "ambiguous first argument" M railties/test/application/configuration_test.rb commit 68782c1 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-04 23:51:08 -0200 Use better variable names for ltree tests, remove instance variable M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/cases/adapters/postgresql/ltree_test.rb commit 0102c81 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 07:04:42 -0300 Rename the last occurrence of UnexpectedParameters M actionpack/test/controller/parameters/raise_on_unpermitted_parameters_test.rb commit 18ac587 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 07:01:51 -0300 Wrong copy and paste :bomb: [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit a135f37 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 07:59:26 -0200 Rename raise_on_unexpected_params to raise_on_unpermitted_parameters on the guides M guides/source/configuring.md commit beda9c5 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 06:56:24 -0300 Add documentation to raise_on_unpermitted_parameters option [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 1401f96 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 06:38:27 -0300 Rename the configuration to raise_on_unpermitted_parameters Also changed the exception to UnpermittedParameters M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/railtie.rb A actionpack/test/controller/parameters/raise_on_unpermitted_parameters_test.rb D actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb M railties/test/application/configuration_test.rb commit 58f5267 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 06:23:28 -0300 Ensure that raise_on_unexpected_params configuration will work M actionpack/lib/action_controller/railtie.rb M railties/test/application/configuration_test.rb commit cd1757e refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 06:23:34 -0200 Fix typo M guides/source/configuring.md commit df1f290 refs/heads/master Merge: 14f1867 08578bb Author: Rafael Mendonça França Date: 2013-01-05 00:22:06 -0800 Merge pull request #8752 from thomasfedb/master Exception on unexpected params when enabled. commit 14f1867 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 05:03:02 -0300 Revert "[#8743] Test case" This reverts commit 162e2859813b31c50700b453aa61992dfa57139e. This commit was added by mistake, sorry :bow: M activerecord/test/cases/relations_test.rb commit 107e572 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-05 05:01:14 -0300 Don't use Rails.root since it is not available at this point M railties/lib/rails/commands/console.rb M railties/lib/rails/commands/dbconsole.rb commit 08578bb refs/heads/master Author: Thomas Drake-Brockman Date: 2013-01-05 15:46:38 +0800 Allow developers to enable raising of exception when unexpected params are provided. M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/railtie.rb A actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb commit 162e285 refs/heads/master Author: Cédric FABIANSKI Date: 2013-01-04 16:12:29 +0100 [#8743] Test case - Reverting #a3cf03ef99 fixes the issue Conflicts: activerecord/test/cases/relations_test.rb M activerecord/test/cases/relations_test.rb commit d60ed3d refs/heads/master Author: Matthew M. Boedicker Date: 2013-01-04 22:20:36 -0800 Add join table migration generator to usage help. M railties/lib/rails/generators/rails/migration/USAGE commit 85c13b7 refs/heads/master Author: Akira Matsuda Date: 2013-01-05 14:41:32 +0900 beginrescueend has ended M guides/source/performance_testing.md commit eb34327 refs/heads/master Author: Ryunosuke SATO Date: 2013-01-04 16:02:01 +0900 Don't use layout when requested from xhr M railties/lib/rails/info_controller.rb M railties/lib/rails/templates/rails/welcome/index.html.erb commit bd104bf refs/heads/master Author: Thomas Drake-Brockman Date: 2013-01-05 10:45:10 +0800 Document new configuration option action_controller.raise_on_unexpected_params. M guides/source/configuring.md commit 665e11e refs/tags/v3.2.15 Merge: 6b9cb71 8a1ba01 Author: Carlos Antonio da Silva Date: 2013-01-04 17:20:14 -0800 Merge pull request #8763 from hsbt/backport-to-hide-warning Backport 4f0f1b5 into 3-2-stable. When running the test with warnings enabled, it fails without this change. commit 28fd867 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-04 22:41:36 -0200 Remove unnecessary begin..rescue..end, use only rescue M railties/lib/rails/commands/console.rb commit 2269f43 refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-04 22:39:34 -0200 Move class method to instance in dbconsole This method doesn't need to be in the class, since it's only used only from the instance. M railties/lib/rails/commands/console.rb M railties/lib/rails/commands/dbconsole.rb commit 149b86d refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-04 22:36:49 -0200 Move changelog entry in railties to the top Other minor changelog improvements [ci skip] M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit ee1a03c refs/heads/master Merge: 5458f50 bf620c0 Author: Aaron Patterson Date: 2013-01-04 16:48:01 -0800 Merge pull request #8762 from hsbt/fix-marshal_load added marshal_load and marshal_dump for ProxyTestResult. Behavior of met... commit 8a1ba01 refs/tags/v3.2.15 Author: SHIBATA Hiroshi Date: 2012-12-20 16:49:00 +0900 backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused variables. Conflicts: actionpack/test/controller/render_test.rb M actionpack/test/controller/render_test.rb commit bf620c0 refs/heads/master Author: SHIBATA Hiroshi Date: 2012-12-29 14:07:09 +0900 added marshal_load and marshal_dump for ProxyTestResult. Behavior of method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later. M activesupport/lib/active_support/testing/isolation.rb commit 5458f50 refs/heads/master Merge: fab7c53 216d5fd Author: Guillermo Iguaran Date: 2013-01-04 14:13:14 -0800 Merge pull request #8761 from mattdbridges/patch-3 Small typo fix in railties/CHANGELOG.md commit 216d5fd refs/heads/master Author: Matt Bridges Date: 2013-01-04 16:08:28 -0600 Small typo fix in railties/CHANGELOG.md M railties/CHANGELOG.md commit fab7c53 refs/heads/master Merge: d2bc6f9 4fa6088 Author: Rafael Mendonça França Date: 2013-01-04 14:03:24 -0800 Merge pull request #8633 from mykola-kyryk/issue_8628 Allow environment name to start with a substring of the default environment names. Fixes #8628 commit d2bc6f9 refs/heads/master Merge: 5b750c1 ab3cf01 Author: Rafael Mendonça França Date: 2013-01-04 13:51:31 -0800 Merge pull request #8760 from amatsuda/railties_failing_tests_fix fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057 commit 5b750c1 refs/heads/master Merge: fba6a6a ebd27d5 Author: Andrew White Date: 2013-01-04 13:51:11 -0800 Merge pull request #8722 from kwstannard/string_to_date_change Better error message for String#to_date commit fba6a6a refs/heads/master Merge: cfb3019 e209107 Author: Rafael Mendonça França Date: 2013-01-04 13:27:33 -0800 Merge pull request #8755 from robworley/postgresql-ltree-data-type Support for PostgreSQL's ltree datatype commit e209107 refs/heads/master Author: Rob Worley Date: 2013-01-04 21:22:34 +0000 Support for PostgreSQL's ltree data type. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb A activerecord/test/cases/adapters/postgresql/ltree_test.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit ab3cf01 refs/heads/master Author: Akira Matsuda Date: 2013-01-05 05:44:03 +0900 fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057 M railties/test/generators/shared_generator_tests.rb commit cfb3019 refs/heads/master Merge: 306027a 15fb788 Author: Carlos Antonio da Silva Date: 2013-01-04 12:25:22 -0800 Merge pull request #8758 from amatsuda/plugin_new_error_message Misleading error message that prompts non-existing command [ci skip] commit 15fb788 refs/heads/master Author: Akira Matsuda Date: 2013-01-05 04:57:43 +0900 misleading error message that prompts non-existing command [ci skip] M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb commit 306027a refs/heads/master Merge: add4375 d2b937b Author: Guillermo Iguaran Date: 2013-01-04 11:41:38 -0800 Merge pull request #8754 from amatsuda/app_generator_unused_empty_directories get rid of unused .empty_directory files in the app generator commit d2b937b refs/heads/master Author: Akira Matsuda Date: 2013-01-05 04:27:53 +0900 get rid of unused .empty_directory files in the app generator D railties/lib/rails/generators/rails/app/templates/app/mailers/.empty_directory D railties/lib/rails/generators/rails/app/templates/app/models/.empty_directory D railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory D railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory D railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory D railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory D railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory commit ebd27d5 refs/heads/master Author: Kelly Stannard Date: 2013-01-02 23:50:55 +0000 Better error message for String#to_date I did this because to_date gives a very unhelpful error message if you do not pass in a correct date. In the process I think this cleans up the code nicely and even better it tends to be slightly faster than the current implementation. Benchmark https://gist.github.com/4440875 M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/conversions.rb M activesupport/test/core_ext/string_ext_test.rb commit add4375 refs/heads/master Author: Andrew White Date: 2013-01-04 16:14:24 +0000 Allow use of durations for ActionDispatch::SSL configuration M actionpack/lib/action_dispatch/middleware/ssl.rb M actionpack/test/dispatch/ssl_test.rb commit e752cb4 refs/heads/master Merge: f6386f7 fbb3e8e Author: Carlos Antonio da Silva Date: 2013-01-04 08:13:09 -0800 Merge pull request #8750 from tricknotes/remove-unnecessary-h Remove unnecessary `ERB::Util::h` commit fbb3e8e refs/heads/master Author: Ryunosuke SATO Date: 2013-01-05 00:50:06 +0900 Remove unnecessary `ERB::Util::h` It is automatically applied when strings is unsafe for html. M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/missing_template.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb commit f6386f7 refs/heads/master Merge: be26d51 2bacacd Author: Carlos Antonio da Silva Date: 2013-01-04 07:39:23 -0800 Merge pull request #8747 from asanghi/wsfix Remove dangling whitespace in generated database yml files for postgresql and sqlserver [ci skip] commit 2bacacd refs/heads/master Author: Aditya Sanghi Date: 2013-01-04 21:04:57 +0530 removed dangling whitespace in generated database yml M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit be26d51 refs/heads/master Merge: 0cbc240 3dc1a36 Author: Carlos Antonio da Silva Date: 2013-01-04 07:34:51 -0800 Merge pull request #8746 from tricknotes/remove-h-from-guides ERB::Util::h is no longer generated in scaffold [ci skip] commit 3dc1a36 refs/heads/master Author: Ryunosuke SATO Date: 2013-01-05 00:16:12 +0900 ERB::Util::h is no longer generated in scaffold M guides/source/active_support_core_extensions.md M guides/source/debugging_rails_applications.md commit 0cbc240 refs/heads/master Merge: c9402c0 0f10367 Author: Rafael Mendonça França Date: 2013-01-04 07:21:20 -0800 Merge pull request #8744 from tricknotes/suppress-warning Suppress warning about IO#lines in Ruby 2.0 commit 4fa6088 refs/heads/master Author: Mykola Kyryk Date: 2012-12-27 17:04:54 +0200 This commit fixes issue #8628 Allow environment name to start with a substring of the default environment names. For example: tes, pro, prod, dev, devel, etc. Fixing identation. Adding test for Rails::Console.parse_arguments method. Fix issue 8628 for Rails::DBConsole. M railties/CHANGELOG.md M railties/lib/rails/commands/console.rb M railties/lib/rails/commands/dbconsole.rb M railties/test/commands/console_test.rb M railties/test/commands/dbconsole_test.rb commit 0f10367 refs/heads/master Author: Ryunosuke SATO Date: 2013-01-04 23:30:09 +0900 Suppress warning about IO#lines in Ruby 2.0 actionpack/lib/action_dispatch/middleware/exception_wrapper.rb:99: IO#lines is deprecated; use #each_line instead M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb commit c9402c0 refs/heads/master Merge: a951136 8ea480b Author: Guillermo Iguaran Date: 2013-01-04 05:53:25 -0800 Merge pull request #8739 from franckverrot/remove_activexobject Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`. commit 8ea480b refs/heads/master Author: Franck Verrot Date: 2013-01-04 08:32:24 +0100 Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`. M railties/lib/rails/templates/rails/welcome/index.html.erb commit c91a7db refs/heads/master Author: Akira Matsuda Date: 2013-01-04 17:19:25 +0900 undecorated_table_name was moved and refactored M guides/source/active_support_core_extensions.md commit a951136 refs/heads/master Merge: 3e35b6e 8ffac1c Author: Guillermo Iguaran Date: 2013-01-03 23:27:04 -0800 Merge pull request #8738 from amatsuda/frozen_rails another tiny update on generated README commit 3e35b6e refs/heads/master Merge: 7019858 37e250f Author: Guillermo Iguaran Date: 2013-01-03 22:57:14 -0800 Merge pull request #8736 from tricknotes/apply-var Apply `var` keyword to js at welcome#index commit 7019858 refs/heads/master Merge: 39374aa 1a5b5e1 Author: Guillermo Iguaran Date: 2013-01-03 22:50:07 -0800 Merge pull request #8723 from goshakkk/refactor-error-page Move error page js into script tag commit 37e250f refs/heads/master Author: Ryunosuke SATO Date: 2013-01-04 15:22:47 +0900 Apply `var` keyword to js at welcome#index M railties/lib/rails/templates/rails/welcome/index.html.erb commit 2573484 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 14:54:58 +0900 Ruby 1.8 support had gone instance_variable_names remains for internal use, but it's not that useful for the users anymore M guides/source/active_support_core_extensions.md commit ffaad63 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 14:40:21 +0900 get rid of outdated "`server` with Different Backends" section * I don't think people are running Rails under mongrel today * it's better not to sudo gem install * basically all we need to do is just bundle the server. No need to give its name as a parameter * I could write ^^^, but I realized that it's not really about "command line" M guides/source/command_line.md commit 40c3d80 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 14:24:46 +0900 update the example of generated postgresql config M guides/source/command_line.md commit 39374aa refs/heads/master Author: Rafael Mendonça França Date: 2013-01-04 00:22:21 -0300 Set the default timezone after the initialization since the configuration now lives in the application initializers. Fix #8711 M activesupport/lib/active_support/railtie.rb M railties/test/application/configuration_test.rb commit dd3360e refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-04 00:31:47 -0200 Refactor infinite comparable definition a bit M activesupport/lib/active_support/core_ext/infinite_comparable.rb commit 05ef97d refs/heads/master Author: Rafael Mendonça França Date: 2013-01-03 23:19:28 -0300 Remove unnecessary requires M activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb commit 59e0c26 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-03 23:14:57 -0300 Remove assert_nothing_raised M activesupport/test/core_ext/date_ext_test.rb M activesupport/test/core_ext/date_time_ext_test.rb M activesupport/test/core_ext/numeric_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb M activesupport/test/inflector_test.rb commit e3ce5ea refs/heads/master Merge: 4d240ec 38f28dc Author: Rafael Mendonça França Date: 2013-01-03 17:59:07 -0800 Merge pull request #7350 from slbug/date_time_ranges_with_infinite_bounds Added ability to compare date/time with infinity commit 38f28dc refs/heads/master Author: bUg Date: 2012-08-14 20:28:26 +0200 Added ability to compare date/time with infinity Date, DateTime, Time and TimeWithZone can now be compared to infinity, so it's now possible to create ranges with one infinite bound and date/time object as another bound. Ex.: @range = Range.new(Date.today, Float::INFINITY) Also it's possible to check inclusion of date/time in range with conversion. Ex.: @range.include?(Time.now + 1.year) # => true @range.include?(DateTime.now + 1.year) # => true Ability to create date/time ranges with infinite bound is required for handling postgresql range types. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date.rb A activesupport/lib/active_support/core_ext/date/infinite_comparable.rb M activesupport/lib/active_support/core_ext/date_time.rb M activesupport/lib/active_support/core_ext/date_time/calculations.rb A activesupport/lib/active_support/core_ext/date_time/infinite_comparable.rb A activesupport/lib/active_support/core_ext/infinite_comparable.rb M activesupport/lib/active_support/core_ext/numeric.rb A activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb M activesupport/lib/active_support/core_ext/time.rb A activesupport/lib/active_support/core_ext/time/infinite_comparable.rb M activesupport/test/core_ext/date_ext_test.rb M activesupport/test/core_ext/date_time_ext_test.rb M activesupport/test/core_ext/numeric_ext_test.rb M activesupport/test/core_ext/range_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 654f0d6 refs/heads/master Author: Francesco Rodriguez Date: 2013-01-03 20:28:17 -0500 extract alert= and notice= examples to FlashHash#now [ci skip] M actionpack/lib/action_dispatch/middleware/flash.rb commit dc14b89 refs/heads/master Author: Matthew Stopa Date: 2013-01-03 18:21:20 -0700 Readd deleted section of caching rails guide M guides/source/caching_with_rails.md commit 6b9cb71 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-06 15:39:13 -0200 Change the encrypted campfire notification token Conflicts: .travis.yml M .travis.yml commit 4d240ec refs/heads/master Author: Jeremy Kemper Date: 2013-01-03 18:05:17 -0700 Use bundler --pre for travis builds M .travis.yml commit e00b8ec refs/heads/master Author: Jeremy Kemper Date: 2013-01-03 17:40:25 -0700 Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs ' M rails.gemspec commit d64c7c7 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-03 21:40:01 -0300 Reuse the Column integer converter M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb commit ebabd78 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-03 21:26:38 -0300 Change duplicated test name M activerecord/test/cases/persistence_test.rb commit a802fa3 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 09:26:32 +0900 A Relation is not a collection of records. So let's not use the term "record" M guides/source/active_record_basics.md commit 034982e refs/heads/master Author: Akira Matsuda Date: 2013-01-04 09:06:40 +0900 Revert "TODO typo fix" This reverts commit 1a59a6dfdca217e31a52779d92aa56b67c6689cb. I guess it's not a typo: https://github.com/jorlhuda/exceptron M actionpack/lib/action_view/renderer/streaming_template_renderer.rb commit 1a59a6d refs/heads/master Author: Gosha Arinich Date: 2013-01-04 02:57:56 +0300 TODO typo fix M actionpack/lib/action_view/renderer/streaming_template_renderer.rb commit 8ffac1c refs/heads/master Author: Akira Matsuda Date: 2013-01-04 07:59:43 +0900 No such feature in Rails anymore. That's Bundler's business [ci skip] M railties/lib/rails/generators/rails/app/templates/README commit 9a44cd1 refs/tags/v3.2.15 Merge: 229042f e842dbb Author: Rafael Mendonça França Date: 2013-01-03 15:43:38 -0800 Merge pull request #8718 from jstirk/column_writer_to_i_errors Fix undefined method `to_i' introduced since 3.2.8 commit e842dbb refs/tags/v3.2.15 Author: Jason Stirk Date: 2013-01-03 22:26:53 +1100 Fix undefined method `to_i' introduced since 3.2.8 This commit fixes a bug introduced in 96a13fc7 which breaks behaviour of integer fields in 3.2.8. In 3.2.8, setting the value of an integer field to a non-integer (eg. Array, Hash, etc.) would default to 1 (true) : # 3.2.8 p = Post.new p.category_id = [ 1, 2 ] p.category_id # => 1 p.category_id = { 3 => 4 } p.category_id # => 1 In 3.2.9 and above, this will raise a NoMethodError : # 3.2.9 p = Post.new p.category_id = [ 1, 2 ] NoMethodError: undefined method `to_i' for [1, 2]:Array Whilst at first blush this appear to be sensible, it combines in bad ways with scoping. For example, it is common to use scopes to control access to data : @collection = Posts.where(:category_id => [ 1, 2 ]) @new_post = @collection.new In 3.2.8, this would work as expected, creating a new Post object (albeit with @new_post.category_id = 1). However, in 3.2.9 this will cause the NoMethodError to be raised as above. It is difficult to avoid triggering this error without descoping before calling .new, breaking any apps running on 3.2.8 that rely on this behaviour. This patch deviates from 3.2.8 in that it does not retain the somewhat spurious behaviour of setting the attribute to 1. Instead, it explicitly sets these invalid values to nil : p = Post.new p.category_id = [ 1, 2 ] p.category_id # => nil This also fixes the situation where a scope using an array will "pollute" any newly instantiated records. @new_post = @collection.new @new_post.category_id # => nil Finally, 3.2.8 exhibited a behaviour where setting an object to an integer field caused it to be coerced to "1". This has not been retained, as it is spurious and surprising in the same way that setting Arrays and Heshes was : c = Category.find(6) p = Post.new # 3.2.8 p.category_id = c p.category_id # => 1 # This patch p.category_id = c p.category_id # => nil This commit includes explicit test cases that expose the original issue with calling new on a scope that uses an Array. As this is a common situation, an explicit test case is the best way to prevent regressions in the future. It also updates and separates existing tests to be explicit about the situation that is being tested (eg. AR objects vs. other objects vs. non-integers) M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/column_test.rb commit 3a39de6 refs/heads/master Merge: a664686 8d98c83 Author: Rafael Mendonça França Date: 2013-01-03 15:36:34 -0800 Merge pull request #8734 from jstirk/master-column_writer_to_i_errors Fix undefined method `to_i' introduced in 3.2.9 commit 8d98c83 refs/heads/master Author: Jason Stirk Date: 2013-01-03 22:26:53 +1100 Fix undefined method `to_i' introduced since 3.2.8 This commit fixes a bug introduced in 96a13fc7 which breaks behaviour of integer fields. In 3.2.8, setting the value of an integer field to a non-integer (eg. Array, Hash, etc.) would default to 1 (true) : # 3.2.8 p = Post.new p.category_id = [ 1, 2 ] p.category_id # => 1 p.category_id = { 3 => 4 } p.category_id # => 1 In 3.2.9 and above, this will raise a NoMethodError : # 3.2.9 p = Post.new p.category_id = [ 1, 2 ] NoMethodError: undefined method `to_i' for [1, 2]:Array Whilst at first blush this appear to be sensible, it combines in bad ways with scoping. For example, it is common to use scopes to control access to data : @collection = Posts.where(:category_id => [ 1, 2 ]) @new_post = @collection.new In 3.2.8, this would work as expected, creating a new Post object (albeit with @new_post.category_id = 1). However, in 3.2.9 this will cause the NoMethodError to be raised as above. It is difficult to avoid triggering this error without descoping before calling .new, breaking any apps running on 3.2.8 that rely on this behaviour. This patch deviates from 3.2.8 in that it does not retain the somewhat spurious behaviour of setting the attribute to 1. Instead, it explicitly sets these invalid values to nil : p = Post.new p.category_id = [ 1, 2 ] p.category_id # => nil This also fixes the situation where a scope using an array will "pollute" any newly instantiated records. @new_post = @collection.new @new_post.category_id # => nil Finally, 3.2.8 exhibited a behaviour where setting an object to an integer field caused it to be coerced to "1". This has not been retained, as it is spurious and surprising in the same way that setting Arrays and Heshes was : c = Category.find(6) p = Post.new # 3.2.8 p.category_id = c p.category_id # => 1 # This patch p.category_id = c p.category_id # => nil This commit includes explicit test cases that expose the original issue with calling new on a scope that uses an Array. As this is a common situation, an explicit test case is the best way to prevent regressions in the future. It also updates and separates existing tests to be explicit about the situation that is being tested (eg. AR objects vs. other objects vs. non-integers) M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/column_test.rb commit 229042f refs/tags/v3.2.15 Merge: ef727a6 3a9db02 Author: Rafael Mendonça França Date: 2013-01-03 15:00:27 -0800 Merge pull request #8733 from amatsuda/rails32_readme_dir_tree update directory tree in the generated README in Rails 3.2 [ci skip] commit 3a9db02 refs/tags/v3.2.15 Author: Akira Matsuda Date: 2013-01-04 07:41:14 +0900 update directory tree in the generated README [ci skip] M railties/lib/rails/generators/rails/app/templates/README commit ebdb863 refs/heads/master Author: lambda_ Date: 2013-01-03 17:40:02 -0500 Add examples `alert=` and `notice=`, using memes M actionpack/lib/action_dispatch/middleware/flash.rb commit 8370e50 refs/heads/master Author: lambda_ Date: 2013-01-03 17:33:00 -0500 Change `Example for` to `Example of` M actionpack/lib/action_dispatch/middleware/cookies.rb commit a664686 refs/heads/master Merge: e5d4367 86a4881 Author: Rafael Mendonça França Date: 2013-01-03 14:17:21 -0800 Merge pull request #8732 from amatsuda/readme_call_yield a tiny fix in the generated README commit 86a4881 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 07:12:36 +0900 no, call <%= yield %> M railties/lib/rails/generators/rails/app/templates/README commit e5d4367 refs/heads/master Merge: 3be2edd cd1cc47 Author: Guillermo Iguaran Date: 2013-01-03 13:54:18 -0800 Merge pull request #8731 from amatsuda/readme_dir_tree update directory tree in the generated README commit 3be2edd refs/heads/master Author: Rafael Mendonça França Date: 2013-01-03 18:49:28 -0300 Add documentation to ActionDispatch::Http::UploadedFile#headers [ci skip] M actionpack/lib/action_dispatch/http/upload.rb commit cd1cc47 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 05:41:33 +0900 update directory tree in the generated README M railties/lib/rails/generators/rails/app/templates/README commit 02e422b refs/heads/master Author: Akira Matsuda Date: 2013-01-04 05:28:21 +0900 we don't have public/index.html anymore M guides/source/rails_application_templates.md commit 2161434 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 05:14:24 +0900 update the scaffold generator outputs M guides/source/command_line.md M guides/source/generators.md commit 8572f32 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 05:29:09 +0900 .all does not return an Array M guides/source/active_record_basics.md commit 05fb650 refs/heads/master Merge: fdd6271 975493a Author: Rafael Mendonça França Date: 2013-01-03 13:14:10 -0800 Merge pull request #8730 from robin850/master Fix missing spaces in method definitions commit 975493a refs/heads/master Author: Robin Dupret Date: 2013-01-03 22:14:09 +0100 Fix missing spaces before and after equal signs in method definitions M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/collector.rb commit 1a5b5e1 refs/heads/master Author: Gosha Arinich Date: 2013-01-03 19:21:28 +0300 move error page js into script tag M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb commit fdd6271 refs/heads/master Merge: a896609 66258c0 Author: Rafael Mendonça França Date: 2013-01-03 12:56:43 -0800 Merge pull request #8729 from timraymond/help_message_for_install_script Adding a usage message to install.rb script commit 66258c0 refs/heads/master Author: Tim Raymond Date: 2013-01-03 15:08:50 -0500 Adding a usage message to install.rb script Previously, invoking the install.rb script with zero arguments caused it to attempt to install all gems without a version suffix, which would fail spectacularly. Failing gracefully with a usage message is more helpful to a first-time user. M install.rb commit db4af11 refs/heads/master Author: Akira Matsuda Date: 2013-01-04 04:54:39 +0900 deliver_ is an old API M actionmailer/lib/action_mailer/test_helper.rb commit ef727a6 refs/tags/v3.2.15 Merge: 4179470 2e4df2a Author: Rafael Mendonça França Date: 2013-01-03 11:39:29 -0800 Merge pull request #8716 from miguelff/3-2-stable Merged latest released tag (v3.2.10) into the stable branch (3-2-stable) commit a896609 refs/heads/master Merge: bb1955d 4b7137e Author: Rafael Mendonça França Date: 2013-01-03 11:24:44 -0800 Merge pull request #8728 from amatsuda/model_all_returns_a_relation A small fix for an AR test case commit f89fa2a refs/heads/master Author: Akira Matsuda Date: 2013-01-04 04:22:30 +0900 `Model.all` alone does nothing M activesupport/lib/active_support/log_subscriber/test_helper.rb commit 4b7137e refs/heads/master Author: Akira Matsuda Date: 2013-01-04 04:02:23 +0900 need to to_a the Relation to execute SQL here M activerecord/test/cases/explain_test.rb commit 48d5a33 refs/heads/master Author: Tim Raymond Date: 2012-12-19 01:54:09 -0500 Adding Back Rails::Engine::Railties#engines Removing it breaks functionality with gems such as Thinking Sphinx. This restores it with a deprecation warning. Closes #8551 M railties/CHANGELOG.md M railties/lib/rails/application.rb M railties/lib/rails/engine.rb A railties/lib/rails/engine/railties.rb M railties/test/railties/engine_test.rb commit bb1955d refs/heads/master Merge: cb2bd4a 4075be8 Author: Rafael Mendonça França Date: 2013-01-03 10:53:48 -0800 Merge pull request #8727 from robin850/patch-2 Remove a useless TODO comment commit 4075be8 refs/heads/master Author: Robin Dupret Date: 2013-01-03 19:50:43 +0100 Remove a useless TODO comment M actionpack/lib/action_dispatch/http/upload.rb commit cb2bd4a refs/heads/master Merge: b4a23ed d826f14 Author: Guillermo Iguaran Date: 2013-01-03 09:09:59 -0800 Merge pull request #8705 from amparo-luna/change_update_attributes_to_update Rename update_attributes method to update commit d826f14 refs/heads/master Author: Amparo Luna + Guillermo Iguaran Date: 2013-01-02 18:08:26 -0500 Add Changelog entry regarding update_attibutes being renamed to update M activerecord/CHANGELOG.md commit 0433d79 refs/heads/master Author: Amparo Luna + Guillermo Iguaran Date: 2013-01-02 16:55:29 -0500 Updating default application templates to use update instead of update_attributes M railties/lib/rails/generators/active_model.rb M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit 03ac174 refs/heads/master Author: Amparo Luna + Guillermo Iguaran Date: 2013-01-02 16:40:48 -0500 Change guides to use update instead of update_attributes M guides/code/getting_started/app/controllers/posts_controller.rb M guides/source/active_record_basics.md M guides/source/active_record_callbacks.md M guides/source/active_record_validations.md M guides/source/form_helpers.md M guides/source/getting_started.md M guides/source/layouts_and_rendering.md commit 1bb0200 refs/heads/master Author: Amparo Luna + Guillermo Iguaran Date: 2013-01-02 16:16:24 -0500 Change docs to use update instead of update_attributes M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/record_identifier.rb M activerecord/examples/performance.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/persistence.rb M activesupport/lib/active_support/core_ext/hash/except.rb commit 1f3a1fe refs/heads/master Author: Amparo Luna + Guillermo Iguaran Date: 2013-01-02 11:46:58 -0500 Rename update_attributes method to update, keep update_attributes as an alias M activerecord/lib/active_record/associations/has_one_through_association.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/callbacks.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/dirty_test.rb M activerecord/test/cases/locking_test.rb M activerecord/test/cases/nested_attributes_test.rb M activerecord/test/cases/persistence_test.rb M activerecord/test/cases/transaction_isolation_test.rb M activerecord/test/cases/transactions_test.rb M activerecord/test/models/reference.rb commit b4a23ed refs/heads/master Merge: f8633f9 f6364e4 Author: Guillermo Iguaran Date: 2013-01-03 08:49:17 -0800 Merge pull request #8725 from mattdbridges/patch-2 Typo and grammar fixes in the ActionPack CHANGELOG commit f6364e4 refs/heads/master Author: Matt Bridges Date: 2013-01-03 10:30:11 -0600 Typo and grammar fixes in the ActionPack CHANGELOG M actionpack/CHANGELOG.md commit 3d1bc89 refs/heads/master Author: Akira Matsuda Date: 2013-01-03 23:38:31 +0900 remove meaningless use of Relation#all particularly, `all(options)` would warn M activerecord/lib/active_record/aggregations.rb M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/locking/pessimistic.rb commit f8633f9 refs/heads/master Merge: b02d452 d7d4578 Author: Guillermo Iguaran Date: 2013-01-03 06:24:56 -0800 Merge pull request #8713 from goshakkk/better-error-page Fix env toggling, improve error page styling commit d7d4578 refs/heads/master Author: Gosha Arinich Date: 2013-01-03 10:55:56 +0300 fix env toggling, improve error page styling M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb commit 79255fa refs/heads/master Author: Akira Matsuda Date: 2013-01-03 22:34:11 +0900 PUT => PATCH M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/form_tag_helper.rb commit 4179470 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2013-01-03 05:22:15 -0800 Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo Fix typo on form_tag_helper.rb [ci skip] M actionpack/lib/action_view/helpers/form_tag_helper.rb commit b02d452 refs/heads/master Merge: de729af eab2b99 Author: Carlos Antonio da Silva Date: 2013-01-03 05:22:15 -0800 Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo Fix typo on form_tag_helper.rb [ci skip] commit eab2b99 refs/heads/master Author: Paulo Luis Franchini Casaretto Date: 2013-01-03 11:07:20 -0200 Fix typo on form_tag_helper.rb The inline documentantion had a typo that was somewhat confusing. M actionpack/lib/action_view/helpers/form_tag_helper.rb commit de729af refs/heads/master Merge: e0be37c 1030b7b Author: Carlos Antonio da Silva Date: 2013-01-03 04:09:24 -0800 Merge pull request #8717 from amatsuda/scaffold_controller_test_patch test PATCH method for update action in generated scaffold controller test rather than PUT commit e0be37c refs/heads/master Merge: fe649b1 77f2ba9 Author: Carlos Antonio da Silva Date: 2013-01-03 04:07:31 -0800 Merge pull request #8715 from goshakkk/refactor-mapper Refactor Routing::Mapper#matches? commit fe649b1 refs/heads/master Merge: c9d8481 86c21e4 Author: Carlos Antonio da Silva Date: 2013-01-03 03:48:48 -0800 Merge pull request #8714 from utkarshkukreti/faster-gem-install Pass in `--local` when doing `gem install` for local gems. [ci skip] commit eed9f25 refs/heads/master Author: Akira Matsuda Date: 2013-01-03 20:45:45 +0900 let's get started with PATCH method rather than PUT M guides/source/getting_started.md commit 1030b7b refs/heads/master Author: Akira Matsuda Date: 2013-01-03 20:21:18 +0900 test PATCH method for update action in generated scaffold controller test rather than PUT M railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit 2e4df2a refs/tags/v3.2.15 Merge: 4d4e6e2 8ba3df0 Author: Miguel Date: 2013-01-03 11:54:21 +0100 Merge tag 'v3.2.10' into 3-2-stable Latest released tag was not fully merged into the stable branch (missed version bumping) commit 77f2ba9 refs/heads/master Author: Gosha Arinich Date: 2013-01-03 12:59:56 +0300 refactor Routing::Mapper M actionpack/lib/action_dispatch/routing/mapper.rb commit 86c21e4 refs/heads/master Author: Utkarsh Kukreti Date: 2013-01-03 15:23:47 +0530 Pass in `--local` when doing `gem install` for local gems. M Rakefile M install.rb commit 4b5e424 refs/heads/master Author: Matthew Stopa Date: 2013-01-02 22:43:58 -0700 Remove action/page caching from Rails guides M guides/source/caching_with_rails.md commit 4928bde refs/heads/master Author: Matthew Stopa Date: 2013-01-02 21:17:12 -0700 Add documentation for BacktraceCleaner#remove_filters! M activesupport/lib/active_support/backtrace_cleaner.rb commit 5b8db45 refs/tags/v2.3.15 Merge: 9de9b35 9baab1f Author: Aaron Patterson Date: 2013-01-02 17:58:37 -0800 Merge pull request #6722 from adgear/2-3-stable Backported rails 2.3 fix for CVE-2012-2695 commit 4d4e6e2 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-02 22:52:59 -0300 Use Ruby 1.8 syntax M actionpack/test/controller/routing_test.rb commit c9d8481 refs/heads/master Merge: c79fb2a cc5a4bb Author: Rafael Mendonça França Date: 2013-01-02 15:37:02 -0800 Merge pull request #8706 from steveklabnik/ip_precautions Explain the possible IP precautions commit cc5a4bb refs/heads/master Author: Andre Arko Date: 2013-01-02 15:34:27 -0800 Explain the possible precautions M actionpack/lib/action_dispatch/middleware/remote_ip.rb commit c79fb2a refs/heads/master Merge: 9f200fb 75dcdbc Author: Guillermo Iguaran Date: 2013-01-02 15:27:20 -0800 Merge pull request #7980 from steveklabnik/issue_7979 Restore original remote_ip algorithm. commit 75dcdbc refs/heads/master Author: Andre Arko Date: 2013-01-02 15:21:13 -0800 Restore original remote_ip algorithm. Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We remove trusted IP values, and then take the last given value, assuming that it is the most likely to be the correct, unfaked value. See [1] for a very thorough discussion of why that is the best option we have at the moment. [1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/ Fixes #7979 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/remote_ip.rb M actionpack/test/dispatch/request_test.rb M guides/source/configuring.md M railties/test/application/middleware/remote_ip_test.rb commit 9baab1f refs/tags/v2.3.15 Merge: 62f81f4 9de9b35 Author: Mina Naguib Date: 2013-01-02 18:19:01 -0500 Merge remote-tracking branch 'rails/2-3-stable' into 2-3-stable commit 9f200fb refs/heads/master Author: Carlos Antonio da Silva Date: 2013-01-02 21:11:11 -0200 Changelog improvements [ci skip] M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md commit b6aa593 refs/heads/master Author: Akira Matsuda Date: 2013-01-03 06:43:26 +0900 missing changelog entry for #8682 M activesupport/CHANGELOG.md commit ef61504 refs/heads/master Merge: 44930b2 8ef780c Author: Rafael Mendonça França Date: 2013-01-02 13:58:32 -0800 Merge pull request #8697 from goshakkk/undup Remove another unnecessary dup commit f8452e8 refs/tags/v3.2.15 Merge: f4dc7e3 33841a9 Author: Rafael Mendonça França Date: 2013-01-02 13:56:05 -0800 Merge pull request #8703 from senny/backport_8700 Backport #8701, do not append a second slash with `trailing_slash: true` Closes #8700 commit 33841a9 refs/tags/v3.2.15 Author: Yves Senn Date: 2013-01-02 21:11:16 +0100 Backport #8701, do not append a second slash with `trailing_slash: true` M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/controller/routing_test.rb commit f4dc7e3 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-02 18:51:13 -0300 Add release date of 3.2.10 Fix format and wrong changelog entry M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit 66844ec refs/heads/master Author: Gosha Arinich Date: 2013-01-03 00:44:49 +0300 make symbol reference in docs appear as code M railties/lib/rails/engine.rb commit 44930b2 refs/heads/master Author: Aaron Patterson Date: 2012-12-23 11:07:07 -0800 CVE-2012-5664 options hashes should only be extracted if there are extra parameters Conflicts: activerecord/lib/active_record/dynamic_matchers.rb M activerecord/test/cases/finder_test.rb commit 970c10c refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2013-01-02 09:08:31 -0300 Improve CHANGELOG message [ci skip] M actionpack/CHANGELOG.md commit 8af6747 refs/heads/master Merge: c9f0680 0b2ce7d Author: Rafael Mendonça França Date: 2013-01-02 13:39:56 -0800 Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash do not append a second slash when using `trailing_slash: true` commit e5ee5a9 refs/tags/v3.2.15 Merge: 2aa70bd 204109e Author: Aaron Patterson Date: 2013-01-02 13:23:20 -0800 Merge branch '3-2-stable' into 3-2-secmerge * 3-2-stable: fix block.arity raise nil error when not given a block to "content_tag_for" removes the Ajax on Rails early draft Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present" backport #8662, charset should not be appended for `head` responses Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options." Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options. backport #8616, quote column names in generated fixture files commit c9f0680 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-02 16:18:17 -0500 Fixing closing

M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb commit 2db932d refs/heads/master Merge: 8890fb8 73f4f4a Author: Guillermo Iguaran Date: 2013-01-02 13:12:38 -0800 Merge pull request #8702 from rubys/master Fix a number of validation/style errors commit 73f4f4a refs/heads/master Author: Sam Ruby Date: 2013-01-02 16:06:54 -0500 Fix a number of validation/style errors: * 
 is not allowed to be nested inside of 
 elements in HTML
     * Indentation of 
 doesn't match corresponding 

     * 
 element not explicitly closed
     * One more

than
In each case, the template was fixed to match how a HTML5 parser would "see" the resulting page. M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb commit 0b2ce7d refs/heads/master Author: Yves Senn Date: 2013-01-02 21:11:16 +0100 do not append a second slash when using M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/controller/routing_test.rb commit 8890fb8 refs/heads/master Author: Aaron Patterson Date: 2013-01-02 11:52:23 -0800 take into account multipart when calculating tag attributes M actionpack/lib/action_view/helpers/form_helper.rb commit 497c4bb refs/heads/master Author: Aaron Patterson Date: 2013-01-02 11:19:42 -0800 ask the form builder for form tag attributes M actionpack/lib/action_view/helpers/form_helper.rb commit b934034 refs/heads/master Author: Aaron Patterson Date: 2013-01-02 11:14:14 -0800 do not mutate the options hash (when we do not need to) M actionpack/lib/action_view/helpers/form_helper.rb commit 8ef780c refs/heads/master Author: Gosha Arinich Date: 2013-01-02 19:01:01 +0300 remove another unnecessary dup M actionpack/lib/action_dispatch/journey/formatter.rb commit bdaafae refs/heads/master Merge: 6e475a0 aca0c6d Author: Carlos Antonio da Silva Date: 2013-01-02 07:48:03 -0800 Merge pull request #8694 from goshakkk/undup Remove unnecessary #dup commit 6e475a0 refs/heads/master Merge: f83b6ed bb932d5 Author: Guillermo Iguaran Date: 2013-01-02 07:35:53 -0800 Merge pull request #8688 from goshakkk/error-page-toggle Allow toggling dumps on error page commit aca0c6d refs/heads/master Author: Gosha Arinich Date: 2013-01-02 18:33:52 +0300 remove unnecessary #dup M actionpack/lib/action_dispatch/journey/formatter.rb commit 25c12de refs/heads/master Author: Franck Verrot Date: 2013-01-02 16:12:19 +0100 Link to the right fork of country_select. M guides/source/form_helpers.md commit f83b6ed refs/heads/master Merge: 08db381 7c1af53 Author: Rafael Mendonça França Date: 2013-01-02 07:10:43 -0800 Merge pull request #8693 from goshakkk/flatten Replace #flatten with Array() commit 08db381 refs/heads/master Merge: 1fd7971 ed8122c Author: Rafael Mendonça França Date: 2013-01-02 07:06:23 -0800 Merge pull request #8692 from lucasmazza/error-page-css Cleanup the CSS on the new error page. commit 7c1af53 refs/heads/master Author: Gosha Arinich Date: 2013-01-02 18:03:23 +0300 replace #flatten with Array() M railties/lib/rails/paths.rb commit 1fd7971 refs/heads/master Merge: fb61a80 0a9172f Author: Rafael Mendonça França Date: 2013-01-02 07:00:56 -0800 Merge pull request #8691 from acapilleri/preload_association refactoring to_sym of Symbol in preload commit ed8122c refs/heads/master Author: Lucas Mazza Date: 2013-01-02 12:59:02 -0200 Cleanup some unnecessary CSS on the new error page and reformat some lines. M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb commit 0a9172f refs/heads/master Author: Angelo capilleri Date: 2013-01-02 15:57:01 +0100 refactoring to_sym of Symbol in preload M activerecord/lib/active_record/associations/preloader.rb commit fb61a80 refs/heads/master Merge: 6a38bef 30f86ea Author: Rafael Mendonça França Date: 2013-01-02 06:15:15 -0800 Merge pull request #8689 from goshakkk/error-page Add source code left padding on error pages commit 30f86ea refs/heads/master Author: Gosha Arinich Date: 2013-01-02 15:53:53 +0300 add source line padding M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb commit bb932d5 refs/heads/master Author: Gosha Arinich Date: 2013-01-02 15:23:34 +0300 allow toggling dumps instead of just showing M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb commit 6a38bef refs/heads/master Author: Rafael Mendonça França Date: 2013-01-02 09:53:51 -0300 No need to pass a empty block to content_tag_for anymore M actionpack/test/template/record_tag_helper_test.rb commit 7e2ef18 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-02 04:05:05 -0800 Make content_tag_for work without block This is version of #8640 for master M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/record_tag_helper.rb M actionpack/test/template/record_tag_helper_test.rb commit 204109e refs/tags/v3.2.15 Merge: b366ec5 ea881ca Author: Rafael Mendonça França Date: 2013-01-02 04:05:05 -0800 Merge pull request #8640 from jasl/3-2-stable fix block.arity will raise nil error commit 51ab77e refs/heads/master Merge: e443ac0 fc7b8d3 Author: Xavier Noria Date: 2013-01-02 02:48:15 -0800 Merge pull request #8686 from mekishizufu/changelog_entry Add missing changelog entry for #8676 [ci skip] commit fc7b8d3 refs/heads/master Author: Jiri Pospisil Date: 2013-01-02 11:41:35 +0100 Add missing changelog entry for #8676 [ci skip] M railties/CHANGELOG.md commit ea881ca refs/tags/v3.2.15 Author: jasl Date: 2013-01-02 16:48:09 +0800 fix block.arity raise nil error when not given a block to "content_tag_for" M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/record_tag_helper.rb M actionpack/test/template/record_tag_helper_test.rb commit e443ac0 refs/heads/master Merge: bb38df8 7bc224d Author: Guillermo Iguaran Date: 2013-01-01 20:56:35 -0800 Merge pull request #8682 from amatsuda/rm_as_frozen_object_error remove meaningless AS::FrozenObjectError commit 7bc224d refs/heads/master Author: Akira Matsuda Date: 2013-01-02 09:37:44 +0900 remove meaningless AS::FrozenObjectError M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M activerecord/lib/active_record/aggregations.rb M activerecord/test/cases/aggregations_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/persistence_test.rb M activesupport/lib/active_support/cache.rb D activesupport/lib/active_support/core_ext/exception.rb commit bb38df8 refs/heads/master Author: Rafael Mendonça França Date: 2013-01-01 19:17:37 -0300 Standardize the use of current_adapter? M activerecord/test/cases/adapters/mysql/active_schema_test.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/connection_specification/resolver_test.rb M activerecord/test/cases/defaults_test.rb M activerecord/test/cases/migration/change_schema_test.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/cases/query_cache_test.rb M activerecord/test/cases/schema_dumper_test.rb commit baf8e34 refs/heads/master Merge: e333d64 e7ff765 Author: Rafael Mendonça França Date: 2013-01-01 14:08:53 -0800 Merge pull request #8678 from yahonda/remove_column_oracle Address a failure test_remove_column_with_multi_column_index with Oracle commit e7ff765 refs/heads/master Author: Yasuo Honda Date: 2013-01-02 02:39:18 +0900 Address a failure test_remove_column_with_multi_column_index with Oracle database Not only PostgreSQL, Oracle database adapter drops the multi-column index if any of the indexed columns dropped by remove_column. M activerecord/test/cases/migration/rename_column_test.rb commit e333d64 refs/heads/master Merge: 5f63816 542d6b5 Author: Rafael Mendonça França Date: 2013-01-01 13:57:18 -0800 Merge pull request #8677 from amatsuda/unused_scope_in_test_models unused scope in AR test model commit f817bb2 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 06:52:15 +0900 s/ERb/ERB/ M actionpack/lib/action_view/base.rb commit 6c7699f refs/heads/master Author: Akira Matsuda Date: 2013-01-02 06:41:51 +0900 PUT => PATCH or PUT M actionpack/README.rdoc M guides/source/security.md commit 7496c8c refs/heads/master Author: Akira Matsuda Date: 2013-01-02 06:25:38 +0900 wrong model name M activerecord/lib/active_record/associations.rb commit 7f49599 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 06:23:12 +0900 Observers was extracted from Active Model as `rails-observers` gem M activemodel/README.rdoc commit 3bf1267 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 06:11:49 +0900 find + conditions is deprecated in AR 4 M activerecord/lib/active_record/associations.rb commit 542d6b5 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 05:48:56 +0900 unused scope M activerecord/test/models/reply.rb commit fec6661 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 05:13:49 +0900 find_or_initialize_by is deprecated in AR 4 M activerecord/lib/active_record/base.rb commit 2565c81 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 05:07:32 +0900 find_or_create_by is deprecated in AR 4 M actionpack/lib/action_controller/metal/mime_responds.rb M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/base.rb M guides/source/engines.md commit 44717a9 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 04:42:47 +0900 find_last_by is deprecated in AR 4 M activerecord/lib/active_record/base.rb M guides/source/active_record_querying.md commit ad82753 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 04:36:33 +0900 find_all_by is deprecated in AR 4 M activerecord/lib/active_record/base.rb M guides/source/active_record_callbacks.md M guides/source/active_record_querying.md commit 545ee23 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 04:25:23 +0900 scoped_by is deprecated in AR 4 M activerecord/lib/active_record/base.rb commit 5f63816 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-01 14:14:58 -0500 Add entry in Releases Notes about changes in exceptions page M guides/source/4_0_release_notes.md commit b2e3539 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 04:07:34 +0900 Model.scoped is deprecated in favour of Model.all M actionpack/lib/action_controller/metal/streaming.rb commit f23f8d1 refs/heads/master Author: Mikhail Dieterle Date: 2013-01-01 22:06:28 +0300 a bit of inline code tags M guides/source/action_controller_overview.md commit ffbcb09 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 03:58:09 +0900 no more supporting 1.8 M guides/source/performance_testing.md commit 6f3fbc6 refs/heads/master Author: Akira Matsuda Date: 2013-01-02 03:38:15 +0900 correct raw GitHub URLs M guides/source/performance_testing.md commit c22fbea refs/heads/master Author: Akira Matsuda Date: 2013-01-02 03:35:08 +0900 "SSL everywhere" for GitHub URLs see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere M guides/source/credits.html.erb M guides/source/debugging_rails_applications.md commit c113a2f refs/heads/master Author: Guillermo Iguaran Date: 2013-01-01 13:29:04 -0500 Add CHANGELOG entry for changes in exception pages M actionpack/CHANGELOG.md commit ed28e6c refs/heads/master Author: Vijay Dev Date: 2013-01-01 23:41:13 +0530 update rake tasks output [ci skip] M guides/source/command_line.md commit d888dff refs/heads/master Author: Vijay Dev Date: 2013-01-01 23:34:34 +0530 fix alignment in rails info properties page [ci skip] M railties/lib/rails/templates/layouts/application.html.erb commit 7f5a1d3 refs/heads/master Author: Mikhail Dieterle Date: 2013-01-01 21:05:08 +0300 New hash syntax works only with symbol keys M guides/source/form_helpers.md commit 44ea013 refs/heads/master Merge: 7c6246b 47e52a6 Author: José Valim Date: 2013-01-01 09:49:52 -0800 Merge pull request #8676 from mekishizufu/skip_bundle_alias Add -B alias for --skip-bundle commit 47e52a6 refs/heads/master Author: Jiri Pospisil Date: 2013-01-01 18:36:26 +0100 Add -B alias for --skip-bundle M railties/lib/rails/generators/app_base.rb commit 1371b24 refs/heads/master Author: Mikhail Dieterle Date: 2013-01-01 20:40:59 +0300 fix wrong hash syntax M guides/source/form_helpers.md commit 7c6246b refs/heads/master Merge: 6845118 fb58c0e Author: José Valim Date: 2013-01-01 09:40:53 -0800 Merge pull request #8675 from goshakkk/cleanup Remove unnecessary always-nil var from #compact commit fb58c0e refs/heads/master Author: Gosha Arinich Date: 2013-01-01 20:35:43 +0300 remove unnecessary always-nil var from #compact M activesupport/lib/active_support/dependencies/autoload.rb commit 6845118 refs/heads/master Author: Vijay Dev Date: 2013-01-01 22:44:04 +0530 small fix in js guide [ci skip] M guides/source/working_with_javascript_in_rails.md commit c684125 refs/heads/master Author: Guillermo Iguaran Date: 2013-01-01 11:57:22 -0500 Fix indent in UnknownAction template M actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb commit a4eaecc refs/heads/master Author: Matthew Stopa Date: 2013-01-01 09:45:30 -0700 Add more documentation to TimeWithZone [ci skip] M activesupport/lib/active_support/time_with_zone.rb commit dfc930b refs/heads/master Merge: 8d945f4 a30eae1 Author: Vijay Dev Date: 2013-01-01 20:29:43 +0530 Merge branch 'master' of github.com:lifo/docrails commit a30eae1 refs/heads/master Author: Vijay Dev Date: 2013-01-01 20:28:34 +0530 copy edits [ci skip] M activesupport/lib/active_support/time_with_zone.rb commit df5c4d6 refs/heads/master Merge: f3dc158 06c7ecb Author: Vijay Dev Date: 2013-01-01 05:05:14 -0800 Merge pull request #123 from m-o/master Fixed typo one line in layouts and rendering: stylesheet_link_tag for file in subdirectory. commit ef4ac7a refs/heads/master Author: Juanjo Bazán Date: 2013-01-01 12:50:00 +0100 Inflector irregular singularize rules M activesupport/lib/active_support/inflector/inflections.rb M activesupport/test/inflector_test_cases.rb commit f3dc158 refs/heads/master Author: Ruafozy Date: 2013-01-01 10:22:18 +0000 Improve English * Fix one error * Improve wording * Improve punctuation M guides/source/form_helpers.md commit 8d945f4 refs/heads/master Merge: 56aa02f 25c8770 Author: David Heinemeier Hansson Date: 2013-01-01 02:14:23 -0800 Merge pull request #8668 from guilleiguaran/exceptions New exceptions pages for development commit 3b98fb7 refs/heads/master Author: sanemat Date: 2013-01-01 19:03:40 +0900 Add rake test description No behavior change M railties/Rakefile commit f42c089 refs/heads/master Author: Matthew Stopa Date: 2012-12-31 22:52:47 -0700 Add documentation for TimeWithZone methods M activesupport/lib/active_support/time_with_zone.rb commit 6d5385a refs/heads/master Author: Matthew Stopa Date: 2012-12-31 19:04:10 -0700 Add documentation for the TimeWithZone#dst? method. [ci skip] M activesupport/lib/active_support/time_with_zone.rb commit 56aa02f refs/heads/master Merge: e6e3a64 d814284 Author: Jeremy Kemper Date: 2012-12-31 15:18:38 -0800 Merge pull request #8667 from andrew/copyright-update Updated copyright notices for 2013 commit 25c8770 refs/heads/master Author: Guillermo Iguaran Date: 2012-12-31 18:07:21 -0500 formatted_code_for should be private M actionpack/lib/action_view/template/error.rb commit 8ecaf13 refs/heads/master Author: Guillermo Iguaran Date: 2012-12-31 17:49:05 -0500 Summary and Details HTML elements aren't supported in all modern browsers M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb commit a27c4f6 refs/heads/master Author: Guillermo Iguaran Date: 2012-12-31 16:48:10 -0500 Fix test for DebugExceptions due to template change M actionpack/test/dispatch/debug_exceptions_test.rb commit 5a1b885 refs/heads/master Author: Guillermo Iguaran Date: 2012-12-31 14:36:23 -0500 Add style to AV::Template::Error exception page M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb M actionpack/lib/action_view/template/error.rb commit d814284 refs/heads/master Author: Andrew Nesbitt Date: 2012-12-31 20:35:29 +0000 Updated copyright notices for 2013 M actionmailer/MIT-LICENSE M actionmailer/lib/action_mailer.rb M actionpack/MIT-LICENSE M actionpack/lib/action_dispatch.rb M actionpack/lib/action_pack.rb M actionpack/lib/action_view.rb M activemodel/MIT-LICENSE M activemodel/lib/active_model.rb M activerecord/MIT-LICENSE M activerecord/lib/active_record.rb M activesupport/MIT-LICENSE M activesupport/lib/active_support.rb M railties/MIT-LICENSE commit b366ec5 refs/tags/v3.2.15 Author: Xavier Noria Date: 2012-12-31 21:35:07 +0100 removes the Ajax on Rails early draft There was a few attempts at writing this guide, but we never passed from the work in progress stage. In spite of not being included in the table of contents, this draft was still indexed by bots and showed up in searches. Steve Klabnik has written "Working with JavaScript in Rails" which is going to be released with Rails 4. So better get rid of this altogether. D railties/guides/source/ajax_on_rails.textile commit 9b79bb4 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-08 22:28:46 -0500 Improve line-height to have better line spacing in exception message M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb commit 78a0d86 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-07 23:22:17 -0500 Add new style to Routing Error page M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb commit 048cd25 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-07 20:20:09 -0500 Styling for exception page M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/missing_template.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb commit e6e3a64 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-31 16:06:07 -0300 Only call MiniTest.autorun if the dependecy is present M activesupport/test/xml_mini/libxml_engine_test.rb M activesupport/test/xml_mini/libxmlsax_engine_test.rb M activesupport/test/xml_mini/nokogiri_engine_test.rb M activesupport/test/xml_mini/nokogirisax_engine_test.rb commit fe12e46 refs/heads/master Author: Guillermo Iguaran Date: 2012-04-29 18:26:37 -0500 Add source extract to detailed exception page M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb A actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb commit 90c8972 refs/heads/master Merge: 73a6a71 1564b08 Author: Rafael Mendonça França Date: 2012-12-31 09:58:09 -0800 Merge pull request #8664 from acapilleri/spawn_method refatctoring of some code repetition in spawn_methods commit 73a6a71 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-31 14:55:59 -0300 Revert "Do not install debugger in the pathlevel 362" This reverts commit 9c18b6a818801a77a90c2768e436e4690537a3ab. M Gemfile commit 1564b08 refs/heads/master Author: Angelo capilleri Date: 2012-12-31 11:23:19 +0100 refatctoring of some code repetition in spawn_methods M activerecord/lib/active_record/relation/spawn_methods.rb commit dc8091b refs/heads/master Author: Rafael Mendonça França Date: 2012-12-31 14:36:30 -0300 Use ActiveSupport::TestCase in the journey tests M actionpack/test/journey/gtg/builder_test.rb M actionpack/test/journey/gtg/transition_table_test.rb M actionpack/test/journey/nfa/simulator_test.rb M actionpack/test/journey/nfa/transition_table_test.rb M actionpack/test/journey/nodes/symbol_test.rb M actionpack/test/journey/path/pattern_test.rb M actionpack/test/journey/route/definition/parser_test.rb M actionpack/test/journey/route/definition/scanner_test.rb M actionpack/test/journey/route_test.rb M actionpack/test/journey/router/strexp_test.rb M actionpack/test/journey/router/utils_test.rb M actionpack/test/journey/router_test.rb M actionpack/test/journey/routes_test.rb commit 9c18b6a refs/heads/master Author: Rafael Mendonça França Date: 2012-12-31 14:35:50 -0300 Do not install debugger in the pathlevel 362 M Gemfile commit cf2dcf4 refs/heads/master Merge: b22c527 dbacb95 Author: Santiago Pastorino Date: 2012-12-31 09:09:11 -0800 Merge pull request #8666 from mekishizufu/fix_lambdas Fix usage of lambda as a Rack endpoint commit 348870d refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2012-12-31 15:08:00 -0200 Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present" This reverts commit e48dc194231830f42f179704596b88215f062c23, reversing changes made to d38c8caa48a732d41c7402a5e71deece4e313559. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/head.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/render_test.rb commit b22c527 refs/heads/master Merge: 5e51074 cf4afc4 Author: Rafael Mendonça França Date: 2012-12-31 14:03:55 -0300 Merge branch 'minitest_cleanup' commit cf4afc4 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-31 13:55:47 -0300 Add note on the contributing guide to not use the refute methods M guides/source/contributing_to_ruby_on_rails.md commit 5294ad8 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-28 20:49:41 -0300 Alias refute methods to assert_not and perfer assert_not on tests M actionpack/lib/action_dispatch/testing/assertions/dom.rb M actionpack/test/controller/live_stream_test.rb M actionpack/test/dispatch/live_response_test.rb M actionpack/test/dispatch/request/session_test.rb M actionpack/test/dispatch/session/abstract_store_test.rb M actionpack/test/dispatch/ssl_test.rb M actionpack/test/journey/gtg/transition_table_test.rb M actionpack/test/journey/nfa/simulator_test.rb M actionpack/test/journey/nodes/symbol_test.rb M actionpack/test/journey/path/pattern_test.rb M actionpack/test/journey/route_test.rb M actionpack/test/journey/router_test.rb M actionpack/test/journey/routes_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/connection_adapters/abstract_adapter_test.rb M activerecord/test/cases/migration/change_schema_test.rb M activerecord/test/cases/migration/column_attributes_test.rb M activerecord/test/cases/migration/index_test.rb M activerecord/test/cases/migration/references_index_test.rb M activerecord/test/cases/migration/references_statements_test.rb M activerecord/test/cases/migration_test.rb M activerecord/test/cases/migrator_test.rb M activerecord/test/cases/transactions_test.rb M activesupport/lib/active_support/test_case.rb M activesupport/test/core_ext/thread_test.rb M activesupport/test/string_inquirer_test.rb commit 6c0013f refs/heads/master Author: Rafael Mendonça França Date: 2012-12-28 16:39:29 -0300 Do not use the same tests description M actionpack/test/controller/http_token_authentication_test.rb commit d4c94ac refs/heads/master Author: Rafael Mendonça França Date: 2012-12-28 14:25:53 -0300 Remove unneeded tests These tests are needed only if we are using MiniTest::Spec D actionmailer/test/spec_type_test.rb M actionmailer/test/test_test.rb D actionpack/test/controller/spec_style_test.rb D actionpack/test/controller/spec_type_test.rb D actionpack/test/dispatch/spec_type_test.rb D actionpack/test/template/spec_type_test.rb M actionpack/test/template/test_test.rb D activesupport/test/spec_type_test.rb commit 5da4d51 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-28 16:17:37 -0300 Add active_support/testing/autorun minitest/autorun load minitest/spec polluting the global namespace with the DSL that we don't want on Rails M actionmailer/test/abstract_unit.rb M actionpack/test/abstract_unit.rb M actionpack/test/dispatch/routing/inspector_test.rb M actionpack/test/ts_isolated.rb M activemodel/test/cases/helper.rb M activerecord/test/cases/helper.rb M activerecord/test/cases/migration/change_table_test.rb A activesupport/lib/active_support/testing/autorun.rb M activesupport/test/abstract_unit.rb M activesupport/test/ts_isolated.rb M railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb M railties/lib/rails/test_help.rb M railties/test/abstract_unit.rb M railties/test/configuration/middleware_stack_proxy_test.rb M railties/test/isolation/abstract_unit.rb commit eb4930e refs/heads/master Author: Rafael Mendonça França Date: 2012-12-28 14:16:26 -0300 Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec M actionmailer/lib/action_mailer/test_case.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/lib/action_view/test_case.rb M activesupport/lib/active_support/test_case.rb M railties/test/engine_test.rb commit d58d71f refs/heads/master Author: Rafael Mendonça França Date: 2012-12-28 14:06:10 -0300 Revert "minitest provides "it" and "describe"" This reverts commit 22bc12ec374b8bdeb3818ca0a3eb787dd3ce39d8. REASON: We will remove the MiniTest::Spec from Rails and we need these methods again Conflicts: activesupport/lib/active_support/test_case.rb M activesupport/lib/active_support/test_case.rb A activesupport/lib/active_support/testing/declarative.rb commit dbacb95 refs/heads/master Author: Jiri Pospisil Date: 2012-12-31 17:46:19 +0100 Fix usage of lambda as a Rack endpoint The response body needs to respond_to? :each. M actionpack/lib/action_dispatch/routing/mapper.rb M railties/test/application/assets_test.rb M railties/test/railties/engine_test.rb commit e48dc19 refs/tags/v3.2.15 Merge: d38c8ca 55a886b Author: Santiago Pastorino Date: 2012-12-31 08:08:16 -0800 Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present backport #8662, charset should not be appended for `head` responses commit 55a886b refs/tags/v3.2.15 Author: Yves Senn Date: 2012-12-30 22:49:46 +0100 backport #8662, charset should not be appended for `head` responses 1) Failure: test_head_created_with_image_png_content_type(RenderTest) [test/controller/render_test.rb:1238]: Expected: "image/png" Actual: "image/png; charset=utf-8" M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/head.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/render_test.rb commit 5e51074 refs/heads/master Merge: 2b773e1 b8c2f3c Author: Santiago Pastorino Date: 2012-12-31 07:23:36 -0800 Merge pull request #8662 from senny/8661_should_not_append_charset_if_already_present Charset should not be appended to image/* type commit b8c2f3c refs/heads/master Author: Yves Senn Date: 2012-12-30 22:49:46 +0100 charset should not be appended for `head` responses 1) Failure: test_head_created_with_image_png_content_type(RenderTest) [test/controller/render_test.rb:1238]: Expected: "image/png" Actual: "image/png; charset=utf-8" M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/head.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/render_test.rb commit 3511e3f refs/heads/master Author: Jonathan Baudanza Date: 2012-12-30 20:21:20 -0800 Update guides/source/rails_on_rack.md Rack::Lock actually sets rack.multithread to `false`, not `true`. Presumably because once inside the mutex, the app can function as if it were single threaded. M guides/source/rails_on_rack.md commit 2b773e1 refs/heads/master Author: Santiago Pastorino Date: 2012-12-30 23:50:26 -0200 Define [], []=, permanent, signed and encrypted as the only allowed methods for the non Raw Cookie classes M actionpack/lib/action_dispatch/middleware/cookies.rb commit 5e80b25 refs/heads/master Merge: 1304298 4f0f1b5 Author: Santiago Pastorino Date: 2012-12-30 16:07:23 -0800 Merge pull request #8546 from hsbt/fix-testcase-strict-warning fix testcase: ruby-2.0.0 warned unused variables commit 46af32a refs/heads/master Author: Joey Schoblaska Date: 2012-12-30 16:47:19 -0600 fixed inconsistent `require 'test_helper'` in testing guide M guides/source/testing.md commit 1304298 refs/heads/master Author: Guillermo Iguaran Date: 2012-12-30 16:07:09 -0500 Revert "Rails 4.0 is going to depend on Rack 1.5.x so let's test against Rack master" This reverts commit fba97c9620e709f0449ea9f3240b9e5174f72e1e. M Gemfile commit 3755a49 refs/heads/master Author: Santiago Pastorino Date: 2012-12-30 15:59:24 -0200 Point to guides.rubyonrails.org instead of edgeguides.rubyonrails.org M activerecord/lib/active_record/railtie.rb commit 1202170 refs/heads/master Merge: 219e831 494cfc3 Author: Rafael Mendonça França Date: 2012-12-30 09:58:08 -0800 Merge pull request #8651 from tjouan/activerecord-structure_dump-ending_nl Fix missing ending newline in db structure dump: commit 219e831 refs/heads/master Author: Santiago Pastorino Date: 2012-12-30 15:43:40 -0200 Improve secret_token deprecation message M railties/lib/rails/application.rb commit 494cfc3 refs/heads/master Author: Thibault Jouan Date: 2012-12-27 21:50:55 +0000 Fix missing ending newline in db structure dump: When dumping database structure with `rake db:structure:dump` and using migrations, the resulting file will not end with a newline char. Although it's not mandatory, it breaks a lot of simple use cases with programs like cat, more, grep, etc. This changes use `puts' instead of `<<' to append migration versions data to the dump and also split the line where this is happening as it was a bit long. M activerecord/lib/active_record/railties/databases.rake commit 06c7ecb refs/heads/master Author: Marek Ovečka Date: 2012-12-30 15:07:36 +0100 Update guides/source/layouts_and_rendering.md Removed first slash. The subdirectory will nto be found with slash befor it. M guides/source/layouts_and_rendering.md commit 257b3f6 refs/heads/master Merge: 2e92a23 92ab7ac Author: Guillermo Iguaran Date: 2012-12-30 01:28:10 -0800 Merge pull request #8656 from arunagw/warning_removed_shadowing_var warning removed: shadowing outer local variable commit 92ab7ac refs/heads/master Author: Arun Agrawal Date: 2012-12-30 14:55:27 +0530 warning removed: shadowing outer local variable M activerecord/lib/active_record/relation/calculations.rb commit 2e92a23 refs/heads/master Merge: fba97c9 95343f6 Author: Vijay Dev Date: 2012-12-29 13:15:32 -0800 Merge pull request #8647 from nishantmodak/patch-2 Update documentation for yml usage commit fba97c9 refs/heads/master Author: Santiago Pastorino Date: 2012-12-29 19:04:42 -0200 Rails 4.0 is going to depend on Rack 1.5.x so let's test against Rack master M Gemfile commit 9a49758 refs/heads/master Author: Nishant Modak Date: 2012-12-30 02:33:57 +0530 Update documentation for yml usage Update documentation for yml usage against https://github.com/rails/rails/issues/8612 M guides/source/testing.md commit 95343f6 refs/heads/master Author: Nishant Modak Date: 2012-12-30 01:59:07 +0530 Update documentation for yml usage M guides/source/testing.md commit 0dad3ed refs/heads/master Author: Sammy Larbi Date: 2012-12-29 11:11:45 -0600 Document JoinTable migration generator M guides/source/migrations.md commit 7b34c5c refs/heads/master Merge: 1d38c82 0b79a93 Author: Guillermo Iguaran Date: 2012-12-29 08:56:29 -0800 Merge pull request #8650 from codeodor/patch-1 Fix up/down column change example code formatting commit 0b79a93 refs/heads/master Author: Sammy Larbi Date: 2012-12-29 10:50:05 -0600 Fix up/down column change example code formatting M guides/source/migrations.md commit 1d38c82 refs/heads/master Author: Aaron Patterson Date: 2012-12-29 00:07:10 -0800 add missing require and fixtures M activerecord/test/cases/adapters/postgresql/timestamp_test.rb commit 160af90 refs/heads/master Author: Aaron Patterson Date: 2012-12-28 23:09:50 -0800 fix time typcasting on group counts in PG M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/adapters/postgresql/timestamp_test.rb commit 8faf2b3 refs/heads/master Author: Aaron Patterson Date: 2012-12-28 22:45:24 -0800 mysql does not return alias names, so fall back M activerecord/lib/active_record/relation/calculations.rb commit 8a130ec refs/heads/master Author: Jeremy Kemper Date: 2012-12-28 21:47:42 -0700 Test that assert_not returns true. Use assert_raises instead of doing begin/rescue/else. M activesupport/test/test_test.rb commit 54a6518 refs/heads/master Author: Aaron Patterson Date: 2012-12-28 19:11:02 -0800 fix PG typecasting errors M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit ac65949 refs/heads/master Merge: 70e3ee3 6415d3a Author: Rafael Mendonça França Date: 2012-12-28 14:24:51 -0800 Merge pull request #8644 from acapilleri/abstract_mysql small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter commit 6415d3a refs/heads/master Author: Angelo Capilleri Date: 2012-12-28 23:18:48 +0100 small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb commit 70e3ee3 refs/heads/master Merge: 1e9d6e7 d1f2155 Author: Rafael Mendonça França Date: 2012-12-28 13:37:46 -0800 Merge pull request #8636 from senny/work_off_fixme_in_rename_column_test work off FIXME in rename_column_test commit d1f2155 refs/heads/master Author: Yves Senn Date: 2012-12-28 01:46:36 +0100 work off FIXME comments in AR rename_column_test.rb There were a couple of tests, which had FIXME comments in palce of assertions. I replaced these FIXME comments with actual assertions to get more feedback from our test suite. M activerecord/test/cases/migration/rename_column_test.rb commit 1e9d6e7 refs/heads/master Author: Jeremy Kemper Date: 2012-12-28 14:23:01 -0700 Revert "Install binstubs by default" This reverts commit f34c27a452418d8aa17f92bb0fd7ae97b5f7e252. We'll be taking a different tack on this with new `bundle binstubs ` support. M railties/lib/rails/generators/app_base.rb M railties/test/generators/shared_generator_tests.rb commit a79300a refs/heads/master Author: Jeremy Kemper Date: 2012-12-28 14:20:27 -0700 Revert "Detect rbenv and update the shebang" This reverts commit 7173c4f931c9026bd3bc0b644d93dae744433f09. This reverts commit a562f9fa09967eba26dff1c3bc8aa85b6f0a72ff. M railties/lib/rails/generators/app_base.rb D railties/test/fixtures/path/ruby-local-exec M railties/test/generators/shared_generator_tests.rb commit 427544e refs/heads/master Merge: 90397de 896a049 Author: Vijay Dev Date: 2012-12-29 00:19:51 +0530 Merge branch 'master' of github.com:lifo/docrails commit 896a049 refs/heads/master Author: Vijay Dev Date: 2012-12-29 00:15:22 +0530 Revert "Add rake test description" This reverts commit a3309caf338830849acd826bc6ad14f972e787db. Reason: docrails isn't the place to do this. [ci skip] M railties/Rakefile commit 09a347f refs/heads/master Author: Vijay Dev Date: 2012-12-29 00:08:37 +0530 Revert "Add rake default to description" This reverts commit 0d8ca8124de9b3a5f6398a28d79baca935a1f96c. Reason: docrails isn't the place to do this. Also, I feel this is not really required. [ci skip] M railties/Rakefile commit 8dd2c71 refs/heads/master Author: Vijay Dev Date: 2012-12-29 00:07:02 +0530 Revert "reminder to run bundle after setting up rails-dev-box" This reverts commit 41381c19d1f3920ee9540aff0d35209cb43fb057. Reason: This doesn't quite fit the flow where it's added. Let's add this someplace else if it's explicitly required. [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit 90397de refs/heads/master Merge: f75addd f71aa35 Author: Steve Klabnik Date: 2012-12-28 09:57:47 -0800 Merge pull request #8641 from arunagw/warning_removed_unused_var Remove 'assigned but unused variable' warning commit f71aa35 refs/heads/master Author: Arun Agrawal Date: 2012-12-28 23:14:59 +0530 Remove 'assigned but unused variable' warning M activesupport/lib/active_support/core_ext/class/attribute.rb commit f75addd refs/heads/master Author: Jeremy Kemper Date: 2012-12-28 10:34:26 -0700 Introduce assert_not to replace 'assert !foo' M activesupport/CHANGELOG.md M activesupport/lib/active_support/testing/assertions.rb M activesupport/test/test_test.rb commit 6b18a79 refs/heads/master Author: Jeremy Kemper Date: 2012-12-27 13:48:01 -0700 Consistent punctuation for @jaroslawr :bowtie: M railties/lib/rails/generators/rails/app/templates/gitignore commit 88a6883 refs/heads/master Merge: 2283a1d e68505a Author: Rafael Mendonça França Date: 2012-12-27 09:33:53 -0800 Merge pull request #8634 from senny/rewrite_order_dependent_test_case rewrite order dependent test case commit e63b752 refs/heads/master Author: Fabrizio Regini Date: 2012-12-27 18:11:21 +0100 Fixed couple of typos M guides/source/active_support_instrumentation.md commit e68505a refs/heads/master Author: Yves Senn Date: 2012-12-27 17:28:42 +0100 rewrite order dependent test case. #8185 As reported (https://github.com/rails/rails/pull/8185#issuecomment-11702226) this test relied on the order a hash was serialized. Comparing the parsed hash makes the test no longer order dependent. M activesupport/test/json/encoding_test.rb commit 2283a1d refs/heads/master Merge: b821094 d5277b8 Author: Rafael Mendonça França Date: 2012-12-26 21:25:28 -0800 Merge pull request #8627 from schneems/schneems/routes-1-9 Ruby 1.9 style hash in Route Inspector commit d5277b8 refs/heads/master Author: schneems Date: 2012-12-27 00:12:51 -0500 Ruby 1.9 style hash in Route Inspector M actionpack/lib/action_dispatch/routing/inspector.rb commit b821094 refs/heads/master Author: Jeremy Kemper Date: 2012-12-26 21:02:24 -0700 Make test logs easier to read. Tagging every message in tests makes the logs really wide. It's great for grepping, but annoying to open in an editor or a narrow terminal. Try out a different approach: spit out a heading before each test. M activesupport/lib/active_support/testing/tagged_logging.rb M activesupport/test/test_test.rb commit 42d9b48 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 23:30:38 -0300 Extract the component rendering of collection_radio_buttons and collection_check_boxes to a private method. It will make easier to extend. Example: class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons include CollectionExtensions def render wrap_rendered_collection(super, @options) end private def render_component(builder) builder.radio_button + builder.label(:class => "collection_radio_buttons") end end M actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb M actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb commit ceedec7 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 23:00:31 -0300 Fix collection_radio_buttons with the option `:checked` with value of `false` M actionpack/lib/action_view/helpers/tags/collection_helpers.rb M actionpack/test/template/form_collections_helper_test.rb commit 52691c3 refs/heads/master Author: Colin Kelley Date: 2012-12-26 17:02:54 -0800 removed TIP: :allow_nil/:allow_blank is ignored by the presence validator These tips were documenting an inconsistency issue https://github.com/rails/rails/issues/8621. That issue is resolved by https://github.com/rails/rails/issues/8622. M guides/source/active_record_validations.md commit b05819f refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 20:39:32 -0300 This change doesn't need a CHANGELOG entry. [ci skip] M activemodel/CHANGELOG.md commit d38c8ca refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-26 20:20:02 -0300 Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options." This reverts commit 93366c7c913bf0883f140fa782d3e198593477be. REASON: This is backward incompatible. Also this behavior is documented on the guides. M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations/presence.rb M activemodel/test/cases/validations/presence_validation_test.rb commit 9647d4b refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 19:08:08 -0300 Add CHANGELOG entry for #8622 M activemodel/CHANGELOG.md M activemodel/test/cases/validations/presence_validation_test.rb commit 14a61bb refs/heads/master Merge: 78fd14c 513331d Author: Santiago Pastorino Date: 2012-12-26 14:06:13 -0800 Merge pull request #8598 from NARKOZ/refactor-highlight refactor highlight method: return fast if text or phrases are blank commit 93366c7 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-26 19:05:03 -0300 Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options. Fix #8621 [Colin Kelley + Rafael Mendonça França] M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations/presence.rb M activemodel/test/cases/validations/presence_validation_test.rb commit 78fd14c refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 18:20:48 -0300 Revert the change at ActiveModel::Errors#add_on_blank and fix in the right place. The EachValidator#validate already handle :allow_blank and :allow_nil, correctly. Closes #8622. Fix #8621. M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/validations/presence.rb M activemodel/test/cases/validations/presence_validation_test.rb commit d4c30a0 refs/heads/master Author: Colin Kelley Date: 2012-12-26 10:31:05 -0800 Tests and fix for validates_presence of :allow_nil, :allow_blank Conflicts: activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/errors.rb M activemodel/test/cases/validations/presence_validation_test.rb commit c009e86 refs/heads/master Author: virusman Date: 2012-12-26 23:53:42 +0400 Test nested fields with AssociationProxy mockup & fix AssociationProxy support in form helper M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/test/template/form_helper_test.rb commit d9ce4fa refs/heads/master Author: Steve Klabnik Date: 2012-12-26 15:24:22 -0500 Note about migration timestamps. We should mention that the ordering matters with regards to timestamps, and not imply that it's just for uniqueness purposes. Closes #8610. M guides/source/migrations.md commit 8c938dd refs/tags/v3.2.15 Merge: 885f59f 5203b6d Author: Rafael Mendonça França Date: 2012-12-26 07:41:51 -0800 Merge pull request #8618 from senny/backport_8612 backport #8616, quote column names in generated fixture files commit 5203b6d refs/tags/v3.2.15 Author: Yves Senn Date: 2012-12-26 15:16:09 +0100 backport #8616, quote column names in generated fixture files Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/test_unit/model/model_generator.rb railties/lib/rails/generators/test_unit/model/templates/fixtures.yml railties/test/generators/model_generator_test.rb M railties/CHANGELOG.md M railties/lib/rails/generators/test_unit/model/model_generator.rb M railties/lib/rails/generators/test_unit/model/templates/fixtures.yml M railties/test/generators/model_generator_test.rb commit 899cae2 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 12:23:39 -0300 Consistent use of single and double quotes M railties/test/generators/model_generator_test.rb commit d792737 refs/heads/master Merge: 5d80da8 edae477 Author: Rafael Mendonça França Date: 2012-12-26 07:20:46 -0800 Merge pull request #8616 from senny/8612_respect_yaml_keywords quote column names in generated fixture files commit 5d80da8 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 12:19:09 -0300 Fix CHANGELOG style [ci skip] M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md commit edae477 refs/heads/master Author: Yves Senn Date: 2012-12-26 15:16:09 +0100 quote column names in generated fixture files M railties/CHANGELOG.md M railties/lib/rails/generators/test_unit/model/model_generator.rb M railties/lib/rails/generators/test_unit/model/templates/fixtures.yml M railties/test/generators/model_generator_test.rb commit e72790c refs/heads/master Merge: 84d38f6 5a3dc80 Author: Rafael Mendonça França Date: 2012-12-26 07:16:56 -0800 Merge pull request #5100 from paukul/validate_on_condition_on_transaction_callbacks Validate :on option on after_commit and after_rollback callbacks commit 84d38f6 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-26 12:15:18 -0300 We need to check explictly that env['action_dispatch.show_exceptions'] is false. If it is nil we can't raise the exception M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit 8fe1dfd refs/heads/master Merge: 61b91c4 7731fd8 Author: Rafael Mendonça França Date: 2012-12-26 06:41:56 -0800 Merge pull request #8600 from shime/patch-1 more descriptive return parameters commit 7731fd8 refs/heads/master Author: Hrvoje Šimić Date: 2012-12-26 14:17:11 +0100 more descriptive return parameters M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit 61b91c4 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-26 13:02:59 +0100 Revert "Ignore /bin on new apps" -- given the move to default binstubs, we want you to check those in! This reverts commit 35c554f0bf518e1068e79002a462c3deba649e9b. M railties/lib/rails/generators/rails/app/templates/gitignore commit 5a3dc80 refs/heads/master Author: Pascal Friederich Date: 2012-12-25 19:35:52 +0100 validate :on option on after_commit and after_rollback callbacks M activerecord/CHANGELOG.md M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transaction_callbacks_test.rb commit 227d4e9 refs/heads/master Merge: ea6cddd 8787c6e Author: Rafael Mendonça França Date: 2012-12-25 13:55:37 -0800 Merge pull request #8608 from senny/8576_cant_inherit_from_deprecated_buffered_logger deprecation warning when BufferedLogger is instantiated commit ea6cddd refs/heads/master Merge: 95fa0e6 6c8a48e Author: Guillermo Iguaran Date: 2012-12-25 11:48:20 -0800 Merge pull request #8609 from senny/buffered_logger_documentation replace AS::BufferedLogger doc mentions with AS::Logger commit 6c8a48e refs/heads/master Author: Yves Senn Date: 2012-12-25 20:39:23 +0100 replace AS::BufferedLogger doc mentions with AS::Logger M guides/source/configuring.md M guides/source/debugging_rails_applications.md M guides/source/performance_testing.md commit 8787c6e refs/heads/master Author: Yves Senn Date: 2012-12-25 20:21:14 +0100 deprecation warning when BufferedLogger is instantiated M activesupport/lib/active_support/buffered_logger.rb M activesupport/test/deprecation/buffered_logger_test.rb commit 95fa0e6 refs/heads/master Merge: 501175e 433ebbd Author: Rafael Mendonça França Date: 2012-12-25 07:00:35 -0800 Merge pull request #8607 from senny/8576_cant_inherit_from_deprecated_buffered_logger ActiveSupport::BufferedLogger can be subclassed commit 433ebbd refs/heads/master Author: Yves Senn Date: 2012-12-25 15:50:35 +0100 ActiveSupport::BufferedLogger can be subclassed M activesupport/lib/active_support/buffered_logger.rb A activesupport/test/deprecation/buffered_logger_test.rb commit 501175e refs/heads/master Merge: 0e4fb15 7f7c09c Author: Guillermo Iguaran Date: 2012-12-24 20:29:52 -0800 Merge pull request #8592 from rafaelfranca/warning_fix Remove warning of intance variable not initialized commit 0e4fb15 refs/heads/master Merge: 26c024e c651cc9 Author: Guillermo Iguaran Date: 2012-12-24 13:39:35 -0800 Merge pull request #8604 from zoltankiss/minor_fixes minor grammar fix commit c651cc9 refs/heads/master Author: Zoltan Kiss Date: 2012-12-24 15:20:05 -0600 minor grammar fix M activesupport/test/configurable_test.rb commit 26c024e refs/heads/master Author: Xavier Noria Date: 2012-12-24 21:14:02 +0100 silences "possibly useless use of :: in void context" warnings The AS utility silence_warnings does not really silence this one, because it is issued at parse-time. It seemed to in some places because the constant was the only expression in the block and therefore it was its return value, that could potentially be used by silence_warnings are return value of the yield call. To bypass the warning we assign to a variable. The chosen variable is "_" because it is special-cased in parse.c not to issue an "assigned but unused variable" warning in turn. M activesupport/test/dependencies_test.rb commit 513331d refs/heads/master Author: Nihad Abbasov Date: 2012-12-24 20:56:32 +0400 fetch highlighter option only when needed M actionpack/lib/action_view/helpers/text_helper.rb commit ef5d857 refs/heads/master Merge: 0a752e8 08cf17d Author: Rafael Mendonça França Date: 2012-12-24 07:50:58 -0800 Merge pull request #8601 from amatsuda/chmod_x chmod -x from non-script files commit 08cf17d refs/heads/master Author: Akira Matsuda Date: 2012-12-24 23:35:46 +0900 chmod -x from non-script files M activemodel/lib/active_model/serializers/xml.rb M activemodel/test/cases/serializers/xml_serialization_test.rb commit 41381c1 refs/heads/master Author: Ace Suares Date: 2012-12-24 08:14:14 -0400 reminder to run bundle after setting up rails-dev-box M guides/source/contributing_to_ruby_on_rails.md commit a3309ca refs/heads/master Author: sanemat Date: 2012-12-24 17:10:18 +0900 Add rake test description M railties/Rakefile commit 0d8ca81 refs/heads/master Author: sanemat Date: 2012-12-24 17:09:54 +0900 Add rake default to description M railties/Rakefile commit 0a752e8 refs/heads/master Merge: c80fcce e8cf06e Author: Rafael Mendonça França Date: 2012-12-23 20:07:20 -0800 Merge pull request #8595 from amatsuda/regex_warning "warning: ambiguous first argument; put parentheses or even spaces" commit e8cf06e refs/heads/master Author: Akira Matsuda Date: 2012-12-24 13:04:08 +0900 "warning: ambiguous first argument; put parentheses or even spaces" M actionpack/lib/action_controller/metal/http_authentication.rb commit c80fcce refs/heads/master Merge: 33e52d3 a2ce1de Author: Guillermo Iguaran Date: 2012-12-23 19:28:24 -0800 Merge pull request #8594 from amatsuda/rm_sqlite2 I don't think we're supporting SQLite 2 commit a2ce1de refs/heads/master Author: Akira Matsuda Date: 2012-12-24 12:23:39 +0900 we're not supporting SQLite 2 M actionpack/test/active_record_unit.rb commit 33e52d3 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-23 23:56:43 -0300 Explicit options should have precedence over railsrc on the `rails new` command Closes #8545 M railties/CHANGELOG.md M railties/lib/rails/commands/application.rb commit a1a4957 refs/heads/master Merge: 7ab469c 2e02752 Author: Rafael Mendonça França Date: 2012-12-23 17:57:51 -0800 Merge pull request #8593 from shime/master another little documentation fix commit 2e02752 refs/heads/master Author: Hrvoje Šimić Date: 2012-12-24 02:50:32 +0100 remove duplication from Rails::Application docs M railties/lib/rails/application.rb commit 7f7c09c refs/heads/master Author: Rafael Mendonça França Date: 2012-12-23 20:32:09 -0300 Remove warning of intance variable not initialized M activesupport/lib/active_support/core_ext/thread.rb commit fb06fe4 refs/tags/v3.0.18 (tag: v3.0.18) Author: Aaron Patterson Date: 2012-12-23 14:30:59 -0800 bumping to 3.0.18 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit f1e977c refs/tags/v3.1.9 (tag: v3.1.9) Author: Aaron Patterson Date: 2012-12-23 13:38:54 -0800 bumping version to 3.1.9 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 8ba3df0 refs/tags/v3.2.10 (tag: v3.2.10) Author: Aaron Patterson Date: 2012-12-23 13:36:49 -0800 bumping version to 3.2.10 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 2aa70bd refs/tags/v3.2.15 Merge: 885f59f 325669f Author: Aaron Patterson Date: 2012-12-23 11:52:05 -0800 Merge branch '3-2-sec' into 3-2-secmerge * 3-2-sec: CVE-2012-5664 options hashes should only be extracted if there are extra parameters updating changelog updating the changelogs updating the changelog for the CVE Add release date of Rails 3.2.9 to documentation Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md commit 9de9b35 refs/tags/v2.3.15 Author: Aaron Patterson Date: 2012-12-23 11:07:07 -0800 CVE-2012-5664 options hashes should only be extracted if there are extra parameters M activerecord/lib/active_record/base.rb M activerecord/test/cases/finder_test.rb commit 3542641 refs/tags/v3.0.18 Author: Aaron Patterson Date: 2012-12-23 11:07:07 -0800 CVE-2012-5664 options hashes should only be extracted if there are extra parameters M activerecord/lib/active_record/base.rb M activerecord/test/cases/finder_test.rb commit 826548b refs/tags/v3.0.18 Author: Aaron Patterson Date: 2012-12-22 21:49:03 -0800 updating changelogs M actionmailer/CHANGELOG M actionpack/CHANGELOG M activemodel/CHANGELOG M activerecord/CHANGELOG M activeresource/CHANGELOG M activesupport/CHANGELOG M railties/CHANGELOG commit c42f548 refs/tags/v3.1.9 Author: Aaron Patterson Date: 2012-12-23 11:07:07 -0800 CVE-2012-5664 options hashes should only be extracted if there are extra parameters M activerecord/lib/active_record/base.rb M activerecord/test/cases/finder_test.rb commit fbe436b refs/tags/v3.1.9 Author: Aaron Patterson Date: 2012-12-22 21:41:05 -0800 updating changelogs M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit 325669f refs/tags/v3.2.10 Author: Aaron Patterson Date: 2012-12-23 11:07:07 -0800 CVE-2012-5664 options hashes should only be extracted if there are extra parameters M activerecord/lib/active_record/dynamic_matchers.rb M activerecord/test/cases/finder_test.rb commit 7d592ba refs/tags/v3.2.10 Author: Aaron Patterson Date: 2012-12-23 11:04:02 -0800 updating changelog M activerecord/CHANGELOG.md commit 6727ac6 refs/tags/v3.2.10 Author: Aaron Patterson Date: 2012-12-22 21:34:47 -0800 updating the changelogs M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activeresource/CHANGELOG.md M railties/CHANGELOG.md commit 784a386 refs/tags/v3.2.10 Author: Aaron Patterson Date: 2012-12-22 21:34:17 -0800 updating the changelog for the CVE M activerecord/CHANGELOG.md commit acc2aa4 refs/tags/v3.2.10 Author: claudiob Date: 2012-11-12 16:07:36 -0800 Add release date of Rails 3.2.9 to documentation Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit 7ab469c refs/heads/master Merge: a4d21f7 a4932d6 Author: Carlos Antonio da Silva Date: 2012-12-23 08:16:07 -0800 Merge pull request #8588 from marcandre/fix_reversible Fix Migration#reversible by not using `transaction`. commit a4d21f7 refs/heads/master Author: Yehuda Katz Date: 2012-12-22 23:05:39 -0800 Fix spacing regression in scaffold generator M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit e738acd refs/heads/master Author: Guillermo Iguaran Date: 2012-12-22 23:46:51 -0500 Fix syntax error in controller template M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit a4932d6 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-12-22 12:10:40 -0500 Fixes for PR [#8267] * Fix Migration#reversible by not using `transaction`. * Adapt mysql adapter to updated api for remove_column * Update test after aedcd683684d08eaf30623a4b48ce31a31426372 M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/invertible_migration_test.rb M railties/test/application/rake/migrations_test.rb commit 7b5d466 refs/heads/master Author: Xavier Noria Date: 2012-12-22 22:43:10 +0100 adds kindlerb to the :doc bundle group for guides generation M Gemfile commit 35c554f refs/heads/master Author: José Valim Date: 2012-12-22 21:21:06 +0100 Ignore /bin on new apps M railties/lib/rails/generators/rails/app/templates/gitignore commit a562f9f refs/heads/master Author: Yehuda Katz Date: 2012-12-22 12:18:35 -0800 Forgot to check in railties fixture for binstubs A railties/test/fixtures/path/ruby-local-exec commit cb025f8 refs/heads/master Author: Yehuda Katz Date: 2012-12-22 12:18:13 -0800 Add --no-html to scaffold generator M railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit 7173c4f refs/heads/master Author: Yehuda Katz Date: 2012-12-22 11:13:10 -0800 Detect rbenv and update the shebang M railties/lib/rails/generators/app_base.rb M railties/test/generators/shared_generator_tests.rb commit f34c27a refs/heads/master Author: Yehuda Katz Date: 2012-12-22 10:57:50 -0800 Install binstubs by default M railties/lib/rails/generators/app_base.rb M railties/test/generators/shared_generator_tests.rb commit cba0588 refs/heads/master Merge: 8a39d83 c2267db Author: Guillermo Iguaran Date: 2012-12-22 00:38:56 -0800 Merge pull request #8085 from acapilleri/format_never_nil if format is unknown NullMimeTypeObject is returned commit c2267db refs/heads/master Author: Angelo Capilleri Date: 2012-12-22 09:18:01 +0100 return Mime::NullType if format is unknown If a request has an unknown format, the methods html?, xml?, json? ...etc not raise an Exception. This patch add a class Mime::NullType, that is returned when request.format is unknown and it responds false to the methods that ends with '?' and true to 'nil?'. It refers to #7837, this issue is considered a improvement not a bug. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/test/controller/send_file_test.rb M actionpack/test/dispatch/request_test.rb commit 8a39d83 refs/heads/master Merge: f9da785 749a745 Author: Rafael Mendonça França Date: 2012-12-21 23:52:44 -0800 Merge pull request #8586 from balexand/cache_digests_regex Digestor explicit dependency should not contain trailing whitespace commit 749a745 refs/heads/master Author: Brian Alexander Date: 2012-12-21 14:51:41 -0700 Digestor explicit dependency should not contain trailing whitespace test for rails/rails#8586 M actionpack/lib/action_view/digestor.rb M actionpack/test/fixtures/digestor/messages/show.html.erb M actionpack/test/template/digestor_test.rb commit f9da785 refs/heads/master Author: Jeremy Kemper Date: 2012-12-21 15:42:47 -0800 Move background jobs to the 'jobs' branch until fully baked. Not shipping with Rails 4.0. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer.rb M actionmailer/lib/action_mailer/base.rb D actionmailer/lib/action_mailer/queued_message.rb M actionmailer/lib/action_mailer/railtie.rb M actionmailer/test/abstract_unit.rb M actionmailer/test/base_test.rb D actionmailer/test/mailers/async_mailer.rb M actionpack/test/controller/assert_select_test.rb D activesupport/lib/active_support/queueing.rb D activesupport/test/queueing/synchronous_queue_test.rb D activesupport/test/queueing/test_queue_test.rb D activesupport/test/queueing/threaded_consumer_test.rb M guides/source/4_0_release_notes.md M guides/source/action_mailer_basics.md M guides/source/configuring.md M railties/CHANGELOG.md M railties/lib/rails.rb M railties/lib/rails/application.rb M railties/lib/rails/application/configuration.rb M railties/lib/rails/application/finisher.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt M railties/test/application/initializers/frameworks_test.rb D railties/test/application/queue_test.rb commit 10c0a3b refs/heads/master Merge: bc8d2f6 b02ebe7 Author: Steve Klabnik Date: 2012-12-21 15:54:13 -0800 Merge pull request #8471 from kytrinyx/refactor-xml-to-hash WIP Refactor xml conversion to hash commit b02ebe7 refs/heads/master Author: Steve Klabnik + Katrina Owen Date: 2012-12-21 22:38:52 +0000 Refactor Hash.from_xml. Three basic refactors in this PR: * We extracted the logic into a method object. We now don't define a tone of extraneous methods on Hash, even if they were private. * Extracted blocks of the case statement into methods that do the work. This makes the logic more clear. * Extracted complicated if clauses into their own query methods. They often have two or three terms, this makes it much easier to see what they _do_. We took care not to refactor too much as to not break anything, and put comments where we suspect tests are missing. We think ActiveSupport::XMLMini might be a good candidate to move to a plugin in the future. M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit bc8d2f6 refs/heads/master Merge: 625699a 6b692ee Author: Rafael Mendonça França Date: 2012-12-21 15:31:15 -0800 Merge pull request #8574 from alindeman/rails_env Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set (e.g., in Pow) commit 625699a refs/heads/master Merge: 4da76d7 f71cca9 Author: Steve Klabnik Date: 2012-12-21 15:25:10 -0800 Merge pull request #7312 from krainboltgreene/http-token-parser-bug Http token parser bug commit 6b692ee refs/heads/master Author: Andy Lindeman Date: 2012-12-20 17:41:52 -0500 Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set (e.g., in Pow) * Fixes #8025 M activerecord/lib/active_record/migration.rb M railties/test/application/configuration_test.rb commit 33b3fa6 refs/heads/master Author: Andy Lindeman Date: 2012-12-20 17:40:02 -0500 Revert "Make sure that RAILS_ENV is set when accessing Rails.env" This reverts commit b3125c89f42968bec6ee0b92ab93e36dbc36d5c3. * It is not desirable to set `ENV['RAILS_ENV']`; otherwise, it will leak through to rake tasks such as `rake test` or `rake spec`. See #7175 for more details. M railties/CHANGELOG.md M railties/lib/rails.rb commit 4da76d7 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-21 19:55:23 -0200 Remove duplicated methods in command recorder and duplicated test name M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/create_join_table_test.rb commit 2976282 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-21 19:54:44 -0200 Fix calling quote column name in interpolated string M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 68e91da refs/heads/master Merge: 59ea907 a81845f Author: Aaron Patterson Date: 2012-12-21 13:22:52 -0800 Merge pull request #8267 from marcandre/reversible_drop_table_etc Reversible commands commit 59ea907 refs/heads/master Merge: ecc7751 e176580 Author: Guillermo Iguaran Date: 2012-12-21 12:50:09 -0800 Merge pull request #8584 from garysweaver/security_guide_update Updated security guide to reference secret_key_base instead of secret_token commit e176580 refs/heads/master Author: Gary S. Weaver Date: 2012-12-21 15:44:49 -0500 Updated security guide to reference secret_key_base instead of secret_token, with a little information about the change from CookieStore to EncryptedCookieStore. M guides/source/security.md commit ecc7751 refs/heads/master Merge: bda1937 4a9644a Author: Rafael Mendonça França Date: 2012-12-21 17:39:03 -0300 Merge pull request #7376 from dmitriy-kiriyenko/fix-double-callback-in-same-statement Prevent callback from being set twice. Conflicts: activesupport/CHANGELOG.md commit bda1937 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-21 17:10:41 -0300 Remove CHANGELOG entry for ActiveModel::Errors#add_on_present M activemodel/CHANGELOG.md commit ac6941f refs/heads/master Author: Rafael Mendonça França Date: 2012-12-21 17:10:16 -0300 Use :present as key for the absence validatior message M activemodel/lib/active_model/locale/en.yml M activemodel/lib/active_model/validations/absence.rb commit b437053 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-21 17:04:37 -0300 Remove ActiveModel::Errors#add_on_present method. We don't need to define a new method in ActiveMode::Errors for each validatior. See https://github.com/rails/rails/commit/d72a07f1d1478db9daed847eadb35bfd840674f6#commitcomment-2325333 M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/validations/absence.rb M activemodel/lib/active_model/validator.rb commit 8ee1c26 refs/heads/master Merge: 48b40ec d2b1584 Author: Guillermo Iguaran Date: 2012-12-21 12:03:43 -0800 Merge pull request #8581 from garysweaver/security_guide_update Update security guide commit d2b1584 refs/heads/master Author: Gary S. Weaver Date: 2012-12-21 14:59:09 -0500 Updated security guide with information about secret_token.rb and to suggest securing sensitive files like database.yml and secret_token.rb M guides/source/security.md commit 885f59f refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-21 14:15:33 -0300 Serialized attribute can be serialized in an integer column Fix #8575 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/serialization.rb activerecord/test/cases/serialized_attribute_test.rb activerecord/test/models/person.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/test/cases/base_test.rb M activerecord/test/models/person.rb M activerecord/test/schema/schema.rb commit 48b40ec refs/heads/master Author: Rafael Mendonça França Date: 2012-12-21 15:59:13 -0300 BufferedLogger is deprecated too. M activesupport/lib/active_support/core_ext/logger.rb commit b37b6b7 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-21 15:56:07 -0300 Fix broken test for postgresql For some reason postgresql doesn't pass an integer value to load. cc @tenderlove M activerecord/test/models/person.rb commit a81845f refs/heads/master Author: Marc-Andre Lafortune Date: 2012-12-19 14:46:16 -0500 Update Migration and 4.0 Release Guides, Changelogs [#8267] M activerecord/CHANGELOG.md M guides/source/4_0_release_notes.md M guides/source/migrations.md M railties/CHANGELOG.md commit 06c7ba8 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-12-19 01:44:42 -0500 Make execute, change_column and remove_columns methods actually irreversible [#8267] M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/command_recorder_test.rb commit e43e8e2 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-12-18 23:32:45 -0500 Make change_table reversible when possible [#8267] M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/command_recorder_test.rb commit aedcd68 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-12-18 19:43:33 -0500 Migration generators use `change` even for destructive methods [#8267] M activerecord/lib/rails/generators/active_record/migration/templates/migration.rb M railties/test/generators/migration_generator_test.rb commit 7204d3c refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-19 02:29:26 -0500 Factorize methods that are easily reversible [#8267] M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/command_recorder_test.rb commit 3132324 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-19 02:12:40 -0500 Make remove_index reversible [#8267] M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/command_recorder_test.rb commit e28ddea refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-19 01:34:12 -0500 Differentiate between remove_column and remove_columns. Make remove_column reversible. [#8267] M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/change_table_test.rb M activerecord/test/cases/migration/command_recorder_test.rb commit af871a0 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-19 01:12:36 -0500 Make drop_table reversible [#8267] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/invertible_migration_test.rb M activerecord/test/cases/migration/command_recorder_test.rb commit bd155d2 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-19 00:57:10 -0500 Add drop_join_table [#8267] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/migration/command_recorder_test.rb M activerecord/test/cases/migration/create_join_table_test.rb commit 99770e4 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-11 14:43:57 -0500 Add Migration#reversible for reversible data operations [#8267] M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/invertible_migration_test.rb commit 65e154f refs/heads/master Author: Marc-Andre Lafortune Date: 2012-08-06 22:25:01 -0400 Allow revert of whole migration [#8267] M activerecord/lib/active_record/migration.rb M activerecord/test/cases/invertible_migration_test.rb commit 24653c9 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-08-06 22:20:34 -0400 Extract exec_migration [#8267] M activerecord/lib/active_record/migration.rb commit d327c18 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-08-06 20:44:05 -0400 Allow reverting of migration commands with Migration#revert [#8267] M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/migration/command_recorder.rb M activerecord/test/cases/invertible_migration_test.rb M activerecord/test/cases/migration/command_recorder_test.rb commit 740dbf8 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-19 00:26:55 -0500 Split ridiculously long line M activerecord/lib/active_record/migration/command_recorder.rb commit 29ed612 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-12-18 19:42:01 -0500 Simple replacement of variable name for consistency M railties/test/generators/migration_generator_test.rb commit b045804 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-12-18 23:37:36 -0500 Simplify change_table and avoid duplicated logic M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/test/cases/migration/change_table_test.rb commit 95f5f81 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-21 19:35:10 +0100 Revert "Make sure that ActiveSupport::Logger includes the Logger extensions from core_ext/logger" (some confusion over deprecation) This reverts commit d00f568a83a5159ed93618b1081bd17858536d1c. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/logger.rb M activesupport/lib/active_support/logger.rb A activesupport/lib/active_support/logger_silence.rb commit d00f568 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-21 19:28:24 +0100 Make sure that ActiveSupport::Logger includes the Logger extensions from core_ext/logger M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/logger.rb M activesupport/lib/active_support/logger.rb D activesupport/lib/active_support/logger_silence.rb commit f914454 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-21 19:15:36 +0100 Add ActiveSupport::Logger#silence that works the same as the old Logger#silence extension M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/logger.rb M activesupport/lib/active_support/logger.rb A activesupport/lib/active_support/logger_silence.rb M activesupport/test/logger_test.rb commit e0176bf refs/heads/master Merge: f2e0925 4a8bdab Author: Vijay Dev Date: 2012-12-21 23:14:08 +0530 Merge branch 'master' of github.com:lifo/docrails commit f2e0925 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-21 14:15:33 -0300 Serialized attribute can be serialized in an integer column Fix #8575 M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/test/cases/serialized_attribute_test.rb M activerecord/test/models/person.rb M activerecord/test/schema/schema.rb commit 4a8bdab refs/heads/master Author: Vijay Dev Date: 2012-12-21 23:08:56 +0530 copy edits in assets guide [ci skip] M guides/source/asset_pipeline.md commit 6fee8f3 refs/heads/master Author: Vijay Dev Date: 2012-12-21 23:03:52 +0530 Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106" This reverts commit e1f8ec59f2cc83f052b15233147aa2d6d8114a4d. Reason: seems bad styling [ci skip] M actionpack/lib/abstract_controller/helpers.rb commit aefcd34 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-21 12:47:26 -0300 Wrap table creation in a transaction. This will make the tests pass when the intrange datatype is not present M activerecord/test/cases/adapters/postgresql/intrange_test.rb commit c7d7e7f refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-21 09:10:29 -0200 Fix doc pointing to non existent logger class [ci skip] M activesupport/lib/active_support/core_ext/logger.rb commit 9e7bcaa refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-20 20:19:14 -0200 Fix indentation issuing warning M actionpack/lib/action_dispatch/journey/nfa/transition_table.rb commit 4eefa1e refs/heads/master Merge: 3aa327f f12d09f Author: Rafael Mendonça França Date: 2012-12-20 18:29:49 -0300 Merge pull request #8560 from u16suzu/master Fix document for String#humanize Conflicts: activesupport/lib/active_support/core_ext/string/inflections.rb commit 3aa327f refs/heads/master Merge: a8ad694 eb493f5 Author: Rafael Mendonça França Date: 2012-12-20 12:45:09 -0800 Merge pull request #8567 from frodsan/update_coding_conventions_journey update AD::Journey to follow Rails coding conventions commit eb493f5 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-20 15:42:39 -0500 update AD::Journey to follow Rails coding conventions M actionpack/Rakefile M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/journey/gtg/builder.rb M actionpack/lib/action_dispatch/journey/gtg/simulator.rb M actionpack/lib/action_dispatch/journey/gtg/transition_table.rb M actionpack/lib/action_dispatch/journey/nfa/builder.rb M actionpack/lib/action_dispatch/journey/nfa/simulator.rb M actionpack/lib/action_dispatch/journey/nfa/transition_table.rb M actionpack/lib/action_dispatch/journey/nodes/node.rb M actionpack/lib/action_dispatch/journey/parser_extras.rb M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/journey/router/strexp.rb M actionpack/lib/action_dispatch/journey/routes.rb M actionpack/lib/action_dispatch/journey/scanner.rb M actionpack/lib/action_dispatch/journey/visitors.rb commit 1a7567d refs/heads/master Author: Boris Staal Date: 2012-12-20 14:26:40 +0700 Eager loading made to use relation's in_clause_length instead of host's one (fixes #8474) M actionmailer/CHANGELOG.md M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/test/cases/associations/eager_test.rb commit e1f8ec5 refs/heads/master Author: kei Date: 2012-12-20 18:24:31 +0900 Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106 M actionpack/lib/abstract_controller/helpers.rb commit a8ad694 refs/heads/master Author: Guillermo Iguaran Date: 2012-12-20 04:21:34 -0500 Fix CHANGELOG entry about scope change I missed attribution on this :flushed: M actionpack/CHANGELOG.md commit 4c41e87 refs/heads/master Author: kei Date: 2012-12-20 18:10:21 +0900 Fix documentation style M actionpack/lib/abstract_controller/helpers.rb commit 4a9644a refs/heads/master Author: Dmitriy Kiriyenko Date: 2012-08-15 15:43:04 +0300 Prevent callback from being set twice. When you add one callack in two separate `set_callback` calls - it is only called once. When you do it in one `set_callback` call - it is called twice. This violates the principle of least astonishment for me. Duplicating callback is usually an error. There is a correct and obvious way to do anything without this "feature". If you want to do before_save :clear_balance, :calculate_tax, :clear_balance or whatever, you should better do before_save :carefully_calculate_tax def carefully_calculate_tax clear_balance calculate_tax clear_balance end And this even opens gates for some advanced refactorings, unlike the first approach. My assumptions are: - Principle of least astonishment is violated, when callbacks are either prevented from duplication, or not. - Duplicating callbacks is usually an error. When it is intentional - it's a smell of a bad design and can be approached without abusing this "feature". My suggestion is: do not allow duplicating callbacks in one callback call, like it is not allowed in separate callbacks call. M activesupport/CHANGELOG.md M activesupport/lib/active_support/callbacks.rb M activesupport/test/callbacks_test.rb M activesupport/test/test_test.rb commit 9f42f73 refs/heads/master Author: John Kelly Date: 2012-12-20 00:24:49 -0800 Remove Reference to Ruby 1.8.7 M activesupport/lib/active_support/core_ext/array/wrap.rb commit 4f0f1b5 refs/heads/master Author: SHIBATA Hiroshi Date: 2012-12-20 16:49:00 +0900 change spy of after invoked controller action. because ruby-2.0.0 waned unused variables M actionpack/test/controller/render_test.rb commit 42b555d refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-19 23:08:34 -0200 Fix Action Mailer changelog indenation to match other changelogs Also some minor improvements to other changelogs. [ci skip] M actionmailer/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md commit 05b80a1 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-19 23:03:32 -0200 Improve AMo changelog example to not rely on AR [ci skip] M activemodel/CHANGELOG.md commit dd4822c refs/heads/master Merge: f0129da a36ae63 Author: Carlos Antonio da Silva Date: 2012-12-19 16:30:52 -0800 Merge pull request #8565 from frodsan/wed_code_journey nodoc Journey and remove unneeded Ruby <1.9 validation commit a36ae63 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-19 19:24:25 -0500 :nodoc: Journey because is not part of the public API [ci skip] M actionpack/lib/action_dispatch/journey/backwards.rb M actionpack/lib/action_dispatch/journey/formatter.rb M actionpack/lib/action_dispatch/journey/gtg/builder.rb M actionpack/lib/action_dispatch/journey/gtg/simulator.rb M actionpack/lib/action_dispatch/journey/gtg/transition_table.rb M actionpack/lib/action_dispatch/journey/nfa/builder.rb M actionpack/lib/action_dispatch/journey/nfa/dot.rb M actionpack/lib/action_dispatch/journey/nfa/simulator.rb M actionpack/lib/action_dispatch/journey/nfa/transition_table.rb M actionpack/lib/action_dispatch/journey/nodes/node.rb M actionpack/lib/action_dispatch/journey/parser.rb M actionpack/lib/action_dispatch/journey/parser_extras.rb M actionpack/lib/action_dispatch/journey/path/pattern.rb M actionpack/lib/action_dispatch/journey/route.rb M actionpack/lib/action_dispatch/journey/router.rb M actionpack/lib/action_dispatch/journey/router/strexp.rb M actionpack/lib/action_dispatch/journey/router/utils.rb M actionpack/lib/action_dispatch/journey/routes.rb M actionpack/lib/action_dispatch/journey/scanner.rb M actionpack/lib/action_dispatch/journey/visitors.rb commit a1cffa6 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-19 17:52:50 -0500 remove code for Ruby 1.8.x support M actionpack/lib/action_dispatch/journey/router/utils.rb commit f0129da refs/heads/master Author: Andrew White Date: 2012-12-19 22:32:59 +0000 Remove the actual extension file as well [ci skip] D actionpack/lib/action_dispatch/journey/core-ext/hash.rb commit dc0542f refs/heads/master Author: Andrew White Date: 2012-12-19 22:28:43 +0000 Remove obsolete Hash extension needed for Ruby 1.8.x support [ci skip] M actionpack/lib/action_dispatch/journey/router.rb commit 56fee39 refs/heads/master Author: Andrew White Date: 2012-12-19 20:54:47 +0000 Integrate Journey into Action Dispatch Move the Journey code underneath the ActionDispatch namespace so that we don't pollute the global namespace with names that may be used for models. Fixes rails/journey#49. M Gemfile M actionpack/CHANGELOG.md M actionpack/Rakefile M actionpack/actionpack.gemspec M actionpack/lib/action_dispatch.rb A actionpack/lib/action_dispatch/journey.rb A actionpack/lib/action_dispatch/journey/backwards.rb A actionpack/lib/action_dispatch/journey/core-ext/hash.rb A actionpack/lib/action_dispatch/journey/formatter.rb A actionpack/lib/action_dispatch/journey/gtg/builder.rb A actionpack/lib/action_dispatch/journey/gtg/simulator.rb A actionpack/lib/action_dispatch/journey/gtg/transition_table.rb A actionpack/lib/action_dispatch/journey/nfa/builder.rb A actionpack/lib/action_dispatch/journey/nfa/dot.rb A actionpack/lib/action_dispatch/journey/nfa/simulator.rb A actionpack/lib/action_dispatch/journey/nfa/transition_table.rb A actionpack/lib/action_dispatch/journey/nodes/node.rb A actionpack/lib/action_dispatch/journey/parser.rb A actionpack/lib/action_dispatch/journey/parser.y A actionpack/lib/action_dispatch/journey/parser_extras.rb A actionpack/lib/action_dispatch/journey/path/pattern.rb A actionpack/lib/action_dispatch/journey/route.rb A actionpack/lib/action_dispatch/journey/router.rb A actionpack/lib/action_dispatch/journey/router/strexp.rb A actionpack/lib/action_dispatch/journey/router/utils.rb A actionpack/lib/action_dispatch/journey/routes.rb A actionpack/lib/action_dispatch/journey/scanner.rb A actionpack/lib/action_dispatch/journey/visitors.rb A actionpack/lib/action_dispatch/journey/visualizer/fsm.css A actionpack/lib/action_dispatch/journey/visualizer/fsm.js A actionpack/lib/action_dispatch/journey/visualizer/index.html.erb M actionpack/lib/action_dispatch/routing/route_set.rb A actionpack/test/journey/gtg/builder_test.rb A actionpack/test/journey/gtg/transition_table_test.rb A actionpack/test/journey/nfa/simulator_test.rb A actionpack/test/journey/nfa/transition_table_test.rb A actionpack/test/journey/nodes/symbol_test.rb A actionpack/test/journey/path/pattern_test.rb A actionpack/test/journey/route/definition/parser_test.rb A actionpack/test/journey/route/definition/scanner_test.rb A actionpack/test/journey/route_test.rb A actionpack/test/journey/router/strexp_test.rb A actionpack/test/journey/router/utils_test.rb A actionpack/test/journey/router_test.rb A actionpack/test/journey/routes_test.rb M railties/lib/rails/generators/app_base.rb commit f12d09f refs/heads/master Author: Yuichiro Suzuki Date: 2012-12-20 01:20:05 +0900 Fix: documentation for String#humanize M activesupport/lib/active_support/core_ext/string/inflections.rb commit b225693 refs/heads/master Merge: 939ff86 5c33542 Author: José Valim Date: 2012-12-19 07:28:25 -0800 Merge pull request #8559 from mshytikov/runner_method_is_slow_with_thread_safe Attempt to fix slow runner name method commit 939ff86 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-19 13:22:03 -0200 Move changelog entry to the top [ci skip] M actionpack/CHANGELOG.md commit 5c33542 refs/heads/master Author: Max Shytikov Date: 2012-12-19 16:32:01 +0200 attempt to fix slow runner name method M activesupport/lib/active_support/callbacks.rb commit ebef8e9 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-19 09:37:19 -0200 Revert "Add test to deprecation of Path#children" This reverts commit 29b1dc273e1ad6b9e13bf48fe3f12047850f9554. Conflicts: railties/test/application/paths_test.rb Reason: since 7f96e4317e1354852e9600becb16662de3c17691 was reverted, Path#children is no longer deprecated. M railties/test/application/paths_test.rb commit bf16699 refs/tags/v3.2.15 Merge: df048b5 9f69d42 Author: Carlos Antonio da Silva Date: 2012-12-19 03:33:51 -0800 Merge pull request #8558 from senny/backport_3489 Backport #8522, Keep index names when using with sqlite3 commit 9f69d42 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-12-15 22:42:22 +0100 Backport #8522, Keep index names when using with sqlite3 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb activerecord/test/cases/migration/rename_column_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb M activerecord/test/cases/migration_test.rb commit e36f9ef refs/heads/master Merge: b204830 d01f913 Author: Carlos Antonio da Silva Date: 2012-12-19 02:56:19 -0800 Merge pull request #8522 from senny/3489_index_names_on_copy Leep index names when using `alter_table` with sqlite3. Closes #3489 commit b204830 refs/heads/master Merge: 153f0cb 2d4b243 Author: Carlos Antonio da Silva Date: 2012-12-19 02:43:42 -0800 Merge pull request #8554 from yahonda/binary_count_oracle Address test_binary_data_is_not_logged with Oracle database commit d01f913 refs/heads/master Author: Yves Senn Date: 2012-12-15 22:42:22 +0100 Keep index names when using with sqlite3 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/migration/rename_column_test.rb commit 153f0cb refs/heads/master Merge: 88e9157 cf9d945 Author: David Heinemeier Hansson Date: 2012-12-18 23:41:57 -0800 Merge pull request #8523 from reednj77/remove-mail-to-encoding Remove obfuscation support from mail_to helper commit cf9d945 refs/heads/master Author: Nick Reed Date: 2012-12-15 15:27:32 -0600 Remove obfuscation support from mail_to helper Removes support for :encode, :replace_at, and :replace_dot options from the mail_to helper. Support for these options has been extracted to the 'actionview-encoded_mail_to' gem. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/test/template/url_helper_test.rb commit 2d4b243 refs/heads/master Author: Yasuo Honda Date: 2012-12-19 06:31:23 +0900 Address test_binary_data_is_not_logged with Oracle database The number of sql statement logged depends on each database adapter implementation. Also, this test does not depends on how many sql statement executed. M activerecord/test/cases/log_subscriber_test.rb commit 88e9157 refs/heads/master Merge: e68abc2 411e499 Author: Carlos Antonio da Silva Date: 2012-12-18 17:02:21 -0800 Merge pull request #8552 from frodsan/concerned_tests Fix railties tests related to the addition of app/[models|controllers]/concerns, and improve changelog. commit 411e499 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-18 17:25:16 -0500 update concerned tests M railties/test/generators/app_generator_test.rb commit b565a7a refs/heads/master Author: Francesco Rodriguez Date: 2012-12-18 16:18:29 -0500 fix railties CHANGELOG [ci skip] M railties/CHANGELOG.md commit e68abc2 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-18 18:27:52 -0200 Fix argument name in fixtures method Relatedo to 8e44c93b4c0e4b1bdd0fca13b79f5be1088d6959. M activerecord/lib/active_record/fixtures.rb commit 8e44c93 refs/heads/master Author: Aaron Patterson Date: 2012-12-18 11:26:57 -0800 Revert "use File.basename to get the filename minus .yml" This reverts commit 00c5342d96a3677c0a6a2bb8316c76182f5bdfdd. Conflicts: activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/fixtures.rb commit 7f96e43 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-18 16:05:30 -0300 Revert "Merge pull request #7587 from elia/fix-too-eager-loading" This reverts commit 3663057518eb9acf9b1e72f47dcb07038e6b7368. REASON: This caused a regression that add app folder in the eager load path. See #8146 for more information. Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/paths.rb M railties/test/application/paths_test.rb commit e4003ad refs/heads/master Merge: 15c40b2 9bb27f7 Author: Rafael Mendonça França Date: 2012-12-18 08:38:10 -0800 Merge pull request #8548 from garysweaver/postgresql_fallback_to_disable_user_triggers fix #5523: postgresql adapter to disable user triggers in disable_referential_integrity commit 9bb27f7 refs/heads/master Author: Gary S. Weaver Date: 2012-12-18 10:46:16 -0500 #5523 Add ability for postgresql adapter to disable user triggers in disable_referential_integrity. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb commit 15c40b2 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-18 16:32:11 +0100 Fix changelog M railties/CHANGELOG.md commit 09aeee7 refs/heads/master Merge: f6bbc3f f6d0eda Author: David Heinemeier Hansson Date: 2012-12-18 16:29:00 +0100 Merge commit f6bbc3f refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-18 16:26:08 +0100 Add app/models/concerns and app/controllers/concerns to the default directory structure and load path M railties/CHANGELOG.md M railties/lib/rails/engine/configuration.rb M railties/lib/rails/generators/rails/app/app_generator.rb commit f6d0eda refs/heads/master Merge: c3e573d 0bb1517 Author: Carlos Antonio da Silva Date: 2012-12-18 09:08:11 -0200 Merge branch 'uniqueness-validation-postgresql-arrays' When setting an array column (or other PostgreSQL-specific data type) to be validated for uniqueness, the resulting SQL query is generated with syntax errors, like this: SELECT 1 AS one FROM "postgresql_arrays" WHERE "postgresql_arrays"."nicknames" = '["john", "johnny"]' LIMIT 1 This happens because Ruby Arrays must be type-casted to their PostgreSQL equivalent. This small patch fixes this issue, calling the adapter's type_cast method. Closes #8077 commit 0bb1517 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-31 00:45:47 -0200 Extract some methods M activerecord/lib/active_record/validations/uniqueness.rb commit 1127262 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-31 00:37:13 -0200 Change relation in place M activerecord/lib/active_record/validations/uniqueness.rb commit 23750b4 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-31 00:33:51 -0200 Simplify value logic by always typecasting M activerecord/lib/active_record/validations/uniqueness.rb commit 73fb634 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-31 00:23:47 -0200 Avoid unnecessary hashes with error options M activerecord/lib/active_record/validations/uniqueness.rb commit af05829 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-31 00:20:50 -0200 Remove prepend_and_append requirement from AS It's not necessary to use this extension here, we are fine with Array#unshift. M activerecord/lib/active_record/validations/uniqueness.rb commit ba492af refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-31 00:19:21 -0200 Refactor uniqueness validator logic a bit Cleanup some code, avoid extra hash with reverse_merge, and don't use send for :id, since it's always present. M activerecord/lib/active_record/validations/uniqueness.rb commit ba98dad refs/heads/master Author: Pedro Padron Date: 2012-10-30 15:29:47 -0200 Added support for validates_uniqueness_of in PostgreSQL array columns. Fixes: #8075. M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/uniqueness.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb commit c3e573d refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-17 21:51:43 -0200 Minor js review [ci skip] Remove/add ; where necessary, fix indentation. M actionpack/lib/action_dispatch/middleware/templates/routes/_route_wrapper.html.erb commit bd5f0ad refs/heads/master Merge: 60214e8 0a6d8fb Author: Steve Klabnik Date: 2012-12-18 00:37:22 -0800 Merge pull request #8389 from nashby/issue-8388 handle protocol option in stylesheet_link_tag and javascript_include_tag commit 0a6d8fb refs/heads/master Author: Vasiliy Ermolovich Date: 2012-12-01 18:26:47 +0300 handle protocol option in stylesheet_link_tag and javascript_include_tag closes #8388 M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit 60214e8 refs/heads/master Merge: 504ed90 37d9c44 Author: Rafael Mendonça França Date: 2012-12-17 14:02:44 -0800 Merge pull request #8543 from schneems/schneems/html-route-error Format routes as html on debug page commit 86c5cea refs/heads/master Author: Damian Galarza Date: 2012-12-16 17:43:59 -0500 Explain controller specific assets more thoroughly The current section on controller specific assets does not really explain how the default application.css and application.js files generated by rails will work with controller specific assets and is a bit ambiguous. We should remind users that they will be included into their application by default but that they have the option to include them only where needed if they want and how this works with precompiling assets. [ci_skip] M guides/source/asset_pipeline.md commit 37d9c44 refs/heads/master Author: schneems Date: 2012-12-17 14:26:46 -0600 Format routes as html on debug page When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both.
![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png) M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb A actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb A actionpack/lib/action_dispatch/middleware/templates/routes/_route_wrapper.html.erb M railties/lib/rails/info_controller.rb M railties/lib/rails/templates/rails/info/routes.html.erb commit 504ed90 refs/heads/master Merge: cc74088 49182b8 Author: Rafael Mendonça França Date: 2012-12-17 11:37:43 -0800 Merge pull request #8542 from le0pard/fixed_ar_intrange AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix #8528 pull request commit 49182b8 refs/heads/master Author: Alexey Date: 2012-12-17 21:16:40 +0200 AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix realization M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/test/cases/adapters/postgresql/intrange_test.rb commit cc74088 refs/heads/master Merge: 75ba92e 9a4a095 Author: Rafael Mendonça França Date: 2012-12-17 11:00:06 -0800 Merge pull request #8528 from le0pard/fixed_ar_intrange AR supporting new int4range and int8range data type on PostgreSQL >= 9.2 commit 75ba92e refs/heads/master Merge: dcb318e 8a59b87 Author: Rafael Mendonça França Date: 2012-12-17 10:48:12 -0800 Merge pull request #8521 from schneems/schneems/html-routes HTML formatting to Rails::InfoController#routes commit 8a59b87 refs/heads/master Author: schneems Date: 2012-12-15 11:36:26 -0600 HTML formatting to Rails::InfoController#routes This PR adds formatting and meta-data to the display of the internal routes. Users can now toggle between showing helpers with the `_path` or _`url` suffix. There are multiple ways to achieve this, this method uses partials for formatting and meta-data. The partials can be re-used when rendering `routing_error.erb`, though that will need to be in a separate PR. ![](http://f.cl.ly/items/3A2p3c1T1t2f2X2R2K2S/Screen%20Shot%202012-12-12%20at%202.28.01%20PM.png) ATP Railties M railties/CHANGELOG.md M railties/lib/rails/info_controller.rb M railties/lib/rails/templates/rails/info/routes.html.erb M railties/test/rails_info_controller_test.rb commit dcb318e refs/heads/master Author: Andrew White Date: 2012-12-17 16:12:07 +0000 Make conditional_layout? private and update documentation The conditional_layout? method is not for public use and doesn't actually do what the documentation suggested it does. It's actually used to determine whether or not to use the explicit layout definition defined in a controller or use the implicit layout definition. Also documentation was added for the action_has_layout? method which acts as a master switch for disabling the layout for the current action. This method was added so that action caching didn't depend on accessing layout internals but is also used by third-parties, most notably the [Hobo][1] application. [1]: https://github.com/hobo/hobo M actionpack/lib/abstract_controller/layouts.rb commit d551701 refs/heads/master Merge: d8607c1 9f4386c Author: Carlos Antonio da Silva Date: 2012-12-17 08:01:58 -0800 Merge pull request #8539 from frodsan/fix_as_basic_object Add nodoc to AS::BasicObject [ci skip] commit 9f4386c refs/heads/master Author: Francesco Rodriguez Date: 2012-12-17 10:56:27 -0500 fix AS::BasicObject :nodoc: [ci skip] M activesupport/lib/active_support/basic_object.rb commit 0c181b4 refs/heads/master Author: Ivan Vanyak Date: 2012-12-17 14:12:24 +1100 Add script_name option description and example for #url_for options M actionpack/lib/action_dispatch/routing/url_for.rb commit d8607c1 refs/heads/master Merge: aefdcfd d963ff4 Author: Xavier Noria Date: 2012-12-16 19:00:48 -0800 Merge pull request #8532 from ptn/add_missing_require Add missing requires to core_ext/integer/time commit d963ff4 refs/heads/master Author: Pablo Torres Date: 2012-12-16 20:27:10 -0500 Add missing requires to core_ext/integer/time M activesupport/lib/active_support/core_ext/integer/time.rb commit aefdcfd refs/heads/master Merge: 8832313 170a93d Author: Steve Klabnik Date: 2012-12-16 12:24:20 -0800 Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-path DebugExceptions `File.join` => `File.expand_path` commit 170a93d refs/heads/master Author: schneems Date: 2012-12-11 15:48:05 -0800 DebugExceptions `File.join` => `File.expand_path` M actionpack/lib/action_dispatch/middleware/debug_exceptions.rb commit 8832313 refs/heads/master Author: Steve Klabnik Date: 2012-12-16 11:07:01 -0500 Restored 'Working with Validation Errors' Somehow this got lost in my PRs before. I'm going to re-check all the guides to make sure this didn't happen again elsewhere. M guides/source/active_record_validations.md commit 9a4a095 refs/heads/master Author: Alexey Date: 2012-12-16 04:10:58 +0200 AR supporting new intrange data type on PostgreSQL >= 9.2 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb A activerecord/test/cases/adapters/postgresql/intrange_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 38af354 refs/tags/v3.2.15 Author: kennyj Date: 2012-05-29 23:31:27 +0900 backport runner fixes to 3-2-stable Add a runner hook to Rails::Application and Rails::Engine that requires ActiveRecord::Base to avoid circular constant loading when using observers. This commit backports cc7dd66, c0ba0f0 and 8d01c61. M activerecord/CHANGELOG.md M activerecord/lib/active_record/railtie.rb M railties/CHANGELOG.md M railties/lib/rails/application.rb M railties/lib/rails/commands/runner.rb M railties/lib/rails/engine.rb M railties/lib/rails/railtie.rb M railties/test/application/rake_test.rb M railties/test/application/runner_test.rb M railties/test/railties/railtie_test.rb commit f71cca9 refs/heads/master Author: Kurtis Rainbolt-Greene Date: 2012-10-07 17:36:01 -0500 Refactoring the token_and_options method to fix bugs Adding a test for the equal trun bug Adding a test for the after equal trunc bug Adding a test for the slash bug Adding a test for the slash quote bug Adding a helper method for creating a sample request object with token Writing a method to create params array from raw params Writing a method to rewrite param values in the params Writing a method to get the token params from an authorization value Refactoring the token_and_options method to fix bugs Removing unnessecary test A constant for this shared regex seemed appropriate Wanting to split up this logic Adding small documentation pieces M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_token_authentication_test.rb commit 2d6abcc refs/heads/master Merge: d72a07f bb1d3c1 Author: Jeremy Kemper Date: 2012-12-15 13:59:17 -0800 Merge pull request #8518 from rwz/inheritable-basic-object Properly deprecate AS::BasicObject without breaking subclasses of it commit d72a07f refs/heads/master Author: Roberto Vasquez Angel Date: 2012-07-25 17:07:05 +0200 Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the absence of attributes. Add `ActiveModel::Errors#add_on_present` method. Adds error messages to present attributes. M activemodel/CHANGELOG.md M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/locale/en.yml A activemodel/lib/active_model/validations/absence.rb A activemodel/test/cases/validations/absence_validation_test.rb commit c298ee4 refs/heads/master Merge: 351f071 b9eb784 Author: Rafael Mendonça França Date: 2012-12-15 11:28:10 -0800 Merge pull request #8519 from rubys/master Remove blank lines from generated Gemfile commit b9eb784 refs/heads/master Author: Sam Ruby Date: 2012-12-15 12:26:30 -0500 Remove blank lines from generated Gemfile Introduced by 059bdc3415b0f1fb436c56a399a41b90fe3e87f0 M railties/lib/rails/generators/rails/app/templates/Gemfile commit 351f071 refs/heads/master Author: Vijay Dev Date: 2012-12-15 21:43:14 +0530 make an editing pass through the upgrading guide [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 5cc178a refs/heads/master Merge: 8f8397e 561e5ab Author: Vijay Dev Date: 2012-12-15 21:20:28 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb commit 561e5ab refs/heads/master Author: Vijay Dev Date: 2012-12-15 21:15:05 +0530 copy editing [ci skip] M guides/source/active_record_validations.md M guides/source/asset_pipeline.md M railties/lib/rails/generators/rails/migration/USAGE commit ca73e05 refs/heads/master Author: Vijay Dev Date: 2012-12-15 21:08:52 +0530 bullets have fullstops too [ci skip] M README.rdoc commit 751dd9e refs/heads/master Author: Vijay Dev Date: 2012-12-15 20:59:52 +0530 Revert "Add quotes to Numeric Passwords to force string(sqlserver)" This reverts commit d1e70cb7b410f5151b08af9b38b2d6d80c1c61c2. M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit df33446 refs/heads/master Author: Vijay Dev Date: 2012-12-15 20:59:35 +0530 Revert "Add quotes to Numeric Passwords to force string(jdbcmysql)" This reverts commit 2f0311d79af01dc59ab3bd95cd6a56511258f917. M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml commit 57bfd19 refs/heads/master Author: Vijay Dev Date: 2012-12-15 20:59:23 +0530 Revert "Add quotes to Numeric Passwords to force string(jdbcpostgresql)" This reverts commit db9b619f2851d7aeef9b239f6c19d0076faf5909. M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml commit 5e42488 refs/heads/master Author: Vijay Dev Date: 2012-12-15 20:58:40 +0530 Revert "Add quotes to Numeric Passwords to force string(MySql)" This reverts commit e5f8b2be64a74ce05e7c8b873d3e795e7bc68df5. M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml commit 7124e39 refs/heads/master Author: Vijay Dev Date: 2012-12-15 20:57:38 +0530 Revert "Add quotes to Numeric Passwords to force string(Postgres)" This reverts commit 6e72099a382c9731c7b40aa1b10237318e31ac92. Reason: Feel that this isn't the right place. M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml commit bb1d3c1 refs/heads/master Author: Pavel Pravosud Date: 2012-12-15 20:57:45 +0700 AS::BasicObject can be inherited from M activesupport/lib/active_support/basic_object.rb A activesupport/test/deprecation/basic_object_test.rb commit 64e6e6a refs/tags/v3.1.9 Author: Carlos Antonio da Silva Date: 2012-11-19 20:54:03 -0200 Be a bit less conservative with mysql in adapter This will allow the new mysql 2.9.0 to be used, fixing our test issues. M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit 9fc6c31 refs/tags/v3.1.9 Author: Carlos Antonio da Silva Date: 2012-09-07 13:08:30 -0300 Update xml serialization tests to reflect a change in builder Due to a change in builder, nil values now generates closed tags, so instead of this: It generates this: Document this change in Rails so that people can track it down easily if necessary. Changes in Active Model, Active Record and Active Support tests. Cherry-pick of d65adc7, 77dd3be and 146eaf3. Fix build. M activemodel/CHANGELOG.md M activemodel/test/cases/serializers/xml_serialization_test.rb M activerecord/test/cases/xml_serialization_test.rb M activesupport/test/core_ext/hash_ext_test.rb commit df048b5 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-14 23:33:53 -0200 Use 1.8 style hash in json encoding test M activesupport/test/json/encoding_test.rb commit 815a943 refs/tags/v3.2.15 Author: Brett Carter Date: 2012-12-13 15:52:19 -0800 Remove unicode character encoding from ActiveSupport::JSON.encode The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters not in the Basic Multilingual Plane. It is possible to escape them for json using the weird encoding scheme of a twelve-character sequence representing the UTF-16 surrogate pair (e.g. '𠜎' -> "\u270e\u263a") but this wasn't properly handled in the escaping code. Since raw UTF-8 is allowed in json, it was decided to simply pass through the raw bytes rather than attempt to escape them. Backport of https://github.com/zbskii/rails/commit/9ace3a8820a5270f9b3f37b593f8bbea3e940f73 Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/json/encoding.rb M activesupport/test/json/encoding_test.rb commit 61776f5 refs/tags/v3.1.9 Author: Aaron Patterson Date: 2012-12-14 16:29:43 -0800 do not install ruby-prof on Ruby 2.0 M Gemfile commit 8f8397e refs/heads/master Author: Brett Carter Date: 2012-12-13 15:52:19 -0800 Remove unicode character encoding from ActiveSupport::JSON.encode The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters not in the Basic Multilingual Plane. It is possible to escape them for json using the weird encoding scheme of a twelve-character sequence representing the UTF-16 surrogate pair (e.g. '𠜎' -> "\u270e\u263a") but this wasn't properly handled in the escaping code. Since raw UTF-8 is allowed in json, it was decided to simply pass through the raw bytes rather than attempt to escape them. M activesupport/CHANGELOG.md M activesupport/lib/active_support/json/encoding.rb M activesupport/test/json/encoding_test.rb commit f447240 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-14 21:21:37 -0200 Skip binary data with binds test for mysql2, fix build Mysql2 doesn't support binds, which means no binds payload is set when logging, so the logic to render binary data differently here doesn't work. Introduced in 99d142a9375f9ba1960863b3cc745265aa9a14df. M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/log_subscriber_test.rb commit df9f9b7 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-14 20:16:59 -0200 Convert changelogs to 1.9 hash style and fix some formatting [ci skip] M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit 92118e7 refs/tags/v3.1.9 Author: Aaron Patterson Date: 2012-12-14 14:14:49 -0800 test for 8018 M actionpack/test/controller/routing_test.rb commit 99d142a refs/heads/master Merge: a8864aa 8f59ffc Author: Aaron Patterson Date: 2012-12-14 13:44:01 -0800 Merge pull request #8514 from mmb/filter_blob Do not log the binding values for binary columns. commit a8864aa refs/heads/master Author: Steve Klabnik Date: 2012-12-14 15:51:12 -0500 Revert "Fix failing test in railties" This reverts commit 6bdc04624dcc0f45aab93af42d00224f67da36d5. This has been reverted because https://github.com/rails/rails/commit/8554537e48d6ed18ef08cb3ac0a9da96ac3c5cd6 M railties/test/rails_info_controller_test.rb commit 8554537 refs/heads/master Author: Steve Klabnik Date: 2012-12-14 15:44:57 -0500 Revert "Merge pull request #8499 from schneems/schneems/html-route-inspector" This reverts commit ae68fc3864e99ab43c18fd12577744e1583f6b64, reversing changes made to 0262a18c7b0ab6f60fee842b3007388f9ffeb0fa. See here: https://github.com/rails/rails/pull/8499#issuecomment-11356417 M actionpack/lib/action_dispatch/routing/inspector.rb M railties/lib/rails/info_controller.rb M railties/lib/rails/templates/rails/info/routes.html.erb commit 8f59ffc refs/heads/master Author: Matthew M. Boedicker Date: 2012-12-13 23:29:49 -0800 Do not log the binding values for binary columns. They tend to be large and not very useful in the log. M activerecord/CHANGELOG.md M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/log_subscriber_test.rb commit fa3457d refs/heads/master Author: Aaron Patterson Date: 2012-12-14 11:16:18 -0800 remove a cache we do not need M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 4921929 refs/heads/master Merge: ce130ef 45448a5 Author: Aaron Patterson Date: 2012-12-14 11:12:50 -0800 Merge pull request #8510 from thedarkone/thread_safety_improvements Thread safety improvements commit ce130ef refs/heads/master Author: Santiago Pastorino Date: 2012-12-14 16:49:25 -0200 Remove AR gem pushed by mistake D activerecord/activerecord-4.0.0.beta.gem commit 0b97ffd refs/heads/master Merge: 05e9075 a765c84 Author: Carlos Antonio da Silva Date: 2012-12-14 10:21:44 -0800 Merge pull request #8400 from matthewrobertson/has-many-through-counter-cache Fix for has_many_through counter_cache bug Counter caches were not being updated properly when replacing has_many_through relationships. commit 05e9075 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-14 15:17:23 -0300 Improve the documentation of cache_if and cache_unless M actionpack/lib/action_view/helpers/cache_helper.rb commit a765c84 refs/heads/master Author: Matthew Robertson Date: 2012-12-01 17:56:28 -0800 Fix for has_many_through counter_cache bug This commit fixes reported issue #7630 in which counter caches were not being updated properly when replacing has_many_through relationships M activerecord/CHANGELOG.md A activerecord/activerecord-4.0.0.beta.gem M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 414b1c3 refs/heads/master Merge: 01d3a36 8322342 Author: Rafael Mendonça França Date: 2012-12-14 13:57:53 -0300 Merge pull request #8497 from acapilleri/conditional_cache Removed :if / :unless conditions to fragment cache in favour of *cache_i... commit 8322342 refs/heads/master Author: Angelo capilleri Date: 2012-12-12 18:26:38 +0100 Removed :if and :unless from fragment cache option in favour of cache_if(condition, option, &block) and cache_unless(condition, option, &block). In the PR #8371 was introduced conditional options :if and :unless in the cache method. Example: <%= cache @model, if: some_condition(@model) do %> ... <%end%> This is a good feature but *cache_if* and and *cache_unless* are more concise and close to the standard of rails view helpers (ex: link_to_if and link_to_unless). Example: <%= cache_if condition, @model do %> ... <%end%> M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/cache_helper.rb M actionpack/test/controller/log_subscriber_test.rb commit 9c581d3 refs/tags/v3.2.15 Author: Andrew White Date: 2012-12-14 14:52:24 +0000 Don't use 1.9 hash syntax on 3-2-stable M actionpack/test/dispatch/routing/route_set_test.rb M railties/test/application/routing_test.rb commit 6ab1a95 refs/tags/v3.2.15 Author: Andrew White Date: 2012-12-14 13:50:14 +0000 Clear url helper methods when routes are reloaded Clear url helper methods when routes are reloaded by removing the methods explicitly rather than just clearing the module because it didn't work properly and could be the source of a memory leak. Closes #8488. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb A actionpack/test/dispatch/routing/route_set_test.rb M railties/test/application/routing_test.rb commit 01d3a36 refs/heads/master Author: Andrew White Date: 2012-12-14 13:15:57 +0000 Clear url helper methods when routes are reloaded Remove all the old url helper methods when clear! is called on the route set because it's possible that some routes have been removed. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb A actionpack/test/dispatch/routing/route_set_test.rb M railties/test/application/routing_test.rb commit a16da3f refs/heads/master Author: Andrew White Date: 2012-12-13 20:26:18 +0000 Revert "Clear url helpers when reloading routes" This doesn't actually remove old url helper methods as they are defined in a different module. This reverts commit 96bcef947bf713b7d9fc88f26dff69f568111262. Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb commit 6bdc046 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-14 09:38:28 -0200 Fix failing test in railties Related to the HTML route inspector changes: ae68fc3864e99ab43c18fd12577744e1583f6b64 M railties/test/rails_info_controller_test.rb commit 45448a5 refs/heads/master Author: thedarkone Date: 2012-12-13 14:47:33 +0100 Replace some global Hash usages with the new thread safe cache. Summary of the changes: * Add thread_safe gem. * Use thread safe cache for digestor caching. * Replace manual synchronization with ThreadSafe::Cache in Relation::Delegation. * Replace @attribute_method_matchers_cache Hash with ThreadSafe::Cache. * Use TS::Cache to avoid the synchronisation overhead on listener retrieval. * Replace synchronisation with TS::Cache usage. * Use a preallocated array for performance/memory reasons. * Update the controllers cache to the new AS::Dependencies::ClassCache API. The original @controllers cache no longer makes much sense after @tenderlove's changes in 7b6bfe84f3 and f345e2380c. * Use TS::Cache in the connection pool to avoid locking overhead. * Use TS::Cache in ConnectionHandler. M Gemfile M actionpack/lib/action_dispatch/http/filter_parameters.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/lib/action_view/digestor.rb M actionpack/lib/action_view/lookup_context.rb M actionpack/lib/action_view/renderer/partial_renderer.rb M actionpack/lib/action_view/template/resolver.rb M activemodel/lib/active_model/attribute_methods.rb M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/relation/delegation.rb M activesupport/activesupport.gemspec M activesupport/lib/active_support/dependencies.rb M activesupport/lib/active_support/inflector/inflections.rb M activesupport/lib/active_support/key_generator.rb M activesupport/lib/active_support/notifications/fanout.rb commit fcdc0d8 refs/heads/master Author: Gaurish Sharma Date: 2012-12-14 10:43:13 +0530 Change method is default since rails 3.1 [ci skip] Since Rails 3.1, change method is preferred for writing migrations. Updated the example, because that command would generate migration with change method. M railties/lib/rails/generators/rails/migration/USAGE commit 948c1e5 refs/heads/master Author: Jay Hayes Date: 2012-12-13 14:04:21 -0600 Elaborate using `inverse_of` with presence validation M guides/source/active_record_validations.md commit d5badea refs/heads/master Author: Jay Hayes Date: 2012-12-13 13:58:49 -0600 Fix associations presence lost in steve's reformat https://github.com/lifo/docrails/commit/55a2820cc6d33e96b8d1b64b38b033913058dce4 messes up https://github.com/lifo/docrails/commit/cfd324b4b68469ba3188e4b7ba8586e59b239693 Hopefully there is other stuff lost in translation... M guides/source/active_record_validations.md commit 5d54fd7 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-13 14:48:55 -0300 Add missing require. I was trying to use those files without Rails and that require was missing. M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/helpers/tags/date_select.rb commit c5fb487 refs/heads/master Merge: ae68fc3 312234c Author: Rafael Mendonça França Date: 2012-12-13 09:44:13 -0800 Merge pull request #8432 from rmcastil/add_migration_example_to_each_association_type Add migration examples to Association Basics [ci skip] commit 312234c refs/heads/master Author: Ryan Castillo Date: 2012-12-05 20:22:12 -0500 Add migration example to Association Basics [ci skip] M guides/source/association_basics.md commit ae68fc3 refs/heads/master Merge: 0262a18 08d7b18 Author: Steve Klabnik Date: 2012-12-13 08:30:51 -0800 Merge pull request #8499 from schneems/schneems/html-route-inspector Output routes in :html format commit e927ba9 refs/heads/master Author: Anuj Dutta Date: 2012-12-13 16:28:43 +0000 Add a small note about the compressing the file, and how that helps the application. M guides/source/asset_pipeline.md commit 0262a18 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-13 09:36:58 -0200 Bring back helpers_path attr accessor This is apparently used by the railtie to setup the app helpers paths correctly between initializers. I'll need to check it further. M actionpack/lib/action_controller/metal/helpers.rb commit 34cdaf7 refs/heads/master Merge: cff0e51 059bdc3 Author: Carlos Antonio da Silva Date: 2012-12-13 03:30:26 -0800 Merge pull request #8503 from siong1987/debugger-jruby Don't include debugger gem if jruby is used since it doesn't work on jruby. [ci skip] commit cff0e51 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-13 08:46:12 -0200 Refactor helpers code in Action Pack a bit * Avoid calling class_eval when not needed * Remove helpers_path attr accessor, it's defined as a class attribute a few lines later * Avoid creating extra arrays when finding helpers, use flat_map and sort! * Remove not required refer variable when redirecting :back M actionpack/lib/abstract_controller/helpers.rb M actionpack/lib/action_controller/metal/helpers.rb M actionpack/lib/action_controller/metal/redirecting.rb commit 3bf4ddf refs/tags/v3.2.15 Merge: 6fbee4f d68e299 Author: Carlos Antonio da Silva Date: 2012-12-13 02:43:50 -0800 Merge pull request #8504 from senny/backport_8492 Backport of #8500, recognize migrations, in folders containing numbers and 'rb'. commit d68e299 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-12-12 21:51:38 +0100 recognize migrations, in folders containing numbers and 'rb'. Backport of #8500 Closes #8492 Conflicts: activerecord/test/cases/migrator_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migration_test.rb A activerecord/test/migrations/10_urban/9_add_expressions.rb commit 85741dd refs/heads/master Merge: 4737ad3 349d460 Author: Carlos Antonio da Silva Date: 2012-12-13 02:32:30 -0800 Merge pull request #8500 from senny/8492_migrations_crash_on_specific_path Recognize migrations, in folders containing numbers and 'rb' commit 349d460 refs/heads/master Author: Yves Senn Date: 2012-12-12 21:51:38 +0100 recognize migrations, in folders containing numbers and 'rb'. Closes #8492 M activerecord/CHANGELOG.md M activerecord/lib/active_record/migration.rb M activerecord/test/cases/migrator_test.rb A activerecord/test/migrations/10_urban/9_add_expressions.rb commit 059bdc3 refs/heads/master Author: Teng Siong Ong Date: 2012-12-12 21:58:29 -0800 don't include debugger gem if jruby is used since it doesn't work on jruby. M railties/lib/rails/generators/rails/app/templates/Gemfile commit 4737ad3 refs/heads/master Merge: 0a6ee1f 601cc60 Author: Jeremy Kemper Date: 2012-12-12 21:08:08 -0800 Merge pull request #8502 from arunagw/master Fixed duplicate test case name commit 5a8cb31 refs/heads/master Author: Soon Van Date: 2012-12-13 00:03:49 -0500 Trimming the in resource listing; Tutorial book moved [ci skip] M README.rdoc commit 601cc60 refs/heads/master Author: Arun Agrawal Date: 2012-12-13 10:29:07 +0530 Fixed test names for generated_attribute_test.rb M railties/test/generators/generated_attribute_test.rb commit 0a6ee1f refs/heads/master Merge: fe70cde dcf0b2d Author: Steve Klabnik Date: 2012-12-12 19:50:47 -0800 Merge pull request #8496 from ptn/link-AR-basics-guide Link to Active Record Basics guide [ci skip] commit dcf0b2d refs/heads/master Author: Pablo Torres Date: 2012-12-12 12:40:51 -0500 General refreshment of the Active Record Basics guide M guides/source/active_record_basics.md M guides/source/documents.yaml commit fe70cde refs/heads/master Author: Jeremy Kemper Date: 2012-12-12 15:38:16 -0700 Shush deprecation warning due to initializing a Migrator with migration paths rather than migrations. Use Migrator.open(paths) instead. Thanks @rubys! M activerecord/lib/active_record/railties/databases.rake commit 08d7b18 refs/heads/master Author: schneems Date: 2012-12-11 15:41:49 -0800 Output routes in :html format By formatting routes for different media (txt/html) we can apply optimizations based on the format. We can include meta-data in the HTML to allow a rich experience while rendering and viewing the routes. This PR shows route helpers as they are used with the `_path` extension, it also has a javascript toggle on the top to switch to `_url`. This way the developer can see the exact named route helper they can use instead of having to modify a base. This is one example of an optimization that could be applied. Eventually we can link out to guides for the different columns to better explain what helper, HTTP Verb, Path, and Controller#action indicate. We could even add a route search box that could allow developers to input a given route and see all of the routes that match it. These are stand alone features and should be delivered separately. M actionpack/lib/action_dispatch/routing/inspector.rb M railties/lib/rails/info_controller.rb M railties/lib/rails/templates/rails/info/routes.html.erb commit 2cdf6bd refs/heads/master Author: Pablo Torres Date: 2012-12-12 12:01:37 -0500 Add #destroy! as a method that triggers callbacks M guides/source/active_record_callbacks.md commit 019b389 refs/heads/master Author: Pablo Torres Date: 2012-12-11 22:15:41 -0500 Remove deprecated Time methods from the guides [ci skip] Don't use: * Time.time_with_datetime_fallback * Time.utc_time * Time.local_time M guides/source/active_support_core_extensions.md commit d4333ed refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-11 23:12:56 -0200 Remove deprecation message from Action Pack Related to the deprecation of Time.utc_time in favor of Time.utc, in 48583f8bf74d1cefefea3cd6591bd546a9eaff6c. M actionpack/lib/action_view/helpers/tags/date_select.rb commit 2125a6a refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-11 23:09:44 -0200 Remove not used variable warnings from AM and AC M actionmailer/lib/action_mailer/base.rb M actionpack/lib/action_controller/metal/redirecting.rb commit 6fbee4f refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-11 15:58:11 -0800 Merge pull request #8490 from mattv/fix_request_raw_post Fix rewinding in ActionDispatch::Request#raw_post Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit d176af3 refs/heads/master Merge: 5353795 991601f Author: Rafael Mendonça França Date: 2012-12-11 15:58:11 -0800 Merge pull request #8490 from mattv/fix_request_raw_post Fix rewinding in ActionDispatch::Request#raw_post commit 5353795 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-11 21:52:21 -0200 Improve test name related to cache timestamp format [ci skip] Conflicts: activerecord/test/cases/base_test.rb M activerecord/test/cases/base_test.rb commit 73f0d53 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-11 21:52:21 -0200 Improve test name related to cache timestamp format [ci skip] M activerecord/test/cases/base_test.rb commit 64281fb refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-11 21:38:49 -0200 Add :nsec format only for Ruby 1.9 Ruby 1.8 does not support this format in Time, so the format will only be added to the available date formats on Ruby 1.9. Changelog entry was changed to explain that as well. M activerecord/CHANGELOG.md M activerecord/test/cases/base_test.rb M activesupport/lib/active_support/core_ext/time/conversions.rb M activesupport/test/core_ext/time_ext_test.rb commit 991601f refs/heads/master Author: Matt Venables Date: 2012-12-11 16:46:13 -0500 Fix rewinding in ActionDispatch::Request#raw_post If env['RAW_POST_DATA'] is nil, #raw_post will attempt to set it to the result of #body (which will return env['rack.input'] if env['RAW_POST_DATA'] is nil). #raw_post will then attempt to rewind the result of another call to #body. Since env['RAW_POST_DATA'] has already been set, the result of #body is not env['rack.input'] anymore. This causes env['rack.input'] to never be rewound. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit a565f80 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-11 17:45:27 -0300 Backport thread-local variables from Ruby 2.0 A activesupport/lib/active_support/core_ext/thread.rb A activesupport/test/core_ext/thread_test.rb commit 87a7e87 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-11 13:10:09 -0200 Run backported serialized test without Identity Map It fails with Identity Map because the find call returns the same object, so the "content" attribute that we expect to raise "missing attribute" is actually present. M activerecord/test/cases/base_test.rb commit 48583f8 refs/heads/master Author: Andrew White Date: 2012-12-11 13:57:05 +0000 Deprecate obsolete Time to DateTime fallback methods The Time.time_with_datetime_fallback, Time.utc_time and Time.local_time methods were added to handle the limitations of Ruby's native Time implementation. Those limitations no longer apply so we are deprecating them in 4.0 and they will be removed in 4.1. M activerecord/lib/active_record/attribute_assignment.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/date_time_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date/conversions.rb M activesupport/lib/active_support/core_ext/string/conversions.rb M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/lib/active_support/time_with_zone.rb M activesupport/lib/active_support/values/time_zone.rb M activesupport/test/core_ext/date_ext_test.rb M activesupport/test/core_ext/date_time_ext_test.rb M activesupport/test/core_ext/string_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb commit 45a6f54 refs/heads/master Author: Andrew White Date: 2012-12-11 13:08:08 +0000 Beef up tests for String#in_time_zone and Date#in_time_zone M activesupport/test/core_ext/string_ext_test.rb M activesupport/test/core_ext/time_with_zone_test.rb commit 4dd5635 refs/heads/master Author: Andrew White Date: 2012-12-11 12:35:30 +0000 Only call `in_time_zone` on Time or DateTime instances Both String and Date now respond to in_time_zone so we need to check if the value is a Time or a DateTime. M activemodel/lib/active_model/serializers/xml.rb commit f0a9e2f refs/heads/master Author: Andrew White Date: 2012-12-11 12:23:30 +0000 Clean up 'active_support/time' requires Rely on the hub files for Time, Date and DateTime classes and add the requires for String#to_time and String#in_time_zone. M activesupport/lib/active_support/time.rb commit 454f112 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-11 09:13:50 -0200 Use 1.8 hash style :bomb: M activerecord/test/cases/base_test.rb commit 2d3b1da refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-11 08:33:57 -0200 Remove changelog entry from #8441 [ci skip] This issue only happens on master due to internal AR refactorings, so there is no need for a changelog entry. The test was backported to 3-2-stable to ensure there won't be any regressions. M activerecord/CHANGELOG.md commit 5924036 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-10 03:17:28 -0800 Merge pull request #8441 from itzki/fix_decorate_columns Backport test to ensure there won't be regressions. The issue only happens on master at the moment. M activerecord/test/cases/base_test.rb commit 6e98989 refs/heads/master Author: George Claghorn Date: 2012-12-11 04:29:19 -0500 Update guides/source/routing.md It's no longer necessary to delete public/index.html for the root route to take effect. M guides/source/routing.md commit 15934c8 refs/heads/master Merge: 224d82e 9f5622f Author: Xavier Noria Date: 2012-12-11 01:11:05 -0800 Merge pull request #8484 from gclag/dynamic-index-refinements Explain how to supersede the new dynamic welcome page commit 224d82e refs/heads/master Author: Andrew White Date: 2012-12-11 07:06:34 +0000 Deprecate Date#to_time_in_current_zone The to_time_in_current_zone method doesn't match the naming of the methods for converting to ActiveSupport::TimeWithZone on Time and DateTime. Since DateTime inherits from Date that has led to confusion with some users using the to_time_in_current_zone method with DateTime instances and having the time part dropped and the UTC offset lost. This commit fixes this by deprecating the old method and adding a new in_time_zone method which matches the naming for DateTime and Time. This should prevent accidently dropping times and UTC offsets when converting DateTime instances to ActiveSupport::TimeWithZone. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date/calculations.rb M activesupport/lib/active_support/core_ext/date/conversions.rb M activesupport/lib/active_support/core_ext/date/zones.rb M activesupport/test/core_ext/date_ext_test.rb commit 6816978 refs/heads/master Author: Andrew White Date: 2012-12-11 06:47:47 +0000 Add missing at_end_of_* aliases M activesupport/lib/active_support/core_ext/date/calculations.rb M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/core_ext/time/calculations.rb commit 9f5622f refs/heads/master Author: George Claghorn Date: 2012-12-11 01:18:30 -0500 Explain how to supersede the new dynamic welcome page The old, static welcome page instructed developers to delete the public/index.html file and set a root route. The new, dynamic welcome page should tell developers (a) why they're seeing it when it doesn't correspond to anything in the viewable app source and (b) that it can be superseded with a root route. M railties/lib/rails/templates/rails/welcome/index.html.erb commit 331a82a refs/heads/master Author: Andrew White Date: 2012-12-11 06:32:28 +0000 Add String#in_time_zone method This commit adds a convenience method for converting a string to an ActiveSupport::TimeWithZone instance using the configured Time.zone or another passed as an argument. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string.rb A activesupport/lib/active_support/core_ext/string/zones.rb M activesupport/test/core_ext/string_ext_test.rb commit 377692e refs/heads/master Merge: 603e7f7 c00e7aa Author: Santiago Pastorino Date: 2012-12-10 21:05:10 -0800 Merge pull request #8482 from BanzaiMan/defensive_matching_on_default_index_page Match the controller and path names defensively. commit c00e7aa refs/heads/master Author: Hiro Asari Date: 2012-12-10 23:04:51 -0500 Match the controller and path names defensively. Use '\A' instead of '^', and make the alteration shorter. M actionpack/lib/action_dispatch/routing/inspector.rb commit 603e7f7 refs/heads/master Merge: 8dac976 baea5d6 Author: Santiago Pastorino Date: 2012-12-10 19:49:10 -0800 Merge pull request #8468 from schneems/schneems/rack-index-page Use Rails to Render Default Index Page commit 8dac976 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-10 23:16:48 -0300 Make sure that no extra spaces are created with a non-polymorphic attributes M railties/lib/rails/generators/test_unit/model/templates/fixtures.yml M railties/test/generators/model_generator_test.rb commit 0807f6e refs/heads/master Author: Richard Schneeman Date: 2012-12-10 16:15:30 -0800 Update railties/lib/rails/info_controller.rb # :nodoc: the rails/info_controller M railties/lib/rails/info_controller.rb commit baea5d6 refs/heads/master Author: schneems Date: 2012-12-05 13:02:51 -0600 Use Rails to Render Default Index Page This is an alternative implementation to #7771 thanks to the advice of @spastorino Rails is a dynamic framework that serves a static index.html by default. One of my first questions ever on IRC was solved by simply deleting my public/index.html file. This file is a source of confusion when starting as it over-rides any set "root" in the routes yet it itself is not listed in the routes. By making the page dynamic by default we can eliminate this confusion. This PR moves the static index page to an internal controller/route/view similar to `rails/info`. When someone starts a rails server, if no root is defined, this route will take over and the "dynamic" index page from rails/welcome_controller will be rendered. These routes are only added in development. If a developer defines a root in their routes, it automatically takes precedence over this route and will be rendered, with no deleting of files required. In addition to removing this source of confusion for new devs, we can now use Rails view helpers to build and render this page. While not the primary intent, the added value of "dogfooding" should not be under-estimated. The prior PR #7771 had push-back since it introduced developer facing files. This PR solves all of the same problems, but does not have any new developer facing files (it actually removes one). cc/ @wsouto, @dickeyxxx, @tyre, @ryanb, @josevalim, @maxim, @subdigital, @steveklabnik ATP Railties and Actionpack. M actionpack/lib/action_dispatch/routing/inspector.rb M guides/source/getting_started.md M railties/CHANGELOG.md M railties/lib/rails.rb M railties/lib/rails/application/finisher.rb M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/app/templates/config/routes.rb D railties/lib/rails/generators/rails/app/templates/public/index.html A railties/lib/rails/templates/rails/welcome/index.html.erb A railties/lib/rails/welcome_controller.rb M railties/test/application/routing_test.rb M railties/test/generators/app_generator_test.rb commit c04dc67 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-10 19:08:09 -0500 remove attr_protected reference from AS Core Extensions guide [ci skip] M guides/source/active_support_core_extensions.md commit 1e83730 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-10 19:07:25 -0500 remove Mass Assignment reference from Form Helpers guide [ci skip] M guides/source/form_helpers.md commit 46d63d5 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-10 19:04:11 -0500 remove Mass Assignment reference from Security Guide [ci skip] M guides/source/security.md commit 336bbb1 refs/heads/master Author: Florent Guilleux Date: 2012-12-10 18:47:21 -0500 Document adding member route without the option M guides/source/routing.md commit d668544 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-10 17:14:17 -0300 Add CHANGELOG entry for #6376. Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md commit 9cce1ea refs/heads/master Author: Rafael Mendonça França Date: 2012-12-10 16:22:30 -0300 Allow users to choose the timestamp format in the cache key This can be done using the class attribute cache_timestamp_format Conflicts: railties/guides/source/configuring.textile M activerecord/CHANGELOG.md M activerecord/lib/active_record/integration.rb M activerecord/test/cases/base_test.rb M activerecord/test/models/developer.rb M guides/source/configuring.md commit 0ef70b8 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-10 17:14:17 -0300 Add CHANGELOG entry for #6376. M activerecord/CHANGELOG.md commit b097652 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-10 16:22:30 -0300 Allow users to choose the timestamp format in the cache key This can be done using the class attribute cache_timestamp_format Closes #8195 M activerecord/CHANGELOG.md M activerecord/lib/active_record/integration.rb M activerecord/test/cases/base_test.rb M activerecord/test/models/developer.rb M railties/guides/source/configuring.textile commit 3142bf5 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-29 21:35:30 -0200 Make sure the tests pass in the case closer to described in #8195 Conflicts: activerecord/test/models/bulb.rb activerecord/test/schema/schema.rb M activerecord/test/cases/base_test.rb D activerecord/test/cases/cache_key_test.rb M activerecord/test/models/bulb.rb M activerecord/test/schema/schema.rb commit 567cdd1 refs/heads/master Author: jacobstr Date: 2012-11-26 16:50:04 -0700 Added regression test for #8195. A activerecord/test/cases/cache_key_test.rb commit d9039cd refs/heads/master Author: Rafael Mendonça França Date: 2012-12-10 17:34:35 -0300 Move new CHANGELOG entry to the top M actionpack/CHANGELOG.md commit b04fe4c refs/heads/master Merge: 287a8d8 bc254cc Author: Rafael Mendonça França Date: 2012-12-10 12:28:41 -0800 Merge pull request #8476 from sheerun/fix/multipart-get Prevent raising EOFError on multipart GET request. commit bc254cc refs/heads/master Author: Adam Stankiewicz Date: 2012-12-10 14:59:06 +0100 Prevent raising EOFError on multipart GET request. Such request can happen on Internet Explorer. When we redirect after multipart form submission, the request type is changed to GET, but Content-Type is preserved as multipart. GET request cannot have multipart body and that caused Rails to fail. It's similar fix to Rack's one: https://github.com/chneukirchen/rack/blob/8025a4ae9477d1e6231344c2b7d795aa9b3717b6/lib/rack/request.rb#L224 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/parameters.rb M actionpack/test/dispatch/request/multipart_params_parsing_test.rb commit 660882b refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-29 21:35:30 -0200 Make sure the tests pass in the case closer to described in #8195 M activerecord/test/cases/base_test.rb D activerecord/test/cases/cache_key_test.rb M activerecord/test/models/bulb.rb M activerecord/test/schema/schema.rb commit d4d9e1f refs/heads/master Author: Steve Klabnik Date: 2012-12-10 11:01:21 -0800 Add multipart: true to form for file upload. I was slightly overzealous when removing this before. Identified here: https://github.com/rails/rails/commit/ed78770b1a13788a5d3fcae484f34654de580bd5\#commitcomment-2281181 M guides/source/action_view_overview.md commit 5c2eb88 refs/heads/master Author: Andy Lindeman Date: 2012-12-10 13:43:29 -0500 `config.action_mailer.async` is no longer used M guides/source/action_mailer_basics.md commit 09a8b14 refs/tags/v3.2.15 Author: Jeremy Kemper Date: 2012-05-18 17:30:35 -0700 Merge pull request #6376 from jgaskins/timestamp-microseconds Increase numeric-timestamp precision to nanoseconds Conflicts: activesupport/lib/active_support/core_ext/time/conversions.rb M activerecord/lib/active_record/integration.rb M activerecord/test/cases/base_test.rb M activesupport/lib/active_support/core_ext/time/conversions.rb M activesupport/test/core_ext/time_ext_test.rb commit cc99580 refs/tags/v3.2.15 Author: jacobstr Date: 2012-11-26 16:50:04 -0700 Added regression test for #8195. A activerecord/test/cases/cache_key_test.rb commit c720ff7 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-10 15:29:38 -0300 Remove warning of unused variable M activerecord/test/cases/calculations_test.rb commit 86e1f45 refs/tags/v3.2.15 Merge: a3c3cfd 9b72c36 Author: Rafael Mendonça França Date: 2012-12-10 08:04:06 -0800 Merge pull request #8477 from senny/backport_8448 Backport #8450, the return value from mailer methods is not relevant. commit 9b72c36 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-12-10 17:00:41 +0100 Backport #8450, the return value from mailer methods is not relevant. Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb M actionmailer/test/mailers/base_mailer.rb commit d1b9c5f refs/tags/v3.2.15 Author: Yves Senn Date: 2012-12-10 16:59:37 +0100 revised the actionmailer's CHANGELOG structure M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb commit 287a8d8 refs/heads/master Merge: f2d1e27 ec3429a Author: Rafael Mendonça França Date: 2012-12-10 06:40:33 -0800 Merge pull request #8450 from senny/8448_mailer_return_values the return value of mailer methods should not be relevant commit f2d1e27 refs/heads/master Merge: 9e42cd8 7efcc5d Author: Carlos Antonio da Silva Date: 2012-12-10 03:17:28 -0800 Merge pull request #8441 from itzki/fix_decorate_columns Fix decorate_columns for finding only non-serialized columns commit ec3429a refs/heads/master Author: Yves Senn Date: 2012-12-07 14:43:49 +0100 The return value from mailer methods is not relevant. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb M actionmailer/test/mailers/base_mailer.rb commit 7efcc5d refs/heads/master Author: itzki Date: 2012-12-07 04:30:00 +0900 Fix decorating columns for serialized attributes M activerecord/CHANGELOG.md M activerecord/lib/active_record/model_schema.rb M activerecord/test/cases/serialized_attribute_test.rb commit 9e42cd8 refs/heads/master Merge: 05e6123 190f638 Author: Rafael Mendonça França Date: 2012-12-10 00:36:31 -0300 Merge branch 'scaffold_fixes' commit 190f638 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-10 00:35:03 -0300 Ensure the scaffold tests will pass when using references attributes M railties/test/application/rake_test.rb commit 05e6123 refs/heads/master Merge: 8110035 e073b03 Author: Rafael Mendonça França Date: 2012-12-09 19:05:00 -0800 Merge pull request #8472 from schneems/schneems/expand_path Use `File.expand_path` instead of `File.join` commit 95ccbd8 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-09 17:01:03 -0300 Add GeneratedAttribute#column_name to get the name of the column in the database M railties/lib/rails/generators/generated_attribute.rb M railties/lib/rails/generators/named_base.rb M railties/lib/rails/generators/test_unit/model/templates/fixtures.yml M railties/test/generators/generated_attribute_test.rb commit 80735ff refs/heads/master Author: Rafael Mendonça França Date: 2012-12-09 15:53:23 -0300 Extract a attributes_names method to avoid duplication M railties/lib/rails/generators/named_base.rb M railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb commit b05b77b refs/heads/master Author: Rafael Mendonça França Date: 2012-12-09 15:20:32 -0300 Deal with polymorphic attributes correctly in the generators M railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/lib/rails/generators/test_unit/model/templates/fixtures.yml M railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb M railties/test/generators/model_generator_test.rb M railties/test/generators/scaffold_controller_generator_test.rb commit 4a487f9 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-09 14:34:26 -0300 Make references and belongs_to attributes to generate the _id column in fixtures M railties/lib/rails/generators/test_unit/model/templates/fixtures.yml M railties/test/generators/model_generator_test.rb commit 3d8fcdd refs/heads/master Author: Rafael Mendonça França Date: 2012-12-06 18:00:41 -0200 Put the reference and belongs_to attributes in the scaffold tests. M railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit e073b03 refs/heads/master Author: schneems Date: 2012-12-09 17:51:58 -0800 Use `File.expand_path` instead of `File.join` cc/ @carlosantoniodasilva M railties/lib/rails/info_controller.rb commit 8110035 refs/heads/master Author: Jeremy Kemper Date: 2012-12-09 17:14:27 -0700 Revert "Omit directories from gemspec.files for RubyGems 2 compat." Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25. M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M activemodel/activemodel.gemspec M activerecord/activerecord.gemspec M activesupport/activesupport.gemspec M rails.gemspec M railties/railties.gemspec commit cff747d refs/heads/master Author: Jeremy Kemper Date: 2012-12-09 15:52:28 -0700 Move to the schema-migrations-metadata branch. Pending work on graceful app upgrades. Revert "Merge pull request #8439 from joshsusser/fixes" This reverts commit ce8ac39338f86388e70356b3a470b3ea443802ae, reversing changes made to b0e7b6f67c984d4b1502e801781ed75fad681633. Revert "Merge pull request #8431 from joshsusser/schemadump" This reverts commit 036d3e1c2b65c4b8cbd23de2e20ad67b9b756182, reversing changes made to 0c692f4d121792117b6a71e5ed590a31c3b9d12e. Revert "Merge branch 'joshsusser-master' into merge" This reverts commit 0c692f4d121792117b6a71e5ed590a31c3b9d12e, reversing changes made to 2e299fca715b083a60222a85e48f9d3b8dd8ce93. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/schema_dumper_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/schema.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb M activerecord/test/cases/migration/logger_test.rb A activerecord/test/cases/migration/table_and_index_test.rb M activerecord/test/cases/migration_test.rb M activerecord/test/cases/migrator_test.rb M activerecord/test/cases/schema_dumper_test.rb D activerecord/test/cases/schema_migration_test.rb D activerecord/test/migrations/always_safe/1001_always_safe.rb D activerecord/test/migrations/always_safe/1002_still_safe.rb commit c712b08 refs/heads/master Author: Iuri Gagnidze Date: 2012-12-09 16:56:10 -0600 Added test to ensure that DescendantsTracker does not leak memory on singleton classes M activesupport/test/descendants_tracker_without_autoloading_test.rb commit 9819002 refs/heads/master Author: Thiago Pinto Date: 2012-12-09 15:24:44 -0500 repeating documentation for form helpers M actionpack/lib/action_view/helpers/form_helper.rb commit d1e70cb refs/heads/master Author: Gaurish Sharma Date: 2012-12-10 01:31:39 +0530 Add quotes to Numeric Passwords to force string(sqlserver) If you have numeric password for your database, like below: ```yaml development: adapter: mysql2 encoding: utf8 database: myblog_development pool: 5 username: root password: 123456 ``` you will get the following obscure error with unhelpful stack-trace ```shell /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `connect': can't convert Fixnum into String (TypeError) from /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `initialize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `new' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `mysql2_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:444:in `new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:454:in `checkout_new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:425:in `acquire_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:362:in `block in checkout' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:361:in `checkout' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:271:in `block in connection' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:270:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:545:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:79:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:53:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/railtie.rb:153:in `block in ' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `instance_exec' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `run' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:55:in `block in run_initializers' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:150:in `block in tsort_each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:183:in `block (2 levels) in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:219:in `each_strongly_connected_component_from' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:182:in `block in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:148:in `tsort_each' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:54:in `run_initializers' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:216:in `initialize!' from /home/gaurish/code/repo/rails/railties/lib/rails/railtie/configurable.rb:30:in `method_missing' from /tmp/numericpass/config/environment.rb:5:in `' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require_environment!' from /home/gaurish/code/repo/rails/railties/lib/rails/commands.rb:70:in `' from script/rails:6:in `require' from script/rails:6:in `
' ``` Looking [Can't convert fixnum to string during rake db:create](http://stackoverflow.com/questions/3765834/cant-convert-fixnum-to-string-during-rake-dbcreate), it seems lot of people have faced the same error. so adding a note informing about numeric passwords seems like a good idea M railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit 2f0311d refs/heads/master Author: Gaurish Sharma Date: 2012-12-10 01:28:09 +0530 Add quotes to Numeric Passwords to force string(jdbcmysql) If you have numeric password for your database, like below: ```yaml development: adapter: mysql2 encoding: utf8 database: myblog_development pool: 5 username: root password: 123456 ``` you will get the following obscure error with unhelpful stack-trace ```shell /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `connect': can't convert Fixnum into String (TypeError) from /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `initialize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `new' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `mysql2_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:444:in `new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:454:in `checkout_new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:425:in `acquire_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:362:in `block in checkout' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:361:in `checkout' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:271:in `block in connection' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:270:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:545:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:79:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:53:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/railtie.rb:153:in `block in ' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `instance_exec' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `run' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:55:in `block in run_initializers' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:150:in `block in tsort_each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:183:in `block (2 levels) in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:219:in `each_strongly_connected_component_from' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:182:in `block in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:148:in `tsort_each' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:54:in `run_initializers' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:216:in `initialize!' from /home/gaurish/code/repo/rails/railties/lib/rails/railtie/configurable.rb:30:in `method_missing' from /tmp/numericpass/config/environment.rb:5:in `' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require_environment!' from /home/gaurish/code/repo/rails/railties/lib/rails/commands.rb:70:in `' from script/rails:6:in `require' from script/rails:6:in `
' ``` Looking [Can't convert fixnum to string during rake db:create](http://stackoverflow.com/questions/3765834/cant-convert-fixnum-to-string-during-rake-dbcreate), it seems lot of people have faced the same error. so adding a note informing about numeric passwords seems like a good idea M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml commit db9b619 refs/heads/master Author: Gaurish Sharma Date: 2012-12-10 01:26:26 +0530 Add quotes to Numeric Passwords to force string(jdbcpostgresql) If you have numeric password for your database, like below: ```yaml development: adapter: mysql2 encoding: utf8 database: myblog_development pool: 5 username: root password: 123456 ``` you will get the following obscure error with unhelpful stack-trace ```shell /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `connect': can't convert Fixnum into String (TypeError) from /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `initialize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `new' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `mysql2_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:444:in `new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:454:in `checkout_new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:425:in `acquire_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:362:in `block in checkout' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:361:in `checkout' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:271:in `block in connection' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:270:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:545:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:79:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:53:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/railtie.rb:153:in `block in ' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `instance_exec' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `run' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:55:in `block in run_initializers' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:150:in `block in tsort_each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:183:in `block (2 levels) in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:219:in `each_strongly_connected_component_from' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:182:in `block in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:148:in `tsort_each' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:54:in `run_initializers' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:216:in `initialize!' from /home/gaurish/code/repo/rails/railties/lib/rails/railtie/configurable.rb:30:in `method_missing' from /tmp/numericpass/config/environment.rb:5:in `' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require_environment!' from /home/gaurish/code/repo/rails/railties/lib/rails/commands.rb:70:in `' from script/rails:6:in `require' from script/rails:6:in `
' ``` Looking [Can't convert fixnum to string during rake db:create](http://stackoverflow.com/questions/3765834/cant-convert-fixnum-to-string-during-rake-dbcreate), it seems lot of people have faced the same error. so adding a note informing about numeric passwords seems like a good idea M railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml commit e5f8b2b refs/heads/master Author: Gaurish Sharma Date: 2012-12-10 01:22:25 +0530 Add quotes to Numeric Passwords to force string(MySql) If you have numeric password for your database, like below: ```yaml development: adapter: mysql2 encoding: utf8 database: myblog_development pool: 5 username: root password: 123456 ``` you will get the following obscure error with unhelpful stack-trace ```shell $ c /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `connect': can't convert Fixnum into String (TypeError) from /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `initialize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `new' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `mysql2_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:444:in `new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:454:in `checkout_new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:425:in `acquire_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:362:in `block in checkout' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:361:in `checkout' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:271:in `block in connection' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:270:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:545:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:79:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:53:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/railtie.rb:153:in `block in ' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `instance_exec' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `run' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:55:in `block in run_initializers' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:150:in `block in tsort_each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:183:in `block (2 levels) in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:219:in `each_strongly_connected_component_from' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:182:in `block in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:148:in `tsort_each' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:54:in `run_initializers' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:216:in `initialize!' from /home/gaurish/code/repo/rails/railties/lib/rails/railtie/configurable.rb:30:in `method_missing' from /tmp/numericpass/config/environment.rb:5:in `' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require_environment!' from /home/gaurish/code/repo/rails/railties/lib/rails/commands.rb:70:in `' from script/rails:6:in `require' from script/rails:6:in `
' ``` Looking [Can't convert fixnum to string during rake db:create](http://stackoverflow.com/questions/3765834/cant-convert-fixnum-to-string-during-rake-dbcreate), it seems lot of people have faced the same error. so adding a note informing about numeric passwords seems like a good idea M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml commit 6e72099 refs/heads/master Author: Gaurish Sharma Date: 2012-12-10 01:20:36 +0530 Add quotes to Numeric Passwords to force string(Postgres) If you have numeric password for your database, like below: ```yaml development: adapter: mysql2 encoding: utf8 database: myblog_development pool: 5 username: root password: 123456 ``` you will get the following obscure error with unhelpful stack-trace ```shell $ c /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `connect': can't convert Fixnum into String (TypeError) from /home/gaurish/.rvm/gems/ruby-1.9.3-p286-perf/gems/mysql2-0.3.11/lib/mysql2/client.rb:44:in `initialize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `new' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:16:in `mysql2_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:444:in `new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:454:in `checkout_new_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:425:in `acquire_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:362:in `block in checkout' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:361:in `checkout' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:271:in `block in connection' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/monitor.rb:211:in `mon_synchronize' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:270:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb:545:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:79:in `retrieve_connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/connection_handling.rb:53:in `connection' from /home/gaurish/code/repo/rails/activerecord/lib/active_record/railtie.rb:153:in `block in ' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `instance_exec' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:30:in `run' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:55:in `block in run_initializers' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:150:in `block in tsort_each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:183:in `block (2 levels) in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:219:in `each_strongly_connected_component_from' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:182:in `block in each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:180:in `each_strongly_connected_component' from /home/gaurish/.rvm/rubies/ruby-1.9.3-p286-perf/lib/ruby/1.9.1/tsort.rb:148:in `tsort_each' from /home/gaurish/code/repo/rails/railties/lib/rails/initializable.rb:54:in `run_initializers' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:216:in `initialize!' from /home/gaurish/code/repo/rails/railties/lib/rails/railtie/configurable.rb:30:in `method_missing' from /tmp/numericpass/config/environment.rb:5:in `' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require' from /home/gaurish/code/repo/rails/railties/lib/rails/application.rb:190:in `require_environment!' from /home/gaurish/code/repo/rails/railties/lib/rails/commands.rb:70:in `' from script/rails:6:in `require' from script/rails:6:in `
' ``` Looking [Can't convert fixnum to string during rake db:create](http://stackoverflow.com/questions/3765834/cant-convert-fixnum-to-string-during-rake-dbcreate), it seems lot of people have faced the same error. so adding a note informing about numeric passwords seems like a good idea M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml commit b4b8c26 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-06 17:48:11 -0200 Use the references and belongs_id ids in the scaffold_controller generator M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb commit 95b7b02 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-06 17:43:36 -0200 Add test case for scaffold_controller generator without attributes. This is a test for 978c568a7bffe354180aaefa471092182fed1015 M railties/test/generators/scaffold_controller_generator_test.rb commit 3c2c1a4 refs/remotes/origin/schema-migrations-metadata (origin/schema-migrations-metadata) Author: Vijay Dev Date: 2012-12-09 23:05:37 +0530 revise block on kindle guides [ci skip] M guides/source/index.html.erb commit 6897a83 refs/remotes/origin/schema-migrations-metadata Author: Rafael Mendonça França Date: 2012-12-09 13:57:56 -0300 Remove the spaces after the open bracket and before the close bracket. All our generated code follow this rule M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit 2d6b406 refs/remotes/origin/schema-migrations-metadata Merge: 6c58fca 21d87f7 Author: Rafael Mendonça França Date: 2012-12-09 08:33:17 -0800 Merge pull request #8469 from kytrinyx/explicit-mysql-instructions Include command to create mysql user [ci skip] commit 21d87f7 refs/remotes/origin/schema-migrations-metadata Author: Katrina Owen Date: 2012-12-09 17:24:33 +0100 Include command to create mysql user The guide mentions that the 'rails' user is needed, but doesn't explicitly include the command to do so. M guides/source/development_dependencies_install.md commit 6c58fca refs/remotes/origin/schema-migrations-metadata Author: Vijay Dev Date: 2012-12-09 19:29:52 +0530 Revert "API reader should look elsewhere for helper instructions" This reverts commit ba2d867b2961b5ef72aad353c2d647b04654cbe3. Reason: https://github.com/lifo/docrails/commit/ba2d867b2961b5ef72aad353c2d647b04654cbe3#commitcomment-2276670 [ci skip] M actionpack/lib/action_view/helpers/form_helper.rb commit 0939a81 refs/heads/master Author: Henare Degan Date: 2012-12-09 23:17:33 +1100 Globalize2 is only compatible with Rails 2 so link to Globalize3 instead M guides/source/i18n.md commit e58e8bd refs/remotes/origin/schema-migrations-metadata Merge: bb8923d 6e0eb92 Author: Jeremy Kemper Date: 2012-12-08 22:03:46 -0800 Merge pull request #8466 from gclag/stats-handle-new-test-locations Make rake task for code statistics handle new test locations properly commit 6e0eb92 refs/remotes/origin/schema-migrations-metadata Author: George Claghorn Date: 2012-12-09 00:04:36 -0500 Make code statistics rake task handle new test locations properly As of 2a68f68aead9fd65ecac8062ca8efc15f5bab418: - Unit tests are now in test/models, instead of test/units - Functional tests are now in test/controllers, instead of test/functional - Helper tests are now in test/helpers, instead of test/units/helpers - Mailer tests are now in test/mailers, instead of test/functional Update the rake task for code statistics (`rake stats`) so that it recognizes files in the above locations as tests, and accurately calculates statistics such as "Test LOC" and "Code to Test Ratio." Safely handle Rails apps that still have tests in the old locations. M railties/lib/rails/code_statistics.rb commit 4d6a314 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-09 00:01:28 -0500 use default_options= instead of default to avoid confusion M actionmailer/lib/action_mailer/base.rb commit bb8923d refs/remotes/origin/schema-migrations-metadata Author: Jeremy Kemper Date: 2012-12-08 17:18:10 -0700 Omit directories from gemspec.files for RubyGems 2 compat. RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted. M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M activemodel/activemodel.gemspec M activerecord/activerecord.gemspec M activesupport/activesupport.gemspec M rails.gemspec M railties/railties.gemspec commit 314e4bb refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-12-08 19:22:09 -0200 Fix method assertion ensuring it will match "end" with the same indentation Otherwise it was matching "end" lines from blocks within the method body, making tests such as the migration ones fail. M railties/lib/rails/generators/test_case.rb commit 61b528e refs/remotes/origin/schema-migrations-metadata Merge: 86269b4 97d06e8 Author: Jeremy Kemper Date: 2012-12-08 13:45:30 -0800 Merge pull request #8346 from sodabrew/patch-1 Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters commit 07e2f0e refs/heads/master Author: Steve Klabnik Date: 2012-12-08 11:24:14 -0800 Security Guide: removing Mass Assignment. Since mass assignment doesn't exist anymore, we don't need to discuss it. I checked with @fxn last night before making this change. M guides/source/security.md commit 86269b4 refs/remotes/origin/schema-migrations-metadata Merge: ea86fa3 e8fe1d1 Author: Vijay Dev Date: 2012-12-08 10:33:05 -0800 Merge pull request #8348 from danchoi/master Kindle ebook generation with working section navigation commit ea86fa3 refs/remotes/origin/schema-migrations-metadata Author: Vijay Dev Date: 2012-12-08 23:47:12 +0530 update release notes [ci skip] M guides/source/4_0_release_notes.md commit 97d06e8 refs/remotes/origin/schema-migrations-metadata Author: Aaron Stone Date: 2012-11-27 00:57:45 -0800 Session variables for mysql, mysql2, and postgresql adapters can be set in the new 'variables:' hash in each database config section in database.yml. The key-value pairs of this hash will be sent in a 'SET key = value, ...' query on new database connections. The configure_connection methods from mysql and mysql2 into are consolidated into the abstract_mysql base class. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 0a33fcd refs/heads/master Merge: 1233fc6 7297980 Author: Vijay Dev Date: 2012-12-08 23:11:37 +0530 Merge branch 'master' of github.com:lifo/docrails commit 7297980 refs/heads/master Author: Vijay Dev Date: 2012-12-08 23:10:38 +0530 copy edits [ci skip] M guides/source/api_documentation_guidelines.md M guides/source/ruby_on_rails_guides_guidelines.md commit 4085dd6 refs/heads/master Author: Vijay Dev Date: 2012-12-08 23:02:18 +0530 Revert "Introduce Bundler and Gemfiles in a NOTE" This reverts commit 83cb6fbd13f3c5ea3106b9a57964b1a6fb243682. Reason: very trivial [ci skip] M guides/source/getting_started.md commit 1233fc6 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-08 14:37:15 -0200 Fix scaffold controller generator tests M railties/test/generators/scaffold_controller_generator_test.rb commit 7d42317 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-08 14:21:06 -0200 Improve where.not docs [ci skip] * Fix example queries * Remove doc entries of where.like/not_like. * Remove :chain from where.not related docs. To me that's an implementation detail and we don't expect people to use where(:chain).not. M activerecord/lib/active_record/relation/query_methods.rb commit 49295e7 refs/heads/master Merge: 40991dd 0e027f4 Author: Carlos Antonio da Silva Date: 2012-12-08 08:00:52 -0800 Merge pull request #8461 from frodsan/fix_assert_method_generators Fix #assert_instance_method to also assert indented methods commit 40991dd refs/heads/master Merge: bef3308 4ec7493 Author: Rafael Mendonça França Date: 2012-12-08 07:24:41 -0800 Merge pull request #8465 from frodsan/update_am_action_callbacks use _action callbacks in actionmailer commit 4ec7493 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-08 10:20:59 -0500 use _action callbacks in actionmailer M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb A actionmailer/test/fixtures/base_test/after_action_mailer/welcome.html.erb D actionmailer/test/fixtures/base_test/after_filter_mailer/welcome.html.erb A actionmailer/test/fixtures/base_test/before_action_mailer/welcome.html.erb D actionmailer/test/fixtures/base_test/before_filter_mailer/welcome.html.erb A actionpack/test/controller/default_url_options_with_before_action_test.rb D actionpack/test/controller/default_url_options_with_filter_test.rb commit 0e027f4 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-08 09:44:45 -0500 Fix #assert_instance_method to also assert indented methods M railties/lib/rails/generators/test_case.rb commit bef3308 refs/heads/master Merge: 3f95908 b9d1d2c Author: Carlos Antonio da Silva Date: 2012-12-08 06:14:17 -0800 Merge pull request #8395 from bmaland/attr_accessors Use attr_accessor for Rails.{application,cache,logger} commit 3f95908 refs/heads/master Merge: 236bed9 ad59260 Author: Carlos Antonio da Silva Date: 2012-12-08 08:16:28 -0200 Merge pull request #8457 from caike/master Update AR Changelog with correct example using includes [ci skip] commit ad59260 refs/heads/master Author: Caike Souza Date: 2012-12-07 17:03:00 -0500 Update AR Changelog with correct example using includes These queries don't seem to work without the includes clause. [ci skip] M activerecord/CHANGELOG.md commit 236bed9 refs/heads/master Merge: 0eedfec f19e41f Author: Carlos Antonio da Silva Date: 2012-12-08 02:11:47 -0800 Merge pull request #8462 from frodsan/update_guides_action_callbacks Update guides to use _action callbacks [ci skip] commit 0eedfec refs/heads/master Merge: 69163cc cd526fe Author: Carlos Antonio da Silva Date: 2012-12-08 02:09:15 -0800 Merge pull request #8459 from frodsan/explicit! use :only instead of :except callback option in the controller template commit aa1b903 refs/heads/master Author: Steve Klabnik Date: 2012-12-07 23:31:17 -0800 Fill out API Documentation Guidelines 'you will learn' list. M guides/source/api_documentation_guidelines.md commit 1ef8138 refs/heads/master Author: Steve Klabnik Date: 2012-12-07 23:26:13 -0800 Fill out Active Support Core Extensions 'you will learn' list. M guides/source/active_support_core_extensions.md commit 350b122 refs/heads/master Author: Steve Klabnik Date: 2012-12-07 23:22:51 -0800 Remove reference to background queue in mailer guide. Mailers are always async now, and we already discuss queueing lower down in the guide. M guides/source/action_mailer_basics.md commit ed78770 refs/heads/master Author: Steve Klabnik Date: 2012-12-07 23:20:35 -0800 Remove references to Rails versions. There's no reason for guides to reference old behaviors. They should be current as of the versions of Rails that they ship with, and including older information just clutters thing. I discussed this change with @fxn and he agrees. M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_record_querying.md M guides/source/active_support_core_extensions.md M guides/source/asset_pipeline.md M guides/source/configuring.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/layouts_and_rendering.md M guides/source/plugins.md M guides/source/routing.md commit f19e41f refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 23:43:46 -0500 update guides to use _action callbacks [ci skip] M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/caching_with_rails.md M guides/source/i18n.md M guides/source/security.md commit cd526fe refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 20:35:43 -0500 fix scaffold controller generator tests M railties/test/generators/scaffold_generator_test.rb commit e618adb refs/heads/master Author: Claudio B. Date: 2012-12-07 16:54:32 -0800 Update activesupport/lib/active_support/deprecation/proxy_wrappers.rb Fix a typo in rdoc (*expect* for *except*) M activesupport/lib/active_support/deprecation/proxy_wrappers.rb commit a3c29b7 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 19:31:14 -0500 use :only instead of :except callback option in the controller template As [Security Guide](http://edgeguides.rubyonrails.org/security.html#whitelists-versus-blacklists) says, it's better to use `before_filter only: []` instead of `except: []` so we don't forget to turn the filter off for newly added actions. M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit fc6336d refs/heads/master Author: Katie Oldaker Date: 2012-12-07 16:31:27 -0500 Punctuation, capitalization, grammar fixes in rails guides M guides/source/action_mailer_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/migrations.md commit 69163cc refs/heads/master Merge: 9cb91f9 1b97d41 Author: Xavier Noria Date: 2012-12-07 12:35:26 -0800 Merge pull request #8456 from frodsan/actionize2 Actionize2 commit 1b97d41 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 15:29:51 -0500 add tests to aliased _filter callbacks M actionpack/test/abstract/callbacks_test.rb commit 5fb94ec refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 15:24:56 -0500 use `_action` instead of `_filter` callbacks M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/lib/action_dispatch/http/mime_negotiation.rb M actionpack/test/abstract/callbacks_test.rb M actionpack/test/controller/flash_test.rb M actionpack/test/controller/rescue_test.rb commit 9cb91f9 refs/heads/master Merge: 85f4956 a53a7be Author: Xavier Noria Date: 2012-12-07 11:52:42 -0800 Merge pull request #8455 from frodsan/actionize Actionize: Use `_action` callbacks in documentation and code commit 85f4956 refs/heads/master Merge: 339e4e8 6ee03a4 Author: Jeremy Kemper Date: 2012-12-07 11:48:25 -0800 Merge pull request #8454 from frodsan/deprecate_as_basic_object Rename ActiveSupport::BasicObject to ActiveSupport::ProxyObject commit a53a7be refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 14:46:06 -0500 update documentation and code to use _action callbacks M actionpack/lib/action_controller/metal/force_ssl.rb M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_basic_authentication_test.rb M actionpack/test/controller/http_digest_authentication_test.rb M actionpack/test/controller/http_token_authentication_test.rb M actionpack/test/controller/log_subscriber_test.rb M actionpack/test/controller/mime_responds_test.rb M actionpack/test/controller/new_base/base_test.rb M actionpack/test/controller/new_base/render_context_test.rb M actionpack/test/controller/render_test.rb M actionpack/test/controller/rescue_test.rb M actionpack/test/controller/show_exceptions_test.rb M actionpack/test/controller/view_paths_test.rb commit 339e4e8 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-07 20:37:25 +0100 Let the scaffold example use the "set shared record" pattern to explain callbacks M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit f53132d refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 14:28:32 -0500 fix prepend_before_filter documentation [ci skip] M actionpack/lib/abstract_controller/callbacks.rb commit 6ee03a4 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-07 14:13:56 -0500 Rename ActiveSupport::BasicObject to ActiveSupport::ProxyObject AS::BasicObject is used for proxy classes. Let's give it a less concerning name. Also, it avoids the confusion with Ruby's Basic Object. M activesupport/CHANGELOG.md M activesupport/lib/active_support.rb M activesupport/lib/active_support/basic_object.rb M activesupport/lib/active_support/duration.rb A activesupport/lib/active_support/proxy_object.rb M activesupport/test/core_ext/duration_test.rb commit 8d02afe refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-07 16:52:55 -0200 Rollback where.like and where.not_like The real win with these chain methods is where.not, that takes care of different scenarios in a graceful way, for instance when the given value is nil. where("author.id != ?", author_to_ignore.id) where.not("author.id", author_to_ignore.id) Both where.like and where.not_like compared to the SQL versions doesn't seem to give us that much: Post.where("title LIKE 'ruby on%'") Post.where.like(title: 'ruby on%'") Post.where("title NOT LIKE 'ruby on%'") Post.where.not_like(title: 'ruby on%'") Thus Rails is adding where.not, but not where.like/not_like and others. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_chain_test.rb commit 7b50dc5 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-07 19:08:38 +0100 Fix README M actionpack/CHANGELOG.md commit 38db4e2 refs/heads/master Author: Max Katz Date: 2012-12-07 10:57:24 -0700 Fix small grammatical error M guides/source/action_controller_overview.md commit 9d62e04 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-07 18:54:26 +0100 Rename all action callbacks from *_filter to *_action M actionpack/CHANGELOG.md M actionpack/lib/abstract_controller/callbacks.rb M actionpack/test/abstract/callbacks_test.rb commit 7c05ea2 refs/heads/master Author: Katie Oldaker Date: 2012-12-07 12:50:09 -0500 Fixed grammar in a lot of guide prologues. M guides/source/action_controller_overview.md M guides/source/active_record_callbacks.md M guides/source/active_record_querying.md M guides/source/active_record_validations.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/testing.md M guides/source/working_with_javascript_in_rails.md commit c205284 refs/heads/master Merge: 27ca915 bb53c60 Author: Carlos Antonio da Silva Date: 2012-12-07 09:27:51 -0800 Merge pull request #8452 from claudiob/explain_where_chain_parameters Document the types of arguments accepted by AR#not commit bb53c60 refs/heads/master Author: claudiob Date: 2012-12-07 08:45:45 -0800 Document the types of arguments accepted by AR#not This commit stems from https://github.com/rails/rails/pull/8332#issuecomment-11127957 Since the formats in which conditions can be passed to `not` differ from the formats in which conditions can be passed to `like` and `not_like`, then I think it's worth adding rdoc and tests to show this behavior M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_chain_test.rb commit 70b8094 refs/heads/master Author: Ian C. Anderson Date: 2012-12-07 12:00:48 -0500 Added overview items to Guides Guidelines prologue M guides/source/ruby_on_rails_guides_guidelines.md commit 27ca915 refs/heads/master Author: Xavier Noria Date: 2012-12-07 17:37:57 +0100 revises a RDoc example to make it idiomatic The force flag suggests the original was probably copied from some db/schema.rb. Thanks to Josh Susser for spotting and reporting this. M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb commit 0adcf6d refs/heads/master Author: Xavier Noria Date: 2012-12-07 15:20:02 +0100 let @version be always externally set in guides generation [fixes #8221] Shelling out was there for authors convenience, but we are rather going to have the tag or SHA1 always in RAILS_VERSION and if the environment variable is blank, then just use "local" as a reminder that you are just working locally. The docs server has been updated to set the long SHA1 in RAILS_VERSION when generating edge guides. M guides/rails_guides/generator.rb M guides/source/_welcome.html.erb commit 89ab303 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-07 08:53:24 -0200 Fix where.not with in clause Arel::Nodes::In inherits from Arel::Nodes::Equality, so the case statement was always using the Equality operator for both scenarios, resulting in a not equal query instead. M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_chain_test.rb commit ee5999d refs/heads/master Merge: af73e3c 74e3f30 Author: Carlos Antonio da Silva Date: 2012-12-07 02:38:47 -0800 Merge pull request #8445 from claudiob/match_rdoc_with_6ba0f97 Update #where rdoc to match 6ba0f97 [ci skip] commit 74e3f30 refs/heads/master Author: claudiob Date: 2012-12-07 01:28:28 -0800 Update #where rdoc to match 6ba0f97 [ci skip] This commit updates the rdoc of AR#where to match the changes applied in https://github.com/rails/rails/commit/6ba0f97 that is: * `where(nil)` has the same effect of `where('')`: a no op * `where` (no args) has the same effect of `where(:chain)`: to create a WhereChain M activerecord/lib/active_record/relation/query_methods.rb commit af73e3c refs/heads/master Author: Andrew White Date: 2012-12-07 06:02:43 +0000 Revert "Invert precedence of content in ActionDispatch::Static" This reverts commit c59734f756b79c39486c45273d2cc5d42cd0c864. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/dispatch/static_test.rb M railties/test/application/routing_test.rb commit 55dec5a refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-07 01:00:33 -0200 Move where with blank conditions test to the correct where tests file This test does not belong to has many associations test. M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/relation/where_test.rb commit 6ba0f97 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-07 00:49:36 -0200 Ensure there won't be any regression with where(nil) calls Consider this scenario: if params[:foo] conditions = { foo: true } end foos = Foo.where(conditions).order(:id) When params[:foo] is nil, this would call: foos = Foo.where(nil).order(:id) In this scenario, we want Foo.where(conditions) to be the same as calling Foo.all, otherwise we'd get a "NoMethodError order for WhereChain". Related to #8332. M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 23b9cc8 refs/heads/master Merge: cf05e5f de75af7 Author: Carlos Antonio da Silva Date: 2012-12-07 00:46:06 -0200 Merge pull request #8332 from amatsuda/ar_where_chain Relation.where with no args can be chained with not, like, and not_like Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/query_methods.rb commit cf05e5f refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-07 00:06:08 -0200 Stop shelling out more than necessary M railties/test/application/rake/dbs_test.rb commit a3c3cfd refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-06 23:09:11 -0200 Unscope update_column(s) query to ignore default scope When applying default_scope to a class with a where clause, using update_column(s) could generate a query that would not properly update the record due to the where clause from the default_scope being applied to the update query. class User < ActiveRecord::Base default_scope where(active: true) end user = User.first user.active = false user.save! user.update_column(:active, true) # => false In this situation we want to skip the default_scope clause and just update the record based on the primary key. With this change: user.update_column(:active, true) # => true Backport of #8436 fix. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/persistence.rb activerecord/test/cases/persistence_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 0e67f79 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-06 23:09:11 -0200 Unscope update_column(s) query to ignore default scope When applying default_scope to a class with a where clause, using update_column(s) could generate a query that would not properly update the record due to the where clause from the default_scope being applied to the update query. class User < ActiveRecord::Base default_scope where(active: true) end user = User.first user.active = false user.save! user.update_column(:active, true) # => false In this situation we want to skip the default_scope clause and just update the record based on the primary key. With this change: user.update_column(:active, true) # => true Fixes #8436. M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 1eaf3db refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-06 22:23:01 -0200 Improve AR changelog M activerecord/CHANGELOG.md commit 04aece2 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-06 22:17:11 -0200 Remove method redefined warnings M activerecord/test/cases/migration/logger_test.rb commit 0029244 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-06 22:12:39 -0200 Use CURRENT_TIMESTAMP since it has apparently better cross db support LOCALTIMESTAMP is not support by sqlite3, and travis was giving us these errors: https://travis-ci.org/rails/rails/jobs/3535241/#L570 M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/schema_dumper_test.rb commit 4bdbf0a refs/heads/master Author: Drew Dara-Abrams Date: 2012-12-06 16:04:53 -0800 changing tense, since Rails 3.2 has been released M guides/source/active_record_querying.md commit 43c2842 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-06 21:41:00 -0200 Run rake tasks all at once in rake dbs test for a speed up Before: Finished tests in 56.245787s, 0.2133 tests/s, 0.0000 assertions/s. 12 tests, 0 assertions, 0 failures, 0 errors, 0 skips After: Finished tests in 42.401416s, 0.2830 tests/s, 0.0000 assertions/s. 12 tests, 0 assertions, 0 failures, 0 errors, 0 skips M railties/test/application/rake/dbs_test.rb commit 4a2b739 refs/heads/master Merge: ce8ac39 b27f27d Author: Rafael Mendonça França Date: 2012-12-06 10:45:56 -0800 Merge pull request #8440 from steveklabnik/master CHANGELOG for 78d5d6f [ci skip] commit b27f27d refs/heads/master Author: Steve Klabnik Date: 2012-12-06 10:43:33 -0800 CHANGELOG for 78d5d6f. It was pointed out by @giner that the CHANGELOG entry for https://github.com/rails/rails/commit/78d5d6f8688bb7c45ba9a3ef893682231130da3f wasn't included. Here it is. M activerecord/CHANGELOG.md commit ce8ac39 refs/heads/master Merge: b0e7b6f d2cc10c Author: Carlos Antonio da Silva Date: 2012-12-06 09:46:06 -0800 Merge pull request #8439 from joshsusser/fixes Fixes issues in test_mysql2 commit b0e7b6f refs/heads/master Author: Rafael Mendonça França Date: 2012-12-06 15:39:13 -0200 Change the encrypted campfire notification token M .travis.yml commit d2cc10c refs/heads/master Author: Josh Susser Date: 2012-12-06 09:08:43 -0800 Oracle needs table to check index existence M activerecord/lib/active_record/schema_migration.rb commit c59734f refs/heads/master Author: Andrew White Date: 2012-12-06 17:06:59 +0000 Invert precedence of content in ActionDispatch::Static This commit inverts the precedence in ActionDispatch::Static so that dynamic content will be served before static content. This is so that precompiled assets do not inadvertently get included when running in development mode - it should have no effect in production where static files are usually handled by the web server. Closes #6421 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/dispatch/static_test.rb M railties/test/application/routing_test.rb commit dba022f refs/heads/master Author: Josh Susser Date: 2012-12-06 08:34:00 -0800 convert time to string why is this a Time to start with? M activerecord/test/cases/migration_test.rb M activerecord/test/cases/schema_migration_test.rb commit 5a8f25f refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-06 10:05:45 -0200 Refactor tests that switch RAILS_ENV and RACK_ENV This cleanup aims to fix a build failure: https://travis-ci.org/rails/rails/jobs/3515951/#L482 Since travis always have both ENV vars set to "test", a test is failing where it's expected to output the default env "development", but "test" is the result due to RACK_ENV being set when we expect it to not be. By cleaning this duplication we ensure that changing any of these env variables will pick the right expected value. M railties/test/abstract_unit.rb M railties/test/application/runner_test.rb M railties/test/commands/console_test.rb M railties/test/commands/server_test.rb A railties/test/env_helpers.rb M railties/test/generators/actions_test.rb commit 8942035 refs/heads/master Author: Andrew White Date: 2012-12-06 12:42:47 +0000 Add comment about implementation of class_attribute To prevent future pull requests like #8435 add a comment about the implementation of class_attribute using class_eval for performance. [ci skip] M activesupport/lib/active_support/core_ext/class/attribute.rb commit 7b03d40 refs/heads/master Author: Xavier Noria Date: 2012-12-06 13:19:37 +0100 adds a couple of items to the check list for stable releases [ci skip] M RELEASING_RAILS.rdoc commit ba2d867 refs/heads/master Author: Thiago Pinto Date: 2012-12-06 02:52:40 -0500 API reader should look elsewhere for helper instructions M actionpack/lib/action_view/helpers/form_helper.rb commit d2fb5f2 refs/heads/master Author: Thiago Pinto Date: 2012-12-06 02:33:43 -0500 complementary options guidelines for f.file_field and file_field_tag M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/form_tag_helper.rb commit 15f2663 refs/heads/master Author: Thiago Pinto Date: 2012-12-06 02:21:15 -0500 adding example for f.file_input M actionpack/lib/action_view/helpers/form_helper.rb commit 4aced1f refs/heads/master Author: Thiago Pinto Date: 2012-12-06 02:13:33 -0500 adding example for f.file_input M actionpack/lib/action_view/helpers/form_helper.rb commit 7cf2912 refs/heads/master Author: Thiago Pinto Date: 2012-12-06 02:05:10 -0500 correct bad jquery syntax M actionpack/lib/action_view/helpers/form_helper.rb commit 83cb6fb refs/heads/master Author: Pablo Torres Date: 2012-12-05 21:39:58 -0500 Introduce Bundler and Gemfiles in a NOTE M guides/source/getting_started.md commit 036d3e1 refs/heads/master Merge: 0c692f4 cb79070 Author: Aaron Patterson Date: 2012-12-05 15:05:40 -0800 Merge pull request #8431 from joshsusser/schemadump dump schema.rb without :version option commit cb79070 refs/heads/master Author: Josh Susser Date: 2012-12-05 14:33:49 -0800 dump schema.rb without :version option M activerecord/lib/active_record/schema_dumper.rb commit 0c692f4 refs/heads/master Merge: 2e299fc 94ef7b5 Author: Aaron Patterson Date: 2012-12-05 12:13:49 -0800 Merge branch 'joshsusser-master' into merge * joshsusser-master: style cleanup Add migration history to schema.rb dump Add metadata to schema_migrations Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/schema.rb commit 2e299fc refs/heads/master Merge: b6f0978 b8b9b76 Author: Carlos Antonio da Silva Date: 2012-12-05 10:26:33 -0800 Merge pull request #8429 from reednj77/turbolinks-js-include-order Revert turbolinks load order requirement commit b8b9b76 refs/heads/master Author: Nick Reed Date: 2012-12-05 11:51:16 -0600 Revert turbolinks load order requirement M railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt commit b6f0978 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-05 15:27:17 -0200 Fix duplicated method name [ci skip] M railties/test/application/runner_test.rb commit ddd4fac refs/heads/master Merge: 396c068 a769557 Author: Rafael Mendonça França Date: 2012-12-05 09:19:32 -0800 Merge pull request #8427 from kennyj/support_rack_env Add ENV['RACK_ENV'] support to rake runner/console/server. commit a769557 refs/heads/master Author: kennyj Date: 2012-12-06 02:05:33 +0900 Add ENV['RACK_ENV'] support to rake runner/console/server. M railties/CHANGELOG.md M railties/lib/rails/commands/console.rb M railties/lib/rails/commands/runner.rb M railties/lib/rails/commands/server.rb M railties/test/application/runner_test.rb M railties/test/commands/console_test.rb M railties/test/commands/server_test.rb commit 396c068 refs/heads/master Merge: 6ed4ad1 180e2e5 Author: Xavier Noria Date: 2012-12-05 08:13:01 -0800 Merge pull request #8424 from kennyj/tiny_fixes_20121206 fix warning: possibly useless use of a constant in void context commit 180e2e5 refs/heads/master Author: kennyj Date: 2012-12-06 00:38:09 +0900 silence warning: possibly useless use of a constant in void context M activesupport/test/dependencies_test.rb commit 6ed4ad1 refs/heads/master Merge: 1b32c06 6b014a4 Author: Rafael Mendonça França Date: 2012-12-05 06:02:43 -0800 Merge pull request #8371 from freegenie/5396-conditional-fragment-caching Allow fragment cache to accept :if and :unless options. Closes #5396 commit 6b014a4 refs/heads/master Author: Fabrizio Regini Date: 2012-11-29 16:16:18 +0100 Allow fragment cache to accept :if and :unless options [Stephen Ausman + Fabrizio Regini] M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/cache_helper.rb M actionpack/test/controller/log_subscriber_test.rb commit 1b32c06 refs/heads/master Merge: e905639 542d525 Author: Rafael Mendonça França Date: 2012-12-05 05:05:40 -0800 Merge pull request #8412 from JoeyButler/action_dispatch_routing_mapper_refactoring Extract method refactoring. commit 542d525 refs/heads/master Author: Joey Butler Date: 2012-12-03 23:30:10 -0500 Extract method refactoring in ActionDispatch::Routing::SingletonResource. M actionpack/lib/action_dispatch/routing/mapper.rb commit e905639 refs/heads/master Merge: 4af9be0 86e3aaa Author: Andrew White Date: 2012-12-05 02:21:44 -0800 Merge pull request #8404 from freegenie/filter_redirects commit 4af9be0 refs/heads/master Merge: 129eac0 019df98 Author: Carlos Antonio da Silva Date: 2012-12-05 02:17:52 -0800 Merge pull request #8421 from claudiob/remove_unicode_blanks Replace comments' non-breaking spaces with spaces [ci skip] commit 86e3aaa refs/heads/master Author: Fabrizio Regini Date: 2012-10-01 00:00:44 +0200 Adding filter capability to ActionController logs M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/instrumentation.rb M actionpack/lib/action_dispatch.rb A actionpack/lib/action_dispatch/http/filter_redirect.rb M actionpack/lib/action_dispatch/http/response.rb M actionpack/test/controller/log_subscriber_test.rb M guides/source/action_controller_overview.md M railties/lib/rails/application.rb M railties/lib/rails/application/configuration.rb commit 019df98 refs/heads/master Author: claudiob Date: 2012-12-04 22:11:54 -0800 Replace comments' non-breaking spaces with spaces Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code. M actionpack/lib/action_controller/metal/conditional_get.rb M actionpack/lib/action_controller/metal/strong_parameters.rb M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/serialization.rb M activemodel/lib/active_model/validator.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/scoping/named.rb M activesupport/lib/active_support/cache.rb M activesupport/lib/active_support/callbacks.rb M activesupport/lib/active_support/configurable.rb M activesupport/lib/active_support/core_ext/array/conversions.rb M activesupport/lib/active_support/core_ext/class/subclasses.rb M activesupport/lib/active_support/core_ext/hash/indifferent_access.rb M activesupport/lib/active_support/core_ext/hash/keys.rb M activesupport/lib/active_support/core_ext/object/deep_dup.rb M activesupport/lib/active_support/dependencies.rb M activesupport/lib/active_support/file_update_checker.rb M activesupport/lib/active_support/inflector/inflections.rb M activesupport/lib/active_support/message_encryptor.rb M activesupport/lib/active_support/message_verifier.rb M activesupport/lib/active_support/multibyte.rb M activesupport/lib/active_support/tagged_logging.rb M activesupport/lib/active_support/test_case.rb M activesupport/lib/active_support/values/time_zone.rb M railties/lib/rails/commands.rb M railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb commit cb389fc refs/heads/master Author: Pablo Torres Date: 2012-12-04 21:38:06 -0500 Define a generator before referring to it M guides/source/getting_started.md commit ad22352 refs/heads/master Author: Pablo Torres Date: 2012-12-04 21:09:06 -0500 Correct bad English M guides/source/getting_started.md commit d70539c refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-04 09:25:16 -0800 Merge pull request #8417 from kennyj/fix_8414 Fix #8414. Performance problem with postgresql adapter primary_key function. Conflicts: activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 129eac0 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-04 19:50:27 -0200 Fix Active Record validation error messages markup in guides The other way it was not marking the text as italic, it was showing the underlines as normal text. Also fixes some code examples indentation and # => marks in Active Model and Active Record guides. [ci skip] M guides/source/active_model_basics.md M guides/source/active_record_basics.md M guides/source/active_record_callbacks.md M guides/source/active_record_validations.md commit 7f39560 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-04 19:22:38 -0200 Improve the Active Model guide [ci skip] M guides/source/active_model_basics.md commit c32978d refs/heads/master Merge: 40e1612 52e1a42 Author: 簡煒航 Date: 2012-12-04 11:22:12 -0800 Merge pull request #120 from tonytonyjan/patch add a notice about loading assets in production mode commit 6300d83 refs/heads/master Merge: 2715c4a 6389571 Author: Carlos Antonio da Silva Date: 2012-12-04 10:45:50 -0800 Merge pull request #8418 from ershad/master Fixing a spelling mistake [ci skip] commit 52e1a42 refs/heads/master Author: Tony Jian Date: 2012-12-05 02:39:49 +0800 add a notice about loading assets in production mode M guides/source/asset_pipeline.md commit 6389571 refs/heads/master Author: Ershad K Date: 2012-12-04 23:44:26 +0530 Fixing a couple of spelling mistakes M guides/source/active_model_basics.md commit 2715c4a refs/heads/master Merge: 40e1612 634d28e Author: Rafael Mendonça França Date: 2012-12-04 09:25:16 -0800 Merge pull request #8417 from kennyj/fix_8414 Fix #8414. Performance problem with postgresql adapter primary_key function. commit 634d28e refs/heads/master Author: kennyj Date: 2012-12-05 01:12:46 +0900 Fix #8414. Performance problem with postgresql adapter primary_key function. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 40e1612 refs/heads/master Merge: 9d3ce6c 2b847a0 Author: Vijay Dev Date: 2012-12-04 22:26:16 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: guides/source/migrations.md commit 9d3ce6c refs/heads/master Author: Vijay Dev Date: 2012-12-04 22:17:29 +0530 Updated 4.0 release notes The release notes is changed to include only the major changes and point to the changelogs for the complete list. This lets us talk more about the features included in the upcoming release and make the guide more useful and interesting than just a list of all changelogs. This is still a WIP guide pending a lot of work. [ci skip] A guides/assets/images/rails4_features.png M guides/source/4_0_release_notes.md commit 2b847a0 refs/heads/master Author: Vijay Dev Date: 2012-12-04 22:06:34 +0530 copy edits [ci skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/lib/action_view/helpers/capture_helper.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/number_helper.rb commit 042f5eb refs/heads/master Merge: 2259893 d3f4625 Author: Rafael Mendonça França Date: 2012-12-04 08:34:50 -0800 Merge pull request #8416 from kennyj/redundant_pg_namespace pg_namespace table isn't used. commit b5de0ac refs/heads/master Author: Vijay Dev Date: 2012-12-04 21:56:21 +0530 Revert "Add documentation to TransactionIsolationError [ci skip]" This reverts commit 5ff59704f68d284381606a1b76e4ffcfd73b2cfa. Reason: Seems dubious and adds less value. [ci skip] M activerecord/lib/active_record/errors.rb commit d3f4625 refs/heads/master Author: kennyj Date: 2012-12-05 01:22:24 +0900 pg_namespace table isn't used. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 2259893 refs/heads/master Author: David Heinemeier Hansson Date: 2012-12-04 16:39:12 +0100 Track the default application.css/js files for turbolinks as per version 0.6.0 M railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt commit 4243de6 refs/heads/master Author: Maura Fitzgerald Date: 2012-11-02 23:19:05 +0000 Fixed issue where routes with globs caused constraints on that glob to be ignored. A regular expression constraint gets overwritten when the routes.rb file is processed. Changed the overwriting to an ||= instead of an = assignment. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit fbf23ed refs/tags/v3.2.15 Author: Andrew White Date: 2012-12-04 14:13:15 +0000 Make distance_of_time_in_words work with DateTime offsets Because DateTime#to_time returns self when it has a non-zero offset and subtracting two DateTime instances returns a Rational then the distance_of_time_in_words methods outputs an incorrect value. This is fixed in master because we can rely on Ruby 1.9.3's implementation of to_time but it can't be fixed on Ruby 1.8.7 as there is no way to map the DateTime to a Time with a non-zero offset. We can workaround the problem by casting to Float before doing the subtraction in the distance_of_time_in_words method. Closes #8390 M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_test.rb commit 18e1227 refs/tags/v3.2.15 Author: Andrew White Date: 2012-12-04 14:04:53 +0000 Make output of distance_of_time_in_words consistent This commit fixes the output of distance_of_time_in_words when using integer or duration arguments. Previously a distance of more than 30 seconds would be output as 'Less than 1 minute' when using integer arguments and '1 minute' when using two Time instances more than 30 seconds apart. Cherry picked from 5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0 M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_test.rb commit 549da0d refs/tags/v3.2.15 Merge: dac811e 1b96176 Author: Rafael Mendonça França Date: 2012-12-04 04:49:07 -0800 Merge pull request #8413 from senny/8403_backport backport #8403, no intermediate AR objects when eager loading. commit 1b96176 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-12-02 21:24:47 +0100 backport #8403, no intermediate AR objects when eager loading. Closes #3313 Conflicts: activerecord/CHANGELOG.md activerecord/test/models/developer.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/models/developer.rb commit a9dc446 refs/heads/master Merge: c7e4ee7 db51704 Author: Rafael Mendonça França Date: 2012-12-04 04:12:35 -0800 Merge pull request #8403 from senny/3313_after_find_is_triggered_too_often Do not instantiate intermediate AR objects when eager loading. commit db51704 refs/heads/master Author: Yves Senn Date: 2012-12-02 21:24:47 +0100 Do not instantiate intermediate AR objects when eager loading. Closes #3313 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/models/developer.rb commit dac811e refs/tags/v3.2.15 Author: Jeremy Kemper Date: 2012-12-03 20:48:23 -0700 Bump mailer to quiet the stdout log messages Conflicts: actionmailer/actionmailer.gemspec M actionmailer/actionmailer.gemspec commit 94ef7b5 refs/heads/master Author: Josh Susser Date: 2012-12-03 21:26:35 -0800 style cleanup M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/migration_test.rb M activerecord/test/cases/schema_dumper_test.rb commit c7e4ee7 refs/heads/master Author: Jeremy Kemper Date: 2012-12-03 20:48:23 -0700 Bump mailer to quiet the stdout log messages M actionmailer/actionmailer.gemspec commit 5004363 refs/heads/master Merge: e1ce84b 13ba4fe Author: Rafael Mendonça França Date: 2012-12-03 18:38:07 -0800 Merge pull request #8411 from YasuOza/turbolinks_require_bottom Locate `=require turbolinks` at the bottom of application.js commit 13ba4fe refs/heads/master Author: Yasuharu Ozaki Date: 2012-12-04 11:18:44 +0900 Locate `=require turbolinks` at the bottom of application.js Turbolinks should be located at the bottom of application.js to detect assets change properly. M railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt commit a878126 refs/tags/v3.2.15 Author: José Valim Date: 2012-02-08 06:41:54 -0800 Merge pull request #4942 from bogdan/pluck_joins AR::Relation#pluck: improve to work with joins Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit e1ce84b refs/heads/master Merge: baa4d79 86dd2f3 Author: Carlos Antonio da Silva Date: 2012-12-03 16:19:37 -0800 Merge pull request #8393 from frodsan/fix_dependend_order_test_example Ensure original encoding does not change in mb_chars test. commit 1a5caf1 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-03 21:45:03 -0200 Use send in Time marshal extensions since the methods are now private See https://github.com/ruby/ruby/commit/9c1b3161f20162dc1682d758c0e4d2fc3a74745e All Active Support tests pass in 2.0.0preview2 after this change. Closes #8409 M activesupport/lib/active_support/core_ext/time/marshal.rb commit baa4d79 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-03 21:45:03 -0200 Use send in Time marshal extensions since the methods are now private See https://github.com/ruby/ruby/commit/9c1b3161f20162dc1682d758c0e4d2fc3a74745e All Active Support tests pass in 2.0.0preview2 after this change. Closes #8409 M activesupport/lib/active_support/core_ext/time/marshal.rb commit 33ab32d refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-03 21:39:57 -0200 Skip ruby-prof in Gemfile for Ruby 2.0 M Gemfile commit 511f301 refs/heads/master Author: Jean Boussier Date: 2012-12-03 18:20:27 -0500 Fix a typo in ActionController::Caching M actionpack/lib/action_controller/caching.rb commit 5f28000 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-12-03 21:00:14 -0200 Use 1.8 hash style M actionpack/test/controller/new_base/render_template_test.rb commit 9d6e502 refs/tags/v3.2.15 Author: Jeremy Kemper Date: 2012-12-03 10:30:58 -0700 Override <%== to always behave as literal text rather than toggling based on whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged. Conflicts: actionpack/test/template/template_test.rb M actionpack/lib/action_view/template/handlers/erb.rb M actionpack/test/controller/new_base/render_template_test.rb M actionpack/test/template/template_test.rb commit 2797757 refs/heads/master Author: Jeremy Kemper Date: 2012-12-03 10:30:58 -0700 Override <%== to always behave as literal text rather than toggling based on whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged. M actionpack/lib/action_view/template/handlers/erb.rb M actionpack/test/controller/new_base/render_template_test.rb M actionpack/test/template/template_test.rb commit d7fdcc8 refs/heads/master Merge: 4fac8c6 0f47c49 Author: Rafael Mendonça França Date: 2012-12-03 09:28:24 -0800 Merge pull request #8407 from kennyj/fix_profiler_comments Fix wrong doc and message about rails profiler. commit 0f47c49 refs/heads/master Author: kennyj Date: 2012-12-04 02:21:31 +0900 Fix wrong doc and message about rails profiler. M guides/source/performance_testing.md M railties/lib/rails/commands/profiler.rb commit 19599c2 refs/tags/v3.2.15 Merge: eaa0d0b 127411f Author: Carlos Antonio da Silva Date: 2012-12-03 05:16:38 -0800 Merge pull request #8405 from hsbt/fix-respond-initialize-dup Handle respond_to? with private methods commit 127411f refs/tags/v3.2.15 Author: SHIBATA Hiroshi Date: 2012-12-03 22:07:14 +0900 handled respond_to? with private methods M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/validations.rb M activerecord/lib/active_record/base.rb commit 47d95c8 refs/heads/master Author: 1334 <1334@shadowproject.net> Date: 2012-12-03 14:01:27 +0100 fix some formatting M guides/source/migrations.md commit 4fac8c6 refs/heads/master Author: Rafael Mendonça França Date: 2012-12-03 10:12:47 -0200 Try to get back the campfire notifications M .travis.yml commit 137f3be refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-03 09:24:13 -0200 Fix failing tests related to rake notes Related to changes introduced in 553b563749517114323b4e8742509227e0daab67 M railties/test/application/rake/notes_test.rb commit c9c1e6b refs/heads/master Merge: ea53526 4a93836 Author: Xavier Noria Date: 2012-12-03 02:43:49 -0800 Merge pull request #8375 from steveklabnik/migrations_guide Updates to the Migration Guide commit f02d218 refs/heads/master Author: Josh Susser Date: 2012-12-02 21:16:32 -0800 Add migration history to schema.rb dump M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/schema.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/ar_schema_test.rb M activerecord/test/cases/schema_dumper_test.rb A activerecord/test/migrations/always_safe/1001_always_safe.rb A activerecord/test/migrations/always_safe/1002_still_safe.rb commit b066210 refs/heads/master Author: Hendy Tanata Date: 2012-12-03 12:37:45 +0800 Fix typo. M activerecord/lib/active_record/query_cache.rb commit 0a17800 refs/heads/master Author: Matthew Robertson Date: 2012-12-02 19:35:35 -0800 grammar improvements for increment_counter and decrement_counter docs M activerecord/lib/active_record/counter_cache.rb commit 43405a7 refs/heads/master Author: Matthew Robertson Date: 2012-12-02 19:00:12 -0800 increment_counter and decrement_counter can accept and array of ids as an arg M activerecord/lib/active_record/counter_cache.rb commit 57c60d3 refs/heads/master Author: Yoni Yalovitsky Date: 2012-12-03 03:11:16 +0200 added full file path in all file references It's really comfy being able to copy-paste the file paths. I suppose there's also some benefit in trying to figure out the file name as a small exercise, but I don't think that sort of thing belongs in "Getting Started". M guides/source/getting_started.md commit ef4e835 refs/heads/master Author: Yoni Yalovitsky Date: 2012-12-03 02:57:40 +0200 removed an extra slash before the 'app' dir M guides/source/getting_started.md commit 286e56f refs/heads/master Author: Pablo Torres Date: 2012-12-02 16:43:47 -0500 Standardize use of "route globbing" and "wildcard segments" [ci skip] M guides/source/routing.md commit 1d36963 refs/heads/master Author: Pablo Torres Date: 2012-12-02 16:31:12 -0500 Add counterexample for regex [ci skip] M guides/source/routing.md commit 25e7515 refs/heads/master Author: Pablo Torres Date: 2012-12-02 16:27:13 -0500 Convert parragraph about security to a NOTE [ci skip] M guides/source/routing.md commit 51b2629 refs/heads/master Author: Pablo Torres Date: 2012-12-02 16:21:29 -0500 Add clarity to static segments docs in non-resourceful routes [ci skip] M guides/source/routing.md commit c5539cd refs/heads/master Author: Pablo Torres Date: 2012-12-02 16:20:48 -0500 Correct grammar [ci skip] M guides/source/routing.md commit 7d6cb75 refs/heads/master Author: Pablo Torres Date: 2012-12-02 16:10:35 -0500 Convert a section to a tip to highlight it [ci skip] M guides/source/routing.md commit 082f4f9 refs/heads/master Author: Pablo Torres Date: 2012-12-02 15:52:12 -0500 Normalize use of colon before code examples in routing guide [ci skip] M guides/source/routing.md commit 34f8cd2 refs/heads/master Author: Pablo Torres Date: 2012-12-02 15:43:23 -0500 Show equivalent routes definition without using concerns [ci skip] M guides/source/routing.md commit 12c7f80 refs/heads/master Author: Pablo Torres Date: 2012-12-02 15:16:07 -0500 Clarify section titles [ci skip] M guides/source/routing.md commit 624069d refs/heads/master Author: Pablo Torres Date: 2012-12-02 15:14:08 -0500 Move note to a meaningful section in the guides [ci skip] M guides/source/routing.md commit d21a468 refs/heads/master Author: Pablo Torres Date: 2012-12-02 15:11:26 -0500 Use correct conjunction and connector words [ci skip] M guides/source/routing.md commit c41576e refs/heads/master Author: Chris Walquist Date: 2012-12-02 14:37:18 -0600 match text with translation file example M guides/source/i18n.md commit e309e74 refs/heads/master Author: Pablo Torres Date: 2012-12-02 14:19:29 -0500 Capitalize all table column titles in routing guide M guides/source/routing.md commit 1ba6cdd refs/heads/master Author: Pablo Torres Date: 2012-12-02 12:49:29 -0500 List instructions in the order to be executed M guides/source/ruby_on_rails_guides_guidelines.md commit 2610797 refs/heads/master Author: Pablo Torres Date: 2012-12-02 12:46:22 -0500 Add shallow nesting to the routing guide M guides/source/routing.md commit eaa0d0b refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-12-02 09:09:02 -0800 Merge pull request #8402 from senny/8376_descriptive_error_message_for_partial_layout_true More descriptive error when rendering a partial with `:layout => true` Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/renderer/partial_renderer.rb M actionpack/CHANGELOG.md M actionpack/lib/action_view/renderer/partial_renderer.rb M actionpack/test/template/render_test.rb commit ea53526 refs/heads/master Merge: 7730655 60b525c Author: Rafael Mendonça França Date: 2012-12-02 09:09:02 -0800 Merge pull request #8402 from senny/8376_descriptive_error_message_for_partial_layout_true More descriptive error when rendering a partial with `:layout => true` commit 60b525c refs/heads/master Author: Yves Senn Date: 2012-12-02 16:26:11 +0100 More descriptive error when rendering a partial with `:layout => true` M actionpack/CHANGELOG.md M actionpack/lib/action_view/renderer/partial_renderer.rb M actionpack/test/template/render_test.rb commit 7730655 refs/heads/master Merge: df1484c 553b563 Author: Rafael Mendonça França Date: 2012-12-01 21:48:46 -0800 Merge pull request #8394 from acangiano/add_db_folder_to_annotations Add db to the list of default annotation folders commit df1484c refs/heads/master Merge: a777692 cc62ec1 Author: Rafael Mendonça França Date: 2012-12-01 21:41:41 -0800 Merge pull request #8398 from rmascarenhas/active-model-errors-spec-fixes ActiveModel::Errors spec fixes commit 0a5afa2 refs/heads/master Author: Josh Susser Date: 2012-12-01 18:32:23 -0800 Add metadata to schema_migrations migrated_at: timestamp when migration run fingerprint: md5 hash of migration source name: filename without version or extension M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/schema_migration.rb M activerecord/test/cases/migration/logger_test.rb D activerecord/test/cases/migration/table_and_index_test.rb M activerecord/test/cases/migration_test.rb M activerecord/test/cases/migrator_test.rb M activerecord/test/cases/schema_dumper_test.rb A activerecord/test/cases/schema_migration_test.rb commit a39ab3a refs/heads/master Author: Pablo Torres Date: 2012-12-01 22:05:22 -0500 Remove nodoc from FlashHash #[]= [ci skip] M actionpack/lib/action_dispatch/middleware/flash.rb commit cc62ec1 refs/heads/master Author: Renato Mascarenhas Date: 2012-12-01 22:27:55 -0200 Actually test that ActiveModel::Errors#add defaults to :invalid. M activemodel/test/cases/errors_test.rb commit 703b638 refs/heads/master Author: Renato Mascarenhas Date: 2012-12-01 22:25:43 -0200 Call `full_messages` instead of `to_a` in its spec. M activemodel/test/cases/errors_test.rb commit a777692 refs/heads/master Merge: c89b6c4 368e4f0 Author: Rafael Mendonça França Date: 2012-12-01 15:56:09 -0800 Merge pull request #8397 from mmb/gitignore_global_home Quote ~ in git config global excludes command. commit 368e4f0 refs/heads/master Author: Matthew M. Boedicker Date: 2012-12-01 15:14:01 -0800 Quote ~ in git config global excludes command. This will put ~/ in .gitconfig so it will not be hardcoded to the home directory where the command was run. M railties/lib/rails/generators/rails/app/templates/gitignore commit e8fe1d1 refs/remotes/origin/schema-migrations-metadata Author: Daniel Choi Date: 2012-11-28 11:25:32 -0500 Add periodical-style TOC and navigation to Kindle version of guides M guides/Rakefile M guides/rails_guides/generator.rb A guides/rails_guides/kindle.rb M guides/source/kindle/rails_guides.opf.erb commit c89b6c4 refs/heads/master Author: Andrew White Date: 2012-12-01 20:43:07 +0000 Only take the date parts from Time.zone.now When there are missing components in the Hash returned by Date._parse only the date components should default to the value of Time.zone.now, the time components should all default to zero. M activesupport/lib/active_support/values/time_zone.rb M activesupport/test/time_zone_test.rb commit b9d1d2c refs/heads/master Author: Bjørn Arild Mæland Date: 2012-12-01 21:41:54 +0100 Use attr_accessor for Rails.{application,cache,logger} M railties/lib/rails.rb commit 86dd2f3 refs/heads/master Author: Francesco Rodriguez Date: 2012-12-01 15:41:06 -0500 ensure original encoding doesnt change M activesupport/test/multibyte_chars_test.rb commit b1e2d7b refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 15:35:04 -0500 Cleans and removes 'Examples' tag [ci skip] M actionpack/lib/action_dispatch/testing/assertions/selector.rb M actionpack/lib/action_view/helpers/form_helper.rb M activerecord/lib/active_record/autosave_association.rb M activerecord/lib/active_record/integration.rb M activerecord/lib/active_record/query_cache.rb M activerecord/lib/active_record/querying.rb commit 553b563 refs/heads/master Author: Antonio Cangiano Date: 2012-12-01 12:23:39 -0800 Add db to the list of default annotation folders M railties/CHANGELOG.md M railties/lib/rails/source_annotation_extractor.rb M railties/test/application/rake/notes_test.rb commit 4940d6d refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 15:19:34 -0500 Cleans and removes useless 'Examples' tag [ci skip] M actionmailer/lib/action_mailer/base.rb M actionpack/lib/abstract_controller/helpers.rb M actionpack/lib/action_controller/metal/streaming.rb M actionpack/lib/action_dispatch/routing.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M activerecord/lib/active_record/relation/calculations.rb commit 82ebe18 refs/heads/master Author: Carlos Duclos Date: 2012-12-01 14:57:35 -0500 nodoc AS::Testing::ConstantLookup::ClassMethods [ci skip] M activesupport/lib/active_support/testing/constant_lookup.rb commit 96f7ec4 refs/heads/master Author: HPNeo Date: 2012-12-01 14:57:27 -0500 Add documentation for Hash.from_xml [ci skip] M activesupport/lib/active_support/core_ext/hash/conversions.rb commit fb39249 refs/heads/master Author: Florent Guilleux Date: 2012-12-01 14:43:39 -0500 Add documentation to AssetTagHelper#image_alt [ci skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 9bc16d0 refs/heads/master Author: Carlos Duclos Date: 2012-12-01 14:49:45 -0500 update AR::Schema docs [ci skip] M activerecord/lib/active_record/schema.rb commit 20e61a6 refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 14:40:16 -0500 Fixes wrong typo on FormHelper [ci skip] M actionpack/lib/action_view/helpers/form_helper.rb commit 5ab0c5d refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 14:38:07 -0500 Cleans documentation from Helpers [ci skip] M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/javascript_helper.rb M actionpack/lib/action_view/helpers/number_helper.rb M actionpack/lib/action_view/helpers/output_safety_helper.rb commit 583cc11 refs/heads/master Merge: 4eca912 193c31c Author: Vijay Dev Date: 2012-12-01 11:26:39 -0800 Merge pull request #8382 from asanghi/mailerguide Add Mailer Callback section to Mailer guides commit 193c31c refs/heads/master Author: Aditya Sanghi Date: 2012-11-30 14:56:54 +0530 Add Mailer Callback section to Mailer guides M guides/source/action_mailer_basics.md commit 4eca912 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-01 17:07:46 -0200 Remove not used variable warnigns M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/persistence_test.rb commit 42efdbf refs/heads/master Merge: 90e2d96 cf7ab60 Author: Rafael Mendonça França Date: 2012-12-01 11:00:53 -0800 Merge pull request #8391 from rmascarenhas/reset-attribute-doesnt-change-it Reset attributes should not report changes. commit cf7ab60 refs/heads/master Author: Renato Mascarenhas Date: 2012-12-01 15:29:49 -0200 Reset attributes should not report changes. When resetting an attribute, you expect it to return to the state it was before any changes. Namely, this fixes this unexpected behavior: ~~~ruby model.name = "Bob" model.reset_name! model.name_changed? #=> true ~~~ M activemodel/CHANGELOG.md M activemodel/lib/active_model/dirty.rb M activemodel/test/cases/dirty_test.rb commit 4a93836 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 11:13:09 -0800 Migration Guide: General fix-up This introduces a bunch of editing/re-writing to the migrations guide. There were a bunch of small changes, and a few larger ones: * mysql does support transactions. * Add a section about db/seeds.rb * Largely re-wrote the first few sections M guides/source/migrations.md commit 90e2d96 refs/heads/master Merge: 0181c2d 55a2820 Author: Vijay Dev Date: 2012-12-01 10:33:10 -0800 Merge pull request #8379 from steveklabnik/validations_guide Validations guide commit 55a2820 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 15:24:08 -0800 Here's a few updates to the validations guide. A bunch of small changes, plus: * 80 column formats * replacing the explanation of the dynamic_form gem with the example HTML/CSS that Rails scaffolds generate. D guides/assets/images/customized_error_messages.png D guides/assets/images/error_messages.png D guides/assets/images/validation_error_messages.png M guides/source/active_record_validations.md commit 8dc4041 refs/heads/master Author: Florent Guilleux Date: 2012-12-01 13:22:49 -0500 Revert "Remove trailing whitespaces" This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3. M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_dispatch/middleware/flash.rb M activemodel/test/cases/validations/format_validation_test.rb M activemodel/test/models/oauthed_user.rb M activemodel/test/models/user.rb M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/cases/tasks/database_tasks_test.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb M activerecord/test/models/eye.rb M activesupport/lib/active_support/gzip.rb M activesupport/test/callbacks_test.rb M activesupport/test/core_ext/bigdecimal_test.rb M activesupport/test/core_ext/duration_test.rb M activesupport/test/core_ext/module/remove_method_test.rb M activesupport/test/core_ext/numeric_ext_test.rb M activesupport/test/core_ext/object/inclusion_test.rb M activesupport/test/core_ext/object_and_class_ext_test.rb M activesupport/test/deprecation_test.rb M activesupport/test/inflector_test.rb M activesupport/test/message_verifier_test.rb M railties/lib/rails/code_statistics.rb M railties/lib/rails/generators/rails/model/USAGE M railties/lib/rails/source_annotation_extractor.rb M railties/test/commands/console_test.rb M railties/test/generators/generated_attribute_test.rb M railties/test/generators/migration_generator_test.rb commit 90c887f refs/heads/master Author: Florent Guilleux Date: 2012-12-01 13:20:39 -0500 Remove trailing whitespaces M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_dispatch/middleware/flash.rb M activemodel/test/cases/validations/format_validation_test.rb M activemodel/test/models/oauthed_user.rb M activemodel/test/models/user.rb M activerecord/lib/active_record/log_subscriber.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/cases/tasks/database_tasks_test.rb M activerecord/test/cases/validations/uniqueness_validation_test.rb M activerecord/test/models/eye.rb M activesupport/lib/active_support/gzip.rb M activesupport/test/callbacks_test.rb M activesupport/test/core_ext/bigdecimal_test.rb M activesupport/test/core_ext/duration_test.rb M activesupport/test/core_ext/module/remove_method_test.rb M activesupport/test/core_ext/numeric_ext_test.rb M activesupport/test/core_ext/object/inclusion_test.rb M activesupport/test/core_ext/object_and_class_ext_test.rb M activesupport/test/deprecation_test.rb M activesupport/test/inflector_test.rb M activesupport/test/message_verifier_test.rb M railties/lib/rails/code_statistics.rb M railties/lib/rails/generators/rails/model/USAGE M railties/lib/rails/source_annotation_extractor.rb M railties/test/commands/console_test.rb M railties/test/generators/generated_attribute_test.rb M railties/test/generators/migration_generator_test.rb commit 5ff5970 refs/heads/master Author: Florent Guilleux Date: 2012-12-01 13:16:18 -0500 Add documentation to TransactionIsolationError [ci skip] M activerecord/lib/active_record/errors.rb commit cd026d7 refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 13:17:04 -0500 Improves documentation of Capture helper [ci skip] M actionpack/lib/action_view/helpers/benchmark_helper.rb M actionpack/lib/action_view/helpers/capture_helper.rb commit 20b40c8 refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 13:03:33 -0500 Removes :nodoc: tag on AtomFeedHelper [ci skip] M actionpack/lib/action_view/helpers/atom_feed_helper.rb commit 33f6209 refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 13:01:42 -0500 Removes unneeded 'Example' tags and whitespaces [ci skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit ed45782 refs/heads/master Author: Carlos Duclos Date: 2012-12-01 13:10:08 -0500 nodoc AD & AV railties classes M actionpack/lib/action_dispatch/railtie.rb M actionpack/lib/action_view/railtie.rb commit c71c8a9 refs/heads/master Author: HPNeo Date: 2012-12-01 13:03:34 -0500 Remove :nodoc from SanitizeHelper module [ci skip] M actionpack/lib/action_view/helpers/sanitize_helper.rb commit abefe32 refs/heads/master Author: Carlos Duclos Date: 2012-12-01 13:00:12 -0500 nodoc AS::Testing::Pending because is deprecated [ci skip] M activesupport/lib/active_support/testing/pending.rb commit e166f02 refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 12:57:15 -0500 Removes :nodoc: label [ci skip] M actionpack/lib/action_view/helpers/asset_url_helper.rb commit e1c0aa4 refs/heads/master Author: Alvaro Pereyra Date: 2012-12-01 12:49:27 -0500 Improves documentation on favicon_link_tag M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit a1ffc4a refs/heads/master Author: Carlos Duclos Date: 2012-12-01 12:52:45 -0500 remove unneeded Examples tag [ci skip] M activerecord/lib/active_record/relation/spawn_methods.rb commit 2a6cfce refs/heads/master Author: HPNeo Date: 2012-12-01 12:49:42 -0500 Update documentation for javascript_include_tag [ci skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 0181c2d refs/heads/master Merge: fb42520 9685019 Author: Vijay Dev Date: 2012-12-01 23:00:47 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: guides/source/active_record_validations.md commit 9685019 refs/heads/master Author: Vijay Dev Date: 2012-12-01 22:59:10 +0530 copy edits [ci skip] M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/relation/calculations.rb commit daab9bb refs/heads/master Author: Florent Guilleux Date: 2012-12-01 11:23:02 -0500 Fix Calculations#pluck doc to mention several attributes can be selected [ci skip] M activerecord/lib/active_record/relation/calculations.rb commit fb42520 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-12-01 11:39:08 -0200 Fix typo in AS guide [ci skip] M guides/source/active_support_core_extensions.md commit 0dc1417 refs/heads/master Author: Xavier Noria Date: 2012-12-01 14:18:25 +0100 copy-edits the docs of 9ee0ffb M guides/source/active_support_core_extensions.md commit 60edece refs/heads/master Merge: 005d910 9ee0ffb Author: Xavier Noria Date: 2012-12-01 04:38:36 -0800 Merge pull request #8246 from urielka/uriel-fixed-8167 Fix #8167 - adding autoloading support for caching commit 9ee0ffb refs/heads/master Author: Uriel Katz Date: 2012-11-17 02:05:53 +0200 Patched Marshal#load to work with constant autoloading (active_support/dependecies.rb) (issue #8167) M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache/file_store.rb M activesupport/lib/active_support/cache/mem_cache_store.rb A activesupport/lib/active_support/core_ext/marshal.rb M activesupport/test/caching_test.rb A activesupport/test/core_ext/marshal_test.rb A activesupport/test/dependecies_test_helpers.rb M activesupport/test/dependencies_test.rb M guides/source/active_support_core_extensions.md commit 005d910 refs/heads/master Author: Andrew White Date: 2012-12-01 11:15:29 +0000 Make `Time.zone.parse` to work with JavaScript date strings Chrome, Safari and Firefox serialize Date objects to strings such as 'Mon May 28 2012 00:00:00 GMT-0700 (PDT)'. When these strings are parsed the zone is interpreted as 'GMT-0700' which doesn't exist in the TzInfo list of timezones. By taking advantage of the improved date/time handling in 1.9.3 we can use `Date._parse` and the `:offset` value which is parsed correctly. Three tests were amended to make them pass: 1. test_parse_with_old_date This needed changing to a different value because the original value was before EST was adopted so was being changed to a LMT (Local Mean Time) value after the change. It didn't before because `DateTime` just has offsets from UTC not timezones. 2. test_parse_should_not_black_out_system_timezone_dst_jump Changed the implementation of this test as the stubs were dependent on internal implementation details of the test. Confirmed that the modified test still failed when the implementation of `parse` was restored to pre-#5571. 3. test_parse_should_black_out_app_timezone_dst_jump Ditto. Closes #5770. M activesupport/CHANGELOG.md M activesupport/lib/active_support/values/time_zone.rb M activesupport/test/time_zone_test.rb commit 0a1c611 refs/heads/master Merge: 76c432f 20c03e7 Author: Santiago Pastorino Date: 2012-11-30 14:25:52 -0800 Merge pull request #8387 from claudiob/remove_ar_observer_from_docs Remove references to AR::Observer from docs commit 20c03e7 refs/heads/master Author: claudiob Date: 2012-11-30 13:54:03 -0800 Remove references to AR::Observer from docs ActiveRecord::Observer was extracted into a separate gem so it should not be referenced anymore (see https://github.com/rails/rails/commit/ccecab3) M activerecord/README.rdoc M guides/source/active_support_core_extensions.md commit 76c432f refs/heads/master Merge: 64c53d7 8348225 Author: Rafael Mendonça França Date: 2012-11-30 08:27:14 -0800 Merge pull request #8385 from frodsan/strings_love hash filters should be accessed with symbols or strings commit 8348225 refs/heads/master Author: Francesco Rodriguez Date: 2012-11-30 11:24:16 -0500 hash filters should be accessed with symbols or strings M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/nested_parameters_test.rb commit 64c53d7 refs/heads/master Author: Jon Leighton Date: 2012-11-23 12:36:22 +0000 Use separate Relation subclasses for each AR class At present, ActiveRecord::Delegation compiles delegation methods on a global basis. The compiled methods apply to all subsequent Relation instances. This creates several problems: 1) After Post.all.recent has been called, User.all.respond_to?(:recent) will be true, even if User.all.recent will actually raise an error due to no User.recent method existing. (See #8080.) 2) Depending on the AR class, the delegation should do different things. For example, if a Post.zip method exists, then Post.all.zip should call it. But this will then result in User.zip being called by a subsequent User.all.zip, even if User.zip does not exist, when in fact User.all.zip should call User.all.to_a.zip. (There are various variants of this problem.) We are creating these compiled delegations in order to avoid method missing and to avoid repeating logic on each invocation. One way of handling these issues is to add additional checks in various places to ensure we're doing the "right thing". However, this makes the compiled methods signficantly slower. In which case, there's almost no point in avoiding method_missing at all. (See #8127 for a proposed solution which takes this approach.) This is an alternative approach which involves creating a subclass of ActiveRecord::Relation for each AR class represented. So, with this patch, Post.all.class != User.all.class. This means that the delegations are compiled for and only apply to a single AR class. A compiled method for Post.all will not be invoked from User.all. This solves the above issues without incurring significant performance penalties. It's designed to be relatively seamless, however the downside is a bit of complexity and potentially confusion for a user who thinks that Post.all and User.all should be instances of the same class. Benchmark --------- require 'active_record' require 'benchmark/ips' class Post < ActiveRecord::Base establish_connection adapter: 'sqlite3', database: ':memory:' connection.create_table :posts def self.omg :omg end end relation = Post.all Benchmark.ips do |r| r.report('delegation') { relation.omg } r.report('constructing') { Post.all } end Before ------ Calculating ------------------------------------- delegation 4392 i/100ms constructing 4780 i/100ms ------------------------------------------------- delegation 144235.9 (±27.7%) i/s - 663192 in 5.038075s constructing 182015.5 (±21.2%) i/s - 850840 in 5.005364s After ----- Calculating ------------------------------------- delegation 6677 i/100ms constructing 6260 i/100ms ------------------------------------------------- delegation 166828.2 (±34.2%) i/s - 754501 in 5.001430s constructing 116575.5 (±18.6%) i/s - 563400 in 5.036690s Comments -------- Bear in mind that the standard deviations in the above are huge, so we can't compare the numbers too directly. However, we can conclude that Relation construction has become a little slower (as we'd expect), but not by a huge huge amount, and we can still construct a large number of Relations quite quickly. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/relation/delegation.rb M activerecord/test/cases/relation_test.rb M activerecord/test/cases/relations_test.rb commit a50ab21 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-30 11:29:41 -0200 Use 1.8 hash style in xml serialization test M activemodel/test/cases/serializers/xml_serialization_test.rb commit 25a15a7 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-30 11:08:32 -0200 Make the CHANGELOG consistent [ci skip] M activerecord/CHANGELOG.md commit 564e32b refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-05-19 11:46:13 -0700 Merge pull request #6397 from kennyj/fix_translate_exception Fix a problem of translate_exception method in a Japanese (non English) environment. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit c2be9b0 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-30 10:20:49 -0200 Simplify keys order test for as_json in Active Model M activemodel/test/cases/serializers/json_serialization_test.rb commit 68e4442 refs/heads/master Author: Jon Leighton Date: 2012-11-30 11:50:11 +0000 Fix memory leak in development mode Keying these hashes by klass causes reloadable classes to never get freed. Thanks to @thedarkone for pointing this out in the comments on 221571beb6b4bb7437989bdefaf421f993ab6002. This doesn't seem to make a massive difference to performance. Benchmark --------- require 'active_record' require 'benchmark/ips' class Post < ActiveRecord::Base establish_connection adapter: 'sqlite3', database: ':memory:' end GC.disable Benchmark.ips(20) do |r| r.report { Post.connection } end Before ------ Calculating ------------------------------------- 5632 i/100ms ------------------------------------------------- 218671.0 (±1.9%) i/s - 4364800 in 19.969401s After ----- Calculating ------------------------------------- 8743 i/100ms ------------------------------------------------- 206525.9 (±17.8%) i/s - 4039266 in 19.992590s M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit c5bdf6c refs/heads/master Author: Jon Leighton Date: 2012-11-30 10:28:49 +0000 Mark Relation mutators as :nodoc: These are for internal use only and cannot be relied on as part of the public API. See discussion on 8c2c60511beaad05a218e73c4918ab89fb1804f0. M activerecord/lib/active_record/relation/query_methods.rb M activerecord/lib/active_record/relation/spawn_methods.rb commit e70bab2 refs/heads/master Merge: 0a6afef da67d19 Author: Carlos Antonio da Silva Date: 2012-11-30 02:28:13 -0800 Merge pull request #8381 from aderyabin/unnecessary_monkey_patch Remove outdated monkey patch in mysql tests commit da67d19 refs/heads/master Author: Andrey Deryabin Date: 2012-11-30 12:07:55 +0400 Revert "Fix annoy warning, when executing testcase." This reverts commit a3024f81228d7b3b446408114a5dc2a86870cd35. REASON: Since warning doesn't exist M activerecord/test/cases/helper.rb D activerecord/test/support/mysql.rb commit d7deec3 refs/tags/v3.2.15 Merge: db994b7 5b50c7d Author: Xavier Noria Date: 2012-11-30 00:02:34 -0800 Merge pull request #8380 from route/fix-concern-description Fixed description for ActiveSupport::Concern typical case commit 5b50c7d refs/tags/v3.2.15 Author: Dmitry Vorotilin Date: 2012-11-30 10:34:08 +0400 Fixed description for ActiveSupport::Concern typical case M activesupport/lib/active_support/concern.rb commit 0a6afef refs/heads/master Merge: f87202f b659e00 Author: Rafael Mendonça França Date: 2012-11-29 15:06:24 -0800 Merge pull request #8378 from steveklabnik/split_validations_callbacks_guide Split Validations and Callbacks into separate guides. commit b659e00 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 14:45:58 -0800 Split Validations and Callbacks into separate guides. Two big features that are only barely related in the same guide. Seems bad. I did not check references to these guides yet, so some links may need to be updated. M guides/CHANGELOG.md A guides/source/active_record_callbacks.md A guides/source/active_record_validations.md D guides/source/active_record_validations_callbacks.md M guides/source/documents.yaml commit d16a1b9 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 14:25:02 -0800 Normalize on 'After reading this guide, you will know:' We have three or four different introduction sentences to the guides. After this commit, we use the same one everywhere. M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_model_basics.md M guides/source/active_record_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/development_dependencies_install.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/nested_model_forms.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/ruby_on_rails_guides_guidelines.md M guides/source/security.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md M guides/source/working_with_javascript_in_rails.md commit d168d23 refs/heads/master Author: Francesco Rodriguez Date: 2012-11-29 13:31:00 -0500 nodoc AS::Deprecation::InstanceDelegator class [ci skip] M activesupport/lib/active_support/deprecation/instance_delegator.rb commit abdfffa refs/heads/master Author: Francesco Rodriguez Date: 2012-11-29 12:58:31 -0500 add documentation to CollectionProxy #length and #size methods [ci skip] M activerecord/lib/active_record/associations/collection_proxy.rb commit 61a7a9f refs/heads/master Author: Francesco Rodriguez Date: 2012-11-29 12:51:31 -0500 add documentation to CollectionProxy#empty? M activerecord/lib/active_record/associations/collection_proxy.rb commit f87202f refs/heads/master Merge: f2902eb 8fc0c98 Author: Rafael Mendonça França Date: 2012-11-29 08:53:36 -0800 Merge pull request #8372 from amparo-luna/gemfile_source_url Gemfile source url for plugins updated commit db994b7 refs/tags/v3.2.15 Author: Jeremy Kemper Date: 2012-11-29 09:26:05 -0700 Backport 78b30fed9336336694fb2cb5d2825f95800b541c to fix non-utf-8 databases mistakenly getting utf8 collation M activerecord/lib/active_record/railties/databases.rake commit 8fc0c98 refs/heads/master Author: Amparo Luna Date: 2012-11-29 10:41:59 -0500 Gemfile source url for plugins updated M railties/lib/rails/generators/rails/plugin_new/templates/Gemfile commit de75af7 refs/heads/master Author: Akira Matsuda Date: 2012-11-05 13:56:30 +0900 Relation.where with no args can be chained with not, like, and not_like examples: Model.where.not field: nil #=> "SELECT * FROM models WHERE field IS NOT NULL Model.where.like name: 'Jeremy%' #=> "SELECT * FROM models WHERE name LIKE 'Jeremy%' this feature was originally suggested by Jeremy Kemper https://github.com/rails/rails/pull/5950#issuecomment-5591330 Closes #5950 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/has_many_associations_test.rb A activerecord/test/cases/relation/where_chain_test.rb M guides/source/active_record_querying.md commit f2902eb refs/heads/master Author: Jeremy Kemper Date: 2012-11-29 08:45:31 -0700 Move instantiation responsibilities from Inheritance to Persistence. Have Inheritance#discriminate_class_for_record handle STI lookup duties. M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/persistence.rb commit e8c3605 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-28 12:53:48 -0800 Merge pull request #8352 from steveklabnik/update_7858 Specify type of singular assication during serialization Conflicts: activemodel/CHANGELOG.md activemodel/test/cases/serializers/xml_serialization_test.rb M activemodel/CHANGELOG.md M activemodel/lib/active_model/serializers/xml.rb M activemodel/test/cases/serializers/xml_serialization_test.rb commit 97b95c3 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:34:00 -0800 Asset Pipeline: add 'the' Some guides work without 'the'. For instance, 'Migrations' or 'Form Helpers.' But when we talk about the asset pipeline, we... always say 'the asset pipeline.' The guide title should reflect this. M guides/source/asset_pipeline.md commit 362f28d refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:32:12 -0800 Command Line: remove 'A Guide to' It's obvious that this is a guide. M guides/source/command_line.md commit 9715d0a refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:30:31 -0800 Migrations: add 'Active Record' to title Other guides that talk about Active Record specific features include the name of the library in the title, this one should too for consistency. M guides/source/migrations.md commit e6b8452 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:28:52 -0800 Fix title of 'form helpers' guide. They're Rails Guides, so obviously we're talking about Rails Form Helpers. Also, 'helpers' should be capitalized. M guides/source/form_helpers.md commit 87b5d53 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:27:09 -0800 Associations: s/A Guide// It's obvious that this is a guide, and none of the other guides say 'A Guide to'. M guides/source/association_basics.md commit 5ea8a41 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:21:30 -0800 Remove 'This guide is based on ' warnings. It's obvious that the guide is based on this version of Rails, and may not be backwards compatible. M guides/source/action_mailer_basics.md M guides/source/active_model_basics.md M guides/source/command_line.md M guides/source/getting_started.md commit 6dcae8a refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:14:08 -0800 Add periods to the bullet points in guides. Talked with @fxn about this. Bullet points should have periods at the ends. M guides/source/action_controller_overview.md M guides/source/action_view_overview.md M guides/source/active_record_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_instrumentation.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/nested_model_forms.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/security.md M guides/source/testing.md M guides/source/working_with_javascript_in_rails.md commit 5cdb23c refs/heads/master Author: Steve Klabnik Date: 2012-11-29 05:07:53 -0800 Migrations: Fix opening bullets. The wording of these was a bit off, so I fixed them. M guides/source/migrations.md commit c0f415d refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:44:31 -0800 ActionView -> Action View The proper name has a space. M guides/source/active_support_instrumentation.md commit 4380639 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:42:25 -0800 ActionController -> Action Controller The proper name has a space. M guides/source/active_support_instrumentation.md commit 4e538bc refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:40:34 -0800 ActiveSupport -> Active Support The proper name has a space. M guides/source/active_support_instrumentation.md commit 0dfe2c2 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:37:40 -0800 ActionMailer -> Action Mailer. The proper name for the library has a space. M guides/source/active_support_instrumentation.md commit 4d1053f refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:36:22 -0800 ActionPack -> Action Pack. The proper name has a space. M guides/source/upgrading_ruby_on_rails.md commit 2713838 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:35:13 -0800 ActiveRecord -> Active Record The proper name, as per the documentation guides, is 'Active Record.' I've updated several references to it as 'ActiveRecord'. M guides/source/active_model_basics.md M guides/source/active_record_querying.md M guides/source/active_support_instrumentation.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md commit 0c294e0 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:27:29 -0800 Migrations: move massive paragraph out of intro. Most of the guides have a few simple sentences describing what they will show you at the top. This one had a few big paragraphs. I've moved those paragraphs down to an introductory one, and written a new smaller one for the introduction. This makes this guide more consistent with the others. M guides/source/migrations.md commit 28e8abf refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:10:03 -0800 Getting Started: Improve instructions on opening a terminal M guides/source/getting_started.md commit e8b2625 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 04:02:51 -0800 Getting Started: remove reference to attr_accessible M guides/source/getting_started.md commit 8bc945d refs/heads/master Author: Steve Klabnik Date: 2012-11-29 03:57:53 -0800 Getting Started: mac -> Mac OS X It's properly called "Mac OS X" M guides/source/getting_started.md commit 7ad590d refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-29 09:24:05 -0200 User assert_kind_of, invert assert_equal expectations M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb M activerecord/test/cases/inheritance_test.rb commit 213f034 refs/heads/master Author: Steve Klabnik Date: 2012-11-29 03:53:58 -0800 Getting Started: Rails 3.2 -> Rails 4. This is based on Rails 4, not Rails 3.2. M guides/source/getting_started.md commit 544b5ee refs/heads/master Author: Santiago Pastorino Date: 2012-11-29 09:53:25 -0200 Tiny refactor M actionmailer/lib/action_mailer/base.rb commit 5e086cc refs/heads/master Merge: 7c2797c 0204f80 Author: Carlos Antonio da Silva Date: 2012-11-29 03:04:31 -0800 Merge pull request #8363 from Takehiro-Adachi/add-string-options-examples-to-currentpage-method Added examples to current_page? method [ci skip] commit 7c2797c refs/heads/master Merge: 89b5b31 4fe70ee Author: Xavier Noria Date: 2012-11-29 02:31:50 -0800 Merge pull request #8356 from senny/add_links_to_rails4_guide augmented the Rails 4 guides with links back to Github commit 4fe70ee refs/heads/master Author: Yves Senn Date: 2012-11-28 21:24:22 +0100 augment the rails4 guide with links to PRs M guides/source/4_0_release_notes.md commit ce7a493 refs/heads/master Author: Yves Senn Date: 2012-11-28 20:39:30 +0100 add list of extracted plugins to rails4 guide M guides/source/4_0_release_notes.md commit 89b5b31 refs/heads/master Author: Jason Rush Date: 2012-04-05 13:21:48 -0600 Added STI support to init and building associations Allows you to do BaseClass.new(:type => "SubClass") as well as parent.children.build(:type => "SubClass") or parent.build_child to initialize an STI subclass. Ensures that the class name is a valid class and that it is in the ancestors of the super class that the association is expecting. M activerecord/CHANGELOG.md M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/reflection.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb M activerecord/test/cases/forbidden_attributes_protection_test.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/models/author.rb M activerecord/test/models/company.rb commit eba430a refs/heads/master Merge: ec17f0d ce73055 Author: Andrew White Date: 2012-11-28 21:47:01 -0800 Merge pull request #7961 from exviva/seconds_until_end_of_day Add #seconds_until_end_of_day to DateTime and Time commit ce73055 refs/heads/master Author: Olek Janiszewski Date: 2012-10-16 12:05:24 +0200 Add #seconds_until_end_of_day to DateTime and Time M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/test/core_ext/date_time_ext_test.rb M activesupport/test/core_ext/time_ext_test.rb commit ec17f0d refs/heads/master Author: Rafael Mendonça França Date: 2012-11-29 00:26:32 -0200 Add CHANGELOG entries for the observes extraction [ci skip] M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md commit 0204f80 refs/heads/master Author: Takehiro Adachi Date: 2012-11-29 12:06:43 +0900 added examples when options is string M actionpack/lib/action_view/helpers/url_helper.rb commit 8b27062 refs/heads/master Merge: 39e85b3 54aed23 Author: Rafael Mendonça França Date: 2012-11-28 17:13:00 -0800 Merge pull request #8361 from lucasmazza/typo Fix typo in the Observers deprecation message. commit 54aed23 refs/heads/master Author: Lucas Mazza Date: 2012-11-28 23:08:41 -0200 Fix typo in the Observers deprecation message. [ci skip] M activerecord/lib/active_record/railtie.rb commit 39e85b3 refs/heads/master Merge: e38d310 f862376 Author: Rafael Mendonça França Date: 2012-11-28 22:49:34 -0200 Merge branch 'extract_observers' commit f862376 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-28 21:55:07 -0200 Gracefully handle upgrading apps with observers Rather than just raising a NoMethodError when copying the config, this commit adds a warning message until either the rails-observers gem is installed or the relevant config options are removed. M activerecord/lib/active_record/railtie.rb commit ccecab3 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-14 20:00:57 -0300 Remove observers and sweepers They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik] M actionpack/lib/action_controller/caching.rb D actionpack/lib/action_controller/caching/sweeping.rb M actionpack/test/abstract_unit.rb M actionpack/test/controller/filters_test.rb D actionpack/test/controller/sweeper_test.rb M activemodel/lib/active_model.rb D activemodel/lib/active_model/observer_array.rb D activemodel/lib/active_model/observing.rb D activemodel/test/cases/observer_array_test.rb D activemodel/test/cases/observing_test.rb D activemodel/test/models/observers.rb M activerecord/lib/active_record.rb M activerecord/lib/active_record/base.rb D activerecord/lib/active_record/observer.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/relation.rb D activerecord/lib/rails/generators/active_record/observer/observer_generator.rb D activerecord/lib/rails/generators/active_record/observer/templates/observer.rb M activerecord/test/cases/dirty_test.rb D activerecord/test/cases/lifecycle_test.rb M activerecord/test/cases/transaction_callbacks_test.rb M guides/code/getting_started/config/application.rb M guides/source/active_record_validations_callbacks.md M guides/source/caching_with_rails.md M guides/source/configuring.md M railties/lib/rails/engine.rb M railties/lib/rails/generators.rb M railties/lib/rails/generators/actions.rb M railties/lib/rails/generators/named_base.rb D railties/lib/rails/generators/rails/observer/USAGE D railties/lib/rails/generators/rails/observer/observer_generator.rb D railties/lib/rails/generators/test_unit/observer/observer_generator.rb D railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb M railties/test/application/configuration_test.rb M railties/test/application/console_test.rb M railties/test/application/rake_test.rb M railties/test/generators/namespaced_generators_test.rb D railties/test/generators/observer_generator_test.rb commit e38d310 refs/heads/master Merge: e9df078 bd85260 Author: Carlos Antonio da Silva Date: 2012-11-28 14:48:04 -0800 Merge pull request #8261 from steveklabnik/fix_mb_chars Simplify String#mb_chars and fix documentation. commit bd85260 refs/heads/master Author: Steve Klabnik Date: 2012-11-28 13:57:07 -0800 Simplify String#mb_chars and stop proxying #class This behavior mattered under Ruby 1.8, but that doesn't matter now that we don't support it. In addition, we don't want to proxy the #class method. A test was added to prevent against regressions. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/multibyte.rb M activesupport/test/multibyte_chars_test.rb commit 27b79f4 refs/heads/master Author: Steve Klabnik Date: 2012-11-28 13:56:36 -0800 Fix documentation for String#mb_chars. This documentation has been out of date. M activesupport/lib/active_support/core_ext/string/multibyte.rb commit e9df078 refs/heads/master Merge: 4c99d08 22df38c Author: Rafael Mendonça França Date: 2012-11-28 13:41:29 -0800 Merge pull request #8355 from steveklabnik/update_7418 Ensure that associations have a symbol argument. commit 22df38c refs/heads/master Author: Steve Klabnik Date: 2012-11-28 12:43:09 -0800 Ensure that associations have a symbol argument. Fixes #7418. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/builder/association.rb M activerecord/test/cases/associations_test.rb commit 4c99d08 refs/heads/master Merge: 5f15956 9504b44 Author: Rafael Mendonça França Date: 2012-11-28 12:53:48 -0800 Merge pull request #8352 from steveklabnik/update_7858 Specify type of singular assication during serialization commit 66e87b7 refs/tags/v3.2.15 Merge: 9d97ef8 4325bec Author: Aaron Patterson Date: 2012-11-28 12:27:47 -0800 Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fix Fixing a schema:load when using a prefix and suffix on the tables [Reopen/backport] commit 9504b44 refs/heads/master Author: Steve Klabnik Date: 2012-10-05 15:07:39 -0600 Specify type of singular association during serialization When serialising a class, specify the type of any singular associations, if necessary. Rails already correctly specifies the :type of any enumerable association (e.g. a has_many association), but made no attempt to do so for non-enumerables (e.g. a has_one association). We must specify the :type of any STI association. A has_one association to a class which uses single-table inheritance is an example of this type of association. Fixes #7471 M activemodel/CHANGELOG.md M activemodel/lib/active_model/serializers/xml.rb M activemodel/test/cases/serializers/xml_serialization_test.rb commit 5f15956 refs/heads/master Merge: 3e965e2 626086a Author: José Valim Date: 2012-11-28 10:27:03 -0800 Merge pull request #8350 from claudiob/restore_default_require_paths Revert "rails gem has no lib directory to require" commit 626086a refs/heads/master Author: claudiob Date: 2012-11-28 10:20:54 -0800 Revert "rails gem has no lib directory to require" This reverts commit 6bcbd6046f82c5f0114249a6b725f9679a140b9a. The default value for require_paths is ['lib'], and Rails does not need to include any lib/ file to build the gem, so the previous commit 'makes sense'. However, gems will not be built at all if require_paths is empty (see https://gist.github.com/1065473), so it's better to stick with the default, which does not have any side-effects M rails.gemspec commit 3e965e2 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-28 11:47:48 -0200 Fix some indentation in the postgresql_specific_schema M activerecord/test/schema/postgresql_specific_schema.rb commit f036862 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-28 11:11:11 -0200 Add comment to a table without model. This table is being used to verify if the :limit options is being ignored for text and binary columns M activerecord/test/schema/postgresql_specific_schema.rb commit f3aaf6d refs/heads/master Author: Rafael Mendonça França Date: 2012-11-28 11:06:19 -0200 Use assert_nil instead of assert_equal M activerecord/CHANGELOG.md M activerecord/test/cases/dirty_test.rb commit 9d97ef8 refs/tags/v3.2.15 Merge: 06cc38a 9c33cb2 Author: Carlos Antonio da Silva Date: 2012-11-28 10:31:56 -0200 Merge pull request #8327 from elia/fix-send-data-disposition-with-symbols Accept symbols as #send_data :disposition value commit 06cc38a refs/tags/v3.2.15 Author: Jeremy Kemper Date: 2012-05-31 00:47:50 -0700 Work around undiagnosed bug that's draining a relation's bind_values M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit 26e8cb8 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-28 10:27:03 -0200 Use 1.8 hash style in pg specific schema M activerecord/test/schema/postgresql_specific_schema.rb commit 6880b30 refs/heads/master Author: Xavier Noria Date: 2012-11-28 09:21:17 +0100 Revert "correct css selector for the display of validation error messages: changed #error_explanation to #errorExplanation" At least in master the selector is snake case. This reverts commit ba2fed41613e02bb6cfc46c92ace00abb99ce313. M guides/source/active_record_validations_callbacks.md commit fdb41cb refs/heads/master Author: Andy Lindeman Date: 2012-11-27 22:30:47 -0500 Clarifies the cookie store docs a bit and uses correct Markdown syntax for preformatted text M guides/source/upgrading_ruby_on_rails.md commit daa7b4e refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-27 00:34:16 -0200 Use "refute" instead of "assert !" Remove FIXME tag from abstract adapter test. M activerecord/test/cases/connection_adapters/abstract_adapter_test.rb commit 46ebce6 refs/remotes/origin/schema-migrations-metadata Author: Xavier Noria Date: 2012-11-28 00:13:14 +0100 prevent Dependencies#remove_const from autoloading parents [fixes #8301] M activesupport/lib/active_support/dependencies.rb M activesupport/test/dependencies_test.rb commit 5aade82 refs/remotes/origin/schema-migrations-metadata Merge: 6c0ea88 8b104e2 Author: Rafael Mendonça França Date: 2012-11-27 13:06:04 -0800 Merge pull request #8318 from Empact/fixture-file Use File.join to better integrate fixture_path in fixture_file_upload. commit 6c0ea88 refs/remotes/origin/schema-migrations-metadata Merge: 5b9c902 e105adc Author: Rafael Mendonça França Date: 2012-11-27 10:19:55 -0800 Merge pull request #8339 from latortuga/cache-digest-opt-out-cleanup Cache digest opt out cleanup commit e105adc refs/remotes/origin/schema-migrations-metadata Author: Drew Ulmer Date: 2012-11-27 09:27:41 -0600 Cleanup CacheHelper changes allowing opt-out of cache digests Instead of deleting the skip_digest option flag, this changes the method to merely check the key. This change is because of a discussion in this thread: https://github.com/rails/rails/pull/8317 This commit also makes #fragment_name_with_digest private due to its functionality being subsumed by #cache_fragment_name. M actionpack/lib/action_view/helpers/cache_helper.rb commit e969ba9 refs/remotes/origin/schema-migrations-metadata Author: Drew Ulmer Date: 2012-11-27 09:26:18 -0600 Add CHANGELOG entry for opt-out option of automatic template digesting M actionpack/CHANGELOG.md commit 5b9c902 refs/remotes/origin/schema-migrations-metadata Author: Rafael Mendonça França Date: 2012-11-27 14:59:58 -0200 Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems" This reverts commit 33b29e0112db62d3a8c798bb58f51c0a839d9e26, reversing changes made to ac8c729342e6b020a57d0d6887c8a8d5b39f96e0. Reason: https://github.com/rails/rails/pull/4684#commitcomment-920313 M Gemfile M guides/code/getting_started/Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/plugin_new/templates/Gemfile commit 1ce9955 refs/heads/master Author: Steve Klabnik Date: 2012-11-27 08:56:45 -0800 Adding a note about :inverse_of for validations. From https://github.com/lifo/docrails/commit/cfd324b4b68469ba3188e4b7ba8586e59b239693\#commitcomment-2213592 M guides/source/active_record_validations_callbacks.md commit cfd324b refs/heads/master Author: Steve Klabnik Date: 2012-11-27 08:51:36 -0800 Fix validation based on object not _id. From https://github.com/rails/rails/issues/6161\#issuecomment-10750118 M guides/source/active_record_validations_callbacks.md commit 33b29e0 refs/remotes/origin/schema-migrations-metadata Merge: ac8c729 4ed645b Author: Rafael Mendonça França Date: 2012-11-27 08:35:26 -0800 Merge pull request #8341 from amatsuda/bundle_source_rubygems default source in Gemfiles to :rubygems rather than hardcoding the URL commit ac8c729 refs/remotes/origin/schema-migrations-metadata Merge: 0be0a97 0195d61 Author: Rafael Mendonça França Date: 2012-11-27 08:20:30 -0800 Merge pull request #8340 from skojin/grouped_options_for_select_without_hash_sort No sort Hash options in #grouped_options_for_select commit 4ed645b refs/remotes/origin/schema-migrations-metadata Author: Akira Matsuda Date: 2012-11-28 01:05:36 +0900 default source in Gemfiles to :rubygems rather than hardcoding the URL * I guess this would be the preferrable default for Bundler * current version of Bundler converts :rubygems into 'http://rubygems.org', not https://, and that will help those who are working on a very poor network environment that doesn't allow SSL M Gemfile M guides/code/getting_started/Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/plugin_new/templates/Gemfile commit 0195d61 refs/remotes/origin/schema-migrations-metadata Author: Sergey Kojin Date: 2012-11-27 20:00:31 +0400 No sort Hash options in #grouped_options_for_select M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/test/template/form_options_helper_test.rb commit ba2fed4 refs/heads/master Author: Harper Henn Date: 2012-11-27 08:24:25 -0500 correct css selector for the display of validation error messages: changed #error_explanation to #errorExplanation M guides/source/active_record_validations_callbacks.md commit 0be0a97 refs/remotes/origin/schema-migrations-metadata Merge: d7f8aab 9fb4803 Author: Carlos Antonio da Silva Date: 2012-11-27 05:16:52 -0800 Merge pull request #8338 from ugisozols/master Fix Strong Parameters docs [ci skip] commit 9fb4803 refs/remotes/origin/schema-migrations-metadata Author: Uģis Ozols Date: 2012-11-27 15:11:30 +0200 Fix Strong Parameters docs. It's only possible to inherit from ActiveRecord::Base and not include it. M actionpack/lib/action_controller/metal/strong_parameters.rb commit d7f8aab refs/remotes/origin/schema-migrations-metadata Merge: 56aba69 919cec8 Author: Rafael Mendonça França Date: 2012-11-27 04:19:10 -0800 Merge pull request #8337 from amatsuda/unshift_html_scanner unshift html-scanner into $LOAD_PATH rather than append commit 56aba69 refs/remotes/origin/schema-migrations-metadata Merge: 1f29aba 585e64f Author: Carlos Antonio da Silva Date: 2012-11-27 02:46:25 -0800 Merge pull request #8336 from rashmi14yadav/warning_removed Unused variable warning removed commit 919cec8 refs/remotes/origin/schema-migrations-metadata Author: Akira Matsuda Date: 2012-11-27 19:32:30 +0900 unshift html-scanner into $LOAD_PATH rather than append M actionpack/lib/action_view/vendor/html-scanner.rb commit 585e64f refs/remotes/origin/schema-migrations-metadata Author: Rashmi Yadav Date: 2012-11-27 15:24:25 +0530 Unused variable warning removed M railties/test/application/rake_test.rb commit 1f29aba refs/remotes/origin/schema-migrations-metadata Merge: 80b8df5 6bcbd60 Author: José Valim Date: 2012-11-27 00:26:58 -0800 Merge pull request #8333 from amatsuda/rails_gem_empty_require_path empty rails gem's require_paths commit 8f43c9a refs/heads/master Author: Hendy Tanata Date: 2012-11-27 15:46:18 +0800 Set fixed-width style where appropriate on Getting Started guide. M guides/source/getting_started.md commit 6bcbd60 refs/remotes/origin/schema-migrations-metadata Author: Akira Matsuda Date: 2012-11-27 17:14:14 +0900 rails gem has no lib directory to require M rails.gemspec commit 80b8df5 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-27 02:37:24 -0200 Remove warning of circular require This file was using mime_types before load the Mime::Type class. When trying to register first Mime::Type it load mime_type that loads mime_types in the end. Requiring mime_type ensure that we have the class definition and the mime types M actionpack/lib/action_controller/metal/params_wrapper.rb commit 462a905 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-27 00:11:21 -0200 Remove useless check of AR being defined from teardown fixtures We are already in the AR namespace, there's no way for it to be undefined. See the cousin commit 13e72db77063f57c3028a906690d42fb068845bb Refactor a bit teardown fixtures to avoid two conditionals. M activerecord/lib/active_record/fixtures.rb commit 8df46ea refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-27 00:07:05 -0200 Refactor generators tests to include test helpers in the parent class M railties/test/generators/namespaced_generators_test.rb commit 8b104e2 refs/remotes/origin/schema-migrations-metadata Author: Ben Woosley Date: 2012-11-26 04:18:18 -0600 Use File.join to better integrate fixture_path in fixture_file_upload. M actionpack/lib/action_dispatch/testing/test_process.rb M actionpack/test/controller/test_case_test.rb commit fe45712 refs/heads/master Merge: 5658923 5d8faa6 Author: Carlos Antonio da Silva Date: 2012-11-26 15:34:09 -0800 Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-master Accept symbols as #send_data :disposition value commit 9c33cb2 refs/tags/v3.2.15 Author: Elia Schito Date: 2012-11-26 23:49:14 +0100 Accept symbols as #send_data :disposition value M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/data_streaming.rb M actionpack/test/controller/send_file_test.rb commit 5d8faa6 refs/heads/master Author: Elia Schito Date: 2012-11-26 23:49:14 +0100 Accept symbols as #send_data :disposition value M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/data_streaming.rb M actionpack/test/controller/send_file_test.rb commit 5658923 refs/heads/master Merge: b3660ac ea76e9a Author: Rafael Mendonça França Date: 2012-11-26 18:44:07 -0200 Merge pull request #7282 from xHire/validates_length_of_fix Length validation handles correctly nil. Fix #7180 Conflicts: activemodel/CHANGELOG.md commit 941f019 refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-11-25 22:53:46 -0800 schema cache already has the columns as a hash, so use that Commits 978ec98c8eff824a60c7e973f369cc7bed1f4d36 and 51676652a3568ad09b06385564de4fdcb13af05e changed database statements to use the schema_cache methods, added on master in c99e34e90d763c52cbe8dc3d950ed1b4db665dc4 and dc973e78560a6514ab172f0ee86dc84a9147d39a But apparently the methods weren't added to schema_cache, resulting in the failure described in #8322 for 3-2-stable. Fixes #8322. Conflicts: activerecord/lib/active_record/connection_adapters/schema_cache.rb M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit 17d64a1 refs/tags/v3.2.15 Merge: 924018f 767879c Author: Carlos Antonio da Silva Date: 2012-11-26 10:59:23 -0800 Merge pull request #8325 from steveklabnik/backport_7997 @steveklabnik can't spell 'distance.' [ci skip] commit 767879c refs/tags/v3.2.15 Author: Steve Klabnik Date: 2012-11-26 10:56:24 -0800 @steveklabnik can't spell 'distance.' M actionpack/CHANGELOG.md commit b3660ac refs/heads/master Merge: 586bc59 aa996c3 Author: Rafael Mendonça França Date: 2012-11-26 10:52:18 -0800 Merge pull request #8324 from steveklabnik/changelog_7997 @steveklabnik can't spell 'distance.' commit aa996c3 refs/heads/master Author: Steve Klabnik Date: 2012-11-26 10:51:08 -0800 @steveklabnik can't spell 'distance.' M actionpack/CHANGELOG.md commit 586bc59 refs/heads/master Merge: 2cab6a1 512a8c7 Author: Rafael Mendonça França Date: 2012-11-26 10:49:24 -0800 Merge pull request #8323 from steveklabnik/changelog_7997 Add changelog for #7997. commit 512a8c7 refs/heads/master Author: Steve Klabnik Date: 2012-11-26 10:44:56 -0800 Add changelog for #7997. This was forgotten when we did the merge. M actionpack/CHANGELOG.md commit 924018f refs/tags/v3.2.15 Merge: 5167665 1a876f6 Author: Rafael Mendonça França Date: 2012-11-26 10:43:23 -0800 Merge pull request #8321 from steveklabnik/backport_7997 Add i18n scope to disance_of_time_in_words. commit 1a876f6 refs/tags/v3.2.15 Author: Steve Klabnik Date: 2012-11-26 10:33:06 -0800 Add i18n scope to disance_of_time_in_words. This is a backport of rails/rails#7997. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_i18n_test.rb commit 2cab6a1 refs/heads/master Merge: 26a3b70 4ac92c6 Author: Carlos Antonio da Silva Date: 2012-11-26 09:39:06 -0800 Merge pull request #8319 from alindeman/typo Corrects typo in test name [ci skip] commit 26a3b70 refs/heads/master Merge: 296412f 6fc8320 Author: Carlos Antonio da Silva Date: 2012-11-26 15:32:25 -0200 Merge pull request #8320 from senny/active_model_log_folder Log output from activemodel's railtie_test directly to STDOUT. There's no logging going on here, but since we initialize the app, the logger is set and the folder is automatically created. With this change, the default logger is not created, so there is no logging folder anymore. Conflicts: activemodel/test/cases/railtie_test.rb commit 6fc8320 refs/heads/master Author: Yves Senn Date: 2012-11-26 17:23:20 +0100 log output from activemodel's railtie_test directly to STDOUT after this patch, running the tests in activemodel will no longer create an untracked log/ folder inside of activemodel M activemodel/test/cases/railtie_test.rb commit 296412f refs/heads/master Merge: 3ec4430 50e8613 Author: Xavier Noria Date: 2012-11-26 07:43:43 -0800 Merge pull request #6197 from blakesmith/connection_adapters_without_explain_support Don't run explain on slow queries for database adapters that don't support it commit 50e8613 refs/heads/master Author: Blake Smith Date: 2012-11-21 08:28:37 -0600 Don't run explain on slow queries for database adapters that don't support it M activerecord/lib/active_record/explain.rb M activerecord/lib/active_record/railtie.rb M activerecord/test/cases/explain_test.rb commit 4ac92c6 refs/heads/master Author: Andy Lindeman Date: 2012-11-26 09:22:28 -0500 Corrects typo in test name M activerecord/test/cases/associations/has_many_associations_test.rb commit 3ec4430 refs/heads/master Merge: be2a3b0 22598ee Author: Rafael Mendonça França Date: 2012-11-26 04:11:17 -0800 Merge pull request #8312 from senny/make_active_model_parts_individually_loadable make sure that individual parts `ActiveModel` can be required by itself commit ea76e9a refs/heads/master Author: Michal Zima Date: 2012-08-07 13:39:21 +0200 Length validation handles correctly nil. Fix #7180 When nil or empty string are not allowed, they are not valid. M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations/length.rb M activemodel/test/cases/validations/length_validation_test.rb commit be2a3b0 refs/heads/master Author: Andrew White Date: 2012-11-26 11:15:50 +0000 Improve clarity of routing tests Move the routes for each test inside the test method so that it's easier to see which routes are applicable to which test. To ensure that each test wasn't invalidated the changes were done by first removing all of the routes, ensuring that all of the tests failed and then adding the routes back to each test one by one. One test for `assert_recognizes` was removed as it wasn't actually testing the defined routes and is now tested more thoroughly in routing_assertions_test.rb. One downside is that the test suite takes about 1s longer due to having to using `method_missing` for handling the url helpers as using `include url_helpers` isn't isolated for each test. M actionpack/test/dispatch/routing_test.rb commit 3da1649 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-26 09:18:41 -0200 Require active_model/railtie directly instead of rails/all Use Class.new with a block instead of tap to configure it. M activemodel/test/cases/railtie_test.rb commit 02c30c6 refs/heads/master Merge: 1081ae2 3f2c011 Author: Carlos Antonio da Silva Date: 2012-11-26 02:41:45 -0800 Merge pull request #8316 from roberto/assert_template_validate_options assert_template: validating option keys It only handles the keys locals, partial, layout and count. assert_template(foo: "bar") # raises ArgumentError assert_template(leiaute: "test") # raises ArgumentError commit 1081ae2 refs/heads/master Merge: dc973e7 7fb8c67 Author: David Heinemeier Hansson Date: 2012-11-26 00:59:48 -0800 Merge pull request #8317 from latortuga/cache-digest-opt-out Add explicit opt-out for fragment cache digesting commit 5167665 refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-11-25 22:53:46 -0800 schema cache already has the columns as a hash, so use that M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit 978ec98 refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-11-25 22:49:48 -0800 speed up fixture loading by querying the schema cache for column names M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit dc973e7 refs/heads/master Author: Aaron Patterson Date: 2012-11-25 22:53:46 -0800 schema cache already has the columns as a hash, so use that M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit c99e34e refs/heads/master Author: Aaron Patterson Date: 2012-11-25 22:49:48 -0800 speed up fixture loading by querying the schema cache for column names M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/schema_cache.rb commit 266d844 refs/heads/master Merge: 064ae35 d34fd9f Author: Caleb Wright Date: 2012-11-25 20:59:35 -0800 Merge pull request #119 from c0/master Clarification to ActiveRecord Validations Doc in 7.2 Custom Methods commit d34fd9f refs/heads/master Author: Caleb Wright Date: 2012-11-25 23:46:11 -0500 Update guides/source/active_record_validations_callbacks.md In the expiration_date_cannot_be_in_the_past validation method, use `expiration_date.present?` instead of the double negative `!expiration_date.blank?`. Also join the comparisons with `&&` instead of `and`, which could cause unintended consequences. M guides/source/active_record_validations_callbacks.md commit 7fb8c67 refs/heads/master Author: Drew Ulmer Date: 2012-11-25 22:10:44 -0600 Add explicit opt-out for fragment cache digesting This add support for sending an explicit opt-out of the "Russian-doll" cache digest feature on a case-by-case basis. This is useful when cache- expiration needs to be performed manually and it would be otherwise difficult to know the exact name of a digested cache key. More information: https://github.com/rails/cache_digests/pull/16 M actionpack/lib/action_view/helpers/cache_helper.rb M actionpack/test/controller/caching_test.rb A actionpack/test/fixtures/functional_caching/fragment_cached_without_digest.html.erb commit 3f2c011 refs/heads/master Author: Roberto Soares Date: 2012-11-25 23:39:08 -0300 assert_template: validating option keys M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb commit 6fe1a4a refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-25 14:29:34 -0800 Merge pull request #8311 from alisdair/dirty-nullable-datetime Don't call will_change! for datetime nil->"". Setting a nil datetime attribute to a blank string should not cause the attribute to be dirty. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/dirty_test.rb commit 4d0dc53 refs/heads/master Merge: 0a7ba19 2d6c4ec Author: Carlos Antonio da Silva Date: 2012-11-25 16:45:55 -0800 Merge pull request #8302 from roberto/assert_template_empty_string assert_template("") will now fail no matter whether a template has been rendered or not. commit 0a7ba19 refs/heads/master Merge: e95b9d6 fc4e387 Author: Carlos Antonio da Silva Date: 2012-11-25 14:29:34 -0800 Merge pull request #8311 from alisdair/dirty-nullable-datetime Don't call will_change! for datetime nil->"". commit 064ae35 refs/heads/master Author: Jason Noble Date: 2012-11-25 12:02:01 -0700 Revert "Updated with where functional/helper tests go" This reverts commit c94cfdad6388dcdfaf4c10b9e8cee46baf2a7901. * This is the new 4.0 (master) directory structure M guides/source/getting_started.md commit 22598ee refs/heads/master Author: Yves Senn Date: 2012-11-25 17:08:57 +0100 cleanup, removed dispensable `require` statements from `ActiveModel` M activemodel/CHANGELOG.md M activemodel/lib/active_model/callbacks.rb M activemodel/lib/active_model/conversion.rb M activemodel/lib/active_model/dirty.rb M activemodel/lib/active_model/naming.rb M activemodel/lib/active_model/observing.rb M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validations/callbacks.rb commit b7edbc7 refs/heads/master Author: Yves Senn Date: 2012-11-25 12:33:47 +0100 cleanup, remove broken whitespace M activemodel/lib/active_model/attribute_methods.rb M activemodel/lib/active_model/naming.rb M activemodel/lib/active_model/observing.rb M activemodel/lib/active_model/validations/callbacks.rb commit fc4e387 refs/heads/master Author: Alisdair McDiarmid Date: 2012-11-25 10:13:39 +0000 Don't call will_change! for datetime nil->"". Setting a nil datetime attribute to a blank string should not cause the attribute to be dirty. Fix #8310 M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/dirty_test.rb commit f9793a1 refs/heads/master Author: Jason Noble Date: 2012-11-24 22:57:21 -0700 Reword Post model to note there are lines not shown M guides/source/getting_started.md commit 45f0fea refs/heads/master Author: Jason Noble Date: 2012-11-24 22:56:56 -0700 We should use post_path, not post_url M guides/source/getting_started.md commit c94cfda refs/heads/master Author: Jason Noble Date: 2012-11-24 22:41:30 -0700 Updated with where functional/helper tests go M guides/source/getting_started.md commit 9314867 refs/heads/master Author: Jason Noble Date: 2012-11-24 22:37:50 -0700 Moved position of has_many M guides/source/getting_started.md commit 3e8c4bc refs/heads/master Author: Jason Noble Date: 2012-11-24 22:25:32 -0700 Added new line to make it more readable * This shows the reader there is a method: and data: parameters M guides/source/getting_started.md commit a22fc4a refs/heads/master Author: Jason Noble Date: 2012-11-24 22:24:29 -0700 Changed the Using Partials section to read a little better * No need to give a simple example, as we have a partial that we create in the blog app M guides/source/getting_started.md commit 85db49f refs/heads/master Author: Jason Noble Date: 2012-11-24 21:37:53 -0700 Modified "Allowing the update of fields" section * Rails generate model Post ______ creates the attr_accessible line for you for any fields you specify. Changed the section to describe what this line in the model does. M guides/source/getting_started.md commit c332393 refs/heads/master Author: Jason Noble Date: 2012-11-24 21:02:48 -0700 Update version numbers of Ruby and Rails M guides/source/getting_started.md commit 65ee3d7 refs/heads/master Author: Jason Noble Date: 2012-11-24 18:27:10 -0700 Updated link to RubyGems site M guides/source/getting_started.md commit e95b9d6 refs/heads/master Merge: d23c761 47b4ed9 Author: Carlos Antonio da Silva Date: 2012-11-24 09:59:03 -0800 Merge pull request #8306 from senny/documentation_for_hidden_field_id Document :hidden_field_id option for fields_for [ci skip] commit 47b4ed9 refs/heads/master Author: Yves Senn Date: 2012-11-24 17:35:29 +0100 document :hidden_field_id option for fields_for M actionpack/lib/action_view/helpers/form_helper.rb commit d23c761 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-24 09:30:18 -0200 Fix changelog entry about fast_string_to_time fix Introduced in 53ca22f2e11cd3050d75385bc31b6bb5055a2738. Thanks @rochefort. [ci skip] M activerecord/CHANGELOG.md commit ccdf54d refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-24 08:48:01 -0200 Refector a bit to remove extra slice iteration and splat call This yields a small bit of performance improvement when building the defaults from constraints, specially considering that it's rather common for constraints to be empty. Also, there's a bit of duplicated code in here that I have to check before extracting. M actionpack/lib/action_dispatch/routing/mapper.rb commit d98014c refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-23 20:40:21 -0200 Use merge! in some places to avoid creating extra hashes M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/redirection.rb commit 2b64e9b refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-23 20:00:25 -0200 Simplify scope options recovery by using merge! Instead of iterating again over the options and setting one by one, we can just merge the recover hash back to the scope one since all keys match. M actionpack/lib/action_dispatch/routing/mapper.rb commit beeb952 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-23 19:47:05 -0200 Normalize scope recovering :blocks option name Use the same :blocks key in the recover hash to revert the scope options later. M actionpack/lib/action_dispatch/routing/mapper.rb commit 5b9f983 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-23 19:57:38 -0200 Simplify constraints condition in scope when checking for Hash M actionpack/lib/action_dispatch/routing/mapper.rb commit b69fd47 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-22 20:02:56 -0200 Move initialize_copy method around to let new method / build alias closer M activerecord/lib/active_record/relation.rb commit 2d6c4ec refs/heads/master Author: Roberto Soares Date: 2012-11-23 18:10:18 -0300 `assert_template` fails with empty string. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb commit 20723ca refs/heads/master Author: Roberto Soares Date: 2012-11-23 16:13:08 -0300 `assert_template` fails with empty string when a template has been rendered For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}") M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb commit 36ee580 refs/heads/master Merge: b313bcb 5859433 Author: Vijay Dev Date: 2012-11-23 22:26:53 +0530 Merge branch 'master' of github.com:lifo/docrails commit bceb623 refs/remotes/origin/relation_subclasses (origin/relation_subclasses) Author: Jon Leighton Date: 2012-11-23 12:36:22 +0000 Use separate Relation subclasses for each AR class At present, ActiveRecord::Delegation compiles delegation methods on a global basis. The compiled methods apply to all subsequent Relation instances. This creates several problems: 1) After Post.all.recent has been called, User.all.respond_to?(:recent) will be true, even if User.all.recent will actually raise an error due to no User.recent method existing. (See #8080.) 2) Depending on the AR class, the delegation should do different things. For example, if a Post.zip method exists, then Post.all.zip should call it. But this will then result in User.zip being called by a subsequent User.all.zip, even if User.zip does not exist, when in fact User.all.zip should call User.all.to_a.zip. (There are various variants of this problem.) We are creating these compiled delegations in order to avoid method missing and to avoid repeating logic on each invocation. One way of handling these issues is to add additional checks in various places to ensure we're doing the "right thing". However, this makes the compiled methods signficantly slower. In which case, there's almost no point in avoiding method_missing at all. (See #8127 for a proposed solution which takes this approach.) This is an alternative approach which involves creating a subclass of ActiveRecord::Relation for each AR class represented. So, with this patch, Post.all.class != User.all.class. This means that the delegations are compiled for and only apply to a single AR class. A compiled method for Post.all will not be invoked from User.all. This solves the above issues without incurring significant performance penalties. It's designed to be relatively seamless, however the downside is a bit of complexity and potentially confusion for a user who thinks that Post.all and User.all should be instances of the same class. Benchmark --------- require 'active_record' require 'benchmark/ips' class Post < ActiveRecord::Base establish_connection adapter: 'sqlite3', database: ':memory:' connection.create_table :posts def self.omg :omg end end relation = Post.all Benchmark.ips do |r| r.report('delegation') { relation.omg } r.report('constructing') { Post.all } end Before ------ Calculating ------------------------------------- delegation 4392 i/100ms constructing 4780 i/100ms ------------------------------------------------- delegation 144235.9 (±27.7%) i/s - 663192 in 5.038075s constructing 182015.5 (±21.2%) i/s - 850840 in 5.005364s After ----- Calculating ------------------------------------- delegation 6677 i/100ms constructing 6260 i/100ms ------------------------------------------------- delegation 166828.2 (±34.2%) i/s - 754501 in 5.001430s constructing 116575.5 (±18.6%) i/s - 563400 in 5.036690s Comments -------- Bear in mind that the standard deviations in the above are huge, so we can't compare the numbers too directly. However, we can conclude that Relation construction has become a little slower (as we'd expect), but not by a huge huge amount, and we can still construct a large number of Relations quite quickly. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/relation/delegation.rb M activerecord/test/cases/relation_test.rb M activerecord/test/cases/relations_test.rb commit 83e7105 refs/tags/v3.2.15 Merge: 4e00e8e d397a38 Author: Rafael Mendonça França Date: 2012-11-22 06:47:44 -0800 Merge pull request #8295 from senny/8265_backport backport #8291, prevent mass assignment of polymorphic type with `build` commit d397a38 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-11-21 09:48:48 +0100 backport #8291, prevent mass assignment of polymorphic type with `build` Closes #8265 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/association.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit b313bcb refs/heads/master Merge: 43dd9c8 053bfa2 Author: Rafael Mendonça França Date: 2012-11-22 11:52:01 -0200 Merge pull request #8291 from senny/8265_build_with_polymorphic_association prevent mass assignment of polymorphic type when using `build` Conflicts: activerecord/CHANGELOG.md commit 43dd9c8 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-22 08:42:12 -0200 Indent changelog markdown code to highlight correctly [ci skip] M actionpack/CHANGELOG.md commit 9f68d52 refs/heads/master Merge: 0134ca6 0d3a9e8 Author: Andrew White Date: 2012-11-22 01:27:14 -0800 Merge pull request #8114 from guilleiguaran/use-symbols-in-scope Allow setting a symbol as path in scope on routes commit 053bfa2 refs/heads/master Author: Yves Senn Date: 2012-11-21 09:48:48 +0100 prevent mass assignment of polymorphic type when using `build` Closes #8265 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 0d3a9e8 refs/heads/master Author: Guillermo Iguaran Date: 2012-11-03 17:38:55 -0500 Allow setting a symbol as path in scope on routes Was surprising found that this example doesn't work: scope :api do resources :users end and the right form to use it is: scope 'api' do resources :users end I think this should work similary as `namespace` where both are allowed. These two are equivalent: namespace :api do resources :users end namespace 'api' do resources :user end M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 0134ca6 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-20 09:26:23 -0200 Remove private partial/template renderer methods Since now these objects are not cached anymore, there's no need to have these private methods, just instantiate each of them in the necessary place. M actionpack/lib/action_view/renderer/partial_renderer.rb M actionpack/lib/action_view/renderer/renderer.rb M actionpack/lib/action_view/renderer/template_renderer.rb commit a9aeba6 refs/heads/master Merge: ae934ae fd1c457 Author: Carlos Antonio da Silva Date: 2012-11-21 22:23:41 -0200 Merge branch 'deprecate-calculations-with-block' Follow up of the discussion from the original merge commit: https://github.com/rails/rails/commit/f9cb645dfcb5cc89f59d2f8b58a019486c828c73#commitcomment-1414561 We want to avoid people's mistakes with methods like count and sum when called with a block, that can easily lead to code performing poorly and that could be way better written with a db query. Please check the discussion there for more background. Closes #8268 commit fd1c457 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-19 09:01:20 -0200 Remove the #sum method from CollectionAssociation Since edd94cee9af1688dd036fc58fd405adb30a5e0da, CollectionProxy delegates all calculation methods - except count - to the scope, which does basically what this method was doing, but since we're delegating from the proxy, the association method was never called. M activerecord/lib/active_record/associations/collection_association.rb commit ad9983f refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 19:08:07 -0200 Deprecate Relation#sum with a block. To perform a sum calculation over the array of elements, use to_a.sum(&block). Please check the discussion in f9cb645dfcb5cc89f59d2f8b58a019486c828c73 for more context. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/calculations_test.rb commit 76a6bfd refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 18:57:32 -0200 Revert "Yield only one argument instead of splatting." This reverts commit f9cb645dfcb5cc89f59d2f8b58a019486c828c73. Conflicts: activerecord/CHANGELOG.md Revert "Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks" This reverts commit 9cc2bf69ce296b7351dc612a8366193390a305f3. Conflicts: activerecord/lib/active_record/relation/calculations.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit ae934ae refs/heads/master Author: Jon Leighton Date: 2012-10-12 12:33:11 +0100 Don't allocate new strings in compiled attribute methods This improves memory and performance without having to use symbols which present DoS problems. Thanks @headius and @tenderlove for the suggestion. This was originally committed in f1765019ce9b6292f2264b4601dad5daaffe3a89, and then reverted in d3494903719682abc0948bef290af0d3d7b5a440 due to it causing problems in a real application. This second attempt should solve that. Benchmark --------- require 'active_record' require 'benchmark/ips' ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') class Post < ActiveRecord::Base connection.create_table :posts, force: true do |t| t.string :name end end post = Post.create name: 'omg' Benchmark.ips do |r| r.report('Post.new') { Post.new name: 'omg' } r.report('post.name') { post.name } r.report('post.name=') { post.name = 'omg' } r.report('Post.find(1).name') { Post.find(1).name } end Before ------ Calculating ------------------------------------- Post.new 1419 i/100ms post.name 7538 i/100ms post.name= 3024 i/100ms Post.find(1).name 243 i/100ms ------------------------------------------------- Post.new 20637.6 (±12.7%) i/s - 102168 in 5.039578s post.name 1167897.7 (±18.2%) i/s - 5186144 in 4.983077s post.name= 64305.6 (±9.6%) i/s - 317520 in 4.998720s Post.find(1).name 2678.8 (±10.8%) i/s - 13365 in 5.051265s After ----- Calculating ------------------------------------- Post.new 1431 i/100ms post.name 7790 i/100ms post.name= 3181 i/100ms Post.find(1).name 245 i/100ms ------------------------------------------------- Post.new 21308.8 (±12.2%) i/s - 105894 in 5.053879s post.name 1534103.8 (±2.1%) i/s - 7634200 in 4.979405s post.name= 67441.0 (±7.5%) i/s - 337186 in 5.037871s Post.find(1).name 2681.9 (±10.6%) i/s - 13475 in 5.084511s M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/core.rb commit 96106a1 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-21 17:38:44 -0200 Move migration test together with other join table tests M activerecord/test/cases/migration/create_join_table_test.rb M activerecord/test/cases/migration_test.rb commit c2c1ecb refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-19 23:07:12 -0200 Use secure password min cost option in its own tests for a speed up Around 0.564359s => 0.092244s speed up in my machine. M activemodel/test/cases/secure_password_test.rb commit 293c121 refs/heads/master Merge: b6793ba 654a2de Author: Jon Leighton Date: 2012-11-21 11:50:27 -0800 Merge pull request #8183 from jcoglan/objectless_sessions Store FlashHashes in the session as plain hashes commit b6793ba refs/heads/master Merge: 0cf3092 48a0357 Author: Rafael Mendonça França Date: 2012-11-21 11:35:49 -0800 Merge pull request #7716 from steveklabnik/issue_7715 Coerce strings in create_join_table. commit 48a0357 refs/heads/master Author: Steve Klabnik Date: 2012-09-20 15:09:21 +0300 Coerce strings in create_join_table. If you accidentally pass a string and a symbol, this breaks. So we coerce them both to strings. Fixes #7715 M activerecord/lib/active_record/migration/join_table.rb M activerecord/test/cases/migration_test.rb commit 0cf3092 refs/heads/master Merge: 1c0e7ab 104f4fd Author: Carlos Antonio da Silva Date: 2012-11-21 10:17:46 -0800 Merge pull request #8290 from cpatuzzo/master Fixed a typo commit 104f4fd refs/heads/master Author: Chris Patuzzo Date: 2012-11-21 18:04:08 +0000 Typo M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 1c0e7ab refs/heads/master Merge: 6b266c2 fa73cf7 Author: Rafael Mendonça França Date: 2012-11-21 09:34:55 -0800 Merge pull request #6245 from bogdan/bc_timestamp Postgresql adapter: fix handling of BC timestamps commit 6b266c2 refs/heads/master Merge: f058e56 2197e1f Author: Rafael Mendonça França Date: 2012-11-21 09:33:41 -0800 Merge pull request #8289 from semaperepelitsa/pg_adapter_refactoring_squashed Refactoring, testing and documenting pg_connection.distinct commit 2197e1f refs/heads/master Author: Semyon Perepelitsa Date: 2012-09-08 00:03:59 +0800 Refactoring, testing and documenting pg_connection.distinct M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit fa73cf7 refs/heads/master Author: Bogdan Gusiev Date: 2012-11-21 16:11:14 +0200 Fix postgresql adapter to handle bc timestamps correctly M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/timestamp_test.rb commit f058e56 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-20 22:44:33 -0200 Remove return guard and use code convetions M activerecord/lib/active_record/persistence.rb commit 4e00e8e refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-20 14:59:50 -0800 Merge pull request #8280 from asanghi/fix_guide_field_with_error_proc fix guide with field_with_error proc example [ci skip] M railties/guides/source/active_record_validations_callbacks.textile commit f042b4e refs/heads/master Merge: f63d654 e8502ed Author: Rafael Mendonça França Date: 2012-11-20 14:59:50 -0800 Merge pull request #8280 from asanghi/fix_guide_field_with_error_proc fix guide with field_with_error proc example commit f63d654 refs/heads/master Merge: 3a89068 4a7a858 Author: Carlos Antonio da Silva Date: 2012-11-20 11:23:21 -0800 Merge pull request #8282 from arunagw/warning_removed_for_ruby2 Initialize accessors to remove some warnings in Ruby 2.0 commit 4a7a858 refs/heads/master Author: Arun Agrawal Date: 2012-11-21 00:48:21 +0530 Initialize accessors to remove some warnings in Ruby 2.0 M railties/lib/rails/engine.rb commit 50f0046 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-20 08:00:52 -0800 Merge pull request #8276 from pwnall/pgsql_text_limits Postgresql doesn't accepts limits on text columns Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb A activerecord/test/cases/adapters/postgresql/sql_types_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 3a89068 refs/heads/master Merge: abb38fe a8a60e9 Author: Rafael Mendonça França Date: 2012-11-20 08:00:52 -0800 Merge pull request #8276 from pwnall/pgsql_text_limits Postgresql doesn't accepts limits on text columns commit a8a60e9 refs/heads/master Author: Victor Costan Date: 2012-11-19 22:38:19 -0500 Postgresql doesn't accepts limits on text columns. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb A activerecord/test/cases/adapters/postgresql/sql_types_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 5859433 refs/heads/master Author: Lennart Tange Date: 2012-11-20 15:39:21 +0100 fixed a minor spelling error M guides/source/engines.md commit e8502ed refs/heads/master Author: Aditya Sanghi Date: 2012-11-20 19:08:51 +0530 fix guide with field_with_error proc example M guides/source/active_record_validations_callbacks.md commit ceb1fd3 refs/heads/master Author: Sergey Nartimov Date: 2012-11-20 16:17:13 +0300 embed code example using backticks in caching guide M guides/source/caching_with_rails.md commit 7521698 refs/heads/master Author: Michel Grootjans Date: 2012-11-20 14:19:04 +0100 remove previous commit M guides/source/engines.md commit 62c34f0 refs/heads/master Author: Michel Grootjans Date: 2012-11-20 14:18:05 +0100 bug in example '<%= form_for ...' should be '<% form_for ...' M guides/source/engines.md commit abb38fe refs/heads/master Merge: 03ef833 61425f2 Author: Carlos Antonio da Silva Date: 2012-11-20 03:48:32 -0800 Merge pull request #8279 from gaurish/database_error Improved Error handling when parsing database.yaml, Fixes #8143 commit 61425f2 refs/heads/master Author: Gaurish Sharma Date: 2012-11-20 16:18:28 +0530 Better Error handling when parsing database.yaml Provides a better error message incase the database.yaml has some errors. M railties/lib/rails/application/configuration.rb commit 03ef833 refs/heads/master Merge: bba8fc4 ce60672 Author: Carlos Antonio da Silva Date: 2012-11-19 21:44:04 -0200 Merge branch 'url-for-params' Fix error when using a non-hash query argument named "params" in `url_for`. Before: url_for(params: "") # => undefined method `reject!' for "":String After: url_for(params: "") # => http://www.example.com?params=` Closes #8233 commit ce60672 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-19 21:27:47 -0200 Correct the use of params options when given to url_for Merge url for tests and add changelog entry for #8233. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/request_test.rb commit e492c44 refs/heads/master Author: tumayun Date: 2012-11-16 12:11:03 +0800 Fix issue with params in url_for With a "params" argument, the following error is raised: undefined method `reject!` for "":String M actionpack/lib/action_dispatch/http/url.rb M actionpack/test/dispatch/request_test.rb commit bba8fc4 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-19 21:20:17 -0200 Refactor request tests, remove #with_set method M actionpack/test/dispatch/request_test.rb commit 14620ea refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-19 20:54:03 -0200 Be a bit less conservative with mysql in adapter M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit bd87bd9 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-19 20:54:03 -0200 Be a bit less conservative with mysql in adapter This will allow the new mysql 2.9.0 to be used, fixing our test issues. M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit 0077b41 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-18 10:17:15 -0800 Merge pull request #8258 from kommen/eager_loading_with_select_test2 Add test to ensure preloading works as expected with "group", "select" and "includes". Conflicts: activerecord/test/cases/relations_test.rb Chery-pick a739340d3c9e66814429af6f3f410c01ff86810a: Ensure ordering to make the test pass with postgresql Conflicts: activerecord/test/cases/relations_test.rb M activerecord/test/cases/relations_test.rb commit a1c7eae refs/heads/master Merge: 60790e8 1d07d3d Author: José Valim Date: 2012-11-19 12:43:23 -0800 Merge pull request #8212 from senny/8197_make_render_in_spacer_template_work render every partial with a new `PartialRenderer`. commit 1d07d3d refs/heads/master Author: Yves Senn Date: 2012-11-13 22:02:41 +0100 render every partial with a new `PartialRenderer`. This resolves issues when rendering nested partials. Previously the `PartialRenderer` was reused which led to situations where the state of the renderer was reset. Closes #8197 M actionpack/CHANGELOG.md M actionpack/lib/action_view/renderer/renderer.rb M actionpack/test/controller/render_test.rb commit 60790e8 refs/heads/master Merge: ffaab2c 9cf33b5 Author: Rafael Mendonça França Date: 2012-11-19 08:51:27 -0800 Merge pull request #8044 from nateberkopec/block_does_not_set_parts_order Explicit multipart messages respect :parts_order commit 9cf33b5 refs/heads/master Author: Nate Berkopec Date: 2012-10-27 14:28:42 -0400 Explicit multipart messages respect :parts_order As issue #7978, the order in which ActionMailer sends multipart messages could be unintentionally overwritten if a block is passed to the mail method. This changes the mail method such that :parts_order is always respected, regardless of whether a block is passed to mail. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb M guides/source/action_mailer_basics.md commit db67652 refs/tags/v3.2.15 Merge: b18fc59 da6951a Author: Rafael Mendonça França Date: 2012-11-19 08:25:46 -0800 Merge pull request #8271 from senny/backport_8262 backport #8262, require bundler groups to include rake-tasks in engines commit ffaab2c refs/heads/master Author: Santiago Pastorino Date: 2012-11-19 14:14:05 -0200 Add UpgradeSignatureToEncryptionCookieStore to upgrading_ruby_on_rails guide M guides/source/upgrading_ruby_on_rails.md commit 90ee4c5 refs/heads/master Author: Santiago Pastorino Date: 2012-11-19 14:11:06 -0200 Fix UpgradeSignatureToEncryptionCookieStore doc M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 3b99653 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-19 12:50:44 -0200 Remove not needed begin..end from AR#save M activerecord/lib/active_record/persistence.rb commit 7e10f38 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-19 12:52:09 -0200 Initialize accessors to remove some warnings in Ruby 2.0 M activerecord/test/cases/migration/helper.rb M activerecord/test/models/reference.rb commit da6951a refs/tags/v3.2.15 Author: Yves Senn Date: 2012-11-18 17:57:55 +0100 backport #8262, require bundler groups to include rake-tasks in engines If you generate a full engine, this will include rake tasks from your gem under the `app` namespace. For example if you have a dependency on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec` Closes #8229 Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb commit 133cdf0 refs/heads/master Merge: ea0056f a1fd9cd Author: Rafael Mendonça França Date: 2012-11-19 06:14:58 -0800 Merge pull request #8262 from senny/8229_correct_bundler_require_in_engines require bundler groups to include rake-tasks in engines commit ea0056f refs/heads/master Merge: 12d32dd c33e893 Author: Carlos Antonio da Silva Date: 2012-11-19 02:49:00 -0800 Merge pull request #8256 from nalwayaabhishek/master Displaying error message if validation fail in examples (p tag was missing) commit 12d32dd refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-18 23:58:17 -0200 Refactor config abort message a bit for dbconsole Remove not used variable. Remove config attr_reader causing warning. Fix indent in runner file. M railties/lib/rails/commands/dbconsole.rb M railties/lib/rails/commands/runner.rb commit 53aefde refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-18 23:46:33 -0200 Fix rails db command with sqlite3 database When using sqlite3 it was attempting to find the database file based on Rails.root, the problem is that Rails.root is not always present because we try to first manually load "config/database.yml" instead of loading the entire app, to make "rails db" faster. This means that when we're in the root path of the app, calling "rails db" won't allow us to use Rails.root, making the command fail for sqlite3 with the error: ./rails/commands/dbconsole.rb:62:in `start': undefined method `root' for Rails:Module (NoMethodError) The fix is to simply not pass any dir string to File.expand_path, which will make it use the current directory of the process as base, or the root path of the app, which is what we want. When we are in any other subdirectory, calling "rails db" should work just fine, because "config/database.yml" won't be found, thus "rails db" will fallback to loading the app, making Rails.root available. Closes #8257. M railties/lib/rails/commands/dbconsole.rb M railties/test/commands/dbconsole_test.rb commit c33e893 refs/heads/master Author: Abhishek Nalwaya Date: 2012-11-18 12:34:36 +0530 displaying error message(p tag was missing) and adding output as comment M activemodel/examples/validations.rb commit 0cc9c12 refs/heads/master Merge: f460835 70fa756 Author: Rafael Mendonça França Date: 2012-11-18 23:25:13 -0200 Merge pull request #3023 from Tho85/preserve_sti_type AR::Base.becomes should not change the STI type Conflicts: activerecord/CHANGELOG.md commit f460835 refs/heads/master Merge: e21579f 1a782b2 Author: Rafael Mendonça França Date: 2012-11-18 17:14:07 -0800 Merge pull request #8266 from CvX/index_rename Add rename_index to change_table. commit 1a782b2 refs/heads/master Author: Jarek Radosz Date: 2012-11-19 01:00:38 +0100 Add rename_index to change_table. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/test/cases/migration/change_table_test.rb commit e21579f refs/heads/master Merge: a739340 92da512 Author: Carlos Antonio da Silva Date: 2012-11-18 21:34:32 -0200 Merge branch 'deprecate-pending' Properly deprecate #pending from AS::TestCase. This has been previously removed from master, and is now back with a deprecation instead, to avoid people having tests breaking when upgrading an app. Please check #4575 for more background. commit 92da512 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 14:24:33 -0200 Properly deprecate #pending from AS::TestCase Check https://github.com/rails/rails/pull/4575#issuecomment-5765575. M activesupport/CHANGELOG.md M activesupport/lib/active_support/testing/pending.rb M activesupport/test/test_case_test.rb commit 4913984 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 14:21:09 -0200 Revert "Merge pull request #4575 from carlosantoniodasilva/remove-test-pending" This reverts commit 1620df78dff527b4fa3f7b204fa05d1b630aae17, reversing changes made to 2d000328dfc0d4b297fb4bdcebc9af6c2fb559dc. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/test_case.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/test_case.rb A activesupport/lib/active_support/testing/pending.rb commit a739340 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-18 16:27:50 -0200 Ensure ordering to make the test pass with postgresql M activerecord/test/cases/relations_test.rb commit 5e7919c refs/heads/master Merge: 5a3e258 22ed92d Author: Carlos Antonio da Silva Date: 2012-11-18 10:17:15 -0800 Merge pull request #8258 from kommen/eager_loading_with_select_test2 Add test to ensure preloading works as expected with "group", "select" and "includes". commit e63a97d refs/heads/master Author: Yves Senn Date: 2012-11-18 18:52:10 +0100 refactor the naming within plugin new generator Having a method called `full?`, which checks on :full and :mountable is very confusing. I renamed `full?` to `engine?` and created a `full?` method that only checks the `:full` option M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb M railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec M railties/lib/rails/generators/rails/plugin_new/templates/Gemfile M railties/lib/rails/generators/rails/plugin_new/templates/Rakefile M railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%.rb commit a1fd9cd refs/heads/master Author: Yves Senn Date: 2012-11-18 17:57:55 +0100 require bundler groups to include rake-tasks in engines If you generate a full engine, this will include rake tasks from your gem under the `app` namespace. For example if you have a dependency on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec` Closes #8229 M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb commit 7cb0c88 refs/heads/master Author: Yves Senn Date: 2012-11-18 18:01:13 +0100 cleanup, remove whitspace from railties CHANGELOG M railties/CHANGELOG.md commit 5a3e258 refs/heads/master Merge: 06dd7e4 61edea0 Author: Rafael Mendonça França Date: 2012-11-18 05:49:18 -0800 Merge pull request #8260 from sauliusg/improved_deprecation_notice Point user to strong_parameters as the new protection model [ci skip] commit 61edea0 refs/heads/master Author: Saulius Grigaliunas Date: 2012-11-18 15:35:06 +0200 Point user to strong_parameters as the new protection model [ci skip] M activemodel/lib/active_model/deprecated_mass_assignment_security.rb commit 06dd7e4 refs/heads/master Merge: aff1872 1f1ccbc Author: Rafael Mendonça França Date: 2012-11-18 05:35:15 -0800 Merge pull request #8259 from senny/make_queued_message_autoloadable make ActionMailer::QueuedMessage autoloadable commit 1f1ccbc refs/heads/master Author: Yves Senn Date: 2012-11-18 14:28:50 +0100 make ActionMailer::QueuedMessage autoloadable M actionmailer/lib/action_mailer.rb commit 22ed92d refs/heads/master Author: Dieter Komendera Date: 2012-11-18 12:16:00 +0100 Add test to ensure preloading works as expected with "select" and "includes". This didn't work in rails 3.1. See #2303 for more information and original pull request. M activerecord/test/cases/relations_test.rb commit e410b5b refs/heads/master Author: Jaime Iniesta Date: 2012-11-18 09:34:59 +0100 Fix broken link in Active Record Query Interface guide M guides/source/active_record_querying.md commit b18fc59 refs/tags/v3.2.15 Author: Mikel Lindsaar Date: 2012-11-18 15:55:33 +1100 Upgrade mail dependency to 2.5.2 M actionmailer/actionmailer.gemspec commit aff1872 refs/heads/master Author: Mikel Lindsaar Date: 2012-11-18 15:54:15 +1100 Upgrade mail dependency to 2.5.2 M actionmailer/actionmailer.gemspec commit 4525b97 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 20:23:44 -0200 Remove not used require and some useless test comments M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/attribute_methods_test.rb commit af43e71 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 22:48:22 -0200 Bump mysql gem version to the newly 2.9.0, fix build. M Gemfile M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit a497f84 refs/tags/v3.2.15 Author: Mikel Lindsaar Date: 2012-11-18 10:43:48 +1100 Upgrade mail dependency to 2.5.0 M actionmailer/actionmailer.gemspec commit 89a00f3 refs/heads/master Author: Mikel Lindsaar Date: 2012-11-18 10:41:16 +1100 Upgrade mail dependency to 2.5.0 M actionmailer/actionmailer.gemspec commit 0b63da9 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 15:21:47 -0200 Initialize #min_cost to avoid warning in Ruby 2.0 M activemodel/lib/active_model/secure_password.rb commit 6c5bd10 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 14:01:35 -0200 Fix typo in module name and make #in_time_zone private M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/dirty_test.rb M activerecord/test/cases/helper.rb commit d4bf1c9 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 13:35:39 -0200 Extract #in_time_zone helper method duplication to a module M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/dirty_test.rb M activerecord/test/cases/helper.rb commit 6d2aade refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 13:16:52 -0200 Simplify helper method in attribute methods test M activerecord/test/cases/attribute_methods_test.rb commit b6a6873 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-17 12:58:32 -0200 Remove return guard M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/test/cases/dirty_test.rb commit 70fa756 refs/heads/master Author: Thomas Hollstegge Date: 2011-09-14 17:32:31 +0200 AR::Base.becomes should not change the STI type If you want to change the STI type too, use AR::Base.becomes! instead M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit ee94128 refs/heads/master Merge: f63545c 506b9f2 Author: Carlos Antonio da Silva Date: 2012-11-17 06:38:25 -0800 Merge pull request #8251 from alexeymuranov/deprecate-removed-fixture-methods Add a deprecation before removing ActiveRecord::Fixtures::find_table_name Removed in e0ef0936193491689724880599ae26a8f5c2b5a6 commit 506b9f2 refs/heads/master Author: Alexey Muranov Date: 2012-11-17 14:53:07 +0100 Add a deprecation before removing find_table_name The `ActiveRecord::Fixtures::find_table_name` method was removed from "master" almost a year ago, but it was never deprecated. Here it comes back, more dead than alive. M activerecord/lib/active_record/fixtures.rb commit f63545c refs/heads/master Merge: 68b0bac 4bb0aa8 Author: Carlos Antonio da Silva Date: 2012-11-17 04:53:34 -0800 Merge pull request #8249 from steveklabnik/add_two_oh_to_travis Add Ruby 2.0 to .travis.yml. commit 4bb0aa8 refs/heads/master Author: Steve Klabnik Date: 2012-11-17 13:44:57 +0100 Add Ruby 2.0 to .travis.yml. @joshk said it's okay. :) M .travis.yml commit 68b0bac refs/heads/master Merge: 02e3684 c0c8792 Author: Carlos Antonio da Silva Date: 2012-11-17 04:29:16 -0800 Merge pull request #8248 from zenspider/master Removed extra call to #diff in #assert_recognizes commit c0c8792 refs/heads/master Author: Ryan Davis Date: 2012-11-17 01:46:37 -0800 Please use assert_equal instead of diff directly M activesupport/lib/active_support/core_ext/hash/diff.rb commit 270d1cf refs/heads/master Author: Ryan Davis Date: 2012-11-17 01:36:30 -0800 Removed extra call to #diff in #assert_recognizes. assert_equal calls it for you and shows the diff. Also delayed message calculation so the cost of the diff on success is now gone. M actionpack/lib/action_dispatch/testing/assertions/routing.rb commit 02e3684 refs/heads/master Merge: 154fee2 716222c Author: Rafael Mendonça França Date: 2012-11-16 21:37:09 -0800 Merge pull request #8247 from rnesius/sqlserver-template Adding sqlserver.yml template to satisfy "-d sqlserver" commit 716222c refs/heads/master Author: Robert Nesius Date: 2012-11-16 23:20:59 -0600 Adding sqlserver.yml template to satisfy "-d sqlserver" being given invocations of "rails new". M railties/CHANGELOG.md A railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml commit 603f538 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-16 23:45:43 -0200 Remove the git option from ruby-prof gem pointing to wycats repo. According to him, at one point his fork was the one that had the call stack printer, and it's in the main repo now. [ci skip] M railties/guides/source/performance_testing.textile commit 154fee2 refs/heads/master Author: Santiago Pastorino Date: 2012-11-16 22:05:25 -0200 Revert "Debugger gem doesn't work with patchlevel >= 327" This reverts commit 0ecd4640664c4723323d6fff5760dc4d833d7eb9. M Gemfile commit ff5d606 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-16 21:50:13 -0200 Add changelog entry for #6003 backport M actionpack/CHANGELOG.md commit 0c7a236 refs/tags/v3.2.15 Author: Andrew White Date: 2012-05-09 11:48:33 +0100 Refactor Generator class to not rely on in-place editing the controller M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 09c4dfa refs/tags/v3.2.15 Author: Nikita Beloglazov Date: 2012-04-26 21:05:56 +0300 Fix bug when url_for changes controller. M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/routing_test.rb commit 7411970 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-16 21:37:02 -0200 Fix some AR changelog entries [ci skip] M activerecord/CHANGELOG.md commit 3e64859 refs/heads/master Author: George Brocklehurst Date: 2012-10-25 23:48:22 +0200 Test for has_many bug on unsaved records See issue #7950. M activerecord/test/cases/associations/has_many_associations_test.rb commit 88a296d refs/tags/v3.2.15 Merge: 666a7e3 b6a2bae Author: Carlos Antonio da Silva Date: 2012-11-16 21:15:34 -0200 Merge pull request #7983 from georgebrock/bug7950-squashed Backport 4bc2ae0 to fix #7950 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb commit 1e9522c refs/heads/master Merge: d56cfad 9c82522 Author: Carlos Antonio da Silva Date: 2012-11-16 15:02:29 -0800 Merge pull request #8244 from yahonda/mysql_ruby200 Now mysql gem can be built on ruby 2.0.0-preview1 commit 9c82522 refs/heads/master Author: Yasuo Honda Date: 2012-11-17 06:41:30 +0900 Revert "mysql does not build on Ruby 2.0.0 at the moment" This reverts commit 8d8fd13179cacd86f307e87396474bdfab9f3462. mysql 2.8.1 gem can be built on ruby 2.0.0-preview1. M Gemfile commit d56cfad refs/heads/master Author: Santiago Pastorino Date: 2012-11-16 19:44:44 -0200 Improve UpgradeSignatureToEncryptionCookieStore docs I suck at English, please help me reviewing this <3 <3 <3 [ci skip] M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 5d239ac refs/heads/master Author: Vijay Dev Date: 2012-11-17 02:00:43 +0530 Remove old comments about using our own sdoc fork [ci skip] M Gemfile commit 7b70eee refs/heads/master Merge: 8eefdb6 1fd008c Author: Vijay Dev Date: 2012-11-17 01:50:49 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb commit 1fd008c refs/heads/master Author: Vijay Dev Date: 2012-11-17 01:13:52 +0530 copy edits and fixes [ci skip] M guides/source/action_view_overview.md M guides/source/active_support_core_extensions.md M guides/source/association_basics.md M guides/source/generators.md M guides/source/rails_application_templates.md commit 578eba0 refs/heads/master Author: Vijay Dev Date: 2012-11-17 01:41:11 +0530 remove kindle link from guides index [ci skip] M guides/source/index.html.erb commit 47411cc refs/heads/master Author: Vijay Dev Date: 2012-11-17 01:29:55 +0530 Revert "Switch to 1.9 hash syntax" This reverts commit d8596c4b8500a899d686c57fa093c549b0378c7a. Reason: too many mistakes [ci skip] M guides/source/asset_pipeline.md commit 2b5b36e refs/heads/master Author: Vijay Dev Date: 2012-11-17 01:13:55 +0530 Revert "add AR deep dive video links to guides" This reverts commit 25648ce35b9d8df9fac81c1d53c45aaeef08fde9. M guides/source/active_record_querying.md commit 8eefdb6 refs/heads/master Author: Santiago Pastorino Date: 2012-11-16 17:17:08 -0200 Add UpgradeSignatureToEncryptionCookieStore This allows easy upgrading from the old signed Cookie Store <= 3.2 or the deprecated one in 4.0 (the ones that doesn't use key derivation) to the new one that signs using key derivation M actionpack/lib/action_dispatch.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M railties/lib/rails/application.rb M railties/test/application/middleware/session_test.rb commit d4b9a3f refs/heads/master Author: Santiago Pastorino Date: 2012-11-16 17:14:48 -0200 Call get_cookie to allow the method to be overriden by subclasses M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 0e2bd1d refs/heads/master Author: Santiago Pastorino Date: 2012-11-16 17:11:40 -0200 Add missing env param to get_cookie M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb commit 571b747 refs/heads/master Author: Santiago Pastorino Date: 2012-11-16 12:05:14 -0200 Remove duplicated get /foo/write_session M railties/test/application/middleware/session_test.rb commit 1acdc4d refs/heads/master Author: Santiago Pastorino Date: 2012-11-16 11:49:12 -0200 Remove unused config option M railties/test/application/middleware/session_test.rb commit d0767ce refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 21:11:34 +0200 Switch to 1.9 hash syntax (guides) M guides/source/upgrading_ruby_on_rails.md commit e258225 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 21:10:27 +0200 Switch to 1.9 hash syntax (guides) M guides/source/testing.md commit 8d06b62 refs/heads/master Merge: de20deb 9a07996 Author: Rafael Mendonça França Date: 2012-11-16 06:18:24 -0800 Merge pull request #8234 from kentaro/bundler-1.2.2 Updated dependency on bundler to ~> 1.2.2 commit 9a07996 refs/heads/master Author: Kentaro Kuribayashi Date: 2012-11-16 23:13:27 +0900 Depend bundler from `=> 1.2.2` to `< 2.0` M rails.gemspec commit 8be3a1a refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 14:48:17 +0200 Update the middleware stack to reflect the current Rails output Specifically, remove `ActionDispatch::Head` in favor of `Rack::Head`. M guides/source/rails_on_rack.md commit de20deb refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-16 10:01:42 -0200 Move changelog entry from #8235 to the top [ci skip] M actionpack/CHANGELOG.md commit 666a7e3 refs/tags/v3.2.15 Author: José Valim Date: 2012-11-16 00:33:14 -0800 Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext Introduce `ActionView::Template::Handlers::ERB.escape_whitelist` Conflicts: actionpack/CHANGELOG.md actionpack/test/template/template_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_view/template/handlers/erb.rb M actionpack/test/template/template_test.rb commit 2bad4d2 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-16 09:44:58 -0200 Remove config.threadsafe! from production env template Closes #8232 [ci skip] M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit f73a05f refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-16 09:35:26 -0200 Refactor url methods a bit Use if..else conditions instead of return guards. Use _ for not used arguments when iterating. Set the path variable directly instead of using an empty string and <<. M actionpack/lib/action_dispatch/http/url.rb commit 8e49fa6 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-16 09:23:59 -0200 Fix failing template tests Introduced in 4a4de567b45ff28035419bc2d92f9b206e3c0a66. M actionpack/test/template/template_test.rb commit 3ad89fc refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:54:25 +0200 Remove unnecessary whitespace M guides/source/rails_on_rack.md commit 991b883 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:35:48 +0200 Add link to the Application Templates guide M guides/source/generators.md commit e7ba7c3 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:31:14 +0200 Remove unnecessary whitespace M guides/source/rails_application_templates.md commit 8b178b3 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:30:12 +0200 Switch to 1.9 hash syntax (guides) M guides/source/rails_application_templates.md commit da7febd refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:28:16 +0200 Switch to 1.9 hash syntax (guides) M guides/source/plugins.md commit 6f54aac refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:26:26 +0200 Switch to 1.9 hash syntax M guides/source/migrations.md commit fe30769 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:22:22 +0200 Switch to 1.9 hash syntax M guides/source/layouts_and_rendering.md commit 17fd344 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:13:29 +0200 Add a consideration note regarding linking to Kindle M guides/source/index.html.erb commit 85482e1 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 12:08:59 +0200 Switch to 1.9 hash syntax & remove some parentheses when it reads nicer M guides/source/generators.md commit 832b1e5 refs/heads/master Merge: 4a4de56 3c4a0b2 Author: Xavier Noria Date: 2012-11-16 01:44:40 -0800 Merge pull request #8236 from marcandre/use_div Use div commit 3c4a0b2 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-16 03:35:42 -0500 Simplify (and optimize) M activesupport/lib/active_support/core_ext/array/grouping.rb commit 4a4de56 refs/heads/master Merge: 44f12bb 5f189f4 Author: José Valim Date: 2012-11-16 00:33:14 -0800 Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext Introduce `ActionView::Template::Handlers::ERB.escape_whitelist` commit 22edb66 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-16 03:20:55 -0500 Use Integer#div instead of Integer#/ to avoid side effects from mathn M activesupport/lib/active_support/core_ext/array/grouping.rb M activesupport/test/core_ext/array_ext_test.rb commit 5f189f4 refs/heads/master Author: Joost Baaij Date: 2012-11-16 09:11:43 +0100 Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. This is a list of mime types where template text is not html escaped by default. It prevents `Jack & Joe` from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist contains text/plain. This follows a whitelist approach where plain text templates are not escaped, and all the others (json, xml) are. The mime type is assumed to be set by the abstract controller. M actionpack/CHANGELOG.md M actionpack/lib/action_view/template/handlers/erb.rb M actionpack/test/template/template_test.rb commit 65c2d2f refs/heads/master Author: Kentaro Kuribayashi Date: 2012-11-16 12:58:29 +0900 Updated dependency for bundler to ~> 1.2.2 M rails.gemspec commit fe66191 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 03:32:40 +0200 Add a consideration note and a WIP note M guides/source/action_view_overview.md commit 21ef4e1 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 03:25:22 +0200 Remove the ActiveRecordHelper section Since ActionView::Helpers::ActiveRecordHelper is removed. M guides/source/action_view_overview.md commit 44f12bb refs/heads/master Author: Santiago Pastorino Date: 2012-11-15 23:08:16 -0200 Remove extra whitespace M actionpack/test/controller/flash_test.rb commit e6e3317 refs/heads/master Author: Santiago Pastorino Date: 2012-11-15 23:06:44 -0200 Add docs for CachingKeyGenerator M activesupport/lib/active_support/key_generator.rb commit d348c43 refs/heads/master Author: Santiago Pastorino Date: 2012-11-15 23:01:29 -0200 Add nodoc to DummyKeyGenerator since it's a private thing M activesupport/lib/active_support/key_generator.rb commit 278e073 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-16 00:20:37 +0200 Switch to 1.9 hash syntax I've intentionally left out some spots as they're the expected output, and since Hash#inspect yields `=>` I guess it may be confusing for beginners to see one syntax in the guide and a different one in their system. M guides/source/form_helpers.md commit 75f6e45 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:56:55 +0200 Switch to 1.9 hash syntax M guides/source/engines.md commit fe44565 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:54:33 +0200 Switch to 1.9 hash syntax M guides/source/debugging_rails_applications.md commit 5e32350 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:52:54 +0200 Switch to 1.9 hash syntax M guides/source/command_line.md commit 699075a refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:51:50 +0200 Switch to 1.9 hash syntax and remove unnecessary punct. M guides/source/caching_with_rails.md commit 4ce1690 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:47:02 +0200 Switch to 1.9 hash syntax plus minor fixes M guides/source/association_basics.md commit 0803d7a refs/heads/master Author: Aaron Patterson Date: 2012-11-15 13:42:35 -0800 arel columns can be used for grouping so that "weird" column names are usable M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/base_test.rb M activerecord/test/schema/schema.rb commit ca71bb8 refs/heads/master Author: Aaron Patterson Date: 2012-11-14 17:17:46 -0800 stop hardcoding FrontBase adapter conditionals M activerecord/lib/active_record/relation/calculations.rb commit f77beac refs/heads/master Author: Aaron Patterson Date: 2012-11-14 17:17:23 -0800 stop passing *args to generate aliases M activerecord/lib/active_record/relation/calculations.rb commit d5a8bdb refs/heads/master Author: Aaron Patterson Date: 2012-11-14 17:08:53 -0800 create fewer relation objects M activerecord/lib/active_record/relation/calculations.rb commit d8596c4 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:35:44 +0200 Switch to 1.9 hash syntax M guides/source/asset_pipeline.md commit 25ac03c refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:31:55 +0200 Properly align some example comments M guides/source/active_support_core_extensions.md commit 000121e refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:10:45 +0200 Switch to 1.9 hash syntax M guides/source/active_record_basics.md commit ba280c6 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:09:28 +0200 Switch to 1.9 hash syntax M guides/source/active_model_basics.md commit 204d3af refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 23:07:34 +0200 Fix 'persons' to 'people' and add some whitespace M guides/source/action_view_overview.md commit 3f8bd32 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 22:43:23 +0200 Switch to 1.9 hash syntax plus minor fixes M guides/source/action_view_overview.md commit f3b95a6 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 22:28:24 +0200 Switch to 1.9 hash syntax M guides/source/active_record_querying.md commit ef8b845 refs/heads/master Merge: cf3eb6d d637839 Author: Santiago Pastorino Date: 2012-11-15 12:17:25 -0800 Merge pull request #8112 from rails/encrypted_cookies Encrypted cookies commit bf9ddc4 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 21:32:56 +0200 Add links to TryGit & official documentation M guides/source/development_dependencies_install.md commit f60a51f refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 21:14:44 +0200 Some minor improvements M guides/source/active_support_core_extensions.md commit c675482 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 21:06:20 +0200 Minor improvements & fixes M guides/source/active_support_core_extensions.md commit 90d780c refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 20:30:23 +0200 Update links to API documentation & add a TODO M guides/source/action_view_overview.md commit 2ff8881 refs/heads/master Author: maximerety Date: 2012-11-15 19:17:53 +0100 Fix another AS::Concern example (class_eval is already called by included) M activesupport/lib/active_support/concern.rb commit d0ba816 refs/heads/master Author: maximerety Date: 2012-11-15 19:16:36 +0100 Fix AS::Concern example (current example doesn't work) M activesupport/lib/active_support/concern.rb commit 3fb67b4 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 20:14:10 +0200 Minor improvements & fixes M guides/source/action_view_overview.md commit 472b25c refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 19:51:50 +0200 Minor improvements & fixes M guides/source/action_view_overview.md commit cf3eb6d refs/heads/master Merge: a8c3ea9 1fab200 Author: Rafael Mendonça França Date: 2012-11-15 15:50:39 -0200 Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backend Make XmlMini.with_backend usable with threads Conflicts: activesupport/CHANGELOG.md commit f2a98a9 refs/tags/v3.2.15 Merge: 492c8de e69058c Author: Rafael Mendonça França Date: 2012-11-15 09:48:06 -0800 Merge pull request #8227 from senny/backport_8139 backport #8139, `plugin new` adds dummy app tasks when necessary commit e69058c refs/tags/v3.2.15 Author: Yves Senn Date: 2012-11-15 18:45:37 +0100 backport #8139, `plugin new` adds dummy app tasks when necessary. … The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. Closes #8224 Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb M railties/lib/rails/generators/rails/plugin_new/templates/Rakefile M railties/test/generators/plugin_new_generator_test.rb commit 00fbee5 refs/tags/v3.2.15 Author: David Padilla Date: 2012-05-10 15:56:13 -0500 Fixes issue #6251 Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy. M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb commit 42707db refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 19:28:03 +0200 Update table of contents as a result of #bf63c4971d73e80739c9f2619a9fa0dfb2223435 M guides/source/action_view_overview.md commit c1a6614 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 19:22:00 +0200 Improve the starting sentence M guides/source/action_view_overview.md commit bf63c49 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 19:13:33 +0200 Move "Using Action View outside of Rails" at the bottom See 8db41ff7698eed542fb09821de37fc7ea1f2bd5d why M guides/source/action_view_overview.md commit c675922 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 19:08:32 +0200 Some minor fixes & improvements M guides/source/action_view_overview.md commit 8db41ff refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 18:56:38 +0200 Add a consideration note I believe this paragraph should move to the end as it's a little out of the scope of Rails guides. M guides/source/action_view_overview.md commit 1fab200 refs/heads/master Author: Nikita Afanasenko Date: 2012-11-14 09:58:33 +0400 Make XmlMini.with_backend usable with threads `XmlMini.with_backend` now may be safely used with threads: Thread.new do XmlMini.with_backend("REXML") { rexml_power } end Thread.new do XmlMini.with_backend("LibXML") { libxml_power } end Each thread will use it's own backend. M activesupport/CHANGELOG.md M activesupport/lib/active_support/xml_mini.rb M activesupport/test/xml_mini_test.rb commit 763c82e refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 16:28:32 +0200 Some minor fixes M guides/source/action_view_overview.md commit 2d7ea2c refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 14:15:13 +0200 Remove unecessary word M guides/source/action_controller_overview.md commit f76b64c refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 14:10:17 +0200 Slightly improve the syntax & grammar M guides/source/action_controller_overview.md commit 168f5b1 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 14:08:09 +0200 Add a note for the example in Setting Custom Headers M guides/source/action_controller_overview.md commit 08bf549 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 13:58:29 +0200 Wrap before & after words in quotes when they're referring to filters Using these words without quotes (example sentence: Before filters are run) can be confusing to a newcomer. M guides/source/action_controller_overview.md commit b3a3870 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 13:51:19 +0200 Slightly improve the syntax M guides/source/action_controller_overview.md commit 688d8bf refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 13:46:09 +0200 Replace "name" with "author" in the Cookies example I think doing `@comments.name` is a little confusing, just doesn't sounds right. M guides/source/action_controller_overview.md commit c15b65d refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 13:33:15 +0200 Minor punctuation improvement in ActionController guide M guides/source/action_controller_overview.md commit a84dd20 refs/heads/master Author: Agis Anastasopoulos Date: 2012-11-15 13:24:36 +0200 Use the more compact syntax in the example M guides/source/action_controller_overview.md commit a8c3ea9 refs/heads/master Author: Xavier Noria Date: 2012-11-15 11:06:35 +0100 let remove_constant still delete Kernel#autoload constants [rounds #8213] The method #remove_const does not load the file, so we can still remove the constant. M activesupport/CHANGELOG.md M activesupport/lib/active_support/dependencies.rb M activesupport/test/dependencies_test.rb commit f732f9b refs/heads/master Merge: bff4d8d dc3ac35 Author: Rafael Mendonça França Date: 2012-11-14 20:05:09 -0800 Merge pull request #8222 from marcandre/avoid_slash Avoid using Integer#/, as it is redefined by the 'mathn' stdlib commit bff4d8d refs/heads/master Author: Xavier Noria Date: 2012-11-15 04:33:17 +0100 dependencies no longer trigger Kernel#autoload in remove_const [fixes #8213] M activesupport/CHANGELOG.md M activesupport/lib/active_support/dependencies.rb A activesupport/test/autoloading_fixtures/should_not_be_required.rb M activesupport/test/dependencies_test.rb commit dc3ac35 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-11-14 16:37:28 -0500 Avoid using Integer#/, as it is redefined by the 'mathn' stdlib M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_test.rb commit 77edb7c refs/heads/master Merge: 71922fe 06faa6d Author: Rafael Mendonça França Date: 2012-11-14 08:01:27 -0800 Merge pull request #8216 from trevorturk/master Use BCrypt's MIN_COST in the test environment for speedier tests commit 06faa6d refs/heads/master Author: Trevor Turk Date: 2012-11-14 09:42:54 -0600 Use BCrypt's MIN_COST in the test environment for speedier tests M activemodel/CHANGELOG.md M activemodel/lib/active_model/railtie.rb M activemodel/lib/active_model/secure_password.rb A activemodel/test/cases/railtie_test.rb M activemodel/test/cases/secure_password_test.rb commit 71922fe refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-14 04:06:32 -0800 Merge pull request #8218 from DawidJanczak/form-tag-doc [ci skip] Correct examples for form_tag helper. Conflicts: actionpack/lib/action_view/helpers/form_tag_helper.rb M actionpack/lib/action_view/helpers/form_tag_helper.rb commit 492c8de refs/tags/v3.2.15 Merge: 1edd358 89a8143 Author: Carlos Antonio da Silva Date: 2012-11-14 04:06:32 -0800 Merge pull request #8218 from DawidJanczak/form-tag-doc [ci skip] Correct examples for form_tag helper. commit 89a8143 refs/tags/v3.2.15 Author: DawidJanczak Date: 2012-11-14 11:56:15 +0000 [ci skip] Correct examples for form_tag helper. M actionpack/lib/action_view/helpers/form_tag_helper.rb commit 25648ce refs/heads/master Author: schneems Date: 2012-11-14 13:26:54 +0200 add AR deep dive video links to guides M guides/source/active_record_querying.md commit e5946e0 refs/heads/master Author: Aaron Patterson Date: 2012-11-13 16:26:22 -0800 asset compilation should not require a database connection M railties/test/application/assets_test.rb commit e5248aa refs/heads/master Author: Aaron Patterson Date: 2012-11-13 14:32:47 -0800 lazily calculate name in the options object M actionpack/lib/action_controller/metal/params_wrapper.rb commit 2a51d6c refs/heads/master Author: Aaron Patterson Date: 2012-11-13 14:26:22 -0800 move include calculation to include method on the options object M actionpack/lib/action_controller/metal/params_wrapper.rb commit 46284a1 refs/heads/master Author: Aaron Patterson Date: 2012-11-13 13:52:01 -0800 model name is lazily evaluated in the options object M actionpack/lib/action_controller/metal/params_wrapper.rb commit d7c7270 refs/heads/master Author: Aaron Patterson Date: 2012-11-13 13:46:06 -0800 move the controller class to the options object M actionpack/lib/action_controller/metal/params_wrapper.rb commit 4729208 refs/heads/master Author: Aaron Patterson Date: 2012-11-13 13:40:29 -0800 attribute_names will always return a list, so just use any? M actionpack/lib/action_controller/metal/params_wrapper.rb commit df3b650 refs/heads/master Author: Aaron Patterson Date: 2012-11-13 13:39:42 -0800 wrap up hash conversion in the constructor M actionpack/lib/action_controller/metal/params_wrapper.rb commit fc29bff refs/heads/master Author: Aaron Patterson Date: 2012-11-13 13:17:41 -0800 use the options object in the wrapper defaults M actionpack/lib/action_controller/metal/params_wrapper.rb commit 95ec448 refs/heads/master Author: Aaron Patterson Date: 2012-11-13 11:38:36 -0800 start using options object M actionpack/lib/action_controller/metal/params_wrapper.rb M actionpack/test/controller/params_wrapper_test.rb commit bf35465 refs/heads/master Author: Aaron Patterson Date: 2012-11-13 10:45:04 -0800 only do hash lookups on options once M actionpack/lib/action_controller/metal/params_wrapper.rb commit 9a64ffc refs/heads/master Author: Aaron Patterson Date: 2012-11-13 10:36:06 -0800 replace present? with any? to reduce dependency on AS M actionpack/lib/action_controller/base.rb M actionpack/lib/action_controller/metal/params_wrapper.rb commit d7536e6 refs/heads/master Author: Daniel Lopes Date: 2012-11-13 17:31:46 -0600 add details on password confirmation used with has_secure_password M activemodel/lib/active_model/secure_password.rb commit 1edd358 refs/tags/v3.2.15 Author: Jon Leighton Date: 2012-03-30 14:37:37 +0100 fix test Conflicts: activerecord/test/cases/locking_test.rb M activerecord/test/cases/locking_test.rb commit 7240202 refs/tags/v3.2.15 Merge: e4e2bcc d3006f3 Author: Rafael Mendonça França Date: 2012-11-13 19:58:26 -0200 Merge pull request #8209 from senny/backport_8176 backport #8176, `#pluck` can be used on a relation with `select` clause. Conflicts: activerecord/CHANGELOG.md commit e4e2bcc refs/tags/v3.2.15 Merge: aac0320 b56376b Author: Rafael Mendonça França Date: 2012-11-13 19:55:26 -0200 Merge pull request #8204 from nikitug/fix_dynamic_finder_result_check Use nil? instead of blank? to check dynamic finder result Conflicts: activerecord/CHANGELOG.md commit 3c5c93b refs/heads/master Merge: 8f6ce1a f945178 Author: Rafael Mendonça França Date: 2012-11-13 13:51:19 -0800 Merge pull request #8169 from nicolasdespres/robust_git_repository_check Rake test:uncommitted finds git directory in ancestors. commit 8f6ce1a refs/heads/master Author: Aaron Patterson Date: 2012-11-13 11:11:11 -0800 backporting Struct#to_h from ruby 2.0 A activesupport/lib/active_support/core_ext/struct.rb A activesupport/test/core_ext/struct_test.rb commit aac0320 refs/tags/v3.2.15 Merge: 5ed0381 05e1466 Author: Carlos Antonio da Silva Date: 2012-11-13 11:06:40 -0800 Merge pull request #8188 from courtland/habtm-fix-stable Fix deleting from a HABTM join table upon destroying an object of a mode... commit 05e1466 refs/tags/v3.2.15 Author: Nick Rogers Date: 2012-03-07 17:16:21 -0500 Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. Fixes #5332. M activerecord/CHANGELOG.md M activerecord/lib/active_record/locking/optimistic.rb M activerecord/test/cases/locking_test.rb A activerecord/test/fixtures/peoples_treasures.yml M activerecord/test/models/person.rb M activerecord/test/schema/schema.rb commit f945178 refs/heads/master Author: Nicolas Despres Date: 2012-11-13 19:05:38 +0100 Add ChangeLog entry. M railties/CHANGELOG.md commit b56376b refs/tags/v3.2.15 Author: Nikita Afanasenko Date: 2012-11-13 21:19:48 +0400 Use nil? instead of blank? to check dynamic finder result It's safe to use `nil?` instead of `blank?` because it's impossible to get an array on finder with bang; `all_by` finder matches against regex without bang: `when /^find_(all_|last_)?by_([_a-zA-Z]\w*)$/`. Fixes #7238 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/test/cases/finder_test.rb M activerecord/test/models/topic.rb commit 9ad8d67 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-13 14:54:47 -0200 Assert the query result instead of checking for nothing raised Nothing should be raised anyway :smile: Thanks @spastorino :heart: https://github.com/rails/rails/pull/8202/files#r2112067 M activerecord/test/cases/finder_test.rb commit 5ed0381 refs/tags/v3.2.15 Merge: 267fb61 fda9075 Author: Rafael Mendonça França Date: 2012-11-13 08:20:38 -0800 Merge pull request #8205 from kennyj/fix_6951-32 Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only database.yml but also DATABASE_URL. commit fda9075 refs/tags/v3.2.15 Author: kennyj Date: 2012-10-31 22:27:57 +0900 Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only database.yml but also DATABASE_URL. M activerecord/CHANGELOG.md M activerecord/lib/active_record/query_cache.rb M activerecord/test/cases/query_cache_test.rb commit 087150d refs/heads/master Merge: 3a33572 8424d0d Author: Carlos Antonio da Silva Date: 2012-11-13 06:59:17 -0800 Merge pull request #8202 from nikitug/regression_test_on_dynamic_finder_result Regression test for #7238 commit d3006f3 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-11-11 17:15:26 +0100 backport #8176, `#pluck` can be used on a relation with `select` clause. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 8424d0d refs/heads/master Author: Nikita Afanasenko Date: 2012-11-13 18:39:07 +0400 Regression test for #7238 M activerecord/test/cases/finder_test.rb M activerecord/test/models/topic.rb commit 3a33572 refs/heads/master Merge: 12990c4 663d9ef Author: Rafael Mendonça França Date: 2012-11-13 06:27:42 -0800 Merge pull request #8176 from senny/7551_pluck_with_select `#pluck` can be used on a relation with `select` clause (#7551) commit 12990c4 refs/heads/master Merge: c940aa6 ff2973a Author: Rafael Mendonça França Date: 2012-11-13 05:06:50 -0800 Merge pull request #8201 from nikitug/regression_test_on_ar_cache_key_precision Add a regression test on #8195 commit 267fb61 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-13 10:08:43 -0200 Revert "Use MiniTest in Ruby 1.8 if it is available." This reverts commit c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f. Reason: too many incompatibilities make a lot of Rails tests fail in 1.9. Might need more work to get this done properly in 3-2 if necessary. M activesupport/CHANGELOG.md M activesupport/lib/active_support/test_case.rb commit cd5b2e1 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-13 10:14:20 -0200 Fix warning with assigned but not used variable M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 47971c8 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-13 09:29:41 -0200 Add changelog entry for #8200 [ci skip] M activesupport/CHANGELOG.md commit 17ccefc refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-12 20:29:15 -0200 Update mocha version to 0.13.0 and change requires M Gemfile M actionpack/test/template/sprockets_helper_test.rb M actionpack/test/template/sprockets_helper_with_routes_test.rb M activerecord/test/cases/helper.rb M activeresource/test/cases/base_test.rb M activesupport/lib/active_support/testing/mochaing.rb M activesupport/lib/active_support/testing/setup_and_teardown.rb M activesupport/test/abstract_unit.rb M railties/test/application/rack/logger_test.rb M railties/test/application/route_inspect_test.rb M railties/test/generators_test.rb commit 25b23d7 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-13 09:17:36 -0200 Fix json encoding test with ruby 1.8.7 and random hash order Introduced in 3e53fe6. M activesupport/test/json/encoding_test.rb commit c940aa6 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-13 08:49:18 -0200 Use new mocha version and add changelog entry for #8180 M Gemfile M activesupport/CHANGELOG.md commit 395d6b4 refs/heads/master Merge: 8f3f50a 57b333e Author: Carlos Antonio da Silva Date: 2012-11-13 02:36:17 -0800 Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0.13-onwards Simplify code by taking advantage of latest mocha (v0.13.0). commit 0ed585a refs/tags/v3.2.15 Merge: 3e53fe6 3791cac Author: Carlos Antonio da Silva Date: 2012-11-13 02:34:42 -0800 Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixes Fix 3-2-stable to work with Mocha v0.13.0 commit 3e53fe6 refs/tags/v3.2.15 Merge: 6189232 be79632 Author: Carlos Antonio da Silva Date: 2012-11-13 02:26:01 -0800 Merge pull request #8199 from senny/backport_8182 backport #8185, `#as_json` isolates options when encoding a hash. commit ff2973a refs/heads/master Author: Nikita Afanasenko Date: 2012-11-13 13:33:45 +0400 Add a regression test on #8195 M activerecord/test/cases/base_test.rb commit 3791cac refs/tags/v3.2.15 Author: James Mead Date: 2012-11-03 17:53:35 +0000 Avoid a Mocha deprecation warning. M activesupport/lib/active_support/testing/mochaing.rb commit 5573c1d refs/tags/v3.2.15 Author: James Mead Date: 2012-08-27 14:16:34 +0100 Fix for Test::Unit Mocha compatibility. Mocha is now using a single AssertionCounter which needs a reference to the testcase as opposed to the result. This change is an unfortunate consequence of the copying of a chunk of Mocha's internal code in order to monkey-patch Test::Unit. M activesupport/lib/active_support/testing/setup_and_teardown.rb commit c3e186e refs/tags/v3.2.15 Author: James Mead Date: 2012-08-26 17:45:26 +0100 Use MiniTest in Ruby 1.8 if it is available. ActiveSupport::TestCase was always inheriting from Test::Unit::TestCase. This works fine in Ruby 1.9 where Test::Unit::TestCase is a thin wrapper around MiniTest::Unit::TestCase, but does not work in Ruby 1.8 if the MiniTest gem is used. What happens is that ActiveSupport inherits from the Test::Unit::TestCase provided by the standard library, but then since Minitest is defined, it then seems to proceed on the assumption that ActiveSupport::TestCase has MiniTest::Unit::TestCase in its ancestor chain. However, in this case it does not. The fix is simply to choose which test library TestCase to inherit from using the same logic used elsewhere to detect MiniTest. I noticed this bug causing issues when using MiniTest and Mocha in Ruby 1.8, but there may well be other issues. M activesupport/lib/active_support/test_case.rb commit 716bdfc refs/tags/v3.2.15 Author: James Mead Date: 2012-08-26 16:32:47 +0100 Copy Mocha bug fix. A bug was fixed [1] in Mocha's integration with Test::Unit, but this monkey-patching code was copied before the fix. We need to copy the fixed version. The bug meant that an unexpected invocation against a mock within the teardown method caused a test *error* and not a test *failure*. [1] https://github.com/freerange/mocha/commit/f1ff6475ca2871f2977ab84cabbbfe2adadbbee6#diff-5 M activesupport/lib/active_support/testing/setup_and_teardown.rb commit be79632 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-11-12 14:33:20 +0100 backport #8185, `#as_json` isolates options when encoding a hash. Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash. Conflicts: activesupport/CHANGELOG.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/json/encoding.rb M activesupport/test/json/encoding_test.rb commit 8f3f50a refs/heads/master Author: Aaron Patterson Date: 2012-11-12 18:17:06 -0800 Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag this file with us-ascii M actionpack/test/template/template_test.rb commit d5c4370 refs/heads/master Merge: 85cc712 78dca35 Author: Carlos Antonio da Silva Date: 2012-11-12 17:53:17 -0800 Merge pull request #8185 from senny/8182_as_json_options_stick_around `#as_json` isolates options when encoding a hash. Closes #8182 commit 6189232 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-12 23:48:32 -0200 Lock mocha in ~> 0.12.x until we fix the Ruby 1.8.7 issues with 0.13.0 M Gemfile commit 85cc712 refs/heads/master Author: Aaron Patterson Date: 2012-11-12 17:24:10 -0800 only clear caches if we are actually connected to the database M activerecord/lib/active_record/railtie.rb commit 7864f83 refs/heads/master Author: Matthew Robertson Date: 2012-11-12 17:16:28 -0800 Updated the preformance_testing guide to reflect the fact that prof-rails no longer needs to be fetched from github M guides/source/performance_testing.md commit ac49e02 refs/tags/v3.2.15 Merge: 505bf59 69455e7 Author: Rafael Mendonça França Date: 2012-11-12 16:45:31 -0800 Merge pull request #8193 from claudiob/add_rails329_release_date Add release date of Rails 3.2.9 to documentation [ci skip] commit 69455e7 refs/tags/v3.2.15 Author: claudiob Date: 2012-11-12 16:07:36 -0800 Add release date of Rails 3.2.9 to documentation M actionmailer/CHANGELOG.md M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M activeresource/CHANGELOG.md M activesupport/CHANGELOG.md M railties/CHANGELOG.md commit 5287d36 refs/heads/master Author: Xavier Noria Date: 2012-11-12 22:51:51 +0100 depend on voloko/sdoc again voloko/sdoc seems to be maintained again, in particular the issues that made us fork it are resolved. M Gemfile commit 2a8b673 refs/heads/master Merge: 0ecd464 5359ad9 Author: Carlos Antonio da Silva Date: 2012-11-12 08:52:31 -0800 Merge pull request #8184 from vipulnsward/add_merge_tests Merge and add tests related to #5215 commit 505bf59 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-10 05:41:58 -0800 Merge pull request #8154 from bogdan/has_one_association_performance Remove unwanted transaction when has one association is built Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_one_association.rb M activerecord/test/cases/associations/has_one_associations_test.rb commit 8132bb6 refs/heads/master Author: Guillermo Iguaran Date: 2012-11-12 11:35:06 -0500 Update production.rb: Split long comment in two lines M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 40f5f31 refs/heads/master Author: Guillermo Iguaran Date: 2012-11-12 11:19:20 -0500 Update production.rb documentation: only files in app/assets are in config.assets.precompile M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 0d27da5 refs/tags/v3.2.15 Merge: 5f50847 b33cf74 Author: Santiago Pastorino Date: 2012-11-12 13:29:31 -0200 Merge branch '3-2-9' into 3-2-stable commit 663d9ef refs/heads/master Author: Yves Senn Date: 2012-11-11 17:15:26 +0100 `#pluck` can be used on a relation with `select` clause. Closes #7551 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit b33cf74 refs/tags/v3.2.9 (tag: v3.2.9) Author: Santiago Pastorino Date: 2012-11-12 13:19:09 -0200 Bump to 3.2.9 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 0ecd464 refs/heads/master Author: Santiago Pastorino Date: 2012-11-12 13:13:27 -0200 Debugger gem doesn't work with patchlevel < 327 M Gemfile commit d5ac280 refs/heads/master Author: Yves Senn Date: 2012-11-11 17:13:33 +0100 cleanup, removed whitespace from CHANGELOG M activerecord/CHANGELOG.md commit 78dca35 refs/heads/master Author: Yves Senn Date: 2012-11-12 14:33:20 +0100 `#as_json` isolates options when encoding a hash. Closes #8182 Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash. M activesupport/CHANGELOG.md M activesupport/lib/active_support/json/encoding.rb M activesupport/test/json/encoding_test.rb commit 5359ad9 refs/heads/master Author: Vipul A M Date: 2012-11-12 18:13:20 +0530 Merge and add tests related to 5215 M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 57b333e refs/heads/master Author: James Mead Date: 2012-11-12 09:34:21 +0000 Simplify code by taking advantage of latest mocha (v0.13.0). This only works with mocha v0.13.0 or later. Note that this also fixes a few subtle bugs present in the current implementation :- * Mocha was raising a `MiniTest::Assertion` instead of a `Mocha::ExpectationError` as intended. The latter is not recognized by MiniTest as an assertion failure and so it is recorded as a test *error*, not a test *failure* as it ought to. This leads to potentially confusing output in the test results. * Mocha verification should happen as part of the test. The verification of expectations is equivalent to a set of assertions. These assertions should happen as *part of* the test so that they have a chance to cause the test to fail, and not just as part of the teardown. Also if an assertion fails during the test, then there is no need to verify expectations, because only the first assertion failure is normally reported and all subsequent bets are off. * Expectation verification should be counted as an assertion. Mocha cannot record each expectation verification as an assertion, because we weren't passing in an assertion counter to `#mocha_verify`. M activesupport/lib/active_support/test_case.rb D activesupport/lib/active_support/testing/mocha_module.rb commit 2f3d81c refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-11 17:03:55 -0200 Remove duplicated ConnectionHandling extension in AR::Base Thanks @toretore. https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#commitcomment-2134706 M activerecord/lib/active_record/base.rb commit f9dc917 refs/heads/master Merge: eda34c4 d2abfcb Author: Carlos Antonio da Silva Date: 2012-11-11 06:07:19 -0800 Merge pull request #8173 from nikitug/match_classes_without_to_s Match classes without to_s conversions. commit d2abfcb refs/heads/master Author: Nikita Afanasenko Date: 2012-11-11 16:53:39 +0400 Match classes without to_s conversions. There is no need in `value_under_case.class.to_s` conversion since case already matches classes with `Class === value_under_case`. M activesupport/lib/active_support/core_ext/hash/conversions.rb commit eda34c4 refs/heads/master Merge: c49fff9 63ee59d Author: Santiago Pastorino Date: 2012-11-11 04:46:06 -0800 Merge pull request #8172 from nikitug/silent_diff_deprecation Test Hash#diff deprecation, also prevent deprecation message in AS tests commit c49fff9 refs/heads/master Merge: 12d6d3a 5ff5cce Author: Santiago Pastorino Date: 2012-11-11 04:44:39 -0800 Merge pull request #8170 from arunagw/warning_removed_railties Removing warning : ambiguous first argument commit 63ee59d refs/heads/master Author: Nikita Afanasenko Date: 2012-11-11 16:06:26 +0400 Test Hash#diff deprecation, also prevent deprecation message in AS tests M activesupport/test/core_ext/hash_ext_test.rb commit 5ff5cce refs/heads/master Author: Arun Agrawal Date: 2012-11-11 15:16:35 +0530 Removing warning : ambiguous first argument M railties/test/application/initializers/frameworks_test.rb commit 8dabfbe refs/heads/master Author: burningTyger Date: 2012-11-10 23:00:00 +0100 use em-dashes instead of two minuses in guides M guides/source/action_controller_overview.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/development_dependencies_install.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/security.md M guides/source/testing.md commit 12d6d3a refs/heads/master Author: Jon Leighton Date: 2012-11-10 21:41:31 +0000 Make ActiveRecord::Delegation#method_missing threadsafe Two threads may be in method_missing at the same time. If so, they might both try to define the same delegator method. Such a situation probably wouldn't result in a particularly spectacular bug as one method would probably just be overridden by an identical method, but it could cause warnings to pop up. (It could be worse if method definition is non-atomic in a particular implementation.) (We will also need this mutex shortly anyway, see #8127.) M activerecord/lib/active_record/relation/delegation.rb commit 46100f0 refs/heads/master Author: burningTyger Date: 2012-11-10 22:18:18 +0100 make comments fit the comment boxes (mostly) in API doc guides M guides/source/api_documentation_guidelines.md commit 8553b7a refs/heads/master Author: AvnerCohen Date: 2012-11-10 22:15:13 +0200 1.9 hash syntax in activesupport M activesupport/lib/active_support/notifications.rb commit df82296 refs/heads/master Author: Nicolas Despres Date: 2012-11-10 00:08:30 +0100 Rake test:uncommitted finds git directory in ancestors. Sometimes your git directory is an ancestor of your application root directory. For example: ./repo/.git/ ./repo/app/Rakefile In this case rake test:uncommitted will be unable to detect your SCM. This patch fixes this and add a test. M railties/lib/rails/test_unit/testing.rake M railties/test/application/rake_test.rb commit 8ec5166 refs/heads/master Author: Vijay Dev Date: 2012-11-10 22:44:35 +0530 recent railties changes added to the release notes [ci skip] M guides/source/4_0_release_notes.md commit 3a76ee4 refs/heads/master Author: Vijay Dev Date: 2012-11-03 02:16:30 +0530 update turbolinks readme link [ci skip] M guides/source/working_with_javascript_in_rails.md commit 62039ad refs/heads/master Merge: e803f3a c33c991 Author: Carlos Antonio da Silva Date: 2012-11-10 07:34:53 -0800 Merge pull request #8165 from arunagw/warning_removed_unused_variables Removing warning : assigned but unused variable commit 890da51 refs/heads/master Author: AvnerCohen Date: 2012-11-10 17:16:21 +0200 1.9 Syntax related changes M activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/errors.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/locking/pessimistic.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/lib/active_record/relation/spawn_methods.rb M activerecord/lib/active_record/sanitization.rb M activerecord/lib/active_record/serializers/xml_serializer.rb M activerecord/lib/active_record/transactions.rb commit e803f3a refs/heads/master Merge: a002442 3cb0f3f Author: Carlos Antonio da Silva Date: 2012-11-10 05:41:58 -0800 Merge pull request #8154 from bogdan/has_one_association_performance Remove unwanted transaction when has one association is built commit 3cb0f3f refs/heads/master Author: Bogdan Gusiev Date: 2012-11-10 15:30:20 +0200 Do not create useless database transaction when building `has_one` association. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_one_association.rb M activerecord/test/cases/associations/has_one_associations_test.rb commit b6a2bae refs/tags/v3.2.15 Author: George Brocklehurst Date: 2012-10-25 23:48:22 +0200 Test/changelog for has_many bug on unsaved records See issue #7950. The previous commit fixes this bug, and is a backport of 4bc2ae0da1dd812aee759f6d13ad428354cd0e13. M activerecord/CHANGELOG.md M activerecord/test/cases/associations/has_many_associations_test.rb commit a3cf03e refs/tags/v3.2.15 Author: Aaron Patterson Date: 2012-02-27 10:57:40 -0800 use bind values for join columns This is a backport of 4bc2ae0da1dd812aee759f6d13ad428354cd0e13. It fixes bug #7950. Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/lib/active_record/relation/finder_methods.rb M activerecord/lib/active_record/associations/association_scope.rb M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/relation/calculations.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/lib/active_record/relation/spawn_methods.rb commit c33c991 refs/heads/master Author: Arun Agrawal Date: 2012-11-10 17:34:39 +0530 Removing warning : assigned but unused variable M railties/lib/rails/commands/dbconsole.rb M railties/test/commands/console_test.rb commit a002442 refs/heads/master Merge: 90a1721 410e887 Author: Carlos Antonio da Silva Date: 2012-11-10 02:16:40 -0800 Merge pull request #8164 from nikitug/keep_serialization_in_its_module Keep the code related to serialization in Serialization module. commit 410e887 refs/heads/master Author: Nikita Afanasenko Date: 2012-11-10 01:45:43 +0400 Keep the code related to serialization in Serialization module. We should not need any `serialized_attributes` checks outside `ActiveRecord::AttributeMethods::Serialization` module. M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/serialization.rb commit dcf401e refs/heads/master Author: Will Gray Date: 2012-11-09 15:10:39 -0600 Update guides/source/rails_application_templates.md Add `#environment` M guides/source/rails_application_templates.md commit 407e7d4 refs/heads/master Author: Will Gray Date: 2012-11-09 15:09:50 -0600 Update guides/source/rails_application_templates.md Update function signatures for `#gem` and `#generate`. M guides/source/rails_application_templates.md commit 90a1721 refs/heads/master Merge: 38411b8 ba291a6 Author: Rafael Mendonça França Date: 2012-11-09 11:27:25 -0800 Merge pull request #8162 from fimmtiu/master Trivial documentation fix for ActiveModel::Naming comment [ci skip] commit ba291a6 refs/heads/master Author: Dennis Taylor Date: 2012-11-09 11:23:51 -0800 Trivial documentation fix for ActiveModel::Naming comment. M activemodel/lib/active_model/naming.rb commit 9a389cc refs/tags/v3.2.9 Author: Santiago Pastorino Date: 2012-11-09 16:27:18 -0200 Revert "Add test case to assets eager load" This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5. M railties/test/application/paths_test.rb commit 5f50847 refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2012-11-09 16:27:18 -0200 Revert "Add test case to assets eager load" This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5. M railties/test/application/paths_test.rb commit c50c8c1 refs/tags/v3.2.15 Merge: 68e001f db1d5f4 Author: Santiago Pastorino Date: 2012-11-09 16:05:18 -0200 Merge branch '3-2-9' into 3-2-stable commit db1d5f4 refs/tags/v3.2.9.rc3 (tag: v3.2.9.rc3) Author: Santiago Pastorino Date: 2012-11-09 15:51:03 -0200 Bump up to 3.2.9.rc3 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 1baae1d refs/tags/v3.2.9.rc3 Author: Rafael Mendonça França Date: 2012-11-09 09:39:06 -0800 Merge pull request #8161 from guilleiguaran/downgrade-sprockets Lock sprockets to 2.2.x REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release. In a next release we can relax the dependency again. See #8099 for more information. M actionpack/actionpack.gemspec commit 38411b8 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-09 15:40:52 -0200 Use get in the redirection doc examples get is the most common usage, and match without an explicit verb was disallowed in 56cdc81c08b1847c5c1f699810a8c3b9ac3715a6. [ci skip] M actionpack/lib/action_dispatch/routing/redirection.rb commit 68e001f refs/tags/v3.2.15 Merge: a99d542 d1d5228 Author: Rafael Mendonça França Date: 2012-11-09 09:39:06 -0800 Merge pull request #8161 from guilleiguaran/downgrade-sprockets Lock sprockets to 2.2.x REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release. In a next release we can relax the dependency again. See #8099 for more information. commit a99d542 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-09 15:34:26 -0200 Fix redirect example block See #8160. [ci skip] M actionpack/lib/action_dispatch/routing/redirection.rb commit d1d5228 refs/tags/v3.2.15 Author: Guillermo Iguaran Date: 2012-11-09 12:20:34 -0500 Lock sprockets to 2.2.x M actionpack/actionpack.gemspec commit d89b03a refs/heads/master Author: Cesar Carruitero Date: 2012-11-09 11:40:26 -0500 update syntax and add note about prompt use of HttpHelpers [ci-skip] M actionpack/lib/action_dispatch/routing/mapper.rb commit 42cfacf refs/remotes/origin/schema-migrations-metadata Author: Andrew White Date: 2012-11-09 15:21:05 +0000 Gracefully handle upgrading apps with mass assigment configs Most apps upgrading from 3.x will have options for mass assigment in their application.rb and environments/*.rb config files. Rather than just raising a NoMethodError when copying the config, this commit adds a warning message until either the protected_attributes gem is installed or the relevant config options are removed. M activerecord/lib/active_record/railtie.rb commit 477cf31 refs/heads/master Author: Cesar Carruitero Date: 2012-11-09 10:30:10 -0500 correct link syntax [ci-skip] M actionpack/lib/action_dispatch/routing/mapper.rb commit 0500bec refs/heads/master Author: Cesar Carruitero Date: 2012-11-09 10:21:34 -0500 change rdoc syntax for adecuate render [ci-skip] M actionpack/lib/action_dispatch/routing/redirection.rb commit 054578a refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2012-11-09 13:15:09 -0200 Revert "Respect children paths filter settings" This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146 M railties/CHANGELOG.md M railties/lib/rails/paths.rb commit fc5ccd2 refs/tags/v3.2.9.rc3 Author: Santiago Pastorino Date: 2012-11-09 13:15:09 -0200 Revert "Respect children paths filter settings" This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146 M railties/CHANGELOG.md M railties/lib/rails/paths.rb commit e56b890 refs/remotes/origin/schema-migrations-metadata Merge: 9622b3f 88d59de Author: Carlos Antonio da Silva Date: 2012-11-09 07:05:41 -0800 Merge pull request #8158 from steveklabnik/deprecate_diff Deprecate Hash#diff. commit 88d59de refs/remotes/origin/schema-migrations-metadata Author: Steve Klabnik Date: 2012-11-09 15:24:05 +0100 Deprecate Hash#diff. It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more M actionpack/lib/action_dispatch/testing/assertions/routing.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/diff.rb commit 9622b3f refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-09 12:44:58 -0200 Remove not used load hooks for active_record_config These were removed with ActiveRecord::Model in https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#L15L156 M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/timestamp.rb commit 1489303 refs/remotes/origin/schema-migrations-metadata Author: Jon Leighton Date: 2012-11-09 14:39:36 +0000 fix warnings M activerecord/lib/active_record/associations/collection_proxy.rb commit c3ca7ac refs/remotes/origin/schema-migrations-metadata Author: Jon Leighton Date: 2012-11-09 14:36:58 +0000 Properly deprecate ConnectionHandler#connection_pools Rather than just changing it and hoping for the best. Requested by @jeremy: https://github.com/rails/rails/commit/ba1544d71628abff2777c9c514142d7e9a159111#commitcomment-2106059 M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit d2a0781 refs/heads/master Author: Steve Klabnik Date: 2012-11-09 15:19:40 +0100 Further explain the CDN and caching situation. M guides/source/asset_pipeline.md commit e85cb2d refs/heads/master Author: Steve Klabnik Date: 2012-11-09 15:13:18 +0100 Add note about asset pipeline and CDNs. Fixes #2468. M guides/source/asset_pipeline.md commit 4d61d1f refs/heads/master Author: Steve Klabnik Date: 2012-11-09 14:52:56 +0100 Fix default cache store documentation. It's actually the FileStore. Fixes #8130. M guides/source/caching_with_rails.md commit 52538dd refs/remotes/origin/schema-migrations-metadata Merge: dbb39e5 c4e3b0c Author: Rafael Mendonça França Date: 2012-11-09 05:52:28 -0800 Merge pull request #8157 from steveklabnik/remove_callback_duplication Removing duplication in callback normalization. commit c4e3b0c refs/remotes/origin/schema-migrations-metadata Author: Steve Klabnik Date: 2012-11-09 14:41:11 +0100 Removing duplication in callback normalization. These two things were 100% identical. M actionpack/lib/abstract_controller/callbacks.rb commit dbb39e5 refs/remotes/origin/schema-migrations-metadata Merge: edd94ce 710e371 Author: Jon Leighton Date: 2012-11-09 05:42:04 -0800 Merge pull request #8116 from senny/7993_configure_counter_cache_for_has_many :counter_cache option for to support custom named counter caches commit edd94ce refs/remotes/origin/schema-migrations-metadata Author: Jon Leighton Date: 2012-11-09 12:09:37 +0000 Delegate all calculations to the scope. So that the scope may be a NullRelation and return a result without executing a query. Fixes #7928 M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/null_relation.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 654a2de refs/heads/master Author: James Coglan Date: 2012-10-23 20:15:53 +0100 Store FlashHashes in the session as plain hashes rather than custom objects with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize. Fix session['flash'] deletion condition: it will never be empty?, it will either be nil or a hash with 'discard' and 'flashes' keys. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/middleware/flash.rb M actionpack/test/controller/flash_hash_test.rb commit 11b846e refs/remotes/origin/schema-migrations-metadata Author: Jon Leighton Date: 2012-11-09 11:40:33 +0000 CollectionProxy#pluck issues no query for a new_record? owner Fixes #8102. I couldn't find a nicer way to deal with this than delegate the call to #scope, which will be a NullRelation when we want it to be. M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit aae4f35 refs/remotes/origin/schema-migrations-metadata Author: Jon Leighton Date: 2012-11-09 11:27:46 +0000 Nullify the relation at a more general level. This allows us to avoid hacks like the "return 0 if owner.new_record?" in #count (which this commit removes). Also, the relevant foreign key may actually be present even on a new owner record, in which case we *don't* want a null relation. This logic is encapsulated in the #null_scope? method. We also need to make sure that the CollectionProxy is not 'infected' with the NullRelation module, or else the methods from there will override the definitions in CollectionProxy, leading to incorrect results. Hence the nullify: false option to CollectionAssociation#scope. (This feels a bit nasty but I can't think of a better way.) M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/null_relation.rb commit 6710f05 refs/remotes/origin/schema-migrations-metadata Merge: 636ae13 759b03e Author: Carlos Antonio da Silva Date: 2012-11-09 03:29:13 -0800 Merge pull request #8151 from nashby/forwardable delegate PathSet's enumerator methods commit 636ae13 refs/remotes/origin/schema-migrations-metadata Merge: 0130c17 3bc3842 Author: Carlos Antonio da Silva Date: 2012-11-09 03:11:23 -0800 Merge pull request #8153 from steveklabnik/fix_include_blank Fix message about include_blank option. [ci skip] commit c7ef6b6 refs/tags/v3.2.15 Merge: 90a5ec7 8dbf5a4 Author: Carlos Antonio da Silva Date: 2012-11-09 03:01:34 -0800 Merge pull request #8082 from nikitug/backport_serialized_attributes_before_type_cast Backport #8078: Fix `attributes_before_type_cast` for serialised attributes commit 0130c17 refs/remotes/origin/schema-migrations-metadata Author: Jon Leighton Date: 2012-11-09 10:35:39 +0000 Relations built off collection associations with an unsaved owner should be null relations For example, the following should not run any query on the database: Post.new.comments.where(body: 'omg').to_a # => [] Fixes #5215. M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit c33cfa6 refs/remotes/origin/schema-migrations-metadata Merge: dd0040d c980af6 Author: Xavier Noria Date: 2012-11-09 01:43:08 -0800 Merge pull request #8152 from steveklabnik/squashing_guide Add note about squashing in contributor guide. commit 759b03e refs/remotes/origin/schema-migrations-metadata Author: Vasiliy Ermolovich Date: 2012-11-09 09:52:38 +0300 delegate PathSet's enumerator methods M actionpack/lib/action_view/path_set.rb commit c980af6 refs/remotes/origin/schema-migrations-metadata Author: Steve Klabnik + Katrina Owen Date: 2012-11-09 09:23:27 +0100 Add note about squashing in contributor guide. We tell people how to do this all the time in the Issues tracker, so now we can just point them here. M guides/source/contributing_to_ruby_on_rails.md commit 3bc3842 refs/remotes/origin/schema-migrations-metadata Author: Steve Klabnik + Katrina Owen Date: 2012-11-09 09:31:22 +0100 Fix message about include_blank option. See https://github.com/rails/rails/commit/cb7d19b66badfbd1846c195913419c331701074e#commitcomment-2127148. M actionpack/lib/action_view/helpers/form_options_helper.rb commit 8dbf5a4 refs/tags/v3.2.15 Author: Nikita Afanasenko Date: 2012-10-31 00:14:16 +0400 Backport #8078: Fix `attributes_before_type_cast` for serialised attributes. Public method attributes_before_type_cast used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like read_attribute_before_type_cast and returns unserialised values. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/test/cases/base_test.rb commit dd0040d refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-09 14:28:22 +0900 implement to_a and to_ary so that the Array() call in template.rb will not raise so many exceptions: https://github.com/rails/rails/blob/master/actionpack/lib/action_view/template.rb#L126 irb(main):001:0> class Foo; def method_missing(*args); super; end end => nil irb(main):002:0> $DEBUG = true => true irb(main):003:0> Array(Foo.new) Exception `NoMethodError' at (irb):1 - undefined method `to_ary' for # Exception `NoMethodError' at (irb):1 - undefined method `to_a' for # => [#] irb(main):004:0> M actionpack/lib/action_dispatch/http/mime_type.rb commit 3ae8d6d refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-09 13:49:46 +0900 make the extremely useful logs debug level M railties/lib/rails/rack/logger.rb commit e61ffe0 refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-09 13:45:51 +0900 copy the log level from the config settings M railties/lib/rails/commands/server.rb commit b67a03c refs/remotes/origin/schema-migrations-metadata Merge: 72f5085 346ccf3 Author: Carlos Antonio da Silva Date: 2012-11-08 18:10:54 -0800 Merge pull request #7763 from route/full-capture Kernel#capture replaced by version which can catch output from subprocesses commit 72f5085 refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-09 10:31:23 +0900 rm dead code M activemodel/lib/active_model/forbidden_attributes_protection.rb commit fd16cb3 refs/remotes/origin/schema-migrations-metadata Merge: 4842839 a96a176 Author: Rafael Mendonça França Date: 2012-11-08 16:18:09 -0800 Merge pull request #8147 from gbchaosmaster/gemspec Reformat gemspec commit 4842839 refs/remotes/origin/schema-migrations-metadata Author: Jon Leighton Date: 2012-11-09 00:13:42 +0000 Revert "Merge pull request #8017 from jcoglan/objectless_sessions" This reverts commit 36376560fdd02f955ae3bf6b7792b784443660ad, reversing changes made to 3148ed9a4bb7efef30b846dc945d73ceebcc3f0f. Conflicts: actionpack/lib/action_dispatch/middleware/flash.rb Reason: it broke Sam's CI https://github.com/rails/rails/pull/8017#issuecomment-10210655 M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/middleware/flash.rb M actionpack/test/controller/flash_hash_test.rb commit a96a176 refs/remotes/origin/schema-migrations-metadata Author: Vinny Diehl Date: 2012-11-08 14:51:18 -0500 Clean up gemspecs Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes. M actionmailer/actionmailer.gemspec M actionpack/actionpack.gemspec M activemodel/activemodel.gemspec M activerecord/activerecord.gemspec M activesupport/activesupport.gemspec M rails.gemspec M railties/railties.gemspec commit 90a5ec7 refs/tags/v3.2.15 Author: Carlos Antonio da Silva Date: 2012-11-01 04:42:55 -0700 Merge pull request #8093 from nikitug/keep_app_x_ua_compatible Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/best_standards_support.rb A actionpack/test/dispatch/best_standards_support_test.rb commit 3d25292 refs/tags/v3.2.15 Author: Xavier Noria Date: 2012-10-29 02:17:11 -0700 Merge pull request #8027 from daenney/master Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error. Conflicts: activesupport/CHANGELOG.md guides/source/active_support_core_extensions.md M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/file/atomic.rb M railties/guides/source/active_support_core_extensions.textile commit 3738ef2 refs/heads/master Author: Cesar Carruitero Date: 2012-11-08 17:16:38 -0500 correct double quotes for interpolation in routing guide [ci_skip] M guides/source/routing.md commit 5fe385b refs/heads/master Author: Cesar Carruitero Date: 2012-11-08 17:12:23 -0500 change match to get and add single quotes in routing/redirection [ci-skip] M actionpack/lib/action_dispatch/routing/redirection.rb commit 648a95b refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-08 20:15:35 -0200 Remove free usage of #tap M actionpack/lib/action_dispatch/middleware/flash.rb commit 3637656 refs/remotes/origin/schema-migrations-metadata Merge: 3148ed9 76a0237 Author: Jon Leighton Date: 2012-11-08 13:59:57 -0800 Merge pull request #8017 from jcoglan/objectless_sessions Store FlashHashes in the session as plain hashes commit 6eb4271 refs/heads/master Author: Malcolm Locke Date: 2012-11-09 10:21:03 +1300 Action mailer can take an array for template_dir M guides/source/action_mailer_basics.md commit 3c58018 refs/heads/master Author: AvnerCohen Date: 2012-11-08 23:16:54 +0200 1.9 hash syntax changes M activerecord/lib/active_record/aggregations.rb M activerecord/lib/active_record/associations.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/lib/active_record/connection_handling.rb M activerecord/lib/active_record/core.rb commit c04abba refs/heads/master Author: Cesar Carruitero Date: 2012-11-08 16:04:20 -0500 fix bugs in rails_on_rack [ci-skip] M guides/source/rails_on_rack.md commit 5222a33 refs/tags/v3.2.15 Merge: 70f384e d12e753 Author: Rafael Mendonça França Date: 2012-11-08 12:34:15 -0800 Merge pull request #8149 from senny/backport_7842_to_rails_3_2_stable backport: handle trailing slash with engines commit d12e753 refs/tags/v3.2.15 Author: Yves Senn Date: 2012-11-04 14:59:15 +0100 backport, handle trailing slash with engines this is a backport of #8115 to fix #7842 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/prefix_generation_test.rb commit 3148ed9 refs/remotes/origin/schema-migrations-metadata Merge: 772883c ff3ab8a Author: Rafael Mendonça França Date: 2012-11-08 11:50:08 -0800 Merge pull request #8115 from senny/7842_handle_trailing_slash_with_engines handle trailing slash with engines (test case for #7842) commit 70f384e refs/tags/v3.2.15 Merge: dbd0b12 16d98b2 Author: Santiago Pastorino Date: 2012-11-08 10:49:33 -0800 Merge pull request #7987 from alexisbernard/3-2_find_in_batches_compatible_with_strings Fix find_in_batches with customized primary_key on 3-2-stable commit 772883c refs/remotes/origin/schema-migrations-metadata Merge: f8ca941 6876f4a Author: Rafael Mendonça França Date: 2012-11-08 09:27:36 -0800 Merge pull request #8145 from sobrinho/master Add test to avoid regression of 58e48d5 commit 6876f4a refs/remotes/origin/schema-migrations-metadata Author: Gabriel Sobrinho & Ricardo Henrique Date: 2012-11-08 15:19:44 -0200 Add test to avoid regression of 58e48d5292242f000dc8a87fdbb1c0ccdcf286d8 M activerecord/test/cases/nested_attributes_test.rb commit dbd0b12 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-08 15:07:58 -0200 Use a more descriptive test name M activerecord/test/cases/nested_attributes_test.rb commit 16d98b2 refs/tags/v3.2.15 Author: Alexis Bernard Date: 2012-10-30 15:54:16 +0100 Fix find_in_batches against string IDs when start option is not specified. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/batches.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit f8ca941 refs/remotes/origin/schema-migrations-metadata Author: Rafael Mendonça França Date: 2012-11-08 14:37:15 -0200 Add CHANGELOG entry for #8108 on master too. [ci skip] M actionpack/CHANGELOG.md commit cae0879 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-08 14:35:42 -0200 Fix the release in the CHANGELOG [ci skip] M activerecord/CHANGELOG.md commit 2a6f208 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-02 15:21:35 -0700 Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag Support :multiple option on input tags that also have :index Conflicts: actionpack/lib/action_view/helpers/tags/base.rb actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/test/template/form_helper_test.rb commit 7031e36 refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2012-09-22 10:57:54 -0300 Fix test_find_in_batches_should_use_any_column_as_primary_key M activerecord/test/cases/batches_test.rb commit 9673735 refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2012-09-21 19:42:14 -0300 start could be a string Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and eb876c4d07130f15be2cac7be968cc393f959c62 Conflicts: activerecord/lib/active_record/relation/batches.rb activerecord/test/cases/batches_test.rb M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit b025567 refs/tags/v3.2.15 Merge: e41d78c 58e48d5 Author: Rafael Mendonça França Date: 2012-11-08 08:17:43 -0800 Merge pull request #8138 from sobrinho/3-2-stable Fix accepts_nested_attributes for child classes commit e3e4fa1 refs/heads/master Author: Gaurish Sharma Date: 2012-11-08 19:14:35 +0530 make syntax of select.map(&:field) same as pluck The shortcut ampersand syntax of `select.map(&:field)` is same thing as `.plunk(:field)`. document that M guides/source/active_record_querying.md commit 9abec81 refs/remotes/origin/schema-migrations-metadata Merge: c148823 1785bf7 Author: Carlos Antonio da Silva Date: 2012-11-08 04:15:38 -0800 Merge pull request #8139 from senny/8121_engine_generator_rakefile_without_test_unit Add app Rake tasks when -T and --dummy-path is passed to `plugin new` commit 1785bf7 refs/remotes/origin/schema-migrations-metadata Author: Yves Senn Date: 2012-11-07 20:54:49 +0100 `plugin new` adds dummy app tasks when necessary. Closes #8121 The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. M railties/CHANGELOG.md M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb M railties/lib/rails/generators/rails/plugin_new/templates/Rakefile M railties/test/generators/plugin_new_generator_test.rb commit 8659212 refs/heads/master Author: AvnerCohen Date: 2012-11-08 09:47:52 +0200 Actionmailer to 1.9 hash syntax M actionmailer/lib/action_mailer/base.rb commit 01c7a1e refs/heads/master Author: Cesar Carruitero Date: 2012-11-08 00:36:50 -0500 update syntax in routing guide [ci-skip] M guides/source/routing.md commit c148823 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-07 20:03:38 -0200 Remove not used indifferent_access requires from Base and FinderMethods M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/relation/finder_methods.rb commit 688d937 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-07 19:57:43 -0200 Use cached quoted_table_name instead of going through the connection M activerecord/lib/active_record/relation/finder_methods.rb commit 69ba5b4 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-07 19:39:21 -0200 Remove block given check from private find_with_ids This is already handled by #find, it's a duplicate check, since find_with_ids is not called from anywhere else. M activerecord/lib/active_record/relation/finder_methods.rb commit 58e48d5 refs/tags/v3.2.15 Author: Gabriel Sobrinho & Ricardo Henrique Date: 2012-11-07 15:41:36 -0200 Fix accepts_nested_attributes for child classes Closes GH-8131 M activerecord/CHANGELOG.md M activerecord/lib/active_record/nested_attributes.rb M activerecord/test/cases/nested_attributes_test.rb commit 08d3e53 refs/heads/master Author: AvnerCohen Date: 2012-11-07 16:50:10 +0200 Hash Syntax to 1.9 converison M actionpack/lib/abstract_controller/layouts.rb commit c233b2f refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-07 09:16:48 -0200 Fix guides home links and maintain compatibility with small screens Commit 65a2977cdd55678d3eab06434625375914511786 has introduced some changes to format content for small devices, this change reverts the original font size for normal screens while maintaing the same format for these devices. [ci skip] M guides/assets/stylesheets/main.css commit 9886b88 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-05 20:24:22 -0200 Do not strip code blocks, otherwise we may get misaligned output [ci skip] M guides/rails_guides/markdown/renderer.rb commit 8c35f92 refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-05 20:44:59 -0800 stop raising so many exceptions M activerecord/lib/active_record/migration.rb commit 5ff034e refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-05 20:11:04 -0800 adding requires for constant dependencies M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/builder/collection_association.rb commit 4a7679e refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-05 19:20:56 -0800 cleaning up constantize tests M activesupport/test/constantize_test_cases.rb commit 26702a6 refs/remotes/origin/schema-migrations-metadata Author: Aaron Patterson Date: 2012-11-05 18:41:18 -0800 fix warnings in Ruby 2.0 M activesupport/lib/active_support/core_ext/date/calculations.rb M activesupport/lib/active_support/core_ext/time/zones.rb commit 640bec5 refs/remotes/origin/schema-migrations-metadata Merge: a911d74 3443649 Author: Carlos Antonio da Silva Date: 2012-11-06 13:11:29 -0800 Merge pull request #8132 from bquorning/permitted_is_sticky_on_slice Permitted should be sticky on #slice commit 3443649 refs/remotes/origin/schema-migrations-metadata Author: Benjamin Quorning Date: 2012-11-06 21:32:03 +0100 Set @permitted on new instance when slicing parameters hash M actionpack/lib/action_controller/metal/strong_parameters.rb commit 478d80f refs/remotes/origin/schema-migrations-metadata Author: Benjamin Quorning Date: 2012-11-06 21:30:12 +0100 Test that permitted? is sticky on accessors, mutators, and merges M actionpack/test/controller/parameters/parameters_permit_test.rb commit 1a0f14e refs/remotes/origin/schema-migrations-metadata Author: Benjamin Quorning Date: 2012-11-06 21:24:14 +0100 Test that not permitted is sticky on #except M actionpack/test/controller/parameters/parameters_permit_test.rb commit 93eaffe refs/remotes/origin/schema-migrations-metadata Author: Benjamin Quorning Date: 2012-11-06 21:23:24 +0100 Current tests are testing stickiness of non-permitted parameters M actionpack/test/controller/parameters/parameters_permit_test.rb commit 5b3b9b0 refs/remotes/origin/schema-migrations-metadata Author: Benjamin Quorning Date: 2012-11-06 21:22:57 +0100 Fix buggy tests M actionpack/test/controller/parameters/parameters_permit_test.rb commit a911d74 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-06 01:07:38 -0200 Update mocha github repo to new one M Gemfile commit fc15139 refs/remotes/origin/schema-migrations-metadata Author: Jeremy Kemper Date: 2012-11-05 18:31:21 -0700 mocha_standalone is now deprecated. Switch to mocha/api. M Gemfile M activesupport/lib/active_support/testing/mocha_module.rb commit 9ef8838 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-05 19:49:17 -0200 Revert "fix white spaces" This reverts commit 223ed2b4832d63853b61ccb8e9ff82fcd835e61f. Reverting since rake routes right align named route. See some discussion in https://github.com/lifo/docrails/commit/223ed2b4832d63853b61ccb8e9ff82fcd835e61f#commitcomment-2104595 M guides/source/routing.md commit 223ed2b refs/heads/master Author: Cesar Carruitero Date: 2012-11-05 15:28:58 -0500 fix white spaces M guides/source/routing.md commit ae6d2ef refs/remotes/origin/schema-migrations-metadata Author: Rafael Mendonça França Date: 2012-11-05 15:12:09 -0200 Make the tests pass with minitest 4.2 M activesupport/test/test_case_test.rb commit ce9b6ad refs/remotes/origin/schema-migrations-metadata Merge: b8b100a 70ecf6c Author: Rafael Mendonça França Date: 2012-11-05 07:46:51 -0800 Merge pull request #8118 from nashby/activemodel-errors use Array() instead of flatten commit 70ecf6c refs/remotes/origin/schema-migrations-metadata Author: Vasiliy Ermolovich Date: 2012-11-05 18:29:31 +0300 use Array() instead flatten * move ActiveModel::Errors tests to errors_test.rb * add spec coverage for add_on_empty and add_on_blank M activemodel/lib/active_model/errors.rb M activemodel/test/cases/errors_test.rb M activemodel/test/cases/validations/i18n_validation_test.rb commit b8b100a refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-05 13:00:21 -0200 Remove AS::Concern extension from Testing::TaggedLogging M activesupport/lib/active_support/testing/tagged_logging.rb commit 5cb2edc refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 23:17:20 -0200 Minor css style improvements Fix some indenting for some properties and closing }, remove tabs, and merge two pre/code definitions. [ci skip] M guides/assets/stylesheets/main.css commit 3f705b6 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 23:16:21 -0200 Restore index link states to the way they are in current guide Current stable guides show the "Guides Index" links without underline, just showing it when it's hovered. This restores the same functionality for edge guides. Also remove annoying pointer cursor while accessing guides index, restoring previously functionality: now the pointer cursor only appears when hovering a link. Closes #8107 [ci skip] M guides/assets/stylesheets/main.css commit 5e6bee1 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 21:35:38 -0200 Use flat_map when building AR order M activerecord/lib/active_record/relation/query_methods.rb commit 7fb5369 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 19:50:56 -0200 Add ensure block to make sure the state is properly restored M actionpack/lib/action_dispatch/middleware/show_exceptions.rb M actionpack/test/controller/show_exceptions_test.rb commit 1fef1be refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 19:22:05 -0200 Remove some line breaks between array items that make the assert file tests harder to read M railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb M railties/test/generators/namespaced_generators_test.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit ade6c74 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 18:51:47 -0200 Refactor Inflector#ordinal to avoid converting the number twice M activesupport/lib/active_support/inflector/methods.rb commit 710e371 refs/remotes/origin/schema-migrations-metadata Author: Yves Senn Date: 2012-11-04 17:09:25 +0100 :counter_cache option for to support custom named counter caches. Closes #7993 M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations.rb M activerecord/lib/active_record/associations/builder/has_many.rb M activerecord/lib/active_record/associations/has_many_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/models/topic.rb commit ff3ab8a refs/remotes/origin/schema-migrations-metadata Author: Yves Senn Date: 2012-11-04 15:01:02 +0100 routing prefix slash replacement is no longer necessary M actionpack/lib/action_dispatch/routing/mapper.rb commit 88ba1fb refs/remotes/origin/schema-migrations-metadata Author: Yves Senn Date: 2012-11-04 14:59:15 +0100 test case to lock down the behavior of #7842 M actionpack/test/dispatch/prefix_generation_test.rb commit 5cdeb5e refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 12:07:06 -0200 Fix typo in test name M activesupport/test/spec_type_test.rb M activesupport/test/testing/constant_lookup_test.rb commit b1fe78e refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 11:41:05 -0200 Raise ArgumentError when no attribute is given to AMo::EachValidator ArgumentError is better suited than RuntimeError for this. M activemodel/lib/active_model/validator.rb M activemodel/test/cases/validations/with_validation_test.rb commit d9f20c5 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-04 11:35:01 -0200 Set hash value instead of using merge! M activemodel/lib/active_model/validations/validates.rb commit f786469 refs/remotes/origin/schema-migrations-metadata Merge: 7c3bc58 9cda6a3 Author: Carlos Antonio da Silva Date: 2012-11-04 05:03:43 -0800 Merge pull request #8111 from nikitug/use_tag_instead_of_method_missing_in_xml_builder Use `tag!` instead of `method_missing` in `to_xml` conversions. commit 9cda6a3 refs/remotes/origin/schema-migrations-metadata Author: Nikita Afanasenko Date: 2012-11-03 15:25:27 +0400 Use `tag!` instead of `method_missing` in `to_xml` conversions. Since version `3.0.x` `Builder` caches method passed to `method_missing` each time. This commit replaces `method_missing` call with `tag!` call to prevent method redefinition on each `to_xml` call with the same builder. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/array/conversions.rb M activesupport/lib/active_support/core_ext/hash/conversions.rb commit 7c3bc58 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-03 19:57:35 -0200 Ensure nested attributes is restored in case of a test failure M activerecord/test/cases/nested_attributes_test.rb commit 66bcaff refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-03 19:51:52 -0200 Simplify query conditions a bit in nested attributes test Also refactor the test a bit. M activerecord/test/cases/nested_attributes_test.rb commit 51b9014 refs/remotes/origin/schema-migrations-metadata Author: Carlos Antonio da Silva Date: 2012-11-03 16:56:37 -0200 Remove #permitted attr accessor from Parameters There is no need to expose this accessor since we already have the query method #permitted? that should handle this purpose. M actionpack/lib/action_controller/metal/strong_parameters.rb commit d637839 refs/heads/master Author: Santiago Pastorino Date: 2012-11-02 00:43:24 -0200 Disallow ability to use EncryptedCookieJar with DummyKeyGenerator Developers must set config.secret_key_base in config/initializers/secret_token.rb M actionpack/lib/action_dispatch/middleware/cookies.rb commit 4faa041 refs/heads/master Author: Santiago Pastorino Date: 2012-11-02 20:27:51 -0200 Rename secret_token_key to secret_key_base M actionpack/lib/action_dispatch/middleware/cookies.rb M activesupport/lib/active_support/key_generator.rb M guides/code/getting_started/config/initializers/secret_token.rb M guides/source/action_controller_overview.md M guides/source/configuring.md M railties/lib/rails/application.rb M railties/lib/rails/application/configuration.rb M railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt M railties/test/abstract_unit.rb M railties/test/application/configuration_test.rb M railties/test/application/url_generation_test.rb M railties/test/isolation/abstract_unit.rb commit c2a7956 refs/heads/master Author: Santiago Pastorino Date: 2012-11-02 11:03:18 -0200 Move ensure_secret_secure to DummyKeyGenerator M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/controller/http_digest_authentication_test.rb M activesupport/lib/active_support/key_generator.rb commit 851e8fe refs/heads/master Author: Santiago Pastorino Date: 2012-11-01 20:23:21 -0200 Cache generated keys per KeyGenerator instance using salt + key_size M activesupport/lib/active_support/key_generator.rb M railties/lib/rails/application.rb commit 47da574 refs/heads/master Author: Santiago Pastorino Date: 2012-11-01 20:02:09 -0200 Allow users to change the default salt if they want, shouldn't be necessary M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/lib/action_dispatch/railtie.rb M actionpack/test/dispatch/cookies_test.rb M railties/lib/rails/application.rb commit 5d23925 refs/heads/master Author: Santiago Pastorino Date: 2012-11-02 20:26:11 -0200 Use derived keys everywhere, http_authentication was missing it M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/test/controller/http_digest_authentication_test.rb M railties/lib/rails/application.rb M railties/lib/rails/application/configuration.rb M railties/test/abstract_unit.rb M railties/test/application/configuration_test.rb M railties/test/application/middleware/remote_ip_test.rb commit fb0cea2 refs/heads/master Author: Santiago Pastorino Date: 2012-10-30 18:12:23 -0200 Add encrypted cookie store M actionpack/lib/action_dispatch.rb M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt M railties/test/application/middleware/session_test.rb M railties/test/generators/app_generator_test.rb commit 38c40db refs/heads/master Author: Santiago Pastorino Date: 2012-10-30 16:41:11 -0200 Add cookie.encrypted which returns an EncryptedCookieJar How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45 M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/dispatch/cookies_test.rb M activesupport/lib/active_support/message_encryptor.rb M activesupport/test/message_encryptor_test.rb commit e272000 refs/heads/master Author: Santiago Pastorino Date: 2012-11-01 02:20:16 -0200 Warn config.derive_keys will be true by default in 4.1 M railties/lib/rails/application.rb commit 60609bb refs/heads/master Author: Santiago Pastorino Date: 2012-10-31 01:06:46 -0200 Sign cookies using key deriver M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/test/controller/flash_test.rb M actionpack/test/dispatch/cookies_test.rb M actionpack/test/dispatch/session/cookie_store_test.rb M activesupport/lib/active_support/key_generator.rb M guides/code/getting_started/config/initializers/secret_token.rb M guides/source/action_controller_overview.md M guides/source/configuring.md M railties/lib/rails/application.rb M railties/lib/rails/application/configuration.rb M railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt M railties/test/application/configuration_test.rb M railties/test/application/url_generation_test.rb M railties/test/isolation/abstract_unit.rb commit fa0aebf refs/remotes/origin/schema-migrations-metadata Author: Rafael Mendonça França Date: 2012-11-03 13:26:21 -0200 Check if the options value is present before to send the deprecation message M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration/references_statements_test.rb commit 76a0237 refs/remotes/origin/schema-migrations-metadata Author: James Coglan Date: 2012-10-23 20:15:53 +0100 Store FlashHashes in the session as plain hashes rather than custom objects with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize. M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/middleware/flash.rb M actionpack/test/controller/flash_hash_test.rb commit a89869e refs/remotes/origin/attributes_perf (origin/attributes_perf) Author: Jon Leighton Date: 2012-10-12 12:33:11 +0100 Don't allocate new strings in compiled attribute methods This improves memory and performance without having to use symbols which present DoS problems. Thanks @headius and @tenderlove for the suggestion. This was originally committed in f1765019ce9b6292f2264b4601dad5daaffe3a89, and then reverted in d3494903719682abc0948bef290af0d3d7b5a440 due to it causing problems in a real application. This second attempt should solve that. Benchmark --------- require 'active_record' require 'benchmark/ips' ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') class Post < ActiveRecord::Base connection.create_table :posts, force: true do |t| t.string :name end end post = Post.create name: 'omg' Benchmark.ips do |r| r.report('Post.new') { Post.new name: 'omg' } r.report('post.name') { post.name } r.report('post.name=') { post.name = 'omg' } r.report('Post.find(1).name') { Post.find(1).name } end Before ------ Calculating ------------------------------------- Post.new 1419 i/100ms post.name 7538 i/100ms post.name= 3024 i/100ms Post.find(1).name 243 i/100ms ------------------------------------------------- Post.new 20637.6 (±12.7%) i/s - 102168 in 5.039578s post.name 1167897.7 (±18.2%) i/s - 5186144 in 4.983077s post.name= 64305.6 (±9.6%) i/s - 317520 in 4.998720s Post.find(1).name 2678.8 (±10.8%) i/s - 13365 in 5.051265s After ----- Calculating ------------------------------------- Post.new 1431 i/100ms post.name 7790 i/100ms post.name= 3181 i/100ms Post.find(1).name 245 i/100ms ------------------------------------------------- Post.new 21308.8 (±12.2%) i/s - 105894 in 5.053879s post.name 1534103.8 (±2.1%) i/s - 7634200 in 4.979405s post.name= 67441.0 (±7.5%) i/s - 337186 in 5.037871s Post.find(1).name 2681.9 (±10.6%) i/s - 13475 in 5.084511s M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/lib/active_record/core.rb commit ebc18cf refs/heads/master Author: comptrol Date: 2012-11-03 15:32:23 +0200 Fixed the wrong terminology usage in 2.2.2 M guides/source/layouts_and_rendering.md commit c449462 refs/heads/master Merge: 743d07e 175ba04 Author: Rafael Mendonça França Date: 2012-11-02 15:21:35 -0700 Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag Support :multiple option on input tags that also have :index commit 175ba04 refs/heads/master Author: Daniel Fox, Grant Hutchins & Trace Wax Date: 2012-11-02 14:47:35 -0700 Support :multiple option on input tags with :index When you have an explicit index set, then when you build an input tag with :multiple => true, it doesn't add [] to the end of its name, although it should. M actionpack/lib/action_view/helpers/tags/base.rb M actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb M actionpack/test/template/form_helper_test.rb commit 743d07e refs/heads/master Author: Rafael Mendonça França Date: 2012-11-02 20:04:41 -0200 Remove old comment This comment is not valid since that `if` is there to make possible to do: remove_index :users, :name Instead of: remove_index :users, column: :name What is a valid use case. [ci skip] M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb commit 7042fe2 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-02 19:51:06 -0200 Deprecate passing a string as third argument of `add_index` This was there due historical reasons since 7dc45818dc43c163700efc9896a0f3feafa31138 to give the user the possibility to create unique indexes passing "UNIQUE" as the third argument M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration/index_test.rb commit e41d78c refs/tags/v3.2.15 Author: Santiago Pastorino Date: 2012-11-02 19:10:22 -0200 Clear url helpers when reloading routes M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb commit 96bcef9 refs/heads/master Author: Santiago Pastorino Date: 2012-11-02 19:10:22 -0200 Clear url helpers when reloading routes M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/route_set.rb commit 8fc5270 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-02 18:58:27 -0200 Raise an ArgumentError when passing an invalid option to add_index Closes #8104 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/test/cases/migration/index_test.rb commit 48a7a26 refs/heads/master Merge: 3b0bb08 6831c61 Author: Carlos Antonio da Silva Date: 2012-11-02 13:51:07 -0700 Merge pull request #8106 from steveklabnik/fix_grammar Fixed grammar in migration pending error. commit 6831c61 refs/heads/master Author: Steve Klabnik Date: 2012-11-02 13:46:56 -0700 Fixed grammar in migration pending error. M activerecord/lib/active_record/migration.rb commit 3b0bb08 refs/heads/master Merge: 974467d ee91749 Author: Vijay Dev Date: 2012-11-03 01:56:16 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md commit 974467d refs/heads/master Author: Rafael Mendonça França Date: 2012-11-02 18:10:46 -0200 Add test to avoid regression of 1bfc5b4 M actionpack/test/dispatch/routing_test.rb commit ee91749 refs/heads/master Author: Vijay Dev Date: 2012-11-03 01:41:44 +0530 copy edits [ci skip] M activerecord/lib/active_record/errors.rb M guides/source/contributing_to_ruby_on_rails.md commit 190dddf refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-02 18:10:46 -0200 Add test to avoid regression of 4a86362 M actionpack/test/dispatch/routing_test.rb commit 1c3bdfc refs/heads/master Author: Vijay Dev Date: 2012-11-03 01:27:14 +0530 Revert "Updated activerecord test comments to new hash syntax" This reverts commit 3b89052014c2bf3b8fbbcfb93f657a17dd7e7ca3. Reason: changes made to a test, albeit in commented lines - non-uniform change. [ci skip] M activerecord/test/cases/base_test.rb M activerecord/test/cases/validations/i18n_generate_message_validation_test.rb commit 8ffb0da refs/heads/master Author: Vijay Dev Date: 2012-11-03 01:16:57 +0530 Revert "dont encourage AC::Parameters#permit_all_parameters usage [ci skip]" This reverts commit cd17ee5598411728747011566abf6779166be9d3. Reason: Let's note that this is discouraged, not remove the docs [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 1bfc5b4 refs/heads/master Author: Rafael Mendonça França Date: 2012-11-02 14:49:12 -0200 Revert "Merge pull request #7668 from Draiken/fix_issue_6497" This reverts commit f4ad0ebe7a6b17658bddfeb996e3c34835b75623, reversing changes made to 8b2cbb3a832101f0e672ee309beca0f8c555b292. Conflicts: actionpack/CHANGELOG.md REASON: This added introduced a bug when you have a shorthand route inside a nested namespace. See https://github.com/rafaelfranca/rails/commit/281367eb770faf8077c1fd6194188e92ed1637a1 M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 4a86362 refs/tags/v3.2.15 Author: Rafael Mendonça França Date: 2012-11-02 14:33:20 -0200 Revert "Merge pull request #7668 from Draiken/fix_issue_6497" This reverts commit 61d5d2d8a97fd289b81991cd79dca3112e7ca135. Conflicts: actionpack/CHANGELOG.md REASON: This added a backward incompatible change. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit e34d856 refs/heads/master Merge: 2e20a7d 642e1af Author: Rafael Mendonça França Date: 2012-11-01 18:12:47 -0700 Merge pull request #8097 from steveklabnik/issue_8095 Fixed mapping of Solomon Islands. commit 642e1af refs/heads/master Author: Steve Klabnik Date: 2012-11-01 17:58:17 -0700 Fixed timezone mapping of Solomon Islands. Fixes #8095. For reference, here is the discussion about the mapping being incorrect: http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html M activesupport/CHANGELOG.md M activesupport/lib/active_support/values/time_zone.rb commit 2e20a7d refs/heads/master Merge: 694334c 43aa2d3 Author: Santiago Pastorino Date: 2012-11-01 13:03:08 -0700 Merge pull request #8019 from lest/patch-1 memoize calculated ip without additional variable commit 43aa2d3 refs/heads/master Author: Sergey Nartimov Date: 2012-10-24 14:32:32 +0300 memoize calculated ip without additional variable There is no need in additional `@calculated_ip` instance variable. M actionpack/lib/action_dispatch/middleware/remote_ip.rb commit de3dff3 refs/tags/v3.2.9.rc2 (tag: v3.2.9.rc2) Author: Santiago Pastorino Date: 2012-11-01 15:37:58 -0200 Bump to 3.2.9.rc2 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 694334c refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-01 13:14:58 -0200 Fix issue with collection associations and first(n)/last(n) When calling first(n) or last(n) in a collection, Active Record was improperly trying to set the inverse of instance in case that option existed. This change was introduced by fdf4eae506fa9895e831f569bed3c4aa6a999a22. In such cases we don't need to do that "manually", since the way collection will be loaded will already handle that, so we just skip setting the inverse association when any argument is given to first(n)/last(n). The test included ensures that these scenarios will have the inverse of instance set properly. Fixes #8087, Closes #8094. Squashed cherry-pick from d37d40b and c368b66. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/inverse_associations_test.rb commit 2c4faaa refs/heads/master Author: kennyj Date: 2012-11-02 01:34:29 +0900 This is comment for singular association. M activerecord/lib/active_record/associations/singular_association.rb commit c368b66 refs/tags/v3.2.9.rc2 Author: Carlos Antonio da Silva Date: 2012-11-01 14:27:45 -0200 Ensure calling first/last with options correctly set inverse association Also related to #8087. Thanks @al2o3cr. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/inverse_associations_test.rb commit d37d40b refs/tags/v3.2.9.rc2 Author: Carlos Antonio da Silva Date: 2012-11-01 13:14:58 -0200 Fix issue with collection associations and first(n)/last(n) When calling first(n) or last(n) in a collection, Active Record was improperly trying to set the inverse of instance in case that option existed. This change was introduced by fdf4eae506fa9895e831f569bed3c4aa6a999a22. In such cases we don't need to do that "manually", since the way collection will be loaded will already handle that, so we just skip setting the inverse association when any argument is given to first(n)/last(n). The test included ensures that these scenarios will have the inverse of instance set properly. Fixes #8087, Closes #8094. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/inverse_associations_test.rb commit 69cebae refs/heads/master Merge: b31ea0c d8c1404 Author: Carlos Antonio da Silva Date: 2012-11-01 04:42:55 -0700 Merge pull request #8093 from nikitug/keep_app_x_ua_compatible Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header) commit d8c1404 refs/heads/master Author: Nikita Afanasenko Date: 2012-11-01 12:59:10 +0400 Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now appends). Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value. Also test for `BestStandardsSupport` middleware added. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/best_standards_support.rb A actionpack/test/dispatch/best_standards_support_test.rb commit b31ea0c refs/heads/master Author: Carlos Antonio da Silva Date: 2012-11-01 08:49:47 -0200 Add test to ensure data attributes are properly escaped with tag helpers Closes #8091 M actionpack/test/template/tag_helper_test.rb commit 346ccf3 refs/remotes/origin/schema-migrations-metadata Author: Dmitry Vorotilin Date: 2012-09-26 13:04:41 +0400 Kernel#capture replaced by version which can catch output from subprocesses M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/kernel/reporting.rb M activesupport/test/core_ext/kernel_test.rb commit c7e233c refs/heads/master Merge: 1e89e43 d065938 Author: Santiago Pastorino Date: 2012-10-31 22:17:39 -0700 Merge pull request #8092 from arunagw/warning_removed_unused_var Small change to remove warning unused variable. commit d065938 refs/heads/master Author: Arun Agrawal Date: 2012-11-01 10:25:20 +0530 Small change to remove warning unused variable. M railties/test/application/assets_test.rb commit 1e89e43 refs/heads/master Merge: d349490 b3125c8 Author: Carlos Antonio da Silva Date: 2012-10-31 17:18:45 -0700 Merge pull request #8026 from steveklabnik/issue_8025 Make sure that RAILS_ENV is set when accessing Rails.env commit b3125c8 refs/heads/master Author: Steve Klabnik Date: 2012-10-24 15:04:12 -0700 Make sure that RAILS_ENV is set when accessing Rails.env Fixes #8025 M railties/CHANGELOG.md M railties/lib/rails.rb commit d20a529 refs/heads/master Author: AvnerCohen Date: 2012-10-31 21:19:44 +0200 1.9 hash syntax changes to docs M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/lib/action_dispatch/middleware/cookies.rb M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb M actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb M actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb M actionpack/lib/action_dispatch/routing.rb M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb M actionpack/lib/action_dispatch/routing/redirection.rb M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/lib/action_dispatch/routing/url_for.rb M actionpack/lib/action_dispatch/testing/assertions/response.rb M actionpack/lib/action_dispatch/testing/assertions/routing.rb M actionpack/lib/action_dispatch/testing/assertions/selector.rb M actionpack/lib/action_dispatch/testing/assertions/tag.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/lib/action_dispatch/testing/test_process.rb commit d349490 refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-31 17:04:08 +0100 Revert "Don't allocate new strings in compiled attribute methods" This reverts commit f1765019ce9b6292f2264b4601dad5daaffe3a89. M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/write.rb commit 750a30b refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-31 16:35:20 +0100 No need for the debugger M actionpack/test/controller/parameters/parameters_permit_test.rb commit 954c350 refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-31 16:32:24 +0100 Allow #permit to take its list of permitted parameters as an array M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit 4b20cd9 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-31 10:01:39 -0500 Revert "if format is unknown NullMimeTypeObject is returned" This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/test/dispatch/request_test.rb commit f32f150 refs/tags/v3.2.9.rc2 Author: Xavier Noria Date: 2012-10-31 15:53:57 +0100 relaxes assertion This method returns the status of the operation, but as we generally do in the code base it does not commit to any particular exact value. Hence, we do not have to check for a singleton, because if the implementation changes and returns some other true value the test should pass. M activerecord/test/cases/persistence_test.rb commit 9fdf606 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-31 12:54:07 -0200 Remove extre count, preheat already happens during setup M activerecord/test/cases/batches_test.rb commit 92bae49 refs/heads/master Merge: 6a6909d a58cafe Author: Carlos Antonio da Silva Date: 2012-10-31 07:49:42 -0700 Merge pull request #8073 from alexisbernard/fix_find_in_batches_start_option Fix find_in_batches against string IDs when start option is not specified commit a58cafe refs/heads/master Author: Alexis Bernard Date: 2012-10-30 15:54:16 +0100 Fix find_in_batches against string IDs when start option is not specified. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit 6a6909d refs/heads/master Merge: 6569709 a8560fa Author: Rafael Mendonça França Date: 2012-10-31 07:08:27 -0700 Merge pull request #8084 from acapilleri/format_never_nil if format is unknown NullMimeTypeObject is returned commit a8560fa refs/heads/master Author: Angelo capilleri Date: 2012-10-31 14:25:51 +0100 if format is unknown NullMimeTypeObject is returned If a unknown format is passed in a request, the methods html?, xml?, json? ...etc Nil Exception. This patch add a class NullMimeTypeObject, that is returned when request.format is unknown and it responds false to the methods that ends with '?'. It refers to #7837, not fixes because it's not considered a improvement not a bug. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/test/dispatch/request_test.rb commit 6569709 refs/heads/master Merge: 85039d4 e7e59a7 Author: Carlos Antonio da Silva Date: 2012-10-31 04:09:58 -0700 Merge pull request #8078 from nikitug/serialized_attributes_before_type_cast Fix `attributes_before_type_cast` for serialized attributes. commit f5f57e2 refs/tags/v3.2.9.rc2 Merge: d5b275d 68307a1 Author: José Valim Date: 2012-10-31 03:19:43 -0700 Merge pull request #8083 from saks/fix_update_column_return_value Fix ActiveRecord#update_column return value commit 68307a1 refs/tags/v3.2.9.rc2 Author: saksmlz Date: 2012-10-31 12:59:11 +0300 Fix ActiveRecord#update_column return value M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit e7e59a7 refs/heads/master Author: Nikita Afanasenko Date: 2012-10-31 00:14:16 +0400 Fix `attributes_before_type_cast` for serialised attributes. Public method `attributes_before_type_cast` used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like `read_attribute_before_type_cast` and returns unserialised values. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/test/cases/serialized_attribute_test.rb commit d5b275d refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-31 00:31:47 -0200 Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased" This reverts commit 7d17cd2cbfc086f5aa9dd636e1207eb130150428. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression since people were relying on this buggy behavior. This will introduce back #3849 but we will be backward compatible in stable release. Fixes #8068. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb D actionpack/test/fixtures/test/hello/hello.erb commit 6b7cd20 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-30 23:51:10 -0200 Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables" This reverts commit 2bad605873b5b720d77ae6388a995827ab7fe705. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression related with shoulda-matchers, since it is expecting the instance variable @layouts See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74 This will introduce back #7459 but this stable release will be backward compatible. Related with #8068. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/test_case.rb commit 85039d4 refs/heads/master Merge: 7e17b0b a7c3c90 Author: Rafael Mendonça França Date: 2012-10-30 18:27:40 -0700 Merge pull request #8074 from kennyj/fix_6951 Fix #6951. Use query cache/uncache, when using not only database.yml but also DATABASE_URL. commit a7c3c90 refs/heads/master Author: kennyj Date: 2012-10-31 02:21:52 +0900 Fix #6951. Use query cache/uncache, when using not only database.yml but also DATABASE_URL. M activerecord/CHANGELOG.md M activerecord/lib/active_record/query_cache.rb M activerecord/test/cases/query_cache_test.rb commit 7e17b0b refs/heads/master Author: Jon Leighton Date: 2012-10-30 18:43:57 +0000 Revert "Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*args).deliver`." This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8. Conflicts: actionmailer/CHANGELOG.md See discussion at https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489 M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb commit e0fb16b refs/heads/master Author: Santiago Pastorino Date: 2012-10-30 16:41:58 -0200 Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now." This reverts commit 7b290ad13c294005db062e746f8b79c8a192e4fa. debugger gem is now working ok with p286 M Gemfile commit 48fe4f1 refs/heads/master Merge: 0ad6c08 fcd19a1 Author: Carlos Antonio da Silva Date: 2012-10-30 08:22:14 -0700 Merge pull request #8072 from kennyj/remove_mattr_include_root_in_json Allow include_root_in_json to be inheritable by using the class_attribute created by Active Model serialization module. commit fcd19a1 refs/heads/master Author: kennyj Date: 2012-10-30 23:44:32 +0900 include_root_in_json allows inheritance. M activerecord/lib/active_record/serialization.rb M activerecord/test/cases/serialization_test.rb commit 0ad6c08 refs/heads/master Merge: 4e23c0e b955939 Author: Carlos Antonio da Silva Date: 2012-10-30 03:47:07 -0700 Merge pull request #6107 from gazay/make_caller_attribute_in_deprecation_optional Make callstack attribute optional in AS:Deprecation commit b955939 refs/heads/master Author: Alexey Gaziev Date: 2012-10-30 10:23:41 +0800 Make caller attribute in deprecation methods optional M actionpack/lib/action_controller/record_identifier.rb M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/lib/action_dispatch/testing/integration.rb M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/helpers/form_tag_helper.rb M actionpack/lib/action_view/helpers/javascript_helper.rb M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/lib/action_view/template.rb M actionpack/lib/action_view/template/resolver.rb M activemodel/lib/active_model/attribute_methods.rb M activemodel/lib/active_model/observing.rb M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/readonly_attributes.rb M activerecord/lib/active_record/scoping/default.rb M activerecord/lib/active_record/scoping/named.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/benchmarkable.rb M activesupport/lib/active_support/callbacks.rb M activesupport/lib/active_support/core_ext/array/uniq_by.rb M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/core_ext/module/introspection.rb M activesupport/lib/active_support/core_ext/proc.rb M activesupport/lib/active_support/core_ext/string/encoding.rb M activesupport/lib/active_support/deprecation/method_wrappers.rb M activesupport/lib/active_support/deprecation/reporting.rb M activesupport/lib/active_support/json/variable.rb M activesupport/lib/active_support/test_case.rb M activesupport/test/deprecation_test.rb M railties/lib/rails/application/configuration.rb commit 4e23c0e refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-29 23:51:25 -0200 Remove not assigned variable warning from sqlite3 adapter test M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit 37c60c9 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-29 23:00:12 -0200 Add CHANGELOG entry to #8032 fix e6b41845efe2252fe7de6882e355c31f93c65cc3 fixes that issue too. [ci skip] M activerecord/CHANGELOG.md commit fad74d6 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-29 22:59:36 -0200 Fix typo :bomb: [ci skip] M activerecord/lib/active_record/connection_adapters/column.rb commit 3525a9b refs/heads/master Author: Rafael Mendonça França Date: 2012-10-29 22:47:58 -0200 Fix bug when Column is trying to type cast boolean values to integer. This can occur if the user is using :integer columns to store boolean values. Now we are handling the boolean values but it still raises if the value can't type cast to integer and is not a boolean. See #7509. Fixes #8067. Conflicts: activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/column_test.rb commit 96a13fc refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-29 22:47:58 -0200 Fix bug when Column is trying to type cast boolean values to integer. This can occur if the user is using :integer columns to store boolean values. Now we are handling the boolean values but it still raises if the value can't type cast to integer and is not a boolean. See #7509. Fixes #8067. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/column_test.rb commit a4ac2b4 refs/heads/master Merge: 008154e 3152ee8 Author: Carlos Antonio da Silva Date: 2012-10-29 15:43:59 -0700 Merge pull request #8066 from cfabianski/AddTestForSerializationMethod Add test for code change introduced in this commit f20032f commit 3152ee8 refs/heads/master Author: Cédric FABIANSKI Date: 2012-10-29 21:55:09 +0100 Add test for code change introduced in this commit f20032f M activemodel/test/cases/serializers/json_serialization_test.rb commit e6b4184 refs/tags/v3.2.9.rc2 Merge: fdfb399 e7a6b92 Author: Rafael Mendonça França Date: 2012-10-29 15:10:24 -0200 Merge pull request #8009 from graceliu/3-2-fix_database_url_support fixed support for DATABASE_URL for rake db tasks commit e7a6b92 refs/tags/v3.2.9.rc2 Author: Grace Liu Date: 2012-10-12 15:57:41 -0700 fixed support for DATABASE_URL for rake db tasks Backport for #7521 - added tests to confirm establish_connection uses DATABASE_URL and Rails.env correctly even when no arguments are passed in. - updated rake db tasks to support DATABASE_URL, and added tests to confirm correct behavior for these rake tasks. (Removed establish_connection call from some tasks since in those cases the :environment task already made sure the function would be called) - updated Resolver so that when it resolves the database url, it removes hash values with empty strings from the config spec (e.g. to support connection to postgresql when no username is specified). - updated ResolverTest to use current_adapter? to check the type of the current adapter. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/test/cases/connection_specification/resolver_test.rb M railties/test/application/initializers/frameworks_test.rb A railties/test/application/rake/dbs_test.rb commit fdfb399 refs/tags/v3.2.9.rc1 (tag: v3.2.9.rc1) Author: Santiago Pastorino Date: 2012-10-29 14:38:23 -0200 Bump to 3.2.9.rc1 M RAILS_VERSION M actionmailer/lib/action_mailer/version.rb M actionpack/lib/action_pack/version.rb M activemodel/lib/active_model/version.rb M activerecord/lib/active_record/version.rb M activeresource/lib/active_resource/version.rb M activesupport/lib/active_support/version.rb M railties/lib/rails/version.rb M version.rb commit 008154e refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-29 13:57:00 -0200 Fix failing tests and use new hash style in deprecation messages M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/helpers/form_tag_helper.rb M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/lib/action_view/template/resolver.rb M actionpack/test/template/form_tag_helper_test.rb M actionpack/test/template/url_helper_test.rb commit 6ed23ea refs/tags/v3.2.9.rc2 Author: Santiago Pastorino Date: 2012-10-29 13:50:02 -0200 Add 3.2.9 section in ARes CHANGELOG [ci skip] M activeresource/CHANGELOG.md commit d1c95d9 refs/heads/master Merge: 72e6fb0 0b7067d Author: Carlos Antonio da Silva Date: 2012-10-29 08:42:16 -0700 Merge pull request #8063 from nikitug/deprecation_caller_context Provide a call stack for deprecation warnings where needed. commit 0b7067d refs/heads/master Author: Nikita Afanasenko Date: 2012-10-29 19:22:59 +0400 Provide a call stack for deprecation warnings where needed. It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly. M actionpack/lib/action_controller/record_identifier.rb M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/lib/action_view/helpers/form_helper.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/helpers/form_tag_helper.rb M actionpack/lib/action_view/helpers/javascript_helper.rb M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/lib/action_view/template.rb M actionpack/lib/action_view/template/resolver.rb M activemodel/lib/active_model/attribute_methods.rb M activemodel/lib/active_model/observing.rb M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/migration.rb M activerecord/lib/active_record/readonly_attributes.rb M activerecord/lib/active_record/scoping/default.rb M activerecord/lib/active_record/scoping/named.rb M activesupport/lib/active_support/benchmarkable.rb M activesupport/lib/active_support/callbacks.rb M activesupport/lib/active_support/json/variable.rb M activesupport/lib/active_support/test_case.rb M railties/lib/rails/application/configuration.rb commit 72e6fb0 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-29 12:52:44 -0200 Fix deprecation message in test for Path#children M railties/test/application/paths_test.rb commit 29b1dc2 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-29 11:14:20 -0200 Add test to deprecation of Path#children M railties/test/application/paths_test.rb commit 3663057 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-29 06:02:16 -0700 Merge pull request #7587 from elia/fix-too-eager-loading Should not eager_load app/assets Conflicts: railties/CHANGELOG.md M railties/CHANGELOG.md M railties/lib/rails/paths.rb M railties/test/application/paths_test.rb commit 633f2cd refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-29 11:03:29 -0200 Revert "Deprecate Paths::Path#children which is unused now" This reverts commit f7de647f2cd099ecf6434fa4a0db1ec297f1c32d. We can't deprecate things in stable branches. I didn't not realized that the pull request was for 3-2-stable M railties/lib/rails/paths.rb commit a53e464 refs/tags/v3.2.9.rc2 Merge: d40309a f7de647 Author: Rafael Mendonça França Date: 2012-10-29 06:02:16 -0700 Merge pull request #7587 from elia/fix-too-eager-loading Should not eager_load app/assets commit be4a4cd refs/heads/master Author: AvnerCohen Date: 2012-10-29 13:10:53 +0200 Hash Syntax to 1.9 related changes M actionpack/lib/action_view/base.rb M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/lib/action_view/helpers/atom_feed_helper.rb M actionpack/lib/action_view/helpers/capture_helper.rb M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/lib/action_view/helpers/debug_helper.rb M actionpack/lib/action_view/helpers/form_options_helper.rb M actionpack/lib/action_view/helpers/form_tag_helper.rb M actionpack/lib/action_view/helpers/javascript_helper.rb M actionpack/lib/action_view/helpers/number_helper.rb M actionpack/lib/action_view/helpers/record_tag_helper.rb M actionpack/lib/action_view/helpers/rendering_helper.rb M actionpack/lib/action_view/helpers/sanitize_helper.rb M actionpack/lib/action_view/helpers/tag_helper.rb M actionpack/lib/action_view/helpers/text_helper.rb M actionpack/lib/action_view/helpers/translation_helper.rb M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/lib/action_view/renderer/partial_renderer.rb M actionpack/lib/action_view/routing_url_for.rb M actionpack/lib/action_view/vendor/html-scanner/html/node.rb commit 20c574c refs/heads/master Merge: 0d7dcdc cd17ee5 Author: Juanjo Bazán Date: 2012-10-29 11:28:27 +0100 Merge branch 'master' of github.com:lifo/docrails commit 0d7dcdc refs/heads/master Author: Juanjo Bazán Date: 2012-10-29 11:27:35 +0100 3.1 and up, in configuring guide. M guides/source/configuring.md commit f7de647 refs/tags/v3.2.9.rc2 Author: Elia Schito Date: 2012-10-29 10:23:11 +0100 Deprecate Paths::Path#children which is unused now M railties/lib/rails/paths.rb commit 71abfa5 refs/heads/master Merge: 81679ab 851f8c1 Author: Xavier Noria Date: 2012-10-29 02:17:11 -0700 Merge pull request #8027 from daenney/master Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error. commit 851f8c1 refs/heads/master Author: Daniele Sluijters Date: 2012-10-25 10:06:40 +0200 atomicc.rb: Don't assume we may chown/chmod a file. Previously this code just assumed it is capable of changing the file ownership, both user and group. This will fail in a lot of scenario's unless: * The process is run as a superuser (root); * The owning user and group are already set to the user and group we're trying to chown to; * The user chown'ing only changes the group to another group it is a member of. If either of those conditions are not met the filesystem will simply deny the operation throwing an error. It is also not always possible to do a chmod, there might be a SELinux policy or another limitation preventing the user to change the file mode. To this end the chmod call has also been added to the rescue block. I've also added a little comment above the chmod command that doing a chmod on a file which has an ACL set will cause the ACL to be recalculated / modified. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/file/atomic.rb M guides/source/active_support_core_extensions.md commit d40309a refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-28 17:01:01 -0700 Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg SQLite3Adapter#type_cast should not mutate arguments Conflicts: activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit cdfa4a5 refs/tags/v3.2.9.rc2 Author: Carlos Antonio da Silva Date: 2012-10-28 13:31:34 -0700 Merge pull request #8053 from henrik/update_columns_with_primary_key Unbreak update_column/update_columns for the primary key attribute. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/persistence.rb activerecord/test/cases/persistence_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 5d82c1f refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-29 01:45:42 -0200 Make Active Record tests pass in isolation Also remove the feature detecting for Ruby 1.9 M activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit 81679ab refs/heads/master Author: Rafael Mendonça França Date: 2012-10-28 23:47:20 -0200 Fix the skip code. Checking for the constant doesn't work M activerecord/test/cases/connection_specification/resolver_test.rb commit 721cf54 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-28 23:47:20 -0200 Fix the skip code. Checking for the constant doesn't work M activerecord/test/cases/connection_specification/resolver_test.rb commit a119dd3 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-26 12:47:33 -0700 Merge pull request #7593 from veader/patch-1 Decode attributes pulled from URI.parse Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit 1743e95 refs/heads/master Merge: 852e376 b5133d0 Author: Rafael Mendonça França Date: 2012-10-28 17:01:01 -0700 Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg SQLite3Adapter#type_cast should not mutate arguments commit b5133d0 refs/heads/master Author: Stefan Rusterholz Date: 2012-10-28 18:55:36 -0500 SQLite3Adapter#type_cast should not mutate arguments M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb commit cd17ee5 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-28 17:50:56 -0500 dont encourage AC::Parameters#permit_all_parameters usage [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 852e376 refs/heads/master Merge: c6f47c1 300d080 Author: Rafael Mendonça França Date: 2012-10-28 14:45:46 -0700 Merge pull request #7750 from xuanxu/none_modificating_relation_in_place Added ActiveRecord::Relation#none! method commit 300d080 refs/heads/master Author: Juanjo Bazán Date: 2012-09-25 00:59:07 +0200 ActiveRecord::Relation#none! method. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation_test.rb commit 35ca953 refs/heads/master Author: Juanjo Bazán Date: 2012-09-25 00:34:30 +0200 loaded relations cannot be mutated by extending! M activerecord/test/cases/relations_test.rb commit c6f47c1 refs/heads/master Merge: 5bbe245 1849665 Author: Carlos Antonio da Silva Date: 2012-10-28 13:31:34 -0700 Merge pull request #8053 from henrik/update_columns_with_primary_key Unbreak update_column/update_columns for the primary key attribute. commit 1849665 refs/heads/master Author: Henrik N Date: 2012-10-28 17:48:04 +0100 Enable update_column(s) for the primary key attribute. Didn't work before because it updated the model-in-memory first, so the DB query couldn't find the record. M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/persistence_test.rb commit 5bbe245 refs/heads/master Merge: a273b6b 8d0efcc Author: Rafael Mendonça França Date: 2012-10-28 13:22:45 -0700 Merge pull request #8046 from pmahoney/exceptions_as_flow_control Replace flow-control exception with explicit test. commit 37586dd refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-28 12:55:53 -0700 Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb A actionmailer/test/fixtures/base_mailer/without_mail_call.erb M actionmailer/test/mailers/base_mailer.rb commit a273b6b refs/heads/master Merge: a698175 b786f06 Author: Rafael Mendonça França Date: 2012-10-28 12:55:53 -0700 Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call Do not render views when mail() isn't called. (NullMail refactoring) commit a698175 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-28 12:51:42 -0700 Merge pull request #8047 from arunagw/json_only_in_18 Removing JSON for other ruby M Gemfile commit d46f9e3 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-28 17:54:06 -0200 Fix some assert_raise calls containing messages in Active Support M activesupport/test/core_ext/module/qualified_const_test.rb M activesupport/test/dependencies_test.rb commit 2b5d3aa refs/tags/v3.2.9.rc2 Merge: 4b1a7bc 1adb784 Author: Carlos Antonio da Silva Date: 2012-10-28 12:51:42 -0700 Merge pull request #8047 from arunagw/json_only_in_18 Removing JSON for other ruby commit ed80dd7 refs/heads/master Merge: c82f0d7 e4790a2 Author: Carlos Antonio da Silva Date: 2012-10-28 12:46:39 -0700 Merge pull request #8054 from senny/6378_create_table_raises_when_defining_pk_column create_table raises an ArgumentError when the primary key is redefined. commit b786f06 refs/heads/master Author: Yves Senn Date: 2012-09-29 22:29:29 +0200 Do not render views when mail() isn't called. (NullMail refactoring) M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb A actionmailer/test/fixtures/base_mailer/without_mail_call.erb M actionmailer/test/mailers/base_mailer.rb commit e4790a2 refs/heads/master Author: Yves Senn Date: 2012-10-28 18:05:30 +0100 raise `ArgumentError` when redefining the primary key column. Closes #6378 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/test/cases/migration/change_schema_test.rb commit b104157 refs/heads/master Author: Yves Senn Date: 2012-10-28 18:51:26 +0100 refactor `SQLite3Adapter#copy_table` to prevent primary key redefinitions. #6378 M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/cases/adapters/sqlite3/copy_table_test.rb commit c82f0d7 refs/heads/master Merge: e46a8d8 10f6f90 Author: Rafael Mendonça França Date: 2012-10-28 12:22:24 -0700 Merge pull request #8056 from frodsan/fix_issue_missing_attribute AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes commit 10f6f90 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-28 14:18:31 -0500 AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes. This fixes the following behaviour: class Person < ActiveRecord::Base belongs_to :company end # Before: person = Person.select('id').first person[:name] # => nil person.name # => ActiveModel::MissingAttributeError: missing_attribute: name person[:company_id] # => nil person.company # => nil # After: person = Person.select('id').first person[:name] # => ActiveModel::MissingAttributeError: missing_attribute: name person.name # => ActiveModel::MissingAttributeError: missing_attribute: name person[:company_id] # => ActiveModel::MissingAttributeError: missing_attribute: company_id person.company # => ActiveModel::MissingAttributeError: missing_attribute: company_id Fixes #5433. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/test/cases/attribute_methods_test.rb commit e46a8d8 refs/heads/master Merge: 94aadf7 0fbdddd Author: Rafael Mendonça França Date: 2012-10-28 09:53:29 -0700 Merge pull request #8052 from schneems/schneems/silence-ar-query-in-middleware Don't log on pending migration check commit 0fbdddd refs/heads/master Author: schneems Date: 2012-10-28 11:47:34 -0500 Don't log on pending migration check Conversation from: #6665 cc/ @rafaelfranca M activerecord/lib/active_record/migration.rb commit 94aadf7 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-28 12:26:07 -0200 Add syntax highlight to code blocks in javascript guide [ci skip] M guides/source/working_with_javascript_in_rails.md commit f47026e refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-28 12:15:35 -0200 Add backticks around link_to example in javascript guide [ci skip] M guides/source/form_helpers.md M guides/source/working_with_javascript_in_rails.md commit 66033a9 refs/heads/master Merge: 2e44dda 3b76725 Author: Carlos Antonio da Silva Date: 2012-10-28 07:11:29 -0700 Merge pull request #8050 from bashmish/master fix typo in button_to helper example [ci skip] commit 3b76725 refs/heads/master Author: Michael Bashkirov Date: 2012-10-28 16:26:02 +0400 fix typo in button_to helper example M guides/source/working_with_javascript_in_rails.md commit 1adb784 refs/tags/v3.2.9.rc2 Author: Arun Agrawal Date: 2012-10-28 15:53:48 +0530 Removing JSON for other ruby It's only required for 1.8 and for JRuby! I was fixing a bug with JSON pure on 1.8.7 and I found that we have included json for other 1.8 > rubies also. M Gemfile commit 53778ec refs/tags/v3.2.9.rc2 Author: Elia Schito Date: 2012-10-27 14:05:02 +0200 Respect children paths filter settings E.g. don't eager-load app/assets even if app/* has the eager_load flag set. M railties/CHANGELOG.md M railties/lib/rails/paths.rb commit 4edea9e refs/heads/master Merge: c570ba7 62f273b Author: John Gallagher Date: 2012-10-27 21:55:56 +0100 Merge branch 'master' of https://github.com/lifo/docrails commit c570ba7 refs/heads/master Author: John Gallagher Date: 2012-10-27 21:54:44 +0100 Changed comment section to be more explicit. I had an issue with rolling back a migration and couldn't understand why 'rake db:reset' didn't work. M guides/source/migrations.md commit 62f273b refs/heads/master Author: AvnerCohen Date: 2012-10-27 22:05:27 +0200 Multiple changes to 1,9 hash syntax M actionpack/lib/action_controller/metal.rb M actionpack/lib/action_controller/metal/conditional_get.rb M actionpack/lib/action_controller/metal/data_streaming.rb M actionpack/lib/action_controller/metal/force_ssl.rb M actionpack/lib/action_controller/metal/head.rb M actionpack/lib/action_controller/metal/http_authentication.rb M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/lib/action_controller/metal/params_wrapper.rb M actionpack/lib/action_controller/metal/redirecting.rb M actionpack/lib/action_controller/metal/renderers.rb M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/lib/action_controller/metal/responder.rb M actionpack/lib/action_controller/metal/streaming.rb M actionpack/lib/action_controller/metal/url_for.rb M actionpack/lib/action_controller/test_case.rb commit 8d0efcc refs/heads/master Author: Patrick Mahoney Date: 2012-10-27 14:53:10 -0500 Replace flow-control exception with explicit test. It was noticed while profiling 'assets:precompile' in JRuby that exception creation was consuming a large portion of time, and some of that was due to File.atomic_write. Testing first with File.exists? eliminates the need for an exception which should be a perfomrance improvement on both JRuby and MRI. In this case, the stat() isn't even extra overhead, since it is always called. M activesupport/lib/active_support/core_ext/file/atomic.rb commit 2e44dda refs/heads/master Author: Rafael Mendonça França Date: 2012-10-27 16:48:59 -0200 USe the released version of sprockets-rails in a new Rails 4 application M railties/lib/rails/generators/app_base.rb commit 51adec3 refs/heads/master Merge: a4c3d5a 5d30e44 Author: Rafael Mendonça França Date: 2012-10-27 10:48:20 -0700 Merge pull request #7960 from pwnall/mysql_varbinary Use the MySQL varbinary type when appropriate in migrations commit 5d30e44 refs/heads/master Author: Victor Costan Date: 2012-10-16 05:53:18 -0400 Use the MySQL varbinary type when appropriate in migrations. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb A activerecord/test/cases/adapters/mysql/sql_types_test.rb A activerecord/test/cases/adapters/mysql2/sql_types_test.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/schema/mysql2_specific_schema.rb M activerecord/test/schema/mysql_specific_schema.rb commit a4c3d5a refs/heads/master Author: Rafael Mendonça França Date: 2012-10-27 15:40:21 -0200 Improve the deprecation message of link_to_function and button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide M actionpack/lib/action_view/helpers/javascript_helper.rb M actionpack/test/template/javascript_helper_test.rb commit 028f29d refs/heads/master Merge: e3dad96 c195aed Author: Xavier Noria Date: 2012-10-27 08:18:30 -0700 Merge pull request #8034 from gbchaosmaster/readme-format Organize README commit e3dad96 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-27 13:14:02 -0200 Add the Working with JavaScript Guides in the guides home as WIP M guides/source/documents.yaml commit 4b1a7bc refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-10-26 19:53:32 -0700 Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency Fix AM::Serializers::Xml dependency M activemodel/lib/active_model/serializers/json.rb M activemodel/lib/active_model/serializers/xml.rb M activemodel/test/cases/serializers/json_serialization_test.rb M activemodel/test/cases/serializers/xml_serialization_test.rb commit f3807a8 refs/heads/master Merge: 67166c4 4d7f533 Author: Rafael Mendonça França Date: 2012-10-27 07:40:13 -0700 Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpack remove trailing whitespace within actionpack [ci skip] commit 4d7f533 refs/heads/master Author: Yves Senn Date: 2012-10-27 16:03:18 +0200 cleanup, remove trailing whitespace within actionpack M actionpack/lib/abstract_controller/rendering.rb M actionpack/lib/action_controller/metal/mime_responds.rb M actionpack/test/activerecord/controller_runtime_test.rb M actionpack/test/controller/default_url_options_with_filter_test.rb M actionpack/test/controller/http_basic_authentication_test.rb M actionpack/test/controller/mime_responds_test.rb M actionpack/test/controller/new_base/middleware_test.rb M actionpack/test/controller/new_base/render_partial_test.rb M actionpack/test/controller/send_file_test.rb M actionpack/test/template/digestor_test.rb M actionpack/test/template/render_test.rb commit 552a3e1 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-07 02:51:52 -0300 Add test case to assets eager load M railties/test/application/paths_test.rb commit 67166c4 refs/heads/master Merge: 94f6b3d df2b60c Author: Jeremy Kemper Date: 2012-10-26 21:07:03 -0700 Merge pull request #8040 from frodsan/fix_build_isolated fix failing isolated tests in activemodel commit df2b60c refs/heads/master Author: Francesco Rodriguez Date: 2012-10-26 23:03:36 -0500 fix failing isolated tests M activemodel/test/models/contact.rb commit 94f6b3d refs/heads/master Merge: b794440 10d9cb2 Author: Jeremy Kemper Date: 2012-10-26 19:53:32 -0700 Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency Fix AM::Serializers::Xml dependency commit 10d9cb2 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-26 21:46:15 -0500 fix AM::Serializers titles [ci skip] M activemodel/lib/active_model/serializers/json.rb M activemodel/lib/active_model/serializers/xml.rb commit 0703295 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-26 21:45:40 -0500 AM::Serializers::Xml depends on AM::Naming M activemodel/lib/active_model/serializers/xml.rb M activemodel/test/cases/serializers/json_serialization_test.rb M activemodel/test/cases/serializers/xml_serialization_test.rb M activemodel/test/models/contact.rb commit b794440 refs/heads/master Author: Jeremy Kemper Date: 2012-10-26 19:11:19 -0700 Fix queueing tests that should be consuming the queue rather than draining it M activesupport/lib/active_support/queueing.rb M activesupport/test/queueing/threaded_consumer_test.rb commit bf2009f refs/heads/master Author: Jeremy Kemper Date: 2012-10-26 16:18:39 -0700 Job consumer logs to Rails.logger by default M activesupport/lib/active_support/queueing.rb M railties/lib/rails/application/finisher.rb M railties/test/application/queue_test.rb commit 26f52b2 refs/heads/master Author: Jeremy Kemper Date: 2012-10-26 11:29:37 -0700 Job worker thread logs failed jobs too M activesupport/lib/active_support/queueing.rb M activesupport/test/queueing/threaded_consumer_test.rb commit 411378e refs/heads/master Author: Jeremy Kemper Date: 2012-10-26 11:28:51 -0700 Job worker thread logs to stderr if no logger is provided M activesupport/lib/active_support/queueing.rb M activesupport/test/queueing/threaded_consumer_test.rb commit c195aed refs/heads/master Author: Vinny Diehl Date: 2012-10-26 14:44:21 -0400 Organize README * Organized code status badges into a "Code Status" section. * Moved the OSI MIT License link inline (bullets are for unordered lists). * Removed all EOL whitespace. [ci skip] M README.rdoc M Rakefile commit cc81af2 refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-26 23:18:34 +0300 Use a better word M guides/source/action_controller_overview.md commit 35f2a09 refs/heads/master Merge: f078f91 f96b410 Author: Rafael Mendonça França Date: 2012-10-26 12:47:33 -0700 Merge pull request #7593 from veader/patch-1 Decode attributes pulled from URI.parse commit f96b410 refs/heads/master Author: Shawn Veader Date: 2012-09-10 17:50:04 -0300 Decode attributes pulled from URI.parse The RFC indicates that username and passwords may be encoded. http://tools.ietf.org/html/rfc2396#section-3.2.2 Found this trying to use the mysql://username:password@host:port/db and having special characters in the password which needed to be URI encoded. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/test/cases/connection_specification/resolver_test.rb commit f078f91 refs/heads/master Merge: 6ac33f9 f38e752 Author: Rafael Mendonça França Date: 2012-10-26 12:40:40 -0700 Merge pull request #7971 from dgraham/hash-replace Implement HashWithIndifferentAccess#replace so key? works correctly. commit 7a36dc7 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-26 13:40:24 -0500 update AR::ImmutableRelation documentation [ci skip] M activerecord/lib/active_record/errors.rb commit f38e752 refs/heads/master Author: David Graham Date: 2012-10-16 13:05:25 -0600 Implement replace method so key? works correctly. M activesupport/CHANGELOG.md M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit 6ac33f9 refs/heads/master Author: Jon Leighton Date: 2012-10-26 16:55:44 +0100 remove unused config option M activerecord/lib/active_record/core.rb commit d200cb9 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-26 13:37:04 -0200 Remove ActiveRecord::Model entry from 4.0 Release Notes [ci skip] M guides/source/4_0_release_notes.md commit 7c7a225 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-26 13:33:59 -0200 Remove ActiveRecord::Model consant from AS::TestCase Fixing the build. M activesupport/lib/active_support/test_case.rb commit 00791bf refs/heads/master Author: Jeremy Kemper Date: 2012-10-26 08:23:00 -0700 Remove REE GC stats since master is 1.9.3 M tools/profile commit 9e4c41c refs/heads/master Author: Jon Leighton Date: 2012-10-26 15:51:02 +0100 Remove ActiveRecord::Model In the end I think the pain of implementing this seamlessly was not worth the gain provided. The intention was that it would allow plain ruby objects that might not live in your main application to be subclassed and have persistence mixed in. But I've decided that the benefit of doing that is not worth the amount of complexity that the implementation introduced. M activerecord/CHANGELOG.md M activerecord/lib/active_record.rb M activerecord/lib/active_record/associations/alias_tracker.rb M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/connection_handling.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/explain.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/locking/optimistic.rb D activerecord/lib/active_record/model.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/relation/finder_methods.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/lib/active_record/result.rb M activerecord/lib/active_record/serialization.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/adapter_test.rb M activerecord/test/cases/adapters/mysql/connection_test.rb M activerecord/test/cases/adapters/mysql2/connection_test.rb M activerecord/test/cases/attribute_methods/read_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb M activerecord/test/cases/defaults_test.rb D activerecord/test/cases/inclusion_test.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/cases/multiple_db_test.rb M activerecord/test/cases/pooled_connections_test.rb M activerecord/test/cases/primary_keys_test.rb M activerecord/test/cases/unconnected_test.rb D activerecord/test/models/teapot.rb M activerecord/test/schema/schema.rb M activerecord/test/support/connection.rb commit b1e5c16 refs/heads/master Author: Jaime Iniesta Date: 2012-10-26 14:56:37 +0200 Fix a pair of typos on Active Record Querying guide M guides/source/active_record_querying.md commit a27b517 refs/heads/master Author: Jeremy Kemper Date: 2012-10-25 20:29:56 -0700 Add missing require for minitest assertions. Breaks calling 'app' in console otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25. M actionpack/lib/action_dispatch/testing/integration.rb commit 91c5af4 refs/heads/master Merge: ca3b429 cadff7b Author: Carlos Antonio da Silva Date: 2012-10-25 19:39:59 -0700 Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2 Update redcarpet dependency commit cadff7b refs/heads/master Author: Vinny Diehl Date: 2012-10-25 19:02:48 -0400 Update redcarpet dependency "~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the Gemfile to the 1.9 syntax. M Gemfile commit 9ac095f refs/heads/master Author: Francesco Rodriguez Date: 2012-10-25 20:41:35 -0500 minor edits and remove mixed titles in AM::Validations docs [ci skip] M activemodel/lib/active_model/validations/acceptance.rb M activemodel/lib/active_model/validations/confirmation.rb M activemodel/lib/active_model/validations/exclusion.rb M activemodel/lib/active_model/validations/format.rb M activemodel/lib/active_model/validations/inclusion.rb M activemodel/lib/active_model/validations/numericality.rb M activemodel/lib/active_model/validations/presence.rb M activemodel/lib/active_model/validations/validates.rb M activemodel/lib/active_model/validations/with.rb commit 65be1a0 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-25 20:05:14 -0500 encourage use of Ruby 1.9 syntax [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit ca3b429 refs/heads/master Merge: 59a53f4 3d3fd39 Author: Rafael Mendonça França Date: 2012-10-25 14:43:15 -0700 Merge pull request #8030 from calebthompson/fix-ternary Fix gratuitous use of ternary operator commit 3d3fd39 refs/heads/master Author: Caleb Thompson Date: 2012-10-25 17:00:14 -0400 Fix gratuitous use of ternary operator M actionpack/lib/action_view/renderer/template_renderer.rb commit 59a53f4 refs/heads/master Author: Aaron Patterson Date: 2012-10-25 13:51:30 -0700 remain backwards compatible, exception can be constructed with no arguments M actionpack/lib/action_controller/metal/exceptions.rb commit cde326b refs/heads/master Author: Aaron Patterson Date: 2012-10-25 11:34:37 -0700 give access to the original exception raised in case of a parse error M actionpack/lib/action_controller/metal/exceptions.rb M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit facd3e8 refs/heads/master Author: Aaron Patterson Date: 2012-10-25 11:25:29 -0700 do not lose backtrace information from the raised exception M actionpack/lib/action_dispatch/http/request.rb M actionpack/test/dispatch/request_test.rb commit 6033e8a refs/heads/master Author: Aaron Patterson Date: 2012-10-25 10:49:04 -0700 fix uninitialized ivar warnings M actionpack/lib/abstract_controller/base.rb commit f5ae64d refs/heads/master Merge: 1582100 96f5cea Author: Aaron Patterson Date: 2012-10-25 09:07:16 -0700 Merge pull request #8013 from noahhendrix/master Pass key to block in cache.fetch on miss commit cc5dfcc refs/heads/master Author: Henrik N Date: 2012-10-25 13:45:32 +0200 AJAX -> Ajax in layouts_and_rendering guide. Fixed in the JS guide in 8c38172ba59e16d8e523ac4f1c5ae29b6851d3ee M guides/source/layouts_and_rendering.md commit 4fee5df refs/heads/master Author: Xavier Noria Date: 2012-10-24 22:52:59 +0200 Revert "Improve grammar a bit" This reverts commit 507e522e26b4073455b2337bcf1670e52bba5429. M guides/source/working_with_javascript.md commit fe47041 refs/heads/master Author: Xavier Noria Date: 2012-10-24 22:52:43 +0200 Revert "Explain where the acronym AJAX stands for & replace "JavaScript writer" with "JavaScript developer"" This reverts commit 1332cf53af981d0a7a6f801edd9632eb5c118a3f. M guides/source/working_with_javascript.md commit c8dec40 refs/heads/master Author: Xavier Noria Date: 2012-10-24 22:52:18 +0200 Revert "Improve "request response" term typing & fix a minor typo" This reverts commit a6d383c8b2afb253c009ad67d31aae3aa8dcc457. M guides/source/working_with_javascript.md commit 7cbce85 refs/heads/master Author: Xavier Noria Date: 2012-10-24 22:51:58 +0200 Revert "fix a typo" This reverts commit 6d927fb4da7a0a17d62109b7ef8798a8e75082a7. M guides/source/working_with_javascript.md commit 0f45570 refs/heads/master Author: Xavier Noria Date: 2012-10-24 22:51:20 +0200 Revert "Consistent headlines & ToC" This reverts commit 506257a173bb5cbb083ccae8d1b4ed82a456006a. M guides/source/working_with_javascript.md commit 6250873 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-24 10:58:04 -0500 With the Asset Pipeline the :cache and :concat options aren't used anymore M guides/source/asset_pipeline.md commit 53568e0 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-24 10:51:11 -0500 Update Upgrading Guide with removal of :cache and :concat options M guides/source/upgrading_ruby_on_rails.md commit 276e7b0 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-24 10:47:07 -0500 Update upgrading notes: users should stop using :concat and :cache options in asset tags M guides/source/3_1_release_notes.md commit 211accc refs/heads/master Author: Andrii Dovgaliuk Date: 2012-10-24 09:47:19 -0400 fix a typo in comments to ActiveRecord::Associations::Association.stale_state M activerecord/lib/active_record/associations/association.rb commit 7f09bcd refs/tags/v3.2.9.rc2 Merge: f7c2a81 9f1a47d Author: Rafael Mendonça França Date: 2012-10-24 06:38:31 -0700 Merge pull request #8022 from GRoguelon/3-2-stable Adding a missing parenthesis in the doc of String#parameterize. commit 1582100 refs/heads/master Merge: 9d66c40 1a6b082 Author: Rafael Mendonça França Date: 2012-10-24 06:26:24 -0700 Merge pull request #8021 from ugisozols/master Fix incorrect markdown by removing extra space. [ci skip] commit 9f1a47d refs/tags/v3.2.9.rc2 Author: Geoffrey Roguelon Date: 2012-10-24 15:25:35 +0200 Adding a missing parenthesis in the doc of String#parameterize. M activesupport/lib/active_support/core_ext/string/inflections.rb commit 1a6b082 refs/heads/master Author: Uģis Ozols Date: 2012-10-24 16:14:59 +0300 Fix incorrect markdown by removing extra space. M activerecord/CHANGELOG.md commit 1e593db refs/heads/master Author: Geoffrey Roguelon Date: 2012-10-24 15:08:58 +0200 Adding a missing parenthesis in the doc of String#parameterize. M activesupport/lib/active_support/core_ext/string/inflections.rb commit 96f5cea refs/heads/master Author: Noah Hendrix Date: 2012-10-23 18:42:37 -0700 make the cache test more @tenderlove(ing) and not depend on internal implentation M activesupport/test/caching_test.rb commit 9edd4e1 refs/heads/master Author: AvnerCohen Date: 2012-10-23 22:39:49 +0200 Migration of docs to 1.9 hash syntax M activerecord/lib/active_record/associations/preloader.rb M activerecord/lib/active_record/associations/through_association.rb M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 9d66c40 refs/heads/master Author: Xavier Noria Date: 2012-10-23 22:25:21 +0200 JS guide: applies guides casing guidelines for titles [ci skip] M guides/source/working_with_javascript_in_rails.md commit c3d4fc4 refs/heads/master Author: Xavier Noria Date: 2012-10-23 22:22:15 +0200 registers the JS guide in the CHANGELOG [ci skip] M guides/CHANGELOG.md commit 8c38172 refs/heads/master Author: Xavier Noria Date: 2012-10-23 22:21:02 +0200 JS guide: AJAX -> Ajax We discussed this on Twitter, seems to be the best option. M guides/source/working_with_javascript_in_rails.md commit 69e9715 refs/heads/master Author: Xavier Noria Date: 2012-10-23 22:09:10 +0200 renames the JS guide file name to match the new title [ci skip] D guides/source/working_with_javascript.md A guides/source/working_with_javascript_in_rails.md commit c145f35 refs/heads/master Author: Xavier Noria Date: 2012-10-23 22:08:20 +0200 adds Rails to the title of the JS guide [ci skip] M guides/source/working_with_javascript.md commit 3b89052 refs/heads/master Author: AvnerCohen Date: 2012-10-23 15:59:42 +0200 Updated activerecord test comments to new hash syntax M activerecord/test/cases/base_test.rb M activerecord/test/cases/validations/i18n_generate_message_validation_test.rb commit 30d2627 refs/heads/master Author: AvnerCohen Date: 2012-10-23 13:02:34 +0200 Another batch of hash syntax changes to comment, this time around, I tried to keep 'output' messages untouched. M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/relation.rb commit a5744f0 refs/heads/master Merge: 4049643 ff29dd8 Author: Rafael Mendonça França Date: 2012-10-23 03:25:17 -0700 Merge pull request #8014 from insside/task-test-typos changed test case name commit ff29dd8 refs/heads/master Author: Tima Maslyuchenko Date: 2012-10-23 12:43:11 +0300 changed test case name M railties/test/generators/task_generator_test.rb commit 81b7112 refs/heads/master Author: Noah Hendrix Date: 2012-10-23 00:04:42 -0700 pass the key to the block in cache.fetch on misses M activesupport/lib/active_support/cache.rb M activesupport/test/caching_test.rb commit 6004fd3 refs/heads/master Author: Luis M Date: 2012-10-23 01:05:00 -0500 Fixed typo on ActiveRecord nested_attributes. M activerecord/lib/active_record/nested_attributes.rb commit f7c2a81 refs/tags/v3.2.9.rc2 Author: Aaron Patterson Date: 2012-10-22 16:48:09 -0700 frozen state should be restored after txn is aborted M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit 4049643 refs/heads/master Author: Aaron Patterson Date: 2012-10-22 16:48:09 -0700 frozen state should be restored after txn is aborted M activerecord/lib/active_record/transactions.rb M activerecord/test/cases/transactions_test.rb commit 2ef4d5e refs/heads/master Author: Francesco Rodriguez Date: 2012-10-22 14:27:55 -0500 fix output messages - docs [ci skip] M activemodel/lib/active_model/errors.rb M activesupport/lib/active_support/core_ext/array/extract_options.rb M activesupport/lib/active_support/core_ext/array/wrap.rb M activesupport/lib/active_support/core_ext/hash/deep_merge.rb M activesupport/lib/active_support/core_ext/hash/slice.rb M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/i18n.md commit 78adc45 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-22 16:53:46 -0200 Add tests to make sure that the I18n taken message can be overrided in the activerecord scope. Related with 5341b84936d93ec90e6252af437a3871101c115a M activerecord/test/cases/validations/i18n_generate_message_validation_test.rb commit 77eb1fb refs/heads/master Author: AvnerCohen Date: 2012-10-22 19:34:24 +0200 convert comments to 1.9 hash syntax M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validator.rb M activemodel/test/cases/validations/i18n_generate_message_validation_test.rb M activemodel/test/cases/validations/validates_test.rb commit 01e38d8 refs/heads/master Author: Hendy Tanata Date: 2012-10-22 22:49:01 +0800 Fix code example in AR::AttributeMethods::BeforeTypeCast. M activerecord/lib/active_record/attribute_methods/before_type_cast.rb commit e041a50 refs/heads/master Merge: 3e6b2f5 ae27acb Author: Pablo Ifran Date: 2012-10-22 09:42:42 -0200 Merge branch 'master' of https://github.com/lifo/docrails Conflicts: activerecord/lib/active_record/callbacks.rb commit 3e6b2f5 refs/heads/master Author: Pablo Ifran Date: 2012-10-22 09:38:57 -0200 Changeing some code-styles of the examples & fix a typo on dependent option M activerecord/lib/active_record/callbacks.rb commit ae27acb refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 20:04:41 -0500 read_attribute is public [ci skip] M activerecord/lib/active_record/attribute_methods.rb commit 1e5a6c7 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 19:46:10 -0500 add docs to AR::AttributeMethods::BeforeTypeCast [ci skip] M activerecord/lib/active_record/attribute_methods/before_type_cast.rb commit bc3f960 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 19:20:18 -0500 improve AR::AttributeMethods documentation [ci skip] M activerecord/lib/active_record/attribute_methods.rb commit 7fbb21d refs/heads/master Author: AvnerCohen Date: 2012-10-21 22:28:50 +0200 More changes around 1.9 hash syntax Added missing space in previous hash related commit M activesupport/lib/active_support/core_ext/array/extract_options.rb M activesupport/lib/active_support/core_ext/hash/deep_merge.rb commit 40b0cec refs/heads/master Author: Cesar Carruitero Date: 2012-10-21 14:17:40 -0500 fix error in AssertTagHelper documentation [ci skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit e32bbc1 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 14:12:01 -0500 fix typo and improve example [ci skip] M activerecord/lib/active_record/attribute_methods/before_type_cast.rb commit c6fb832 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 14:06:53 -0500 update AR::AttributeMethods::BeforeTypeCast docs [ci skip] M activerecord/lib/active_record/attribute_methods/before_type_cast.rb commit 06e908c refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 13:46:41 -0500 Fix AR::AttributeMethods#[] example [ci skip] M activerecord/lib/active_record/attribute_methods.rb commit 0ce7ea6 refs/heads/master Author: Cesar Carruitero Date: 2012-10-21 13:56:56 -0500 update AssetTagHelper documentation [ci skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 8059b82 refs/heads/master Merge: 676ee78 1f74315 Author: Rafael Mendonça França Date: 2012-10-21 11:27:51 -0700 Merge pull request #8006 from GRoguelon/master Remove extra line in Gemfile generated commit 1f74315 refs/heads/master Author: Geoffrey Roguelon Date: 2012-10-21 20:17:23 +0200 Remove extra line in Gemfile under turbolinks. M railties/lib/rails/generators/rails/app/templates/Gemfile commit ae057d6 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 11:49:51 -0500 fix StrongParameters example [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 4736c14 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 11:49:14 -0500 nodoc deprecated AR::Fixtures constant [ci skip] M activerecord/lib/active_record/fixtures.rb commit 67ec9b7 refs/heads/master Author: Lennart Fridén Date: 2012-10-21 17:36:02 +0200 Fixes typo. M guides/source/working_with_javascript.md commit d279d3e refs/heads/master Author: Robin Dupret Date: 2012-10-21 17:48:40 +0300 Wrap a piece of code to a code block M guides/source/working_with_javascript.md commit 2767f01 refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-21 17:23:22 +0300 Fix a typo M guides/source/working_with_javascript.md commit 0033273 refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-21 17:21:50 +0300 Improve grammar M guides/source/working_with_javascript.md commit 507e522 refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-21 17:19:06 +0300 Improve grammar a bit M guides/source/working_with_javascript.md commit 1332cf5 refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-21 17:15:44 +0300 Explain where the acronym AJAX stands for & replace "JavaScript writer" with "JavaScript developer" M guides/source/working_with_javascript.md commit a6d383c refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-21 17:12:05 +0300 Improve "request response" term typing & fix a minor typo M guides/source/working_with_javascript.md commit 506257a refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-21 17:10:11 +0300 Consistent headlines & ToC I believe the topics and their headlines should be consistent for obvious reasons. Also M guides/source/working_with_javascript.md commit 6d927fb refs/heads/master Author: Agis Anastasopoulos Date: 2012-10-21 17:06:47 +0300 fix a typo M guides/source/working_with_javascript.md commit 676ee78 refs/heads/master Author: Vijay Dev Date: 2012-10-21 19:19:47 +0530 fix a couple of typos in the js guide [ci skip] M guides/source/working_with_javascript.md commit f938019 refs/heads/master Merge: cec66e5 e842813 Author: Vijay Dev Date: 2012-10-21 18:49:19 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md commit e842813 refs/heads/master Author: Vijay Dev Date: 2012-10-21 18:23:29 +0530 copy edits [ci skip] M activerecord/lib/active_record/callbacks.rb commit cec66e5 refs/heads/master Merge: 64391cd 4d0c43e Author: Xavier Noria Date: 2012-10-21 02:32:53 -0700 Merge pull request #7493 from steveklabnik/ajax_guide Re-writing the AJAX Guide commit c9a88a2 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 01:26:01 -0500 minor edits in AM documentation [ci skip] M activemodel/lib/active_model/attribute_methods.rb M activemodel/lib/active_model/callbacks.rb M activemodel/lib/active_model/conversion.rb M activemodel/lib/active_model/dirty.rb M activemodel/lib/active_model/errors.rb M activemodel/lib/active_model/lint.rb M activemodel/lib/active_model/model.rb M activemodel/lib/active_model/naming.rb M activemodel/lib/active_model/observing.rb M activemodel/lib/active_model/railtie.rb M activemodel/lib/active_model/serialization.rb M activemodel/lib/active_model/translation.rb M activemodel/lib/active_model/validations.rb M activemodel/lib/active_model/validations/acceptance.rb M activemodel/lib/active_model/validations/callbacks.rb M activemodel/lib/active_model/validations/confirmation.rb M activemodel/lib/active_model/validations/exclusion.rb M activemodel/lib/active_model/validations/inclusion.rb M activemodel/lib/active_model/validations/length.rb M activemodel/lib/active_model/validations/numericality.rb M activemodel/lib/active_model/validations/presence.rb M activemodel/lib/active_model/validator.rb commit aceb4a5 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-21 00:59:59 -0500 update AR::AttributeMethods documentation [ci skip] M activerecord/lib/active_record/attribute_methods.rb commit 19a2673 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-20 23:04:20 -0500 nodoc AR::Generators [ci skip] M activerecord/lib/rails/generators/active_record.rb M activerecord/lib/rails/generators/active_record/migration/migration_generator.rb M activerecord/lib/rails/generators/active_record/model/model_generator.rb M activerecord/lib/rails/generators/active_record/observer/observer_generator.rb commit 64391cd refs/heads/master Author: Rafael Mendonça França Date: 2012-10-20 17:09:27 -0300 Rotate the debug.log on each 100MB M activerecord/test/support/connection.rb commit 3be9e8a refs/heads/master Merge: 4ed1563 3ee6bcf Author: Rafael Mendonça França Date: 2012-10-20 12:43:03 -0700 Merge pull request #8002 from nashby/checkbox-include check_box value can be not only an object of Array class commit 3ee6bcf refs/heads/master Author: Vasiliy Ermolovich Date: 2012-10-20 22:27:43 +0300 check_box value can be not only an object of Array class there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case M actionpack/lib/action_view/helpers/tags/check_box.rb M actionpack/test/template/form_helper_test.rb commit 4ed1563 refs/heads/master Author: Jeremy Kemper Date: 2012-10-20 11:35:16 -0700 Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing." This reverts commit 83846838252397b3781eed165ca301e05db39293. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/explain.rb M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/model.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/serialization.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/inclusion_test.rb commit 71c67d1 refs/heads/master Author: AvnerCohen Date: 2012-10-20 16:54:43 +0200 Hash Syntax changes to 1.9 format M activesupport/lib/active_support/core_ext/array/wrap.rb M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/lib/active_support/core_ext/hash/slice.rb M activesupport/lib/active_support/core_ext/module/deprecation.rb M activesupport/lib/active_support/core_ext/time/calculations.rb commit c869ce0 refs/heads/master Merge: bfc6c17 5042eda Author: Carlos Antonio da Silva Date: 2012-10-20 07:19:02 -0700 Merge pull request #7951 from Grandrath/patch-1 Use `Rails.env` instead of `ENV['RAILS_ENV']`. Fix behavior of `rake db:structure:load`. commit 2471271 refs/tags/v3.2.9.rc2 Merge: b04ec27 f4ddc49 Author: Carlos Antonio da Silva Date: 2012-10-20 07:18:40 -0700 Merge pull request #7986 from Grandrath/patch-2 Fix behavior of `rake db:structure:load` for 3.2.8 commit bfc6c17 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-19 22:26:11 -0300 We don't need this anymore since we had a sprockets-rails release M railties/lib/rails/generators/app_base.rb commit 5341b84 refs/heads/master Merge: c50de96 f48b7cc Author: Rafael Mendonça França Date: 2012-10-19 17:39:58 -0700 Merge pull request #7995 from adimichele/master Small change to active_record/locale/en.yml commit f48b7cc refs/heads/master Author: Andrew DiMichele Date: 2012-10-19 12:21:01 -0700 Changed scope for "taken" error message translation to decrease precedence Moved activerecord.errors.messages.taken to errors.messages.taken so that translations for, e.g., errors.attributes.email.taken don't get overridden. Test that the translation for 'taken' can be overridden M activerecord/lib/active_record/locale/en.yml M activerecord/test/cases/validations/i18n_generate_message_validation_test.rb commit c50de96 refs/heads/master Merge: 86df55e e22e785 Author: Rafael Mendonça França Date: 2012-10-19 18:35:44 -0300 Merge pull request #7997 from steveklabnik/issue_733 Add i18n scope to disance_of_time_in_words. commit e22e785 refs/heads/master Author: Steve Klabnik Date: 2012-10-19 16:43:42 -0300 Add i18n scope to disance_of_time_in_words. This fixes #733. M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_i18n_test.rb commit 86df55e refs/heads/master Merge: 2268859 048866a Author: Rafael Mendonça França Date: 2012-10-19 12:44:40 -0700 Merge pull request #7996 from yahonda/revert_7994 Revert "truncate debug.log on each test run" I'm reverting this since we may want to see SQL results of subsequent tests run, to, per example, copare them. I didn't realized this first time but @yahonda pointed me out. commit 048866a refs/heads/master Author: Yasuo Honda Date: 2012-10-20 04:30:07 +0900 Revert "truncate debug.log on each test run" This reverts commit 98043c689f945cabffc043f4bdc80ab2a7edc763. Because if every time `debug.log` is truncated, developers have no way to see the previous ActiveRecord unit test results. `debug.log` file can be easily reduced by executing `$ touch /dev/null > debug.log` periodically. M activerecord/test/support/connection.rb commit d4db095 refs/heads/master Author: Pablo Ifran Date: 2012-10-19 17:25:45 -0200 ActiveRecord Callbacks ordering examples M activerecord/lib/active_record/callbacks.rb commit 2268859 refs/heads/master Merge: 8384683 98043c6 Author: Rafael Mendonça França Date: 2012-10-19 10:20:48 -0700 Merge pull request #7994 from frodsan/truncate_debug_log truncate debug.log on each test run commit 8384683 refs/heads/master Author: Jon Leighton Date: 2012-10-19 18:08:51 +0100 Get rid of the ActiveRecord::Model::DeprecationProxy thing. I think it's going to be too much pain to try to transition the :active_record load hook from executing against Base to executing against Model. For example, after Model is included in Base, and modules included in Model will no longer get added to the ancestors of Base. So plugins which wish to be compatible with both Model and Base should use the :active_record_model load hook which executes *before* Base gets loaded. In general, ActiveRecord::Model is an advanced feature at the moment and probably most people will continue to inherit from ActiveRecord::Base for the time being. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/explain.rb M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/locking/optimistic.rb M activerecord/lib/active_record/model.rb M activerecord/lib/active_record/model_schema.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/serialization.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/inclusion_test.rb commit 98043c6 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-19 12:11:38 -0500 truncate debug.log on each test run M activerecord/test/support/connection.rb commit 18e979e refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-19 13:30:03 -0300 Update rails gemspec to use sprockets-rails 2.0.0.rc1 So that we can bundle and travis can run our tests. M rails.gemspec commit 7efb1fe refs/heads/master Author: Jon Leighton Date: 2012-10-19 16:45:41 +0100 Rename the partial_updates config to partial_writes This reflects the fact that it now impact inserts as well as updates. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/dirty_test.rb commit aee07fe refs/heads/master Author: Hrvoje Šimić Date: 2012-10-19 17:24:34 +0200 include serializers in ActiveModel::Serialization example M activemodel/README.rdoc commit 2d2c823 refs/heads/master Author: Hrvoje Šimić Date: 2012-10-19 16:58:30 +0200 better examples in ActiveModel readme M activemodel/README.rdoc commit 0096f53 refs/heads/master Author: Jon Leighton Date: 2012-10-19 15:56:18 +0100 nodoc the first_or_create methods and document alternatives M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relations_test.rb M guides/source/active_record_querying.md commit 45d585e refs/heads/master Author: Jon Leighton Date: 2012-10-19 15:17:06 +0100 fix test :/ M activerecord/test/cases/migration_test.rb commit af8c8b4 refs/heads/master Author: Jon Leighton Date: 2012-10-19 15:08:58 +0100 The default value of a text/blob in mysql strict mode should be nil In non-strict mode it is '', but if someone is in strict mode then we should honour the strict semantics. Also, this removes the need for a completely horrible hack in dirty.rb. Closes #7780 M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/test/cases/defaults_test.rb commit eb72e62 refs/heads/master Author: Jon Leighton Date: 2012-10-19 13:18:47 +0100 Add Relation#find_or_create_by and friends This is similar to #first_or_create, but slightly different and a nicer API. See the CHANGELOG/docs in the commit. Fixes #7853 M activerecord/CHANGELOG.md M activerecord/lib/active_record/querying.rb M activerecord/lib/active_record/relation.rb M activerecord/test/cases/relations_test.rb M guides/source/active_record_querying.md commit b83e0c3 refs/heads/master Author: Robb Shecter Date: 2012-10-18 22:41:31 -0700 Corrected the logic in production.rb comment. M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit feb9c5f refs/heads/master Author: Francesco Rodriguez Date: 2012-10-18 21:37:43 -0500 remove assert_valid method from testing guide [ci skip] M guides/source/testing.md commit 0d7b0f0 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 18:13:01 -0700 synchronize on param filter cache. Do we actually need this cache? M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 8654f8c refs/heads/master Author: Aaron Patterson Date: 2012-10-18 18:10:32 -0700 add another singleton for environment filtering M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 73de222 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 18:03:09 -0700 oops, forgot the default parameter M actionpack/lib/action_dispatch/http/parameter_filter.rb commit 481f30e refs/heads/master Author: Aaron Patterson Date: 2012-10-18 17:50:02 -0700 keep a singleton filter around that we can use when no filter is set M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 79e91cc refs/heads/master Author: Aaron Patterson Date: 2012-10-18 17:38:03 -0700 move compiled filters to their own class so that recursive calls don't need to check for the length of @filters M actionpack/lib/action_dispatch/http/parameter_filter.rb commit be9fc77 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 17:18:25 -0700 nil isn't a valid filter M actionpack/lib/action_dispatch/http/parameter_filter.rb commit 6c3166a refs/heads/master Author: Aaron Patterson Date: 2012-10-18 17:16:33 -0700 prevent people from accidentally modifying the filter word M actionpack/lib/action_dispatch/http/parameter_filter.rb commit c6c6ffb refs/heads/master Author: Aaron Patterson Date: 2012-10-18 16:54:28 -0700 simplify filter enabled checking M actionpack/lib/action_dispatch/http/parameter_filter.rb commit 57d3817 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 16:51:59 -0700 if no filters are supplied, default to an empty list M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 210c841 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 16:51:35 -0700 initialize required instance variables for this mixin M actionpack/lib/action_dispatch/http/filter_parameters.rb commit 7cc5bf5 refs/heads/master Author: thedarkone Date: 2012-06-30 17:09:12 +0200 There is already a Set of non-hidden action_names lying around. M actionpack/lib/action_controller/metal/hide_actions.rb commit 872d8c3 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 16:05:28 -0700 eagerly populate the http method loookup cache so we don't need locks M actionpack/lib/action_dispatch/http/request.rb commit 13655a4 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 15:32:44 -0700 move cache inside the instance so we do not need locking M actionpack/lib/action_dispatch/http/headers.rb commit b2debfb refs/heads/master Author: Aaron Patterson Date: 2012-10-18 15:22:58 -0700 add test for fetch with a block M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit 6ea781c refs/heads/master Author: Aaron Patterson Date: 2012-10-18 15:20:30 -0700 prefer composition over inheritence M actionpack/lib/action_dispatch/http/headers.rb M actionpack/test/dispatch/header_test.rb commit d774f4c refs/heads/master Author: Adam Coffman Date: 2012-10-18 16:32:31 -0500 Change 'branches' to 'branch' [ci skip] M guides/source/contributing_to_ruby_on_rails.md commit a3ad0a7 refs/heads/master Author: Aaron Patterson Date: 2012-10-18 13:14:43 -0700 fix assertions M activesupport/test/descendants_tracker_test_cases.rb commit 9f84e60 refs/heads/master Author: thedarkone Date: 2012-06-30 21:51:57 +0200 Make DescendantsTracker thread safe and optimize the #descendants method. M activesupport/lib/active_support/descendants_tracker.rb M activesupport/test/descendants_tracker_test_cases.rb M activesupport/test/descendants_tracker_with_autoloading_test.rb commit 4f106bb refs/heads/master Author: Aaron Patterson Date: 2012-10-18 12:04:51 -0700 some ruby interpreters don't have ruby-prof so just skip the tests rather than exiting the process. M activesupport/lib/active_support/testing/performance/ruby.rb M activesupport/test/testing/performance_test.rb commit 144d747 refs/tags/v3.1.9 Author: Rafael Mendonça França Date: 2012-10-18 14:45:37 -0300 Require ActionController::Railtie in the default middleware stack. This will make possible to do a frameworkless initialization since the the default middleware stack is self contained. M railties/lib/rails/application.rb commit 2834454 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-18 12:44:28 -0500 add a nested attributes example into Strong Parameters documentation [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit b04ec27 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-18 14:38:41 -0300 Require ActionController::Railtie in the default middleware stack. This will make possible to do a frameworkless initialization since the the default middleware stack is self contained. M railties/lib/rails/application.rb commit 11acaa1 refs/heads/master Merge: ff79df0 a48ef9b Author: Rafael Mendonça França Date: 2012-10-18 14:35:31 -0300 Merge pull request #7975 from butcher/extend_date_select_helper_functionality Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md commit ff79df0 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-18 14:33:40 -0300 Remove warning setting eager_load M railties/test/application/url_generation_test.rb commit 90733e7 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-18 14:31:52 -0300 Don't use action_controller.perform_caching to enable rack-rack. Setting the action_dispatch.rack_cache options to true or a hash should be the way to enable it. M railties/lib/rails/application.rb M railties/test/application/middleware/cache_test.rb M railties/test/application/middleware_test.rb commit 12fb937 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-18 14:31:12 -0300 Fix the app_generator and plugin_new tests M railties/lib/rails/generators/app_base.rb M railties/test/generators/app_generator_test.rb commit a48ef9b refs/heads/master Author: Pavel Nikitin Date: 2012-10-17 12:33:17 +0300 Extend date_select helper functionality. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/date_helper.rb M actionpack/test/template/date_helper_test.rb commit 55d153e refs/heads/master Merge: c1e080d a774354 Author: Rafael Mendonça França Date: 2012-10-18 07:34:17 -0700 Merge pull request #7990 from mrbrdo/master Credit for previous commit [ci skip] commit a774354 refs/heads/master Author: Jan Berdajs Date: 2012-10-18 16:28:45 +0200 add credit to committer of pull request #6569 M activemodel/CHANGELOG.md commit 6dfa701 refs/tags/v3.2.9.rc2 Merge: 9a38e73 1f73a53 Author: Rafael Mendonça França Date: 2012-10-18 06:09:47 -0700 Merge pull request #7989 from senny/backport_7969 backport: active_model/validations requires necessary files to run commit 1f73a53 refs/tags/v3.2.9.rc2 Author: Yves Senn Date: 2012-10-16 21:34:58 +0200 active_model/validations requires necessary files to run M activemodel/lib/active_model/validations.rb commit c1e080d refs/heads/master Merge: fc32ff4 a06012c Author: Rafael Mendonça França Date: 2012-10-18 05:32:01 -0700 Merge pull request #7969 from senny/active_model_validations_requires_necessary_files active_model/validations requires necessary files to run commit 5042eda refs/heads/master Author: Martin Grandrath Date: 2012-10-15 10:58:01 +0300 Don't use test environment by default when running rake db:structure:load; #7951 `ENV['RAILS_ENV']` is not defined unless explicitly specified on the command line when running `rake db:structure:load`. M activerecord/lib/active_record/railties/databases.rake commit f4ddc49 refs/tags/v3.2.9.rc2 Author: Martin Grandrath Date: 2012-10-18 10:56:44 +0200 Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951 `ENV['RAILS_ENV']` is not defined unless explicitly specified on the command line when running `rake db:structure:load`. This patch lets the rake task retrieve the environment from `Rails.env` which defaults to "development". M activerecord/lib/active_record/railties/databases.rake commit f069ec1 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-18 01:38:36 -0500 remove some non-breaking spaces [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit f12244b refs/heads/master Author: Francesco Rodriguez Date: 2012-10-18 01:22:55 -0500 remove non-breaking spaces [ci skip] M activemodel/lib/active_model/secure_password.rb commit a06012c refs/heads/master Author: Yves Senn Date: 2012-10-16 21:34:58 +0200 active_model/validations requires necessary files to run M activemodel/lib/active_model/validations.rb commit f00b33e refs/heads/master Author: Yves Senn Date: 2012-10-18 07:43:58 +0200 cleanup, replace non-breaking spaces with spaces M activemodel/lib/active_model/validations.rb commit fc32ff4 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-18 01:03:24 -0300 Now the Sprockets railtie lives in sprockets/railtie M guides/source/initialization.md M railties/lib/rails/all.rb M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb commit 0c3ca0f refs/heads/master Author: Rafael Mendonça França Date: 2012-10-18 00:31:46 -0300 Permit string and float values in the multiparameter attributes M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/multi_parameter_attributes_test.rb commit ae7f109 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-18 00:31:05 -0300 Typecast to string and array are not supported in multiparameter attributes M activerecord/lib/active_record/attribute_assignment.rb commit d88b65f refs/heads/master Author: Joshua Peek Date: 2012-10-17 21:51:37 -0500 Change back to official sprockets-rails M Gemfile M railties/lib/rails/generators/app_base.rb commit a3913ca refs/heads/master Author: Joshua Peek Date: 2012-10-17 21:37:01 -0500 Add changelog entry for precompile config M actionpack/CHANGELOG.md commit 0dfebbc refs/heads/master Merge: f4c6ecc 117d5e3 Author: Rafael Mendonça França Date: 2012-10-17 19:18:09 -0700 Merge pull request #7968 from josh/only-precompile-app-assets-by-default Only compile non-js/css under app/assets by default commit f4c6ecc refs/heads/master Merge: d7f8b2a b8c7e31 Author: Rafael Mendonça França Date: 2012-10-17 19:17:49 -0700 Merge pull request #7964 from josh/josh-sprockets-rails Switch to new sprockets-rails plugin commit 9a38e73 refs/tags/v3.2.9.rc2 Author: Santiago Pastorino Date: 2012-10-16 09:46:44 -0700 Merge pull request #7371 from csmuc/fix_dup_validation_errors Dup'ed ActiveRecord objects may not share the errors object Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/dup_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/dup_test.rb commit d7f8b2a refs/heads/master Author: Rafael Mendonça França Date: 2012-10-17 22:17:08 -0300 Add more CHANGELOG entries from #7927 Also remove references for RAILS_ASSET_ID from the guides [ci skip] M actionpack/CHANGELOG.md M guides/source/configuring.md commit e627834 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-17 21:03:56 -0300 Add CHANGELOG entry for #7927 Removed the asset_path configuration from the guides and added an entry in the upgrading_ruby_on_rails guide [ci skip] M actionpack/CHANGELOG.md M guides/source/configuring.md M guides/source/upgrading_ruby_on_rails.md commit 506e266 refs/heads/master Author: Aaron Patterson Date: 2012-10-17 15:55:30 -0700 remove unused variables. Oops! M activerecord/test/cases/calculations_test.rb commit e06c06d refs/heads/master Author: Aaron Patterson Date: 2012-10-17 15:51:17 -0700 use columns hash to look up the column for the count field M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 01149dd refs/heads/master Author: Aaron Patterson Date: 2012-10-17 15:20:51 -0700 fix Digestor to be thread safe. Add a lock on the cache so that we don't have concurrency issues when calculating the cache. M actionpack/lib/action_view/digestor.rb commit d410ac5 refs/heads/master Author: Aaron Patterson Date: 2012-10-17 11:30:08 -0700 use the tmp filesystem rather than our own thing. M actionpack/test/template/digestor_test.rb commit 759e797 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-17 10:19:31 -0300 Revert "Change with start of translation in internationalization, this time with pt_br." This reverts commit 09682e9e7328b1c1466ae87af08f1785a0b5d7e3. Conflicts: guides/source/en/association_basics.md REASON: Translation work can not be done in the docrails repository M guides/rails_guides/generator.rb M guides/rails_guides/helpers.rb M guides/rails_guides/markdown.rb M guides/source/association_basics.md D guides/source/en/2_2_release_notes.md D guides/source/en/2_3_release_notes.md D guides/source/en/3_0_release_notes.md D guides/source/en/3_1_release_notes.md D guides/source/en/3_2_release_notes.md D guides/source/en/4_0_release_notes.md D guides/source/en/_license.html.erb D guides/source/en/_welcome.html.erb D guides/source/en/action_controller_overview.md D guides/source/en/action_mailer_basics.md D guides/source/en/action_view_overview.md D guides/source/en/active_model_basics.md D guides/source/en/active_record_basics.md D guides/source/en/active_record_querying.md D guides/source/en/active_record_validations_callbacks.md D guides/source/en/active_support_core_extensions.md D guides/source/en/active_support_instrumentation.md D guides/source/en/ajax_on_rails.md D guides/source/en/api_documentation_guidelines.md D guides/source/en/asset_pipeline.md D guides/source/en/association_basics.md D guides/source/en/caching_with_rails.md D guides/source/en/command_line.md D guides/source/en/configuring.md D guides/source/en/contributing_to_ruby_on_rails.md D guides/source/en/credits.html.erb D guides/source/en/debugging_rails_applications.md D guides/source/en/development_dependencies_install.md D guides/source/en/documents.yaml D guides/source/en/engines.md D guides/source/en/form_helpers.md D guides/source/en/generators.md D guides/source/en/getting_started.md D guides/source/en/i18n.md D guides/source/en/index.html.erb D guides/source/en/initialization.md D guides/source/en/kindle/KINDLE.md D guides/source/en/kindle/copyright.html.erb D guides/source/en/kindle/layout.html.erb D guides/source/en/kindle/rails_guides.opf.erb D guides/source/en/kindle/toc.html.erb D guides/source/en/kindle/toc.ncx.erb D guides/source/en/kindle/welcome.html.erb D guides/source/en/layout.html.erb D guides/source/en/layouts_and_rendering.md D guides/source/en/migrations.md D guides/source/en/nested_model_forms.md D guides/source/en/performance_testing.md D guides/source/en/plugins.md D guides/source/en/rails_application_templates.md D guides/source/en/rails_on_rack.md D guides/source/en/routing.md D guides/source/en/ruby_on_rails_guides_guidelines.md D guides/source/en/security.md D guides/source/en/testing.md D guides/source/en/upgrading_ruby_on_rails.md D guides/source/pt_br/4_0_release_notes.md D guides/source/pt_br/_license.html.erb D guides/source/pt_br/_welcome.html.erb D guides/source/pt_br/credits.html.erb D guides/source/pt_br/documents.yaml D guides/source/pt_br/index.html.erb D guides/source/pt_br/layout.html.erb commit 9eeb009 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-17 10:15:55 -0300 Revert "divided into folder with the language" This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252. REASON: Translation work can not be done in the docrails repository A guides/source/2_2_release_notes.md A guides/source/2_3_release_notes.md A guides/source/3_0_release_notes.md A guides/source/3_1_release_notes.md A guides/source/3_2_release_notes.md A guides/source/4_0_release_notes.md A guides/source/_license.html.erb A guides/source/_welcome.html.erb A guides/source/action_controller_overview.md A guides/source/action_mailer_basics.md A guides/source/action_view_overview.md A guides/source/active_model_basics.md A guides/source/active_record_basics.md A guides/source/active_record_querying.md A guides/source/active_record_validations_callbacks.md A guides/source/active_support_core_extensions.md A guides/source/active_support_instrumentation.md A guides/source/ajax_on_rails.md A guides/source/api_documentation_guidelines.md A guides/source/asset_pipeline.md A guides/source/association_basics.md A guides/source/caching_with_rails.md A guides/source/command_line.md A guides/source/configuring.md A guides/source/contributing_to_ruby_on_rails.md A guides/source/credits.html.erb A guides/source/debugging_rails_applications.md A guides/source/development_dependencies_install.md A guides/source/documents.yaml A guides/source/engines.md A guides/source/form_helpers.md A guides/source/generators.md A guides/source/getting_started.md A guides/source/i18n.md A guides/source/index.html.erb A guides/source/initialization.md A guides/source/kindle/KINDLE.md A guides/source/kindle/copyright.html.erb A guides/source/kindle/layout.html.erb A guides/source/kindle/rails_guides.opf.erb A guides/source/kindle/toc.html.erb A guides/source/kindle/toc.ncx.erb A guides/source/kindle/welcome.html.erb A guides/source/layout.html.erb A guides/source/layouts_and_rendering.md A guides/source/migrations.md A guides/source/nested_model_forms.md A guides/source/performance_testing.md A guides/source/plugins.md A guides/source/rails_application_templates.md A guides/source/rails_on_rack.md A guides/source/routing.md A guides/source/ruby_on_rails_guides_guidelines.md A guides/source/security.md A guides/source/testing.md A guides/source/upgrading_ruby_on_rails.md commit 701bd83 refs/heads/master Author: Jaime Iniesta Date: 2012-10-17 12:50:08 +0200 Fix typos in Association Basics guide M guides/source/en/association_basics.md commit bf876af refs/heads/master Merge: c432c74 25262bc Author: José Valim Date: 2012-10-17 02:47:38 -0700 Merge pull request #7972 from scottwillson/fix-double-presence-of-errors-2 Fix bug with presence validation of associations. commit f5b9ed4 refs/heads/master Author: Rodrigo Martins Date: 2012-10-17 03:34:10 -0300 divided into folder with the language D guides/source/2_2_release_notes.md D guides/source/2_3_release_notes.md D guides/source/3_0_release_notes.md D guides/source/3_1_release_notes.md D guides/source/3_2_release_notes.md D guides/source/4_0_release_notes.md D guides/source/_license.html.erb D guides/source/_welcome.html.erb D guides/source/action_controller_overview.md D guides/source/action_mailer_basics.md D guides/source/action_view_overview.md D guides/source/active_model_basics.md D guides/source/active_record_basics.md D guides/source/active_record_querying.md D guides/source/active_record_validations_callbacks.md D guides/source/active_support_core_extensions.md D guides/source/active_support_instrumentation.md D guides/source/ajax_on_rails.md D guides/source/api_documentation_guidelines.md D guides/source/asset_pipeline.md D guides/source/association_basics.md D guides/source/caching_with_rails.md D guides/source/command_line.md D guides/source/configuring.md D guides/source/contributing_to_ruby_on_rails.md D guides/source/credits.html.erb D guides/source/debugging_rails_applications.md D guides/source/development_dependencies_install.md D guides/source/documents.yaml D guides/source/engines.md D guides/source/form_helpers.md D guides/source/generators.md D guides/source/getting_started.md D guides/source/i18n.md D guides/source/index.html.erb D guides/source/initialization.md D guides/source/kindle/KINDLE.md D guides/source/kindle/copyright.html.erb D guides/source/kindle/layout.html.erb D guides/source/kindle/rails_guides.opf.erb D guides/source/kindle/toc.html.erb D guides/source/kindle/toc.ncx.erb D guides/source/kindle/welcome.html.erb D guides/source/layout.html.erb D guides/source/layouts_and_rendering.md D guides/source/migrations.md D guides/source/nested_model_forms.md D guides/source/performance_testing.md D guides/source/plugins.md D guides/source/rails_application_templates.md D guides/source/rails_on_rack.md D guides/source/routing.md D guides/source/ruby_on_rails_guides_guidelines.md D guides/source/security.md D guides/source/testing.md D guides/source/upgrading_ruby_on_rails.md commit 09682e9 refs/heads/master Author: Rodrigo Martins Date: 2012-10-17 03:30:45 -0300 Change with start of translation in internationalization, this time with pt_br. M guides/rails_guides/generator.rb M guides/rails_guides/helpers.rb M guides/rails_guides/markdown.rb A guides/source/en/2_2_release_notes.md A guides/source/en/2_3_release_notes.md A guides/source/en/3_0_release_notes.md A guides/source/en/3_1_release_notes.md A guides/source/en/3_2_release_notes.md A guides/source/en/4_0_release_notes.md A guides/source/en/_license.html.erb A guides/source/en/_welcome.html.erb A guides/source/en/action_controller_overview.md A guides/source/en/action_mailer_basics.md A guides/source/en/action_view_overview.md A guides/source/en/active_model_basics.md A guides/source/en/active_record_basics.md A guides/source/en/active_record_querying.md A guides/source/en/active_record_validations_callbacks.md A guides/source/en/active_support_core_extensions.md A guides/source/en/active_support_instrumentation.md A guides/source/en/ajax_on_rails.md A guides/source/en/api_documentation_guidelines.md A guides/source/en/asset_pipeline.md A guides/source/en/association_basics.md A guides/source/en/caching_with_rails.md A guides/source/en/command_line.md A guides/source/en/configuring.md A guides/source/en/contributing_to_ruby_on_rails.md A guides/source/en/credits.html.erb A guides/source/en/debugging_rails_applications.md A guides/source/en/development_dependencies_install.md A guides/source/en/documents.yaml A guides/source/en/engines.md A guides/source/en/form_helpers.md A guides/source/en/generators.md A guides/source/en/getting_started.md A guides/source/en/i18n.md A guides/source/en/index.html.erb A guides/source/en/initialization.md A guides/source/en/kindle/KINDLE.md A guides/source/en/kindle/copyright.html.erb A guides/source/en/kindle/layout.html.erb A guides/source/en/kindle/rails_guides.opf.erb A guides/source/en/kindle/toc.html.erb A guides/source/en/kindle/toc.ncx.erb A guides/source/en/kindle/welcome.html.erb A guides/source/en/layout.html.erb A guides/source/en/layouts_and_rendering.md A guides/source/en/migrations.md A guides/source/en/nested_model_forms.md A guides/source/en/performance_testing.md A guides/source/en/plugins.md A guides/source/en/rails_application_templates.md A guides/source/en/rails_on_rack.md A guides/source/en/routing.md A guides/source/en/ruby_on_rails_guides_guidelines.md A guides/source/en/security.md A guides/source/en/testing.md A guides/source/en/upgrading_ruby_on_rails.md A guides/source/pt_br/4_0_release_notes.md A guides/source/pt_br/_license.html.erb A guides/source/pt_br/_welcome.html.erb A guides/source/pt_br/credits.html.erb A guides/source/pt_br/documents.yaml A guides/source/pt_br/index.html.erb A guides/source/pt_br/layout.html.erb commit 25262bc refs/heads/master Author: Scott Willson Date: 2012-10-16 19:04:40 -0700 Fix bug with presence validation of associations. Would incorrectly add duplicated errors when the association was blank. Bug introduced in 1fab518c6a75dac5773654646eb724a59741bc13. M activerecord/CHANGELOG.md M activerecord/lib/active_record/validations/presence.rb M activerecord/test/cases/validations/presence_validation_test.rb commit 117d5e3 refs/heads/master Author: Joshua Peek Date: 2012-10-16 14:17:41 -0500 Only compile non-js/css under app/assets by default M railties/lib/rails/application/configuration.rb commit c432c74 refs/heads/master Merge: 12a0383 fb66521 Author: Santiago Pastorino Date: 2012-10-16 09:46:44 -0700 Merge pull request #7371 from csmuc/fix_dup_validation_errors Dup'ed ActiveRecord objects may not share the errors object commit fb66521 refs/heads/master Author: Christian Seiler Date: 2012-08-16 23:19:47 +0200 Call super to nullify the reference to the original errors object in the dup'ed object (call ActiveModel::Validations#initialize_dup). Closes #7291 M activerecord/CHANGELOG.md M activerecord/lib/active_record/timestamp.rb M activerecord/test/cases/dup_test.rb commit 12a0383 refs/heads/master Merge: 74bf8af ea14e76 Author: Carlos Antonio da Silva Date: 2012-10-16 04:27:14 -0700 Merge pull request #7963 from arunagw/redcarpet_not_for_jruby Add :platform to redcarpet gem, pointing to :ruby only. commit ea14e76 refs/heads/master Author: Arun Agrawal Date: 2012-10-16 16:42:14 +0530 redcarpet gem will not work with JRuby! M Gemfile commit 74bf8af refs/heads/master Author: Xavier Noria Date: 2012-10-16 12:05:00 +0200 Revert "remove unnecessary object/conversions file" This file is used at least by Active Merchant, its existence is maybe not necessary but no big deal either. This reverts commit ae9b3d7cecd77b9ace38671b183e1a360bf632b6. M activesupport/lib/active_support/core_ext/object.rb A activesupport/lib/active_support/core_ext/object/conversions.rb M activesupport/test/core_ext/array_ext_test.rb M activesupport/test/core_ext/hash_ext_test.rb commit d1fb675 refs/heads/master Merge: d207a33 13cdfac Author: Santiago Pastorino Date: 2012-10-15 21:27:57 -0700 Merge pull request #7958 from mattdbridges/rails-guides-active-support-addition Adding reference a few Time and Date aliases in Rails 4.0 release notes commit 13cdfac refs/heads/master Author: Matt Bridges Date: 2012-10-15 23:00:54 -0500 Adding reference a few Time and Date aliases I originally contributed these aliases 10 months ago and just never got it added to the Rails 4.0 release notes. Here they are. M guides/source/4_0_release_notes.md commit d761eab refs/heads/master Author: AvnerCohen Date: 2012-10-16 05:08:10 +0200 Moving code base to 1.9 hash syntax M railties/lib/rails/generators/base.rb M railties/lib/rails/generators/named_base.rb M railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb commit b8c7e31 refs/heads/master Author: Joshua Peek Date: 2012-10-15 18:22:12 -0500 Switch to new sprockets-rails plugin M Gemfile M rails.gemspec M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/test/application/assets_test.rb M railties/test/generators/app_generator_test.rb commit d207a33 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-10-15 19:19:25 -0300 Move changelog entry from #7439 to the top [ci skip] M activerecord/CHANGELOG.md commit 0a78417 refs/heads/master Merge: 081f0ad 51d6e21 Author: Aaron Patterson Date: 2012-10-15 14:44:10 -0700 Merge pull request #7439 from featurist/master ActiveRecord: sum expression returns string '0' for no records, fixed commit 51d6e21 refs/heads/master Author: Tim Macfarlane Date: 2012-08-24 10:08:36 +0100 ActiveRecord: sum expression returns string '0' for no records, fixed M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb commit 081f0ad refs/heads/master Author: Aaron Patterson Date: 2012-10-15 14:22:15 -0700 use `setup` for setting up the test M activerecord/test/cases/schema_dumper_test.rb commit d92e66f refs/tags/v3.2.9.rc2 Author: Aaron Patterson Date: 2012-10-15 14:12:48 -0700 Synchronize around deleting from the reserved connections hash. Fixes #7955 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit 4f44173 refs/heads/master Merge: dc126cf c4276dd Author: Rafael Mendonça França Date: 2012-10-15 11:48:38 -0700 Merge pull request #7956 from josh/ignore-asset-url-query-or-anchor Ignore asset url query string or anchor when generating path commit c4276dd refs/heads/master Author: Joshua Peek Date: 2012-10-15 13:30:24 -0500 Ignore asset url query string or anchor when appending extensions and computing public path M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit dc126cf refs/heads/master Author: Aaron Patterson Date: 2012-10-15 11:18:38 -0700 buckets hash isn't public, so use symbol keys to avoid string allocations M activerecord/lib/active_record/relation/query_methods.rb commit 02174a3 refs/heads/master Author: Aaron Patterson Date: 2012-10-15 11:11:43 -0700 Move two hotspots to use Hash[] rather than Hash#dup https://bugs.ruby-lang.org/issues/7166 M activerecord/lib/active_record/relation.rb commit 046ab84 refs/heads/master Merge: 46dc6e7 eafc2b0 Author: Rafael Mendonça França Date: 2012-10-15 10:23:12 -0700 Merge pull request #7927 from josh/asset-path-helper Refactor AssetUrlHelper commit eafc2b0 refs/heads/master Author: Joshua Peek Date: 2012-10-15 11:46:05 -0500 Use sprockets-rails master M Gemfile M railties/lib/rails/generators/app_base.rb commit 6601917 refs/heads/master Author: Joshua Peek Date: 2012-10-15 10:57:32 -0500 Extract compute_asset_extname and allow extname to be disabled M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit 9d41238 refs/heads/master Author: Joshua Peek Date: 2012-10-15 10:23:07 -0500 Sprockets-rails branch M Gemfile commit 8d7fc73 refs/heads/master Author: Joshua Peek Date: 2012-10-15 10:22:22 -0500 Use sprockets-rails branch for now M railties/lib/rails/generators/app_base.rb commit c800e27 refs/heads/master Merge: 7dba159 46dc6e7 Author: Joshua Peek Date: 2012-10-15 10:20:50 -0500 Merge branch 'master' into asset-path-helper Conflicts: railties/test/application/configuration_test.rb commit b8dafa3 refs/heads/master Author: Jaime Iniesta Date: 2012-10-15 16:58:47 +0200 Fix formatting errors on the Active Record Validations and Callbacks guide M guides/source/active_record_validations_callbacks.md commit 7dba159 refs/heads/master Author: Joshua Peek Date: 2012-10-15 09:51:20 -0500 Remove old asset_path from rails config M actionmailer/lib/action_mailer/railtie.rb M railties/lib/rails/application/configuration.rb M railties/test/application/configuration_test.rb commit 3db6990 refs/heads/master Author: Joshua Peek Date: 2012-10-15 09:47:16 -0500 :fire: Rails asset id support M actionpack/lib/abstract_controller/asset_paths.rb M actionpack/lib/action_controller/railtie.rb M actionpack/lib/action_view/helpers.rb D actionpack/lib/action_view/helpers/asset_id_helper.rb M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/lib/action_view/railtie.rb M actionpack/test/template/asset_tag_helper_test.rb commit 511382b refs/heads/master Author: Joshua Peek Date: 2012-10-15 09:41:34 -0500 merge! default asset tag options M actionpack/lib/action_view/helpers/asset_url_helper.rb commit e6451a5 refs/heads/master Author: Joshua Peek Date: 2012-10-15 09:40:08 -0500 Just check request instead of controller.request M actionpack/lib/action_view/helpers/asset_url_helper.rb commit 46dc6e7 refs/heads/master Author: Jeremy Kemper Date: 2012-10-15 06:32:16 -0700 ruby-prof isn't compatible with ruby trunk after 36925 M Gemfile commit 5225a93 refs/heads/master Merge: 2b4c3c8 0b238e4 Author: Santiago Pastorino Date: 2012-10-15 05:56:18 -0700 Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanup Removed useless "extend SanitizeHelper::ClassMethods" commit 2b4c3c8 refs/heads/master Merge: a550a68 a0f97e4 Author: Santiago Pastorino Date: 2012-10-15 05:53:30 -0700 Merge pull request #7952 from ayrton/minor_cleanup Minor cleanup, helper method was only used once commit 0b238e4 refs/heads/master Author: Andrey Samsonov Date: 2012-10-15 12:25:23 +0000 Removed useless "extend SanitizeHelper::ClassMethods" Since SanitizeHelper includes ActiveSupport::Concern, extending of it ClassMethods is no needed. M actionpack/lib/action_view/helpers.rb commit a0f97e4 refs/heads/master Author: Ayrton De Craene Date: 2012-10-15 11:30:14 +0200 Minor cleanup, helper method was only used once M actionpack/test/template/sanitize_helper_test.rb commit fe5f5d1 refs/heads/master Author: Cesar Carruitero Date: 2012-10-15 01:33:15 -0500 fix link bug in contributing page M guides/source/contributing_to_ruby_on_rails.md commit 4d0c43e refs/heads/master Author: Steve Klabnik Date: 2012-08-30 19:39:49 -0700 Working With JavaScript guide. Originally, this guide was called "AJAX on Rails," but really, it's not just about AJAX. This was never finished, but it got accidentally generated and Google found out about it. In the meantime, all the guides were converted to markdown, as well. So here's a new guide. It covers all of the built-in helpers that use ajax requests, it covers CoffeeScript, and it covers UJS. D guides/source/ajax_on_rails.md A guides/source/working_with_javascript.md commit c615161 refs/heads/master Author: AvnerCohen Date: 2012-10-15 00:19:07 +0200 Hash syntax to 1.9 style M railties/lib/rails.rb M railties/lib/rails/paths.rb commit a550a68 refs/heads/master Merge: ae61c03 08927cf Author: Rafael Mendonça França Date: 2012-10-14 14:13:14 -0700 Merge pull request #7947 from acapilleri/uniqueness_validate refactoring of uniqueness validate_each commit 08927cf refs/heads/master Author: Angelo Capilleri Date: 2012-10-14 23:01:59 +0200 refactoring of uniqueness validate_each get scope_value only one time dependig on reflection M activerecord/lib/active_record/validations/uniqueness.rb commit ae61c03 refs/heads/master Merge: 4e8cf43 6f400da Author: Rafael Mendonça França Date: 2012-10-14 10:44:39 -0700 Merge pull request #7942 from IPGlider/master Fix typo in inet and cidr saving commit 6f400da refs/heads/master Author: Miguel Herranz Date: 2012-10-14 15:50:17 +0200 Fix typo in inet and cidr saving M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/test/cases/adapters/postgresql/quoting_test.rb commit b3485b7 refs/tags/v3.2.9.rc2 Merge: 84c3774 3006c59 Author: Rafael Mendonça França Date: 2012-10-14 10:40:33 -0700 Merge pull request #7940 from arturopie/7914-backport-to-3-2-stable Backport fix of issue #7914 to 3-2-stable commit 4e8cf43 refs/heads/master Author: Jeremy Kemper Date: 2012-10-14 10:20:07 -0700 Fix typo in #7941 M railties/test/railties/engine_test.rb commit 7b290ad refs/heads/master Author: Jeremy Kemper Date: 2012-10-14 10:03:17 -0700 The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now. M Gemfile commit 6338e1e refs/heads/master Merge: 1974911 5ad7f8a Author: Jeremy Kemper Date: 2012-10-14 09:57:41 -0700 Merge pull request #7941 from robin850/master Use 1.9 Hash syntax in railties commit 5ad7f8a refs/heads/master Author: Robin Dupret Date: 2012-10-14 12:03:39 +0200 Use Ruby 1.9 Hash syntax in railties M railties/lib/rails.rb M railties/lib/rails/application.rb M railties/lib/rails/application/bootstrap.rb M railties/lib/rails/application/configuration.rb M railties/lib/rails/application/finisher.rb M railties/lib/rails/application/routes_reloader.rb M railties/lib/rails/commands/destroy.rb M railties/lib/rails/commands/generate.rb M railties/lib/rails/commands/runner.rb M railties/lib/rails/commands/server.rb M railties/lib/rails/commands/update.rb M railties/lib/rails/engine.rb M railties/lib/rails/engine/configuration.rb M railties/lib/rails/generators.rb M railties/lib/rails/generators/actions.rb M railties/lib/rails/generators/base.rb M railties/lib/rails/generators/erb/controller/controller_generator.rb M railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb M railties/lib/rails/generators/generated_attribute.rb M railties/lib/rails/generators/named_base.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/assets/assets_generator.rb M railties/lib/rails/generators/rails/controller/controller_generator.rb M railties/lib/rails/generators/rails/generator/generator_generator.rb M railties/lib/rails/generators/rails/helper/helper_generator.rb M railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb M railties/lib/rails/generators/rails/migration/migration_generator.rb M railties/lib/rails/generators/rails/model/model_generator.rb M railties/lib/rails/generators/rails/observer/observer_generator.rb M railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb M railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt M railties/lib/rails/generators/rails/resource/resource_generator.rb M railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb M railties/lib/rails/generators/rails/task/task_generator.rb M railties/lib/rails/generators/rails/task/templates/task.rb M railties/lib/rails/generators/resource_helpers.rb M railties/lib/rails/generators/test_case.rb M railties/lib/rails/generators/test_unit/controller/controller_generator.rb M railties/lib/rails/generators/test_unit/helper/helper_generator.rb M railties/lib/rails/generators/test_unit/integration/integration_generator.rb M railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb M railties/lib/rails/generators/test_unit/model/model_generator.rb M railties/lib/rails/generators/test_unit/observer/observer_generator.rb M railties/lib/rails/generators/test_unit/performance/performance_generator.rb M railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb M railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb M railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb M railties/lib/rails/info_controller.rb M railties/lib/rails/paths.rb M railties/lib/rails/railtie.rb M railties/lib/rails/railtie/configurable.rb M railties/lib/rails/railtie/configuration.rb M railties/lib/rails/tasks/annotations.rake M railties/lib/rails/tasks/framework.rake M railties/lib/rails/tasks/middleware.rake M railties/lib/rails/tasks/misc.rake M railties/lib/rails/tasks/routes.rake M railties/lib/rails/tasks/tmp.rake M railties/lib/rails/test_unit/railtie.rb M railties/lib/rails/test_unit/testing.rake M railties/test/application/asset_debugging_test.rb M railties/test/application/assets_test.rb M railties/test/application/configuration_test.rb M railties/test/application/generators_test.rb M railties/test/application/initializers/i18n_test.rb M railties/test/application/initializers/notifications_test.rb M railties/test/application/loading_test.rb M railties/test/application/middleware/cache_test.rb M railties/test/application/middleware/session_test.rb M railties/test/application/middleware_test.rb M railties/test/application/rake_test.rb M railties/test/application/routing_test.rb M railties/test/application/url_generation_test.rb M railties/test/commands/console_test.rb M railties/test/fixtures/lib/plugin_builders/spec_builder.rb M railties/test/generators/actions_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/model_generator_test.rb M railties/test/generators/namespaced_generators_test.rb M railties/test/generators/orm_test.rb M railties/test/generators/plugin_new_generator_test.rb M railties/test/generators/resource_generator_test.rb M railties/test/generators/scaffold_generator_test.rb M railties/test/generators/shared_generator_tests.rb M railties/test/generators_test.rb M railties/test/initializable_test.rb M railties/test/isolation/abstract_unit.rb M railties/test/paths_test.rb M railties/test/rails_info_controller_test.rb M railties/test/railties/engine_test.rb M railties/test/railties/generators_test.rb M railties/test/railties/mounted_engine_test.rb commit 1974911 refs/heads/master Merge: ca618d4 ecee641 Author: Jeremy Kemper Date: 2012-10-14 08:21:42 -0700 Merge pull request #7943 from NARKOZ/patch-4 remove 'then' from conditional statement commit 319fd4e refs/heads/master Author: Jaime Iniesta Date: 2012-10-14 17:09:22 +0200 Fix formatting on migrations guide M guides/source/migrations.md commit ecee641 refs/heads/master Author: Nihad Abbasov Date: 2012-10-14 21:08:25 +0600 remove 'then' from conditional statement M actionpack/lib/abstract_controller/base.rb commit e320c0a refs/heads/master Merge: a5d4e1c 91222f6 Author: Vijay Dev Date: 2012-10-14 03:04:13 -0700 Merge pull request #118 from patriciomacadden/master Fix a typo in caching with rails guide commit 3006c59 refs/tags/v3.2.9.rc2 Author: Arturo Pie Date: 2012-10-14 00:03:43 -0400 7914 Using a better way to get the defaults from db. Changes: * According to postgreSQL documentation: (http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html) we should not be using 'adsrc' field because this field is unaware of outside changes that could affect the way that default values are represented. Thus, I changed the queries to use "pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field. * Remove parsing of character type default values for 8.1 formatting since Rails doesn't support postgreSQL 8.1 anymore. * Remove misleading comment unrelated to code. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 3980465 refs/tags/v3.2.9.rc2 Author: Arturo Pie Date: 2012-10-13 23:48:37 -0400 #7914 get default value when type uses schema name PostgreSQL adapter properly parses default values when using multiple schemas and domains. When using domains across schemas, PostgresSQL prefixes the type of the default value with the name of the schema where that type (or domain) is. For example, this query: ``` SELECT a.attname, d.adsrc FROM pg_attribute a LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum WHERE a.attrelid = "defaults"'::regclass AND a.attnum > 0 AND NOT a.attisdropped ORDER BY a.attnum; ``` could return something like "''::pg_catalog.text" or "('''::pg_catalog.text)::text" for the text columns with defaults. I modified the regexp used to parse this value so that it ignores anything between ':: and \b(?:character varying|bpchar|text), and it allows to have optional parens like in the above second example. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/defaults_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit ca618d4 refs/heads/master Merge: 7cc6ee7 8fb841b Author: Rafael Mendonça França Date: 2012-10-13 19:36:11 -0700 Merge pull request #7937 from arturopie/7914-defaults-on-domains-and-multiple-schemas Fixes #7914 - PostgreSQL adapter doesn't fetch column defaults when using multiple schemas and domains commit 8fb841b refs/heads/master Author: Arturo Pie Date: 2012-10-13 19:29:23 -0400 #7914 Remove code for unsupported postgreSQL version. Remove parsing of character type default values for 8.1 formatting since Rails doesn't support postgreSQL 8.1 anymore. Remove misleading comment unrelated to code. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 40475cf refs/heads/master Author: Arturo Pie Date: 2012-10-13 18:30:43 -0400 #7914 Using a better way to get the defaults from db. According to postgreSQL documentation: (http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html) we should not be using 'adsrc' field because this field is unaware of outside changes that could affect the way that default values are represented. Thus, I changed the queries to use "pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 54b3f41 refs/heads/master Author: Arturo Pie Date: 2012-10-12 18:07:30 -0400 #7914 Add change of previous commit to CHANGELOG.md M activerecord/CHANGELOG.md commit 2da85ed refs/heads/master Author: Arturo Pie Date: 2012-10-12 18:03:30 -0400 #7914 get default value when type uses schema name PostgreSQL adapter properly parses default values when using multiple schemas and domains. When using domains across schemas, PostgresSQL prefixes the type of the default value with the name of the schema where that type (or domain) is. For example, this query: ``` SELECT a.attname, d.adsrc FROM pg_attribute a LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum WHERE a.attrelid = "defaults"'::regclass AND a.attnum > 0 AND NOT a.attisdropped ORDER BY a.attnum; ``` could return something like "''::pg_catalog.text" or "('''::pg_catalog.text)::text" for the text columns with defaults. I modified the regexp used to parse this value so that it ignores anything between ':: and \b(?:character varying|bpchar|text), and it allows to have optional parens like in the above second example. M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb M activerecord/test/cases/defaults_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit a5d4e1c refs/heads/master Author: Arturo Pie Date: 2012-10-13 20:36:48 -0300 Update guides/source/contributing_to_ruby_on_rails.md In this section we are actually updating 'my_new_branch' M guides/source/contributing_to_ruby_on_rails.md commit 91222f6 refs/heads/master Author: Patricio Mac Adden Date: 2012-10-13 16:19:58 -0300 Fix a silly typo M guides/source/caching_with_rails.md commit 7cc6ee7 refs/heads/master Merge: 1fd8926 7891cbf Author: Rafael Mendonça França Date: 2012-10-13 11:40:01 -0700 Merge pull request #7935 from leereilly/minor-gemfile-twerk Clean up Gemfile entry (replace double quotes with single quotes) [ci skip] commit 7891cbf refs/heads/master Author: Lee Reilly Date: 2012-10-13 11:22:51 -0700 Replace double quotes with single quotes M Gemfile commit 1fd8926 refs/heads/master Author: Jeremy Kemper Date: 2012-10-13 09:54:34 -0700 Test that a Rails.queue consumer is automatically started in production M railties/lib/rails/application/configuration.rb M railties/lib/rails/application/finisher.rb M railties/test/application/queue_test.rb commit a6ddc39 refs/heads/master Author: AvnerCohen Date: 2012-10-13 17:19:03 +0200 1.9 hash syntax changes M guides/code/getting_started/config/routes.rb M guides/code/getting_started/test/performance/browsing_test.rb commit 60a4fff refs/heads/master Author: Joshua Peek Date: 2012-10-13 10:13:47 -0500 Allow asset url config to be undefined M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit 5dfeb1b refs/heads/master Author: Joshua Peek Date: 2012-10-13 09:59:57 -0500 Add a few more compute_asset_path tests M actionpack/test/template/asset_tag_helper_test.rb commit c8fe0d5 refs/heads/master Author: Jeremy Kemper Date: 2012-10-12 20:45:54 -0700 Backpedal from class-oriented config.queue. Set an actual queue instance. M activesupport/lib/active_support/queueing.rb M guides/source/4_0_release_notes.md M guides/source/configuring.md M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb M railties/lib/rails/application/finisher.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt M railties/test/application/configuration_test.rb M railties/test/application/queue_test.rb commit 1dc2ea8 refs/heads/master Author: Jeremy Kemper Date: 2012-10-12 20:44:32 -0700 Tighten up asset precompile tests M railties/test/application/asset_debugging_test.rb M railties/test/application/assets_test.rb commit 7758298 refs/heads/master Author: Jeremy Kemper Date: 2012-10-12 18:01:04 -0700 Remove the queue container. Premature consolidation. Set up and maintain queues in the classes that use them instead. M activesupport/lib/active_support/queueing.rb D activesupport/test/queueing/container_test.rb M railties/lib/rails/application.rb M railties/test/application/initializers/frameworks_test.rb M railties/test/application/queue_test.rb commit 32b4d46 refs/heads/master Merge: db8dbe7 20385ec Author: José Valim Date: 2012-10-12 18:23:50 -0700 Merge pull request #7891 from schneems/schneems/rake_command_warning Prompt to run rake when accidentally typed rails commit db8dbe7 refs/heads/master Author: Aaron Patterson Date: 2012-10-12 16:59:20 -0700 performance improvements to joins! Before: Calculating ------------------------------------- ar 87 i/100ms ------------------------------------------------- ar 823.4 (±11.8%) i/s - 4089 in 5.070234s After: Calculating ------------------------------------- ar 88 i/100ms ------------------------------------------------- ar 894.1 (±3.9%) i/s - 4488 in 5.028161s Same test as 3a6dfca7f5f5bd45cea2f6ac348178e72423e1d5 M activerecord/lib/active_record/relation/merger.rb M activerecord/lib/active_record/relation/query_methods.rb commit 3a6dfca refs/heads/master Author: Aaron Patterson Date: 2012-10-12 14:34:04 -0700 Speed up relation merging by reducing calls to Array#- before: Calculating ------------------------------------- ar 83 i/100ms ------------------------------------------------- ar 832.1 (±4.0%) i/s - 4233 in 5.096611s after: Calculating ------------------------------------- ar 87 i/100ms ------------------------------------------------- ar 839.0 (±9.3%) i/s - 4176 in 5.032782s Benchmark: require 'config/environment' require 'benchmark/ips' GC.disable unless User.find_by_login('tater') u = User.new u.login = 'tater' u.save! end def active_record user = User.find_by_login('tater') starred = user.starred_items.count end active_record Benchmark.ips do |x| x.report("ar") { active_record } end M activerecord/lib/active_record/relation/merger.rb commit 20385ec refs/heads/master Author: schneems Date: 2012-10-09 11:24:36 -1000 Prompt to run rake when accidentally typed rails Developers from all levels will accidentally run rake tasks using the `rails` keyword when they meant to use `rake`. Often times beginners struggle with the difference between the tools. The most common example would be `$ rails db:migrate` Rather than telling the developer simply that they did not use a valid rails command, we can see if it was a valid rake command first. If it is a valid rake command we can auto execute it giving the user a period of time to cancel if that isn't what they intended. Here is what `rake db:migrate` would look like if you cancel the command: ```sh $ rails db:migrate Assuming you meant: $ rake db:migrate press any key to cancel in 3 seconds > command terminated ... ``` Here is what it looks like if you don't cancel the command: ```sh $ rails db:migrate Assuming you meant: $ rake db:migrate press any key to cancel in 3 seconds > Running: $ rake db:migrate == Foo: migrating ============================================================ == Foo: migrated (0.0000s) =================================================== ``` M railties/lib/rails/commands.rb commit aa493f0 refs/heads/master Author: Joshua Peek Date: 2012-10-12 17:28:53 -0500 All asset url helpers should pass options M actionpack/lib/action_view/helpers/asset_url_helper.rb commit dee3a19 refs/heads/master Author: Joshua Peek Date: 2012-10-12 17:09:32 -0500 JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymore M actionpack/test/template/asset_tag_helper_test.rb commit c3cff4d refs/heads/master Author: Joshua Peek Date: 2012-10-12 17:07:17 -0500 Ensure AssetUrlHelper can be mixed into AC::Base M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit 1e2b0ce refs/heads/master Author: Joshua Peek Date: 2012-10-12 16:56:00 -0500 Refactor AssetUrlHelper to make it friendly for plugins and extensions Add asset_path/url helper for a consolidated entry point Expose compute_asset_path as a public API Expose compute_asset_host as a public API Move RAILS_ASSET_ID to its own module, AssetIdHelper Removed AV::AssetPaths M actionpack/lib/action_view.rb D actionpack/lib/action_view/asset_paths.rb M actionpack/lib/action_view/helpers.rb A actionpack/lib/action_view/helpers/asset_id_helper.rb M actionpack/lib/action_view/helpers/asset_tag_helper.rb D actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/lib/action_view/railtie.rb M actionpack/test/template/asset_tag_helper_test.rb commit 3e0be3a refs/heads/master Author: Jaime Iniesta Date: 2012-10-12 23:44:39 +0200 Fix typos and clean up Getting Started guide M guides/source/getting_started.md commit e68b97a refs/heads/master Merge: 3e75369 a4b1196 Author: Rafael Mendonça França Date: 2012-10-12 14:29:11 -0700 Merge pull request #7007 from Mik-die/hash_extract make Hash#extract! more symmetric with Hash#slice commit 3e75369 refs/heads/master Merge: b62f51d 7fc0519 Author: Rafael Mendonça França Date: 2012-10-12 13:34:30 -0700 Merge pull request #7926 from senny/whitespace_cleanup trailling whitespace cleanup in query_methods.rb [ci skip] commit 7fc0519 refs/heads/master Author: Yves Senn Date: 2012-10-12 22:30:22 +0200 trailling whitespace cleanup in query_methods.rb M activerecord/lib/active_record/relation/query_methods.rb commit 84c3774 refs/tags/v3.2.9.rc2 Merge: eefb344 990a938 Author: Rafael Mendonça França Date: 2012-10-12 13:25:21 -0700 Merge pull request #7925 from ernie/3-2-fix-collection-associations-with-select Fix has_many assocation w/select load after create commit 990a938 refs/tags/v3.2.9.rc2 Author: Ernie Miller Date: 2012-10-05 18:36:44 -0400 Fix has_many assocation w/select load after create If you create a new record via a collection association proxy that has not loaded its target, and which selects additional attributes through the association, then when the proxy loads its target, it will inadvertently trigger a deprecation notice during attribute writing when CollectionAssociation#merge_target_lists attempts to do its thing, since the newly loaded records will possess attributes the created record does not. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/join_model_test.rb commit bd38d9f refs/heads/master Author: Joshua Peek Date: 2012-10-12 14:57:38 -0500 Add asset_path and asset_url helpers M actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb M actionpack/lib/action_view/helpers/asset_url_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit b62f51d refs/heads/master Merge: a284b14 9fa1a54 Author: Rafael Mendonça França Date: 2012-10-12 12:25:46 -0700 Merge pull request #7923 from josh/seperate-asset-tag-and-url-concerns Split asset url helpers into seperate AssetUrlHelper commit 9fa1a54 refs/heads/master Author: Joshua Peek Date: 2012-10-12 13:46:24 -0500 Split asset url helpers into seperate AssetUrlHelper M actionpack/lib/action_view/helpers.rb M actionpack/lib/action_view/helpers/asset_tag_helper.rb D actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb D actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb A actionpack/lib/action_view/helpers/asset_url_helper.rb commit a284b14 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-12 14:43:01 -0300 ActiveSupport::SynchronousQueue doesn't have the drain method. Now we are using teh SynchronousQueue in the test environment instead of the TestQueue M railties/test/application/queue_test.rb commit 08f57bf refs/heads/master Author: Rafael Mendonça França Date: 2012-10-12 14:42:26 -0300 Move the TestQueue tests to the proper file M activesupport/test/queueing/test_queue_test.rb M railties/test/application/queue_test.rb commit d08b89f refs/heads/master Merge: 168df24 06129c0 Author: Rafael Mendonça França Date: 2012-10-12 09:52:40 -0700 Merge pull request #7871 from bjnord/master Support another file type .rake in `rake notes` commit 168df24 refs/heads/master Merge: 1957687 13d8777 Author: Xavier Noria Date: 2012-10-12 09:50:24 -0700 Merge pull request #7913 from mje113/master MemCacheStore's move to dalli as a backend broke :race_condition_ttl support commit 1957687 refs/heads/master Merge: 1cb7cb0 11f01be Author: Rafael Mendonça França Date: 2012-10-12 09:42:25 -0700 Merge pull request #7919 from arunagw/warning_removed_shadowing warning removed: shadowing outer local variable - value commit 1cb7cb0 refs/heads/master Merge: 79db8db 633ea6a Author: Jon Leighton Date: 2012-10-12 09:41:00 -0700 Merge pull request #7765 from insside/clever-order learn ActiveReccord::Querying#order work with hash arguments commit 06129c0 refs/heads/master Author: Brent J. Nordquist Date: 2012-10-08 06:41:31 -0500 Add .rake to `rake notes` and `rake notes:custom` M railties/CHANGELOG.md M railties/lib/rails/source_annotation_extractor.rb M railties/test/application/rake/notes_test.rb commit 058ae7e refs/heads/master Author: Arturo Pie Date: 2012-10-12 12:03:47 -0300 Fix small typo in development_dependencies_install Fix small typo a link to bundler page in development_dependencies_install.md  M guides/source/development_dependencies_install.md commit 633ea6a refs/heads/master Author: Tima Maslyuchenko Date: 2012-09-26 22:16:17 +0300 learn ActiveRecord::QueryMethods#order work with hash arguments M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relations_test.rb commit 79db8db refs/heads/master Author: Jeremy Kemper Date: 2012-10-12 07:49:35 -0700 Immediately run queued jobs in tests. Otherwise you have to explicitly drain the queue to actually deliver your emails. M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt M railties/test/application/queue_test.rb commit 11f01be refs/heads/master Author: Arun Agrawal Date: 2012-10-12 18:53:15 +0530 warning removed: shadowing outer local variable - value M actionpack/lib/action_controller/metal/strong_parameters.rb commit f176501 refs/heads/master Author: Jon Leighton Date: 2012-10-12 12:33:11 +0100 Don't allocate new strings in compiled attribute methods This improves memory and performance without having to use symbols which present DoS problems. Thanks @headius and @tenderlove for the suggestion. Benchmark --------- require 'active_record' require 'benchmark/ips' ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') class Post < ActiveRecord::Base connection.create_table :posts, force: true do |t| t.string :name end end post = Post.create name: 'omg' Benchmark.ips do |r| r.report('Post.new') { Post.new name: 'omg' } r.report('post.name') { post.name } r.report('post.name=') { post.name = 'omg' } r.report('Post.find(1).name') { Post.find(1).name } end Before ------ Calculating ------------------------------------- Post.new 1419 i/100ms post.name 7538 i/100ms post.name= 3024 i/100ms Post.find(1).name 243 i/100ms ------------------------------------------------- Post.new 20637.6 (±12.7%) i/s - 102168 in 5.039578s post.name 1167897.7 (±18.2%) i/s - 5186144 in 4.983077s post.name= 64305.6 (±9.6%) i/s - 317520 in 4.998720s Post.find(1).name 2678.8 (±10.8%) i/s - 13365 in 5.051265s After ----- Calculating ------------------------------------- Post.new 1431 i/100ms post.name 7790 i/100ms post.name= 3181 i/100ms Post.find(1).name 245 i/100ms ------------------------------------------------- Post.new 21308.8 (±12.2%) i/s - 105894 in 5.053879s post.name 1534103.8 (±2.1%) i/s - 7634200 in 4.979405s post.name= 67441.0 (±7.5%) i/s - 337186 in 5.037871s Post.find(1).name 2681.9 (±10.6%) i/s - 13475 in 5.084511s M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/write.rb commit 8cf428f refs/heads/master Author: Tim McEwan Date: 2012-10-12 22:18:49 +1100 specify path to CommentsController again inline (incorporating feedback from a newbie) M guides/source/getting_started.md commit 9e5f7cc refs/heads/master Author: Jon Leighton Date: 2012-10-05 19:23:25 +0100 Revert "Key the attributes hash with symbols" This reverts commit 86c3dfbd47cb96af02daaa655963292b1a1b110e. Conflicts: activerecord/lib/active_record/attribute_methods/read.rb Reason: whilst this increased performance, it also presents a DoS risk via memory exhaustion if users were allowing user input to dictate the arguments of read/write_attribute. I will investigate alternative ways to cut down on string allocations here. M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb M activerecord/lib/active_record/attribute_methods/write.rb M activerecord/test/cases/attribute_methods_test.rb commit 36360e9 refs/heads/master Merge: fc5a3e9 ab9140f Author: José Valim Date: 2012-10-12 01:10:43 -0700 Merge pull request #7917 from dfens/master Cosmetic changes: remove trailing whitespaces from tests commit ab9140f refs/heads/master Author: dfens Date: 2012-10-12 09:56:39 +0200 Cleanup trailing whitespaces M actionpack/test/controller/parameters/parameters_permit_test.rb M activemodel/test/cases/secure_password_test.rb M activerecord/test/cases/adapters/postgresql/schema_test.rb M activerecord/test/cases/adapters/sqlite3/copy_table_test.rb M activerecord/test/cases/migration/change_schema_test.rb M activerecord/test/cases/query_cache_test.rb M activerecord/test/cases/validations/i18n_generate_message_validation_test.rb M activesupport/test/callbacks_test.rb commit fc5a3e9 refs/heads/master Merge: bdd105d 299fee5 Author: Rafael Mendonça França Date: 2012-10-11 21:19:13 -0700 Merge pull request #7915 from frodsan/docs_permit update AC::Parameters#permit documentation [ci skip] commit 299fee5 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-11 22:41:01 -0500 update AC::Parameters#permit documentation [ci skip] bdd105d changes the behaviour of AC::Parameters#permit. M actionpack/lib/action_controller/metal/strong_parameters.rb commit bdd105d refs/heads/master Author: Santiago Pastorino Date: 2012-10-12 00:50:20 -0200 When executing permit with just a key that points to a hash, DO NOT allow all the hash params.require(:person).permit(:projects_attributes) was returning => {"projects_attributes"=>{"0"=>{"name"=>"Project 1"}}} When should return => {} You should be doing ... params.require(:person).permit(projects_attributes: :name) to get just the projects attributes you want to allow M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/nested_parameters_test.rb commit b91a90e refs/heads/master Author: Aaron Patterson Date: 2012-10-11 18:26:41 -0700 adding a test for b21f24d9807bd161af947cf0f0cc440c9adffb73 M activesupport/test/caching_test.rb commit a2c8438 refs/heads/master Author: AvnerCohen Date: 2012-10-12 00:28:47 +0200 1.9 hash syntax changes. M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/api_documentation_guidelines.md commit 9d24f1f refs/heads/master Merge: 888a7a5 2938ef7 Author: Rafael Mendonça França Date: 2012-10-11 15:10:46 -0700 Merge pull request #7912 from mrship/master CacheDigests: Support templates in directories several levels deep commit 13d8777 refs/heads/master Author: Mike Evans Date: 2012-10-11 15:46:30 -0400 Padding expires_in by 5 minutes on dalli key write to facilitate :race_condition_ttl working correctly. M activesupport/lib/active_support/cache/mem_cache_store.rb commit 2938ef7 refs/heads/master Author: Andy Shipman Date: 2012-10-11 17:36:58 +0100 Allow for deep directory path for view templates. M actionpack/lib/action_view/digestor.rb A actionpack/test/fixtures/digestor/level/below/_header.html.erb A actionpack/test/fixtures/digestor/level/below/index.html.erb M actionpack/test/template/digestor_test.rb commit 61c64dc refs/heads/master Author: AvnerCohen Date: 2012-10-11 16:38:31 +0200 1.9 hash syntax for guides, work-in-progress M guides/source/getting_started.md M guides/source/i18n.md M guides/source/performance_testing.md commit 888a7a5 refs/heads/master Merge: eec8924 d6524d7 Author: Rafael Mendonça França Date: 2012-10-11 05:40:53 -0700 Merge pull request #7886 from senny/3675_assert_template_twice_against_same_partial assert_template works when the same partial was rendered multiple times commit eec8924 refs/heads/master Merge: cd98c25 fdc4c84 Author: Rafael Mendonça França Date: 2012-10-11 05:39:19 -0700 Merge pull request #7908 from arunagw/build_fix_railties No need to test for rack-cache present in gem file commit d6524d7 refs/heads/master Author: Yves Senn Date: 2012-10-09 21:14:11 +0200 refactor `ActionView::TestCase` internals to track rendered locals this refactoring extracts the semi complex data structure of rendered locals per view into into a separate class M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/test_case.rb commit ed95674 refs/heads/master Author: Yves Senn Date: 2012-10-08 22:22:47 +0200 recognizes when a partial was rendered twice. Closes #3675 M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/test_case.rb A actionpack/test/fixtures/test/render_two_partials.html.erb M actionpack/test/template/test_case_test.rb commit fdc4c84 refs/heads/master Author: Arun Agrawal Date: 2012-10-11 11:48:13 +0530 No need to test for rack-cache present in Gemfile as it's removed here 1fc795468525d8622cdca474a54c8310a514aa46 M railties/test/generators/app_generator_test.rb commit cd98c25 refs/heads/master Merge: e5e174a a1d2f69 Author: Vijay Dev Date: 2012-10-10 22:43:42 -0700 Merge pull request #7050 from kytrinyx/documentation-reset-column-info Expand the caveat about models in migrations in the rails guide. commit eefb344 refs/tags/v3.2.9.rc2 Merge: fb9c001 2bed954 Author: Rafael Mendonça França Date: 2012-10-10 20:54:33 -0700 Merge pull request #7905 from jfirebaugh/eager_autoload_3-2 Backport eager autoloading fixes commit e5e174a refs/heads/master Merge: f73c259 b1bb8b2 Author: Rafael Mendonça França Date: 2012-10-10 20:54:26 -0700 Merge pull request #7904 from jfirebaugh/eager_autoload Eager autoload Preloader classes commit 2bed954 refs/tags/v3.2.9.rc2 Author: John Firebaugh Date: 2012-10-10 15:47:05 -0700 Eager autoload Preloader classes Without eager autoloading, these would be autoloaded only when #preloader_for is called, which is too late in threaded applications. M activerecord/lib/active_record/associations/preloader.rb commit b1bb8b2 refs/heads/master Author: John Firebaugh Date: 2012-10-10 15:47:05 -0700 Eager autoload Preloader classes Without eager autoloading, these would be autoloaded only when #preloader_for is called, which is too late in threaded applications. M activerecord/lib/active_record/associations/preloader.rb commit de1b687 refs/tags/v3.2.9.rc2 Author: Michael Fairley Date: 2012-07-25 17:34:39 -0700 Eager autoload ActiveRecord association helpers M activerecord/lib/active_record/associations.rb commit f73c259 refs/heads/master Author: Jeremy Kemper Date: 2012-10-10 15:34:41 -0700 Remove the leading :: constant qualifier in the ActiveRecord::Fixtures deprecation message M activerecord/lib/active_record/fixtures.rb commit 1188fb1 refs/heads/master Author: Jeremy Kemper Date: 2012-10-10 14:47:20 -0700 Upgrade to a jquery-rails that doesn't expect config.action_view.javascript_expansions to exist M Gemfile commit a1d2f69 refs/heads/master Author: Katrina Owen Date: 2012-07-13 22:48:32 +0200 Expand caveat about models in migrations (rails guide) This is an attempt to address issue #6939, where an earlier migration added a column to the database, and a later migration uses a model and references that column. When both migrations were run together with `rake db:migrate` the column information in memory still referenced the old table structure. Running the migrations separately fixed this, as a new connection was then established before referencing the model. Explicitly calling `reset_column_information` is a more reliable workaround. M guides/source/migrations.md commit ecf460e refs/heads/master Merge: e40f515 626f7df Author: Vijay Dev Date: 2012-10-10 13:42:33 -0700 Merge pull request #7887 from senny/remove_unused_requires_in_ar_tests remove duplicated require statements in AR test cases commit e40f515 refs/heads/master Author: Vijay Dev Date: 2012-10-11 01:48:37 +0530 Fixing build failures Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca M railties/lib/rails/generators/erb.rb M railties/lib/rails/generators/erb/controller/controller_generator.rb M railties/lib/rails/generators/erb/mailer/mailer_generator.rb M railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb M railties/lib/rails/generators/js/assets/assets_generator.rb M railties/lib/rails/generators/rails/helper/helper_generator.rb commit 2441160 refs/heads/master Merge: ddb9469 58d69a5 Author: Vijay Dev Date: 2012-10-10 12:45:36 -0700 Merge pull request #7898 from olivierlacan/pg_homebrew_instructions Offer instructions for pg gem when installed via Homebrew commit ddb9469 refs/heads/master Merge: f638ef9 b49f159 Author: Vijay Dev Date: 2012-10-10 12:42:44 -0700 Merge pull request #7890 from AvnerCohen/new_hash_syntax Moving to new hash syntax commit f638ef9 refs/heads/master Merge: 3401d50 26ec070 Author: Vijay Dev Date: 2012-10-11 01:05:14 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb commit 3401d50 refs/heads/master Author: Vijay Dev Date: 2012-10-11 01:02:41 +0530 fix github url [ci skip] M railties/lib/rails/generators/rails/app/templates/Gemfile commit 26ec070 refs/heads/master Author: Vijay Dev Date: 2012-10-11 00:59:52 +0530 copy edits [ci skip] M activerecord/lib/active_record/persistence.rb M guides/source/testing.md commit 6754777 refs/heads/master Author: Vijay Dev Date: 2012-10-11 00:59:29 +0530 copy-edit the email delivery errors comment M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 43f32f2 refs/heads/master Author: Vijay Dev Date: 2012-10-11 00:43:52 +0530 Revert "Fix Example in active model attribute methods" This reverts commit 1c02b988641c201308e6b3de6457128878e47bd5. M activemodel/lib/active_model/attribute_methods.rb commit d5802ad refs/heads/master Author: Vijay Dev Date: 2012-10-11 00:43:17 +0530 Revert "Fix all examples in comments in active_model attribute methods" This reverts commit 93b1ca8bd34993f8958219f13c195f5acf8e55f6. M activemodel/lib/active_model/attribute_methods.rb commit 1644f12 refs/heads/master Merge: bf24ba9 b21f24d Author: David Heinemeier Hansson Date: 2012-10-10 11:54:14 -0700 Merge pull request #7902 from josh/fix-bug-in-as-cache-upgrade Fix AS::Cache version upgrading bug commit b21f24d refs/heads/master Author: Joshua Peek Date: 2012-10-10 13:46:25 -0500 Ensure expires_in and created_at timestamps aren't nil when attempting to upgrade cache M activesupport/lib/active_support/cache.rb commit bf24ba9 refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-10 19:22:31 +0200 Add changelog entry for killing the asset tag concatenation M actionpack/CHANGELOG.md commit affd05d refs/heads/master Merge: 1fc7954 badc39f Author: David Heinemeier Hansson Date: 2012-10-10 19:21:11 +0200 Merge branch 'master' of github.com:rails/rails commit badc39f refs/heads/master Merge: 27683b5 f167e24 Author: David Heinemeier Hansson Date: 2012-10-10 10:20:03 -0700 Merge pull request #7900 from josh/kill-old-asset-tag-helper-concat Remove old asset tag concatenation commit f167e24 refs/heads/master Author: Joshua Peek Date: 2012-10-10 11:41:12 -0500 Remove expansion config M actionpack/lib/action_view/railtie.rb commit 2d55431 refs/heads/master Author: Adam Haymond Date: 2012-10-10 10:19:14 -0600 Added clarity to update_column(s) M activerecord/lib/active_record/persistence.rb commit 607829a refs/heads/master Author: Joshua Peek Date: 2012-10-10 10:53:27 -0500 Remove old asset tag concatenation Use sprockets, jammit, or some other asset bundler D actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb M actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb M actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb M actionpack/lib/action_view/railtie.rb M actionpack/test/template/asset_tag_helper_test.rb commit 58d69a5 refs/heads/master Author: Olivier Lacan Date: 2012-10-10 11:02:32 -0400 Offer instructions for pg gem when installed via Homebrew M railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml commit 23839ab refs/heads/master Author: AvnerCohen Date: 2012-10-10 16:35:50 +0200 migrating guides to new hash syntax M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/security.md commit f839e61 refs/heads/master Author: Robin Dupret Date: 2012-10-10 13:45:47 +0200 Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev) M actionmailer/README.rdoc M activemodel/README.rdoc commit 27683b5 refs/heads/master Merge: f7f467d 74bd134 Author: Vijay Dev Date: 2012-10-10 03:29:23 -0700 Merge pull request #7899 from asanghi/master Add missing CHANGELOG relating to addition of callbacks to mailers commit 74bd134 refs/heads/master Author: Aditya Sanghi Date: 2012-10-10 15:26:21 +0530 Add missing CHANGELOG related to addition of callbacks to mailers. M actionmailer/CHANGELOG.md M guides/source/4_0_release_notes.md commit b12d048 refs/heads/master Author: Aditya Sanghi Date: 2012-10-10 15:13:56 +0530 Revert "Add changelog/release note entries for missing ActionMailer super feature related to inclusion of callbacks in mailers" This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a. M actionmailer/CHANGELOG.md M guides/source/4_0_release_notes.md commit f16ec8c refs/heads/master Author: Aditya Sanghi Date: 2012-10-10 14:52:02 +0530 Add changelog/release note entries for missing ActionMailer super feature related to inclusion of callbacks in mailers M actionmailer/CHANGELOG.md M guides/source/4_0_release_notes.md commit f7f467d refs/heads/master Merge: da1aa75 3121ac0 Author: Vijay Dev Date: 2012-10-10 01:58:51 -0700 Merge pull request #7897 from arunagw/warning_fixes_assert_match warning fixed: ambiguous first argument; put parentheses or even spaces commit 4c6f75c refs/heads/master Author: AvnerCohen Date: 2012-10-10 10:54:31 +0200 gradually moving documentation to new hash syntax M activerecord/test/cases/nested_attributes_test.rb M activerecord/test/cases/validations/i18n_validation_test.rb commit 3121ac0 refs/heads/master Author: Arun Agrawal Date: 2012-10-10 10:40:14 +0530 warning fixed: ambiguous first argument; put parentheses or even spaces M railties/test/commands/console_test.rb commit da1aa75 refs/heads/master Merge: 269adae 4c9afc7 Author: Vijay Dev Date: 2012-10-09 21:57:11 -0700 Merge pull request #7895 from mdaisuke/guides_typo fix typo in "The Rails Initialization Process" commit 269adae refs/heads/master Merge: 1c534c6 9f3b8cd Author: Aaron Patterson Date: 2012-10-09 20:14:33 -0700 Merge pull request #7859 from ernie/fix-collection-associations-with-select Fix has_many assocation w/select load after create commit 4c9afc7 refs/heads/master Author: mdaisuke Date: 2012-10-10 10:19:02 +0900 fix typo in "The Rails Initialization Process" M guides/source/initialization.md commit 1c534c6 refs/heads/master Merge: 0787cea 2a68f68 Author: Jeremy Kemper Date: 2012-10-09 17:41:00 -0700 Merge pull request #7878 from blowmage/test_locations Update test names and locations commit 2a68f68 refs/heads/master Author: Mike Moore Date: 2012-10-07 22:59:42 -0600 Update test locations Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional) M actionmailer/lib/rails/generators/mailer/USAGE M guides/CHANGELOG.md M guides/source/action_mailer_basics.md M guides/source/command_line.md M guides/source/engines.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/testing.md M railties/CHANGELOG.md M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/controller/USAGE M railties/lib/rails/generators/rails/helper/USAGE M railties/lib/rails/generators/rails/model/USAGE M railties/lib/rails/generators/rails/observer/USAGE M railties/lib/rails/generators/rails/scaffold_controller/USAGE M railties/lib/rails/generators/test_unit/controller/controller_generator.rb M railties/lib/rails/generators/test_unit/helper/helper_generator.rb M railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb M railties/lib/rails/generators/test_unit/model/model_generator.rb M railties/lib/rails/generators/test_unit/observer/observer_generator.rb M railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb M railties/lib/rails/tasks/statistics.rake M railties/lib/rails/test_unit/testing.rake M railties/test/application/rake_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/controller_generator_test.rb M railties/test/generators/helper_generator_test.rb M railties/test/generators/mailer_generator_test.rb M railties/test/generators/model_generator_test.rb M railties/test/generators/namespaced_generators_test.rb M railties/test/generators/observer_generator_test.rb M railties/test/generators/resource_generator_test.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit b49f159 refs/heads/master Author: AvnerCohen Date: 2012-10-09 22:56:26 +0200 moving to new hash syntax, for discussion before I take the time on full folders M actionpack/lib/action_controller/base.rb commit 0787cea refs/heads/master Author: Xavier Noria Date: 2012-10-09 21:55:43 +0200 let (array|hash)/conversions.rb load the extensions in object/to_(param|query).rb M activesupport/lib/active_support/core_ext/array/conversions.rb M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/test/core_ext/hash_ext_test.rb commit 626f7df refs/heads/master Author: Yves Senn Date: 2012-10-09 21:33:54 +0200 remove duplicated require statements in AR test cases M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/autosave_association_test.rb M activerecord/test/cases/reflection_test.rb M activerecord/test/cases/relations_test.rb commit 3395633 refs/heads/master Author: Xavier Noria Date: 2012-10-09 19:40:38 +0200 adds a missing require M activesupport/test/core_ext/hash_ext_test.rb commit 0e6c70e refs/heads/master Merge: c95bdf7 9f3d864 Author: Rafael Mendonça França Date: 2012-10-09 10:26:25 -0700 Merge pull request #7885 from guilleiguaran/railties-changelog Add missing entry in CHANGELOG about config.assets.cache change commit 9f3d864 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-09 12:16:51 -0500 Add missing entry in CHANGELOG about config.assets.cache change M railties/CHANGELOG.md commit c95bdf7 refs/heads/master Merge: 9492cb0 69b1716 Author: Rafael Mendonça França Date: 2012-10-09 09:57:33 -0700 Merge pull request #7883 from guilleiguaran/refactor-assets-test Minor refactors in assets test commit 69b1716 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-09 11:51:44 -0500 Remove duplicated test M railties/test/application/assets_test.rb commit 39928c8 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-09 11:51:29 -0500 Minor test refactoring: Use add_to_env instead of an initializer M railties/test/application/asset_debugging_test.rb commit 9492cb0 refs/heads/master Author: Xavier Noria Date: 2012-10-09 18:27:02 +0200 adds missing require M activesupport/test/core_ext/hash_ext_test.rb commit bf2c439 refs/heads/master Merge: 7fcbbaf fbfea9e Author: Rafael Mendonça França Date: 2012-10-09 09:22:25 -0700 Merge pull request #7881 from guilleiguaran/fix-initializer Rails.config doesn't exist, it should be Rails.application.config instead commit 7fcbbaf refs/heads/master Author: Xavier Noria Date: 2012-10-09 18:17:54 +0200 copy-edits ae9b3d7 [ci skip] M guides/source/active_support_core_extensions.md commit fbfea9e refs/heads/master Author: Guillermo Iguaran Date: 2012-10-09 11:17:22 -0500 Rails.config doesn't exist, it should be Rails.application.config instead M railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb commit 9c2b3b8 refs/heads/master Author: Xavier Noria Date: 2012-10-09 18:09:47 +0200 AS guide: revises the description of #monday, and #sunday [ci skip] The start of the week is a parameter nowadays, it is a little confusing that we say here that we assume something about it. Better to use "next" and "previous", which are clear regardless of the concept of beginning of week. Adds examples for the edge cases where the receiver is a Monday or Sunday itself. M guides/source/active_support_core_extensions.md commit 64dd071 refs/heads/master Merge: 2e0c617 f912437 Author: Xavier Noria Date: 2012-10-09 08:58:58 -0700 Merge pull request #7736 from gregolsen/beginning_of_week_guides ActiveSupport core extensions guides update commit 2e0c617 refs/heads/master Author: Xavier Noria Date: 2012-10-09 17:50:49 +0200 keys.include? -> key? M activesupport/lib/active_support/core_ext/date/calculations.rb commit 2296e74 refs/heads/master Merge: 8815de7 ae9b3d7 Author: Xavier Noria Date: 2012-10-09 08:36:36 -0700 Merge pull request #7817 from NARKOZ/object-conversions remove unnecessary object/conversions file commit 28fc893 refs/heads/master Author: AvnerCohen Date: 2012-10-09 09:46:09 +0200 Fixed unclosing tag M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 8815de7 refs/heads/master Merge: a9bf3a4 4459233 Author: Rafael Mendonça França Date: 2012-10-08 14:40:06 -0700 Merge pull request #7877 from claudiob/remove_duplicate_article_THE Remove duplicate 'the' article in commented line commit 4459233 refs/heads/master Author: claudiob Date: 2012-10-08 14:00:59 -0700 Remove duplicate 'the' article in commented line The sentence used to read "at the bottom of the the compiled file" M guides/code/getting_started/app/assets/javascripts/application.js M railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt commit a9bf3a4 refs/heads/master Merge: 43e14f8 13206cc Author: Rafael Mendonça França Date: 2012-10-08 12:00:23 -0700 Merge pull request #7875 from senny/interpolation_for_execute remove unused `expand_range_bind_variables` method commit 13206cc refs/heads/master Author: Yves Senn Date: 2012-10-08 20:50:25 +0200 remove unused `expand_range_bind_variables` method this method was not used, not documented and not tested. M activerecord/lib/active_record/sanitization.rb commit 4690290 refs/heads/master Author: Steve Klabnik Date: 2012-10-08 11:29:37 -0700 updating i18n guide with locale config location. This changed in rails/rails#43e14f8 M guides/source/i18n.md commit d7ef1c1 refs/heads/master Author: Jeffrey Hardy Date: 2012-10-08 14:17:38 -0400 Fix typo: 'this also mean' -> 'this also means' M activerecord/lib/active_record/relation/batches.rb commit ecb39e6 refs/heads/master Author: AvnerCohen Date: 2012-10-08 19:53:42 +0200 Closed unclosed , working on a complete solution for docrails, but testing push process first M actionpack/lib/action_view/vendor/html-scanner/html/selector.rb commit 43e14f8 refs/heads/master Merge: bb17a0f 185c020 Author: David Heinemeier Hansson Date: 2012-10-08 09:08:27 -0700 Merge pull request #7873 from steveklabnik/update_initializer Moving locale stuff from app.rb to an initializer. commit 1fc7954 refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-08 18:06:54 +0200 There is already an invitation to use rack-cache in config/environments/production.rb M railties/lib/rails/generators/rails/app/templates/Gemfile commit 185c020 refs/heads/master Author: Steve Klabnik Date: 2012-10-08 09:06:03 -0700 Moving locale stuff from app.rb to an initializer. M railties/lib/rails/generators/rails/app/templates/config/application.rb A railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb commit bb17a0f refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-08 18:03:17 +0200 Cleanup comments a bit and fuck 80 characters M railties/lib/rails/generators/rails/app/templates/config/routes.rb commit 9e84520 refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-08 17:57:28 +0200 Inline comment M railties/lib/rails/generators/app_base.rb commit daf5b66 refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-08 17:52:07 +0200 Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23 M railties/lib/rails/generators/rails/app/templates/config/application.rb commit fc7f3da refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-08 17:49:46 +0200 Everyone is running bundler, no need for defensive programming shit M railties/lib/rails/generators/rails/app/templates/config/application.rb commit d81e76d refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-08 17:44:51 +0200 Not precompiling your assets for production is a bad idea -- do not encourage it M railties/lib/rails/generators/rails/app/templates/config/application.rb commit 28a375a refs/heads/master Merge: 800604e 4756ced Author: José Valim Date: 2012-10-08 05:11:20 -0700 Merge pull request #7872 from kennyj/should_use_app_paths Should use app.paths instead of specific path. commit 4756ced refs/heads/master Author: kennyj Date: 2012-10-08 20:53:25 +0900 Should use app.paths instead of specific path. M activerecord/lib/active_record/railtie.rb commit 9b1853e refs/heads/master Author: Lincoln Lee Date: 2012-10-08 16:50:56 +0800 Fix missing typewriter tag M activerecord/lib/active_record/migration.rb commit 5ee013f refs/heads/master Author: Corey Innis Date: 2012-10-07 20:19:23 -0700 Correct and clarify `--full` and `--mountable` options to `rails plugin new` M guides/source/engines.md commit a4b1196 refs/heads/master Author: Mikhail Dieterle Date: 2012-09-21 11:43:59 +0300 add more testcases and doc about Hash#extract! M activesupport/CHANGELOG.md M activesupport/test/core_ext/hash_ext_test.rb M guides/source/active_support_core_extensions.md commit 5d27338 refs/heads/master Author: Mikhail Dieterle Date: 2012-07-09 00:10:16 +0300 make Hash#extract! more symmetric with Hash#slice M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/slice.rb M activesupport/test/core_ext/hash_ext_test.rb commit 800604e refs/heads/master Merge: 2212110 bf4d6a2 Author: Rafael Mendonça França Date: 2012-10-07 14:48:00 -0700 Merge pull request #6282 from alexeymuranov/rename-fixtures-class Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet" commit 521e2ee refs/heads/master Author: Francesco Rodriguez Date: 2012-10-07 15:36:39 -0500 update Rails::Generators docs [ci skip] M railties/lib/rails/commands/application.rb M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/base.rb M railties/lib/rails/generators/generated_attribute.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/assets/assets_generator.rb M railties/lib/rails/generators/rails/controller/controller_generator.rb M railties/lib/rails/generators/rails/generator/generator_generator.rb M railties/lib/rails/generators/rails/helper/helper_generator.rb M railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb M railties/lib/rails/generators/rails/migration/migration_generator.rb M railties/lib/rails/generators/rails/model/model_generator.rb M railties/lib/rails/generators/rails/observer/observer_generator.rb M railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb M railties/lib/rails/generators/rails/resource/resource_generator.rb M railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb M railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb M railties/lib/rails/generators/rails/task/task_generator.rb M railties/lib/rails/generators/resource_helpers.rb M railties/lib/rails/generators/test_case.rb commit 2212110 refs/heads/master Merge: 918f703 96f290e Author: Rafael Mendonça França Date: 2012-10-07 13:09:22 -0700 Merge pull request #7869 from Locke23rus/actionmailer_new_hash_syntax Update actionmailer with new hash syntax. Just to make clear we don't accept this kind of pull request because it can invalidate a lot of pull requests. I'm accepting this because Action Mailer has only two open pull requests. commit 2f1eea8 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-07 13:50:31 -0500 nodoc JS::Generators [ci skip] M railties/lib/rails/generators/js/assets/assets_generator.rb commit 0ee5433 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-07 13:49:46 -0500 nodoc Erb::Generators [ci skip] M railties/lib/rails/generators/erb.rb M railties/lib/rails/generators/erb/controller/controller_generator.rb M railties/lib/rails/generators/erb/mailer/mailer_generator.rb M railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb commit 4e8ce2c refs/heads/master Author: Francesco Rodriguez Date: 2012-10-07 13:47:34 -0500 nodoc CSS::Generators [ci skip] M railties/lib/rails/generators/css/assets/assets_generator.rb M railties/lib/rails/generators/css/scaffold/scaffold_generator.rb commit bf4d6a2 refs/heads/master Author: Alexey Muranov Date: 2012-05-12 13:17:32 +0200 Add CHANGELOG entry for "Fixtures" -> "FixtureSet" M activerecord/CHANGELOG.md commit c9ccef5 refs/heads/master Author: Alexey Muranov Date: 2012-10-07 20:32:48 +0200 Move/rename files to follow naming conventions A activerecord/lib/active_record/fixture_set/file.rb M activerecord/lib/active_record/fixtures.rb D activerecord/lib/active_record/fixtures/file.rb A activerecord/test/cases/fixture_set/file_test.rb D activerecord/test/cases/fixtures/file_test.rb commit d871807 refs/heads/master Author: Alexey Muranov Date: 2012-05-12 15:42:54 +0200 Deprecate "Fixtures" constant M activerecord/lib/active_record/fixtures.rb commit eecf14d refs/heads/master Author: Francesco Rodriguez Date: 2012-10-07 13:41:53 -0500 nodoc TestUnit::Generators [ci skip] M railties/lib/rails/generators/test_unit.rb M railties/lib/rails/generators/test_unit/controller/controller_generator.rb M railties/lib/rails/generators/test_unit/helper/helper_generator.rb M railties/lib/rails/generators/test_unit/integration/integration_generator.rb M railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb M railties/lib/rails/generators/test_unit/model/model_generator.rb M railties/lib/rails/generators/test_unit/observer/observer_generator.rb M railties/lib/rails/generators/test_unit/performance/performance_generator.rb M railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb M railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb commit 96f290e refs/heads/master Author: Kirill Nikitin Date: 2012-10-07 21:54:14 +0400 Update actionmailer with new hash syntax. M actionmailer/Rakefile M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/collector.rb M actionmailer/lib/action_mailer/delivery_methods.rb M actionmailer/lib/rails/generators/mailer/mailer_generator.rb M actionmailer/test/asset_host_test.rb M actionmailer/test/base_test.rb M actionmailer/test/delivery_methods_test.rb M actionmailer/test/i18n_with_controller_test.rb M actionmailer/test/mail_helper_test.rb M actionmailer/test/mail_layout_test.rb M actionmailer/test/mailers/base_mailer.rb M actionmailer/test/mailers/proc_mailer.rb M actionmailer/test/test_helper_test.rb M actionmailer/test/url_test.rb commit a94220b refs/heads/master Author: Alexey Muranov Date: 2012-05-12 13:17:03 +0200 Rename "Fixtures" class to "FixtureSet" Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`. Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name. This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture. M actionpack/test/active_record_unit.rb M activerecord/lib/active_record/fixtures.rb M activerecord/lib/active_record/fixtures/file.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/test/cases/adapters/mysql/reserved_word_test.rb M activerecord/test/cases/adapters/mysql2/reserved_word_test.rb M activerecord/test/cases/fixtures/file_test.rb M activerecord/test/cases/fixtures_test.rb M activerecord/test/cases/helper.rb M activerecord/test/fixtures/mateys.yml M activerecord/test/fixtures/parrots_pirates.yml M activerecord/test/fixtures/peoples_treasures.yml M railties/lib/rails/test_help.rb commit 918f703 refs/heads/master Author: Xavier Noria Date: 2012-10-07 11:50:50 +0200 explains why these requires are in an unusual place M activesupport/lib/active_support/deprecation.rb commit e0deb0e refs/heads/master Merge: 283949f 8b05cfa Author: Xavier Noria Date: 2012-10-07 02:42:36 -0700 Merge pull request #7650 from kennyj/fix_warning_20120915 Fix warning: circular require considered harmful. commit 283949f refs/heads/master Author: Xavier Noria Date: 2012-10-07 11:38:07 +0200 adds a CHANGELOG for guides and registers the new responsive design A guides/CHANGELOG.md commit fb9c001 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-10-06 22:06:43 -0700 Backport 1a7049906ee6735bae058e9985a3806d08d9746b Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets M railties/lib/rails/rack/logger.rb commit d073116 refs/heads/master Author: Jeremy Kemper Date: 2012-10-06 22:16:39 -0700 Gotta log each spacer line separately to ensure each is tagged M railties/lib/rails/rack/logger.rb commit 1a70499 refs/heads/master Author: Jeremy Kemper Date: 2012-10-06 22:06:43 -0700 Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets M railties/lib/rails/rack/logger.rb commit f89ef12 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-07 02:06:33 -0300 Remove unneeded attr_reader M railties/lib/rails/paths.rb commit 3f97ee8 refs/heads/master Author: Jeremy Kemper Date: 2012-10-06 21:06:10 -0700 Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a few times, so fix up the test to work with however it chooses to escape. M actionpack/test/template/html-scanner/sanitizer_test.rb commit b9999c5 refs/heads/master Author: Jeremy Kemper Date: 2012-10-06 20:57:22 -0700 Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af M activesupport/test/ordered_hash_test.rb commit c22a550 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-07 00:14:35 -0300 Fix nodoc comment M actionpack/lib/action_view/helpers/cache_helper.rb commit e1dd284 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-06 23:00:52 -0300 More Ruby 1.9 hash syntax. M actionpack/lib/action_view/helpers/form_helper.rb commit e1e4b1d refs/heads/master Author: Rafael Mendonça França Date: 2012-10-06 22:44:13 -0300 We don't need to check blank? here. Also the blank? check introduced a bug. $ rails generate model Foo blank:boolean form_for(Foo.new(:blank => true)) => ArgumentError, "First argument in form cannot contain nil or be empty" M actionpack/lib/action_view/helpers/form_helper.rb commit d76ef6f refs/heads/master Author: Rafael Mendonça França Date: 2012-10-06 22:00:06 -0300 Update some code styles. * Uses the Ruby 1.9 hash syntax * Avoid escaping " inside string using the %{} syntax M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/test/template/url_helper_test.rb commit bf07c79 refs/tags/v3.2.9.rc2 Merge: f668ab9 380800e Author: Rafael Mendonça França Date: 2012-10-06 17:13:17 -0700 Merge pull request #7865 from teleological/link_to_remote_3_2 Accept :remote as symbol in link_to options (backport) commit 93d22512 refs/heads/master Merge: 410d376 65a2977 Author: Xavier Noria Date: 2012-10-06 17:08:50 -0700 Merge pull request #6475 from joefiorini/responsive-guides Responsive guides commit 410d376 refs/heads/master Merge: 86b13b6 6caae02 Author: Rafael Mendonça França Date: 2012-10-06 16:44:30 -0700 Merge pull request #7864 from teleological/link_to_remote_master Accept :remote as symbol in link_to options commit 86b13b6 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-06 19:31:57 -0300 Remove unneeded require M activerecord/test/cases/multiparameter_attributes_test.rb commit 5b91aa0 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-06 19:29:17 -0300 Move multiparameter attributes related tests to its own file M activerecord/test/cases/base_test.rb A activerecord/test/cases/multiparameter_attributes_test.rb commit f668ab9 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-06 19:16:26 -0300 Use the Ruby 1.8 hash syntax M actionpack/test/controller/render_test.rb commit 380800e refs/tags/v3.2.9.rc2 Author: Riley Date: 2012-10-06 16:14:28 -0400 Accept :remote as symbol in link_to options Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/test/template/url_helper_test.rb commit 6caae02 refs/heads/master Author: Riley Lynch Date: 2012-10-06 16:58:27 -0400 Accept :remote as symbol in link_to options Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/url_helper.rb M actionpack/test/template/url_helper_test.rb commit 777ffc3 refs/heads/master Author: Adrien Lamothe Date: 2012-10-06 13:41:44 -0700 Update railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit 65a2977 refs/heads/master Author: Joe Fiorini Date: 2012-04-05 00:53:10 -0400 [Guides] Format content for small devices A guides/assets/javascripts/responsive-tables.js M guides/assets/stylesheets/main.css A guides/assets/stylesheets/responsive-tables.css M guides/source/action_controller_overview.md M guides/source/layout.html.erb M guides/source/migrations.md commit 03bcd41 refs/heads/master Author: Joe Fiorini Date: 2012-05-26 00:28:24 -0400 [Guides] Navigation styling for small devices M guides/assets/javascripts/guides.js A guides/assets/javascripts/jquery.min.js M guides/assets/stylesheets/main.css M guides/rails_guides/helpers.rb M guides/source/layout.html.erb commit 151d0b1 refs/heads/master Author: Adrien Lamothe Date: 2012-10-06 13:37:16 -0700 Update guides/source/action_mailer_basics.md M guides/source/action_mailer_basics.md commit 92d7612 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-06 12:45:03 -0700 Merge pull request #7848 from senny/3415_assert_template_has_nil_variable can't pass :locals to #assert_template without a view test case (#3415) Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/render_test.rb commit bcbf1bb refs/heads/master Merge: 05e9258 af677da Author: Rafael Mendonça França Date: 2012-10-06 12:45:03 -0700 Merge pull request #7848 from senny/3415_assert_template_has_nil_variable can't pass :locals to #assert_template without a view test case (#3415) commit de360ac refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-05 22:21:01 -0700 Merge pull request #7850 from senny/5920_postgres_adapter_table_with_capital_letters postgres, quote table names when fetching the primary key (#5920) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit af677da refs/heads/master Author: Yves Senn Date: 2012-10-04 20:55:02 +0200 can't pass :locals to #assert_template without a view test case. Closes #3415 the documentation on #assert_template states that the :locals option is only available in view test cases: # In a view test case, you can also assert that specific locals are passed # to partials: I added a warning when it's passed in an inapropriate context to prevent a NoMethodError. M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/render_test.rb commit 05e9258 refs/heads/master Merge: 9b496d3 3675cd4 Author: Santiago Pastorino Date: 2012-10-05 23:15:11 -0700 Merge pull request #7862 from frodsan/rename_private_method rename private method to avoid overriding commit 3675cd4 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-06 00:49:27 -0500 rename private method to avoid overriding M activesupport/lib/active_support/backtrace_cleaner.rb commit 9b496d3 refs/heads/master Merge: 14b66d6 16e4a53 Author: Rafael Mendonça França Date: 2012-10-05 22:21:01 -0700 Merge pull request #7850 from senny/5920_postgres_adapter_table_with_capital_letters postgres, quote table names when fetching the primary key (#5920) commit 14b66d6 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-06 02:04:44 -0300 We don't need the each call since grep take a block and yield each match to the block. Thanks @tenderlove M actionpack/lib/action_controller/metal/strong_parameters.rb commit 639efb9 refs/heads/master Merge: 62aff55 d91bee8 Author: Rafael Mendonça França Date: 2012-10-05 20:11:03 -0700 Merge pull request #7861 from frodsan/test_backtrace use Rails backtrace in tests commit d91bee8 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-05 21:42:11 -0500 use Rails backtrace in tests M activesupport/lib/active_support/backtrace_cleaner.rb M railties/lib/rails/test_help.rb commit ca519ee refs/heads/master Author: Francesco Rodriguez Date: 2012-10-05 21:42:02 -0500 bump minitest version ~> 4.1.0 M activesupport/activesupport.gemspec commit 9f3b8cd refs/heads/master Author: Ernie Miller Date: 2012-10-05 18:36:44 -0400 Fix has_many assocation w/select load after create If you create a new record via a collection association proxy that has not loaded its target, and which selects additional attributes through the association, then when the proxy loads its target, it will inadvertently trigger an ActiveModel::MissingAttributeError during attribute writing when CollectionAssociation#merge_target_lists attempts to do its thing, since the newly loaded records will possess attributes the created record does not. This error also raises a bogus/confusing deprecation warning when accessing the association in Rails 3.2.x, so cherry-pick would be appreciated! M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/join_model_test.rb commit 2154215 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-05 17:26:16 -0500 add AC::Parameters#permit_all_parameters config option [ci skip] M guides/source/configuring.md commit 4b3377c refs/heads/master Author: Francesco Rodriguez Date: 2012-10-05 17:20:01 -0500 remove old AR Mass Assignment config options [ci skip] M guides/source/configuring.md commit 5af266a refs/heads/master Merge: 8b7f353 7a9dea8 Author: Francesco Rodríguez Date: 2012-10-05 15:07:46 -0700 Merge pull request #115 from ruggeri/master Remove non sequitur NOTE on :include [ci skip] commit 8b7f353 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-05 16:57:50 -0500 delete removed page cache options [ci skip] M guides/source/configuring.md commit d1ae6c5 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-05 16:53:22 -0500 use default_static_extension instead of page_cache_extension deprecated option [ci skip] M guides/source/caching_with_rails.md commit a0d5dca refs/heads/master Author: Francesco Rodriguez Date: 2012-10-05 16:48:08 -0500 update caching with rails guide to reflect action and page extraction [ci skip] M guides/source/caching_with_rails.md commit 62aff55 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-05 18:25:45 -0300 Allow parameter filters to match multi-parameter attributes This will make easier to permit date/time attributes generated by helpers like date_select. [Sven Schwyn + Rafael Mendonça França] M actionpack/lib/action_controller/metal/strong_parameters.rb A actionpack/test/controller/parameters/multi_parameter_attributes_test.rb commit 2b83b07 refs/heads/master Merge: 8197b57 37b3ed1 Author: Rafael Mendonça França Date: 2012-10-05 12:04:29 -0700 Merge pull request #7854 from guilleiguaran/extract-rack-cache Fix middleware cache tests enabling rack_cache commit 37b3ed1 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-05 14:03:13 -0500 Fix middleware cache tests enabling rack_cache M railties/test/application/middleware/cache_test.rb commit 8197b57 refs/heads/master Merge: a0613ad a43213c Author: Jeremy Kemper Date: 2012-10-05 09:38:02 -0700 Merge pull request #7852 from rochefort/fix-example fix Example: Rename tools/profile_requires -> tools/profile commit a43213c refs/heads/master Author: rochefort Date: 2012-10-06 01:32:02 +0900 fix Example: Rename tools/profile_requires -> tools/profile M tools/profile commit a0613ad refs/heads/master Author: Santiago Pastorino Date: 2012-10-05 12:07:16 -0300 Revert "Use flat_map { } instead of map {}.flatten" This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]] M actionpack/lib/action_dispatch/routing/inspector.rb M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/associations/preloader.rb M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/observer.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/callbacks_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/autosave_association_test.rb M activesupport/lib/active_support/multibyte/unicode.rb M guides/rails_guides/helpers.rb M guides/source/active_support_core_extensions.md M railties/lib/rails/generators/actions.rb M railties/lib/rails/paths.rb M railties/lib/rails/source_annotation_extractor.rb M railties/lib/rails/test_unit/testing.rake commit abf8de8 refs/heads/master Author: Santiago Pastorino Date: 2012-10-05 11:52:20 -0300 Use flat_map { } instead of map {}.flatten M actionpack/lib/action_dispatch/routing/inspector.rb M activerecord/lib/active_record/associations/join_dependency.rb M activerecord/lib/active_record/associations/preloader.rb M activerecord/lib/active_record/associations/preloader/association.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/observer.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/associations/callbacks_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/autosave_association_test.rb M activesupport/lib/active_support/multibyte/unicode.rb M guides/rails_guides/helpers.rb M guides/source/active_support_core_extensions.md M railties/lib/rails/generators/actions.rb M railties/lib/rails/paths.rb M railties/lib/rails/source_annotation_extractor.rb M railties/lib/rails/test_unit/testing.rake commit 5c07836 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-05 10:35:03 -0300 Fix the coffee-rails dependecy version M Gemfile commit e9020a6 refs/heads/master Author: Samuel Cochran Date: 2012-10-05 16:14:34 +0800 Add CollectionAssociation#destroy to ActiveRecord::Association::ClassMethods code docs M activerecord/lib/active_record/associations.rb commit 16e4a53 refs/heads/master Author: Yves Senn Date: 2012-10-04 21:57:44 +0200 PostgreSQL, quote table names when fetching the primary key. Closes #5920 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb commit 2e05146 refs/heads/master Author: Samuel Cochran Date: 2012-10-05 14:22:50 +0800 Add CollectionAssociation#destroy to association guide M guides/source/association_basics.md commit a8c8a08 refs/heads/master Merge: 4b33bbc ab4c079 Author: Santiago Pastorino Date: 2012-10-04 19:58:19 -0700 Merge pull request #7838 from guilleiguaran/extract-rack-cache Disable Rack::Cache by default commit ab4c079 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-03 16:48:45 -0500 Update CHANGELOG entry about rack-cache extract M actionpack/CHANGELOG.md commit 3a68a53 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-04 21:52:04 -0500 Comment rack-cache entry on Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile commit 586a991 refs/heads/master Author: Guillermo Iguaran Date: 2012-10-03 16:43:39 -0500 config.action_dispatch.rack_cache should set explicitly to enable Rack::Cache M actionpack/lib/action_dispatch/railtie.rb M railties/lib/rails/application.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/test/application/middleware_test.rb commit 4b33bbc refs/heads/master Author: Rafael Mendonça França Date: 2012-10-04 17:47:36 -0300 Use String#exclude? to make sure that Active Support is not loaded when bare is true. We need to change this since coffee-rails loads ActionView that loads core_ext/array/access. M railties/test/application/initializers/frameworks_test.rb commit a216f91 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-04 17:47:13 -0300 Remove action cache related tests M railties/test/application/configuration_test.rb commit 98c372b refs/heads/master Author: Rafael Mendonça França Date: 2012-10-04 17:46:17 -0300 Strip heredoc to not generate the Gemfile with trailing spaces M railties/lib/rails/generators/app_base.rb commit f822447 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-04 16:44:27 -0300 Add turbolinks as development dependency M Gemfile commit 058dc24 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-04 16:41:11 -0300 Remove unneeded CHANGELOG entry. This was added in Rails 4 and we don't need changelog entries to behavior changes [ci skip] M actionpack/CHANGELOG.md commit afc81bc refs/heads/master Merge: a086e32 1aa522d Author: David Heinemeier Hansson Date: 2012-10-04 11:55:37 -0700 Merge pull request #7847 from bloudermilk/recursive_permit ActionController::Parameters#permit! is recursive commit 1aa522d refs/heads/master Author: Brendan Loudermilk Date: 2012-10-04 11:51:08 -0700 ActionController::Parameters#permit! is recursive M actionpack/CHANGELOG.md M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/parameters_permit_test.rb commit a086e32 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-04 15:42:37 -0300 Do not set removed option Sine page caching was remove from the core we don't have the page_cache_directory anymore M actionpack/lib/action_controller/railtie.rb commit e35d8b1 refs/heads/master Author: David Heinemeier Hansson Date: 2012-10-04 20:22:18 +0200 Turn turbolinks on by default for new apps M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt commit b0a7068 refs/heads/master Merge: 7d204ed ea042ba Author: Rafael Mendonça França Date: 2012-10-04 10:39:06 -0700 Merge pull request #7833 from frodsan/extract_ap_pages_actions_caching Extract AP Page and Action caching from Rails commit 9896729 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-03 17:28:24 -0700 Merge pull request #6978 from frodsan/count_nosql_unsaved_parent Count returns 0 without querying if parent is not saved M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 7d204ed refs/heads/master Merge: c0a182d a2e34f1 Author: Rafael Mendonça França Date: 2012-10-04 09:33:16 -0700 Merge pull request #7846 from ahaymond/master Updated comments for [ci skip] commit a2e34f1 refs/heads/master Author: Adam Haymond Date: 2012-10-04 10:15:31 -0600 Update activerecord/lib/active_record/persistence.rb - Changed the comments documentation for the update_column(s) methods to add a little bit of clarity M activerecord/lib/active_record/persistence.rb commit ea042ba refs/heads/master Author: Francesco Rodriguez Date: 2012-10-04 11:06:54 -0500 add an entry about AP page and action extraction in the upgrading guide [ci skip] M guides/source/upgrading_ruby_on_rails.md commit c82cf81 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-04 10:46:10 -0500 add CHANGELOG entry for AP page and action caching extraction [ci skip] M actionpack/CHANGELOG.md commit c0a182d refs/heads/master Merge: d7d2284 e3438b0 Author: David Heinemeier Hansson Date: 2012-10-04 08:30:49 -0700 Merge pull request #7769 from rgarver/feature/public-fragment_name_with_digest Move the CacheHelper#fragment_name_with_digest to be public commit e3438b0 refs/heads/master Author: Ryan Garver Date: 2012-10-04 08:16:43 -0700 Add nodoc to now public fragment_name_with_digest M actionpack/lib/action_view/helpers/cache_helper.rb commit 1f3a8c8 refs/heads/master Merge: 4cb50a3 d7d2284 Author: Ryan Garver Date: 2012-10-04 08:13:12 -0700 Merge branch 'master' into feature/public-fragment_name_with_digest commit d7d2284 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-04 10:23:27 -0300 Fix CHANGELOG entry [ci skip] M activerecord/CHANGELOG.md commit 3a63fe3 refs/heads/master Merge: e4e84fe aa202ad Author: Rafael Mendonça França Date: 2012-10-03 17:28:24 -0700 Merge pull request #6978 from frodsan/count_nosql_unsaved_parent Count returns 0 without querying if parent is not saved commit aa202ad refs/heads/master Author: Francesco Rodriguez Date: 2012-10-03 18:02:14 -0500 Count returns 0 without querying if parent is not saved Patches `CollectionAssociation#count` to return 0 without querying if the parent record is new. Consider the following code: class Account has_many :dossiers end class Dossier belongs_to :account end a = Account.new a.dossiers.build # before patch a.dossiers.count # SELECT COUNT(*) FROM "dossiers" WHERE "dossiers"."account_id" IS NULL # => 0 # after a.dosiers.count # fires without sql query # => 0 Fixes #1856. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 95369a5 refs/tags/v3.2.9.rc2 Merge: 288885f 36261c8 Author: Rafael Mendonça França Date: 2012-10-03 14:33:55 -0700 Merge pull request #7836 from lihanli/error-msg-update Update supported ruby versions error message in ruby_version_check.rb commit 36261c8 refs/tags/v3.2.9.rc2 Author: lihan Date: 2012-10-03 16:34:41 -0400 Update supported ruby versions error message in ruby_version_check.rb M railties/CHANGELOG.md M railties/lib/rails/ruby_version_check.rb commit e4d5b69 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-03 15:35:19 -0500 rename page_cache_extension option to default_static_extension M actionpack/lib/action_controller/caching.rb M actionpack/lib/action_dispatch/middleware/static.rb M actionpack/test/controller/caching_test.rb commit 2f81be1 refs/heads/master Author: Francesco Rodriguez Date: 2012-10-03 11:14:28 -0500 extract AP Page and Action caching to actionpack-deprecated_caching gem M actionpack/lib/action_controller/caching.rb D actionpack/lib/action_controller/caching/actions.rb D actionpack/lib/action_controller/caching/pages.rb M actionpack/test/controller/caching_test.rb M actionpack/test/controller/log_subscriber_test.rb commit ec57489 refs/heads/master Merge: 93b1ca8 773c0fd Author: Jared Nipper Date: 2012-10-03 08:18:27 -0700 Merge pull request #116 from jarednipper/master Fixed two typos in the testing guide commit 288885f refs/tags/v3.2.9.rc2 Author: Santiago Pastorino Date: 2012-10-03 00:48:28 -0300 Refactor Conflicts: activerecord/lib/active_record/counter_cache.rb M activerecord/lib/active_record/counter_cache.rb commit e4e84fe refs/heads/master Author: Santiago Pastorino Date: 2012-10-03 00:48:28 -0300 Refactor M activerecord/lib/active_record/counter_cache.rb commit d56b5da refs/heads/master Author: Rafael Mendonça França Date: 2012-10-03 00:17:10 -0300 Use the `flat_map` method. Thanks to @jeremy to teach me this one. M activemodel/lib/active_model/validations.rb commit 8606200 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-02 23:56:12 -0300 Revert "Merge pull request #7826 from sikachu/master-validators-kind" This reverts commit 4e9f53f9736544f070e75e516c71137b7eb49a7a, reversing changes made to 6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9. Revert "Don't use tap in this case." This reverts commit 454d820bf0a18fe1db4c55b0145197d70fef1f82. Reason: Is not a good idea to add options to this method since we can do the same thing using method composition. Person.validators_on(:name).select { |v| v.kind == :presence } Also it avoids to change the method again to add more options. M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations.rb M activemodel/test/cases/validations_test.rb commit 454d820 refs/heads/master Author: Rafael Mendonça França Date: 2012-10-02 23:24:42 -0300 Don't use tap in this case. The use of tap in this case is very confusing since we are mutating the return value inside the block M activemodel/lib/active_model/validations.rb commit 4e9f53f refs/heads/master Merge: 6b802cd 4f9b59d Author: Rafael Mendonça França Date: 2012-10-02 19:14:52 -0700 Merge pull request #7826 from sikachu/master-validators-kind Make `.validators_on` accept `:kind` option commit 4f9b59d refs/heads/master Author: Prem Sichanugrist Date: 2012-10-02 21:45:09 -0400 Make `.validators_on` accept `:kind` option This will filter out the validators on a particular attribute based on its kind. M activemodel/CHANGELOG.md M activemodel/lib/active_model/validations.rb M activemodel/test/cases/validations_test.rb commit 6b802cd refs/heads/master Merge: 0a50792 26fe77b Author: Rafael Mendonça França Date: 2012-10-02 18:59:22 -0700 Merge pull request #7825 from sikachu/master-rails-pathname Make Rails.public_path return a Pathname commit 26fe77b refs/heads/master Author: Prem Sichanugrist Date: 2012-10-02 20:44:02 -0400 Make Rails.public_path return a Pathname M railties/CHANGELOG.md M railties/lib/rails.rb M railties/test/application/configuration_test.rb commit 93b1ca8 refs/heads/master Author: Nick Rowe Date: 2012-10-02 15:35:12 -0700 Fix all examples in comments in active_model attribute methods M activemodel/lib/active_model/attribute_methods.rb commit 1c02b98 refs/heads/master Author: Nick Rowe Date: 2012-10-02 15:18:08 -0700 Fix Example in active model attribute methods M activemodel/lib/active_model/attribute_methods.rb commit 0a50792 refs/heads/master Merge: df08271 0479bff Author: Michael Koziarski Date: 2012-10-02 14:26:16 -0700 Merge pull request #6952 from NZKoz/key_generator Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2 commit a7244ca refs/heads/master Author: David A McClain Date: 2012-10-02 13:57:59 -0700 Fixing markdown typos in upgrading_ruby_on_rails.md M guides/source/upgrading_ruby_on_rails.md commit 3f0bc97 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-02 09:23:02 -0700 Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through Fix reset_counters crashing on has_many :through associations. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/counter_cache.rb M activerecord/test/cases/counter_cache_test.rb M activerecord/test/models/subscription.rb M activerecord/test/schema/schema.rb commit 4cb50a3 refs/heads/master Merge: 3fdb712 df08271 Author: Ryan Garver Date: 2012-10-02 10:37:27 -0700 Merge branch 'master' into feature/public-fragment_name_with_digest commit 8b05cfa refs/heads/master Author: kennyj Date: 2012-09-15 17:13:58 +0900 Fix warning: circular require considered harmful. M activesupport/lib/active_support/deprecation.rb commit df08271 refs/heads/master Author: kennyj Date: 2012-09-15 15:29:22 +0900 fix warning: method redefined M activerecord/test/cases/store_test.rb M activerecord/test/models/admin/user.rb commit 2bc1ac7 refs/heads/master Merge: 0d41d69 6e56a03 Author: Rafael Mendonça França Date: 2012-10-02 09:23:02 -0700 Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through Fix reset_counters crashing on has_many :through associations. commit 6e56a03 refs/heads/master Author: lulalala Date: 2012-10-02 22:30:06 +0800 Fix reset_counters() crashing on has_many :through associations. The counter column name in the intermediate model need to be access via the through reflection. M activerecord/CHANGELOG.md M activerecord/lib/active_record/counter_cache.rb M activerecord/test/cases/counter_cache_test.rb M activerecord/test/models/subscription.rb M activerecord/test/schema/schema.rb commit c8f50ef refs/heads/master Author: schneems Date: 2012-10-01 21:05:53 -0400 Add command before bash output Add tip for command line. M guides/source/active_record_validations_callbacks.md commit e8bdbef refs/heads/master Author: schneems Date: 2012-10-01 20:56:03 -0400 add command line $ tip for new programmers M guides/source/migrations.md commit ae44482 refs/heads/master Author: schneems Date: 2012-10-01 20:54:48 -0400 improve wording over `change` method docs The feature is available after Rails 3.1 and this is no longer a "new" feature. M guides/source/migrations.md commit eb85394 refs/heads/master Author: schneems Date: 2012-10-01 20:49:04 -0400 instructions for running migrations in another ENV M guides/source/migrations.md commit ddcda85 refs/heads/master Author: schneems Date: 2012-10-01 20:43:09 -0400 Add /rails/info/routes method to getting_started Also fix # to $ for `rake routes` command M guides/source/getting_started.md commit e427c3b refs/heads/master Author: schneems Date: 2012-10-01 20:42:24 -0400 explain how to check if the server has returned on *nix systems in getting_started guide M guides/source/getting_started.md commit f8a54e1 refs/heads/master Author: schneems Date: 2012-10-01 20:33:27 -0400 Explain that command line commands have $ This was extremely confusing to new programmers, also different operating systems call the command line something different M guides/source/getting_started.md commit 6b1467b refs/heads/master Author: schneems Date: 2012-10-01 20:31:28 -0400 change `#` to `$` in bash section M guides/source/getting_started.md commit 5a07de6 refs/heads/master Author: schneems Date: 2012-09-28 16:32:27 -0400 Space between "every" and "time" M actionpack/lib/action_dispatch/middleware/show_exceptions.rb commit ae9b3d7 refs/heads/master Author: Nihad Abbasov Date: 2012-10-02 13:37:25 +0500 remove unnecessary object/conversions file M activesupport/lib/active_support/core_ext/object.rb D activesupport/lib/active_support/core_ext/object/conversions.rb M activesupport/test/core_ext/array_ext_test.rb M activesupport/test/core_ext/hash_ext_test.rb commit 0d41d69 refs/heads/master Merge: cfc0ca0 561edbe Author: Rafael Mendonça França Date: 2012-10-01 21:31:34 -0700 Merge pull request #7636 from steveklabnik/issue_5660 Fixes issue #5660: Failsafe exception returns text/html and text/plain. commit 561edbe refs/heads/master Author: Steve Klabnik Date: 2012-07-05 22:39:15 -0700 Failsafe exception returns text/plain. It's best to just return text/plain when something has gone terribly wrong. Fixes #5660. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/middleware/show_exceptions.rb M actionpack/test/controller/show_exceptions_test.rb commit cfc0ca0 refs/heads/master Merge: 8ea88c3 8e1b02f Author: Rafael Mendonça França Date: 2012-10-01 20:28:31 -0700 Merge pull request #7708 from bdurand/optimize_log_subscribers Optimize log subscribers to check if the log level is sufficient commit 8ea88c3 refs/heads/master Author: Santiago Pastorino Date: 2012-10-02 00:06:05 -0300 Add the CHANGELOG entry that Guillermo forgot :P M actionpack/CHANGELOG.md commit 2bad605 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-01 19:30:08 -0700 Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables prefix TemplateAssertions ivars. Closes #7459 Conflicts: actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/test_case.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/test_case.rb commit 037e50e refs/heads/master Merge: f934aec f4a6f1d Author: Santiago Pastorino Date: 2012-10-01 19:52:52 -0700 Merge pull request #7794 from guilleiguaran/extract-rack-cache Use Rack::Cache middleware only if is in Gemfile commit f4a6f1d refs/heads/master Author: Guillermo Iguaran Date: 2012-09-30 00:55:06 -0500 Add rack-cache to default Gemfile M railties/lib/rails/generators/rails/app/templates/Gemfile M railties/test/generators/app_generator_test.rb commit cbd26a8 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-30 00:26:45 -0500 Use Rack::Cache middleware only if is in Gemfile M Gemfile M actionpack/actionpack.gemspec M railties/lib/rails/application.rb commit f934aec refs/heads/master Merge: 325748d bb0f4a1 Author: Rafael Mendonça França Date: 2012-10-01 19:30:08 -0700 Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables prefix TemplateAssertions ivars. Closes #7459 commit 325748d refs/heads/master Author: Rafael Mendonça França Date: 2012-10-01 23:17:13 -0300 New CHANGELOG entries always in the top M activesupport/CHANGELOG.md commit 76ea63c refs/heads/master Author: Francesco Rodriguez Date: 2012-10-01 14:31:23 -0500 use markdown syntax instead of [url](url) [ci skip] M guides/source/getting_started.md commit c7d39f2 refs/heads/master Author: Victor Costan Date: 2012-10-01 13:54:48 -0300 Fix truncated line in the i18n edge guide M guides/source/i18n.md commit 773c0fd refs/heads/master Author: Jared Nipper Date: 2012-10-01 10:40:03 -0600 Fixed typo in command to run unit test M guides/source/testing.md commit 29f5982 refs/heads/master Author: Jared Nipper Date: 2012-10-01 10:39:12 -0600 Fixed typo in command to run unit test M guides/source/testing.md commit 3b5bc8d refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-10-01 06:56:53 -0700 Merge pull request #7789 from senny/7777_resource_functions_modify_options resource and resources do no longer modify passed options M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit bb0f4a1 refs/heads/master Author: Yves Senn Date: 2012-09-30 10:54:50 +0200 prefix TemplateAssertions ivars (#7459) M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/lib/action_view/test_case.rb commit d0ad97b refs/heads/master Merge: 997a164 b30ce03 Author: Rafael Mendonça França Date: 2012-10-01 06:56:53 -0700 Merge pull request #7789 from senny/7777_resource_functions_modify_options resource and resources do no longer modify passed options commit b30ce03 refs/heads/master Author: Yves Senn Date: 2012-09-29 20:21:16 +0200 resource and resources do no longer modify passed options this is a patch for #7777. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit 997a164 refs/heads/master Merge: 15125e0 2105167 Author: Rafael Mendonça França Date: 2012-10-01 06:13:19 -0700 Merge pull request #7813 from arunagw/warning_fixed_as warning fixed: (...) interpreted as grouped expression commit a02f67b refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-30 18:30:33 -0700 Merge pull request #6450 from iHiD/resource_generator_routes_master Master branch: Fixed generated whitespace in routes when using namespaced resource. Merge pull request #7811 from iHiD/resource_generator_routes_master Fix the build (Broken scaffold routes test) M railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb M railties/test/generators/namespaced_generators_test.rb M railties/test/generators/scaffold_generator_test.rb commit 2105167 refs/heads/master Author: Arun Agrawal Date: 2012-10-01 16:20:36 +0530 warning fixed: (...) interpreted as grouped expression M activesupport/test/caching_test.rb commit 7a9dea8 refs/heads/master Author: Ned Ruggeri Date: 2012-10-01 03:27:26 -0700 remove non sequitur NOTE on :include M guides/source/active_record_querying.md commit 15125e0 refs/heads/master Merge: 34239cc b784900 Author: Jeremy Kemper Date: 2012-09-30 22:31:58 -0700 Merge pull request #7812 from bdurand/optimize_cache_entry_take_2 fix broken cache tests commit b784900 refs/heads/master Author: Brian Durand Date: 2012-09-30 21:56:47 -0700 fix broken cache tests M activesupport/lib/active_support/cache.rb M activesupport/test/caching_test.rb commit 34239cc refs/heads/master Merge: 2547f36 b09e592 Author: Santiago Pastorino Date: 2012-09-30 19:56:09 -0700 Merge pull request #7811 from iHiD/resource_generator_routes_master Fix the build (Broken scaffold routes test) commit b09e592 refs/heads/master Author: Jeremy Walker Date: 2012-10-01 03:49:14 +0100 Fix broken scaffold routes test M railties/test/generators/scaffold_generator_test.rb commit 2547f36 refs/heads/master Merge: b10c882 55eba0a Author: Jeremy Kemper Date: 2012-09-30 19:47:40 -0700 Merge pull request #7810 from steveklabnik/fix_build fix cache store test commit 55eba0a refs/heads/master Author: Steve Klabnik Date: 2012-09-30 19:41:57 -0700 fix cache store test Pull #7800 broke the build, this should fix it. M actionpack/test/dispatch/session/cache_store_test.rb commit 0479bff refs/heads/master Author: Michael Koziarski Date: 2012-10-01 15:34:12 +1300 Provide access to the application's KeyGenerator Available both as an env entry for rack and an instance method on Rails::Application for other uses M railties/lib/rails/application.rb M railties/test/application/configuration_test.rb commit 07a3c21 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-30 21:01:43 -0500 fix example in Migration docs [ci skip] M activerecord/lib/active_record/migration.rb commit 628e38d refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-30 22:59:23 -0300 Since File instance doesn't respond to #open use a double to test the behavior added at c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb M actionpack/lib/action_dispatch/http/upload.rb M actionpack/test/controller/test_test.rb M actionpack/test/dispatch/uploaded_file_test.rb commit b10c882 refs/heads/master Merge: a6cfd33 a311733 Author: Rafael Mendonça França Date: 2012-09-30 18:30:33 -0700 Merge pull request #6450 from iHiD/resource_generator_routes_master Master branch: Fixed generated whitespace in routes when using namespaced resource. commit def2ccb refs/heads/master Author: Michael Koziarski Date: 2012-07-04 12:37:31 +1200 Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2 This will be used to derive keys from the secret and a salt, in order to allow us to do things like encrypted cookie stores without using the secret for multiple purposes directly. M activesupport/lib/active_support.rb A activesupport/lib/active_support/key_generator.rb A activesupport/test/key_generator_test.rb commit c5647a0 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-30 18:48:22 -0500 add change_table transformation to Migration docs [ci skip] M activerecord/lib/active_record/migration.rb commit a6cfd33 refs/heads/master Author: Jeremy Kemper Date: 2012-09-30 14:57:04 -0700 Add a changelog entry for asset aliasing update in sprockets-rails. Supports referencing foo.js as foo/index.js and vice versa. M actionpack/CHANGELOG.md commit 19987b6 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-30 14:46:06 -0700 Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us. M actionpack/CHANGELOG.md M actionpack/actionpack.gemspec M actionpack/lib/sprockets/static_compiler.rb M railties/test/application/assets_test.rb commit 2b05bac refs/heads/master Merge: 80f14d0 7f1eef9 Author: Xavier Noria Date: 2012-09-30 12:48:20 -0700 Merge pull request #7808 from steveklabnik/fix_assertion_order Fix other assertions that were backwards. commit 7f1eef9 refs/heads/master Author: Steve Klabnik Date: 2012-09-30 12:37:59 -0700 Fix other assertions that were backwards. This time I used ack. M activesupport/test/caching_test.rb commit 80f14d0 refs/heads/master Merge: 3b97f6d 06d173b Author: Xavier Noria Date: 2012-09-30 11:12:00 -0700 Merge pull request #7805 from steveklabnik/fix_assertion_order fix order of assertions. commit 06d173b refs/heads/master Author: Steve Klabnik Date: 2012-09-30 11:08:11 -0700 fix order of assertions. M activesupport/test/caching_test.rb commit 5cb5092 refs/tags/v3.2.9.rc2 Merge: d77d4a8 2475882 Author: Xavier Noria Date: 2012-09-30 10:01:09 -0700 Merge pull request #7802 from steveklabnik/issue_7799 Fix reference to code sample in Getting Started. commit 8e1b02f refs/heads/master Merge: 3785272 d47fde6 Author: Brian Durand Date: 2012-09-30 09:48:17 -0700 Merge branch 'optimize_log_subscribers' of github.com:bdurand/rails into optimize_log_subscribers commit 3785272 refs/heads/master Author: Brian Durand Date: 2012-09-19 16:00:28 -0700 Optimize log subscribers to check if the log level is sufficient before performing an operations. M actionmailer/lib/action_mailer/log_subscriber.rb M actionpack/lib/action_controller/log_subscriber.rb M actionpack/lib/action_view/log_subscriber.rb M activerecord/lib/active_record/log_subscriber.rb M activesupport/CHANGELOG.md commit 3b97f6d refs/heads/master Merge: da27fa1 e3a746b Author: Xavier Noria Date: 2012-09-30 09:44:03 -0700 Merge pull request #7800 from bdurand/optimize_cache_entry_take_2 Optimize ActiveSupport::Cache::Entry to reduce overhead commit 2475882 refs/tags/v3.2.9.rc2 Author: Steve Klabnik Date: 2012-09-30 09:38:01 -0700 Fix reference to code sample in Getting Started. Fixes #7799. M railties/guides/source/getting_started.textile commit ce7d107 refs/heads/master Author: Fabrizio Regini Date: 2012-09-30 18:33:59 +0200 updates latest Rails version number M guides/source/engines.md commit e3a746b refs/heads/master Author: Brian Durand Date: 2012-09-30 09:26:04 -0700 Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead. M activesupport/CHANGELOG.md M activesupport/lib/active_support/cache.rb M activesupport/lib/active_support/cache/memory_store.rb M activesupport/test/caching_test.rb commit da27fa1 refs/heads/master Merge: 15712ac 59b8b82 Author: Vijay Dev Date: 2012-09-30 01:22:52 -0700 Merge pull request #7795 from guilleiguaran/fix-ap-changelog Fix changelog entry about sprockets-rails commit 59b8b82 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-30 02:05:12 -0500 Fix changelog entry about sprockets-rails M actionpack/CHANGELOG.md commit 0677d99 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-30 01:56:17 -0500 Make strong_parameters example simpler M guides/source/security.md commit 15712ac refs/heads/master Merge: 623f2fb f224b4f Author: Rafael Mendonça França Date: 2012-09-29 21:20:59 -0700 Merge pull request #7791 from acapilleri/build_association small refactoring of build_relation in uniqueness commit d77d4a8 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-30 00:23:16 -0300 New CHANGELOG entries always in the top [ci skip] M actionpack/CHANGELOG.md commit 623f2fb refs/heads/master Author: Rafael Mendonça França Date: 2012-09-30 00:21:51 -0300 Whitespaces :scissors: [ci skip] M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb commit 7d17cd2 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-29 20:00:10 -0700 Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased REBASED: fixing assert_template bug when template matches expected, but not ends with Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/test_case.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb A actionpack/test/fixtures/test/hello/hello.erb commit d0d02bf refs/heads/master Merge: f655108 19dff78 Author: Rafael Mendonça França Date: 2012-09-29 20:00:10 -0700 Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased REBASED: fixing assert_template bug when template matches expected, but not ends with commit 19dff78 refs/heads/master Author: Hugo Roque Date: 2012-04-07 00:27:47 -0300 `assert_template` no more passing with what ever string that matches. Given Im rendering an template `/layout/hello.html.erb`, assert_template was passing with any string that matches. This behavior allowed false passing like: assert_template "layout" assert_template "out/hello" Now the passing possibilities are: assert_template "layout/hello" assert_template "hello" fixing assert_template bug when template matches expected, but not ends with Cherry Pick Merge: Fixes issue #3849 assert_template false positive taking redundant test off prevening incorrect assert_template when rendering with repeated names in path updating CHANGELOG with bugfix: assert_template false passing M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/action_pack_assertions_test.rb A actionpack/test/fixtures/test/hello/hello.erb commit f224b4f refs/heads/master Author: Angelo Capilleri Date: 2012-09-29 23:29:48 +0200 small refactoring of build_relation in uniqueness reflection init as 'if' stantment. column is always the same expression and depends from the changing of attributes M activerecord/lib/active_record/validations/uniqueness.rb commit a311733 refs/heads/master Author: Jeremy Walker Date: 2012-09-29 16:24:38 +0100 Fixed generated whitespace in routes when using namespaced resource. M railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb M railties/test/generators/namespaced_generators_test.rb commit c2a7084 refs/tags/v3.2.9.rc2 Merge: e1a10b1 c53e5de Author: Rafael Mendonça França Date: 2012-09-29 07:44:11 -0700 Merge pull request #7786 from yabawock/3-2-stable Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests" commit c53e5de refs/tags/v3.2.9.rc2 Author: Tim Vandecasteele Date: 2012-06-21 10:16:28 +0200 Don't paramify ActionDispatch::Http::UploadedFile in tests To test uploading a file without using fixture_file_upload, a posted ActionDispatch::Http::UploadedFile should not be paramified (just like Rack::Test::UploadedFile). (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't share the same API, tempfile is not accessible on Rack::Test::UploadedFile as discussed in https://github.com/brynary/rack-test/issues/30) M actionpack/CHANGELOG.md M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/test_test.rb commit f655108 refs/heads/master Merge: 4fd0f90 b4006db Author: Rafael Mendonça França Date: 2012-09-28 19:01:51 -0700 Merge pull request #7784 from morgoth/proper_test_names_for_assertions Changed test names to match proper context commit 4fd0f90 refs/heads/master Merge: 2296340 a6e09a5 Author: Jeremy Kemper Date: 2012-09-28 18:16:48 -0700 Merge pull request #7787 from sferik/update_minitest Update minitest dependency to ~> 4.0 commit a6e09a5 refs/heads/master Author: Erik Michaels-Ober Date: 2012-09-28 18:06:39 -0700 Update minitest dependency to ~> 4.0 M activesupport/activesupport.gemspec commit e1a10b1 refs/tags/v3.2.9.rc2 Merge: 8ca05c2 8dbf337 Author: Aaron Patterson Date: 2012-09-28 16:57:24 -0700 Merge pull request #7785 from okcwest/3-2-stable backport 68677ffb8298105eb9d3efa26d928dd88cc5e006 commit 2296340 refs/heads/master Merge: a7f8872 a4c358f Author: Santiago Pastorino Date: 2012-09-28 15:49:04 -0700 Merge pull request #7783 from guilleiguaran/namespace-assets-cache-store Assets cache shouldn't be shared between different environments commit 8dbf337 refs/tags/v3.2.9.rc2 Author: Evan Petrie Date: 2012-09-28 14:19:31 -0700 backport 68677ffb8298105eb9d3efa26d928dd88cc5e006 M activerecord/lib/active_record/base.rb M activerecord/lib/active_record/scoping/named.rb M activerecord/test/cases/relation_scoping_test.rb M activerecord/test/cases/relations_test.rb commit b4006db refs/heads/master Author: Wojciech Wnętrzak Date: 2012-09-28 22:58:27 +0200 Changed test names to match proper context M activesupport/test/test_test.rb commit a4c358f refs/heads/master Author: Guillermo Iguaran Date: 2012-09-28 15:20:17 -0500 Assets cache shouldn't be shared between different environments M railties/lib/rails/application/configuration.rb M railties/lib/rails/tasks/tmp.rake M railties/test/application/assets_test.rb commit a7f8872 refs/heads/master Merge: 9e34127 10f5f23 Author: Rafael Mendonça França Date: 2012-09-28 13:05:31 -0700 Merge pull request #7782 from yahonda/case_insensitive_test_for_partial_inserts Change query pattern case insensitive commit 10f5f23 refs/heads/master Author: Yasuo Honda Date: 2012-09-29 04:57:27 +0900 Change query pattern case insensitive because Oracle adapter uses upper case attribute/column name. M activerecord/test/cases/dirty_test.rb commit 9e34127 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-28 16:08:16 -0300 Fix syntax error in the command_line guide [ci skip] M guides/source/command_line.md commit 9eb72ac refs/heads/master Author: Rafael Mendonça França Date: 2012-09-28 15:26:33 -0300 Fix syntax error with no US-ASCII char M activerecord/lib/active_record/validations.rb commit b8aa392 refs/heads/master Author: Vijay Dev Date: 2012-09-28 23:47:15 +0530 revise commandline guide [ci skip] M guides/source/command_line.md commit 8ca05c2 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-28 11:15:06 -0700 Hashrocket for 1.8 support M railties/test/application/rack/logger_test.rb commit c203557 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-28 10:53:17 -0700 Shush uninitialized @_layout warning M actionpack/lib/abstract_controller/layouts.rb commit 955a72c refs/heads/master Merge: 77fbe1c cf3e760 Author: Vijay Dev Date: 2012-09-28 23:17:07 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb commit cf3e760 refs/heads/master Author: Vijay Dev Date: 2012-09-28 23:15:09 +0530 copy editing [ci skip] M guides/source/i18n.md commit 0b30d66 refs/heads/master Author: Vijay Dev Date: 2012-09-28 22:49:43 +0530 Revert "add documentation to generated routes" This reverts commit bfafa999ddaa203224ac0222203517a0d2a3f6bf. Changes in templates aren't allowed in docrails. [ci skip] M guides/code/getting_started/config/routes.rb M railties/lib/rails/generators/rails/app/templates/config/routes.rb commit 77fbe1c refs/heads/master Author: Rafael Mendonça França Date: 2012-09-28 14:10:38 -0300 Add missing CHANGELOG entry removed by mistake at 7f3b475 [ci skip] M activerecord/CHANGELOG.md commit d14da79 refs/heads/master Author: Jon Leighton Date: 2012-09-28 18:07:25 +0100 Add an explicit test for hot compatibility A activerecord/test/cases/hot_compatibility_test.rb commit 144e869 refs/heads/master Author: Jon Leighton Date: 2012-09-28 17:55:35 +0100 Support for partial inserts. When inserting new records, only the fields which have been changed from the defaults will actually be included in the INSERT statement. The other fields will be populated by the database. This is more efficient, and also means that it will be safe to remove database columns without getting subsequent errors in running app processes (so long as the code in those processes doesn't contain any references to the removed column). M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods.rb M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/dirty_test.rb commit f9c63ad refs/heads/master Merge: f63dd4a bca66a3 Author: Rafael Mendonça França Date: 2012-09-28 10:06:36 -0700 Merge pull request #7776 from smartinez87/changelog_entry Add #update_columns entry to AR Changelog. [ci skip] commit bca66a3 refs/heads/master Author: Sebastian Martinez Date: 2012-09-28 13:58:07 -0300 Add #update_columns entry to AR Changelog. M activerecord/CHANGELOG.md commit ddba97f refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-28 09:56:49 -0700 Shush syntax warnings M activesupport/lib/active_support/tagged_logging.rb commit f63dd4a refs/heads/master Merge: 7e0cf56 bd77fff Author: Rafael Mendonça França Date: 2012-09-28 07:32:05 -0700 Merge pull request #7394 from bobbyw/master Use template0 option for creating activerecord test databases in build_database task with postgres commit 7e0cf56 refs/heads/master Author: Jon Leighton Date: 2012-09-28 12:11:48 +0100 Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*args).deliver`. This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when testing code that calls the mailer. M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/test/base_test.rb commit aa8918a refs/heads/master Merge: aca3942 9142da0 Author: Rafael Mendonça França Date: 2012-09-27 21:12:07 -0700 Merge pull request #7775 from frodsan/test_ap_metal move metal/caching_test into controller/caching_test commit 9142da0 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-27 23:10:53 -0500 move metal/caching_test into controller/caching_test M actionpack/test/controller/caching_test.rb D actionpack/test/metal/caching_test.rb commit aca3942 refs/heads/master Author: Jeremy Kemper Date: 2012-09-27 14:45:48 -0700 Fix tests broken by adding a new instance variable to view test cases M actionpack/lib/action_view/test_case.rb commit 610cf9d refs/heads/master Author: Rafael Mendonça França Date: 2012-09-27 18:44:00 -0300 remove method redefinition warnings actionpack/test/template/spec_type_test.rb:32: warning: method redefined; discarding old test_spec_type_wont_match_non_space_characters actionpack/test/controller/spec_type_test.rb:30: warning: previous definition of test_spec_type_wont_match_non_space_characters was here M actionpack/test/controller/spec_type_test.rb M actionpack/test/template/spec_type_test.rb commit 7f41a08 refs/heads/master Author: Santiago Pastorino Date: 2012-09-27 16:56:55 -0300 Is not needed to wrap name inside an array here M actionpack/lib/action_controller/metal/strong_parameters.rb commit 5917c6e refs/heads/master Author: Grant Hutchins & Sabrina Staedt Date: 2012-09-27 15:37:24 -0400 Improve documentation for subscribe block M activesupport/lib/active_support/notifications.rb commit 60f77cd refs/heads/master Author: Santiago Pastorino Date: 2012-09-27 16:27:02 -0300 Change key not found to param not found M actionpack/lib/action_controller/metal/strong_parameters.rb commit 46f0fc6 refs/heads/master Author: Sebastian Martinez Date: 2012-09-27 13:01:21 -0300 Add #update_columns entry in Rails 4.0 release notes [ci skip] M guides/source/4_0_release_notes.md commit 7a2b809 refs/heads/master Author: Teng Siong Ong Date: 2012-09-27 01:53:04 -0700 bleakhouse is no longer useful for rails and outdated. M guides/source/debugging_rails_applications.md commit 6ee8e92 refs/heads/master Author: cczona Date: 2012-09-26 13:57:03 -0700 typo fix: remove duplicate period M guides/source/asset_pipeline.md commit 35a1750 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-26 15:08:25 -0700 Tune up Rails::Rack::Logger. Only put space between requests in development logs. Conflicts: railties/test/application/rack/logger_test.rb M railties/lib/rails/rack/logger.rb M railties/test/application/rack/logger_test.rb commit 20f5f08 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-26 10:08:20 -0700 Add logger.push_tags and .pop_tags to complement logger.tagged Avoid memory leak from unflushed logs on other threads leaving tags behind. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/tagged_logging.rb activesupport/test/tagged_logging_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/tagged_logging.rb M activesupport/test/tagged_logging_test.rb commit 032c2b6 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-25 20:27:26 -0700 Log newlines separately to ensure the 'Started GET ...' line has a tag on the same line M railties/lib/rails/rack/logger.rb commit 08ca483 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-24 14:07:10 -0700 Only apply log tags if the logger supports it M railties/lib/rails/rack/logger.rb commit 991cf78 refs/heads/master Merge: 1b73dbd 5fef8c1 Author: Rafael Mendonça França Date: 2012-09-27 08:58:21 -0700 Merge pull request #7768 from kennyj/removing_dead_code_20120928 Removing dead code. attribute_cast_code isn't called. commit 3fdb712 refs/heads/master Author: Ryan Garver Date: 2012-09-27 08:41:51 -0700 Move the CacheHelper#fragment_name_with_digest to be public so custom fragment caching can benefit from it. M actionpack/lib/action_view/helpers/cache_helper.rb commit 5fef8c1 refs/heads/master Author: kennyj Date: 2012-09-28 00:09:21 +0900 Removing dead code. attribute_cast_code is not called. M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb commit 1b73dbd refs/heads/master Merge: c131211 ba34110 Author: Santiago Pastorino Date: 2012-09-27 07:26:15 -0700 Merge pull request #7760 from alindeman/adds_missing_dependency_to_action_view_test_case Adds missing dependency to ActionView::TestCase::Behavior commit ba34110 refs/heads/master Author: Andy Lindeman Date: 2012-09-26 23:21:09 -0400 ConstantLookup is not needed in every TestCase decendant M activesupport/lib/active_support/test_case.rb M activesupport/test/testing/constant_lookup_test.rb commit 299e057 refs/heads/master Author: Andy Lindeman Date: 2012-09-25 18:04:09 -0400 Also includes ConstantLookup dependency for controller and mailer tests M actionmailer/lib/action_mailer/test_case.rb M actionpack/lib/action_controller/test_case.rb commit abfcdc6 refs/heads/master Author: Andy Lindeman Date: 2012-09-25 17:39:29 -0400 Adds missing dependency to ActionView::TestCase::Behavior * The module is needed for the `determine_constant_from_test_name` method. * Without it, the including class is required to also include `ActiveSupport::Testing::ConstantLookup` or a `NoMethodError` will be raised upon instantiation of that class. * Issue introduced in c0a24555f9e2749fb94efe1967cb9943db0b6a7e M actionpack/lib/action_view/test_case.rb commit c131211 refs/heads/master Author: Jeremy Kemper Date: 2012-09-26 15:08:25 -0700 Tune up Rails::Rack::Logger. Only put space between requests in development logs. M railties/lib/rails/rack/logger.rb M railties/test/application/rack/logger_test.rb commit 86ebe0b refs/heads/master Author: Jeremy Kemper Date: 2012-09-26 11:16:43 -0700 Tests tag the Rails log with the current test class and test case M activesupport/CHANGELOG.md M activesupport/lib/active_support/test_case.rb A activesupport/lib/active_support/testing/tagged_logging.rb M activesupport/test/test_test.rb commit 107fd87 refs/heads/master Author: Jeremy Kemper Date: 2012-09-26 10:52:19 -0700 Allow wrapping a logger that hasn't set a formatter. Default to our SimpleFormatter. Otherwise we try extending nil with the tagging API. M activesupport/lib/active_support/tagged_logging.rb M activesupport/test/tagged_logging_test.rb commit 8156178 refs/heads/master Merge: d36f57f fd99bb8 Author: Aaron Patterson Date: 2012-09-26 10:55:29 -0700 Merge pull request #7444 from szimek/params_parser_raises_parsing_error Raise generic ParseError exception when ParamsParser fails parsing request params commit d36f57f refs/heads/master Author: Jeremy Kemper Date: 2012-09-26 10:08:20 -0700 Add logger.push_tags and .pop_tags to complement logger.tagged M activesupport/CHANGELOG.md M activesupport/lib/active_support/tagged_logging.rb M activesupport/test/tagged_logging_test.rb commit 15d475a refs/heads/master Author: Steve Klabnik Date: 2012-09-26 07:59:18 -0700 Remove readonly notice. You need to have @implicit_readonly set for this to happen, and it's false by defualt. Fixes #3386. M guides/source/active_record_querying.md commit d1cbcd7 refs/heads/master Author: Jeremy Kemper Date: 2012-09-25 20:27:26 -0700 Log newlines separately to ensure the 'Started GET ...' line has a tag on the same line M railties/lib/rails/rack/logger.rb commit 59f8315 refs/heads/master Author: Aaron Patterson Date: 2012-09-25 15:30:22 -0700 fixing most tests on Ruby 2.0 M actionpack/lib/action_dispatch/routing/inspector.rb M actionpack/test/dispatch/routing/inspector_test.rb commit b59faa7 refs/heads/master Author: Aaron Patterson Date: 2012-09-25 15:17:59 -0700 Revert "Use plaform mri_19 for debugger gem" This reverts commit 2233f1456f6fb1b92e6c1bded70b89a3302c4306. M Gemfile commit 267c3d0 refs/heads/master Merge: d665f91 b134000 Author: Aaron Patterson Date: 2012-09-25 14:42:28 -0700 Merge pull request #7759 from blowmage/minitest Add missing inflector dependency commit b134000 refs/heads/master Author: Mike Moore Date: 2012-09-25 15:40:00 -0600 Add missing inflector dependency M activesupport/lib/active_support/testing/constant_lookup.rb M activesupport/test/testing/constant_lookup_test.rb commit d665f91 refs/heads/master Author: Jeremy Kemper Date: 2012-09-25 13:20:26 -0700 Fix destructive side effects from marshaling an association caused by 65843e1acc0c8d285ff79f8c9c49d4d1215440be M activerecord/lib/active_record/associations/association.rb M activerecord/test/cases/associations/extension_test.rb commit f58e82c refs/heads/master Merge: 2233f14 5826b50 Author: Rafael Mendonça França Date: 2012-09-25 13:17:44 -0700 Merge pull request #7757 from yahonda/skip_non_supported_isolation_level Skip tests for non-supported isolation levels commit 2233f14 refs/heads/master Author: Santiago Pastorino Date: 2012-09-25 16:57:05 -0300 Use plaform mri_19 for debugger gem M Gemfile commit 5826b50 refs/heads/master Author: Yasuo Honda Date: 2012-09-26 04:29:25 +0900 Skip tests for non-supported isolation levels i.e. Oracle database does not support these isolation levels. `:read_uncommitted` `:repeatable_read` This commit also works with other databases which do not support these isolation levels. M activerecord/test/cases/transaction_isolation_test.rb commit a200ebd refs/heads/master Author: Nihad Abbasov Date: 2012-09-25 23:20:57 +0600 update image_tag output in examples to actual [ci-skip] M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 01cef4f refs/heads/master Merge: 9fec0c8 5f1710b Author: Rafael Mendonça França Date: 2012-09-25 10:05:50 -0700 Merge pull request #7756 from yahonda/isolation_level_oracle Skip tests for non-supported isolation levels with Oracle commit 9fec0c8 refs/heads/master Merge: c96b20f 3164b0a Author: Rafael Mendonça França Date: 2012-09-25 09:55:43 -0700 Merge pull request #7754 from NARKOZ/image_tag-size Feature: set the same width and height for image if size attribute is a number commit 3164b0a refs/heads/master Author: Nihad Abbasov Date: 2012-09-25 21:30:27 +0500 change ^ and $ anchors in regexp to \A and \z respectively http://guides.rubyonrails.org/security.html#regular-expressions M actionpack/lib/action_view/helpers/asset_tag_helper.rb commit 2b9bce8 refs/heads/master Author: Nihad Abbasov Date: 2012-09-25 18:20:13 +0500 allow to pass numerical value to size option in image_tag This will set image's both width and height attributes to value passed in size option. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/asset_tag_helper.rb M actionpack/test/template/asset_tag_helper_test.rb commit 2029c2a refs/heads/master Author: Bryan Larsen Date: 2012-09-25 13:29:53 -0300 Update guides/source/routing.md M guides/source/routing.md commit c96b20f refs/heads/master Merge: a05a079 64f254c Author: Aaron Patterson Date: 2012-09-25 09:26:42 -0700 Merge pull request #7749 from blowmage/minitest Improve support for minitest's spec DSL commit 5f1710b refs/heads/master Author: Yasuo Honda Date: 2012-09-25 23:30:15 +0900 Skip tests for non-supported isolation levels with Oracle M activerecord/test/cases/transaction_isolation_test.rb commit a05a079 refs/heads/master Merge: 0409c69 9e2948e Author: Rafael Mendonça França Date: 2012-09-25 07:20:57 -0700 Merge pull request #7738 from grosser/verified_request remove unused Mime::Type#verify_request? commit 8800aae refs/tags/v3.2.9.rc2 Merge: 114e180 3908706 Author: Rafael Mendonça França Date: 2012-09-25 06:36:43 -0700 Merge pull request #7684 from jrochkind/connection_pool_timeout_key_backport ConnectionPool accepts spec key 'checkout_timeout' (Backport) commit bfafa99 refs/heads/master Author: schneems Date: 2012-09-24 22:51:11 -0500 add documentation to generated routes Mention that in addition to `rake routes` a developer can also visit `/rails/info/routes` in the browser. M guides/code/getting_started/config/routes.rb M railties/lib/rails/generators/rails/app/templates/config/routes.rb commit 9e2948e refs/heads/master Author: grosser Date: 2012-09-22 19:36:45 -0700 depreacte unused Mime::Type#verify_request? and Mime::Type.browser_generated_types M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/test/dispatch/mime_type_test.rb M actionpack/test/dispatch/rack_test.rb commit 1505617 refs/heads/master Author: schneems Date: 2012-09-24 18:49:17 -0500 remove misleading comment in Rakefile Comment introduced in https://github.com/rails/rails/commit/bbb3e5a8 before rake `isolate:test` was even introduced https://github.com/rails/rails/commit/bbb3e5a8 M railties/Rakefile commit 0409c69 refs/heads/master Author: Xavier Noria Date: 2012-09-25 00:55:52 +0200 some copy-editing I did in passing M actionpack/CHANGELOG.md commit f51d95a refs/heads/master Author: Igor Zubkov Date: 2012-09-25 01:50:21 +0300 Fix typo in 4_0_release_notes.md M guides/source/4_0_release_notes.md commit 9bcd018 refs/heads/master Author: Xavier Noria Date: 2012-09-25 00:21:15 +0200 gives credit to Aaron in the CHANGELOG entry for AC::Live M actionpack/CHANGELOG.md commit 64f254c refs/heads/master Author: Mike Moore Date: 2012-09-24 15:48:12 -0600 Register AD::IntegrationTest for minitest's spec DSL M actionpack/lib/action_dispatch/testing/integration.rb A actionpack/test/dispatch/spec_type_test.rb commit c0a2455 refs/heads/master Author: Mike Moore Date: 2012-09-24 15:37:45 -0600 Support helper tests using spec DSL Improve how helper tests to resolve the helper class from the test name. Add tests for helper tests using the minitest spec DSL. M actionpack/lib/action_view/test_case.rb M actionpack/test/template/test_case_test.rb M actionpack/test/template/test_test.rb commit 86be49a refs/heads/master Merge: 152e3ac 2d4b9c7 Author: Rafael Mendonça França Date: 2012-09-24 14:31:04 -0700 Merge pull request #7727 from frodsan/security_guide_sp update Security guide with StrongParameters documentation commit c9a6c6c refs/heads/master Author: Juanjo Bazán Date: 2012-09-24 23:28:02 +0200 remove duplication M guides/source/active_record_querying.md commit 2d4b9c7 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-24 16:22:28 -0500 update Security guide to reflect mass assignment protection with StrongParameters [ci skip] M guides/source/security.md commit 152e3ac refs/heads/master Author: Jeremy Kemper Date: 2012-09-24 14:07:10 -0700 Only apply log tags if the logger supports it M railties/lib/rails/rack/logger.rb commit 1949d1f refs/heads/master Author: Mike Moore Date: 2012-09-24 14:54:59 -0600 Register helper and view tests for minitest's spec DSL M actionpack/lib/action_view/test_case.rb A actionpack/test/template/spec_type_test.rb commit 58434e0 refs/heads/master Author: Mike Moore Date: 2012-09-24 14:46:58 -0600 Support mailer tests using spec DSL Improve how mailer tests to resolve mailers from the test name. Add tests for mailer tests using the minitest spec DSL. M actionmailer/lib/action_mailer/test_case.rb M actionmailer/test/test_test.rb commit 530102f refs/heads/master Author: Francesco Rodriguez Date: 2012-09-24 15:39:45 -0500 add a note about DynamicForm in error_messages_for section [ci skip] M guides/source/i18n.md commit 0ce383d refs/heads/master Author: Mike Moore Date: 2012-09-24 14:31:05 -0600 Register mailer tests for minitest's spec DSL M actionmailer/lib/action_mailer/test_case.rb A actionmailer/test/spec_type_test.rb commit 52db1f9 refs/heads/master Author: Mike Moore Date: 2012-09-24 14:24:08 -0600 Add register_spec_type test coverage A activesupport/test/spec_type_test.rb commit b2e5db9 refs/heads/master Author: Mike Moore Date: 2012-09-24 14:18:58 -0600 Allow strings in the controller test describe blocks Allow controller tests using the spec DSL to match strings. Add test coverage for the register_spec_type calls. M actionpack/lib/action_controller/test_case.rb M actionpack/test/controller/spec_style_test.rb A actionpack/test/controller/spec_type_test.rb commit 3908706 refs/tags/v3.2.9.rc2 Author: Jonathan Rochkind Date: 2012-09-21 12:35:11 -0400 ConnectionPool accepts spec key 'checkout_timeout' Backport of #6441 cb6f83935 . Old 'wait_timeout' is still supported, but conflicts with mysql2 using that spec key for different thing. 'checkout_timeout' can now be used taking precedence for ConnectionPool over 'wait_timeout'. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/test/cases/connection_pool_test.rb M activerecord/test/cases/pooled_connections_test.rb commit fdc11fd refs/heads/master Author: Mike Moore Date: 2012-09-24 14:15:21 -0600 Support controller tests using spec DSL - fixes #7743 Add tests for controller tests using the minitest spec DSL. M actionpack/lib/action_controller/test_case.rb A actionpack/test/controller/spec_style_test.rb commit 4894eef refs/heads/master Author: Mike Moore Date: 2012-09-24 13:44:49 -0600 Create ActiveSupport::Testing::ConstantLookup AS::TC::ConstantLookup walks the test's name to find the constant it is describing. This additional lookup logic is needed to better support minitest's spec DSL. M activesupport/lib/active_support/test_case.rb A activesupport/lib/active_support/testing/constant_lookup.rb A activesupport/test/testing/constant_lookup_test.rb commit 1dbe4ba refs/heads/master Merge: dae474e f31ea4d Author: Santiago Pastorino Date: 2012-09-24 07:52:50 -0700 Merge pull request #6936 from jfoley/callbacks Fix collisions with before and after validation callbacks. commit dae474e refs/heads/master Merge: 4ad90b0 ee3e2c2 Author: Santiago Pastorino Date: 2012-09-24 07:47:40 -0700 Merge pull request #7742 from GRoguelon/master Deletion of an extra blank line in configuration template file commit bc87712 refs/heads/master Author: Adam Stankiewicz Date: 2012-09-24 16:11:29 +0200 String.to_time documentation along examples. M activesupport/lib/active_support/core_ext/string/conversions.rb commit 4ad90b0 refs/heads/master Author: Xavier Noria Date: 2012-09-24 14:48:55 +0200 make clear that expired db/schema_cache.dump are ignored M activerecord/lib/active_record/railtie.rb commit 780ecb2 refs/heads/master Author: Xavier Noria Date: 2012-09-24 11:54:36 +0200 adds the release notes for Rails 4.0 to the guides index This is still an early draft, but let's add it to the index to have it ready. M guides/source/documents.yaml commit ee3e2c2 refs/heads/master Author: Geoffrey Roguelon Date: 2012-09-24 11:11:37 +0200 Remove of an extra line in template configuration file. M railties/lib/rails/generators/rails/app/templates/config/application.rb commit 8a5eb2e refs/heads/master Merge: 09d298e 3723d24 Author: Vijay Dev Date: 2012-09-23 21:54:19 -0700 Merge pull request #7741 from siong1987/testing [ci skip] Update Performance Testing guide. commit 3723d24 refs/heads/master Author: Teng Siong Ong Date: 2012-09-23 20:57:11 -0700 [ci skip] Update Performance Testing guide. - remove Palmist which is no longer available. - update link to Query Reviewer. M guides/source/performance_testing.md commit f31ea4d refs/heads/master Author: John Foley Date: 2012-09-23 12:49:34 -0600 Add CHANGELOG entry and update the guide M activerecord/CHANGELOG.md M guides/source/active_record_validations_callbacks.md commit 60c65ca refs/heads/master Author: John Foley Date: 2012-07-02 19:23:34 -0600 Switch to using include? on validation callbacks M activemodel/lib/active_model/validations/callbacks.rb commit d66d607 refs/heads/master Author: John Foley Date: 2012-07-02 10:18:12 -0600 Fix collisions with before and after validation callbacks. This commit allows a user to do something like: before_validation :do_stuff, :on => [ :create, :update ] after_validation :do_more, :on => [ :create, :update ] M activemodel/lib/active_model/validations/callbacks.rb M activerecord/test/cases/callbacks_test.rb commit 09d298e refs/heads/master Merge: d9b873c 5a76d08 Author: José Valim Date: 2012-09-23 09:45:32 -0700 Merge pull request #7740 from BMorearty/dont-sort-params Removed sorting of attribute names in controller generator. commit 5a76d08 refs/heads/master Author: Brian Morearty Date: 2012-09-23 08:54:45 -0700 Update test to match new non-sorting of attributes. M railties/test/generators/scaffold_controller_generator_test.rb commit 263764d refs/heads/master Author: Brian Morearty Date: 2012-09-23 08:19:02 -0700 Removed sorting of attribute names in controller generator. I believe when people use generators, they typically order the parameters on the command line in an order that makes sense to them. Sorting them in the generated code makes the order seem more arbitrary to humans, even though it's less arbitrary to computers. :-) Example: rails g scaffold Post title:string content:text The human chose to put title before content. Sorted attributes in the generated code work but don't match the human's intent: params.require(:posts).permit(:content, :title) M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit 4fc620c refs/heads/master Author: Cory Logan Date: 2012-09-23 17:08:35 +0700 Removed duplicate line describing "default_options". [ci skip] M guides/source/action_mailer_basics.md commit d9b873c refs/heads/master Merge: 133d42b a53c3f3 Author: Vijay Dev Date: 2012-09-23 02:13:59 -0700 Merge pull request #7737 from siong1987/debugging Update Debugging Rails Application guide. commit 417aa43 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-22 20:07:49 -0500 update AC::ConditionalGet documentation [ci skip] M actionpack/lib/action_controller/metal/conditional_get.rb commit 191ddf2 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-22 19:42:40 -0500 update AC::Caching documentation [ci skip] M actionpack/lib/action_controller/caching.rb M actionpack/lib/action_controller/caching/actions.rb M actionpack/lib/action_controller/caching/fragments.rb M actionpack/lib/action_controller/caching/pages.rb M actionpack/lib/action_controller/caching/sweeping.rb commit a53c3f3 refs/heads/master Author: Teng Siong Ong Date: 2012-09-22 15:03:56 -0700 [ci skip] Update Debugging Rails Application guide. - remove query_stats plugin reference in debugging guide since it is no longer maintained. - remove exception_logger plugin reference in debugging guide since it is no longer maintained. - update query_reviewer url to the latest one on github. M guides/source/debugging_rails_applications.md commit a045731 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-22 18:29:37 -0500 remove added indentation from the last commit [ci skip] M activerecord/lib/active_record/core.rb commit d13cd2a refs/heads/master Author: Francesco Rodriguez Date: 2012-09-22 18:26:00 -0500 update AR::Validations documentation [ci skip] M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/validations.rb M activerecord/lib/active_record/validations/associated.rb M activerecord/lib/active_record/validations/presence.rb M activerecord/lib/active_record/validations/uniqueness.rb commit 133d42b refs/heads/master Author: Xavier Noria Date: 2012-09-23 00:50:30 +0200 fixes the suite for uploaded files M actionpack/test/dispatch/uploaded_file_test.rb commit 3b0da71 refs/heads/master Author: Xavier Noria Date: 2012-09-22 23:56:03 +0200 documents ActionDispatch::Http::UploadedFile M actionpack/lib/action_dispatch/http/upload.rb commit 512eb97 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-22 18:22:30 -0300 Put the new CHANGELOG entries always in the top [ci skip] M actionpack/CHANGELOG.md commit 40b5711 refs/heads/master Merge: 19fa8fa e9ba548 Author: Xavier Noria Date: 2012-09-22 13:52:19 -0700 Merge pull request #7713 from porras/action-dispatch-upload-delegates-close-to-tempfile Delegate ActionDispatch::Http::UploadedFile#close to tempfile commit e9ba548 refs/heads/master Author: Sergio Gil Pérez de la Manga Date: 2012-09-22 22:37:00 +0200 Accept parameters in methods delegated to tempfile M actionpack/lib/action_dispatch/http/upload.rb M actionpack/test/dispatch/uploaded_file_test.rb commit f912437 refs/heads/master Author: gregolsen Date: 2012-09-22 23:28:18 +0300 active support core extensions guides updated with config.beginning_of_week info M guides/source/active_support_core_extensions.md commit 19fa8fa refs/heads/master Author: Santiago Pastorino Date: 2012-09-22 10:57:54 -0300 Fix test_find_in_batches_should_use_any_column_as_primary_key M activerecord/test/cases/batches_test.rb commit b21012b refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 23:38:18 -0500 nodoc AR::Railtie [ci skip] M activerecord/lib/active_record/railtie.rb M activerecord/lib/active_record/railties/controller_runtime.rb commit e3fa841 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 23:27:40 -0500 remove AC::Parameters reference [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 6dec753 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 23:25:52 -0500 update AR::Scoping documentation [ci skip] M activerecord/lib/active_record/scoping/default.rb M activerecord/lib/active_record/scoping/named.rb commit 0eea22b refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 22:51:04 -0500 add :nodoc: directive to AR::Fixtures::File [ci skip] M activerecord/lib/active_record/fixtures/file.rb commit 6429851 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 22:48:33 -0500 fix AR::Coders::YAMLColumn nodoc [ci skip] M activerecord/lib/active_record/coders/yaml_column.rb commit c57064a refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 22:47:08 -0500 update AR/attribute_methods documentation [ci skip] M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/lib/active_record/attribute_methods/read.rb M activerecord/lib/active_record/attribute_methods/serialization.rb M activerecord/lib/active_record/attribute_methods/write.rb commit fe78e1d refs/heads/master Author: Steve Klabnik Date: 2012-09-22 06:31:14 +0300 Better docs for overriding inheretance column M activerecord/lib/active_record/model.rb commit 7e538e8 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 22:31:02 -0500 fix AR::AttributeMethods::Dirty :nodoc: [ci skip] M activerecord/lib/active_record/attribute_methods/dirty.rb commit e216b00 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 22:17:32 -0500 fix AR::Associations::CollectionProxy#delete broken documentation [ci skip] M activerecord/lib/active_record/associations/collection_proxy.rb commit 7be8809 refs/heads/master Merge: ec28c05 fd8b9be Author: Santiago Pastorino Date: 2012-09-21 19:51:08 -0700 Merge pull request #7728 from guilleiguaran/fix-asset-test Update asset test to match one in sprockets-rails commit fd8b9be refs/heads/master Author: Guillermo Iguaran Date: 2012-09-21 21:49:28 -0500 Update asset test to match one in sprockets-rails M railties/test/application/assets_test.rb commit 0803548 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 20:49:56 -0500 update AR::Associations::CollectionProxy#loaded? documentation [ci skip] M activerecord/lib/active_record/associations/collection_proxy.rb commit fa94246 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 20:10:57 -0500 fix typos in AC::StrongParameters documentation [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit ec28c05 refs/heads/master Merge: b7918cc c60e19b Author: Santiago Pastorino Date: 2012-09-21 16:10:23 -0700 Merge pull request #7726 from jcorcuera/master Remove '.rb' from require sentences commit b7918cc refs/heads/master Author: Santiago Pastorino Date: 2012-09-21 19:59:13 -0300 Use debugger gem if we are not Travis and Ruby < 2.0 M Gemfile commit 44fa921 refs/heads/master Author: Santiago Pastorino Date: 2012-09-21 19:45:55 -0300 Add debugger to mri:test section of the Gemfile M Gemfile commit 5b99cf0 refs/heads/master Author: Santiago Pastorino Date: 2012-09-21 19:42:14 -0300 start could be a string Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and eb876c4d07130f15be2cac7be968cc393f959c62 M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb commit eb876c4 refs/heads/master Author: Santiago Pastorino Date: 2012-09-21 19:10:16 -0300 Revert "Fix find_in_batches with customized primary_key" This reverts commit 761bc751d31c22e2c2fdae2b4cdd435b68b6d783. This commit wasn't fixing any issue just using the same table for different models with different primary keys. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb M activerecord/test/models/post.rb commit 008eaeb refs/heads/master Author: Santiago Pastorino Date: 2012-09-21 19:05:12 -0300 Raise the same exception the code is handling M activesupport/lib/active_support/queueing.rb commit c60e19b refs/heads/master Author: José Corcuera Z Date: 2012-09-21 16:57:15 -0500 Remove .rb from require sentences M activesupport/test/core_ext/object/to_query_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/plugin_new_generator_test.rb commit 3395ebe refs/heads/master Author: Francesco Rodriguez Date: 2012-09-21 16:49:33 -0500 add note about AR#include_root_in_json default in Upgrading Rails guide [ci skip] M guides/source/upgrading_ruby_on_rails.md commit 0e288ec refs/heads/master Author: Rafael Mendonça França Date: 2012-09-21 16:22:46 -0300 Revert "update ActionMailer::Base documentation [ci skip]" This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f. Conflicts: actionmailer/lib/action_mailer/base.rb Reason: @frodsan asked me to revert since this change is breaking the documentation in the edge API site M actionmailer/lib/action_mailer/base.rb commit 7174307 refs/heads/master Author: Jeremy Kemper Date: 2012-09-21 12:08:02 -0700 Style: remove hash noise M activerecord/test/cases/tasks/mysql_rake_test.rb commit 78b30fe refs/heads/master Author: Jeremy Kemper Date: 2012-09-21 12:03:11 -0700 Correct default charset/collation for mysql dbs M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/tasks/mysql_rake_test.rb commit 68bd4db refs/heads/master Merge: 57bdafb 89a011a Author: Vijay Dev Date: 2012-09-22 00:27:01 +0530 Merge branch 'master' of github.com:lifo/docrails commit 89a011a refs/heads/master Author: José Corcuera Date: 2012-09-21 13:55:42 -0500 Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip] M guides/source/action_mailer_basics.md commit 57bdafb refs/heads/master Author: Jeremy Kemper Date: 2012-09-21 11:37:25 -0700 Use default charset/collation only if *neither* is specified. Otherwise we set utf8_unicode_ci collation on latin1 table. M activerecord/lib/active_record/tasks/mysql_database_tasks.rb commit 96ded2e refs/heads/master Author: Vijay Dev Date: 2012-09-22 00:04:40 +0530 some edits in 4.0 release notes [ci skip] M guides/source/4_0_release_notes.md commit 271d1e7 refs/heads/master Author: Vijay Dev Date: 2012-09-21 23:54:17 +0530 Fix typos and links in engines guide [ci skip] M guides/source/engines.md commit 4a04833 refs/heads/master Author: José Corcuera Date: 2012-09-21 13:11:34 -0500 Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip] M guides/source/action_controller_overview.md commit 25c3c89 refs/heads/master Author: Vijay Dev Date: 2012-09-21 23:23:34 +0530 fix some md syntax errors and general revisions [ci skip] M guides/source/active_record_validations_callbacks.md M guides/source/getting_started.md M guides/source/migrations.md commit 66bc017 refs/heads/master Author: José Corcuera Date: 2012-09-21 12:29:24 -0500 Update examples in AS::Concern to use correct scope syntax. [ci skip] M activesupport/lib/active_support/concern.rb commit 3b7947e refs/heads/master Merge: f74ddc8 7c0e3b8 Author: Vijay Dev Date: 2012-09-21 22:49:20 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes. commit 7c0e3b8 refs/heads/master Author: Vijay Dev Date: 2012-09-21 22:09:03 +0530 remove nodoc [ci skip] M actionmailer/lib/action_mailer/base.rb commit c15e423 refs/heads/master Author: Stephan Hagemann Date: 2012-09-21 10:57:15 -0600 Updated description of what engines are used for M railties/lib/rails/engine.rb commit f74ddc8 refs/heads/master Author: Jon Leighton Date: 2012-09-21 17:55:18 +0100 Make the serializable test much looser It's too hard to test this properly, so let's just check that there are no errors. M activerecord/test/cases/transaction_isolation_test.rb commit 114e180 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-21 13:26:15 -0300 Fix invalid ruby 1.8 syntax M activesupport/lib/active_support/time_with_zone.rb commit de9d1c6 refs/heads/master Merge: 392eeec cf1f670 Author: Rafael Mendonça França Date: 2012-09-21 09:21:03 -0700 Merge pull request #7724 from joliss/changelog Fix MIME type in CHANGELOG [ci skip] commit cf1f670 refs/heads/master Author: Jo Liss Date: 2012-09-21 17:08:49 +0200 Fix MIME type in CHANGELOG M actionpack/CHANGELOG.md commit 392eeec refs/heads/master Author: Jon Leighton Date: 2012-09-21 16:14:42 +0100 Support for specifying transaction isolation level If your database supports setting the isolation level for a transaction, you can set it like so: Post.transaction(isolation: :serializable) do # ... end Valid isolation levels are: * `:read_uncommitted` * `:read_committed` * `:repeatable_read` * `:serializable` You should consult the documentation for your database to understand the semantics of these different levels: * http://www.postgresql.org/docs/9.1/static/transaction-iso.html * https://dev.mysql.com/doc/refman/5.0/en/set-transaction.html An `ActiveRecord::TransactionIsolationError` will be raised if: * The adapter does not support setting the isolation level * You are joining an existing open transaction * You are creating a nested (savepoint) transaction The mysql, mysql2 and postgresql adapters support setting the transaction isolation level. However, support is disabled for mysql versions below 5, because they are affected by a bug (http://bugs.mysql.com/bug.php?id=39170) which means the isolation level gets persisted outside the transaction. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/errors.rb A activerecord/test/cases/transaction_isolation_test.rb commit 3f9c1a1 refs/heads/master Author: Jo Liss Date: 2012-09-21 17:07:13 +0200 Revert "Fix MIME type in CHANGELOG" CHANGELOG edits do not belongs on docrails, so I'll send a pull request instead. Thanks @rafaelfranca for catching this. This reverts commit 84c9491eab5b9f7c4250ca4c2ca5d763e8c4ff4d. M actionpack/CHANGELOG.md commit 84c9491 refs/heads/master Author: Jo Liss Date: 2012-09-21 16:37:46 +0200 Fix MIME type in CHANGELOG M actionpack/CHANGELOG.md commit 7b545ff refs/tags/v3.2.9.rc2 Merge: 98f8021 b8fba55 Author: Rafael Mendonça França Date: 2012-09-21 06:14:37 -0700 Merge pull request #7723 from steveklabnik/backport_3554 Backport #3544 to 3-2-stable commit b8fba55 refs/tags/v3.2.9.rc2 Author: Aaron Patterson Date: 2012-02-14 08:47:42 -0800 Merge pull request #3544 from amatsuda/_field_changed Rename field_changed? to _field_changed? so that users can create a field named field Conflicts: activerecord/lib/active_record/core.rb activerecord/test/cases/dirty_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/dirty.rb M activerecord/lib/active_record/base.rb M activerecord/test/cases/dirty_test.rb commit 79cbfc8 refs/heads/master Author: Steve Klabnik Date: 2012-09-21 12:58:14 +0300 Add extra note about :dependent => :destroy. Callbacks may interfere with each other. M activerecord/lib/active_record/associations.rb commit 834d6da refs/heads/master Merge: a507c64 217a8b0 Author: Jon Leighton Date: 2012-09-21 02:40:26 -0700 Merge pull request #5248 from jcoleman/should-unset-association-when-an-existing-record-is-destroyed Unset association when existing record is destroyed. commit f3afaa6 refs/heads/master Author: Sergio Gil Pérez de la Manga Date: 2012-09-21 08:34:05 +0200 Update CHANGELOG.md M actionpack/CHANGELOG.md commit a507c64 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-20 23:14:34 -0300 Get rid of global variable in AR transactions test M activerecord/test/cases/transactions_test.rb commit 79942d4 refs/heads/master Author: Przemek Hocke Date: 2012-09-21 03:49:26 +0200 correct a typo M guides/source/active_support_core_extensions.textile commit fca6c0f refs/heads/master Author: Przemek Hocke Date: 2012-09-21 03:48:17 +0200 Add missing "m" char M guides/source/ajax_on_rails.textile commit 649a95b refs/heads/master Author: Przemek Hocke Date: 2012-09-21 03:46:14 +0200 fix two typos in the associations guide M guides/source/association_basics.textile commit deed3f9 refs/heads/master Author: Przemek Hocke Date: 2012-09-21 03:40:49 +0200 fix a small typo M guides/source/command_line.textile commit 98f8021 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-20 19:48:08 -0300 Revert "Revert "Respect `config.digest = false` for `asset_path`"" This reverts commit 54f55746a70a7091341e84236498203118a7fbb4. Reason: the last commit fixed the failing case M actionpack/CHANGELOG.md M actionpack/lib/sprockets/helpers/rails_helper.rb M actionpack/test/template/sprockets_helper_test.rb commit 9d07ace refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-20 19:47:14 -0300 Explictly set the assets digest option to false M railties/test/application/assets_test.rb commit 54f5574 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-20 19:05:56 -0300 Revert "Respect `config.digest = false` for `asset_path`" This reverts commit 1ac19c11792a745cd654f02dfaed8e93f95b3c70. Conflicts: actionpack/CHANGELOG.md Reason: This is causing failures in the railties build. See http://travis-ci.org/#!/rails/rails/jobs/2491787 Related with #7672 M actionpack/CHANGELOG.md M actionpack/lib/sprockets/helpers/rails_helper.rb M actionpack/test/template/sprockets_helper_test.rb commit e4018a0 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-20 19:04:37 -0300 Revert "backport fair connection pool 02b2335563 to 3-2-stable" This reverts commit 0693e079708a52b777f2b7872b8e3d467b880a0d. Revert "Cache columns metadata to avoid extra while testing" This reverts commit a82f1e3f5d11c8dfba9f4c911745ec40a7965216. Reason: This is causing failures in the postgresql build. See http://travis-ci.org/#!/rails/rails/builds/2485584 Related with #7675 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/connection_adapters/abstract_adapter_test.rb M activerecord/test/cases/connection_pool_test.rb M activerecord/test/cases/dirty_test.rb commit ed05e92 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-20 18:50:30 -0300 Update delegate docs with new hash syntax [ci skip] M activesupport/lib/active_support/core_ext/module/delegation.rb commit 1eef814 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-20 18:47:57 -0300 Add changelog entry and docs about class delegation using the symbol :class See #7613. [ci skip] M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/module/delegation.rb commit 2ecfed2 refs/heads/master Merge: 0a7b131 f4a9d7d Author: Santiago Pastorino Date: 2012-09-20 12:03:00 -0700 Merge pull request #7721 from frodsan/ar_changelog_improvement remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip] commit f4a9d7d refs/heads/master Author: Francesco Rodriguez Date: 2012-09-20 13:48:32 -0500 remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip] M activerecord/CHANGELOG.md commit 0a7b131 refs/heads/master Merge: 81084bd ad5f18e Author: Jeremy Kemper Date: 2012-09-20 11:19:47 -0700 Merge pull request #7613 from marcandre/delegate_to_class Nice and easy delegation to the class commit 81084bd refs/heads/master Merge: 6e3532d a30b8d3 Author: Jon Leighton Date: 2012-09-20 11:00:17 -0700 Merge pull request #7720 from frodsan/rename_ar_tag rename AR::Model::Tag to AR::Tag commit 6e3532d refs/heads/master Merge: 3034489 356eed9 Author: Rafael Mendonça França Date: 2012-09-20 10:47:30 -0700 Merge pull request #7719 from frodsan/strong_params_docs_part_two Strong Parameters documentation commit a30b8d3 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-20 12:43:12 -0500 rename AR::Model::Tag to AR::Tag - fixes #7714 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/lib/active_record/inheritance.rb M activerecord/lib/active_record/model.rb M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/connection_adapters/connection_handler_test.rb commit 356eed9 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-20 12:14:53 -0500 add :nodoc: to AMo::DeprecatedMassAssignmentSecurity::ClassMethods [ci skip] M activemodel/lib/active_model/deprecated_mass_assignment_security.rb commit 6783c3f refs/heads/master Author: Francesco Rodriguez Date: 2012-09-20 12:14:29 -0500 change AMo::ForbiddenAttributesProtection#sanitize_for_mass_assignment to protected M activemodel/lib/active_model/forbidden_attributes_protection.rb commit 1e56f1f refs/heads/master Author: Francesco Rodriguez Date: 2012-09-20 11:47:32 -0500 update AMo::ForbiddenAttributesError documentation [ci skip] M activemodel/lib/active_model/forbidden_attributes_protection.rb commit 00da7c6 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-20 11:24:53 -0500 fix typos and improve AC::StrongParameters documentation [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 3759e32 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-20 00:08:21 -0500 add :nodoc: directives to AMo::DeprecatedMassAssignmentSecurity [ci skip] M activemodel/lib/active_model/deprecated_mass_assignment_security.rb commit 3034489 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-20 14:13:24 -0300 Remove the environment variables in the Gemfile If you want to set a local path for the gems you can use the local git repositories feature from the Bundler 1.2. For example to set the local arel repository: bundle config local.arel ~/Work/git/arel To unset it: bundle config --delete local.arel Bundler will check if the branch of you local repository is the same that specified in the Gemfile. If you want to disable these branch checks you can override it by setting this option: bundle config disable_local_branch_check true See more about this feature at http://gembundler.com/v1.2/git.html#local M Gemfile commit 920abaa refs/heads/master Author: Jo Liss Date: 2012-09-20 18:29:12 +0200 Fix indentation and update documentation for Array#wrap for Ruby 1.9 M activesupport/lib/active_support/core_ext/array/wrap.rb commit da400fb refs/heads/master Author: Santiago Pastorino Date: 2012-09-20 12:59:31 -0300 Freeze columns only once per Result M activerecord/lib/active_record/result.rb commit 883fa8f refs/heads/master Merge: 2068d30 105cb3d Author: Rafael Mendonça França Date: 2012-09-20 06:34:55 -0700 Merge pull request #7703 from kennyj/fix_6962 Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings. commit 50a76c1 refs/tags/v3.2.9.rc2 Merge: c41f9c1 4e715e3 Author: Rafael Mendonça França Date: 2012-09-20 06:34:11 -0700 Merge pull request #7718 from kennyj/fix_6962-32 [3-2-stable] Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings. commit 4e715e3 refs/tags/v3.2.9.rc2 Author: kennyj Date: 2012-09-20 00:51:28 +0900 Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings. M activesupport/CHANGELOG.md M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/time_zone_test.rb commit dab0859 refs/heads/master Author: Sergio Gil Pérez de la Manga Date: 2012-09-20 11:57:38 +0200 Delegate ActionDispatch::Http::UploadedFile#close to tempfile M actionpack/lib/action_dispatch/http/upload.rb M actionpack/test/dispatch/uploaded_file_test.rb commit 2068d30 refs/heads/master Author: Santiago Pastorino Date: 2012-09-20 01:43:36 -0300 Freeze columns just before using them as hash keys M activerecord/lib/active_record/result.rb commit 2004ef2 refs/heads/master Merge: 71b8851 3aef5ce Author: Aaron Patterson Date: 2012-09-19 21:34:36 -0700 Merge pull request #7631 from jeremyevans/patch-1 Freeze columns before using them as hash keys commit 71b8851 refs/heads/master Merge: b4018fa 25d2b17 Author: Santiago Pastorino Date: 2012-09-19 20:57:29 -0700 Merge pull request #7702 from guilleiguaran/remove-manifest-option Remove highly uncommon `config.assets.manifest` option commit b4018fa refs/heads/master Merge: fa362ff 2417218 Author: Santiago Pastorino Date: 2012-09-19 20:56:49 -0700 Merge pull request #7692 from frodsan/strong_params_docs update docs for strong parameters merge commit 2417218 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-19 22:33:50 -0500 update AC::StrongParameters documentation M actionpack/lib/action_controller/metal/strong_parameters.rb commit f8478a7 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-19 21:13:43 -0500 define permitted? method instead of use an alias to fix rdoc M actionpack/lib/action_controller/metal/strong_parameters.rb commit 93ef857 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-19 20:53:34 -0500 update AC::Parameters documentation [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 2aacee1 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-18 22:29:25 -0500 update AC::ParameterMissing documentation [ci skip] M actionpack/lib/action_controller/metal/strong_parameters.rb commit 19a41eb refs/heads/master Author: Francesco Rodriguez Date: 2012-09-18 22:21:21 -0500 update AR::AttributeAssignment documentation [ci skip] M activerecord/lib/active_record/attribute_assignment.rb commit 1102aa2 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-18 22:19:49 -0500 update AC::ParamsWrapper documentation [ci skip] M actionpack/lib/action_controller/metal/params_wrapper.rb commit c41f9c1 refs/tags/v3.2.9.rc2 Author: Jeremy Kemper Date: 2012-09-19 12:08:19 -0700 Load the environment after creating the database Conflicts: activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/railties/databases.rake commit fa362ff refs/heads/master Merge: 2450980 97338d5 Author: Rafael Mendonça França Date: 2012-09-19 17:24:24 -0700 Merge pull request #7710 from guilleiguaran/refactor-ar-attributes-method AR::Base#attributes= is just an alias for AR::Base#assign_attributes commit 97338d5 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-19 19:19:11 -0500 AR::Base#attributes= is just an alias for AR::Base#assign_attributes M activerecord/lib/active_record/attribute_assignment.rb commit 2450980 refs/heads/master Merge: c4111ec ff33e42 Author: Rafael Mendonça França Date: 2012-09-19 17:15:36 -0700 Merge pull request #7709 from alexreisner/master Fix Broken Link in ActiveRecord Transaction Documentation [ci skip] commit ff33e42 refs/heads/master Author: Alex Reisner Date: 2012-09-19 20:52:21 -0300 Fix out-of-date URL. M activerecord/lib/active_record/transactions.rb commit d47fde6 refs/heads/master Author: Brian Durand Date: 2012-09-19 16:46:48 -0700 Fix ActionMailer::LogSubscriber to use the correct log level check. M actionmailer/lib/action_mailer/log_subscriber.rb commit 25d2b17 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-19 10:43:40 -0500 Allow to use a local copy of sprockets-rails during development M Gemfile commit 66ed71f refs/heads/master Author: Guillermo Iguaran Date: 2012-09-08 23:18:57 -0500 Remove highly uncommon `config.assets.manifest` option for moving the manifest path. This option is now unsupported in sprockets-rails. M guides/source/asset_pipeline.md M guides/source/configuring.md M railties/CHANGELOG.md M railties/lib/rails/application/configuration.rb commit 19f0e37 refs/heads/master Author: Brian Durand Date: 2012-09-19 16:00:28 -0700 Optimize log subscribers to check if the log level is sufficient before performing an operations. M actionmailer/lib/action_mailer/log_subscriber.rb M actionpack/lib/action_controller/log_subscriber.rb M actionpack/lib/action_view/log_subscriber.rb M activerecord/lib/active_record/log_subscriber.rb commit c4111ec refs/heads/master Merge: 7c2d33b 1f4c89f Author: Rafael Mendonça França Date: 2012-09-19 15:52:13 -0700 Merge pull request #7707 from guilleiguaran/changelogs-update Update changelogs to add entries about strong_parameters integration commit 1f4c89f refs/heads/master Author: Guillermo Iguaran Date: 2012-09-19 17:10:32 -0500 Update changelogs to add entries about strong_parameters integration M actionpack/CHANGELOG.md M activemodel/CHANGELOG.md M activerecord/CHANGELOG.md M railties/CHANGELOG.md commit 7c2d33b refs/heads/master Author: Xavier Noria Date: 2012-09-20 00:01:57 +0200 extracts manual development dependencies installation to a new non-promoted guide The purpose of this refactor is twofold: * Emphasize the Rails development box as the recommended way to setup a dev environment by taking out the rest of the instructions. * Lighten the contributing guide, this non-essential information takes a disproportionate amount of space now that we have the rails-dev-box. M guides/source/contributing_to_ruby_on_rails.md A guides/source/development_dependencies_install.md commit 01059d7 refs/heads/master Author: Jeremy Kemper Date: 2012-09-19 12:08:19 -0700 Load the environment after creating the database M activerecord/lib/active_record/railties/databases.rake commit e04818d refs/heads/master Author: Jeremy Kemper Date: 2012-09-19 12:06:24 -0700 Revert "Make sure :environment task is executed before db:schema:load or db:structure:load " Breaks db:setup because it tries to load the environment before creating the database. This reverts commit 5ca11fefce6d83f5db399aa4412f1f1a0d42b2e6. M activerecord/lib/active_record/railties/databases.rake commit 6cbec58 refs/heads/master Merge: 69e0e3f 9f07782 Author: Rafael Mendonça França Date: 2012-09-19 09:27:43 -0700 Merge pull request #7701 from guilleiguaran/set-permit-all-parameters-explicitly Set AC::Parameters.permit_all_parameters explicitly to false when config.action_controller.permit_all_parameters is not present commit 105cb3d refs/heads/master Author: kennyj Date: 2012-09-20 00:51:28 +0900 Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings. M activesupport/lib/active_support/time_with_zone.rb M activesupport/test/time_zone_test.rb commit 9f07782 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-19 10:02:54 -0500 Set AC::Parameters.permit_all_parameters explicitly to false when config.action_controller.permit_all_parameters is not present M actionpack/lib/action_controller/railtie.rb commit 69e0e3f refs/heads/master Author: Rafael Mendonça França Date: 2012-09-19 12:09:03 -0300 Improve the CHANGELOG entry for #6971 M activerecord/CHANGELOG.md commit 5dc5560 refs/heads/master Merge: bf4c8fe 30a576f Author: Rafael Mendonça França Date: 2012-09-19 08:04:47 -0700 Merge pull request #6971 from dmathieu/empty_hash fix querying with an empty hash commit bf4c8fe refs/heads/master Merge: f4ad0eb bbcb625 Author: Rafael Mendonça França Date: 2012-09-19 07:36:50 -0700 Merge pull request #7482 from route/syncing_tests_for_sprockets Use last version of sprockets-rails and sync tests for assets. commit 30a576f refs/heads/master Author: Damien Mathieu <42@dmathieu.com> Date: 2012-07-05 13:24:59 +0200 fix querying with an empty hash Closes #6960 M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb commit 61d5d2d refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-19 06:07:48 -0700 Merge pull request #7668 from Draiken/fix_issue_6497 Removing to_shorthand to fix #6497 Conflicts: actionpack/CHANGELOG.md M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit f4ad0eb refs/heads/master Merge: 8b2cbb3 641ea69 Author: Rafael Mendonça França Date: 2012-09-19 06:07:48 -0700 Merge pull request #7668 from Draiken/fix_issue_6497 Removing to_shorthand to fix #6497 commit 8b2cbb3 refs/heads/master Merge: 731d809 26266cc Author: Carlos Antonio da Silva Date: 2012-09-19 04:21:23 -0700 Merge pull request #7697 from guilleiguaran/minor-ar-cleanups Minor cleanups missed during mass assignment options removal from AR commit 641ea69 refs/heads/master Author: Luiz Felipe Date: 2012-09-17 11:13:45 -0300 Removing to_shorthand from default_controller_and_action. Fixes #6497 When using shortcut routes inside an engine the "to_shorthand" variable is set to true, causing the module scope of the route to not be applied. M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing_test.rb commit bbcb625 refs/heads/master Author: Dmitry Vorotilin Date: 2012-09-11 12:39:22 +0400 Since in sprockets-rails uglifier's version doesn't matter do the same in rails M Gemfile commit d29283a refs/heads/master Author: Dmitry Vorotilin Date: 2012-08-30 13:09:17 +0400 Use last version of sprockets-rails and syncing tests for assets. M Gemfile M railties/test/application/assets_test.rb commit 26266cc refs/heads/master Author: Guillermo Iguaran Date: 2012-09-19 01:07:02 -0500 Remove unused private method AR::NestedAttributes#unassignable_keys and reference to mass_assignment options M activerecord/lib/active_record/nested_attributes.rb commit efef82f refs/heads/master Author: Francesco Rodriguez Date: 2012-09-19 00:47:38 -0500 fix :nodoc:s in AR::Timestamp [ci skip] M activerecord/lib/active_record/timestamp.rb commit 255cefb refs/heads/master Author: Francesco Rodriguez Date: 2012-09-18 22:13:49 -0500 fix Hash#slice code example [ci skip] M actionmailer/lib/action_mailer/base.rb M activesupport/lib/active_support/core_ext/hash/slice.rb commit 731d809 refs/heads/master Merge: 2dff5dc 533c114 Author: Rafael Mendonça França Date: 2012-09-18 19:27:00 -0700 Merge pull request #7694 from guilleiguaran/update-ar-docs Update AR docs to remove reference to mass assignment options commit 533c114 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-18 21:23:47 -0500 Update AR::Base.create and AR:Base#update_attributes docs to remove references to mass assignment options M activerecord/lib/active_record/persistence.rb commit c9f339e refs/heads/master Author: Guillermo Iguaran Date: 2012-09-18 21:03:26 -0500 Update docs for AR::Base#new to remove references to mass_assignment_options M activerecord/lib/active_record/core.rb commit 2dff5dc refs/heads/master Merge: fb0c845 45d6944 Author: Rafael Mendonça França Date: 2012-09-18 18:53:25 -0700 Merge pull request #7693 from parndt/patch-6 Correct parameter access. commit 45d6944 refs/heads/master Author: Philip Arndt Date: 2012-09-19 13:46:01 +1200 Correct parameter access. * The params as supplied pass born in authors[0] but not authors[1] so it seems like the test isn't covering what it should be covering. M actionpack/test/controller/parameters/nested_parameters_test.rb commit a82f1e3 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-18 22:24:45 -0300 Cache columns metadata to avoid extra while testing M activerecord/test/cases/associations/eager_test.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/dirty_test.rb commit fb0c845 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-18 20:00:16 -0300 In development and test we drain the jobs in the same thread. M railties/test/application/queue_test.rb commit aebbd4b refs/heads/master Author: Jeremy Kemper Date: 2012-09-18 15:22:13 -0700 No need to defensively work jobs in another thread M activesupport/lib/active_support/queueing.rb M activesupport/test/queueing/test_queue_test.rb commit 96e713b refs/heads/master Merge: 1e7b8d3 3a34d9a Author: Rafael Mendonça França Date: 2012-09-18 14:43:27 -0700 Merge pull request #7691 from lest/patch-1 fix shadowing outer local variable warning commit 3a34d9a refs/heads/master Author: Sergey Nartimov Date: 2012-09-19 00:33:17 +0300 fix shadowing outer local variable warning M actionpack/lib/action_controller/metal/strong_parameters.rb commit 1e7b8d3 refs/heads/master Author: Xavier Noria Date: 2012-09-18 23:04:12 +0200 let .md be the only supported extension for guides M guides/rails_guides/generator.rb commit 4325bec refs/tags/v3.2.15 Author: Chris Barton Date: 2012-09-18 13:15:02 -0700 Making test accurately reflect what is going on in the schema migrations test M activerecord/lib/active_record/migration.rb M activerecord/test/cases/ar_schema_test.rb commit c49d959 refs/heads/master Merge: ade7010 3919fcd Author: David Heinemeier Hansson Date: 2012-09-18 12:33:13 -0700 Merge pull request #7251 from rails/integrate-strong_parameters Integrate strong_parameters in Rails 4 commit 29ebec7 refs/tags/v3.2.9.rc2 Merge: 7c5454e 1929d9f Author: Rafael Mendonça França Date: 2012-09-18 11:12:08 -0700 Merge pull request #7686 from steveklabnik/add_upgrade_note Add upgrading note to 3.1 release notes. commit 1929d9f refs/tags/v3.2.9.rc2 Author: Steve Klabnik Date: 2012-09-18 21:00:02 +0300 Add upgrading note to 3.1 release notes. See #7685. M railties/guides/source/3_1_release_notes.textile commit 1664093 refs/heads/master Author: Steve Klabnik Date: 2012-09-18 20:47:54 +0300 Update 3.0 -> 3.1 session information. Fixes #7685 M guides/source/upgrading_ruby_on_rails.textile commit ade7010 refs/heads/master Author: Xavier Noria Date: 2012-09-18 17:57:37 +0200 add some kindness M CONTRIBUTING.md commit 46309fa refs/heads/master Merge: 5428de1 e69476a Author: Xavier Noria Date: 2012-09-18 08:54:09 -0700 Merge pull request #7681 from schneems/schneems/stronger-wording Stronger wording in Contributing file commit e69476a refs/heads/master Author: schneems Date: 2012-09-18 08:05:11 -0700 Stronger wording in Contributing file Explicitly tell users to read the guide before submitting code. re: #7677. Specify the name of the mailing list for rubyonrails-talk to help differentiate it from rubyonrails-core mailing list. M CONTRIBUTING.md commit 5428de1 refs/heads/master Merge: bfcbaa5 da26dfb Author: Rafael Mendonça França Date: 2012-09-18 08:00:45 -0700 Merge pull request #5339 from gregolsen/week_start_config week_start option added to rails app config commit bfcbaa5 refs/heads/master Author: Xavier Noria Date: 2012-09-18 16:43:59 +0200 the contributing guide should be mentioned upfront M CONTRIBUTING.md commit 46e252c refs/heads/master Merge: 39c3bda eeb9635 Author: Xavier Noria Date: 2012-09-18 07:36:38 -0700 Merge pull request #7676 from frodsan/patch-7 show love to contributors commit da26dfb refs/heads/master Author: gregolsen Date: 2012-09-18 17:18:19 +0300 Date.beginning_of_week thread local and beginning_of_week application config option added (default is Monday) M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/date/calculations.rb M activesupport/lib/active_support/core_ext/date_and_time/calculations.rb M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/lib/active_support/railtie.rb M activesupport/test/core_ext/date_and_time_behavior.rb M guides/source/configuring.md M railties/lib/rails/application/configuration.rb M railties/test/application/configuration_test.rb commit 39c3bda refs/heads/master Merge: 9f2d1a1 88d578a Author: Rafael Mendonça França Date: 2012-09-18 06:55:43 -0700 Merge pull request #7680 from steveklabnik/master Remove 'assigned but unused variable' warning commit 88d578a refs/heads/master Author: Steve Klabnik Date: 2012-09-18 16:53:36 +0300 Remove 'assigned but unused variable' warning M railties/lib/rails/deprecation.rb commit 7c5454e refs/tags/v3.2.9.rc2 Merge: 24a7774 1ac19c1 Author: Rafael Mendonça França Date: 2012-09-18 06:25:36 -0700 Merge pull request #7672 from wagenet/asset_path_digest_fix Respect `config.digest = false` for `asset_path` commit 9f2d1a1 refs/heads/master Author: Xavier Noria Date: 2012-09-18 11:13:04 +0200 spurious space I saw in passing M actionmailer/lib/action_mailer/base.rb commit 254a324 refs/heads/master Author: Xavier Noria Date: 2012-09-18 10:51:27 +0200 ActiveRecord -> Active Record M activerecord/CHANGELOG.md commit 54f9fea refs/heads/master Author: Xavier Noria Date: 2012-09-18 09:05:36 +0200 copy edits 137e5d9 M actionpack/lib/action_view/helpers/form_helper.rb commit 57887e2 refs/heads/master Merge: edb40dc 137e5d9 Author: Xavier Noria Date: 2012-09-18 00:02:45 -0700 Merge pull request #7678 from dxg/add_password_field_doco Add extra documentation for password_field commit 137e5d9 refs/heads/master Author: Arek W Date: 2012-09-18 11:33:15 +1000 Add extra documentation for password_field I think this should be explicit as the password fields behaviour is inconsistent with other fields in this regard. It had me scratching my head until I dug through the source code. M actionpack/lib/action_view/helpers/form_helper.rb commit 1436751 refs/heads/master Author: Steve Klabnik Date: 2012-09-18 03:26:07 +0300 Expanded note about poly associations. Now with example! M guides/source/association_basics.textile commit e2c7545 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-17 19:18:56 -0500 update ActionMailer documentation [ci skip] M actionmailer/lib/action_mailer/collector.rb M actionmailer/lib/action_mailer/delivery_methods.rb M actionmailer/lib/action_mailer/mail_helper.rb M actionmailer/lib/action_mailer/railtie.rb M actionmailer/lib/action_mailer/test_helper.rb commit eeb9635 refs/heads/master Author: Francesco Rodríguez Date: 2012-09-17 17:32:56 -0500 show love to contributors M CONTRIBUTING.md commit 1ac19c1 refs/tags/v3.2.9.rc2 Author: Peter Wagenet Date: 2012-09-17 10:36:15 -0700 Respect `config.digest = false` for `asset_path` Previously, the `asset_path` internals only respected the `:digest` option, but ignored the global config setting. This meant that `config.digest = false` could not be used in conjunction with `config.compile = false` this corrects the behavior. M actionpack/CHANGELOG.md M actionpack/lib/sprockets/helpers/rails_helper.rb M actionpack/test/template/sprockets_helper_test.rb commit 24a7774 refs/tags/v3.2.9.rc2 Merge: dd76b3b 0693e07 Author: Rafael Mendonça França Date: 2012-09-17 15:07:28 -0700 Merge pull request #7675 from jrochkind/fair_conn_pool_backport backport fair connection pool 02b2335563 to 3-2-stable commit 0693e07 refs/tags/v3.2.9.rc2 Author: Jonathan Rochkind Date: 2012-09-17 17:06:14 -0400 backport fair connection pool 02b2335563 to 3-2-stable M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/test/cases/connection_adapters/abstract_adapter_test.rb M activerecord/test/cases/connection_pool_test.rb commit edb40dc refs/heads/master Merge: 5f34f12 f7c6da2 Author: Vijay Dev Date: 2012-09-17 14:13:04 -0700 Merge pull request #7673 from frodsan/fix_amailer_rdoc fix rdoc task for Action Mailer documentation commit 5f34f12 refs/heads/master Merge: a95ddf6 1fa5c3b Author: Xavier Noria Date: 2012-09-17 13:59:45 -0700 Merge pull request #7663 from sikachu/master-guide-markdown Convert all the guides into GFM commit f7c6da2 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-17 15:25:33 -0500 fix rdoc task for Action Mailer documentation M Rakefile commit 1fa5c3b refs/heads/master Author: Prem Sichanugrist Date: 2012-09-17 00:46:26 -0400 Fix footnote format Markdown has footnote, but Redcarpet doesn't support it. M guides/rails_guides/markdown/renderer.rb M guides/source/i18n.md commit fd56c3a refs/heads/master Author: Prem Sichanugrist Date: 2012-09-16 23:35:06 -0400 Fix broken and duplicate headings M guides/source/active_record_validations_callbacks.md M guides/source/association_basics.md M guides/source/command_line.md M guides/source/engines.md M guides/source/layouts_and_rendering.md commit 05b4d59 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-16 23:12:45 -0400 Change #id generation rule * Use the current heading by default * If duplicate, then use #[parent]-[current] as the id M guides/rails_guides/markdown.rb commit 5e2866c refs/heads/master Author: Prem Sichanugrist Date: 2012-09-07 00:09:56 -0400 No more Textile guide generation support M Gemfile M guides/Rakefile M guides/rails_guides.rb M guides/rails_guides/generator.rb D guides/rails_guides/textile_extensions.rb M guides/source/form_helpers.md M guides/source/ruby_on_rails_guides_guidelines.md commit 7a0dad2 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-06 23:52:16 -0400 Convert legacy release notes to Markdown M guides/source/2_2_release_notes.md M guides/source/2_3_release_notes.md M guides/source/3_0_release_notes.md M guides/source/3_1_release_notes.md M guides/source/3_2_release_notes.md commit 5e13625 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-06 22:51:44 -0400 Move all the legacy guides to Markdown A guides/source/2_2_release_notes.md D guides/source/2_2_release_notes.textile A guides/source/2_3_release_notes.md D guides/source/2_3_release_notes.textile A guides/source/3_0_release_notes.md D guides/source/3_0_release_notes.textile A guides/source/3_1_release_notes.md D guides/source/3_1_release_notes.textile A guides/source/3_2_release_notes.md D guides/source/3_2_release_notes.textile commit 460c2ee refs/heads/master Author: Prem Sichanugrist Date: 2012-09-06 22:45:32 -0400 Update Guides Guideline for Markdown M guides/source/ruby_on_rails_guides_guidelines.md commit 41dbb58 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-06 22:26:59 -0400 Fix the usage of `*` in Markdown In Textile `*` would convert to ``, but in Markdown we have to use `**` instead. M guides/source/action_view_overview.md M guides/source/active_record_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/ajax_on_rails.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/command_line.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/getting_started.md M guides/source/initialization.md M guides/source/nested_model_forms.md M guides/source/performance_testing.md M guides/source/routing.md M guides/source/ruby_on_rails_guides_guidelines.md M guides/source/security.md M guides/source/testing.md commit 721afdc refs/heads/master Author: Prem Sichanugrist Date: 2012-09-03 21:21:24 -0400 Fix remaining formatting problems in the guide M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_model_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/ajax_on_rails.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/security.md commit 5a4622b refs/heads/master Author: Prem Sichanugrist Date: 2012-09-03 21:21:04 -0400 Retain heading styles in the page chapters list M guides/assets/stylesheets/main.css M guides/rails_guides/markdown.rb commit f35187b refs/heads/master Author: Prem Sichanugrist Date: 2012-09-02 14:53:01 -0400 Make sure that styles in NOTE block got converted M guides/rails_guides/markdown/renderer.rb commit 2e89ac3 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-02 14:52:12 -0400 Convert image tags to Markdown syntax M guides/source/active_record_validations_callbacks.md M guides/source/association_basics.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/security.md commit 2c38567 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-02 13:08:06 -0400 Convert all tables to Markdown syntax M guides/source/action_controller_overview.md M guides/source/active_record_basics.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/caching_with_rails.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/migrations.md M guides/source/performance_testing.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/testing.md commit 9873dd8 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-02 01:08:20 -0400 Convert all the links into Markdown format M guides/source/action_controller_overview.md M guides/source/action_view_overview.md M guides/source/active_record_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/ajax_on_rails.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/nested_model_forms.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/ruby_on_rails_guides_guidelines.md M guides/source/security.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md commit 31ef4cf refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 21:37:59 -0400 Convert all inline codes to Markdown syntax M guides/source/action_controller_overview.md M guides/source/action_view_overview.md M guides/source/active_record_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/ajax_on_rails.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/nested_model_forms.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/ruby_on_rails_guides_guidelines.md M guides/source/security.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md commit ed62b1b refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 21:37:50 -0400 Enable table M guides/rails_guides/markdown.rb commit 21a0b20 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 20:45:26 -0400 change shell to bash M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/ajax_on_rails.md M guides/source/command_line.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/testing.md commit c89c163 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 19:34:21 -0400 Convert inline code tags to Markdown M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/ajax_on_rails.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/getting_started.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/plugins.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/ruby_on_rails_guides_guidelines.md M guides/source/security.md M guides/source/upgrading_ruby_on_rails.md commit 872b7af refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 17:25:58 -0400 Convert heading tags and heading section M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_model_basics.md M guides/source/active_record_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/ajax_on_rails.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/nested_model_forms.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/ruby_on_rails_guides_guidelines.md M guides/source/security.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md commit 7bc1ca3 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 17:08:06 -0400 Convert code blocks into GFM style M guides/source/action_controller_overview.md M guides/source/action_mailer_basics.md M guides/source/action_view_overview.md M guides/source/active_model_basics.md M guides/source/active_record_basics.md M guides/source/active_record_querying.md M guides/source/active_record_validations_callbacks.md M guides/source/active_support_core_extensions.md M guides/source/active_support_instrumentation.md M guides/source/ajax_on_rails.md M guides/source/api_documentation_guidelines.md M guides/source/asset_pipeline.md M guides/source/association_basics.md M guides/source/caching_with_rails.md M guides/source/command_line.md M guides/source/configuring.md M guides/source/contributing_to_ruby_on_rails.md M guides/source/debugging_rails_applications.md M guides/source/engines.md M guides/source/form_helpers.md M guides/source/generators.md M guides/source/getting_started.md M guides/source/i18n.md M guides/source/initialization.md M guides/source/layouts_and_rendering.md M guides/source/migrations.md M guides/source/nested_model_forms.md M guides/source/performance_testing.md M guides/source/plugins.md M guides/source/rails_application_templates.md M guides/source/rails_on_rack.md M guides/source/routing.md M guides/source/ruby_on_rails_guides_guidelines.md M guides/source/security.md M guides/source/testing.md M guides/source/upgrading_ruby_on_rails.md commit 0867fcd refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 16:39:47 -0400 Update Markdown renderer to be more flexible M guides/rails_guides/markdown.rb commit 5137d03 refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 16:25:57 -0400 Rename the rest of the guides to Markdown A guides/source/action_controller_overview.md D guides/source/action_controller_overview.textile A guides/source/action_mailer_basics.md D guides/source/action_mailer_basics.textile A guides/source/action_view_overview.md D guides/source/action_view_overview.textile A guides/source/active_model_basics.md D guides/source/active_model_basics.textile A guides/source/active_record_basics.md D guides/source/active_record_basics.textile A guides/source/active_record_querying.md D guides/source/active_record_querying.textile A guides/source/active_record_validations_callbacks.md D guides/source/active_record_validations_callbacks.textile A guides/source/active_support_core_extensions.md D guides/source/active_support_core_extensions.textile A guides/source/active_support_instrumentation.md D guides/source/active_support_instrumentation.textile A guides/source/ajax_on_rails.md D guides/source/ajax_on_rails.textile A guides/source/api_documentation_guidelines.md D guides/source/api_documentation_guidelines.textile A guides/source/asset_pipeline.md D guides/source/asset_pipeline.textile A guides/source/association_basics.md D guides/source/association_basics.textile A guides/source/caching_with_rails.md D guides/source/caching_with_rails.textile A guides/source/command_line.md D guides/source/command_line.textile A guides/source/configuring.md D guides/source/configuring.textile A guides/source/contributing_to_ruby_on_rails.md D guides/source/contributing_to_ruby_on_rails.textile A guides/source/debugging_rails_applications.md D guides/source/debugging_rails_applications.textile A guides/source/engines.md D guides/source/engines.textile A guides/source/form_helpers.md D guides/source/form_helpers.textile A guides/source/generators.md D guides/source/generators.textile A guides/source/getting_started.md D guides/source/getting_started.textile A guides/source/i18n.md D guides/source/i18n.textile A guides/source/initialization.md D guides/source/initialization.textile A guides/source/layouts_and_rendering.md D guides/source/layouts_and_rendering.textile A guides/source/migrations.md D guides/source/migrations.textile A guides/source/nested_model_forms.md D guides/source/nested_model_forms.textile A guides/source/performance_testing.md D guides/source/performance_testing.textile A guides/source/plugins.md D guides/source/plugins.textile A guides/source/rails_application_templates.md D guides/source/rails_application_templates.textile A guides/source/rails_on_rack.md D guides/source/rails_on_rack.textile A guides/source/routing.md D guides/source/routing.textile A guides/source/ruby_on_rails_guides_guidelines.md D guides/source/ruby_on_rails_guides_guidelines.textile A guides/source/security.md D guides/source/security.textile A guides/source/testing.md D guides/source/testing.textile A guides/source/upgrading_ruby_on_rails.md D guides/source/upgrading_ruby_on_rails.textile commit 232b9ad refs/heads/master Author: Prem Sichanugrist Date: 2012-08-31 18:16:37 -0400 Skip kindle's readme file on generation M guides/rails_guides/generator.rb commit 848d13a refs/heads/master Author: Prem Sichanugrist Date: 2012-08-31 18:00:22 -0400 Reuse parent's id if it's already exists M guides/rails_guides/markdown.rb commit efa7717 refs/heads/master Author: Prem Sichanugrist Date: 2012-08-31 17:49:17 -0400 4.0 release note now renders correctly with index M guides/rails_guides/markdown.rb M guides/rails_guides/markdown/renderer.rb M guides/source/4_0_release_notes.md commit 544f6bc refs/heads/master Author: Prem Sichanugrist Date: 2012-08-31 12:01:06 -0400 Start rewriting 4.0 release note into Markdown M Gemfile M guides/Rakefile M guides/assets/stylesheets/main.css M guides/rails_guides.rb M guides/rails_guides/generator.rb A guides/rails_guides/markdown.rb A guides/rails_guides/markdown/renderer.rb M guides/source/4_0_release_notes.md commit fd9867c refs/heads/master Author: Prem Sichanugrist Date: 2012-09-01 10:57:50 -0400 Rename 4.0 release note into Markdown A guides/source/4_0_release_notes.md D guides/source/4_0_release_notes.textile commit e9acafd refs/heads/master Author: Steve Klabnik Date: 2012-09-17 22:03:34 +0300 Add note about inheretance and poly associations. This note came about due to discussion in #6786. M guides/source/association_basics.textile commit a95ddf6 refs/heads/master Author: Jeremy Kemper Date: 2012-09-17 11:29:35 -0700 Roll contrib guide link into feature request guidance M CONTRIBUTING.md commit 84a1e40 refs/heads/master Author: Xavier Noria Date: 2012-09-17 20:15:27 +0200 removes spurious quote M CONTRIBUTING.md commit 4714c8a refs/heads/master Author: Xavier Noria Date: 2012-09-17 20:13:25 +0200 edits a little bit CONTRIBUTING.md [ci skip] M CONTRIBUTING.md commit d0d9e54 refs/heads/master Merge: 40eec14 56071b3 Author: Xavier Noria Date: 2012-09-17 11:11:33 -0700 Merge pull request #7671 from steveklabnik/master Improve CONTRIBUTING commit f5654e7 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-17 12:26:52 -0500 update ActionMailer::Base documentation [ci skip] M actionmailer/lib/action_mailer/base.rb commit 56071b3 refs/heads/master Author: Steve Klabnik Date: 2012-09-17 20:15:09 +0300 Improve CONTRIBUTING.md Noting that we don't take feature requests or 'help me' stuff on the Issues tracker should cut down a ton on bad Issues. M CONTRIBUTING.md commit 40eec14 refs/heads/master Author: Jeremy Kemper Date: 2012-09-17 10:05:43 -0700 Oops, rdoc -> markdown. This reverts commit 5d95f3209fb2d6155ecd76c7692d0ac71a14726c. D CONTRIBUTING A CONTRIBUTING.md commit 5d95f32 refs/heads/master Author: Jeremy Kemper Date: 2012-09-17 10:04:36 -0700 GitHub isn't rendering Markdown for CONTRIBUTING.md. Rely on autolinked URL instead. A CONTRIBUTING D CONTRIBUTING.md commit 1d6668d refs/heads/master Author: Jeremy Kemper Date: 2012-09-17 10:00:53 -0700 Point to the contributing-to-Rails guide A CONTRIBUTING.md commit dd76b3b refs/tags/v3.2.9.rc2 Author: Yves Senn Date: 2012-09-16 21:48:24 +0200 log 404 status when ActiveRecord::RecordNotFound was raised (#7646) Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/log_subscriber.rb M actionpack/CHANGELOG.md M actionpack/lib/action_controller/log_subscriber.rb M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/test/controller/log_subscriber_test.rb commit 8f0d332 refs/heads/master Merge: 3c48b32 dadfa9a Author: Rafael Mendonça França Date: 2012-09-17 09:21:23 -0700 Merge pull request #7660 from senny/7646_wrong_status_code_on_not_found log 404 status when ActiveRecord::RecordNotFound was raised (#7646) commit dadfa9a refs/heads/master Author: Yves Senn Date: 2012-09-17 18:17:37 +0200 cleanup, remove whitespace from CHANGELOG M actionpack/CHANGELOG.md commit 370dcd9 refs/heads/master Author: Yves Senn Date: 2012-09-16 21:48:24 +0200 log 404 status when ActiveRecord::RecordNotFound was raised (#7646) M actionpack/CHANGELOG.md M actionpack/lib/action_controller/log_subscriber.rb M actionpack/lib/action_dispatch/middleware/exception_wrapper.rb M actionpack/test/controller/log_subscriber_test.rb commit 3c48b32 refs/heads/master Author: Xavier Noria Date: 2012-09-17 12:42:22 +0400 removes unnecessary self M actionpack/lib/action_controller/metal.rb commit a8b21ac refs/heads/master Author: Xavier Noria Date: 2012-09-17 12:40:45 +0400 revises the RDoc of AC::Base.without_modules M actionpack/lib/action_controller/base.rb commit 2919f0d refs/heads/master Author: Xavier Noria Date: 2012-09-17 12:13:33 +0400 documents the request and response methods in AC::Base M actionpack/lib/action_controller/base.rb commit 18dbad8 refs/heads/master Author: Xavier Noria Date: 2012-09-17 10:15:03 +0400 revises RDoc in AC::Metal [ci skip] M actionpack/lib/action_controller/metal.rb commit 4363368 refs/heads/master Author: Xavier Noria Date: 2012-09-17 09:43:46 +0400 removes unnecessary self M actionpack/lib/action_controller/metal.rb commit a219499 refs/heads/master Merge: d9f936e de1060f Author: Carlos Antonio da Silva Date: 2012-09-17 08:13:08 -0700 Merge pull request #7669 from guilleiguaran/rename-rb-handler Rename .rb template handler to .ruby to avoid conflicts with mustache classes commit de1060f refs/heads/master Author: Guillermo Iguaran Date: 2012-09-17 10:07:08 -0500 Rename .rb template handler to .ruby to avoid conflicts with mustache views classes M actionpack/CHANGELOG.md M actionpack/lib/action_view/template/handlers.rb D actionpack/test/fixtures/ruby_template.rb A actionpack/test/fixtures/ruby_template.ruby M actionpack/test/template/render_test.rb commit d9f936e refs/heads/master Merge: c35a7d7 13b0af7 Author: Rafael Mendonça França Date: 2012-09-17 07:20:14 -0700 Merge pull request #7644 from insside/register_template_handler-method-refactoring Allowing pass couple extension to one register_template_handler call commit 13b0af7 refs/heads/master Author: Tima Maslyuchenko Date: 2012-09-14 18:25:07 +0300 allowing pass couple extension to register_template_handler call M actionpack/CHANGELOG.md M actionpack/lib/action_view/template/handlers.rb M actionpack/test/template/render_test.rb commit c35a7d7 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-17 10:48:58 -0300 Use the CHANGELOG convention [ci skip] M activerecord/CHANGELOG.md commit ee43989 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-17 06:40:38 -0700 Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt Fix collection= on hm:t join models when unsaved M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 82d507b refs/heads/master Merge: 896594f 610b632 Author: Rafael Mendonça França Date: 2012-09-17 06:40:38 -0700 Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt Fix collection= on hm:t join models when unsaved commit 610b632 refs/heads/master Author: Ernie Miller Date: 2012-09-16 21:23:58 -0400 Fix collection= on hm:t join models when unsaved If assigning to a has_many :through collection against an unsaved object using the collection=[] syntax, the join models were not properly created, previously. M activerecord/CHANGELOG.md M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb commit 896594f refs/heads/master Merge: 73d3c93 0654f76 Author: Rafael Mendonça França Date: 2012-09-17 06:11:46 -0700 Merge pull request #7595 from guilleiguaran/update-ap-changelog Add missing entry in CHANGELOG about change of AD::Session::MemCacheStore commit 73d3c93 refs/heads/master Merge: c1b1215 8732148 Author: Rafael Mendonça França Date: 2012-09-17 06:08:46 -0700 Merge pull request #7667 from kennyj/fix_unnecessary_code_20120917 Remove unncessary code. commit 07c8055 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-17 05:28:35 -0700 Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b23835665 Fix warning: method redefine. Testcase name are duplicated. M activerecord/test/cases/associations/has_many_associations_test.rb commit 8732148 refs/heads/master Author: kennyj Date: 2012-09-17 21:33:43 +0900 Remove unncessary code. M activesupport/test/queueing/threaded_consumer_test.rb commit c1b1215 refs/heads/master Merge: a036dc8 3e4458b Author: Rafael Mendonça França Date: 2012-09-17 05:31:10 -0700 Merge pull request #7664 from arunagw/build_fix_railties Fix build for Queue. commit a036dc8 refs/heads/master Merge: 2a30150 3b18f34 Author: Rafael Mendonça França Date: 2012-09-17 05:28:35 -0700 Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b23835665 Fix warning: method redefine. Testcase name are duplicated. commit 3b18f34 refs/heads/master Author: kennyj Date: 2012-09-17 21:21:57 +0900 Fix warning: method redefine. Testcase name are duplicated. M activerecord/test/cases/associations/has_many_associations_test.rb commit 3e4458b refs/heads/master Author: Arun Agrawal Date: 2012-09-17 12:13:15 +0530 Fix build for Queue. M railties/lib/rails/application/finisher.rb commit 2a30150 refs/heads/master Author: Jeremy Kemper Date: 2012-09-16 18:30:23 -0700 Use synchronous queue by default. Separate queued message delivery jobs from the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage). M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/queued_message.rb M actionmailer/test/abstract_unit.rb M actionmailer/test/base_test.rb M actionmailer/test/mailers/async_mailer.rb commit b881be7 refs/heads/master Author: Jeremy Kemper Date: 2012-09-14 17:00:46 -0700 Always run jobs using a consumer, even in synchronous & test queues, to ensure shared behavior. M activesupport/lib/active_support/queueing.rb A activesupport/test/queueing/synchronous_queue_test.rb M activesupport/test/queueing/test_queue_test.rb M activesupport/test/queueing/threaded_consumer_test.rb commit 82355df refs/heads/master Author: Francesco Rodriguez Date: 2012-09-17 00:28:05 -0500 update code examples to 1.9 hash syntax in the AR/README [ci skip] M activerecord/README.rdoc commit d71d5ba refs/heads/master Author: Francesco Rodriguez Date: 2012-09-17 00:22:18 -0500 update AS docs [ci skip] M activesupport/lib/active_support/backtrace_cleaner.rb M activesupport/lib/active_support/benchmarkable.rb M activesupport/lib/active_support/cache.rb M activesupport/lib/active_support/callbacks.rb M activesupport/lib/active_support/concern.rb M activesupport/lib/active_support/configurable.rb M activesupport/lib/active_support/dependencies.rb M activesupport/lib/active_support/duration.rb M activesupport/lib/active_support/file_update_checker.rb M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/lib/active_support/i18n_railtie.rb M activesupport/lib/active_support/lazy_load_hooks.rb M activesupport/lib/active_support/log_subscriber.rb M activesupport/lib/active_support/logger.rb M activesupport/lib/active_support/message_encryptor.rb M activesupport/lib/active_support/message_verifier.rb M activesupport/lib/active_support/multibyte.rb M activesupport/lib/active_support/notifications.rb M activesupport/lib/active_support/ordered_options.rb M activesupport/lib/active_support/railtie.rb M activesupport/lib/active_support/string_inquirer.rb M activesupport/lib/active_support/tagged_logging.rb M activesupport/lib/active_support/time_with_zone.rb commit c1c9f1c refs/heads/master Author: Francesco Rodriguez Date: 2012-09-17 00:12:11 -0500 fix AS::OrderedOptions documentation [ci skip] M activesupport/lib/active_support/ordered_options.rb commit 3919fcd refs/heads/master Author: Guillermo Iguaran Date: 2012-09-14 15:29:55 -0500 Set primary key with id= only if primary key exists M activerecord/lib/active_record/attribute_methods/primary_key.rb commit 2d7ae1b refs/heads/master Author: Guillermo Iguaran Date: 2012-09-12 11:35:05 -0500 Remove mass_assignment_options from ActiveRecord M activerecord/lib/active_record/associations/association.rb M activerecord/lib/active_record/associations/collection_association.rb M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/associations/has_many_through_association.rb M activerecord/lib/active_record/associations/singular_association.rb M activerecord/lib/active_record/attribute_assignment.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/relation.rb M activerecord/lib/active_record/validations.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb M activerecord/test/cases/dup_test.rb M activerecord/test/cases/forbidden_attributes_protection_test.rb M activerecord/test/cases/persistence_test.rb M activerecord/test/models/bulb.rb commit 6ae93a0 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-10 01:48:31 -0500 AC::ParameterMissing inherits from KeyError since it's more appropiated than IndexError M actionpack/lib/action_controller/metal/strong_parameters.rb commit 9bfa13b refs/heads/master Author: Guillermo Iguaran Date: 2012-09-01 22:36:27 -0500 attr_accessible and attr_protected raise an exception pointing to use plugin or new protection model M activemodel/lib/active_model.rb A activemodel/lib/active_model/deprecated_mass_assignment_security.rb A activemodel/test/cases/deprecated_mass_assignment_security_test.rb A activemodel/test/models/project.rb M activerecord/lib/active_record/attribute_assignment.rb commit 91bcebb refs/heads/master Author: Guillermo Iguaran Date: 2012-09-01 02:30:07 -0500 Support fields_for attributes, which may have numeric symbols as hash keys M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/test/controller/parameters/nested_parameters_test.rb commit 1aaf449 refs/heads/master Author: Guillermo Iguaran Date: 2012-08-30 16:36:59 -0500 Add config.action_controller.permit_all_attributes to bypass StrongParameters protection M actionpack/lib/action_controller.rb M actionpack/lib/action_controller/metal/strong_parameters.rb M actionpack/lib/action_controller/railtie.rb M actionpack/test/controller/parameters/parameters_permit_test.rb M railties/test/application/configuration_test.rb commit 1e1bee3 refs/heads/master Author: Guillermo Iguaran Date: 2012-08-29 10:08:58 -0500 Change tainted/untainted wording to permitted/forbidden A actionpack/test/controller/parameters/parameters_permit_test.rb D actionpack/test/controller/parameters/parameters_taint_test.rb A actionpack/test/controller/permitted_params_test.rb D actionpack/test/controller/tainted_params_test.rb commit 8cfe95d refs/heads/master Author: Guillermo Iguaran Date: 2012-08-29 09:54:27 -0500 Don't use assert_nothing_raised when assert_equal is used M actionpack/test/controller/parameters/parameters_taint_test.rb M activemodel/test/cases/forbidden_attributes_protection_test.rb M activerecord/test/cases/forbidden_attributes_protection_test.rb commit 978c568 refs/heads/master Author: Guillermo Iguaran Date: 2012-08-25 01:43:30 -0500 Change scaffold_generator: Don't use #require or #permit in scaffold if attributes list isn't given M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb commit 1fa4f92 refs/heads/master Author: Guillermo Iguaran Date: 2012-08-13 00:41:04 -0500 Rename ForbiddenAttributes exception to ForbiddenAttributesError M activemodel/lib/active_model/forbidden_attributes_protection.rb M activemodel/test/cases/forbidden_attributes_protection_test.rb M activerecord/lib/active_record/attribute_assignment.rb M activerecord/test/cases/forbidden_attributes_protection_test.rb commit 4b608c0 refs/heads/master Author: Guillermo Iguaran Date: 2012-07-22 11:59:07 -0500 config.activerecord.whitelist_attributes isn't used anymore, remove reference from abstract_unit M railties/test/isolation/abstract_unit.rb commit 7d3be7e refs/heads/master Author: Guillermo Iguaran Date: 2012-07-22 11:58:25 -0500 Remove configuration test for config.activerecord.whitelist_attributes M railties/test/application/configuration_test.rb commit 9881dbb refs/heads/master Author: Guillermo Iguaran Date: 2012-07-22 11:31:38 -0500 Remove attributes whitelist tests from AppGenerator tests M railties/test/generators/app_generator_test.rb commit 8042835 refs/heads/master Author: Guillermo Iguaran Date: 2012-07-19 08:43:58 -0500 Change scaffold_controller to generate and use private method to encapsulate permissible params M railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb M railties/test/generators/scaffold_controller_generator_test.rb M railties/test/generators/scaffold_generator_test.rb commit b4d9a58 refs/heads/master Author: Guillermo Iguaran Date: 2012-07-20 00:32:15 -0500 require abstract_unit in parameters tests M actionpack/test/controller/parameters/nested_parameters_test.rb M actionpack/test/controller/parameters/parameters_require_test.rb M actionpack/test/controller/parameters/parameters_taint_test.rb commit 8c4de0e refs/heads/master Author: Guillermo Iguaran Date: 2012-07-19 08:57:48 -0500 Remove integration between attr_accessible/protected and AC::Metal::ParamsWrapper M actionpack/lib/action_controller/metal/params_wrapper.rb M actionpack/test/controller/params_wrapper_test.rb M actionpack/test/fixtures/company.rb commit d695fdb refs/heads/master Author: Guillermo Iguaran Date: 2012-07-19 08:41:18 -0500 Remove all references to attr_accessible/protected and old mass_assignment_sanitizers M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt M railties/test/application/loading_test.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/model_generator_test.rb commit 52aa534 refs/heads/master Author: Guillermo Iguaran Date: 2012-07-18 01:37:03 -0500 Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash instead of monkey patch permitted? method in regular hashes M activemodel/test/cases/forbidden_attributes_protection_test.rb commit 0168c7a refs/heads/master Author: Guillermo Iguaran Date: 2012-07-18 01:32:49 -0500 Add tests for ForbiddenAttributesProtection in ActiveRecord A activerecord/test/cases/forbidden_attributes_protection_test.rb commit 8020f71 refs/heads/master Author: Guillermo Iguaran Date: 2012-07-17 02:34:57 -0500 Remove mass assignment security from ActiveRecord M activerecord/lib/active_record/associations/collection_proxy.rb M activerecord/lib/active_record/attribute_assignment.rb M activerecord/lib/active_record/attribute_methods/primary_key.rb M activerecord/lib/active_record/nested_attributes.rb M activerecord/lib/active_record/persistence.rb M activerecord/lib/active_record/schema_migration.rb M activerecord/lib/rails/generators/active_record/model/templates/model.rb M activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/test/cases/associations/has_many_through_associations_test.rb M activerecord/test/cases/associations/has_one_associations_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/deprecated_dynamic_methods_test.rb D activerecord/test/cases/mass_assignment_security_test.rb M activerecord/test/cases/validations_test.rb M activerecord/test/models/bulb.rb M activerecord/test/models/company.rb M activerecord/test/models/company_in_module.rb M activerecord/test/models/person.rb M activerecord/test/models/reader.rb M activerecord/test/models/reply.rb commit f8c9a4d refs/heads/master Author: Guillermo Iguaran Date: 2012-07-17 00:59:31 -0500 Remove MassAssignmentSecurity from ActiveModel This will be moved out to protected_attributes gem M activemodel/lib/active_model.rb M activemodel/lib/active_model/forbidden_attributes_protection.rb D activemodel/lib/active_model/mass_assignment_security.rb D activemodel/lib/active_model/mass_assignment_security/permission_set.rb D activemodel/lib/active_model/mass_assignment_security/sanitizer.rb M activemodel/test/cases/forbidden_attributes_protection_test.rb D activemodel/test/cases/mass_assignment_security/black_list_test.rb D activemodel/test/cases/mass_assignment_security/permission_set_test.rb D activemodel/test/cases/mass_assignment_security/sanitizer_test.rb D activemodel/test/cases/mass_assignment_security/white_list_test.rb D activemodel/test/cases/mass_assignment_security_test.rb M activemodel/test/cases/secure_password_test.rb A activemodel/test/models/account.rb M activemodel/test/models/administrator.rb D activemodel/test/models/mass_assignment_specific.rb M activemodel/test/models/visitor.rb commit a8f6d5c refs/heads/master Author: Guillermo Iguaran Date: 2012-07-13 03:51:13 -0500 Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gem M activemodel/lib/active_model.rb A activemodel/lib/active_model/forbidden_attributes_protection.rb A activemodel/test/cases/forbidden_attributes_protection_test.rb M activemodel/test/models/mass_assignment_specific.rb commit 8850054 refs/heads/master Author: Guillermo Iguaran Date: 2012-07-12 00:50:42 -0500 Integrate ActionController::Parameters from StrongParameters gem M actionpack/lib/action_controller.rb M actionpack/lib/action_controller/base.rb A actionpack/lib/action_controller/metal/strong_parameters.rb A actionpack/test/controller/parameters/nested_parameters_test.rb A actionpack/test/controller/parameters/parameters_require_test.rb A actionpack/test/controller/parameters/parameters_taint_test.rb A actionpack/test/controller/required_params_test.rb A actionpack/test/controller/tainted_params_test.rb commit 0654f76 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-11 01:52:46 -0500 Add missing entries in AP changelog M actionpack/CHANGELOG.md commit e08a564 refs/heads/master Merge: beaac33 0aaf87c Author: Rafael Mendonça França Date: 2012-09-16 20:37:55 -0700 Merge pull request #7662 from frodsan/ar_changelog improve AR/CHANGELOG [ci skip] commit 0aaf87c refs/heads/master Author: Francesco Rodriguez Date: 2012-09-16 22:34:43 -0500 improve AR/CHANGELOG [ci skip] M activerecord/CHANGELOG.md commit beaac33 refs/heads/master Merge: 4434e3f 4544d2b Author: Rafael Mendonça França Date: 2012-09-16 20:07:28 -0700 Merge pull request #7547 from danmcclain/pg-arrays Adds migration and type casting support for PostgreSQL Array datatype commit 4434e3f refs/heads/master Author: Rafael Mendonça França Date: 2012-09-16 23:32:23 -0300 Remove debug code :bomb: M activerecord/lib/active_record/associations/collection_association.rb commit 8432d03 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-16 23:27:19 -0300 Merge pull request #7651 from steveklabnik/issue_3956 Don't preserve SELECT columns on COUNT Closes #7651 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 9ae79af refs/heads/master Merge: eac9e03 9fa3f10 Author: Rafael Mendonça França Date: 2012-09-16 23:27:19 -0300 Merge pull request #7651 from steveklabnik/issue_3956 Don't preserve SELECT columns on COUNT Closes #7651 commit 9fa3f10 refs/heads/master Author: Steve Klabnik Date: 2012-09-15 12:31:53 +0400 Don't preserve SELECT columns on COUNT The COUNT clause of a finder_sql relationship is being rewritten from COUNT(*) to COUNT(table_name.*). This does not appear to be valid syntax in MySQL: ``` mysql> SELECT COUNT( table_name.* ) FROM `table_name`; ERROR 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '* ) FROM `table_name`' at line 1 ``` This fixes the bug, as well as adding tests so we don't re-introduce it in the future. Fixes #3956. M activerecord/lib/active_record/associations/collection_association.rb M activerecord/test/cases/associations/has_many_associations_test.rb commit 6abe0e7 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-16 21:51:38 -0300 Backport explain fixes. * Mark as SCHEMA some schema database queries. #7648 * Don't explain queries except normal CRUD sql. #7657 Closes #6458 Closes #7544 M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb M activerecord/lib/active_record/explain_subscriber.rb M activerecord/test/cases/explain_subscriber_test.rb commit eac9e03 refs/heads/master Merge: 82efe89 1efe30e Author: Rafael Mendonça França Date: 2012-09-16 18:17:44 -0700 Merge pull request #7645 from larrylv/configurable-defaults Set up config_accessor with a default value by block commit 1efe30e refs/heads/master Author: Larry Lv Date: 2012-09-15 03:25:21 +0800 set up config_accessor with a default value by block * ActiveSupport::Configurable should allow config_accessor to take default value by block, just like cattr_accessor. class User include ActiveSupport::Configurable config_accessor :hair_colors do [:brown, :black, :blonde, :red] end end User.hair_colors # => [:brown, :black, :blonde, :red] * remove trailing whitespaces in configurable.rb and its test file. * Update ActiveSupport CHANGELOG. M activesupport/CHANGELOG.md M activesupport/lib/active_support/configurable.rb M activesupport/test/configurable_test.rb commit 744b8e0 refs/heads/master Author: Simon Hengel Date: 2012-09-16 21:12:07 +0200 Update "Getting Started" guide M guides/source/getting_started.textile commit 82efe89 refs/heads/master Merge: aa81bf7 5bb056d Author: Piotr Sarnacki Date: 2012-09-16 11:55:44 -0700 Merge pull request #7657 from kennyj/fix_6458-2 Don't explain except normal CRUD sql. commit 5bb056d refs/heads/master Author: kennyj Date: 2012-09-16 10:43:30 +0900 Don't explain except normal CRUD sql. M activerecord/CHANGELOG.md M activerecord/lib/active_record/explain_subscriber.rb M activerecord/test/cases/explain_subscriber_test.rb commit aa81bf7 refs/heads/master Merge: 56c60ca 761bc75 Author: Carlos Antonio da Silva Date: 2012-09-16 05:30:10 -0700 Merge pull request #7652 from toshi-kawanishi/find_in_batches Fix find_in_batches with customized primary_key commit 761bc75 refs/heads/master Author: Toshiyuki Kawanishi Date: 2012-09-15 17:39:11 +0900 Fix find_in_batches with customized primary_key M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/batches.rb M activerecord/test/cases/batches_test.rb M activerecord/test/models/post.rb commit 5853f62 refs/heads/master Author: Henrik N Date: 2012-09-16 12:22:36 +0200 Doc typo: depenent -> dependent; trailing ws. M activerecord/lib/active_record/associations.rb commit 56c60ca refs/heads/master Merge: 714e348 3dc4021 Author: Rafael Mendonça França Date: 2012-09-15 09:17:52 -0700 Merge pull request #7648 from kennyj/rename_2_schema Query for loading index info should be marked as SCHEMA. commit 714e348 refs/heads/master Merge: b96464e 75b9c2c Author: Xavier Noria Date: 2012-09-15 08:31:54 -0700 Merge pull request #7656 from czarneckid/clarify-documentation Clarify the documentation on the Rails::Application#call method commit 75b9c2c refs/heads/master Author: David Czarnecki Date: 2012-09-15 11:11:54 -0400 Clarify the documentation on the Rails::Application#call method M railties/lib/rails/application.rb commit b96464e refs/heads/master Author: Rafael Mendonça França Date: 2012-09-15 11:37:50 -0300 Check if etag exists before to do the gsub This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981 M actionpack/lib/action_dispatch/http/cache.rb commit 3fb492f refs/heads/master Merge: 1b7894c b079f7a Author: Rafael Mendonça França Date: 2012-09-15 07:02:32 -0700 Merge pull request #7655 from steveklabnik/master fix the build commit b079f7a refs/heads/master Author: Steve Klabnik Date: 2012-09-15 18:01:23 +0400 fix the build M actionpack/lib/action_dispatch/http/cache.rb commit 3dc4021 refs/heads/master Author: kennyj Date: 2012-09-15 14:31:55 +0900 Query for sequence info also should be markd as SCHEMA. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb commit 8933efb refs/heads/master Author: kennyj Date: 2012-09-15 14:20:09 +0900 Query for loading index info should be marked as SCHEMA. M activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb commit 1b7894c refs/heads/master Merge: 3ec6783 ed2fea9 Author: Rafael Mendonça França Date: 2012-09-15 05:57:08 -0700 Merge pull request #7643 from steveklabnik/deprecate_silence Deprecate ActiveSupport::Benchmarkable#silence. commit 3ec6783 refs/heads/master Merge: a086ef6 afe9654 Author: Xavier Noria Date: 2012-09-15 05:39:40 -0700 Merge pull request #7654 from steveklabnik/issue_4857 Improve Process::Status#to_json commit afe9654 refs/heads/master Author: Steve Klabnik Date: 2012-09-15 16:22:15 +0400 Improve Process::Status#to_json Because Process::Status has no instance_variables, the ActiveSupport version of #to_json produces {}, which isn't good. Therefore, we implement our own #as_json, which makes it useful again. Fixes #4857 M activesupport/lib/active_support/core_ext/object/to_json.rb commit a086ef6 refs/heads/master Merge: 9cd831a cd461c3 Author: Rafael Mendonça França Date: 2012-09-15 05:17:40 -0700 Merge pull request #7649 from steveklabnik/issue_2520 Support for multiple etags in an If-None-Match header commit 9cd831a refs/heads/master Author: Rafael Mendonça França Date: 2012-09-15 09:13:48 -0300 Fix syntax error in assert_match M railties/test/application/rake/dbs_test.rb commit cd461c3 refs/heads/master Author: Travis Warlick Date: 2011-08-13 21:23:27 -0500 Support for multiple etags in an If-None-Match header This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb M actionpack/CHANGELOG.md M actionpack/lib/action_dispatch/http/cache.rb M actionpack/test/dispatch/request_test.rb commit 91363ec refs/heads/master Merge: c46208c ff04bb8 Author: Rafael Mendonça França Date: 2012-09-15 03:27:14 -0700 Merge pull request #7653 from arunagw/warnings-removed Few more warnings removed. commit c46208c refs/heads/master Author: Jon Leighton Date: 2012-09-15 10:44:12 +0100 simplify rescue M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit ff04bb8 refs/heads/master Author: Arun Agrawal Date: 2012-09-15 14:26:04 +0530 Few more warnings removed. I found them when I was running warning mode on with railties See https://github.com/rails/rails/pull/3782 M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M railties/test/application/rake/dbs_test.rb commit ecaf728 refs/heads/master Author: Steve Klabnik Date: 2012-09-15 12:00:27 +0400 Improve documentation about :dependent and callbacks. Fixes #3458. M activerecord/lib/active_record/associations.rb commit 00fef0a refs/heads/master Author: Francesco Rodriguez Date: 2012-09-14 23:02:37 -0500 update AS/values and AS/xml_mini docs [ci skip] M activesupport/lib/active_support/values/time_zone.rb M activesupport/lib/active_support/xml_mini/libxml.rb M activesupport/lib/active_support/xml_mini/nokogiri.rb M activesupport/lib/active_support/xml_mini/rexml.rb commit b0e9433 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-14 22:57:38 -0500 update AS/notifications and AS/testing docs [ci skip] M activesupport/lib/active_support/notifications/instrumenter.rb M activesupport/lib/active_support/testing/assertions.rb M activesupport/lib/active_support/testing/performance.rb commit d48163c refs/heads/master Author: Francesco Rodriguez Date: 2012-09-14 22:54:39 -0500 update AS/log_subscriber and AS/multibyte docs [ci skip] M activesupport/lib/active_support/log_subscriber/test_helper.rb M activesupport/lib/active_support/multibyte/chars.rb M activesupport/lib/active_support/multibyte/unicode.rb commit 7ef21d8 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-14 22:47:21 -0500 update AS/json docs [ci skip] M activesupport/lib/active_support/json/decoding.rb M activesupport/lib/active_support/json/encoding.rb commit 5ea3f28 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-14 22:44:06 -0500 update AS/inflector docs [ci skip] M activesupport/lib/active_support/inflector/inflections.rb M activesupport/lib/active_support/inflector/methods.rb M activesupport/lib/active_support/inflector/transliterate.rb commit 8673c2e refs/heads/master Author: Francesco Rodriguez Date: 2012-09-14 22:28:56 -0500 update AS/deprecation docs [ci skip] M activesupport/lib/active_support/deprecation/behaviors.rb M activesupport/lib/active_support/deprecation/reporting.rb commit f210a36 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-14 21:31:49 -0500 add :nodoc: to AS::Autoload#extended [ci skip] M activesupport/lib/active_support/dependencies/autoload.rb commit ed2fea9 refs/heads/master Author: Steve Klabnik Date: 2012-09-14 18:52:15 +0400 Deprecate ActiveSupport::Benchmarkable#silence. Due to its lack of thread safety, we're deprecating this, and it will be removed in Rails 4.1. Fixes #4060. M activerecord/test/cases/base_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/benchmarkable.rb commit 60c88e6 refs/heads/master Author: Jon Leighton Date: 2012-09-15 00:41:56 +0100 Fix test Accidentally checked in commented test code. Fail. >_< M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/test/cases/transaction_callbacks_test.rb commit 02f5655 refs/heads/master Author: Jon Leighton Date: 2012-09-14 23:59:35 +0100 Ensure disconnecting or reconnecting resets the transaction state M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb M activerecord/test/active_record/connection_adapters/fake_adapter.rb M activerecord/test/cases/adapter_test.rb commit 6195142 refs/heads/master Author: Jon Leighton Date: 2012-09-14 22:33:44 +0100 Remove our use of #outside_transaction? This method was first seen in 045713ee240fff815edb5962b25d668512649478, and subsequently reimplemented in fb2325e35855d62abd2c76ce03feaa3ca7992e4f. According to @jeremy, this is okay to remove. He thinks it was added because at the time we didn't have much transaction state to keep track of, and he viewed it as a hack for us to track it internally, thinking it was better to ask the connection for the transaction state. Over the years we have added more and more state to track, a lot of which is impossible to ask the connection for. So it seems that this is just a relic of the passed and we will just track the state internally only. M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb M activerecord/test/cases/transactions_test.rb commit 748052a refs/heads/master Author: Jon Leighton Date: 2012-09-14 20:55:01 +0100 Remove the transaction_open variable M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/test/cases/transactions_test.rb commit 2805875 refs/heads/master Author: Jon Leighton Date: 2012-09-14 19:06:02 +0100 Move transaction joinability into the transaction object M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/transactions_test.rb commit a6fbddb refs/heads/master Author: Jon Leighton Date: 2012-09-14 18:01:00 +0100 Alter the naming structure a bit M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb commit 6d9e6b3 refs/heads/master Author: Jon Leighton Date: 2012-09-14 17:54:27 +0100 Split Open into Real and Savepoint M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb commit dd48f0e refs/heads/master Author: Jon Leighton Date: 2012-09-14 17:46:54 +0100 DRY M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb commit 58ced30 refs/heads/master Author: Jon Leighton Date: 2012-09-14 17:44:34 +0100 Don't do the rollback in #commit The caller needs to have knowledge of the rollback either way, so do it all in the caller (#transaction) M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb commit 9296e69 refs/heads/master Author: Jon Leighton Date: 2012-09-14 17:30:37 +0100 Store the transaction number in the transaction object This avoids us having to manually increment and decrement it. M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/railties/console_sandbox.rb commit 02f25a2 refs/heads/master Author: Jon Leighton Date: 2012-09-14 13:35:24 +0100 Start to tease out transaction handling into a state machine M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb A activerecord/lib/active_record/connection_adapters/abstract/transaction.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/fixtures.rb M activerecord/test/cases/transaction_callbacks_test.rb M activerecord/test/cases/transactions_test.rb commit b89ffe7 refs/heads/master Author: Jon Leighton Date: 2012-09-14 16:44:35 +0100 Revert "create a transaction object and point AR objects at that object during a" This reverts commit c24c885209ac2334dc6f798c394a821ee270bec6. Here's the explanation I just sent to @tenderlove: Hey, I've been thinking about about the transaction memory leak thing that we were discussing. Example code: post = nil Post.transaction do N.times { post = Post.create } end Post.transaction is going to create a real transaction and there will also be a (savepoint) transaction inside each Post.create. In an idea world, we'd like all but the last Post instance to be GC'd, and for the last Post instance to receive its after_commit callback when Post.transaction returns. I can't see how this can work using your solution where the Post itself holds a reference to the transaction it is in; when Post.transaction returns, control does not switch to any of Post's instance methods, so it can't trigger the callbacks itself. What we really want is for the transaction itself to hold weak references to the objects within the transaction. So those objects can be GC'd, but if they are not GC'd then the transaction can iterate them and execute their callbacks. I've looked into WeakRef implementations that are available. On 1.9.3, the stdlib weakref library is broken and we shouldn't use it. There is a better implementation here: https://github.com/bdurand/ref/blob/master/lib/ref/weak_reference/pure_ruby.rb We could use that, either by pulling in the gem or just copying the code in, but it still suffers from the limitation that it uses ObjectSpace finalizers. In my testing, this finalizers make GC quite expensive: https://gist.github.com/3722432 Ruby 2.0 will have a native WeakRef implementation (via ObjectSpace::WeakMap), hence won't be reliant on finalizers: http://bugs.ruby-lang.org/issues/4168 So the ultimate solution will be for everyone to use Ruby 2.0, and for us to just use ObjectSpace::WeakMap. In the meantime, we have basically 3 options: The first is to leave it as it is. The second is to use a finalizer-based weakref implementation and take the GC perf hit. The final option is to store object ids rather than the actual objects. Then use ObjectSpace._id2ref to deference the objects at the end of the transaction, if they exist. This won't stop memory use growing within the transaction, but it'll grow more slowly. I benchmarked the performance of _id2ref this if the object does or does not exist: https://gist.github.com/3722550 If it does exist it seems decent, but it's hugely more expensive if it doesn't, probably because we have to do the rescue nil. Probably most of the time the objects will exist. However the point of doing this optimisation is to allow people to create a large number of objects inside a transaction and have them be GC'd. So for that use case, we'd be replacing one problem with another. I'm not sure which of the two problems is worse. My feeling is that we should just leave this for now and come back to it when Ruby 2.0 is out. I'm going to revert your commit because I can't see how it solves this. Hope you don't mind... if I've misunderstood then let me know! Jon M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/transactions.rb commit 8577687 refs/heads/master Author: Santiago Pastorino Date: 2012-09-13 15:09:15 -0700 Move queue classes to ActiveSupport M actionmailer/test/abstract_unit.rb M actionmailer/test/base_test.rb A activesupport/lib/active_support/queueing.rb A activesupport/test/queueing/container_test.rb A activesupport/test/queueing/test_queue_test.rb A activesupport/test/queueing/threaded_consumer_test.rb M guides/source/configuring.textile M railties/lib/rails.rb M railties/lib/rails/application.rb M railties/lib/rails/application/configuration.rb M railties/lib/rails/application/finisher.rb M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt D railties/lib/rails/queueing.rb M railties/test/application/initializers/frameworks_test.rb M railties/test/application/queue_test.rb D railties/test/queueing/container_test.rb D railties/test/queueing/test_queue_test.rb D railties/test/queueing/threaded_consumer_test.rb commit ae00ade refs/heads/master Merge: 84ba499 2385129 Author: José Valim Date: 2012-09-14 07:50:35 -0700 Merge pull request #7642 from lest/patch-1 update CHANGELOG commit 2385129 refs/heads/master Author: Sergey Nartimov Date: 2012-09-14 18:48:05 +0400 update CHANGELOG Add entry about 245941101b1ea00a9b1af613c20b0ee994a43946 and 95be790ece75710f2588558a6d5f40fd09543b97. M actionpack/CHANGELOG.md commit 4544d2b refs/heads/master Author: Dan McClain Date: 2012-08-19 18:02:34 -0400 Moves column dump specific code to a module included in AbstractAdapter Having column related schema dumper code in the AbstractAdapter. The code remains the same, but by placing it in the AbstractAdapter, we can then overwrite it with Adapter specific methods that will help with Adapter specific data types. The goal of moving this code here is to create a new migration key for PostgreSQL's array type. Since any datatype can be an array, the goal is to have ':array => true' as a migration option, turning the datatype into an array. I've implemented this in postgres_ext, the syntax is shown here: https://github.com/dockyard/postgres_ext#arrays Adds array migration support Adds array_test.rb outlining the test cases for array data type Adds pg_array_parser to Gemfile for testing Adds pg_array_parser to postgresql_adapter (unused in this commit) Adds schema dump support for arrays Adds postgres array type casting support Updates changelog, adds note for inet and cidr support, which I forgot to add before Removing debugger, Adds pg_array_parser to JRuby platform Removes pg_array_parser requirement, creates ArrayParser module used by PostgreSQLAdapter M activerecord/CHANGELOG.md A activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb A activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/lib/active_record/schema_dumper.rb A activerecord/test/cases/adapters/postgresql/array_test.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/cases/schema_dumper_test.rb commit 84ba499 refs/heads/master Merge: 40937fe 948a055 Author: José Valim Date: 2012-09-14 01:00:52 -0700 Merge pull request #7635 from arunagw/warning_removed_shadowing_variable warning removed: shadowing outer local variable - message commit 40937fe refs/heads/master Merge: e1af54d 5138a30 Author: José Valim Date: 2012-09-14 01:00:23 -0700 Merge pull request #7634 from arunagw/build_fix_actionmailer Build fix for ActionMailer commit e1af54d refs/heads/master Merge: bb732be 6927fad Author: Jeremy Kemper Date: 2012-09-13 22:52:06 -0700 Merge pull request #7637 from NARKOZ/patch-3 use presence method instead of checking for blank commit 6927fad refs/heads/master Author: Nihad Abbasov Date: 2012-09-14 11:47:22 +0600 use presence method instead of checking for blank M actionpack/lib/action_view/lookup_context.rb commit 948a055 refs/heads/master Author: Arun Agrawal Date: 2012-09-14 10:19:10 +0530 warning removed: shadowing outer local variable - message M activesupport/lib/active_support/deprecation/reporting.rb commit 5138a30 refs/heads/master Author: Arun Agrawal Date: 2012-09-14 10:15:18 +0530 Build fix for ActionMailer See http://travis-ci.org/#!/rails/rails/jobs/2444632 M actionpack/lib/action_controller/metal/request_forgery_protection.rb commit bb732be refs/heads/master Merge: 0247443 95be790 Author: Michael Koziarski Date: 2012-09-13 20:44:45 -0700 Merge pull request #7616 from lest/null-session-forgery-protection Implement :null_session CSRF protection method commit dbfdd00 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-13 22:26:08 -0300 `skip` in Ruby 1.8 doesn't skip the test case without return M activerecord/test/cases/adapters/postgresql/connection_test.rb commit 5aaf79a refs/tags/v3.2.9.rc2 Merge: 84c7896 2326d46 Author: Carlos Antonio da Silva Date: 2012-09-13 15:40:57 -0700 Merge pull request #7633 from frodsan/patch-5 Fix markdown markup in AR/CHANGELOG [ci skip] commit 2326d46 refs/tags/v3.2.9.rc2 Author: Francesco Rodríguez Date: 2012-09-13 17:38:10 -0500 fix markdown markup in AR/CHANGELOG M activerecord/CHANGELOG.md commit 84c7896 refs/tags/v3.2.9.rc2 Merge: f568280 f48bb01 Author: Rafael Mendonça França Date: 2012-09-13 15:22:03 -0700 Merge pull request #7632 from stevecj/3-2-stable 3 2 stable commit f48bb01 refs/tags/v3.2.9.rc2 Author: Steve Jorgensen Date: 2012-06-06 17:31:23 -0700 Backport PostgreSQL auto-reconnect test coverage 6d5f4de4c420ebb906109668f5702a537ac77692 Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. 4b1bca04025a66c54e6e9d5eb6e4d4056bfa92f0 Stop being silly with formatting of method aliasing. c381d5cbf959208adeb38e7859ee815dfbd2cf54 Fix just-plain-wrongness of psql auto-reconnect test. 1e17a9d367c54c680368be72f44247ae28b98904 Fix only-once stub logic. f16c2043826ec1991cf94fe17cb671507b7a7f51 Changelog for PostgreSQL auto-reconnect test coverage backport. M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/connection_test.rb M activerecord/test/config.example.yml commit 3aef5ce refs/heads/master Author: Jeremy Evans Date: 2012-09-13 14:13:19 -0700 Freeze columns before using them as hash keys This reduces the number of allocated strings from columns * (rows + 1) to just columns. M activerecord/lib/active_record/result.rb commit 0247443 refs/heads/master Merge: 8692db5 54575d8 Author: Rafael Mendonça França Date: 2012-09-13 13:07:49 -0700 Merge pull request #7628 from Pranas/deep_merge_with_block Allow passing block to deep_merge and deep_merge! commit 54575d8 refs/heads/master Author: Pranas Kiziela Date: 2012-09-13 21:49:49 +0300 Allow passing block to deep_merge and deep_merge! Hash#merge accepts block that you can use to customize how hash values are merged. This change makes merge and deep_merge compatible. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/hash/deep_merge.rb M activesupport/test/core_ext/hash_ext_test.rb commit b47d5bb refs/heads/master Author: Uģis Ozols Date: 2012-09-13 21:36:26 +0300 Remove redundant 'the'. M railties/lib/rails/generators/base.rb commit 8692db5 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-13 14:02:18 -0300 Copy-edit deprecation relared documentation [ci skip] M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/module/deprecation.rb M activesupport/lib/active_support/deprecation.rb M activesupport/lib/active_support/deprecation/proxy_wrappers.rb M activesupport/lib/active_support/deprecation/reporting.rb commit 1726a94 refs/heads/master Merge: 01ef633 46873ae Author: Rafael Mendonça França Date: 2012-09-13 07:17:33 -0700 Merge pull request #7524 from al2o3cr/store_boolean Add boolean type conversion for AR::Store commit 46873ae refs/heads/master Author: Matt Jones Date: 2012-09-13 10:12:11 -0400 refactor store_accessor M activerecord/CHANGELOG.md M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb M activerecord/test/models/admin/user.rb commit 01ef633 refs/heads/master Merge: c4b8572 71993c6 Author: Carlos Antonio da Silva Date: 2012-09-13 04:47:03 -0700 Merge pull request #6348 from LTe/no_global_depreactations Allow ActiveSupport::Deprecation features to be used by rails applications and library authors commit 95be790 refs/heads/master Author: Sergey Nartimov Date: 2012-09-13 12:07:37 +0300 Implement :null_session CSRF protection method It's further work on CSRF after 245941101b1ea00a9b1af613c20b0ee994a43946. The :null_session CSRF protection method provide an empty session during request processing but doesn't reset it completely (as :reset_session does). M actionpack/lib/action_controller/metal/request_forgery_protection.rb M actionpack/test/controller/request_forgery_protection_test.rb M railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt M railties/test/application/middleware/session_test.rb commit 71993c6 refs/heads/master Author: Piotr Niełacny Date: 2012-09-13 08:38:34 +0200 Change ActiveSupport::Deprecation to class. ActiveSupport::Deprecation is now a class rather than a module. You can get instance of ActiveSupport::Deprecation calling #instance method. ActiveSupport::Deprecation.instance But when you need to get new object od ActiveSupport::Deprecation you need to just call #new. @instance = ActiveSupport::Deprecation.new Since you can create a new object, you can change the version and the name of the library where the deprecator concerned. ActiveSupport::Deprecation.new('2.0', 'MyGem') If you need use another deprecator instance you can select it in the options of deprecate method. deprecate :method, :deprecator => deprecator_instance Documentation has been updated. M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/module/deprecation.rb M activesupport/lib/active_support/deprecation.rb M activesupport/lib/active_support/deprecation/behaviors.rb A activesupport/lib/active_support/deprecation/instance_delegator.rb M activesupport/lib/active_support/deprecation/method_wrappers.rb M activesupport/lib/active_support/deprecation/proxy_wrappers.rb M activesupport/lib/active_support/deprecation/reporting.rb M activesupport/test/deprecation_test.rb commit 2c690a0 refs/heads/master Author: Robert Pankowecki Date: 2011-07-25 21:05:06 +0200 extend ActiveSupport::Deprecation with self, allow other objects to extend/include it also. test local deprecation deprecator object Test ActiveSupport::Deprecation when included M activesupport/lib/active_support/deprecation.rb M activesupport/lib/active_support/deprecation/behaviors.rb M activesupport/lib/active_support/deprecation/method_wrappers.rb M activesupport/lib/active_support/deprecation/proxy_wrappers.rb M activesupport/lib/active_support/deprecation/reporting.rb M activesupport/test/deprecation_test.rb commit c4b8572 refs/heads/master Merge: 9641cdd d4b3fdb Author: Rafael Mendonça França Date: 2012-09-12 20:35:40 -0700 Merge pull request #7623 from tchandy/master update ConnectionAdapter::Column#type_cast_code to be compatible with rails 3.2 branch commit d4b3fdb refs/heads/master Author: Thiago Pradi Date: 2012-09-13 00:26:52 -0300 update ConnectionAdaptar::Column#type_cast_code to be compatible with 3.2 branch M activerecord/lib/active_record/connection_adapters/column.rb commit 9641cdd refs/heads/master Merge: e55c75d ceb05bd Author: Rafael Mendonça França Date: 2012-09-12 18:37:48 -0700 Merge pull request #7614 from frodsan/scm_agnostic add --skip-ignore and --skip-keeps options to generators. commit ceb05bd refs/heads/master Author: Derek Prior Date: 2012-09-12 20:15:38 -0500 change app/plugin generators to be more SCM agnostic Users of other SCM's can now generate rails apps that will add the "empty" directories to source control, but will not have a useless .gitignore or mis-named .gitkeep files. * Change `rails new` and `rails plugin new` generators to name the `.gitkeep` as `.keep` in a more SCM-agnostic way. * Change `--skip-git` option to only skip the `.gitignore` file and still generate the `.keep` files. * Add `--skip-keeps` option to skip the `.keep` files. It closes #2800. M railties/CHANGELOG.md M railties/lib/rails/generators/app_base.rb M railties/lib/rails/generators/rails/app/app_generator.rb M railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb M railties/test/generators/app_generator_test.rb M railties/test/generators/shared_generator_tests.rb commit 68a8a29 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-12 19:41:03 -0500 fix AS/core_ext examples [ci skip] M activesupport/lib/active_support/core_ext/hash/indifferent_access.rb M activesupport/lib/active_support/core_ext/hash/keys.rb M activesupport/lib/active_support/core_ext/hash/reverse_merge.rb commit 794a70f refs/heads/master Author: Francesco Rodriguez Date: 2012-09-12 18:40:18 -0500 update AS/core_ext docs [ci skip] M activesupport/lib/active_support/core_ext/array/conversions.rb M activesupport/lib/active_support/core_ext/array/extract_options.rb M activesupport/lib/active_support/core_ext/array/grouping.rb M activesupport/lib/active_support/core_ext/array/uniq_by.rb M activesupport/lib/active_support/core_ext/array/wrap.rb M activesupport/lib/active_support/core_ext/class/attribute.rb M activesupport/lib/active_support/core_ext/date/calculations.rb M activesupport/lib/active_support/core_ext/date/conversions.rb M activesupport/lib/active_support/core_ext/date/zones.rb M activesupport/lib/active_support/core_ext/date_time/calculations.rb M activesupport/lib/active_support/core_ext/date_time/conversions.rb M activesupport/lib/active_support/core_ext/date_time/zones.rb M activesupport/lib/active_support/core_ext/enumerable.rb M activesupport/lib/active_support/core_ext/hash/conversions.rb M activesupport/lib/active_support/core_ext/hash/deep_merge.rb M activesupport/lib/active_support/core_ext/hash/except.rb M activesupport/lib/active_support/core_ext/hash/indifferent_access.rb M activesupport/lib/active_support/core_ext/hash/keys.rb M activesupport/lib/active_support/core_ext/hash/reverse_merge.rb M activesupport/lib/active_support/core_ext/hash/slice.rb M activesupport/lib/active_support/core_ext/integer/inflections.rb M activesupport/lib/active_support/core_ext/integer/time.rb M activesupport/lib/active_support/core_ext/kernel/reporting.rb M activesupport/lib/active_support/core_ext/module/anonymous.rb M activesupport/lib/active_support/core_ext/module/introspection.rb M activesupport/lib/active_support/core_ext/string/filters.rb M activesupport/lib/active_support/core_ext/string/output_safety.rb M activesupport/lib/active_support/core_ext/time/conversions.rb M activesupport/lib/active_support/core_ext/time/zones.rb commit e55c75d refs/heads/master Author: Jon Leighton Date: 2012-09-13 00:12:25 +0100 Pass in the model class rather than engine In some circumstances engine was Arel::Table.engine which for separate reasons was an ActiveRecord::Model::DeprecationProxy, which caused a deprecation warning. In any case, we want the actual model class here, since we want to use it to infer information about associations. M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/lib/active_record/sanitization.rb commit e588c98 refs/heads/master Author: Jon Leighton Date: 2012-09-12 23:51:30 +0100 Refactor to remove some duplication M activerecord/lib/active_record/reflection.rb M activerecord/lib/active_record/relation/predicate_builder.rb commit eb4a623 refs/heads/master Author: Jon Leighton Date: 2012-09-12 23:32:50 +0100 Fix nested association references Previously the reflection would be looked up on the wrong class. However the test passed because the examples referred back to themselves. M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/models/price_estimate.rb commit b5aed34 refs/heads/master Merge: 0f228b4 3da275c Author: Jon Leighton Date: 2012-09-12 14:04:11 -0700 Merge pull request #7273 from beerlington/foreign_key_model_queries Convert model name to foreign key in queries commit 0f228b4 refs/heads/master Merge: 85d8b22 38886f3 Author: Carlos Antonio da Silva Date: 2012-09-12 12:02:08 -0700 Merge pull request #7622 from marcandre/doc Update documentation for CollectionProxy [ci skip] commit 38886f3 refs/heads/master Author: Marc-Andre Lafortune Date: 2012-09-12 14:54:44 -0400 Update documentation for CollectionProxy M activerecord/lib/active_record/associations/collection_proxy.rb commit 85d8b22 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-12 15:54:06 -0300 Remove the queue configuration from the environments templates since the default is the SynchronousQueue. M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt commit a25b5f6 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-12 15:50:46 -0300 Updating the documentation to ActionMailer::Base.queue M actionmailer/lib/action_mailer/base.rb M guides/source/action_mailer_basics.textile M guides/source/configuring.textile commit f4e1805 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-12 13:46:33 -0500 update some AS code examples to 1.9 hash syntax [ci skip] M activesupport/lib/active_support/core_ext/module/delegation.rb M activesupport/lib/active_support/core_ext/module/deprecation.rb M activesupport/lib/active_support/core_ext/numeric/conversions.rb M activesupport/lib/active_support/core_ext/numeric/time.rb M activesupport/lib/active_support/core_ext/object/blank.rb M activesupport/lib/active_support/core_ext/object/duplicable.rb M activesupport/lib/active_support/core_ext/object/with_options.rb M activesupport/lib/active_support/core_ext/time/calculations.rb M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/lib/active_support/inflector/transliterate.rb M activesupport/lib/active_support/notifications.rb M activesupport/lib/active_support/number_helper.rb M activesupport/lib/active_support/rescuable.rb commit d0c25f2 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-12 15:25:04 -0300 Define a SynchronousQueue for test in Action Pack. We don't need to rely on rails/queueing in Action Pack tests M actionpack/test/abstract_unit.rb M actionpack/test/controller/assert_select_test.rb commit 45537f0 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-12 14:23:07 -0300 Allow users to configure the queue for the mailers This allow the users to do: config.action_mailer.queue = MyQueue.new and class UsersMailer < ActionMailer::Base self.queue = MyQueue.new end M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/railtie.rb M actionmailer/test/abstract_unit.rb M railties/test/application/initializers/frameworks_test.rb commit 961355a refs/heads/master Author: José Corcuera Date: 2012-09-12 13:29:42 -0500 Update action_controller_overview.textile to ruby 1.9 syntax [ci skip] M guides/source/action_controller_overview.textile commit 9bb4850 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-12 14:47:15 -0300 Use the SynchronousQueue as default in production and development. We should not let the users use the ThreadedConsumer without know about the risks M railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt M railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt M railties/test/application/queue_test.rb commit f568280 refs/tags/v3.2.9.rc2 Merge: 924ad60 9630485 Author: Rafael Mendonça França Date: 2012-09-12 09:34:55 -0700 Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32 Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding. commit 079eed8 refs/heads/master Merge: 9a81866 110bfbc Author: Carlos Antonio da Silva Date: 2012-09-12 09:29:10 -0700 Merge pull request #7605 from revans/master Add docs to inheritance_column method, explaining how to override it to be able to use the "type" column without STI [ci skip] commit 110bfbc refs/heads/master Author: Robert Evans Date: 2012-07-06 23:53:02 -0700 Added additional comments on how to use the "type" column without single-table inheritance by overriding it in your ActiveRecord Model. M activerecord/lib/active_record/model.rb commit 1affc30 refs/heads/master Author: José Corcuera Date: 2012-09-12 10:04:29 -0500 Fix typo [ci skip] M guides/source/active_record_validations_callbacks.textile commit 9a81866 refs/heads/master Merge: d46c362 148c50b Author: Rafael Mendonça França Date: 2012-09-12 06:46:09 -0700 Merge pull request #7521 from graceliu/fix_database_url_support Fixed support for DATABASE_URL for rake db tasks commit d46c362 refs/heads/master Merge: b83e24e a28efd8 Author: Carlos Antonio da Silva Date: 2012-09-12 05:00:56 -0700 Merge pull request #7612 from arunagw/build_fix_queue Fix build Rails.queue commit b83e24e refs/heads/master Merge: e85e723 ab14392 Author: Carlos Antonio da Silva Date: 2012-09-12 04:58:19 -0700 Merge pull request #7615 from NARKOZ/patch-2 Remove '.rb' from require call commit e85e723 refs/heads/master Merge: 34b23e7 84a52c6 Author: José Valim Date: 2012-09-12 01:07:18 -0700 Merge pull request #7610 from arunagw/warning_removed_action_pack warning removed. commit ab14392 refs/heads/master Author: Nihad Abbasov Date: 2012-09-12 12:48:17 +0600 remove '.rb' from require call M activemodel/lib/active_model/validations/clusivity.rb commit a28efd8 refs/heads/master Author: Arun Agrawal Date: 2012-09-12 09:50:16 +0530 Fix build Rails.queue see 34b23e7110a3a13cf157608cefc9b5701017bf39 M actionpack/test/abstract_unit.rb commit 84a52c6 refs/heads/master Author: Arun Agrawal Date: 2012-09-12 09:27:19 +0530 warning removed. 1. Unused variable 2. possibly useless use of a variable in void context M actionpack/test/fixtures/ruby_template.rb M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit 148c50b refs/heads/master Author: Grace Liu Date: 2012-08-30 18:50:30 -0700 fixed support for DATABASE_URL for rake db tasks - added tests to confirm establish_connection uses DATABASE_URL and Rails.env correctly even when no arguments are passed in. - updated rake db tasks to support DATABASE_URL, and added tests to confirm correct behavior for these rake tasks. (Removed establish_connection call from some tasks since in those cases the :environment task already made sure the function would be called) - updated Resolver so that when it resolves the database url, it removes hash values with empty strings from the config spec (e.g. to support connection to postgresql when no username is specified). M activerecord/lib/active_record/connection_adapters/connection_specification.rb M activerecord/lib/active_record/railties/databases.rake M activerecord/lib/active_record/tasks/database_tasks.rb M activerecord/test/cases/connection_specification/resolver_test.rb M railties/CHANGELOG.md M railties/test/application/initializers/frameworks_test.rb A railties/test/application/rake/dbs_test.rb commit ad5f18e refs/heads/master Author: Marc-Andre Lafortune Date: 2012-09-11 23:05:19 -0400 Nice and easy delegation to the class M activesupport/lib/active_support/core_ext/module/delegation.rb M activesupport/test/core_ext/module_test.rb commit 1799099 refs/heads/master Merge: ae3965b 6639ef8 Author: Gareth Rees Date: 2012-09-11 17:12:10 -0700 Merge pull request #113 from lifo/gr-flash-output Ran the generators and had no further changes. Merging. commit 34b23e7 refs/heads/master Author: Santiago Pastorino Date: 2012-09-10 12:52:19 -0700 Action Mailer async flag is true by default using a Synchronous impl D actionmailer/lib/action_mailer/async.rb M actionmailer/lib/action_mailer/base.rb A actionmailer/lib/action_mailer/queued_message.rb M actionmailer/test/abstract_unit.rb M actionmailer/test/base_test.rb M actionmailer/test/mailers/async_mailer.rb M guides/source/action_mailer_basics.textile M railties/lib/rails/application/configuration.rb M railties/lib/rails/generators/rails/app/templates/config/application.rb M railties/lib/rails/queueing.rb commit 6639ef8 refs/heads/master Author: Gareth Rees Date: 2012-09-11 22:52:58 +0100 More concise flash output M guides/source/action_controller_overview.textile commit b4b5971 refs/heads/master Merge: f2a44ad 5b7cfc5 Author: Aaron Patterson Date: 2012-09-11 14:29:07 -0700 Merge pull request #7601 from jrochkind/connection_pool_unify_exceptions ConnectionPool, unify exceptions, ConnectionTimeoutError commit 3da275c refs/heads/master Author: beerlington Date: 2012-09-11 14:11:51 -0400 Accept belongs_to assoc. keys in ActiveRecord queries Allows you to specify the model association key in a belongs_to relationship instead of the foreign key. The following queries are now equivalent: Post.where(:author_id => Author.first) Post.where(:author => Author.first) PriceEstimate.where(:estimate_of_type => 'Treasure', :estimate_of_id => treasure) PriceEstimate.where(:estimate_of => treasure) M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/predicate_builder.rb M activerecord/lib/active_record/relation/query_methods.rb M activerecord/test/cases/relation/where_test.rb M activerecord/test/models/treasure.rb M activerecord/test/schema/schema.rb M guides/source/active_record_querying.textile commit f2a44ad refs/heads/master Merge: 616ba15 df9e135 Author: Carlos Antonio da Silva Date: 2012-09-11 10:59:50 -0700 Merge pull request #7564 from kennyj/using_mysqldump Use mysqldump native commands when rake db:structure:dump. Closes #5547 Fixes database tasks config to use encoding instead of charset. commit df9e135 refs/heads/master Author: kennyj Date: 2012-09-12 02:54:56 +0900 Use configuration['encoding'], because database configuration use not charset but encoding. M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/tasks/mysql_rake_test.rb commit ccc6910 refs/heads/master Author: kennyj Date: 2012-09-08 00:02:29 +0900 Use native mysqldump command for 'rake db:structure:dump'. M activerecord/CHANGELOG.md M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/tasks/mysql_rake_test.rb commit 9630485 refs/tags/v3.2.9.rc2 Author: kennyj Date: 2012-09-12 01:37:18 +0900 Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding. M activerecord/CHANGELOG.md M activerecord/lib/active_record/railties/databases.rake commit 5b7cfc5 refs/heads/master Author: Jonathan Rochkind Date: 2012-09-11 10:38:27 -0400 ConnectionPool, unify exceptions, ConnectionTimeoutError As a result of different commits, ConnectionPool had become of two minds about exceptions, sometimes using PoolFullError and sometimes using ConnectionTimeoutError. In fact, it was using ConnectionTimeoutError internally, but then recueing and re-raising as a PoolFullError. There's no reason for this bifurcation, standardize on ConnectionTimeoutError, which is the rails2 name and still accurately describes semantics at this point. History In Rails2, ConnectionPool raises a ConnectionTimeoutError if it can't get a connection within timeout. Originally in master/rails3, @tenderlove had planned on removing wait/blocking in connectionpool entirely, at that point he changed exception to PoolFullError. But then later wait/blocking came back, but exception remained PoolFullError. Then in 02b233556377 pmahoney introduced fair waiting logic, and brought back ConnectionTimeoutError, introducing the weird bifurcation. ConnectionTimeoutError accurately describes semantics as of this point, and is backwards compat with rails2, there's no reason for PoolFullError to be introduced, and no reason for two different exception types to be used internally, no reason to rescue one and re-raise as another. Unify! M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb M activerecord/test/cases/connection_pool_test.rb commit 616ba15 refs/heads/master Merge: 8295663 844ea9c Author: Rafael Mendonça França Date: 2012-09-11 06:15:08 -0700 Merge pull request #7488 from needfeed/master Have rails dbconsole pass sslca to the mysql command line client. commit 8295663 refs/heads/master Merge: db17046 1e554a6 Author: Carlos Antonio da Silva Date: 2012-09-11 04:35:27 -0700 Merge pull request #7569 from skorfmann/improve-has-many-through-exception-message Improve exception message for HasManyThroughAssociationPolymorphicSourceError commit db17046 refs/heads/master Merge: b2063f2 ab7ae68 Author: Rafael Mendonça França Date: 2012-09-10 23:20:12 -0700 Merge pull request #7594 from guilleiguaran/rb-template-handler Add .rb template handler commit ab7ae68 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-11 01:08:40 -0500 Add .rb template handler This handler simply allows arbitrary Ruby code as a template M actionpack/CHANGELOG.md M actionpack/lib/action_view/template/handlers.rb A actionpack/test/fixtures/ruby_template.rb M actionpack/test/template/render_test.rb commit b2063f2 refs/heads/master Merge: 416884c 5510666 Author: Rafael Mendonça França Date: 2012-09-10 14:15:09 -0700 Merge pull request #7586 from route/precompile-should-not-fail-quietly Rake assets:precompile shouldn't fail quietly. commit 5510666 refs/heads/master Author: Dmitry Vorotilin Date: 2012-09-11 00:58:48 +0400 Rake assets:precompile shouldn't fail quietly. We should show to user original issue if rake task will be aborted. M railties/test/application/assets_test.rb commit 844ea9c refs/heads/master Author: needfeed Date: 2012-09-10 12:36:49 -0700 Support MySQL SSL in rails dbconsole. M railties/CHANGELOG.md M railties/lib/rails/commands/dbconsole.rb commit 416884c refs/heads/master Merge: 43d312a f11fc73 Author: José Valim Date: 2012-09-10 12:03:32 -0700 Merge pull request #7592 from bogdan/callbacks-changelog Revert "Changelog entry for PR #7560" commit f11fc73 refs/heads/master Author: Bogdan Gusiev Date: 2012-09-10 21:57:57 +0300 Revert "Changelog entry for PR #7560" This reverts commit ca80067bbe4662c60b933188ad3769605742e812. Entry already added in 895233 M activesupport/CHANGELOG.md commit 43d312a refs/heads/master Merge: 7b2363f ca80067 Author: José Valim Date: 2012-09-10 11:42:07 -0700 Merge pull request #7591 from bogdan/callbacks-changelog Changelog entry for PR #7560 commit ca80067 refs/heads/master Author: Bogdan Gusiev Date: 2012-09-10 21:38:12 +0300 Changelog entry for PR #7560 M activesupport/CHANGELOG.md commit 7b2363f refs/heads/master Merge: be8685d 48498da Author: Rafael Mendonça França Date: 2012-09-10 08:51:25 -0700 Merge pull request #7432 from kennyj/fix_annoy_warning Suppress annoy warning, when executing AR's testcases. commit 48498da refs/heads/master Author: kennyj Date: 2012-09-11 00:42:21 +0900 Remove expired comment. This method is used from other place. M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb commit a3024f8 refs/heads/master Author: kennyj Date: 2012-09-11 00:15:29 +0900 Fix annoy warning, when executing testcase. M activerecord/test/cases/helper.rb A activerecord/test/support/mysql.rb commit ae3965b refs/heads/master Author: Francesco Rodriguez Date: 2012-09-09 23:31:18 -0500 fix punctuation in Getting Started prologue [ci skip] M guides/source/getting_started.textile commit 1e554a6 refs/heads/master Author: Sebastian Korfmann Date: 2012-09-08 09:09:48 +1000 Improve exception message for HasManyThroughAssociationPolymorphicSourceError Exception message was misleading, as it is possible to have a polymorphic 'has_many :through' join model. M activerecord/lib/active_record/associations.rb commit 924ad60 refs/tags/v3.2.9.rc2 Merge: 146eaf3 652107e Author: Rafael Mendonça França Date: 2012-09-09 13:19:39 -0700 Merge pull request #7582 from tchandy/fix_type_cast_code type_cast_code should always convert values to integer calling #to_i commit 652107e refs/tags/v3.2.9.rc2 Author: Thiago Pradi Date: 2012-09-02 18:56:45 -0300 ConnectionAdapters::Column.type_cast_code should always convert values to integer calling #to_i M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/associations/belongs_to_associations_test.rb M activerecord/test/cases/column_test.rb commit be8685d refs/heads/master Merge: cfbd73c 6b2a24c Author: Carlos Antonio da Silva Date: 2012-09-09 06:57:28 -0700 Merge pull request #7513 from kalys/master ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers. commit 6b2a24c refs/heads/master Author: Kalys Osmonov Date: 2012-09-03 15:42:24 +0600 ' dates back to SGML when ' was introduced in HTML 4.0 M actionpack/test/template/erb_util_test.rb M actionpack/test/template/form_options_helper_test.rb M actionpack/test/template/form_tag_helper_test.rb M actionpack/test/template/javascript_helper_test.rb M actionpack/test/template/text_helper_test.rb M actionpack/test/template/url_helper_test.rb M activesupport/CHANGELOG.md M activesupport/lib/active_support/core_ext/string/output_safety.rb M activesupport/test/core_ext/string_ext_test.rb M railties/test/application/assets_test.rb commit cfbd73c refs/heads/master Author: Vijay Dev Date: 2012-09-09 17:39:37 +0530 indent fix [ci skip] M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb commit cb524dc refs/heads/master Merge: 6107407 2db79dc Author: Vijay Dev Date: 2012-09-09 17:38:47 +0530 Merge branch 'master' of github.com:lifo/docrails Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb commit 2db79dc refs/heads/master Author: Vijay Dev Date: 2012-09-09 17:25:09 +0530 minor fixes and edits [ci skip] M guides/source/action_mailer_basics.textile M guides/source/active_record_querying.textile M guides/source/caching_with_rails.textile M guides/source/debugging_rails_applications.textile M guides/source/form_helpers.textile commit 6107407 refs/heads/master Merge: aee9b6a a79f8bd Author: José Valim Date: 2012-09-09 00:52:50 -0700 Merge pull request #7580 from spohlenz/mounted-url-helper-ivars Use internal instance variable naming scheme for mounted URL helpers commit aee9b6a refs/heads/master Merge: 5d264f2 b7a695c Author: Rafael Mendonça França Date: 2012-09-09 00:03:54 -0700 Merge pull request #7571 from arunagw/warning_removed_shadowing removed warning: shadowing outer local variable commit a79f8bd refs/heads/master Author: Sam Pohlenz Date: 2012-09-09 16:29:21 +0930 Use internal instance variable naming scheme for mounted URL helper proxies M actionpack/lib/action_dispatch/routing/route_set.rb M actionpack/test/dispatch/prefix_generation_test.rb commit b7a695c refs/heads/master Author: Arun Agrawal Date: 2012-09-08 12:41:42 +0530 removed warning: shadowing outer local variable M activerecord/lib/active_record/railtie.rb commit 5d264f2 refs/heads/master Merge: f629660 4f107da Author: Carlos Antonio da Silva Date: 2012-09-08 14:51:53 -0700 Merge pull request #7548 from ernie/missing-attributes-query-fix Raise MissingAttributeError on query methods commit 4f107da refs/heads/master Author: Ernie Miller Date: 2012-09-06 15:39:42 -0400 Raise MissingAttributeError on query methods When calling a query method on an attribute that was not selected by an ActiveRecord query, an ActiveModel::MissingAttributeError is not raised. Instead, a nil value is returned, which will return false once cast to boolean. This is undesirable, as we should not give the impression that we know the attribute's boolean value when we haven't loaded the attribute's (possibly) non-boolean value from the database. This issue is present on versions going back as far as 2.3, at least. M activerecord/CHANGELOG.md M activerecord/lib/active_record/attribute_methods/query.rb M activerecord/test/cases/finder_test.rb commit f629660 refs/heads/master Merge: 0617808 8cbd563 Author: Rafael Mendonça França Date: 2012-09-08 13:00:46 -0700 Merge pull request #7577 from frodsan/fix_ap_response set default_headers to nil after use it to avoid order dependent tests commit 8cbd563 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-08 14:51:22 -0500 set default_headers to nil after use it to avoid order dependent tests M actionpack/test/dispatch/response_test.rb commit 0617808 refs/heads/master Merge: c242f6b 6701bb0 Author: Rafael Mendonça França Date: 2012-09-08 12:07:43 -0700 Merge pull request #7576 from prijutme4ty/fix_require_necessary_for_generating_guides Fixed missing require commit 6701bb0 refs/heads/master Author: Ilya Vorontsov Date: 2012-09-08 22:45:48 +0400 Fixed missing require Missing require caused fail of guide generation (in action_dispatch/http/mime_type, line 295, undefined method `ends_with` for "to_ary":String) With this fix guides were normally generated M actionpack/lib/action_dispatch/http/mime_type.rb commit decf4a1 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-08 13:23:52 -0500 add :nodoc: to AR::Store::IndifferentCoder [ci skip] M activerecord/lib/active_record/store.rb commit 56652a6 refs/heads/master Author: Francesco Rodriguez Date: 2012-09-08 13:10:40 -0500 add note about using block form of unscoped in AR Querying guide [ci skip] M guides/source/active_record_querying.textile commit c242f6b refs/heads/master Merge: 7b31a43 65ce6fb Author: Rafael Mendonça França Date: 2012-09-08 09:39:42 -0700 Merge pull request #7574 from frodsan/chlog_ar improve AR CHANGELOG [ci skip] commit 65ce6fb refs/heads/master Author: Francesco Rodriguez Date: 2012-09-08 11:34:22 -0500 improve AR CHANGELOG [ci skip] M activerecord/CHANGELOG.md commit 7b31a43 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-08 09:15:49 -0300 Tidy up excerpt separator logic a bit M actionpack/lib/action_view/helpers/text_helper.rb commit aaa33e6 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-08 09:07:07 -0300 Improve latest AR and AP changelog entries M actionpack/CHANGELOG.md M activerecord/CHANGELOG.md commit 1383445 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-08 08:40:17 -0300 Refactor some date helpers to use merge! Also just set the hash value instead of merging when it's only one key. M actionpack/lib/action_view/helpers/date_helper.rb commit 0801f6a refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-08 08:32:02 -0300 Refactor nested attributes limit logic to lookup :limit option only once M activerecord/lib/active_record/nested_attributes.rb commit bf27f6b refs/heads/master Merge: 6373027 963c50e Author: Carlos Antonio da Silva Date: 2012-09-08 05:02:18 -0700 Merge pull request #7189 from GCorbel/excerpt_with_separation Add a separator option for the excerpt function. commit 963c50e refs/heads/master Author: Guirec Corbel Date: 2012-07-28 17:34:36 -0400 Add a separation option for the excerpt function The separation option enable to keep entire words, lines or anything. To split by line, like github, we can set the separation option as \n. To split by word, like google, we can set the separation option as " ". The radius option represent the number of lines or words we want to have in the result. The default behaviour is the same. If we don't set the separation option, it split the text any where. M actionpack/CHANGELOG.md M actionpack/lib/action_view/helpers/text_helper.rb M actionpack/test/template/text_helper_test.rb commit 6373027 refs/heads/master Merge: 68ca549 b485b8a Author: Carlos Antonio da Silva Date: 2012-09-08 04:16:58 -0700 Merge pull request #7566 from etehtsea/schema-new-hash Dump schema using new style hash commit 68ca549 refs/heads/master Merge: f415475 e282a0a Author: Carlos Antonio da Silva Date: 2012-09-08 04:13:57 -0700 Merge pull request #7568 from alup/master Tests for session handling commit e282a0a refs/heads/master Author: Andreas Loupasakis Date: 2012-09-08 02:00:28 +0300 Add integration tests for reset_session in cookie store M actionpack/test/dispatch/session/cookie_store_test.rb commit 207bad4 refs/heads/master Author: Andreas Loupasakis Date: 2012-09-08 00:57:01 +0300 Add test for clear in ActionDispatch::Request::Session M actionpack/test/dispatch/request/session_test.rb commit b485b8a refs/heads/master Author: Konstantin Shabanov Date: 2012-09-07 22:27:08 +0400 Dump schema using new style hash M activerecord/CHANGELOG.md M activerecord/lib/active_record/schema.rb M activerecord/lib/active_record/schema_dumper.rb M activerecord/test/cases/schema_dumper_test.rb M guides/source/migrations.textile commit 065fcfb refs/heads/master Author: Jonathan Roes Date: 2012-09-07 16:17:27 -0400 Fix a bunch of typos, reword some things for clarity. M guides/source/engines.textile commit f415475 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 15:27:05 -0300 Add changelog entry for #7545: map interval with precision to string Merged in f41dba27a411fe3e2ddeb8d9ab6856dbb23acd02 [ci skip] M activerecord/CHANGELOG.md commit f41dba2 refs/heads/master Merge: ec39055 319482d Author: Aaron Patterson Date: 2012-09-07 11:07:09 -0700 Merge pull request #7545 from senny/7518_postgres_type_detection postgres, map scaled intervals to string datatype commit 6033d2c refs/heads/master Author: 1334 <1334@shadowproject.net> Date: 2012-09-07 19:47:26 +0200 Fix a typo M guides/source/form_helpers.textile commit ec39055 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 14:31:49 -0300 Minor refactor in ActiveRecord#initialize_dup * There is no need to delete the primary key from cloned attributes, since it sets the same pk to nil afterwards. * Check for empty? instead of any? to run initialize callbacks. M activerecord/lib/active_record/attribute_methods/query.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/sanitization.rb commit e371c66 refs/heads/master Merge: c24c885 9c0ab33 Author: Carlos Antonio da Silva Date: 2012-09-07 10:30:23 -0700 Merge pull request #7565 from guilleiguaran/dalli-session-store Improve error message for memcache session store when dalli isn't loaded commit c24c885 refs/heads/master Author: Aaron Patterson Date: 2012-08-28 11:59:45 -0700 create a transaction object and point AR objects at that object during a transaction. M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb M activerecord/lib/active_record/core.rb M activerecord/lib/active_record/transactions.rb commit 9c0ab33 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-07 12:15:31 -0500 Improve error message for memcache session store when dalli isn't loaded in app M actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb commit 146eaf3 refs/tags/v3.2.9.rc2 Author: Carlos Antonio da Silva Date: 2012-09-07 13:37:04 -0300 Fix AS tests due to builder change with nil values / empty strings Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. M activesupport/test/core_ext/hash_ext_test.rb commit 77dd3be refs/tags/v3.2.9.rc2 Author: Carlos Antonio da Silva Date: 2012-09-07 13:31:27 -0300 Fix AR tests due to builder change with nil values / empty strings Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. M activerecord/test/cases/xml_serialization_test.rb commit f24a551 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 13:37:04 -0300 Fix AS tests due to builder change with nil values / empty strings Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. M activesupport/test/core_ext/hash_ext_test.rb commit ba4a6c2 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 13:31:27 -0300 Fix AR tests due to builder change with nil values / empty strings Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. M activerecord/test/cases/xml_serialization_test.rb commit d65adc7 refs/tags/v3.2.9.rc2 Author: Carlos Antonio da Silva Date: 2012-09-07 13:08:30 -0300 Update Active Model xml serialization test to reflect a change in builder Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: It generates this: Document this change in Rails so that people can track it down easily if necessary. Conflicts: activemodel/CHANGELOG.md M activemodel/CHANGELOG.md M activemodel/test/cases/serializers/xml_serialization_test.rb commit 6d4bb90 refs/heads/master Author: José Corcuera Date: 2012-09-07 11:17:59 -0500 default scope should return an ActiveRecord::Relation [ci skip] M guides/source/active_record_querying.textile commit 29fe065 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 13:13:39 -0300 Bump builder dependencies in Active Model and Action Pack M actionpack/actionpack.gemspec M activemodel/activemodel.gemspec commit 0180e09 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 13:08:30 -0300 Update Active Model xml serialization test to reflect a change in builder Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: It generates this: Document this change in Rails so that people can track it down easily if necessary. M activemodel/CHANGELOG.md M activemodel/test/cases/serializers/xml_serialization_test.rb commit 4d33481 refs/heads/master Author: José Corcuera Date: 2012-09-07 10:24:24 -0500 How to use default_scope as a class method M guides/source/active_record_querying.textile commit a203530 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 11:17:37 -0300 Use merge! to merge additional options onto default options M actionpack/lib/action_controller/metal/conditional_get.rb commit dcc68fa refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 11:11:00 -0300 Fix Active Support changelog formatting [ci skip] M activesupport/CHANGELOG.md commit ae516f6 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 11:06:50 -0300 Remove 3.2.x entries from Active Record changelog [ci skip] Since 810a50dacf9ddddc1d59c1cb350e8ce785c8bf85, the new policy is to keep old changelogs in their own branches, to avoid manual syncing across different branches. Please check that commit for more reasoning about the new policy. M activerecord/CHANGELOG.md commit d8fbfee refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 11:05:58 -0300 Add Changelog entry for #4976: fix eager load associations without pks [ci skip] M activerecord/CHANGELOG.md commit 8952339 refs/heads/master Author: Carlos Antonio da Silva Date: 2012-09-07 11:03:07 -0300 Add Changelog entry for #7560: deprecate #filter in AS::Callbacks [ci skip] M activesupport/CHANGELOG.md commit 35a8920 refs/heads/master Merge: c5ac6da f6f4066 Author: Santiago Pastorino Date: 2012-09-07 06:52:06 -0700 Merge pull request #7552 from guilleiguaran/dalli-session-store Use Dalli for memcache session store commit c5ac6da refs/heads/master Merge: e20a790 6777f7b Author: José Valim Date: 2012-09-07 05:13:42 -0700 Merge pull request #7560 from bogdan/deprecate_callbacks_monkeypatch AS::Callbacks: deprecate monkey patch of object callbacks commit 6777f7b refs/heads/master Author: Bogdan Gusiev Date: 2012-09-07 14:42:31 +0300 AS::Callbacks: deprecate monkey patch of object callbacks M actionpack/lib/action_controller/caching/actions.rb M actionpack/test/controller/filters_test.rb M activesupport/lib/active_support/callbacks.rb commit fce0d08 refs/heads/master Author: Anatoly Makarevich Date: 2012-09-07 14:56:23 +0400 Added forgotten :message option to ActiveModel validates documentation M activemodel/lib/active_model/validations/validates.rb commit e20a790 refs/heads/master Merge: 1c1f654 07dad77 Author: Jon Leighton Date: 2012-09-07 02:11:21 -0700 Merge pull request #4976 from kreynolds/fix_eager_without_pkey Fix eagerly loading associations without primary keys commit bf15169 refs/heads/master Merge: fd6b9f3 d881e2f Author: cnaize Date: 2012-09-07 00:06:11 -0700 Merge pull request #112 from cnaize/master extended example commit d881e2f refs/heads/master Author: cnaize Date: 2012-09-07 10:34:05 +0400 extended example M guides/source/i18n.textile commit 1c1f654 refs/heads/master Author: Aaron Patterson Date: 2012-09-06 16:39:13 -0700 fix tests on Ruby 2.0.0 M actionpack/lib/action_view/routing_url_for.rb commit f6f4066 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-06 18:09:07 -0500 Dalli doesn't support autoloading of unloaded classes M actionpack/test/dispatch/session/mem_cache_store_test.rb commit 032da37 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-06 17:45:51 -0500 Use dalli 2.2.1 or prior to fix failing tests in memcache session store M Gemfile commit 7bed3ab refs/heads/master Author: Arun Agrawal Date: 2012-08-27 09:46:52 +0530 More fixes for action pack tests with Dalli. M actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb commit dd62069 refs/heads/master Author: Arun Agrawal Date: 2012-08-27 09:46:35 +0530 Let's run action pack tests with Dalli There is no memcache gem left in repo. M actionpack/test/dispatch/session/mem_cache_store_test.rb commit fd6b9f3 refs/heads/master Author: Aditya Sanghi Date: 2012-09-07 02:02:33 +0530 Added information about dynamic delivery options to action mailer guides M guides/source/action_mailer_basics.textile commit 817a20b refs/heads/master Merge: e9f5b82 75dc195 Author: Carlos Antonio da Silva Date: 2012-09-06 13:27:53 -0700 Merge pull request #7549 from asanghi/master Fix Changelog example in Action Mailer [ci skip] commit e9f5b82 refs/heads/master Merge: 75bde02 db8460c Author: Carlos Antonio da Silva Date: 2012-09-06 13:26:01 -0700 Merge pull request #7550 from sikachu/master-changelog Update Active Record CHANGELOG for #7419 [ci skip] commit db8460c refs/heads/master Author: Prem Sichanugrist Date: 2012-09-06 16:16:03 -0400 Update Active Record CHANGELOG for #7419 M activerecord/CHANGELOG.md commit d016dec refs/heads/master Author: Aditya Sanghi Date: 2012-09-07 01:47:27 +0530 Dynamic Delivery Method Options M guides/source/4_0_release_notes.textile commit 75dc195 refs/heads/master Author: Aditya Sanghi Date: 2012-09-07 01:39:27 +0530 fix bad changelog example M actionmailer/CHANGELOG.md commit 75bde02 refs/heads/master Merge: e8c9f05 d965bbf Author: José Valim Date: 2012-09-06 13:03:09 -0700 Merge pull request #7419 from releu/fix-invalid-filename-migration-generator Ensure valid migration filename on generating migration commit d965bbf refs/heads/master Author: Jan Bernacki Date: 2012-08-22 14:50:41 +0400 add mini-validator on creating migration move validation to AR M activerecord/lib/rails/generators/active_record/migration/migration_generator.rb M railties/test/generators/migration_generator_test.rb commit 319482d refs/heads/master Author: Yves Senn Date: 2012-09-05 13:06:28 +0200 postgres, map scaled intervals to string datatype (#7518) M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/datatype_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit 150c6dc refs/heads/master Author: Semyon Perepelitsa Date: 2012-09-06 23:23:05 +0800 Redirect block with arity of 1 is deprecated. M guides/source/routing.textile commit e8c9f05 refs/heads/master Merge: 2ed325a 8b0d5bf Author: José Valim Date: 2012-09-06 07:26:39 -0700 Merge pull request #7542 from aaronrenner/patch-2 Fixed around callback with lambda example commit b883595 refs/heads/master Author: Aaron Renner Date: 2012-09-06 08:25:58 -0600 Fixed non-working around callback example M activesupport/lib/active_support/callbacks.rb commit 8b0d5bf refs/heads/master Author: Aaron Renner Date: 2012-09-06 08:21:47 -0600 Fixed around callback with lambda example This is a follow up to issue #7535 M activesupport/lib/active_support/callbacks.rb commit 2ed325a refs/heads/master Author: Xavier Noria Date: 2012-09-06 14:00:45 +0200 we already have the module objects, do not constantize I have also chosen a variable name that matches the parameter in the definition of load_missing_constant. M activesupport/lib/active_support/dependencies.rb commit 021cb85 refs/heads/master Author: Xavier Noria Date: 2012-09-06 13:43:49 +0200 restores awesome comment Those who say source code should be without comments lie. M activesupport/lib/active_support/dependencies.rb commit 3ee191f refs/heads/master Author: Xavier Noria Date: 2012-09-06 13:31:28 +0200 no more const_missing combinatorics Basically, const_missing had a loop to try parent namespaces if the constant lookup failed, but at the same time delegated to load_missing_constant which in turn also walks up parent namespaces calling const_missing by hand. In the case of missing constants this results in repeated work in some funky nested way. M activesupport/lib/active_support/dependencies.rb commit 3c27dcc refs/heads/master Merge: 4fa2f10 8fc8763 Author: José Valim Date: 2012-09-06 03:36:19 -0700 Merge pull request #7397 from asanghi/master Allow delivery method options to be set per mail instance commit 4fa2f10 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-05 23:53:10 -0300 Put the create_table block in a transaction. This will solve the issue that abort the connection transaction when we skip the tests. M activerecord/test/cases/adapters/postgresql/json_test.rb commit a690935 refs/heads/master Merge: ddaeaef 3b516b5 Author: Rafael Mendonça França Date: 2012-09-05 18:58:05 -0700 Merge pull request #7527 from guedes/pg9.2_json_support AR supporting new JSON data type on PostgreSQL >= 9.2 commit 3b516b5 refs/heads/master Author: Dickson S. Guedes Date: 2012-09-05 14:01:21 -0300 ActiveRecord support to PostgreSQL 9.2 JSON type This implements the support to encode/decode JSON data to/from database and creating columns of type JSON using a native type [1] supported by PostgreSQL from version 9.2. [1] http://www.postgresql.org/docs/9.2/static/datatype-json.html M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/lib/active_record/connection_adapters/postgresql/cast.rb M activerecord/lib/active_record/connection_adapters/postgresql/oid.rb M activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb A activerecord/test/cases/adapters/postgresql/json_test.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/schema/postgresql_specific_schema.rb commit c9d1ba4 refs/heads/master Author: schneems Date: 2012-09-05 15:51:20 -0700 Doc: sweepers only work on Active Record Models In response to this rails issue: https://github.com/rails/rails/issues/3729 M actionpack/lib/action_controller/caching/sweeping.rb M guides/source/caching_with_rails.textile commit ddaeaef refs/heads/master Author: Rafael Mendonça França Date: 2012-09-05 19:38:54 -0300 Add CHANGELOG entry for #7532 [ci skip] M activerecord/CHANGELOG.md commit 2197d61 refs/heads/master Merge: ebc4d8c 20f943f Author: Rafael Mendonça França Date: 2012-09-05 15:33:48 -0700 Merge pull request #7532 from al2o3cr/fix_store_bugs correct handling of changes in AR::Store, combine multiple store_accessors commit ebc4d8c refs/heads/master Merge: fdcbc56 c7d752f Author: Rafael Mendonça França Date: 2012-09-05 15:30:01 -0700 Merge pull request #7536 from pivotal/fix_pluck_with_reserved_words Fix pluck when columns/tables are reserved words. commit c7d752f refs/heads/master Author: Ian Lesperance Date: 2012-09-05 18:00:07 -0400 Fix pluck when columns/tables are reserved words. M activerecord/CHANGELOG.md M activerecord/lib/active_record/relation/calculations.rb M activerecord/test/cases/calculations_test.rb A activerecord/test/models/possession.rb M activerecord/test/schema/schema.rb commit fdcbc56 refs/heads/master Merge: 1c8539d ece23b5 Author: Rafael Mendonça França Date: 2012-09-05 14:48:19 -0700 Merge pull request #7525 from seamusabshere/use-mysql-binary-for-rake-db-structure-load Use the 'mysql' binary for 'rake db:structure:load' commit 2c96638 refs/heads/master Author: Andreas Loupasakis Date: 2012-09-06 00:46:52 +0300 Fix a typo M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb commit 1c8539d refs/heads/master Author: Rafael Mendonça França Date: 2012-09-05 14:38:16 -0300 Define just the cattr_reader. This will trim down the API and avoid some error that can be made changing the cache object. M actionpack/lib/action_view/digestor.rb commit d8dee21 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-05 13:51:24 -0300 Use the same logger that ActionView::Base for the Digestor M actionpack/lib/action_view/digestor.rb M actionpack/test/template/digestor_test.rb commit 75857d0 refs/heads/master Author: Aldo "xoen" Giambelluca Date: 2012-09-05 18:32:47 +0200 Fixed array wrongly translated in footnote in a guide [ci skip] In the sentence "If @post.author_ids is [1], this would ..." the array [1] is converted in a footnote, fixed this using . M guides/source/action_view_overview.textile commit ece23b5 refs/heads/master Author: Seamus Abshere Date: 2012-09-04 18:46:05 -0500 Use the 'mysql' binary for 'rake db:structure:load'. The previous implementation had the strange requirement that db/structure.sql contain only CREATE TABLE sql statements, one per table, separated by double newlines. SQLite3 and PostgreSQL database tasks, on the other hand, simply spawn 'sqlite3' and 'psql' binaries to load the file directly. The new implementation follows this and attempts to respect all current MySQL configuration settings. M activerecord/lib/active_record/tasks/mysql_database_tasks.rb M activerecord/test/cases/tasks/mysql_rake_test.rb commit 20f943f refs/heads/master Author: Matt Jones Date: 2012-09-05 11:01:26 -0400 correctly flag changed attributes in AR::Store, combine multiple calls to store_accessor M activerecord/lib/active_record/store.rb M activerecord/test/cases/store_test.rb M activerecord/test/models/admin/user.rb commit baa73ac refs/heads/master Author: Ryan Bigg Date: 2012-09-05 15:41:44 +0100 Add giant belongs_to 'please don't pluralize me' note I've personally seen too many newbies get this wrong and pluralize the association M guides/source/association_basics.textile commit a227359 refs/heads/master Author: Rafael Mendonça França Date: 2012-09-05 11:05:50 -0300 Remove unneeded requires We should not require all the core extensions inside the frameworks. The logger is already defined in the Action View framework. M actionpack/lib/action_view/digestor.rb commit 5054e26 refs/tags/v3.2.9.rc2 Author: Rafael Mendonça França Date: 2012-09-05 06:26:53 -0700 Merge pull request #7337 from adzap/string_to_dummy_time Fix for time type columns with invalid time value Conflicts: activerecord/CHANGELOG.md M activerecord/CHANGELOG.md M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/base_test.rb commit 91183ba refs/heads/master Merge: 9e0a14f acf583a Author: Rafael Mendonça França Date: 2012-09-05 06:26:53 -0700 Merge pull request #7337 from adzap/string_to_dummy_time Fix for time type columns with invalid time value commit 9e0a14f refs/heads/master Merge: 08c4eb5 232d222 Author: Rafael Mendonça França Date: 2012-09-05 06:03:09 -0700 Merge pull request #7447 from etehtsea/postgresql-adapter Modularize postgresql adapter commit acf583a refs/heads/master Author: Adam Meehan Date: 2012-09-05 21:05:25 +1000 Update changelog with time column type casting fix M activerecord/CHANGELOG.md commit ce7cdb9 refs/heads/master Author: Adam Meehan Date: 2012-08-12 20:26:17 +1000 Fix for time type columns with invalid time The string_to_dummy_time method was blindly parsing the dummy time string with Date._parse which returns a hash for the date part regardless of whether the time part is an invalid time string. M activerecord/lib/active_record/connection_adapters/column.rb M activerecord/test/cases/base_test.rb commit 08c4eb5 refs/heads/master Merge: ac5089d dc69220 Author: Xavier Noria Date: 2012-09-05 02:49:28 -0700 Merge pull request #7530 from robin850/master Fix a typo in AD commit dc69220 refs/heads/master Author: Robin Dupret Date: 2012-09-05 12:30:09 +0300 Fix a typo M actionpack/lib/action_dispatch/testing/integration.rb commit 232d222 refs/heads/master Author: Konstantin Shabanov Date: 2012-08-26 00:20:34 +0700 Modularize postgresql adapter A activerecord/lib/active_record/connection_adapters/postgresql/cast.rb A activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb A activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb A activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb A activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb M activerecord/test/cases/adapters/postgresql/active_schema_test.rb commit ac5089d refs/heads/master Merge: 7995c03 edab820 Author: Rafael Mendonça França Date: 2012-09-04 17:07:17 -0700 Merge pull request #7519 from leocassarani/merge-with-block Add an optional block to HashWithIndifferentAccess#update and #merge commit edab820 refs/heads/master Author: Leo Cassarani Date: 2012-09-03 23:13:49 +0100 Extend HashWithIndifferentAccess#update to take an optional block When a block is passed into the method, it will be invoked for each duplicated key, with the key in question and the two values as arguments. The value for the duplicated key in the receiver will be set to the return value of the block. This behaviour matches Ruby's long-standing implementation of Hash#update and is intended to provide a more consistent interface. HashWithIndifferentAccess#merge is also affected by the change, as it uses #update internally. M activesupport/CHANGELOG.md M activesupport/lib/active_support/hash_with_indifferent_access.rb M activesupport/test/core_ext/hash_ext_test.rb commit 7995c03 refs/heads/master Merge: a497bed 6972313 Author: Rafael Mendonça França Date: 2012-09-04 15:56:29 -0700 Merge pull request #7522 from lexmag/mime_type Refactor `Mime::Type` commit 6972313 refs/heads/master Author: Aleksey Magusev Date: 2012-09-03 00:40:49 +0400 Refactor `Mime::Type` `parse` method performance improvements - ~27-33%: accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, , pronto/1.00.00, sslvpn/1.00.00.00, */*" Benchmark.measure{ 1_000_0.times { Mime::Type.parse(accept) }} old: 1.430000 0.000000 1.430000 ( 1.440977) new: 0.920000 0.000000 0.920000 ( 0.921813) M actionpack/lib/action_dispatch/http/mime_type.rb M actionpack/test/dispatch/mime_type_test.rb commit a497bed refs/heads/master Author: David Heinemeier Hansson Date: 2012-09-04 17:29:00 -0500 We dont need to include the name and the format in the digest -- source is authoritative enough M actionpack/lib/action_view/digestor.rb commit 8fc8763 refs/heads/master Author: Aditya Sanghi Date: 2012-08-20 18:52:12 +0530 Allow delivery method options to be set per mail instance M actionmailer/CHANGELOG.md M actionmailer/lib/action_mailer/base.rb M actionmailer/lib/action_mailer/delivery_methods.rb M actionmailer/test/delivery_methods_test.rb commit 27acd1e refs/heads/master Merge: 5388fee 05136e5 Author: David Heinemeier Hansson Date: 2012-09-04 08:28:24 -0700 Merge pull request #7422 from ernie/improvements-to-improved-routing Allow routing concerns to accept a callable commit 1cb684c refs/heads/master Author: Konstantin Haase Date: 2012-09-04 15:50:09 +0200 update caching guide: stale? can also figure out last_modified on its own M guides/source/caching_with_rails.textile commit 5388fee refs/heads/master Author: Xavier Noria Date: 2012-09-04 01:17:38 +0200 revised the exception message "Expected #{file_path} to define #{qualified_name}" Users need to know the ultimate problem here is that AS was trying to autoload a constant and it failed. M activesupport/lib/active_support/dependencies.rb commit db35420 refs/heads/master Author: Guillermo Iguaran Date: 2012-09-03 16:52:08 -0500 Update caching guide: memcache-client was replaced with dalli M guides/source/caching_with_rails.textile commit 70f147d refs/heads/master Merge: 30a8f0d 9f494a9 Author: Rafael Mendonça França Date: 2012-09-03 12:13:03 -0700 Merge pull request #7515 from senny/custom_inheritance_column_test_refactoring custom inheritance_column test refactoring commit 9f494a9 refs/heads/master Author: Yves Senn Date: 2012-09-03 20:38:14 +0200 test cleanup, remove ruby_type because it's no longer needed All tests with a custom inheritance_column use the `Vegtable` model. The field ruby_type on the Company models is no longer needed M activerecord/test/cases/attribute_methods_test.rb M activerecord/test/cases/base_test.rb M activerecord/test/cases/inheritance_test.rb M activerecord/test/cases/schema_dumper_test.rb M activerecord/test/fixtures/companies.yml M activerecord/test/models/company.rb M activerecord/test/schema/schema.rb commit 77ca281 refs/heads/master Author: Yves Senn Date: 2012-09-03 20:30:43 +0200 rewrite inheritance tests with a custom inheritance_column previously the tests with and without a custom `inheritance_column` used the same models. Since the model then has both fields this can lead to false positives. M activerecord/test/cases/inheritance_test.rb M activerecord/test/fixtures/vegetables.yml M activerecord/test/models/vegetables.rb M activerecord/test/schema/schema.rb commit 05136e5 refs/heads/master Author: Ernie Miller Date: 2012-08-26 15:37:23 -0400 Make enhanced routing Concerns more tell-don't-ask M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing/concerns_test.rb commit eb43d3d refs/heads/master Author: Ernie Miller Date: 2012-08-23 09:02:37 -0400 Fix concerns not executing block in mapper Also, add documentation for alternate usage. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/dispatch/routing/concerns_test.rb commit 4037e31 refs/heads/master Author: Ernie Miller Date: 2012-08-22 10:27:42 -0400 Allow routing concerns to accept a callable This allows us to make alterations to the generated routes based on the scope of the current mapper, and otherwise allows us to move larger blocks of concerns out of the routes file, altogether. M actionpack/lib/action_dispatch/routing/mapper.rb M actionpack/test/abstract_unit.rb M actionpack/test/dispatch/routing/concerns_test.rb commit 87ac5b4 refs/tags/v3.2.9.rc2 Merge: cabab37 01d09a6 Author: Rafael Mendonça França Date: 2012-09-03 07:38:48 -0700 Merge pull request #7514 from senny/issue_7503_3_2_stable set the configured #inheritance_column on #become (#7503) commit 01d09a6 refs/tags/v3.2.9.rc2 Author: Yves Senn Date: 2012-09-02 17:19:50 +0200 set the configured #inheritance_column on #become (#7503) I had to create a new table because I needed an STI table, which does not have both a "type" and a "custom_type" the test fails with: 1) Error: test_alt_becomes_works_with_sti(InheritanceTest): NoMethodError: undefined method `type=' for # /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes' test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti' test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti' Conflicts: activerecord/test/cases/inheritance_test.rb M activerecord/CHANGELOG.md M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/inheritance_test.rb A activerecord/test/fixtures/vegetables.yml A activerecord/test/models/vegetables.rb M activerecord/test/schema/schema.rb commit 30a8f0d refs/heads/master Merge: ebc50c5 2057495 Author: Rafael Mendonça França Date: 2012-09-03 07:12:18 -0700 Merge pull request #7506 from senny/issue_7503 #becomes works with configured inheritance_column commit 2057495 refs/heads/master Author: Yves Senn Date: 2012-09-02 17:19:50 +0200 set the configured #inheritance_column on #become (#7503) I had to create a new table because I needed an STI table, which does not have both a "type" and a "custom_type" the test fails with: 1) Error: test_alt_becomes_works_with_sti(InheritanceTest): NoMethodError: undefined method `type=' for # /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes' test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti' test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti' M activerecord/lib/active_record/persistence.rb M activerecord/test/cases/inheritance_test.rb A activerecord/test/fixtures/vegetables.yml A activerecord/test/models/vegetables.rb M activerecord/test/schema/schema.rb commit cd59277 refs/heads/master Author: Gaurish Sharma Date: 2012-09-03 19:33:59 +0530 Add section about tagged logging Tagged logging for which Rails has support since [3.2](http://guides.rubyonrails.org/3_2_release_notes.html#tagged-logging). It is trivial & useful but unless somebody explicitly searches API docs, he/she may not know about it.  Hence, I added it in guides.  M guides/source/debugging_rails_applications.textile commit 198d63f refs/heads/master Author: Anuj Dutta Date: 2012-09-03 14:44:14 +0100 Fix indenentation in comment to stop the end of comment from appearing in a 
 block.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 1052067	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-09-02 21:25:08 +0200

    Fixed validation issue and titles in Migrations guide [ci skip]
    
    Changed the title of the 3.5 chapter from "Using the change Method" to
    "When to Use the change Method" since the chapter tells the migration
    definitions supported by the change method. This fix the duplicate ID in the
    document.
    
    I've also changed some of the titles to respect the Guides guidelines.

M	guides/source/migrations.textile

commit 7715b7b	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-09-02 20:55:05 +0200

    Fixed validation issue related to taken ID in Layout and Rendering guide [ci skip]

M	guides/source/layouts_and_rendering.textile

commit 87cfb63	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-09-02 20:39:00 +0200

    Fixed validation issues in the "Configuring Rails Applications" guide [ci skip]
    
    erb tag wasn't closed well

M	guides/source/configuring.textile

commit 1b5e6fc	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-09-02 19:37:34 +0200

    Fixed validation issues related to taken IDs in AR Querying guide [ci skip]

M	guides/source/active_record_querying.textile

commit c38fe90	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-09-02 18:42:29 +0200

    Underscore in _attr_readonly method name is back (Upgrading RoR guide) [ci skip]

M	guides/source/upgrading_ruby_on_rails.textile

commit ebc50c5	refs/heads/master
Merge: 1180e0c 593fa0b
Author: Carlos Antonio da Silva 
Date:   2012-09-02 07:30:42 -0700

    Merge pull request #7502 from xoen/fixed-upgrading-guide-markup
    
    Fixed markup in Upgrading RoR guide [ci skip]

commit 1180e0c	refs/heads/master
Merge: abd47c1 410d877
Author: Carlos Antonio da Silva 
Date:   2012-09-02 07:22:31 -0700

    Merge pull request #7504 from behrends/patch-1
    
    Fix example code: use tasks instead of comments [ci skip]

commit 410d877	refs/heads/master
Author: Erik Behrends 
Date:   2012-09-02 17:09:59 +0300

    Fix example code: use tasks instead of comments

M	actionpack/lib/action_controller/metal/responder.rb

commit 593fa0b	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-09-02 15:28:08 +0200

    Fixed markup in Upgrading RoR guide  [ci skip]
    
    There are two changes:
    - Using  syntax for unicode character routes example instead of
       since it causes single quotes to be transformed into inverted
      commas. This makes this required change more eye-catching.
    - Using  for the j alias and related helpers as written in the
      documentation guidelines.

M	guides/source/upgrading_ruby_on_rails.textile

commit 70d2d2c	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-09-02 13:59:45 +0200

    Fixed validation issue in Upgrading Ruby on Rails guide [ci skip]
    
    In chapter 2.4 there was an underscore at the start of the attr_readonly method name,
    this underscore was interpreted as the opening of the  tag but it wasn't closed.
    
    Worst, the underscore in self.class.serialized_attributes (end of paragraph)
    was interpreted as the closing of the  tag and not as the name of a method.

M	guides/source/upgrading_ruby_on_rails.textile

commit abd47c1	refs/heads/master
Merge: a667499 8bfcb0d
Author: Aaron Patterson 
Date:   2012-09-01 23:42:39 -0700

    Merge pull request #7495 from steveklabnik/issue_7478
    
    Properly reset the session on reset_session

commit 8bfcb0d	refs/heads/master
Author: Andreas Loupasakis 
Date:   2012-09-02 00:41:23 +0300

    Force reloading of the session after destroy
    
    Use load_for_write! to ensure a refresh of the session object.
    This way the new session_id and the empty data will be stored properly.
    E.g. in the case of the session cookie store this means that a new
    digest will be returned to the user.

M	actionpack/lib/action_dispatch/request/session.rb

commit 7fd6bd6	refs/heads/master
Author: Andreas Loupasakis 
Date:   2012-09-01 14:21:49 +0300

    Override rack's destroy_session in cookie store

M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb

commit 54a0b01	refs/heads/master
Author: Andreas Loupasakis 
Date:   2012-09-01 14:20:43 +0300

    Assign a new session_id to session options hash

M	actionpack/lib/action_dispatch/request/session.rb

commit a667499	refs/heads/master
Merge: 7f800b4 831b814
Author: Vijay Dev 
Date:   2012-09-01 23:51:23 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 831b814	refs/heads/master
Author: Vijay Dev 
Date:   2012-09-01 23:49:55 +0530

    copy edits [ci skip]

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	guides/source/asset_pipeline.textile

commit 7f800b4	refs/heads/master
Author: Xavier Noria 
Date:   2012-09-01 20:08:08 +0200

    require bundle in the app generator
    
    The app generator is not generally run under bundler, but the Bundler
    constant is used here.
    
    In particular you cannot create --dev apps without this.

M	railties/lib/rails/generators/app_base.rb

commit eae2dbe	refs/heads/master
Author: Vijay Dev 
Date:   2012-09-01 23:31:29 +0530

    Revert "added .DS_Store to .gitignore"
    
    This reverts commit fc80ebb13328eb5f233f65408ba281bf0f8ce68e.
    
    Such changes aren't allowed in docrails.

M	.gitignore

commit b243522	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-09-01 19:25:41 +0200

    Remove unneeded require

M	actionpack/lib/action_view/asset_paths.rb

commit 2a95a66	refs/heads/master
Merge: 5f99bdb 3a6e8e4
Author: Piotr Sarnacki 
Date:   2012-09-01 05:33:31 -0700

    Merge pull request #7494 from route/actionview_decoupling_issue
    
    ActionView decoupling and sprockets-rails tests fail

commit 3a6e8e4	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-09-01 15:58:24 +0400

    Sprockets-rails tests fail
    
    Method invalid_asset_host! was delegated to controller but sprockets
    compile assets in their own scope without controller. And if we set asset_host
    with second parameter it should raise error through invalid_asset_host!.
    But since controller is nil it cannot be reached.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
D	actionpack/lib/action_controller/metal/asset_paths.rb
M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/template/error.rb

commit a1c7b0e	refs/heads/master
Author: Sven Kraeuter | 5v3n 
Date:   2012-09-01 01:37:47 +0200

    reverting changes from commit b0896c38

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 000edbb	refs/heads/master
Author: Steve Klabnik 
Date:   2012-08-31 11:36:05 -0700

    Properly reset the session on reset_session
    
    Fixes #7478

M	actionpack/lib/action_dispatch/http/request.rb

commit 5f99bdb	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-31 20:59:15 +0200

    Require bundler 1.2

M	rails.gemspec

commit 62fa173	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-16 04:46:26 -0700

    Don't use Gemfile in test application in railties
    
    Option to run `bundle install` after generating new appplication was
    added recently to rails. Since introduction, it contained a subtle bug
    that caused it to use `Gemfile` from current directory (if it exists)
    rather than from generated directory. This also accidentaly caused
    railties tests to work without any problems - after generating test app
    it just used `Gemfile` from the repository, rather than the one in
    generated app. After fixing the bug mentioned above, this of course
    broke. The easiest way to bypass that is to not generate a `Gemfile` for
    test application - with such setup Bundler will just use first available
    `Gemfile` in one of the parent directories.

M	railties/test/isolation/abstract_unit.rb

commit 7fc4b46	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-16 03:35:12 -0700

    Use Bundler.with_clean_env instead of custom code

M	railties/lib/rails/generators/app_base.rb

commit 4141588	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-25 06:57:11 +0200

    Revert "Revert changes related to `bundle install` fixes in `rails new`"
    
    The cause of the previous revert was bug in bundler that made it hard to
    make railties test work. Fix for bundler was recently pushed to github,
    so now we can safely get back to the original commit.
    
    This reverts commit 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit a91c7b4	refs/heads/master
Author: Steve Klabnik 
Date:   2012-08-31 11:19:53 -0700

    Fix comment about Session.
    
    SessionHash isn't a thing, and tenses are wrong.

M	actionpack/lib/action_dispatch/request/session.rb

commit 29fe126	refs/heads/master
Author: Pratik Naik 
Date:   2012-08-31 11:15:24 -0700

    Fix my bio

M	guides/source/credits.html.erb

commit 85098e4	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 17:04:36 +0100

    Avoid #fetch for non-nil values.
    
    This is purely a performance optimisation.
    
    See https://gist.github.com/3552829

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 86c3dfb	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 16:55:08 +0100

    Key the attributes hash with symbols
    
    This is a performance/GC optimisation.
    
    In theory, this could be optimised by the implementation (last time I
    checked, this would have no effect on JRuby). But in practise, this make
    attribute access faster.

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit e96558f	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 14:54:43 +0100

    Cache the connection pool for a given class

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb

commit ba1544d	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 12:56:27 +0100

    One hash is enough
    
    We don't need separate @class_to_pool and @connection_pool hashes.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/fixtures.rb

commit 4a274ed	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 12:33:28 +0100

    Refactor connection handler

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 221571b	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 11:53:50 +0100

    Make connection pool retrieval faster
    
    * Loop rather than recurse in retrieve_connection_pool
    * Key the hash by class rather than class name. This avoids creating
      unnecessary strings.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_handling.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb

commit ae79c7a	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 15:41:03 +0100

    Revert "Merge pull request #7452 from arunagw/memcached_dalli"
    
    This reverts commit 7256cb53e0c34e510a4d59a50d120c0358cf1d99, reversing
    changes made to 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac.
    
    Reason: A test was failing.

M	actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
M	actionpack/test/dispatch/session/mem_cache_store_test.rb

commit cd150c9	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-31 15:39:45 +0100

    Revert "Add missing require"
    
    This reverts commit e4b33b08d6d2b88b627b1e52c4f349e57c5b89fc.
    
    https://github.com/rails/rails/pull/7452#issuecomment-8094302

M	actionpack/test/dispatch/session/mem_cache_store_test.rb

commit b0896c3	refs/heads/master
Merge: 030af5e 3012365
Author: Sven Kräuter 
Date:   2012-08-31 07:09:11 -0700

    Merge pull request #111 from 5v3n/master
    
    Fixed little mistake in the docs

commit 3012365	refs/heads/master
Author: Sven Kräuter 
Date:   2012-08-31 17:08:07 +0300

    there is no "delete" action in a controller

M	actionpack/lib/action_view/helpers/url_helper.rb

commit d659406	refs/heads/master
Merge: c0b6963 341f42b
Author: Xavier Noria 
Date:   2012-08-31 04:45:32 -0700

    Merge pull request #7479 from eriko/master
    
    the example for contraint( :ip => XXXX) has an invalid regex

commit 030af5e	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-08-31 08:45:14 +0200

    In example about params naming conventions use params[:person]  [ci skip]
    
    The example is about a Person model, say that "params[:model] would usually be a
    hash of all the attributes for the person to create" could be confusing.
    I changed to params[:person] since the example is about a Person creation.

M	guides/source/form_helpers.textile

commit b54e577	refs/heads/master
Merge: 94301b9 a708f01
Author: Jeff Shantz 
Date:   2012-08-30 22:10:17 -0700

    Merge pull request #106 from neilstockbridge/master
    
    Added a bullet for :enable_starttls_auto in the smtp_settings table

commit c0b6963	refs/heads/master
Author: José Valim 
Date:   2012-08-30 18:40:30 -0300

    Instrumentation requires RackDelegation
    
    Since it uses request and response methods

M	actionpack/lib/action_controller/metal/instrumentation.rb

commit 94301b9	refs/heads/master
Author: Kevin Musiorski 
Date:   2012-08-30 16:35:17 -0500

    in section 4.1 acts_as_yaffle_test was incorrectly failing due to assertion incorrectly using symbol instead of string

M	guides/source/plugins.textile

commit fc80ebb	refs/heads/master
Author: Kevin Musiorski 
Date:   2012-08-30 16:31:20 -0500

    added .DS_Store to .gitignore

M	.gitignore

commit e01091d	refs/heads/master
Author: Kir Shatrov 
Date:   2012-08-30 21:52:22 +0300

    Added example of using options_for_select() with select_tag()

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit f049d33	refs/heads/master
Author: Aldo "xoen" Giambelluca 
Date:   2012-08-30 18:19:27 +0200

    Removed spaces between name and asterisks in example CHANGELOG entry [ci skip]

M	guides/source/contributing_to_ruby_on_rails.textile

commit 404ddd2	refs/heads/master
Merge: 66c31dd 5225c1a
Author: Rafael Mendonça França 
Date:   2012-08-30 08:10:28 -0700

    Merge pull request #7485 from kennyj/fix_build_20120830
    
    Fix build about TemplateDigestorTest.

commit 5225c1a	refs/heads/master
Author: kennyj 
Date:   2012-08-30 23:55:42 +0900

    Fix build about TemplateDigestorTest.

M	actionpack/test/template/digestor_test.rb

commit 66c31dd	refs/heads/master
Merge: a317e78 d30977c
Author: Rafael Mendonça França 
Date:   2012-08-30 07:16:32 -0700

    Merge pull request #7484 from kennyj/fix_warning_20120830
    
    Fixes warning: & interpreted as argument prefix

commit d30977c	refs/heads/master
Author: kennyj 
Date:   2012-08-30 23:11:54 +0900

    Fixes warning: & interpreted as argument prefix

M	actionpack/lib/action_controller/metal/conditional_get.rb

commit a317e78	refs/heads/master
Merge: a0c5cc6 e7c23a4
Author: David Heinemeier Hansson 
Date:   2012-08-30 05:28:31 -0700

    Merge pull request #7483 from christos/improve_template_digestor
    
    Better ActionView::Digestor nested template inference

commit e7c23a4	refs/heads/master
Author: Christos Zisopoulos 
Date:   2012-08-30 14:27:07 +0200

    Further improve RENDER_DEPENDENCY regexp comments

M	actionpack/lib/action_view/digestor.rb

commit 979d327	refs/heads/master
Author: Christos Zisopoulos 
Date:   2012-08-30 14:17:03 +0200

    Improve RENDER_DEPENDENCY regexp comment to keep the doc editor happy.

M	actionpack/lib/action_view/digestor.rb

commit 17f2499	refs/heads/master
Author: Christos Zisopoulos 
Date:   2012-08-30 13:13:47 +0200

    `Digestor` can now parse old style hash syntax for `render`

M	actionpack/lib/action_view/digestor.rb
M	actionpack/test/fixtures/digestor/messages/edit.html.erb
M	actionpack/test/template/digestor_test.rb

commit 21bad74	refs/heads/master
Author: Christos Zisopoulos 
Date:   2012-08-30 13:01:25 +0200

    `Digestor` ignores most whitespace when parsing `render` invocations

M	actionpack/lib/action_view/digestor.rb
A	actionpack/test/fixtures/digestor/messages/_form.html.erb
A	actionpack/test/fixtures/digestor/messages/edit.html.erb
M	actionpack/test/template/digestor_test.rb

commit a0c5cc6	refs/heads/master
Merge: 8074f3b c34022c
Author: Piotr Sarnacki 
Date:   2012-08-30 03:45:58 -0700

    Merge pull request #7477 from kennyj/fix_7469
    
    A missing require is added to fix build. When performing rake test:isolated in actionmailer, test/base_test.rb was break.

commit 8074f3b	refs/heads/master
Merge: c584568 ec950cf
Author: Vijay Dev 
Date:   2012-08-30 00:41:16 -0700

    Merge pull request #7481 from joliss/typo
    
    Fix grammar

commit cabab37	refs/tags/v3.2.9.rc2
Author: Xavier Noria 
Date:   2012-08-30 06:57:41 +0200

    documents after_(commit|rollback)

M	activerecord/lib/active_record/transactions.rb

commit c584568	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-30 06:57:41 +0200

    documents after_(commit|rollback)

M	activerecord/lib/active_record/transactions.rb

commit 67fa3e8	refs/heads/master
Author: Jeff Shantz 
Date:   2012-08-29 22:48:46 -0400

    Expand documentation for change() method in Time, Date, and DateTime

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit ec950cf	refs/heads/master
Author: Jo Liss 
Date:   2012-08-30 01:03:51 +0200

    Fix grammar

M	activerecord/lib/active_record/associations/has_one_association.rb

commit f4e7537	refs/heads/master
Author: Jo Liss 
Date:   2012-08-30 01:02:06 +0200

    Revert "Grammar"
    
    Per https://github.com/lifo/docrails/commit/e94e8d8c3fcac624466afcf61f6a118abe5a6af4#commitcomment-1784677
    
    Thanks @randomecho!
    
    This reverts commit e94e8d8c3fcac624466afcf61f6a118abe5a6af4.

M	activerecord/lib/active_record/associations/has_one_association.rb

commit d4b8052	refs/heads/master
Merge: 0093daf ee2da01
Author: Carlos Antonio da Silva 
Date:   2012-08-29 15:09:39 -0700

    Merge pull request #7480 from aaronbrethorst/master
    
    Fix markdown rendering of the ActionPack changelog [ci skip]

commit e94e8d8	refs/heads/master
Author: Jo Liss 
Date:   2012-08-29 22:53:23 +0200

    Grammar

M	activerecord/lib/active_record/associations/has_one_association.rb

commit 0093daf	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-29 15:36:11 -0500

    Use class_attribute so we dont bleed

M	actionpack/lib/action_controller/metal/conditional_get.rb

commit ee2da01	refs/heads/master
Author: Aaron Brethorst 
Date:   2012-08-29 13:34:11 -0700

    Fix Markdown rendering of 'controller-level etag additions' feature

M	actionpack/CHANGELOG.md

commit 341f42b	refs/heads/master
Author: Erik Ordway 
Date:   2012-08-29 13:14:33 -0700

    Update actionpack/lib/action_dispatch/routing/mapper.rb
    
    escape the '.'s  

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit ed5c938	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-29 15:06:30 -0500

    Added controller-level etag additions that will be part of the action etag computation *Jeremy Kemper/DHH*

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/conditional_get.rb
M	actionpack/test/controller/render_test.rb

commit 502d5e2	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-29 14:23:15 -0500

    Add automatic template digests to all CacheHelper#cache calls (originally spiked in the cache_digests plugin) *DHH*

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view.rb
A	actionpack/lib/action_view/digestor.rb
M	actionpack/lib/action_view/helpers/cache_helper.rb
M	actionpack/test/controller/caching_test.rb
A	actionpack/test/fixtures/digestor/comments/_comment.html.erb
A	actionpack/test/fixtures/digestor/comments/_comments.html.erb
A	actionpack/test/fixtures/digestor/events/_event.html.erb
A	actionpack/test/fixtures/digestor/messages/_header.html.erb
A	actionpack/test/fixtures/digestor/messages/_message.html.erb
A	actionpack/test/fixtures/digestor/messages/actions/_move.html.erb
A	actionpack/test/fixtures/digestor/messages/index.html.erb
A	actionpack/test/fixtures/digestor/messages/show.html.erb
A	actionpack/test/template/digestor_test.rb

commit 3da10e3	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-29 11:30:17 -0500

    Fix spacing

M	actionpack/lib/action_controller/caching.rb

commit d335495	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-29 11:30:01 -0500

    Fix spacing

M	actionpack/lib/action_controller/caching.rb

commit 46d8543	refs/heads/master
Merge: 3b2c42c cc57b2a
Author: Andrew White 
Date:   2012-08-29 12:03:06 -0700

    Merge pull request #7230 from schneems/schneems/expose_required_keys
    
    Add Missing Keys from Journey on Failed URL Format

commit 74d218d	refs/heads/master
Merge: da85347 fe309b5
Author: Nathaniel Madura 
Date:   2012-08-29 10:16:45 -0700

    Merge pull request #110 from nmadura/master
    
    minor update to asset_pipeline docs describing apache config

commit fe309b5	refs/heads/master
Author: Nathaniel Madura 
Date:   2012-08-29 13:13:58 -0400

    added a touch more information to the apache configuration instructions
    
    In the text there is a section about how to serve the assets with
    far-future headers. The snippet that is proposed doesn't work on Ubuntu
    11 (probably others) as mod_expires is not enabled out-of-the-box. I
    noted this, and gave an example of how to load mod_expires with a2enmod.

M	guides/source/asset_pipeline.textile

commit 3b2c42c	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-29 17:42:24 +0200

    fixes a regexp
    
    We need to anchor to remove the extension. In addition to
    be the correct way to do that, files in ~/.rbenv get that
    .rb removed, so it is a real source of bugs, as reported in
    
    https://github.com/rails/rails/commit/b33700f5580b4cd85379a1dc60fa341ac4d8deb2#commitcomment-1781840

M	activesupport/lib/active_support/dependencies.rb

commit c34022c	refs/heads/master
Author: kennyj 
Date:   2012-08-29 23:19:48 +0900

    Added missing require. When performing rake test:isolated, test/base_test.rb was break.

M	actionmailer/test/base_test.rb

commit 8e974f2	refs/heads/master
Merge: 754173c 8d9f9f9
Author: Xavier Noria 
Date:   2012-08-29 01:39:34 -0700

    Merge pull request #7476 from ayrton/fixed_indentation
    
    Fixed indendation

commit 8d9f9f9	refs/heads/master
Author: Ayrton De Craene 
Date:   2012-08-29 10:25:36 +0200

    Fixed indendation

M	actionpack/lib/abstract_controller/helpers.rb

commit f84fc39	refs/tags/v3.2.9.rc2
Merge: 58d35f6 728e925
Author: Piotr Sarnacki 
Date:   2012-08-29 00:24:52 -0700

    Merge pull request #7474 from steveklabnik/backport_89ebd28
    
    Backport 89ebd28 to 3-2-stable

commit da85347	refs/heads/master
Merge: 0685984 cb8bcdd
Author: Jim Jones 
Date:   2012-08-28 21:48:30 -0700

    Merge pull request #109 from aantix/default_security_headers_clarifications
    
    Added clairifications for default security headers.

commit 728e925	refs/tags/v3.2.9.rc2
Author: Marc-Andre Lafortune 
Date:   2012-05-21 15:24:18 -0400

    Fix bug when Rails.application is defined but is nil. See #881

M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/dispatch/test_request_test.rb

commit 58d35f6	refs/tags/v3.2.9.rc2
Author: Pratik Naik 
Date:   2012-08-28 12:57:41 -0700

    Ensure association preloading properly merges default scope and association conditions
    
    Conflicts:
    
    	activerecord/test/models/reader.rb

M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/reader.rb

commit 2d6d8a7	refs/tags/v3.1.9
Author: Pratik Naik 
Date:   2012-08-28 12:42:40 -0700

    Ensure association preloading properly merges default scope and association conditions

M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/reader.rb

commit 754173c	refs/heads/master
Author: Pratik Naik 
Date:   2012-08-28 12:48:59 -0700

    Add a test to make sure preloading properly merges association and default scope conditions

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/reader.rb

commit e6e9e56	refs/tags/v3.1.9
Author: Xavier Noria 
Date:   2012-08-28 21:46:04 +0200

    CHANGELOGs are now per branch
    
    Check 810a50d for the rationale.

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 8efced6	refs/tags/v3.2.9.rc2
Author: Xavier Noria 
Date:   2012-08-28 21:39:32 +0200

    CHANGELOGs are now per branch
    
    Check 810a50d for the rationale.

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 810a50d	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-28 21:15:12 +0200

    CHANGELOGs are now per branch
    
    Changes in old branches needed to be manually synched in CHANGELOGs of newer ones.
    This has proven to be brittle, sometimes one just forgets this manual step.
    With this commit we switch to CHANGELOGs per branch. When a new major version is
    cut from master, the CHANGELOGs in master start being blank.
    
    A link to the CHANGELOG of the previous branch allows anyone interested to
    follow the history.

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit b33700f	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-28 20:27:59 +0200

    detect circular constant autoloading
    
    Nowadays circular autoloads do not work, but the user gets a NameError
    that says some constant is undefined. That's puzzling, because he is
    normally trying to autoload a constant he knows can be autoloaded.
    With this check we can give a better error message.

M	activesupport/lib/active_support/dependencies.rb
A	activesupport/test/autoloading_fixtures/circular1.rb
A	activesupport/test/autoloading_fixtures/circular2.rb
M	activesupport/test/dependencies_test.rb

commit 844e944	refs/heads/master
Merge: 1ef9b7e 9063f37
Author: Rafael Mendonça França 
Date:   2012-08-28 10:40:29 -0700

    Merge pull request #7470 from kennyj/fix_method_redefined_warning
    
    Fix method redefined warnings.

commit 9063f37	refs/heads/master
Author: kennyj 
Date:   2012-08-29 02:21:39 +0900

    Fix method redefined warnings.

M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit 1ef9b7e	refs/heads/master
Merge: 52c0bf9 167f250
Author: José Valim 
Date:   2012-08-28 10:05:55 -0700

    Merge pull request #7469 from kennyj/fix_many_warnings_in_am
    
    Fixes warnings when executing rake test in ActionMailer.

commit 167f250	refs/heads/master
Author: kennyj 
Date:   2012-08-29 01:57:44 +0900

    Fixes warnings when executing rake test in ActionMailer. Related to 582a7f459990487659886b90e54c22e055c65870

M	actionmailer/lib/action_mailer/base.rb

commit 52c0bf9	refs/heads/master
Merge: db8ff15 1006382
Author: José Valim 
Date:   2012-08-28 09:32:24 -0700

    Merge pull request #7468 from kennyj/tiny_fixings
    
    Tiny fixes in railties/test/application.

commit 1006382	refs/heads/master
Author: kennyj 
Date:   2012-08-29 01:20:39 +0900

    Remove unused require.

M	railties/test/application/middleware_test.rb
M	railties/test/application/queue_test.rb

commit f686bc8	refs/heads/master
Author: kennyj 
Date:   2012-08-29 01:08:22 +0900

    Fixes wrong test class names.

M	railties/test/application/initializers/boot_test.rb
M	railties/test/application/initializers/hooks_test.rb
M	railties/test/application/middleware/cache_test.rb
M	railties/test/application/queue_test.rb

commit cc57b2a	refs/heads/master
Author: schneems 
Date:   2012-08-27 14:39:43 -0500

    refactor route_set `generate_extras` functionality
    
    The result of Generator with or without the @extras instance variable set contains the desired information. Rather than preserving state when initializing the original object, we can simply extract the keys from the resultant parameters.
    
    ATP Actionpack, railties

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 0b6175a	refs/heads/master
Author: schneems 
Date:   2012-08-01 15:33:15 -0500

    Add Missing Keys from Journey on failed URL format
    
    Many named routes have keys that are required to successfully resolve. If a key is left off like this:
    
        <%= link_to 'user', user_path %>
    
    This will produce an error like this:
    
        No route matches {:action=>"show", :controller=>"users"}
    
    Since we know that the :id is missing, we can add extra debugging information to the error message.
    
        No route matches {:action=>"show", :controller=>"users"} missing required keys: [:id]
    
    
    This will help new and seasoned developers look closer at their parameters. I've also subclassed the routing error to be clear that this error is a result of attempting to generate a url and not because the user is trying to visit a bad url.
    
    While this may sound trivial this error message is misleading and confuses most developers. The important part isn't what's in the options its's what's missing. Adding this information to the error message will make debugging much more obvious.
    
    This is the sister pull request of https://github.com/rails/journey/pull/44 which will be required to get they missing keys into the correct error message.
    
    Example Development Error in Rails: http://cl.ly/image/3S0T0n1T3421

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/exceptions.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb
M	actionpack/test/dispatch/routing_test.rb

commit 8333b93	refs/tags/v3.2.9.rc2
Author: Xavier Noria 
Date:   2012-08-28 17:17:58 +0200

    fixes a bug in dependencies.rb
    
    loaded stores file names without the .rb extension, but search_for_file
    returns file names with the extension.
    
    The solution is hackish, but this file needs a revamp.

M	activesupport/lib/active_support/dependencies.rb

commit db8ff15	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-28 17:17:58 +0200

    fixes a bug in dependencies.rb
    
    loaded stores file names without the .rb extension, but search_for_file
    returns file names with the extension.
    
    The solution is hackish, but this file needs a revamp.

M	activesupport/lib/active_support/dependencies.rb

commit 265c8b7	refs/heads/master
Merge: e4b33b0 72bcd9e
Author: Rafael Mendonça França 
Date:   2012-08-28 07:50:01 -0700

    Merge pull request #7466 from arunagw/warning_removed_ap
    
    removed :  warning: `*' interpreted as argument prefix

commit 72bcd9e	refs/heads/master
Author: Arun Agrawal 
Date:   2012-08-28 20:13:36 +0530

    removed :  warning: `*' interpreted as argument prefix

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit e4b33b0	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-28 10:12:38 -0300

    Add missing require

M	actionpack/test/dispatch/session/mem_cache_store_test.rb

commit f93e3f0	refs/tags/v3.0.18
Author: Rafael Mendonça França 
Date:   2012-08-28 09:43:20 -0300

    Remove warning when using html_escape with Ruby 1.9.
    
    Closes #7430

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 7256cb5	refs/heads/master
Merge: 6ebe22c 1f5f5cf
Author: Rafael Mendonça França 
Date:   2012-08-28 05:27:34 -0700

    Merge pull request #7452 from arunagw/memcached_dalli
    
    Memcached to dalli for actionpack test.

commit 6ebe22c	refs/heads/master
Merge: 1144633 8102c0d
Author: José Valim 
Date:   2012-08-28 05:24:06 -0700

    Merge pull request #7465 from wpp/generator_controller_plural
    
    Change generators controller help from singular to plural example.

commit 8102c0d	refs/heads/master
Author: Philipp Weissensteiner 
Date:   2012-08-28 13:40:11 +0200

    Change generators controller help from singular to plural example.
    
    When running `rails generate controller --help` an example
    with creating a (singular) "CreditCard" controller is
    shown. The convention is to generate controllers with plural
    names though.

M	railties/lib/rails/generators/rails/controller/USAGE

commit 1144633	refs/heads/master
Merge: 4f093d8 2b2fd03
Author: Rafael Mendonça França 
Date:   2012-08-28 04:55:33 -0700

    Merge pull request #7458 from frodsan/fix_orddep_basics
    
    fix order dependent test in AR::BasicsTest

commit 4f093d8	refs/heads/master
Merge: 1ec1eb2 daa0ed3
Author: Piotr Sarnacki 
Date:   2012-08-28 11:24:29 +0200

    Merge branch 'actionview-decoupling'
    
    This branch contains set of changes that will allow to extract Action
    View out of Action Pack in the future. This work will be probably done
    after Rails 4.0 release, because of a few deprecations that were done
    to make decoupling possible.

commit daa0ed3	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-25 13:50:45 +0200

    Update AP's CHANGELOG with user facing changes

M	actionpack/CHANGELOG.md

commit e1ffd82	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-25 13:40:56 +0200

    Deprecate AV::RecordIdentifier in controllers
    
    Methods provided by RecordIdentifier are not widely used in controllers
    nowadays as they're view specific (this is probably a legacy left after
    RJS rendering directly in controllers). However if people still need to
    use it, it's trivial to include ActionView::RecordIdentifier by
    themselves.

M	actionpack/lib/action_controller/base.rb
M	actionpack/lib/action_controller/record_identifier.rb
M	actionpack/test/controller/base_test.rb

commit f4d493e	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-25 13:34:52 +0200

    Fix ActionView::RecordIdentifier to work as a singleton
    
    We extend it with self, but the methods were not working properly were
    used directly on module.

M	actionpack/lib/action_view/record_identifier.rb
M	actionpack/test/template/record_identifier_test.rb

commit 8eb4600	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-25 01:23:47 +0200

    No need to use included hook for include
    
    When module is extended ActiveSupport::Concern, include calls are lazily
    loaded, so there is no need to wrap it with included hook.

M	actionpack/lib/action_controller/metal/asset_paths.rb

commit 582a7f4	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-25 01:20:51 +0200

    Deprecate Template#mime_type

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit 3fb10fd	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-25 01:11:22 +0200

    Add deprecation horizon to html-scanner

M	actionpack/lib/action_controller/vendor/html-scanner.rb

commit 67f55e2	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-07-05 22:02:11 +0200

    Implement ActionView::Template::Types
    
    AV::Template::Types is a small abstraction to allow to specify template types
    that can be used in ActionView. When Action Pack is loaded it's replaced with
    Mime::Type.

M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/lib/action_view/template/text.rb
A	actionpack/lib/action_view/template/types.rb

commit dc663dd	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-21 18:39:35 +0200

    Don't require action_dispatch in ActionView::UrlHelpers
    
    ActionDispatch::Routing::UrlFor was always required in UrlHelpers. This
    was changed by splitting previous implementation of UrlHelper into 2
    modules: ActionView::Helpers::UrlHelper and
    ActionView::Routing::UrlHelper. The former one keeps only basic
    implementation of url_for. The latter adds features that allow to use
    routes and is only required when url_helpers or mounted_helpers are
    required.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
A	actionpack/lib/action_view/routing_url_for.rb
M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/template/erb/helper.rb
M	actionpack/test/template/url_helper_test.rb

commit 9b0ac0b	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-15 21:05:00 +0200

    Use ActionView::Base.logger instead of AC::Base.logger

M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb

commit 45efb66	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-15 20:36:09 +0200

    Add ActionView::Base.default_formats
    
    default_formats array is used by LookupContext in order to allow
    rendering templates when :formats option is not passed. Previously it
    was always set to Mime::SET, which created dependency on Action Pack. In
    order to remove this dependency, Mime::SET is used only if
    ActionController is loaded.

M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/test/template/lookup_context_test.rb

commit f21a528	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-15 17:17:21 +0200

    Remove Mime::Type translations from Action View
    
    Action View should not be responsible for translating mime types. Any
    translation that's needed should be handled at controller level.

M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/handlers/builder.rb
M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/lib/action_view/template/text.rb

commit 7abc0c7	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-11 17:59:18 +0200

    Deprecate mime types lookup in auto_discovery_link_tag
    
    Automatically handling mime types for things other than :rss and :atom
    is not functionality that justifies dependency on Mime::Type from
    actionpack.

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 9e731f0	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-14 12:09:03 +0200

    Remove comment about getting rid of old AV::Base.new behavior
    
    I've talked to José Valim, who added this comment, and there is no need
    to remove old API. It's good to have a simple way to instantiate
    ActionView::Base, by just passing view paths as a first argument,
    instead of constructing LookupContext and then the Renderer.
    
    [ci skip]

M	actionpack/lib/action_view/base.rb

commit 731bb2f	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-14 12:04:49 +0200

    Remove stubs from LogSubscriber tests
    
    We can use another way to instantiate ActionView::Base, by passing
    renderer as a first option. Thanks to that we can just pass prefixes to
    LookupContext instead stubbing them on the controller. This is also good,
    because that kind of API is used in Rails code.

M	actionpack/test/template/log_subscriber_test.rb

commit ba83aa7	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-09 14:40:50 +0200

    Move action_controller/vendor/html-scanner to action_view
    
    This is another step in moving Action View's dependencies in Action Pack
    to Action View itself. Also, HtmlScanner seems to be better suited for
    views rather than controllers.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/vendor/html-scanner.rb
D	actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
D	actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
D	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
D	actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
D	actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
D	actionpack/lib/action_controller/vendor/html-scanner/html/version.rb
M	actionpack/lib/action_dispatch/testing/assertions/dom.rb
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_dispatch/testing/assertions/tag.rb
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
A	actionpack/lib/action_view/vendor/html-scanner.rb
A	actionpack/lib/action_view/vendor/html-scanner/html/document.rb
A	actionpack/lib/action_view/vendor/html-scanner/html/node.rb
A	actionpack/lib/action_view/vendor/html-scanner/html/sanitizer.rb
A	actionpack/lib/action_view/vendor/html-scanner/html/selector.rb
A	actionpack/lib/action_view/vendor/html-scanner/html/tokenizer.rb
A	actionpack/lib/action_view/vendor/html-scanner/html/version.rb
M	actionpack/test/controller/action_pack_assertions_test.rb
M	actionpack/test/controller/integration_test.rb
M	actionpack/test/controller/selector_test.rb

commit 4efad29	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-11 16:52:12 +0200

    Deprecate ActionController::RecordIdentifier

M	actionpack/lib/action_controller.rb
A	actionpack/lib/action_controller/record_identifier.rb

commit 8ca1792	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-15 18:44:18 +0200

    Add ActionView::ModelNaming
    
    It's just a duplicate of ActionController::ModelNaming. These are just a
    simple helpers for decoupling Active Model, so it does not make sense to
    extract it to Active Support, but the point is to decouple also Action
    View and Action Pack

M	actionpack/lib/action_view/helpers/form_helper.rb
A	actionpack/lib/action_view/model_naming.rb
M	actionpack/lib/action_view/record_identifier.rb

commit 2646240	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-09 14:20:31 +0200

    Move ActionController::RecordIdentifier to ActionView
    
    Since it's more about DOM classes and ids it belongs to Action View
    better. What's more, it's more convenient to make it part of Action View
    to follow the rule that Action Pack can depend on Action View, but not
    the other way round.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
D	actionpack/lib/action_controller/record_identifier.rb
M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/helpers/record_tag_helper.rb
A	actionpack/lib/action_view/record_identifier.rb
M	actionpack/lib/action_view/test_case.rb
D	actionpack/test/controller/record_identifier_test.rb
A	actionpack/test/template/record_identifier_test.rb

commit 7185e35	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-11 15:14:42 +0200

    Remove dependency on actionpack in ActionView::AssetPaths
    
    Since Action View should not depend on actionpack, it's best to delegate
    invalid_asset_host! to controller and just rely on such simple contract
    instead of raising ActionController::RoutingError directly.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
A	actionpack/lib/action_controller/metal/asset_paths.rb
M	actionpack/lib/action_view/asset_paths.rb

commit cb8bcdd	refs/heads/master
Author: Jim Jones 
Date:   2012-08-27 21:04:42 -0700

    Added clairifications for default security headers.

M	guides/source/security.textile

commit 1ec1eb2	refs/heads/master
Merge: 930dbbb 206d9a7
Author: Rafael Mendonça França 
Date:   2012-08-27 14:48:08 -0700

    Merge pull request #7460 from frodsan/fix_nested_attributes_test
    
    ensures that the test repairs the validation setup

commit fd99bb8	refs/heads/master
Author: Szymon Nowak 
Date:   2012-08-27 23:46:53 +0200

    Make ActionDispatch::ParamsParser::ParseError#original_exception return the original exception.

M	actionpack/lib/action_dispatch/middleware/params_parser.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb

commit 206d9a7	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-08-27 16:46:36 -0500

    ensures that the test repairs the validation setup

M	activerecord/test/cases/nested_attributes_test.rb

commit 2b2fd03	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-08-27 13:49:22 -0500

    fix order dependent test in AR::BasicsTest
    
    This test https://github.com/rails/rails/blob/master/activerecord/test/cases/base_test.rb#L381
    is failing because is not setting `CreditCard.pluralize_table_name` to `false`.
    
    In this case, i prefer to change to another model that is not in the `GUESSED_CLASSES`
    array.

M	activerecord/test/cases/base_test.rb

commit 0685984	refs/heads/master
Merge: 4587e47 dad633c
Author: Egor Homakov 
Date:   2012-08-27 06:37:07 -0700

    Merge pull request #108 from homakov/master
    
    Default headers description

commit dad633c	refs/heads/master
Author: Egor Homakov 
Date:   2012-08-27 16:32:54 +0300

    default headers init

M	guides/source/security.textile

commit 930dbbb	refs/heads/master
Merge: ea84b0c 47cce91
Author: Santiago Pastorino 
Date:   2012-08-27 05:36:04 -0700

    Merge pull request #7451 from frodsan/fix_dep_ag
    
    fix order dependent test in AggregationsTest

commit 4587e47	refs/heads/master
Author: Deepak Kannan 
Date:   2012-08-27 15:35:19 +0530

    Update guides/source/rails_application_templates.textile
    
    think that a quoted string will be better as it will automatically
    escape double-quotes as well

M	guides/source/rails_application_templates.textile

commit 52b3c7d	refs/heads/master
Author: Deepak Kannan 
Date:   2012-08-27 15:32:14 +0530

    Minor update for usage of git command
    
    after running, git add .
    do not need -a option to git commit

M	guides/source/rails_application_templates.textile

commit 1f5f5cf	refs/heads/master
Author: Arun Agrawal 
Date:   2012-08-27 09:46:52 +0530

    More fixes for action pack tests with Dalli.

M	actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb

commit 834a5a9	refs/heads/master
Author: Arun Agrawal 
Date:   2012-08-27 09:46:35 +0530

    Let's run action pack tests with Dalli
    
    There is no memcache gem left in repo.

M	actionpack/test/dispatch/session/mem_cache_store_test.rb

commit 47cce91	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-08-26 16:32:08 -0500

    fix order dependent test in AggregationsTest
    
    Ensure class variable is set to nil.
    
    It prevents the following test to fail:
    
        def test_do_not_run_the_converter_when_nil_was_set
          customers(:david).non_blank_gps_location = nil
          assert_nil Customer.gps_conversion_was_run
        end
    
    Check https://github.com/rails/rails/blob/master/activerecord/test/models/customer.rb#L7
    for more information.

M	activerecord/test/cases/aggregations_test.rb

commit ea84b0c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 03:43:34 -0300

    Remove unused variable

M	activesupport/lib/active_support/core_ext/date_and_time/calculations.rb

commit b4615ff	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 03:09:31 -0300

    Add test to ensure that save will raise SerializationTypeMismatch if the
    serialized attribute value is not from the same class

M	activerecord/test/cases/serialized_attribute_test.rb

commit a6e95c9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 03:03:53 -0300

    We don't need this reload

M	activerecord/test/cases/serialized_attribute_test.rb

commit b26f7a2	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 03:03:12 -0300

    Use the Topic class in the attribute serialized tests

M	activerecord/test/cases/serialized_attribute_test.rb

commit 4f6120e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 02:58:12 -0300

    Use teardown hook to return the initial state of the object

M	activerecord/test/cases/serialized_attribute_test.rb

commit 21be180	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 02:54:46 -0300

    Move the serialized attribute tests to their own file

M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/base_test.rb
A	activerecord/test/cases/serialized_attribute_test.rb

commit 258461e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 02:35:01 -0300

    Move test to the correct file

M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/serialization_test.rb

commit df1d21a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 01:19:44 -0300

    Remove some entries from the 4.0 release notes
    
    We need more :heart: in this file. There are a lot of outdated entries.

M	guides/source/4_0_release_notes.textile

commit e6e5898	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-26 01:18:37 -0300

    Remove CHANGELOG entry for the update_attribute removal.
    
    We reverted the removal because the new deprecation policy

M	activerecord/CHANGELOG.md

commit cffaca4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-25 22:59:40 -0300

    Use verify_readonly_attribute in the update_columns method

M	activerecord/lib/active_record/persistence.rb

commit e5195be	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-25 22:55:03 -0300

    Revert "Remove private verify readonly attr method"
    
    This reverts commit 7a8aee08b610f6edbfe5be076dc14e5cdcf1355e.

M	activerecord/lib/active_record/persistence.rb

commit 50bdb92	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-25 22:54:55 -0300

    Revert "Remove update_attribute."
    
    This reverts commit a7f4b0a1231bf3c65db2ad4066da78c3da5ffb01.
    
    Conflicts:
    	activerecord/lib/active_record/associations/has_one_association.rb
    	activerecord/lib/active_record/persistence.rb
    	activerecord/test/cases/base_test.rb
    	activerecord/test/cases/dirty_test.rb
    	activerecord/test/cases/timestamp_test.rb

M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb

commit a1d18ed	refs/heads/master
Merge: f0c867f b530fd1
Author: Rafael Mendonça França 
Date:   2012-08-25 18:26:07 -0700

    Merge pull request #7029 from panthomakos/date-and-time
    
    Refactored common date and time calculations.

commit f0c867f	refs/heads/master
Merge: af31cf0 ff8f759
Author: Rafael Mendonça França 
Date:   2012-08-25 17:55:16 -0700

    Merge pull request #7449 from Mik-die/nested-limits
    
    Allow to pass Symbol or Proc into :limit option of #accepts_nested_attributes_for

commit af31cf0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-25 21:50:20 -0300

    Create variable only in the test that uses it
    
    Instead of building a Blog::Post instance for every test in form helper
    tests, just build it in the test that uses it.

M	actionpack/test/template/form_helper_test.rb

commit ff8f759	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-08-26 03:42:40 +0300

    changelog #7449

M	activerecord/CHANGELOG.md

commit 8159bc9	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-08-26 03:02:05 +0300

    allow to pass Symbol or Proc into :limit option of #accepts_nested_attributes_for

M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/models/pirate.rb

commit 6715343	refs/heads/master
Merge: dfb5898 130fe2b
Author: Rafael Mendonça França 
Date:   2012-08-25 09:04:33 -0700

    Merge pull request #7435 from nashby/fix-issue-7431
    
    correct handling of date selects when using both disabled and discard options

commit 130fe2b	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-08-23 21:59:22 +0300

    correct handling of date selects when using both disabled and discard options
    
    we should take disabled option not only from `html_options` hash but from
    `options` hash too like `build_select` method does it. So
    
    datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true })
    datetime_select("post", "updated_at", :discard_minute => true , :disabled => true)
    
    both these variants work now
    
    closes #7431

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit dcb2bee	refs/tags/v3.2.9.rc2
Merge: b76a963 4b19855
Author: Rafael Mendonça França 
Date:   2012-08-25 08:53:24 -0700

    Merge pull request #7446 from nashby/backport-fix-issue-7431
    
    backport #7435

commit 4b19855	refs/tags/v3.2.9.rc2
Author: Vasiliy Ermolovich 
Date:   2012-08-23 21:59:22 +0300

    correct handling of date selects when using both disabled and discard options
    
    we should take disabled option not only from `html_options` hash but from
    `options` hash too like `build_select` method does it. So
    
    datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true })
    datetime_select("post", "updated_at", :discard_minute => true , :disabled => true)
    
    both these variants work now
    
    closes #7431

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 0c6890a	refs/heads/master
Author: Henrik N 
Date:   2012-08-25 16:41:25 +0200

    Guide: improvements to "The Flash" section.
    
    Correct :error -> :alert, mention FlashHash class, mention that
    you're not limited to notices and alerts, clean up.

M	guides/source/action_controller_overview.textile

commit dfb5898	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-25 03:10:38 +0200

    simplifies yet another regexp

M	activesupport/lib/active_support/dependencies.rb

commit 4fbd350	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-25 03:08:45 +0200

    instead of returning $& if =~ succeeds, use String#[]

M	activesupport/lib/active_support/dependencies.rb

commit 148e330	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-25 02:56:55 +0200

    simplifies a regexp
    
    We simplify two things here: First since * is greedy it is enough to go
    look for the rightmost ::, no need to ask the regexp engine to match the
    rest of the string since we are not validating anything, only capturing.
    The second simplification comes from using a look-ahead assertion, that
    allows us to have the capture in $&, thus removing the need of a group.

M	activesupport/lib/active_support/dependencies.rb

commit 9cbb6d2	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-24 17:06:02 -0700

    use Hash#fetch to eliminate conditional

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit bf62077	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-24 15:17:38 -0700

    call methods on AR::Model after ClassMethods module is defined

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 35cb772	refs/heads/master
Merge: 73c0222 2f3eb48
Author: Rafael Mendonça França 
Date:   2012-08-24 14:15:08 -0700

    Merge pull request #7342 from sobrinho/master
    
    Accept a symbol for `:in` option on inclusion and exclusion validators

commit 73c0222	refs/heads/master
Merge: 2c571b3 1807384
Author: José Valim 
Date:   2012-08-24 14:11:45 -0700

    Merge pull request #7436 from sikachu/master-remove-active_record-session_store
    
    Extract ActiveRecord::SessionStore from Rails

commit 1807384	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-08-24 17:02:27 -0400

    Raise more helpful error message on missing gem
    
    Tell people to install `activerecord-session_store` gem when it's not
    installed instead ofraising `NameError` on missing
    `ActionDispatch::Session::ActiveRecordStore`.

M	railties/lib/rails/application/configuration.rb
M	railties/test/application/configuration_test.rb

commit 19a3eda	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-08-24 16:01:32 -0400

    Remove meta Sesion Migration generator

D	railties/lib/rails/generators/rails/session_migration/USAGE
D	railties/lib/rails/generators/rails/session_migration/session_migration_generator.rb

commit b6ba012	refs/heads/master
Author: Szymon Nowak 
Date:   2012-08-24 21:55:41 +0200

    Fix ActionDispatch::ParamsParser::ParseError message for XML and JSON parsers.

M	actionpack/lib/action_dispatch/middleware/params_parser.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb

commit aa46558	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-08-24 14:26:00 -0400

    Update guide/release note about AR::SessionStore

M	guides/source/4_0_release_notes.textile
M	guides/source/action_controller_overview.textile
M	guides/source/configuring.textile
M	guides/source/security.textile

commit 0ffe190	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-08-15 01:22:50 -0400

    Extract ActiveRecord::SessionStore from Rails
    
    This functionality will be available from gem
    `active_record-session_store` instead.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/base.rb
D	actionpack/test/activerecord/active_record_store_test.rb
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/railties/databases.rake
D	activerecord/lib/active_record/session_store.rb
D	activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
D	activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb
D	activerecord/test/cases/session_store/session_test.rb
D	activerecord/test/cases/session_store/sql_bypass_test.rb
M	guides/code/getting_started/config/initializers/session_store.rb
M	guides/source/active_support_core_extensions.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
M	railties/test/application/initializers/frameworks_test.rb
D	railties/test/generators/session_migration_generator_test.rb

commit 2f3eb48	refs/heads/master
Author: Gabriel Sobrinho 
Date:   2012-08-12 17:38:22 -0300

    Accept a symbol for `:in` option on inclusion and exclusion validators

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/validations/clusivity.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit d14e2e5	refs/heads/master
Author: Szymon Nowak 
Date:   2012-08-24 18:08:06 +0200

    Raise generic ParseError exception when ActionDispatch::ParamsParser fails parsing request params.

M	actionpack/lib/action_dispatch/middleware/params_parser.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb

commit 2c571b3	refs/heads/master
Merge: 6a70f2d 73f0afd
Author: Rafael Mendonça França 
Date:   2012-08-24 08:56:16 -0700

    Merge pull request #7058 from frodsan/fix_as_random_tests
    
    Fix tests that depend on run order

commit b76a963	refs/tags/v3.2.9.rc2
Merge: d5fe242 0ec7b35
Author: Santiago Pastorino 
Date:   2012-08-24 07:14:26 -0700

    Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fix
    
    We need to have 1-0-stable for joureny gem in edge

commit b9443ba	refs/heads/master
Merge: fdeaea6 14c2979
Author: Xavier Noria 
Date:   2012-08-24 03:49:17 -0700

    Merge pull request #107 from jaimeiniesta/master
    
    Fix rake guides:validate

commit 14c2979	refs/heads/master
Author: Jaime Iniesta 
Date:   2012-08-24 12:06:44 +0200

    Add exception handling to rake guides:validate
    
    If the validation of a guide encounters an exception, inform about it
    and continue with the loop to validate the rest.

M	guides/w3c_validator.rb

commit 1b709f6	refs/heads/master
Author: Jaime Iniesta 
Date:   2012-08-24 11:52:04 +0200

    Fix rake guides:validate
    
    This rake task was looking for the output folder in the wrong place.

M	guides/w3c_validator.rb

commit fdeaea6	refs/heads/master
Author: Jaime Iniesta 
Date:   2012-08-24 11:43:25 +0200

    Revert "Fix rake guides:validate task as it should be run from the guides directory; add exception handling"
    
    This kind of changes should go on a pull request instead.
    
    This reverts commit ecae2f0ef0452f8d333525a6aed58e5ab8d3ccb1.

M	guides/w3c_validator.rb

commit 0ec7b35	refs/tags/v3.2.9.rc2
Author: Arun Agrawal 
Date:   2012-08-24 12:55:55 +0530

    We need to have 1-0-stable for joureny gem in edge
    
    Problem : Edge rails can't bundle
    Fixes #7437

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/shared_generator_tests.rb

commit 6a70f2d	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-24 01:16:27 +0200

    simplifies a regexp
    
    The new regexp has less work to do, we anchor a fixed string at the end
    and need no group.

M	activesupport/lib/active_support/dependencies.rb

commit 2abe950	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-23 15:08:07 -0700

    ivar will always be defined, so stop checking

M	activerecord/lib/active_record/transactions.rb

commit 8d8fd13	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-23 15:07:55 -0700

    mysql does not build on Ruby 2.0.0 at the moment

M	Gemfile

commit dfd1456	refs/heads/master
Merge: aa41bcd ecae2f0
Author: Almudena Garcia 
Date:   2012-08-23 23:46:45 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit aa41bcd	refs/heads/master
Author: Almudena Garcia 
Date:   2012-08-23 23:46:16 +0200

    Fix HTML validation errors

M	guides/source/asset_pipeline.textile
M	guides/source/engines.textile
M	guides/source/form_helpers.textile
M	guides/source/getting_started.textile

commit 73f0afd	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-08-23 16:15:31 -0500

    Fix ActionMailer tests that depend on run order

M	actionmailer/test/base_test.rb

commit 961957d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-14 16:26:05 -0500

    Fix ActiveModel tests that depend on run order

M	activemodel/test/cases/mass_assignment_security_test.rb

commit cc14a3b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-14 16:01:28 -0500

    Fix ActiveSupport tests that depend on run order

M	activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb
M	activesupport/test/core_ext/module/qualified_const_test.rb
M	activesupport/test/dependencies_test.rb
M	activesupport/test/inflector_test.rb

commit e8afb84	refs/heads/master
Merge: 764deab 7bf9db5
Author: Aaron Patterson 
Date:   2012-08-23 12:04:30 -0700

    Merge pull request #7434 from frodsan/select_list_arguments
    
    Model.select takes a variable list of arguments

commit 7bf9db5	refs/heads/master
Author: Isaac Sanders 
Date:   2012-08-23 13:48:02 -0500

    Model.select takes a variable list of arguments.
    
    This is a cleaner version of #6916.
    
    Closes #3165.

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit ecae2f0	refs/heads/master
Author: Jaime Iniesta 
Date:   2012-08-23 18:55:21 +0200

    Fix rake guides:validate task as it should be run from the guides directory; add exception handling

M	guides/w3c_validator.rb

commit 764deab	refs/heads/master
Merge: 891043d 230d7f7
Author: Vijay Dev 
Date:   2012-08-23 08:12:17 -0700

    Merge pull request #7061 from davidcelis/master
    
    Update the documentation for the :autosave option on belongs_to

commit 230d7f7	refs/heads/master
Author: David Celis 
Date:   2012-08-23 07:44:43 -0700

    Update the documentation for the :autosave option
    
    I've noticed a caveat with the :autosave option biting people before.
    Questions arise about why they must explicitly save an associated object
    in their own before_save callbacks. I've updated the documentation as
    such to note to users that the :autosave callback occurs before any
    user defined callbacks. They must save the associated record themselves
    if altering it in their own callbacks.
    
    Signed-off-by: David Celis 

M	activerecord/lib/active_record/associations.rb

commit 891043d	refs/heads/master
Author: José Valim 
Date:   2012-08-23 10:59:42 -0300

    Revert "Use join without default separator"
    
    This reverts commit b0ab8dc0b2b0f580ffe5ac9ff57fd13152e18577
    because it was removing the contents of the message when we
    did not have any tag. A test case is also committed.

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit e8eb68c	refs/heads/master
Author: José Valim 
Date:   2012-08-23 10:22:17 -0300

    Fix failure on middleware/exceptions_test
    
    The reason the test was failing was because when the test
    invokes `app.config`, the app is loaded and, as `eager_load`
    is set to true, it disables the dependency loading mechanism,
    so controllers that are later defined are not loaded.

M	railties/lib/rails/application/finisher.rb
M	railties/test/application/middleware/exceptions_test.rb

commit 16fbe6f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-22 22:12:24 -0300

    Update the ducumentation about the before_eager_load callback [ci skip]

M	railties/lib/rails/application.rb

commit 7f1dc4a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-22 22:05:52 -0300

    before_eager_load only runs when eager_load is true

M	railties/test/application/initializers/hooks_test.rb

commit 6a79aa7	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-22 15:42:39 -0700

    skip the memcache tests if the memcache server is not up

M	activesupport/test/abstract_unit.rb
M	activesupport/test/caching_test.rb

commit 8b16ff6	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-22 23:10:33 +0200

    revises a brittle test in Active Support
    
    The revised test assumed that the default permissions of a file
    matched the umask of the process, but in the general case that
    depends also on the file system. This test was failing in the
    /vagrant shared folder of Rails development boxes.

M	activesupport/lib/active_support/core_ext/file/atomic.rb
M	activesupport/test/core_ext/file_test.rb

commit 79e880f	refs/heads/master
Author: Vijay Dev 
Date:   2012-08-23 01:07:35 +0530

    edit secret token template comment [ci skip]

M	railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt

commit 6431753	refs/heads/master
Author: Vijay Dev 
Date:   2012-08-23 00:24:22 +0530

    copy edit the time_ago_in_words helper docs

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 8fbfeb1	refs/heads/master
Merge: 5c89e07 807a977
Author: Vijay Dev 
Date:   2012-08-22 11:44:58 -0700

    Merge pull request #7398 from iamvery/time_ago_in_words-docs
    
    Extended documentation for `time_ago_in_words` helper

commit 5c89e07	refs/heads/master
Merge: d850fdf 9356d1b
Author: Vijay Dev 
Date:   2012-08-22 23:51:17 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit d850fdf	refs/heads/master
Merge: d168c1f 0d809f6
Author: Carlos Antonio da Silva 
Date:   2012-08-22 04:33:50 -0700

    Merge pull request #7413 from siong1987/secret_token
    
    Remind user a good way to generate a secret code [ci skip]

commit 0d809f6	refs/heads/master
Author: Teng Siong Ong 
Date:   2012-08-21 20:37:58 -0700

    remind user a good way to generate a secret code.

M	railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt

commit 9356d1b	refs/heads/master
Author: Soon Van 
Date:   2012-08-21 23:37:47 -0400

    giving a pause usually made for e.g. in sentences [ci skip]

M	guides/source/migrations.textile

commit d168c1f	refs/heads/master
Merge: 8c6fcbc 566c8d5
Author: Rafael Mendonça França 
Date:   2012-08-21 14:43:19 -0700

    Merge pull request #6606 from amatsuda/ar_relation_model_method
    
    AR::Relation#model would be a better API than AR::Relation#klass

commit 8c6fcbc	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-21 18:39:37 -0300

    Add CHANGELOG entry for #3578 [ci skip]

M	activesupport/CHANGELOG.md
M	guides/source/upgrading_ruby_on_rails.textile

commit d65a15d	refs/heads/master
Merge: 973b278 ed2eac8
Author: Rafael Mendonça França 
Date:   2012-08-21 14:18:38 -0700

    Merge pull request #3578 from amatsuda/remove_j_alias_for_json_escape
    
    Remove j alias for ERB::Util.json_escape

commit 973b278	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-21 17:37:52 -0300

    Remove app building setup/teardown for remote ip railtie tests
    
    These tests rely on "make_basic_app", which is a faster version that
    does not need to create the whole app directory structure.

M	railties/test/application/middleware/remote_ip_test.rb

commit b85894e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-21 17:35:38 -0300

    Set eager load option in "make_basic_app" for railties tests
    
    Avoid output with config option not set when running some tests.

M	railties/test/isolation/abstract_unit.rb

commit d5fe242	refs/tags/v3.2.9.rc2
Author: Carlos Antonio da Silva 
Date:   2012-08-21 17:22:42 -0300

    Use Ruby 1.8 hash syntax
    
    Introduced in backport 648c5a1369ed64608c3ca43a5ebc917687d20010.

M	activerecord/test/models/friendship.rb
M	activerecord/test/models/person.rb

commit 6bef146	refs/heads/master
Merge: 11e890f da3d28e
Author: José Valim 
Date:   2012-08-21 12:58:25 -0700

    Merge pull request #7225 from rails/eager_load
    
    Improve eager load on Rails

commit 11e890f	refs/heads/master
Merge: f89d5e4 7f765da
Author: Carlos Antonio da Silva 
Date:   2012-08-21 12:35:30 -0700

    Merge pull request #6499 from lazylester/patch-1
    
    Clarify and correct the description for the --full option of the
    plugin_new generator. [ci skip]

commit 7f765da	refs/heads/master
Author: lazylester 
Date:   2012-05-26 10:13:17 -0700

    Clarify and correct the description for the --full option of the plugin_new generator

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit 015cac7	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-21 15:46:37 -0300

    Use a model without counter cache to test read-only attributes

M	activerecord/test/cases/locking_test.rb

commit f89d5e4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-21 15:46:37 -0300

    Use a model without counter cache to test read-only attributes

M	activerecord/test/cases/locking_test.rb

commit da3d28e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-21 09:43:10 -0700

    add Rack::Lock for webrick

M	railties/lib/rails/commands/server.rb

commit 5d416b9	refs/heads/master
Author: José Valim 
Date:   2012-08-01 21:10:55 +0200

    Deprecate config.threadsafe!

M	guides/source/configuring.textile
M	railties/CHANGELOG.md
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/configuration_test.rb

commit 2801786	refs/heads/master
Author: José Valim 
Date:   2012-08-01 20:54:22 +0200

    Get rid of config.preload_frameworks in favor of config.eager_load_namespaces
    
    The new option allows any Ruby namespace to be registered and set
    up for eager load. We are effectively exposing the structure existing
    in Rails since v3.0 for all developers in order to make their applications
    thread-safe and CoW friendly.

M	actionmailer/lib/action_mailer.rb
M	actionmailer/lib/action_mailer/railtie.rb
M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/railtie.rb
M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/railtie.rb
M	activemodel/lib/active_model.rb
M	activemodel/lib/active_model/railtie.rb
M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/railtie.rb
M	activesupport/lib/active_support/railtie.rb
M	guides/source/configuring.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie.rb
M	railties/lib/rails/railtie/configuration.rb
M	railties/test/application/configuration_test.rb
M	railties/test/application/rake_test.rb

commit a1687e4	refs/heads/master
Author: José Valim 
Date:   2012-08-01 18:23:11 +0200

    Make ActiveSupport::Autoload local
    
    Previously, ActiveSupport::Autoload was global and reserved
    for usage inside Rails. This pull request makes it local,
    fixes its test (they were not being run because its file
    was named wrongly) and make it part of Rails public API.

M	activesupport/lib/active_support.rb
M	activesupport/lib/active_support/dependencies/autoload.rb
D	activesupport/test/autoload.rb
A	activesupport/test/autoload_test.rb

commit 11bc348	refs/heads/master
Author: José Valim 
Date:   2012-08-01 15:27:57 +0200

    Remove allow_concurrency as a flag
    
    The flag was mainly used to add a Rack::Lock middleware to
    the stack, but the only scenario the lock is desired is in
    development.
    
    If you are deploying on a not-threaded server, the Rack::Lock
    does not provide any benefit since you don't have concurrent
    accesses. On the other hand, if you are on a threaded server,
    you don't want the lock, since it defeats the purpose of using
    a threaded server.
    
    If there is someone out there, running on a thread server
    and does want a lock, it can be added to your environment
    as easy as: `use Rack::Lock`

M	guides/source/configuring.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/configuration_test.rb
M	railties/test/application/middleware_test.rb

commit e6747d8	refs/heads/master
Author: José Valim 
Date:   2012-08-01 15:07:01 +0200

    Allow users to choose when to eager_load the application or not.
    
    Previously, the eager load behavior was mostly coupled to
    config.cache_classes, however this was suboptimal since in
    some environments a developer may want to cache classes but
    not necessarily load them all on boot (for example, test env).
    
    This pull request also promotes the use of config.eager_load
    set to true by default in production. In the majority of the
    cases, this is the behavior you want since it will copy most
    of your app into memory on boot (which was also the previous
    behavior).
    
    Finally, this fix a long standing Rails bug where it was
    impossible to access a model in a rake task when Rails was
    set as thread safe.

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
M	railties/test/application/rake_test.rb
M	railties/test/isolation/abstract_unit.rb

commit 648c5a1	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-21 14:10:33 -0300

    Merge pull request #5210 from Pliny/masteri
    
    Fix for #5200
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/test/cases/counter_cache_test.rb
A	activerecord/test/fixtures/friendships.yml
M	activerecord/test/fixtures/people.yml
A	activerecord/test/models/friendship.rb
M	activerecord/test/models/person.rb
M	activerecord/test/schema/schema.rb

commit df1a5e4	refs/heads/master
Merge: 684a040 ff0d9b9
Author: Rafael Mendonça França 
Date:   2012-08-21 14:10:33 -0300

    Merge pull request #5210 from Pliny/masteri
    
    Fix for #5200

commit ff0d9b9	refs/heads/master
Author: Dave Desrochers 
Date:   2012-02-28 10:20:27 -0800

    reset_counters() was crashing when there were multiple belongs_to associations with the same foreign key.
    
    This closes #5200.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/test/cases/counter_cache_test.rb
A	activerecord/test/fixtures/friendships.yml
M	activerecord/test/fixtures/people.yml
A	activerecord/test/models/friendship.rb
M	activerecord/test/models/person.rb
M	activerecord/test/schema/schema.rb

commit c091fae	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-21 09:37:13 -0700

    Merge pull request #7410 from sandeepravi/default_options_helper_value
    
    option_tags coerced to "" instead of nil
    
    Closes #7404

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 684a040	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-21 13:43:22 -0300

    Add CHANGELOG entry for #7410

M	actionpack/CHANGELOG.md

commit ce0dd56	refs/heads/master
Merge: 5c4fe85 9932226
Author: Rafael Mendonça França 
Date:   2012-08-21 09:37:13 -0700

    Merge pull request #7410 from sandeepravi/default_options_helper_value
    
    option_tags coerced to "" instead of nil
    
    Closes #7404

commit 9932226	refs/heads/master
Author: Sandeep 
Date:   2012-08-21 21:58:05 +0530

    option_tags coerced to "" instead of nil

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 5c4fe85	refs/heads/master
Merge: 8c600e4 5e47ba0
Author: Rafael Mendonça França 
Date:   2012-08-21 09:28:56 -0700

    Merge pull request #7409 from kennyj/refactor_activerecord_result
    
    Refactor AR::Result or inherits. Because we have redundant codes about column_types.

commit 5e47ba0	refs/heads/master
Author: kennyj 
Date:   2012-08-22 01:23:40 +0900

    Refactor AR::Result or inherits. Because we have redundant codes about

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/result.rb

commit 8c600e4	refs/heads/master
Merge: 7e68e8b babc24c
Author: Carlos Antonio da Silva 
Date:   2012-08-21 09:01:31 -0700

    Merge pull request #7408 from yahonda/sqlmode_mysql
    
    Change mysql tests for strict mode disabled to work with new sql_mode default in MySQL 5.6.6-m9.
    
    Since this MySQL version, the sql_mode default value is `NO_ENGINE_SUBSTITUTION`.

commit babc24c	refs/heads/master
Author: Yasuo Honda 
Date:   2012-08-21 23:31:36 +0900

    Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode
    
    Reason since MySQL 5.6.6-m9 the `sql_mode` default value is
    `NO_ENGINE_SUBSTITUTION`.
    This default parameter change is out of control from Rails.
    
    This test verifies Rails not overriding the default `@@GLOBAL.sql_mode` value
    by checking if `@@GLOBAL.sql_mode` is the same as `@@SESSION.sql_mode`.

M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb

commit 7e68e8b	refs/heads/master
Merge: ace0692 2033db1
Author: Rafael Mendonça França 
Date:   2012-08-21 08:04:19 -0700

    Merge pull request #7406 from janko-m/documentation_fixes
    
    Fixed some documentation mistakes

commit 2033db1	refs/heads/master
Author: Janko Marohnić 
Date:   2012-08-21 14:47:52 +0200

    Fix documentation mistakes

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb

commit ace0692	refs/heads/master
Merge: 55d943c 57bef99
Author: Rafael Mendonça França 
Date:   2012-08-21 07:50:35 -0700

    Merge pull request #7000 from kennyj/fix_6697-3
    
    Use instance_accessor: false instead of instance_writer.

commit 57bef99	refs/heads/master
Author: kennyj 
Date:   2012-07-07 22:10:01 +0900

    Use instance_accessor: false instead of instance_writer.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/readonly_attributes.rb
M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/store_test.rb
M	guides/source/upgrading_ruby_on_rails.textile

commit 8905c1f	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-21 10:13:55 -0300

    Merge pull request #6986 from kennyj/fix_6975
    
    Fix #6975. Round usec when writing timestamp attribute.
    
    Conflicts:
    	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/dirty_test.rb

commit 55d943c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-21 10:18:10 -0300

    Add CHANGELOG entry for #6986

M	activerecord/CHANGELOG.md

commit 245fb73	refs/heads/master
Merge: 15e2b80 e9d2ad3
Author: Rafael Mendonça França 
Date:   2012-08-21 10:13:55 -0300

    Merge pull request #6986 from kennyj/fix_6975
    
    Fix #6975. Round usec when writing timestamp attribute.

commit e9d2ad3	refs/heads/master
Author: kennyj 
Date:   2012-07-06 02:59:47 +0900

    Round usec when writing timestamp attribute.

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/dirty_test.rb

commit fdf4eae	refs/tags/v3.2.9.rc2
Author: Carlos Antonio da Silva 
Date:   2012-08-18 18:11:11 -0700

    Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_last_child
    
    Use inversed parent for first and last child of has_many association
    
    [Backport] Closes #3223.
    
    Conflicts:
    	activerecord/lib/active_record/associations/collection_association.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb

commit 15e2b80	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-21 00:50:42 -0300

    Minor refactoring in Active Record model schema methods
    
    * Use each_key instead of generating intermediate keys array.
    * Use each_with_object instead of inject to build hash.
    * Use ternary to return instead of if + assignment.

M	activerecord/lib/active_record/model_schema.rb

commit e7ffa77	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-20 16:12:59 -0700

    removing dead code

M	activerecord/test/cases/transactions_test.rb

commit f734ec4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-20 16:12:09 -0700

    define singleton methods rather than adding and removing methods

M	activerecord/test/cases/transactions_test.rb

commit 79d21dd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-20 15:32:50 -0700

    remove dead code

M	activerecord/test/cases/transactions_test.rb

commit 503bee0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-20 15:08:35 -0700

    initialize instance variables for transactions to remove conditionals

M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/transactions.rb

commit 075b914	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-20 11:39:19 -0700

    This method is useless without a block, so remove test

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit a4697b0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-20 11:13:39 -0700

    remove unused variable

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit 73eeb51	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-20 11:10:42 -0700

    initialize instance variables to avoid conditionals

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit d0d4ef6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-18 19:04:10 -0700

    fix whitespace errors

M	activerecord/lib/active_record/transactions.rb

commit f298481	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-20 23:58:08 +0200

    Revert "removes unused optional argument in AS::Dependencies::Loadable#load"
    
    This argument is there because that's the signature of Kernel#load.
    
    This reverts commit bf3fa34ed0aa33bca3aac9c96165662fe864a7b4.

M	activesupport/lib/active_support/dependencies.rb

commit bf3fa34	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-20 23:55:28 +0200

    removes unused optional argument in AS::Dependencies::Loadable#load

M	activesupport/lib/active_support/dependencies.rb

commit 81d596a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-20 15:51:35 -0300

    Revert "association_basics, updated how inverse_of works"
    
    This reverts commit 8cb9460437eddde6952fbebbc969203cd4d00294.
    
    Reason: #7377 was merged and it fixes this behavior.

M	guides/source/association_basics.textile

commit 85753f1	refs/heads/master
Merge: 6a5d1c7 bb05d99
Author: Carlos Antonio da Silva 
Date:   2012-08-20 10:59:48 -0700

    Merge pull request #7401 from frodsan/fix_environments_punctuation
    
    Fix punctuation in config templates [ci skip]

commit bb05d99	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-08-20 11:57:16 -0500

    fix punctuation in config templates

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/environment.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/routes.rb

commit 6a5d1c7	refs/heads/master
Author: Pratik Naik 
Date:   2012-08-20 10:25:23 -0500

    Make sure :via works with mount

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/mount_test.rb

commit 807a977	refs/heads/master
Author: Jay Hayes 
Date:   2012-08-20 09:56:07 -0500

    Extended documentation for `time_ago_in_words` helper

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 6904af1	refs/heads/master
Merge: 937a825 503c1c0
Author: Rafael Mendonça França 
Date:   2012-08-20 06:14:50 -0700

    Merge pull request #7396 from tomykaira/cleanup_test
    
    Access @rs only through attr_accessor

commit 503c1c0	refs/heads/master
Author: tomykaira 
Date:   2012-08-20 21:47:00 +0900

    Access @rs only through attr_accessor

M	actionpack/test/controller/routing_test.rb

commit 8cb9460	refs/heads/master
Author: Olli Huotari 
Date:   2012-08-20 11:17:26 +0300

    association_basics, updated how inverse_of works
    
    Fixed bug in the example code. A bit related to rails issue in
     https://github.com/rails/rails/issues/3223

M	guides/source/association_basics.textile

commit bd77fff	refs/heads/master
Author: Bobby Wilson 
Date:   2012-08-19 20:05:15 -0600

    use template0 option for creating activerecord test databases in postgres build_database task

M	activerecord/Rakefile

commit 937a825	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-19 23:50:34 +0200

    removes the second argument of the AS const_missing hook
    
    Ruby does not pass the nesting to const_missing (unfortunately).
    That second argument was there in case that changed, Yehuda
    sent a patch to MRI
    
        http://bugs.ruby-lang.org/issues/2740
    
    but there is not much movement there and Matz told me in
    Amsterdam there was no immediate plan to pass the nesting.
    So let's go back to implement what happens now, and if
    in the future we get the nesting then we will adapt this.
    
    Double-checked this with Mr Katz.

M	activesupport/lib/active_support/dependencies.rb

commit 7a8aee0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-19 17:21:07 -0300

    Remove private verify readonly attr method
    
    This method was added to be shared between update_attribute and
    update_column in 50725cec397d4fa0ecf1dda4e6ae845a993f1ba7, but since
    update_attribute was removed, and update_column has changed to delegate
    to update_columns, the method is not used anywhere anymore.
    
    Also remove "key.to_s" conversion when raising readonly error, since
    the key is being interpolated.

M	activerecord/lib/active_record/persistence.rb

commit 30f091b	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-19 21:33:58 +0200

    no need for AS::Dependencies.(hook!|unhook!) to return anything in particular

M	activesupport/lib/active_support/dependencies.rb

commit 1dbf1c8	refs/heads/master
Merge: f9fc26e bf80522
Author: Rafael Mendonça França 
Date:   2012-08-19 08:28:57 -0700

    Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-merge
    
    Fix "last equality wins" logic in relation merge

commit bf80522	refs/heads/master
Author: Ernie Miller 
Date:   2012-08-19 08:02:09 -0400

    Fix "last equality wins" logic in relation merge
    
    This is a real fix (as compared to the band-aid in b127d86c), which uses
    the recently-added equality methods for ARel nodes. It has the side
    benefit of simplifying the merge code a bit.

M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/test/cases/relations_test.rb

commit f9fc26e	refs/heads/master
Merge: af26adc c9c5566
Author: Carlos Antonio da Silva 
Date:   2012-08-18 18:11:11 -0700

    Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_last_child
    
    Use inversed parent for first and last child of has_many association

commit af26adc	refs/heads/master
Merge: db78e58 4848bf3
Author: Rafael Mendonça França 
Date:   2012-08-18 15:36:32 -0700

    Merge pull request #7390 from aantix/add_x_content_type_options_to_default_headers
    
    Added X-Content-Type-Options to the header defaults.

commit 4848bf3	refs/heads/master
Author: Jim Jones 
Date:   2012-08-18 15:29:58 -0700

    Added X-Content-Type-Options to the header defaults.
    
    With a value of "nosniff", this prevents Internet Explorer from MIME-sniffing a response away from the declared content-type.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/railtie.rb
M	actionpack/test/dispatch/response_test.rb
M	guides/source/configuring.textile

commit b3bea49	refs/tags/v3.2.9.rc2
Merge: 3c61642 066ecf0
Author: Rafael Mendonça França 
Date:   2012-08-18 08:32:26 -0700

    Merge pull request #7388 from ManageIQ/fix_table_remove_passing_array_deprecation
    
    Table#remove passed an array to remove_column, which is deprecated.

commit 066ecf0	refs/tags/v3.2.9.rc2
Author: Joe Rafaniello 
Date:   2012-08-18 11:10:06 -0400

    Table#remove passed an array to remove_column, which is deprecated.
    
    See 02ca9151a043a4fefbb3f22edd05f0cd392fffaa

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/test/cases/migration_test.rb

commit 3c61642	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-18 12:06:25 -0300

    Ruby 1.8 doesn't have to_r defined to NilClass and Float.
    
    Use round to get the right conversion

M	activerecord/lib/active_record/connection_adapters/column.rb

commit c9c5566	refs/heads/master
Author: brainopia 
Date:   2012-08-17 17:50:12 +0400

    Use inversed parent for first and last child of has_many association

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb

commit db78e58	refs/heads/master
Merge: 9f88521 ec01242
Author: Carlos Antonio da Silva 
Date:   2012-08-18 10:01:11 -0300

    Merge branch 'multiparameter-attributes-refactor'
    
    Refactor multiparameter attributes assignment implementation.

commit ec01242	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-28 00:36:25 -0300

    Get rid of some arguments by using the accessors
    
    Cleans up a lot of noise from arguments being passed from one method to
    another.

M	activerecord/lib/active_record/attribute_assignment.rb

commit ec31680	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-28 00:29:20 -0300

    Move multiparameter attribute logic to a class
    
    This should make it easier to refactor and improve this code, and remove
    complexity with params going around here and there.

M	activerecord/lib/active_record/attribute_assignment.rb

commit 95f6b12	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-28 00:05:44 -0300

    Some more cleanup to use Hash#values_at, and some method docs

M	activerecord/lib/active_record/attribute_assignment.rb

commit 022d7b3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 23:55:24 -0300

    Use cached column information to instantiate time object

M	activerecord/lib/active_record/attribute_assignment.rb

commit ef52d34	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 23:43:58 -0300

    Refactor blank date parameter validation

M	activerecord/lib/active_record/attribute_assignment.rb

commit 5021c13	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 23:40:16 -0300

    Refactor missing parameter validation based on position

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit a0f9dc7	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 23:30:40 -0300

    Reuse already fetched column to check for :time
    
    Avoid doing a new column lookup for the attribute, since we already have
    the column to check for the klass.

M	activerecord/lib/active_record/attribute_assignment.rb

commit 2a700a0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 23:22:40 -0300

    Refactor some code in multiparameter assignment
    
    Move some methods to the top to better organize them, since they're used
    right at the beginning of the multiparameter assignment method chain.

M	activerecord/lib/active_record/attribute_assignment.rb

commit 5bd96de	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 23:06:35 -0300

    Extract nested parameter assignment to a separate method

M	activerecord/lib/active_record/attribute_assignment.rb

commit 9f88521	refs/heads/master
Merge: 366eb72 bd680e3
Author: Santiago Pastorino 
Date:   2012-08-17 21:26:33 -0700

    Merge pull request #6903 from guilleiguaran/dalli-memcache-store
    
    Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore

commit bd680e3	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-06-28 21:55:28 -0500

    Add test to cover increment/decrement of non-existing key in MemCacheStore

M	activesupport/test/caching_test.rb

commit 8266330	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-06-28 21:47:46 -0500

    Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore
    
    memcache-client was deprecated in favour of dalli in 2010.

M	Gemfile
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/test/abstract_unit.rb
M	activesupport/test/caching_test.rb

commit 366eb72	refs/heads/master
Merge: 271bedd b127d86
Author: Aaron Patterson 
Date:   2012-08-17 14:17:36 -0700

    Merge pull request #7380 from ernie/fix-nomethoderror-on-non-attribute-equalities
    
    Fix merge error when Equality LHS is non-attribute

commit 271bedd	refs/heads/master
Merge: 1f633c7 31735bd
Author: Rafael Mendonça França 
Date:   2012-08-17 13:07:31 -0700

    Merge pull request #7381 from IPGlider/master
    
    Update to activerecord-deprecated_finders on generator

commit 31735bd	refs/heads/master
Author: Miguel Herranz 
Date:   2012-08-17 21:20:20 +0200

    Update to activerecord-deprecated_finders on generator

M	railties/lib/rails/generators/app_base.rb

commit d6dbd7f	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-17 10:19:33 -0700

    Merge pull request #7352 from aripollak/microsecond-timestamp
    
    Fix occasional microsecond conversion inaccuracy
    Conflicts:
    	activerecord/CHANGELOG.md

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/fixtures/topics.yml

commit 1f633c7	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 18:40:39 +0100

    Pull more serialize code into a lazy included module

M	activerecord/lib/active_record/attribute_methods/serialization.rb

commit 5ecb02f	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 18:20:12 +0100

    don't call method unless we need to

M	activerecord/lib/active_record/attribute_assignment.rb

commit 49cb4ed	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 18:16:32 +0100

    align them assignments

M	activerecord/lib/active_record/attribute_assignment.rb

commit 8cbad02	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 18:14:44 +0100

    Optimize for the happy path
    
    Checking respond_to? incurs overhead, and most of the time when
    assigning attributes it will return true. So just handle the
    NoMethodError instead.

M	activerecord/lib/active_record/attribute_assignment.rb

commit 2ff47c4	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 17:09:39 +0100

    Avoid #any?
    
    any? will check that each item in the array is truthy, as opposed to
    !empty? which will simply check that the array has length. For an empty
    array, !empty? still seems to be faster than any?

M	activerecord/lib/active_record/core.rb

commit 8fcd9b6	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 16:38:55 +0100

    The default value can be set once in #column_defaults
    
    Rather than doing it every time an instance is instantiated.

M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model_schema.rb

commit f396c01	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 16:20:48 +0100

    Optimize instantiation for models which don't use serialize
    
    Those z's were hard to type.

M	activerecord/lib/active_record/attribute_methods/serialization.rb

commit 1b2c907	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 15:58:13 +0100

    Avoid deep_dup when intantiating.
    
    deep_dup is slow. we only need to dup the values, so just do that
    directly.

M	activerecord/lib/active_record/core.rb

commit 3e8ab91	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-17 10:21:21 -0700

    column default extraction should handle newlines.
    
    Fixes #7374

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/migration/column_attributes_test.rb

commit 8f4ee48	refs/heads/master
Merge: cbbf6bf 53ca22f
Author: Rafael Mendonça França 
Date:   2012-08-17 10:19:33 -0700

    Merge pull request #7352 from aripollak/microsecond-timestamp
    
    Fix occasional microsecond conversion inaccuracy

commit b127d86	refs/heads/master
Author: Ernie Miller 
Date:   2012-08-17 11:31:23 -0400

    Fix merge error when Equality LHS is non-attribute
    
    This is at best a band-aid for a more proper fix, since it won't truly
    handle the removal of the previous equality condition of these other
    nodes. I'm planning to put in some work on ARel toward supporting that
    goal.
    
    Related: rails/arel#130, ernie/squeel#153, ernie/squeel#156

M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/test/cases/relations_test.rb

commit cbbf6bf	refs/heads/master
Merge: c6bbc10 ed491ae
Author: Vijay Dev 
Date:   2012-08-17 07:47:04 -0700

    Merge pull request #7373 from hollowspace/patch-1
    
    Fix slightly broken Markdown syntax in actionpack/CHANGELOG.md

commit e08268b	refs/tags/v3.1.9
Author: Jon Leighton 
Date:   2012-08-17 13:52:16 +0100

    Increase benchmark time to 20 seconds.
    
    I think that 5 seconds was a bit low for our purposes.
    
    Also enable it to be configured via env vars.
    
    We also need to scale the number of records up/down depending on how
    long we're running the benchmark for.
    
    Conflicts:
    	activerecord/examples/performance.rb

M	activerecord/examples/performance.rb

commit 25f6549	refs/tags/v3.2.9.rc2
Author: Jon Leighton 
Date:   2012-08-17 13:52:16 +0100

    Increase benchmark time to 20 seconds.
    
    I think that 5 seconds was a bit low for our purposes.
    
    Also enable it to be configured via env vars.
    
    We also need to scale the number of records up/down depending on how
    long we're running the benchmark for.

M	activerecord/examples/performance.rb

commit c6bbc10	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 13:52:16 +0100

    Increase benchmark time to 20 seconds.
    
    I think that 5 seconds was a bit low for our purposes.
    
    Also enable it to be configured via env vars.
    
    We also need to scale the number of records up/down depending on how
    long we're running the benchmark for.

M	activerecord/examples/performance.rb

commit 20d6f70	refs/tags/v3.1.9
Author: Jon Leighton 
Date:   2012-08-17 11:41:50 +0100

    Use benchmark/ips to measure AR performance
    
    This means we can more easily compare numbers, and we don't have to
    specify a single N for all reports, which previously meant that some
    tests were running many more/fewer iterations than necessary.
    
    Conflicts:
    	Gemfile
    	activerecord/examples/performance.rb

M	Gemfile
M	activerecord/examples/performance.rb

commit bfff0ed	refs/tags/v3.2.9.rc2
Author: Jon Leighton 
Date:   2012-08-17 11:41:50 +0100

    Use benchmark/ips to measure AR performance
    
    This means we can more easily compare numbers, and we don't have to
    specify a single N for all reports, which previously meant that some
    tests were running many more/fewer iterations than necessary.

M	Gemfile
M	activerecord/examples/performance.rb

commit 1411fc1	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 11:41:50 +0100

    Use benchmark/ips to measure AR performance
    
    This means we can more easily compare numbers, and we don't have to
    specify a single N for all reports, which previously meant that some
    tests were running many more/fewer iterations than necessary.

M	Gemfile
M	activerecord/examples/performance.rb

commit 17bb324	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-17 10:21:52 +0100

    Renaming active_record_deprecated_finders to activerecord-deprecated_finders
    
    For consistency with the other AR extension plugins we are creating.

M	Gemfile
M	activerecord/CHANGELOG.md
M	activerecord/activerecord.gemspec
M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb

commit ed491ae	refs/heads/master
Author: hollowspace 
Date:   2012-08-17 06:53:35 +0400

    Fix slightly broken Markdown syntax in actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md

commit cfd7f4e	refs/heads/master
Merge: 2a42b12 2e4f798
Author: Rafael Mendonça França 
Date:   2012-08-16 16:59:04 -0300

    Merge pull request #7024 from bogdan/strict_validation_custom_exception
    
    AM::Validation#validates: custom exception for :strict option
    
    Conflicts:
    	activemodel/CHANGELOG.md

commit 2a42b12	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-16 16:04:18 -0300

    Remove the active_model require from action_dispatch.
    
    Since we removed the ActiveModel dependenxy from ActionPack at
    166dbaa7526a96fdf046f093f25b0a134b277a68 we don't need to require it
    anymore.
    
    Closes #7370

M	actionpack/lib/action_dispatch.rb

commit 7c58425	refs/heads/master
Author: Evan Farrar 
Date:   2012-08-15 19:52:52 -0400

    Make a doc example output in match actual output
    
    Make doc output in grouped_options_for_select divider example match
    actual output. The options groups were in backwards order of actual.

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 4f12e3a	refs/tags/v3.1.9
Author: Rafael Mendonça França 
Date:   2012-08-15 19:04:55 -0300

    Remove warning when using html_escape with Ruby 1.9.
    
    Closes #7323

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit a38d4d4	refs/heads/master
Author: Vijay Dev 
Date:   2012-08-16 00:23:36 +0530

    remove reference to humans.txt from release notes
    
    This was reverted in https://github.com/rails/rails/commit/fb883318c8b82b3570cee022ddf6886f9052245d

M	guides/source/4_0_release_notes.textile

commit 176f088	refs/heads/master
Merge: ebb4a3d 62499bc
Author: Vijay Dev 
Date:   2012-08-16 00:07:17 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 62499bc	refs/heads/master
Author: Vijay Dev 
Date:   2012-08-16 00:05:47 +0530

    copy edits [ci skip]

M	actionpack/lib/action_view/helpers/url_helper.rb
M	railties/lib/rails/generators/rails/app/templates/config/locales/en.yml

commit 925f07f	refs/heads/master
Author: Vijay Dev 
Date:   2012-08-15 23:48:41 +0530

    tiny formatting fix in i18n guide [ci skip]

M	guides/source/i18n.textile

commit 53ca22f	refs/heads/master
Author: Ari Pollak 
Date:   2012-08-14 16:33:06 -0400

    Fix occasional microsecond conversion inaccuracy
    
    ActiveRecord::ConnectionAdapters::Column#microseconds did an unnecessary
    conversion to from Rational to float when calculating the integer number
    of microseconds. Some terminating decimal numbers in base10 are
    repeating decimal numbers in base2 (the format of float), and
    occasionally this causes a rounding error.
    Patch & explanation originally from Logan Bowers.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/fixtures/topics.yml

commit ebb4a3d	refs/heads/master
Merge: bf5f656 6446e84
Author: Carlos Antonio da Silva 
Date:   2012-08-15 09:15:31 -0700

    Merge pull request #7244 from lucasuyezu/master
    
    Fix indentation on template errors to consider line number character count.
    
    For instance, when an error is shown, if the related source code snippet has line numbers from, lets say, 8-12, the lines are left aligned, which means the code indent is wrong:
    
        8: foo
        9: bar
        10: raise
        11: baz
        12: ...
    
    This changes it to right align the source code snippet, so that the indentation is correct:
    
         8: foo
         9: bar
        10: raise
        11: baz
        12: ...

commit 8181b72	refs/tags/v3.1.9
Author: Carlos Antonio da Silva 
Date:   2012-08-15 12:53:05 -0300

    Add html_escape note to CHANGELOG
    
    This was added to all other branches, but 3-1 missed the entry.
    
    3-0-stable: 954e26263681896312b9133e07db3123e8b13c03
    3-2-stable: ae2383d90a9646e36c8b5d92801fba284ea62ec0
    master: 5c07be5f7fb7e6417c09751c7fb9bb98a63d9917

M	activesupport/CHANGELOG.md

commit 4e31f82	refs/tags/v3.2.9.rc2
Author: Carlos Antonio da Silva 
Date:   2012-08-15 12:48:38 -0300

    Remove duplicated changelog entry [ci skip]

M	activerecord/CHANGELOG.md

commit bf5f656	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-15 12:48:38 -0300

    Remove duplicated changelog entry [ci skip]

M	activerecord/CHANGELOG.md

commit dd64f0a	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-15 12:47:20 -0300

    Move changelog entry to the top [ci skip]

M	activerecord/CHANGELOG.md

commit cf232e3	refs/heads/master
Merge: 0d0d462 f280964
Author: Carlos Antonio da Silva 
Date:   2012-08-15 08:45:15 -0700

    Merge pull request #7133 from roshats/fix_update_all_with_blank_argument
    
    Change Relation#update_all with blank argument to raise an ArgumentError
    instead of trying an update with empty fields.

commit b4dce47	refs/tags/v3.2.9.rc2
Merge: 8055cd6 bccc35b
Author: Carlos Antonio da Silva 
Date:   2012-08-15 08:39:37 -0700

    Merge pull request #7027 from erichmenge/patch/jruby_send_file
    
    Backport 5c51cd0 to fix an issue with jRuby encodings. Fixes #6844

commit 8055cd6	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-15 11:28:22 -0300

    Do not use update_column where update_attribute is not interchangeable
    
    Revert "Deprecate update_attribute."
    
    This reverts commit b081f6b59fb3f15d12043072ad9b331ffd2bc56e.
    
    Reason: Since the new deprecation policy we removed the deprecation of
    update_attribute but we didn't reverted the changes to use
    update_column.
    
    Fixes #7306

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit bccc35b	refs/tags/v3.2.9.rc2
Author: Jeremy Kemper 
Date:   2012-04-12 09:52:41 -0700

    Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/data_streaming.rb

commit 6e84026	refs/heads/master
Author: Erich Menge 
Date:   2012-08-15 08:21:30 -0500

    Minor language fix. [ci skip]

M	actionpack/lib/action_controller/metal/data_streaming.rb

commit 0d0d462	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-14 22:09:43 -0500

    Add Request#formats=(extensions) that lets you set multiple formats directly in a prioritized order

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/http/mime_negotiation.rb

commit 38e3e1a	refs/heads/master
Author: Mikhail 
Date:   2012-08-14 20:54:28 -0400

    corrected grammar [ci skip]

M	guides/source/action_controller_overview.textile

commit 6f7b651	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-15 01:39:00 +0200

    revises the contributing guide to document and encourage using the Rails development box

M	guides/source/contributing_to_ruby_on_rails.textile

commit f280964	refs/heads/master
Author: Roman Shatsov 
Date:   2012-07-23 11:33:21 +0300

    raise ArgumentError if list of attributes to change is empty in update_all

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 1ee306d	refs/heads/master
Merge: b364196 4c8fba1
Author: Rafael Mendonça França 
Date:   2012-08-14 10:02:24 -0700

    Merge pull request #7349 from steveklabnik/master
    
    No longer require AS::TestCase

commit 4c8fba1	refs/heads/master
Author: Steve Klabnik 
Date:   2012-08-14 08:48:40 -0700

    We don't need to require AS::TestCase
    
    This was only needed due to
    https://github.com/rails/rails/blob/6591a10b1f6eccc91bc01ab708050884058e9665/railties/lib/rails/console_app.rb#L6
    
    We don't need that on master.
    
    Fixes #6907.

M	railties/lib/rails/console/app.rb

commit b364196	refs/heads/master
Merge: 89cc4f1 78f5874
Author: Carlos Antonio da Silva 
Date:   2012-08-14 04:10:19 -0700

    Merge pull request #7184 from anthonyalberto/xml_dasherize_include
    
    to_xml dasherize option should be passed to included associations

commit 89cc4f1	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-14 04:05:37 -0300

    Some release notes love :heart:

M	guides/source/4_0_release_notes.textile

commit 738bd0a	refs/heads/master
Author: Soon Van 
Date:   2012-08-13 23:57:53 -0400

    add breathing to reading sentences for flow, cut down the run-ons [ci skip]

M	guides/source/action_mailer_basics.textile
M	guides/source/active_model_basics.textile

commit 78f5874	refs/heads/master
Author: Anthony 
Date:   2012-07-27 15:13:05 -0400

    Following the false issue reporting I did here : https://github.com/rails/rails/issues/6958
    
    - Enable propagation of :skip_types, :dasherize and :camelize on included models by default
    - Adding the option to override this propagation on a per-include basis (:include => { :model => { :dasherize => false } }
    - Enough tests to prove it works
    - Updated activemodel CHANGELOG.md
    
    Squashed my commits

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/test/cases/serializers/xml_serialization_test.rb

commit 2d9dbf4	refs/heads/master
Merge: fa736e6 0bd7b07
Author: Rafael Mendonça França 
Date:   2012-08-13 21:44:13 -0300

    Merge branch 'concerns'

commit 0bd7b07	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-10 00:06:16 -0300

    Add CHANGELOG entry and documentation for Routing Concerns

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	guides/source/routing.textile

commit 546497d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-13 19:02:00 -0300

    Extract common controllers to abstract_unit

M	actionpack/test/abstract_unit.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/dispatch/routing/concerns_test.rb

commit 0dd2472	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-09 19:12:43 -0300

    Implementing Routing Concerns
    
    This pattern was introduced as a plugin by @dhh.
    
    The original implementation can be found in
    https://github.com/rails/routing_concerns

M	actionpack/lib/action_dispatch/routing/mapper.rb
A	actionpack/test/dispatch/routing/concerns_test.rb

commit 6446e84	refs/heads/master
Author: Lucas Uyezu 
Date:   2012-08-02 21:23:06 -0300

    Indentation should consider line number character count.

M	actionpack/lib/action_view/template/error.rb
A	actionpack/test/fixtures/test/_raise_indentation.html.erb
M	actionpack/test/template/render_test.rb

commit fa736e6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-13 17:15:20 -0400

    oops, should be directory

M	railties/lib/rails/tasks/tmp.rake

commit 38a3fed	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-13 14:20:04 -0400

    push header merge down to a private method so that live responses can have their own header object

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/dispatch/live_response_test.rb

commit 8f0541b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-13 13:57:26 -0400

    live response headers can be merged with a hash

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/test/dispatch/live_response_test.rb

commit 621e079	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-13 13:27:39 -0400

    speed up cache directory creation
    
    Let Rake control the cache directories.  If the directory already
    exists, rake will skip creating it (vs the previous task which would
    always try to mkdir_p)

M	railties/lib/rails/tasks/tmp.rake

commit 52f90ea	refs/heads/master
Merge: 1ce6409 1edc7cd
Author: Rafael Mendonça França 
Date:   2012-08-13 10:03:01 -0700

    Merge pull request #7343 from egtann/master
    
    Add start_hour and end_hour options for select_hour helper

commit 1edc7cd	refs/heads/master
Author: Evan Tann 
Date:   2012-08-12 15:53:54 -0400

    Add support for start_hour and end_hour options in select_hour helper
    
    Updated documentation to demonstrate start_hour and end_hour options

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit d24e380	refs/heads/master
Author: Soon Van 
Date:   2012-08-13 00:33:30 -0400

    space for stack overflow; not when you get into things [ci skip]

M	guides/source/kindle/KINDLE.md
M	guides/source/kindle/welcome.html.erb

commit 1ce6409	refs/heads/master
Merge: bf646b3 6fe36ba
Author: Aaron Patterson 
Date:   2012-08-12 18:42:33 -0700

    Merge pull request #7338 from sax/master
    
    Evented notifications should take priority over Timed

commit bf646b3	refs/heads/master
Merge: a84ca22 d9c9d68
Author: Rafael Mendonça França 
Date:   2012-08-12 13:31:05 -0700

    Merge pull request #7341 from edward/patch-1
    
    Grammar fix in ActionView Form Tag Helper docs/comments

commit d9c9d68	refs/heads/master
Author: Edward Ocampo-Gooding 
Date:   2012-08-12 17:26:13 -0300

    Grammar fix in ActionView docs/comments

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 1cd257a	refs/heads/master
Author: Philipp Weißensteiner 
Date:   2012-08-12 21:49:12 +0200

    Add mini-profiler to performance testing, useful links

M	guides/source/performance_testing.textile

commit a84ca22	refs/heads/master
Merge: 15184d8 f7f7084
Author: Xavier Noria 
Date:   2012-08-12 11:32:08 -0700

    Merge pull request #7339 from maletor/patch-1
    
    Missing closing tag

commit f7f7084	refs/heads/master
Author: Ellis Berner 
Date:   2012-08-12 11:26:56 -0700

    Missing closing tag

M	actionpack/lib/action_controller/metal/force_ssl.rb

commit 786713a	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-11 19:08:16 -0700

    Merge pull request #6073 from daveyeu/restore-state-on-record-invalid
    
    Restore state on create when ActiveRecord::RecordInvalid is raised
    Conflicts:
    	activerecord/CHANGELOG.md

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/transactions_test.rb

commit 8ab7093	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-11 23:20:32 -0300

    Minor punctuation fix in api documentation guide [ci skip]

M	guides/source/api_documentation_guidelines.textile

commit 15184d8	refs/heads/master
Merge: a513cc1 a4801a7
Author: Rafael Mendonça França 
Date:   2012-08-11 19:08:16 -0700

    Merge pull request #6073 from daveyeu/restore-state-on-record-invalid
    
    Restore state on create when ActiveRecord::RecordInvalid is raised

commit a4801a7	refs/heads/master
Author: Dave Yeu 
Date:   2012-04-29 22:38:32 -0400

    Restore state on create when ActiveRecord::RecordInvalid is raised
    
    This fixes issue #3217.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/transactions_test.rb

commit 6fe36ba	refs/heads/master
Author: Eric Saxby 
Date:   2012-08-11 17:39:20 -0700

    Evented notifications take priority over Timed notifications
    
    In cases where a notification subscriber includes methods to support
    both Evented and Timed events, Evented should take priority over Timed.
    This allows subscribers to be backwards compatible (older Rails only
    allows Timed events) while defaulting to newer behavior.

M	activesupport/lib/active_support/notifications/fanout.rb
M	activesupport/test/notifications/evented_notification_test.rb

commit 20f18cb	refs/tags/v3.2.9.rc2
Merge: dad717a 2e04a34
Author: Rafael Mendonça França 
Date:   2012-08-11 12:57:43 -0700

    Merge pull request #7316 from brainopia/backport_fix_session_store_options
    
    Backport of "Support cookie jar options for all cookie stores" for 3.2-stable

commit 2e04a34	refs/tags/v3.2.9.rc2
Author: brainopia 
Date:   2012-08-11 23:19:12 +0400

    Update changelog to reflect support of cookie jar options for all
    session stores

M	actionpack/CHANGELOG.md

commit a513cc1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-11 14:13:54 -0300

    Ensure option_html_attributes does not modify the given option hashes
    
    We can avoid creating extra hashes with #merge, and use #merge! instead.

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit e8e8617	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-11 14:04:21 -0300

    Simplify html attributes generation for options_for_select
    
    Further simplify the option_html_attributes method after the changes
    introduced in dacbcbe55745aa9e5484b10b11f65ccca7db1c54 to not escape the
    html options here (since they're going to be escaped down the chain in
    content tag).

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit ce06b8a	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-11 13:33:27 -0300

    Refactor model name logic and make it a real private class method
    
    Under a "private" call, class methods are not real private methods,
    they're public just like any other method.
    
    Make model_name_from_record_or_class a private class method, and nodoc it.

M	activemodel/lib/active_model/naming.rb

commit 8781b26	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-11 13:11:01 -0300

    Sync CHANGELOGs [ci skip]

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activesupport/CHANGELOG.md

commit 347f8c5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-11 12:55:55 -0300

    Add CHANGELOG entry for #7314

M	actionpack/CHANGELOG.md

commit 1d46163	refs/heads/master
Merge: adf3ea3 21b5b6a
Author: Vijay Dev 
Date:   2012-08-11 05:12:48 -0700

    Merge pull request #7331 from morgoth/changelog-for-engine-table-name-prefix-generator-fix
    
    Added changelog entry for table name prefix fix [ci skip]

commit 21b5b6a	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2012-08-11 14:00:40 +0200

    Added changelog entry for table name prefix fix [ci skip]

M	activerecord/CHANGELOG.md

commit dad717a	refs/tags/v3.2.9.rc2
Author: Piotr Sarnacki 
Date:   2012-08-11 12:43:55 +0200

    [guides] Add info about CHANGELOGs to contributing guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit adf3ea3	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-11 12:43:55 +0200

    [guides] Add info about CHANGELOGs to contributing guide

M	guides/source/contributing_to_ruby_on_rails.textile

commit 457b7ff	refs/heads/master
Author: Soon Van 
Date:   2012-08-11 02:19:51 -0400

    proper casing in pronouns; relocate the pro git book [ci skip]
    
    - Cases in point - GitHub, Git, Twitter and Rails should start
      with capitals when used outside code context
    - Pro Git found - URL has been updated for its new home
    - Faces for links - More descriptive titles on link prompt
      instead of "here"

M	RELEASING_RAILS.rdoc
M	guides/source/contributing_to_ruby_on_rails.textile
M	guides/source/initialization.textile
M	guides/source/plugins.textile

commit 56627b6	refs/heads/master
Merge: b6e00c6 47b4d13
Author: Carlos Antonio da Silva 
Date:   2012-08-11 00:55:01 -0300

    Merge branch 'number-helpers-defaults'
    
    Closes #6290

commit 47b4d13	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-24 20:02:52 -0300

    Ensure I18n format values always have precedence over defaults
    
    Always merge I18n format values, namespaced or not, over the default
    ones, to ensure I18n format defaults will have precedence over our
    namespaced values.
    
    Precedence should happen like this:
    
        default :format
        default :namespace :format
        i18n    :format
        i18n    :namespace :format
    
    Because we cannot allow our namespaced default to override a I18n
    :format config - ie precision in I18n :format should always have higher
    precedence than our default precision for a particular :namespace.
    
    Also simplify default format options logic.

M	activesupport/lib/active_support/number_helper.rb
M	activesupport/test/number_helper_i18n_test.rb
M	activesupport/test/number_helper_test.rb

commit a9dccda	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-23 20:05:42 -0300

    Fallback to :en locale instead of handling a constant with defaults
    
    Action Pack already comes with a default locale fine for :en, that is
    always loaded. We can just fallback to this locale for defaults, if
    values for the current locale cannot be found.
    
    Closes #4420, #2802, #2890.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/locale/en.yml
M	activesupport/lib/active_support/number_helper.rb
M	activesupport/test/number_helper_i18n_test.rb
M	activesupport/test/number_helper_test.rb
M	guides/source/4_0_release_notes.textile

commit b6e00c6	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-11 00:10:11 -0300

    Bring back changelog entries for Active Support
    
    Removed in 0228a73b1094a3e19ad291d2ce4789890c09578a, pull request #7310.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/object/try.rb

commit a6e0d8c	refs/heads/master
Merge: feff27d 60b650b
Author: Rafael Mendonça França 
Date:   2012-08-10 20:09:21 -0700

    Merge pull request #7314 from schneems/schneems/form_for_error
    
    Check for Blank Record in form_for

commit feff27d	refs/heads/master
Merge: ac7e170 684b648
Author: Rafael Mendonça França 
Date:   2012-08-10 20:08:09 -0700

    Merge pull request #7329 from guilleiguaran/move-default-headers-ad-railtie
    
    Move AD default_headers configurations to railtie

commit 60b650b	refs/heads/master
Author: schneems 
Date:   2012-08-09 23:59:25 -0500

    check for nil or empty record in form_for
    
    if nil or an empty array is passed into form_for you get a horrible error message, this one is much more indicative of what the programmer needs to know to fix the problem.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 684b648	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-08-10 21:41:57 -0500

    Add doc for config.action_dispatch.default_headers
    
    Add documentation for config.action_dispatch.default_headers to
    Rails Configuring guide.

M	guides/source/configuring.textile

commit ac7e170	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-10 23:58:41 -0300

    Further refactor build_conditions in route set
    
    Return the conditions from the keep_if call, and ignore the value
    argument since it's not being used.

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit c347236	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-08-10 21:11:56 -0500

    Move AD default_headers configurations to railtie
    
    ActionDispatch railtie is a better place for
    config.action_dispatch.default_headers settings, users can continue
    overriding those settings in their configuration files if needed.

M	actionpack/lib/action_dispatch/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 4c711f1	refs/heads/master
Author: Franco Catena 
Date:   2012-08-10 21:51:07 -0300

    Fix caching guide (plural model name) [ci skip]

M	guides/source/caching_with_rails.textile

commit a63fc94	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 23:45:25 +0100

    fixup guides in light of :dependent changes

M	activerecord/lib/active_record/associations.rb
M	guides/source/association_basics.textile
M	guides/source/configuring.textile

commit 6e57d5c	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 17:42:48 +0100

    Use method compilation for association methods
    
    Method compilation provides better performance and I think the code
    comes out cleaner as well.
    
    A knock on effect is that methods that get redefined produce warnings. I
    think this is a good thing. I had to deal with a bunch of warnings
    coming from our tests, though.

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/builder/singular_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/multiple_db_test.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/member.rb
M	activerecord/test/support/connection.rb

commit 5b3bb61	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-08-10 23:27:51 +0200

    Fix handling SCRIPT_NAME from within mounted engine's
    
    When you mount your application at a path, for example /myapp, server
    should set SCRIPT_NAME to /myapp. With such information, rails
    application knows that it's mounted at /myapp path and it should generate
    routes relative to that path.
    
    Before this patch, rails handled SCRIPT_NAME correctly only for regular
    apps, but it failed to do it for mounted engines. The solution was to
    hardcode default_url_options[:script_name], which is not the best answer
    - it will work only when application is mounted at a fixed path.
    
    This patch fixes the situation by respecting original value of
    SCRIPT_NAME when generating application's routes from engine and the
    other way round - when you generate engine's routes from application.
    
    This is done by using one of 2 pieces of information in env - current
    SCRIPT_NAME or SCRIPT_NAME for a corresponding router. This is because
    we have 2 cases to handle:
    
    - generating engine's route from application: in this situation
      SCRIPT_NAME is basically SCRIPT_NAME set by the server and it
      indicates the place where application is mounted, so we can just pass
      it as :original_script_name in url_options. :original_script_name is
      used because if we use :script_name, router will ignore generating
      prefix for engine
    
    - generating application's route from engine: in this situation we
      already lost information about the SCRIPT_NAME that server used. For
      example if application is mounted at /myapp and engine is mounted at
      /blog, at this point SCRIPT_NAME is equal /myapp/blog. Because of that
      we need to keep reference to /myapp SCRIPT_NAME by binding it to the
      current router. Later on we can extract it and use when generating url
    
    Please note that starting from now you *should not* use
    default_url_options[:script_name] explicitly if your server already
    passes correct SCRIPT_NAME to rack env.
    
    (closes #6933)

M	actionpack/lib/action_controller/metal/url_for.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/prefix_generation_test.rb
M	railties/CHANGELOG.md
M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/mounted_engine_test.rb

commit 3307a2e	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-10 15:06:58 -0300

    Add CHANGELOG entry for #7286

M	activerecord/CHANGELOG.md

commit 2e00074	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-10 09:25:33 -0700

    Merge pull request #7286 from kennyj/fix_7191
    
    Fix #7191. Remove unnecessary transaction when assigning has_one associations.
    Conflicts:
    	activerecord/test/cases/associations/has_one_associations_test.rb

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit f255711	refs/heads/master
Merge: 09d2671 79a0c8c
Author: Santiago Pastorino 
Date:   2012-08-10 10:32:06 -0700

    Merge pull request #7321 from bogdan/refactor_routes_set
    
    RouteSet: refactor internals

commit 09d2671	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 18:12:26 +0100

    remove some artifacts of dependent_restrict_raises that I missed

M	railties/test/generators/app_generator_test.rb
M	railties/test/isolation/abstract_unit.rb

commit 6bb8afb	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 16:38:51 +0100

    DRY up handling of dependent option

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb

commit 825c05d	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 16:23:02 +0100

    Unprivatise all the things
    
    Well, not all of them, but some of them.
    
    I don't think there's much reason for these methods to be private.

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/builder/singular_association.rb

commit ea8181b	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 16:00:09 +0100

    move dependency logic out of generated methods

M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb

commit 08fb3c8	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 13:09:12 +0100

    Clean up dependent option validation.
    
    We don't need the complexity of to_sentence, and it shouldn't be a bang
    method.

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb

commit 5ad7998	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-10 12:33:51 +0100

    Remove the dependent_restrict_raises option.
    
    It's not really a good idea to have this as a global config option. We
    should allow people to specify the behaviour per association.
    
    There will now be two new values:
    
    * :dependent => :restrict_with_exception implements the current
      behaviour of :restrict. :restrict itself is deprecated in favour of
      :restrict_with_exception.
    * :dependent => :restrict_with_error implements the new behaviour - it
      adds an error to the owner if there are dependent records present
    
    See #4727 for the original discussion of this.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/models/company.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit d1835db	refs/heads/master
Merge: 0b11dbe 42dd5d9
Author: Rafael Mendonça França 
Date:   2012-08-10 09:25:33 -0700

    Merge pull request #7286 from kennyj/fix_7191
    
    Fix #7191. Remove unnecessary transaction when assigning has_one associations.

commit 0b11dbe	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-08-10 13:19:06 -0300

    Add 'X-Frame-Options' => 'SAMEORIGIN' and 'X-XSS-Protection' => '1; mode=block' CHANGELOG entry

M	actionpack/CHANGELOG.md

commit 79a0c8c	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-08-10 11:54:47 +0300

    RouteSet: refactor internals
    
    No need to build valid_conditions array.
    We can get all the data in place.

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 5a0372f	refs/heads/master
Merge: 581a927 e157903
Author: Aaron Patterson 
Date:   2012-08-09 23:06:22 -0700

    Merge pull request #7315 from brainopia/fix_assertion
    
    Fix mistake in assertion about content of permanent cookie

commit ca07bc0	refs/tags/v3.2.9.rc2
Author: brainopia 
Date:   2012-08-10 09:48:26 +0400

    Test actual content of permanent cookie

M	actionpack/test/dispatch/cookies_test.rb

commit bbe634e	refs/tags/v3.2.9.rc2
Author: brainopia 
Date:   2012-04-30 16:55:06 +0400

    Dont stream back cookie value if it was set to the same value

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 058dc9a	refs/tags/v3.2.9.rc2
Author: brainopia 
Date:   2012-08-10 09:59:37 +0400

    Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores""
    
    This reverts commit a48ea6800ef712440b08c551f8041feb35de8cb4.

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/test/activerecord/active_record_store_test.rb

commit e157903	refs/heads/master
Author: brainopia 
Date:   2012-08-10 09:48:26 +0400

    Test actual content of permanent cookie

M	actionpack/test/dispatch/cookies_test.rb

commit 581a927	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-09 18:05:54 -0700

    set the controller under test so we no longer need the reset! method

M	actionpack/test/controller/caching_test.rb

commit 5c07be5	refs/heads/master
Merge: d8cf713 0228a73
Author: Santiago Pastorino 
Date:   2012-08-09 16:57:49 -0700

    Merge pull request #7310 from amerine/master
    
    Add html_escape note to CHANGELOG

commit ae2383d	refs/tags/v3.2.9.rc2
Merge: 7987e74 e8c0d73
Author: Santiago Pastorino 
Date:   2012-08-09 16:57:38 -0700

    Merge pull request #7309 from amerine/3-2-stable
    
    Add html_escape note to CHANGELOG

commit 954e262	refs/tags/v3.0.18
Merge: 77977f3 cf6bb2a
Author: Santiago Pastorino 
Date:   2012-08-09 16:57:30 -0700

    Merge pull request #7308 from amerine/3-0-stable
    
    Add html_escape note to CHANGELOG

commit 0228a73	refs/heads/master
Author: Mark Turner 
Date:   2012-08-09 16:54:52 -0700

    Add html_escape note to CHANGELOG

M	activesupport/CHANGELOG.md

commit e8c0d73	refs/tags/v3.2.9.rc2
Author: Mark Turner 
Date:   2012-08-09 16:48:57 -0700

    Add html_escape note to CHANGELOG

M	activesupport/CHANGELOG.md

commit cf6bb2a	refs/tags/v3.0.18
Author: Mark Turner 
Date:   2012-08-09 16:47:05 -0700

    Add html_escape note to CHANGELOG

M	activesupport/CHANGELOG

commit d8cf713	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-08-08 14:33:39 -0700

    Do not mark strip_tags result as html_safe
    
    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465

M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/test/template/sanitize_helper_test.rb

commit c63d17c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-09 14:46:57 -0700

    push drawing once to it's own module

M	actionpack/test/abstract_unit.rb

commit 1e8c0a2	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-09 14:30:26 -0700

    refactor the before_setup hooks to a module

M	actionpack/test/abstract_unit.rb

commit 0b29c7b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-09 14:25:35 -0700

    switch callbacks to minitest hooks

M	actionpack/test/abstract_unit.rb

commit 7987e74	refs/tags/v3.2.9.rc2
Merge: 0f9a6a7 64146cf
Author: Santiago Pastorino 
Date:   2012-08-09 18:15:59 -0300

    Merge branch '3-2-8' into 3-2-stable

commit 6794e92	refs/heads/master
Merge: 6a3d469 98c18d0
Author: Aaron Patterson 
Date:   2012-08-09 13:38:29 -0700

    Merge pull request #7302 from homakov/default_headers
    
    Introduce default_headers. closes #6311 #6515

commit 64146cf	refs/tags/v3.2.8 (tag: v3.2.8)
Author: Santiago Pastorino 
Date:   2012-08-09 16:26:36 -0300

    Bump to 3.2.8

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit ddedf5d	refs/tags/v3.2.8
Author: Santiago Pastorino 
Date:   2012-08-09 16:25:43 -0300

    Add release date to CHANGELOGs

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 38bf9cf	refs/tags/v3.1.8 (tag: v3.1.8)
Author: Santiago Pastorino 
Date:   2012-08-09 16:22:39 -0300

    Bump to 3.1.8

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit e8d78e7	refs/tags/v3.1.8
Author: Santiago Pastorino 
Date:   2012-08-09 16:20:17 -0300

    Add CHANGELOG entries

M	actionmailer/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 77977f3	refs/tags/v3.0.17 (tag: v3.0.17)
Author: Santiago Pastorino 
Date:   2012-08-09 16:17:08 -0300

    Bump to 3.0.17

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 6eda26a	refs/tags/v3.0.17
Author: Santiago Pastorino 
Date:   2012-08-09 16:09:22 -0300

    Add CHANGELOG entries

M	actionmailer/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit e91e4e8	refs/tags/v3.2.8
Author: Santiago Pastorino 
Date:   2012-08-08 14:33:39 -0700

    Do not mark strip_tags result as html_safe
    
    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/test/template/sanitize_helper_test.rb

commit 63e67ea	refs/tags/v3.1.8
Author: Santiago Pastorino 
Date:   2012-08-08 14:33:39 -0700

    Do not mark strip_tags result as html_safe
    
    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/test/template/sanitize_helper_test.rb

commit 1151959	refs/tags/v3.0.17
Author: Santiago Pastorino 
Date:   2012-08-08 14:33:39 -0700

    Do not mark strip_tags result as html_safe
    
    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/test/template/sanitize_helper_test.rb

commit b6a0a11	refs/tags/v3.1.8
Author: Santiago Pastorino 
Date:   2012-08-08 15:10:35 -0700

    escape select_tag :prompt values
    
    CVE-2012-3463

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 6d0526d	refs/tags/v3.2.8
Author: Santiago Pastorino 
Date:   2012-08-08 15:10:35 -0700

    escape select_tag :prompt values
    
    CVE-2012-3463

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit c979587	refs/tags/v3.0.17
Author: Santiago Pastorino 
Date:   2012-08-08 15:20:47 -0700

    escape select_tag :prompt values
    
    CVE-2012-3463

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 6a3d469	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-09 11:21:58 -0700

    initialize instance variables

M	actionpack/lib/action_dispatch/http/parameters.rb
M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/http/url.rb

commit 0f9a6a7	refs/tags/v3.2.9.rc2
Merge: 2e98e0f 5c2fc69
Author: Rafael Mendonça França 
Date:   2012-08-09 13:59:49 -0300

    Merge pull request #7299 from iHiD/3-2-stable-store
    
    Ported PR #4856 to 3-2-stable.

commit 5c2fc69	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-09 13:58:57 -0300

    Add CHANGELOG entry

M	activerecord/CHANGELOG.md

commit af6dfdb	refs/tags/v3.2.9.rc2
Author: Jeremy Walker 
Date:   2012-08-09 15:04:27 +0100

    Backport #7173.

M	activerecord/test/schema/schema.rb

commit e463351	refs/heads/master
Author: schneems 
Date:   2012-08-09 10:10:39 -0500

    Document the namespacing of controller actions per this discussion:
    
    https://github.com/rails/journey/issues/40

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 98c18d0	refs/heads/master
Author: Egor Homakov 
Date:   2012-08-09 17:12:11 +0300

    some tests

M	actionpack/test/dispatch/response_test.rb

commit 2a290f7	refs/heads/master
Author: Egor Homakov 
Date:   2012-08-09 16:45:30 +0300

    introduce default_headers config

M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 2a6039a	refs/tags/v3.2.9.rc2
Author: Jeremy Walker 
Date:   2012-08-09 12:44:59 +0100

    Ported PR #4856 to 3-2-stable.

M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb
M	activerecord/test/models/admin/user.rb
M	activerecord/test/schema/schema.rb

commit 37a764b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-08 17:41:50 -0700

    use a sized buffer to prevent the queue being too large

M	actionpack/lib/action_controller/metal/live.rb

commit 2da242f	refs/heads/master
Merge: b8903f3 920d9ee
Author: Aaron Patterson 
Date:   2012-08-08 16:09:39 -0700

    Merge pull request #7293 from Bertg/activemodel_naming_helpers_try_model_name_first
    
    Naming helpers should first check if passed object responds to model_name

commit b8903f3	refs/heads/master
Merge: ec923ab 1e17a9d
Author: Rafael Mendonça França 
Date:   2012-08-08 16:05:26 -0700

    Merge pull request #7294 from stevecj/fix-psql-reconnect-after-simulated-disconnect-test
    
    Fix only-once stub logic.

commit 1e17a9d	refs/heads/master
Author: Steve Jorgensen 
Date:   2012-08-08 14:43:53 -0700

    Fix only-once stub logic.
    
    Didn't fail the test because adapter#query happens to
    not call raw connection's #query, but don't want to count
    on that and have a fragile test.

M	activerecord/test/cases/adapters/postgresql/connection_test.rb

commit ec923ab	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-08 16:42:50 -0500

    Remove highly uncommon option for moving the manifest path

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit b540f4c	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-08 16:35:59 -0500

    Allow data attributes to be set as a first-level option for form_for, so you can write `form_for @record, data: { behavior: 'autosave' }` instead of `form_for @record, html: { data: { behavior: 'autosave' } }` *DHH*

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit c0954a4	refs/heads/master
Merge: 4154bf0 c381d5c
Author: Rafael Mendonça França 
Date:   2012-08-08 14:09:25 -0700

    Merge pull request #7292 from stevecj/fix-psql-reconnect-after-simulated-disconnect-test
    
    Fix just-plain-wrongness of psql auto-reconnect test.

commit 920d9ee	refs/heads/master
Author: Bert Goethals 
Date:   2012-08-08 22:40:06 +0200

    Naming helpers should first check if passed object responds to model_name

M	activemodel/lib/active_model/naming.rb

commit 4154bf0	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-08 11:25:13 -0500

    Modernize the documentation for view caching somewhat

M	actionpack/lib/action_controller/caching/fragments.rb
M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 2e98e0f	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-08 11:51:55 -0300

    Fix CHANGELOG [ci skip]

M	actionpack/CHANGELOG.md

commit a708f01	refs/heads/master
Author: Neil Stockbridge 
Date:   2012-08-08 15:10:33 +1200

    Added a note for smtp_settings.enable_starttls_auto

M	guides/source/action_mailer_basics.textile

commit 9ef905f	refs/tags/v3.0.17
Author: Rafael Mendonça França 
Date:   2012-08-07 22:38:40 -0300

    Fix tests about single quote escaping

M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/text_helper_test.rb

commit 780a718	refs/tags/v3.0.17
Author: Santiago Pastorino 
Date:   2012-07-31 22:25:54 -0300

    html_escape should escape single quotes
    
    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215
    
    Conflicts:
    	actionpack/test/controller/new_base/render_template_test.rb
    	actionpack/test/template/asset_tag_helper_test.rb
    	actionpack/test/template/erb_util_test.rb
    	actionpack/test/template/javascript_helper_test.rb
    	actionpack/test/template/template_test.rb
    	activesupport/lib/active_support/core_ext/string/output_safety.rb
    	activesupport/test/core_ext/string_ext_test.rb
    	railties/test/application/assets_test.rb

M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/javascript_helper_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 5d15287	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-07 20:39:31 -0300

    Deprecate `button_to_function` and `link_to_function` helpers.
    
    We recommend the use of Unobtrusive JavaScript instead. For example:
    
      link_to "Greeting", "#", :class => "nav_link"
    
      $(function() {
        $('.nav_link').click(function() {
          // Some complex code
    
          return false;
        });
      });
    
    or
    
      link_to "Greeting", '#', onclick: "alert('Hello world!'); return false", class: "nav_link"
    
    for simple cases.
    
    This reverts commit 3acdd652e9fe99481c879c84c5807a84eb9ad724.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 7dedfde	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-07 18:09:15 -0500

    Remove antiquated example code

D	actionpack/examples/performance.rb
D	actionpack/examples/views/_collection.erb
D	actionpack/examples/views/_hello.erb
D	actionpack/examples/views/_hundred_partials.erb
D	actionpack/examples/views/_partial.erb
D	actionpack/examples/views/_ten_partials.erb
D	actionpack/examples/views/hashes/_hash.erb
D	actionpack/examples/views/my_hashes/_my_hash.erb
D	actionpack/examples/views/template.html.erb

commit 42c3088	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-07 18:08:01 -0500

    Remove outdated examples and feature highlights

M	actionpack/README.rdoc

commit 775ddf2	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-07 12:18:20 -0500

    Observers are no longer important enough to get this configuration option called out at the top level

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 7ef56d6	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-07 20:04:29 -0300

    Add back missing require

M	activesupport/lib/active_support/json/encoding.rb

commit 82fe116	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-07 19:39:38 -0300

    Fix the deprecation horizon. [ci skip]

M	activesupport/lib/active_support/json/variable.rb

commit 83f2ffc	refs/heads/master
Author: Erich Menge 
Date:   2012-05-30 11:29:09 -0500

    Deprecate ActiveSupport::JSON::Variable
    
    Reason: ActiveSupport::JSON::Variable is not used anymore internally. It
    was deprecated in 3-2-stable but we reverted all the deprecation for
    point releases.
    
    See #6536 and #6546.
    Conflicts:
    	activesupport/lib/active_support/json/variable.rb

M	activesupport/CHANGELOG.md
A	activesupport/lib/active_support/json/variable.rb
M	activesupport/test/json/encoding_test.rb

commit d7f0e43	refs/heads/master
Author: andrea longhi 
Date:   2012-08-08 00:16:28 +0200

    add around_create callback documentation for ActiveModel::Callbacks

M	activemodel/lib/active_model/callbacks.rb

commit 4147e0f	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-07 18:14:33 -0300

    Remove references to old behavior with headers at
    ActionDispatch::Integration::ResquestHelpers.
    
    The behavior has removed at 4a6f4b92ad2f48dc7906d223fe4708d36624bd50 to
    increase the compatibility with Rack::Test
    
    Closes #7136
    
    [ci skip]

M	actionpack/lib/action_dispatch/testing/integration.rb

commit c381d5c	refs/heads/master
Author: Steve Jorgensen 
Date:   2012-08-07 14:05:07 -0700

    Fix just-plain-wrongness of psql auto-reconnect test.
    
    Full test requiring manual intervention was fine, but
    w/ simulated disconnect, assertion was backward & still
    passing. Was several kinds of wrong.

M	activerecord/test/cases/adapters/postgresql/connection_test.rb

commit c35853f	refs/tags/v3.2.9.rc2
Merge: d498b5e 635817e
Author: Rafael Mendonça França 
Date:   2012-08-07 12:30:14 -0700

    Merge pull request #7284 from josh/fix-asset-tests
    
    Fix asset integration test (3-2-stable)

commit 635817e	refs/tags/v3.2.9.rc2
Author: Joshua Peek 
Date:   2012-08-07 14:25:33 -0500

    Fix invalid asset compile assertions
    
    Logical paths to compile should require an extension

M	railties/test/application/assets_test.rb

commit 481dac9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-07 10:54:08 -0700

    make assertions easier to track down

M	railties/test/application/assets_test.rb

commit d498b5e	refs/tags/v3.2.9.rc2
Author: Aaron Patterson 
Date:   2012-08-07 10:54:08 -0700

    make assertions easier to track down

M	railties/test/application/assets_test.rb

commit 42dd5d9	refs/heads/master
Author: kennyj 
Date:   2012-08-08 02:13:02 +0900

    Fix #7191. Remove unnecessary transaction when assigning has_one associations.

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 485e655	refs/heads/master
Author: José Valim 
Date:   2012-08-07 13:59:31 -0300

    Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"
    
    Reverting because it feels backward to specify a delivery to not
    be performed while the e-mail is being composed. It is simpler (and
    makes more sense) to delegate the responsibility to the calling code.

M	actionmailer/CHANGELOG.md
M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/lib/action_mailer/delivery_methods.rb
M	actionmailer/test/delivery_methods_test.rb

commit 666d3fd	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-07 11:44:24 -0500

    Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of what this makes ERB files look like.
    
    This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing
    changes made to 2f58795e783150f2e1b1f6c64e305703f0061129.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/template/handlers/erb.rb
D	actionpack/test/template/erb/handlers_test.rb

commit fb88331	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-08-07 11:17:50 -0500

    Revert "The application generator generates `public/humans.txt` with some basic data". I dont consider this something most people is going to want most of the time. If you want to add it in your own app, knock yourself out. But it doesnt belong in Rails imo

M	railties/CHANGELOG.md
D	railties/lib/rails/generators/rails/app/templates/public/humans.txt.tt
M	railties/test/generators/app_generator_test.rb

commit 185d74c	refs/tags/v3.2.9.rc2
Merge: ea48732 83e0c95
Author: David Heinemeier Hansson 
Date:   2012-08-07 09:11:05 -0700

    Merge pull request #7283 from josh/bump-sprockets
    
    Allow newer versions of Sprockets

commit 83e0c95	refs/tags/v3.2.9.rc2
Author: Joshua Peek 
Date:   2012-08-07 11:01:33 -0500

    Loosen sprockets version restriction

M	actionpack/actionpack.gemspec

commit 46b8bce	refs/heads/master
Merge: 2f58795 e82ffea
Author: Santiago Pastorino 
Date:   2012-08-07 08:26:59 -0700

    Merge pull request #7033 from kron4eg/master
    
    Restore "%" ERb/Erubis Trim Mode

commit 2f58795	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-07 16:55:28 +0200

    defines String#indent [closes #7263] [Xavier Noria & Ace Suares]

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/string.rb
A	activesupport/lib/active_support/core_ext/string/indent.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	guides/source/active_support_core_extensions.textile

commit e82ffea	refs/heads/master
Author: Artiom Di 
Date:   2012-07-11 16:36:41 +0300

    Restoring the '%' trim mode for ERb templates, allowing for a leading percent sign on a line to indicate non-inserted Ruby code.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/template/handlers/erb.rb
A	actionpack/test/template/erb/handlers_test.rb

commit 694c227	refs/heads/master
Author: lulalala 
Date:   2012-08-07 11:50:41 +0800

    For adding non css/js files to precompile array

M	guides/source/asset_pipeline.textile

commit d0c9759	refs/tags/v3.1.8
Author: Santiago Pastorino 
Date:   2012-07-31 22:25:54 -0300

    html_escape should escape single quotes
    
    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215

M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/javascript_helper_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	railties/test/application/assets_test.rb

commit 32df882	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-08-06 16:17:09 -0700

    Update list of finder methods

M	guides/source/active_record_querying.textile

commit ea48732	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-06 18:16:28 -0300

    Add CHANGELOG entry for a935c7a

M	activerecord/CHANGELOG.md

commit a935c7a	refs/tags/v3.2.9.rc2
Author: Aaron Patterson 
Date:   2012-05-25 10:38:13 -0700

    Merge pull request #5872 from evtuhovich/prepared_statement_fix
    
    Remove prepared statement from system query in postgresql adapter
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 9cd1f69	refs/heads/master
Merge: 02d3184 0c4c7d9
Author: Rafael Mendonça França 
Date:   2012-08-06 13:48:59 -0700

    Merge pull request #7277 from sikachu/master-js-include-tag-fix
    
    Do not include application.js if it doesn't exists

commit 0c4c7d9	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-08-06 16:45:59 -0400

    Rearrange example output of javascript_include_tag

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit 02c9654	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-08-06 16:22:23 -0400

    Do not include application.js if it doesn't exists
    
    Rails were including 'application.js' to the pack when using
    `javascript_include_tag :all` even there's no application.js in the
    public directory.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 29fb31f	refs/tags/v3.2.9.rc2
Author: José Valim 
Date:   2012-07-26 03:13:07 -0700

    Merge pull request #7167 from route/missed_extend
    
    Missed extend for eager_autoload
    
    This backport is trying to fix a bug with eager load
    ActiveRecord::Associations modules

M	activerecord/lib/active_record/associations.rb

commit 3cc872d	refs/tags/v3.2.9.rc2
Merge: 0fb6bbd 6c46730
Author: Rafael Mendonça França 
Date:   2012-08-06 13:41:31 -0700

    Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fix
    
    Do not include application.js if it doesn't exists

commit 6c46730	refs/tags/v3.2.9.rc2
Author: Prem Sichanugrist 
Date:   2012-08-06 16:28:38 -0400

    Rearrange example output of javascript_include_tag

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit 8e2a05b	refs/tags/v3.2.9.rc2
Author: Prem Sichanugrist 
Date:   2012-08-06 16:22:23 -0400

    Do not include application.js if it doesn't exists
    
    Rails were including 'application.js' to the pack when using
    `javascript_include_tag :all` even there's no application.js in the
    public directory.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 02d3184	refs/heads/master
Merge: bf39026 9515038
Author: Rafael Mendonça França 
Date:   2012-08-06 11:52:46 -0700

    Merge pull request #7275 from asanghi/perform_deliveries_in_mail
    
    add changelog for #7202

commit 9515038	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-08-07 00:08:25 +0530

    add changelog for #7202

M	actionmailer/CHANGELOG.md

commit bf39026	refs/heads/master
Merge: 3a91d44 a1beec1
Author: Rafael Mendonça França 
Date:   2012-08-06 09:24:37 -0700

    Merge pull request #7272 from lexmag/string_inquirer
    
    Add AS::StringInquirer#respond_to? method

commit 3a91d44	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-06 08:26:32 -0700

    let ruby decompose the tuples in the iterator

M	activesupport/lib/active_support/duration.rb

commit a1beec1	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-08-05 23:30:01 +0400

    Add AS::StringInquirer#respond_to? method
    
    Consistently with #method_missing

M	activesupport/lib/active_support/string_inquirer.rb
M	activesupport/test/string_inquirer_test.rb

commit 2e4f798	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-08-06 13:45:27 +0300

    AM::Validation#validates: ability to pass custom exception to `:strict` option

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/test/cases/validations_test.rb
M	guides/source/active_record_validations_callbacks.textile

commit 5edfc46	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-05 21:21:14 -0300

    Don't use `html_escape` to test the escaping

M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/text_helper_test.rb
M	actionpack/test/template/url_helper_test.rb

commit 39f4f28	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-05 21:12:57 -0300

    Add CHANGELOG entry for 3c731a4ad62430100ba0b65bc966aa6dc6280c5f

M	actionpack/CHANGELOG.md

commit 0fb6bbd	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-05 20:38:02 -0300

    Merge pull request #7140 from seamusabshere/patch-1
    
    Make sure :environment task is executed before db:schema:load or
    db:structure:load
    
    Conflicts:
    	activerecord/CHANGELOG.md

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/railties/databases.rake

commit a48ea68	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-05 20:44:27 -0300

    Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores"
    
    This reverts commit 393c652cf63875f2728c04d47b34b2d6ae908186.
    
    This commit was supposed to fix a bug but it add more failures.

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/test/activerecord/active_record_store_test.rb

commit f784f21	refs/heads/master
Merge: 447b6a4 e7e8656
Author: Rafael Mendonça França 
Date:   2012-08-05 20:38:02 -0300

    Merge pull request #7140 from seamusabshere/patch-1
    
    Make sure :environment task is executed before db:schema:load or
    db:structure:load

commit e7e8656	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-05 20:33:26 -0300

    Update changelog

M	activerecord/CHANGELOG.md

commit 447b6a4	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-06 00:27:56 +0200

    removes usage of Object#in? from the code base (the method remains defined by Active Support)
    
    Selecting which key extensions to include in active_support/rails
    made apparent the systematic usage of Object#in? in the code base.
    After some discussion in
    
        https://github.com/rails/rails/commit/5ea6b0df9a36d033f21b52049426257a4637028d
    
    we decided to remove it and use plain Ruby, which seems enough
    for this particular idiom.
    
    In this commit the refactor has been made case by case. Sometimes
    include? is the natural alternative, others a simple || is the
    way you actually spell the condition in your head, others a case
    statement seems more appropriate. I have chosen the one I liked
    the most in each case.

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	activemodel/lib/active_model/validator.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/rails.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/transliterate_test.rb
M	guides/rails_guides/textile_extensions.rb
M	guides/source/asset_pipeline.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/commands.rb
M	railties/lib/rails/commands/destroy.rb
M	railties/lib/rails/commands/generate.rb
M	railties/lib/rails/engine/commands.rb
M	railties/lib/rails/generators/base.rb

commit 6126f02	refs/heads/master
Merge: daf9f9f d1f7590
Author: Jon Leighton 
Date:   2012-08-05 08:57:58 -0700

    Merge pull request #7270 from beerlington/use_exists_for_empty
    
    Changing AR:CollectionAssociation#empty? to use #exists?

commit d1f7590	refs/heads/master
Author: beerlington 
Date:   2012-08-05 10:22:05 -0400

    Changing AR:CollectionAssociation#empty? to use #exists?
    
    COUNT(*) queries can be slow in PostgreSQL, #exists? avoids this by
    selecting a single record.

M	activerecord/lib/active_record/associations/collection_association.rb

commit daf9f9f	refs/heads/master
Merge: c580772 88f8081
Author: Rafael Mendonça França 
Date:   2012-08-05 07:58:08 -0700

    Merge pull request #7268 from arunagw/warning-removed-small
    
    Remove warning: `*' interpreted as argument prefix

commit 88f8081	refs/heads/master
Author: Arun Agrawal 
Date:   2012-08-05 18:11:36 +0530

    Remove warning: `*' interpreted as argument prefix

M	activerecord/lib/active_record/model.rb

commit 39674d1	refs/heads/master
Author: Weston Platter 
Date:   2012-08-04 19:12:24 -0500

    edit of previous content
     explains how to add/override engine classes in the main rails app via
    1) Class#class_eval
    2) ActiveSupport::Concern

M	guides/source/engines.textile

commit b530fd1	refs/heads/master
Author: Pan Thomakos 
Date:   2012-07-10 17:10:23 -0700

    Refactored common date and time calculations.
    
    * Added the `DateAndTime::Calculations` module that is included in Time
      and Date. It houses common calculations to reduce duplicated code.
    * Simplified and cleaned-up the calculation code.
    * Removed duplication in tests by adding a behavior module for shared
      tests. I also added some missing tests.

M	activesupport/lib/active_support/core_ext/date/calculations.rb
A	activesupport/lib/active_support/core_ext/date_and_time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
A	activesupport/test/core_ext/date_and_time_behavior.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 957e3d4	refs/heads/master
Author: Steve Klabnik 
Date:   2012-08-04 14:42:56 -0400

    Add extra documentation to the locale file.

M	railties/lib/rails/generators/rails/app/templates/config/locales/en.yml

commit c580772	refs/heads/master
Author: Andrew White 
Date:   2012-08-04 19:01:37 +0100

    Revert "polymorphic_url with an array generates a query string"
    
    Passing options as the last value in an array doesn't work with form_for.
    This reverts commit 61c8a4d926343903593a27080216af7e4ed81268.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb

commit 4059423	refs/heads/master
Author: Andrew White 
Date:   2012-08-04 18:58:33 +0100

    Revert "Refactor passing url options via array for polymorphic_url"
    
    Passing options as the last value in an array doesn't work with form_for.
    This reverts commit 6be564c7a087773cb0b51c54396cc190e4f5c983.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb

commit 1a1230b	refs/heads/master
Author: Dejan Simic 
Date:   2012-08-04 18:53:14 +0200

    Document default_options configuration in ActionMailer guide [ci skip]

M	guides/source/action_mailer_basics.textile

commit 96290d4	refs/heads/master
Merge: 1935cfd 9e03c6a
Author: Santiago Pastorino 
Date:   2012-08-04 07:30:35 -0700

    Merge pull request #7262 from bogdan/refator_route_set
    
    Refator route set

commit 9e03c6a	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-08-04 15:11:10 +0300

    RouteSet: cleanup some unneeded compexity

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit d89161e	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-08-04 14:55:00 +0300

    Renamed _path_segments to _recall

M	actionpack/lib/action_controller/metal/url_for.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/abstract_unit.rb

commit 422b3d7	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-08-04 14:24:35 +0300

    Simplify logical statement

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 1935cfd	refs/heads/master
Merge: 067efad 7c8424e
Author: José Valim 
Date:   2012-08-04 04:15:06 -0700

    Merge pull request #7202 from asanghi/perform_deliveries_in_mail
    
    Allow perform_deliveries to be set within mailer action

commit 067efad	refs/heads/master
Merge: 3d3fa16 6be564c
Author: Andrew White 
Date:   2012-08-04 11:33:30 +0100

    Merge branch 'polymorphic_url_builds_query_string_with_array'

commit 6be564c	refs/heads/master
Author: Andrew White 
Date:   2012-08-04 11:24:53 +0100

    Refactor passing url options via array for polymorphic_url
    
    Rather than keep the url options in record_or_hash_or_array, extract it
    and reverse merge with options as it may contain important private keys
    like `:routing_type`.
    
    Closes #7259

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb

commit 3d3fa16	refs/heads/master
Merge: c963f88 b512012
Author: Vijay Dev 
Date:   2012-08-04 15:18:35 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	activemodel/lib/active_model/secure_password.rb
    	activerecord/lib/active_record/associations/collection_proxy.rb

commit b512012	refs/heads/master
Author: Vijay Dev 
Date:   2012-08-04 14:30:21 +0530

    copy edits [ci skip]

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	activemodel/lib/active_model/serializers/xml.rb
M	guides/source/configuring.textile
M	guides/source/contributing_to_ruby_on_rails.textile

commit 4ae72a9	refs/heads/master
Author: Vijay Dev 
Date:   2012-08-04 01:12:26 +0530

    Revert "Fix string interpolation in belongs_to docs"
    
    This reverts commit 3fb0100ef893b8cf229e82ce264b426e0c961eb1.

M	activerecord/lib/active_record/associations.rb

commit c963f88	refs/heads/master
Merge: 5fe923c 4c1db8a
Author: Vijay Dev 
Date:   2012-08-04 02:12:01 -0700

    Merge pull request #7260 from thomasklemm/patch-1
    
    Update Migration Docs: Defaults for Boolean Fields

commit ad088f0	refs/heads/master
Author: Andrew Vit 
Date:   2012-08-04 02:05:16 -0700

    Corrected info about asset pipeline default paths

M	guides/source/asset_pipeline.textile

commit 4c1db8a	refs/heads/master
Author: Thomas Klemm 
Date:   2012-08-04 11:09:38 +0300

    Update Migration Docs: Defaults for Boolean Fields
    
    A Boolean field will accept true or false as defaults instead of 0 / 1.

M	activerecord/lib/active_record/migration.rb

commit 61c8a4d	refs/heads/master
Author: Romain Tribes 
Date:   2012-08-04 10:00:33 +0200

    polymorphic_url with an array generates a query string
    
    Generating an URL with an array of records is now able to build a query
    string if the last item of the array is a hash.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb

commit f07c708	refs/tags/v3.0.17
Author: Andrew White 
Date:   2012-08-04 08:16:19 +0100

    Backport of fix from #5173 - fixes #7252
    
    Rather than use the MySQL specific TINYTEXT, MEDIUMTEXT and LONGTEXT
    datatypes, Active Record migrations use TEXT(n) where n is the limit
    specified by the developer. Unfortunately how MySQL interprets n
    depends on the column's encoding so any limit above 5592405 will be
    interpreted as a LONGTEXT when the encoding is UTF-8.
    
    This commit fixes this by interpreting the limit within the adapter
    and using the specific MySQL datatype as appropriate.

M	Gemfile
M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/schema/mysql2_specific_schema.rb
M	activerecord/test/schema/mysql_specific_schema.rb

commit 1a8e000	refs/heads/master
Author: Ace Suares 
Date:   2012-08-03 21:36:10 -0400

    added info about an error that mysql gives when rails@localhost has a password; removed reference to activerecord/test/connections, which isn't there anymore

M	guides/source/contributing_to_ruby_on_rails.textile

commit a2a73c5	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-08-03 21:58:15 +0300

    Update guides/source/asset_pipeline.textile

M	guides/source/asset_pipeline.textile

commit 5fe923c	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-03 19:36:37 +0100

    Make ActiveRecord::Model::DeprecationProxy work better
    
    Closes #6600

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/test/cases/inclusion_test.rb

commit 6fe1196	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-03 18:38:15 +0100

    Update the docs to reflect the new association API

M	activerecord/lib/active_record/associations.rb
M	guides/source/association_basics.textile

commit 9895f6c	refs/heads/master
Merge: c8a613b 93b6faf
Author: Rafael Mendonça França 
Date:   2012-08-03 09:57:37 -0700

    Merge pull request #7253 from acapilleri/lenght_validator_errors_options
    
    calculate errors_options one time in validate_each

commit 93b6faf	refs/heads/master
Author: Angelo Capilleri 
Date:   2012-08-03 17:12:27 +0200

    calculate errors_options one time in validate_each
    
    errors_options is calculated for every *CHECKS* but it could be
    calculated one time  because options and RESERVED_OPTIONS
    not change during this cycle

M	activemodel/lib/active_model/validations/length.rb

commit 65b5e35	refs/tags/v3.2.8.rc2 (tag: v3.2.8.rc2)
Author: Santiago Pastorino 
Date:   2012-08-03 11:01:50 -0300

    Bump to 3.2.8.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 5f9ae95	refs/tags/v3.2.8.rc2
Author: Santiago Pastorino 
Date:   2012-08-03 11:00:20 -0300

    Add CHANGELOG entry

M	activesupport/CHANGELOG.md

commit c8a613b	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-08-03 02:40:09 -0300

    Add test select_tag escapes prompt

M	actionpack/test/template/form_tag_helper_test.rb

commit 8f8d8eb	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-08-03 02:14:29 -0300

    Use content_tag here instead of manually building HTML

M	actionpack/lib/action_view/helpers/debug_helper.rb

commit 572ecae	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-08-02 21:43:26 -0300

    Don't eager load all this
    
    Some are loaded from Base which is loaded when a model inherits from it
    and some others are used in rake tasks

M	activerecord/lib/active_record.rb

commit 55b2488	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-03 11:51:52 +0100

    Remove ActiveRecord::Base.to_a
    
    On reflection, it seems like a bit of a weird method to have on
    ActiveRecord::Base, and it shouldn't be needed most of the time anyway.

M	activemodel/lib/active_model/observing.rb
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/querying.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/explain_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb

commit 0a6833b	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-03 11:50:50 +0100

    reinstate changelog that seems to have been accidentally deleted o_O

M	activerecord/CHANGELOG.md

commit bf2df6e	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-03 10:50:49 +0100

    Allow Relation#merge to take a proc.
    
    This was requested by DHH to allow creating of one's own custom
    association macros.
    
    For example:
    
        module Commentable
          def has_many_comments(extra)
            has_many :comments, -> { where(:foo).merge(extra) }
          end
        end
    
        class Post < ActiveRecord::Base
          extend Commentable
          has_many_comments -> { where(:bar) }
        end

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_test.rb

commit c391919	refs/heads/master
Author: Aaron Patterson 
Date:   2012-08-02 15:04:36 -0700

    make sure the body finishes rendering before checking response closure

M	actionpack/test/controller/live_stream_test.rb

commit 3c731a4	refs/heads/master
Merge: 9abf589 c62abed
Author: Rafael Mendonça França 
Date:   2012-08-02 18:50:26 -0700

    Merge pull request #7231 from armanddp/no_content
    
    Remove single character body in head(:no_content) response

commit 393c652	refs/tags/v3.2.9.rc2
Author: José Valim 
Date:   2012-04-30 06:28:22 -0700

    Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores
    
    Support cookie jar options for all cookie stores

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/test/activerecord/active_record_store_test.rb

commit c62abed	refs/heads/master
Author: Armand du Plessis 
Date:   2012-08-02 15:58:45 -0700

    Collapsed dual checks (one for content headers and one for content) into a single check.
    
    Rails includes a single character body to a head(:no_content) response to work around an old Safari bug where headers were ignored if no body sent.
    
    This patch brings the behavior slightly closer to spec if :no_content/204 is explicity requested via a head only response.
    
    Status comparison done on symbolic and numeric values
    
    Not returning any content when responding with head and limited to a status code that explicitly states no content will be returned - 100..199, 204, 205, 304.

M	actionpack/lib/action_controller/metal/head.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/new_base/bare_metal_test.rb

commit 9abf589	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-02 19:41:20 -0300

    Remove `:rails_env` task since it is not needed anymore.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/lib/rails/tasks/misc.rake

commit 469d885	refs/tags/v3.2.8.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 17:58:47 -0300

    More `:rails_env` cleanup.
    
    `Rails.env` already use development if ENV["RAILS_ENV"] is not present.

M	activerecord/lib/active_record/railties/databases.rake

commit ad9b6a3	refs/heads/master
Author: Robert Pankowecki 
Date:   2012-08-02 23:47:02 +0200

    Fix ActiveModel::Serializers::Xml#to_xml reference
    
    Link to ActiveRecord::Serialization#to_xml for more details

M	activemodel/lib/active_model/serializers/xml.rb

commit e23b26c	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 17:58:47 -0300

    More `:rails_env` cleanup.
    
    `Rails.env` already use development if ENV["RAILS_ENV"] is not present.

M	activerecord/lib/active_record/railties/databases.rake

commit 6e52376	refs/heads/master
Merge: 077372b 6beaafd
Author: Rafael Mendonça França 
Date:   2012-08-02 13:50:54 -0700

    Merge pull request #7240 from steveklabnik/fix_2301
    
    Fix for digest authentication bug - issue #2301 in rails/rails

commit 6beaafd	refs/heads/master
Author: Steve Klabnik 
Date:   2012-08-02 16:46:41 -0400

    Changelog entry for Digest Auth fix (#2301)

M	actionpack/CHANGELOG.md

commit ebddf75	refs/tags/v3.2.8.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 17:28:19 -0300

    Fix html_escape with Ruby 1.8

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 2f4b82f	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 17:28:19 -0300

    Fix html_escape with Ruby 1.8

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 28f2c6f	refs/tags/v3.2.8.rc2
Author: Santiago Pastorino 
Date:   2012-07-31 22:25:54 -0300

    html_escape should escape single quotes
    
    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215
    
    Conflicts:
    	actionpack/test/template/erb_util_test.rb
    	actionpack/test/template/form_tag_helper_test.rb
    	actionpack/test/template/text_helper_test.rb
    	actionpack/test/template/url_helper_test.rb
    	activesupport/lib/active_support/core_ext/string/output_safety.rb

M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/javascript_helper_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	railties/test/application/assets_test.rb

commit 2bdb4ec	refs/tags/v3.2.9.rc2
Author: Santiago Pastorino 
Date:   2012-07-31 22:25:54 -0300

    html_escape should escape single quotes
    
    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215
    
    Conflicts:
    	actionpack/test/template/erb_util_test.rb
    	actionpack/test/template/form_tag_helper_test.rb
    	actionpack/test/template/text_helper_test.rb
    	actionpack/test/template/url_helper_test.rb
    	activesupport/lib/active_support/core_ext/string/output_safety.rb

M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/javascript_helper_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	railties/test/application/assets_test.rb

commit 077372b	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 21:34:44 +0200

    load active_support/deprecation in active_support/rails

M	actionpack/lib/action_view/helpers/form_helper.rb
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/lib/active_model/observing.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/scoping/default.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/cases/test_case.rb
M	activesupport/lib/active_support/rails.rb

commit 4aee8dd	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 21:25:54 +0200

    load active_support/core_ext/module/delegation in active_support/rails

M	actionmailer/lib/action_mailer.rb
M	actionpack/lib/abstract_controller.rb
M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/lib/action_dispatch/middleware/callbacks.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/test_case.rb
M	activemodel/lib/active_model/naming.rb
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_handling.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/relation/delegation.rb
M	activesupport/lib/active_support/rails.rb

commit 5e1b920	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 21:22:06 +0200

    load active_support/core_ext/class/attribute in active_support/rails

M	actionmailer/lib/action_mailer/test_case.rb
M	actionpack/lib/abstract_controller.rb
M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_controller/metal/helpers.rb
M	actionpack/lib/action_controller/metal/hide_actions.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_controller/metal/renderers.rb
M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/validations.rb
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/explain.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/lib/active_record/observer.rb
M	activerecord/lib/active_record/readonly_attributes.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/lib/active_record/store.rb
M	activerecord/lib/active_record/timestamp.rb
M	activesupport/lib/active_support/rails.rb

commit 64bc844	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 18:51:39 +0200

    load active_support/concern in active_support/rails

M	actionpack/lib/abstract_controller.rb
M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	activemodel/lib/active_model/conversion.rb
M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/readonly_attributes.rb
M	activerecord/lib/active_record/sanitization.rb
M	activerecord/lib/active_record/scoping.rb
M	activerecord/lib/active_record/scoping/default.rb
M	activerecord/lib/active_record/store.rb
M	activesupport/lib/active_support/rails.rb

commit 47396a9	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 18:49:38 +0200

    load active_support/dependencies/autoload in active_support/rails

M	actionpack/lib/abstract_controller.rb
M	actionpack/lib/action_dispatch.rb
M	activesupport/lib/active_support/rails.rb

commit 5ea6b0d	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 18:44:25 +0200

    load active_support/core_ext/object/inclusion in active_support/rails

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	activemodel/lib/active_model/validator.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activesupport/lib/active_support/rails.rb

commit 8f58d6e	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 18:36:41 +0200

    load active_support/core_ext/object/blank in active_support/rails

M	actionmailer/lib/action_mailer.rb
M	actionmailer/lib/action_mailer/base.rb
M	actionpack/lib/action_controller/log_subscriber.rb
M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/lib/action_controller/metal/renderers.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/cache.rb
M	actionpack/lib/action_dispatch/http/filter_parameters.rb
M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/request_id.rb
M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/lib/action_view/helpers/active_model_helper.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/test_case.rb
M	activemodel/lib/active_model/dirty.rb
M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activemodel/lib/active_model/validator.rb
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/lib/active_record/attribute_methods/query.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/lib/active_record/query_cache.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/lib/active_record/schema.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activesupport/lib/active_support/rails.rb

commit 1a7b2e8	refs/heads/master
Author: Xavier Noria 
Date:   2012-08-02 18:07:20 +0200

    defines a private require-hub active_support/rails
    
    This is a private place to put those AS features that are used
    by every component. Nowadays we cherry-pick individual files
    wherever they are used, but that it is not worth the effort
    for stuff that is going to be loaded for sure sooner or later,
    like blank?, autoload, concern, etc.

M	actionmailer/lib/action_mailer.rb
M	actionpack/lib/abstract_controller.rb
M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_view.rb
M	activemodel/lib/active_model.rb
M	activerecord/lib/active_record.rb
A	activesupport/lib/active_support/rails.rb

commit 7a7ec74	refs/heads/master
Author: José Valim 
Date:   2012-08-02 21:49:31 +0200

    Check validity of options[:as] just once

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit ac1a5d4	refs/heads/master
Merge: d875247 a8d68d8
Author: José Valim 
Date:   2012-08-02 12:43:14 -0700

    Merge pull request #7129 from kennyj/fix_7079
    
    Improve error handling when using partial name with hyphen. #7079

commit b3e2abc	refs/heads/master
Author: Arthur Smith 
Date:   2011-07-28 10:06:45 -0400

    Fix for digest authentication bug - issue #2301 in rails/rails

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_digest_authentication_test.rb

commit d875247	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-02 16:04:49 -0300

    Fix tests.
    
    Since b6ab4417720e03f1551abda2f1e4bd0a392dd04e the single quotes are
    being escaped in the templates.

M	railties/test/application/assets_test.rb

commit 9c1b1bd	refs/tags/v3.2.8.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 15:30:38 -0300

    Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
    the ERB scaffold generator.
    
    We are trying to teach the data attributes as best practices and
    `:confirm` will be deprecated in 4.0.

M	railties/CHANGELOG.md
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb

commit 55e05d4	refs/tags/v3.2.8.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 14:01:44 -0300

    Do not consider the numeric attribute as changed if the old value is
    zero and the new value is not a string.
    
    Before this commit this was the behavior
    
    r = Review.find_by_issue(0)
    r.issue
    => 0
    r.changes
    => {}
    r.issue = 0
    => 0
    r.changed?
    => true
    r.changes
    => {"issue"=>[0,0]}
    
    Fixes #7237

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/test/cases/dirty_test.rb

commit 5c42889	refs/tags/v3.2.8.rc2
Author: Mike Gunderloy 
Date:   2012-08-02 06:43:47 -0500

    Fix ActiveSupport integration with Mocha > 0.12.1
    
    Mocha 0.12.2 renames the Integration module to
    MonkeyPatching. This breaks the code Rails uses
    to retrieve the assertion counter from Mocha.

M	activesupport/lib/active_support/testing/setup_and_teardown.rb

commit 96e92b6	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 15:30:38 -0300

    Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
    the ERB scaffold generator.
    
    We are trying to teach the data attributes as best practices and
    `:confirm` will be deprecated in 4.0.

M	railties/CHANGELOG.md
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb

commit f8d1b52	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-08-02 14:20:49 -0400

    Audit the usage of the word "JavaScript"

M	guides/source/action_view_overview.textile
M	guides/source/ajax_on_rails.textile
M	guides/source/command_line.textile
M	guides/source/configuring.textile
M	guides/source/security.textile

commit 4028bed	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-08-02 14:01:44 -0300

    Do not consider the numeric attribute as changed if the old value is
    zero and the new value is not a string.
    
    Before this commit this was the behavior
    
    r = Review.find_by_issue(0)
    r.issue
    => 0
    r.changes
    => {}
    r.issue = 0
    => 0
    r.changed?
    => true
    r.changes
    => {"issue"=>[0,0]}
    
    Fixes #7237
    
    Conflicts:
    	activerecord/CHANGELOG.md

M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/test/cases/dirty_test.rb

commit 99f622d	refs/tags/v3.2.9.rc2
Author: Rafael Mendonça França 
Date:   2012-08-02 14:01:44 -0300

    Do not consider the numeric attribute as changed if the old value is
    zero and the new value is not a string.
    
    Before this commit this was the behavior
    
    r = Review.find_by_issue(0)
    r.issue
    => 0
    r.changes
    => {}
    r.issue = 0
    => 0
    r.changed?
    => true
    r.changes
    => {"issue"=>[0,0]}
    
    Fixes #7237

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/test/cases/dirty_test.rb

commit a8d68d8	refs/heads/master
Author: kennyj 
Date:   2012-07-18 18:02:33 +0900

    Improve error handling when using partial name with hyphen. Fix #7079

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/render_test.rb

commit eb66ead	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-08-02 20:02:37 +0300

    fixed wrong route for creating new post [ci skip]
    
    Now there is error ```No route matches [POST] “/posts”```

M	guides/source/getting_started.textile

commit 59c4b22	refs/tags/v3.2.9.rc2
Merge: 5365c10 f137c2b
Author: Carlos Antonio da Silva 
Date:   2012-08-02 07:53:47 -0700

    Merge pull request #7232 from kennyj/fix_7200
    
    Fix #7200. Backport #5168 to 3-2-stable

commit f137c2b	refs/tags/v3.2.9.rc2
Author: kennyj 
Date:   2012-08-02 02:34:38 +0900

    Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by postgresql_adapter.rb while creating distincts.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

commit 5365c10	refs/tags/v3.2.9.rc2
Merge: 74cf196 a252436
Author: Carlos Antonio da Silva 
Date:   2012-08-02 05:08:50 -0700

    Merge pull request #7235 from ffmike/mocha_12_2_compat
    
    Fix ActiveSupport integration with Mocha > 0.12.1

commit a252436	refs/tags/v3.2.9.rc2
Author: Mike Gunderloy 
Date:   2012-08-02 06:43:47 -0500

    Fix ActiveSupport integration with Mocha > 0.12.1
    
    Mocha 0.12.2 renames the Integration module to
    MonkeyPatching. This breaks the code Rails uses
    to retrieve the assertion counter from Mocha.

M	activesupport/lib/active_support/testing/setup_and_teardown.rb

commit b33e7ba	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-01 23:55:47 +0100

    s/scoped/scope/

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 0e1cafc	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-01 23:14:29 +0100

    Add CollectionProxy#scope
    
    This can be used to get a Relation from an association.
    
    Previously we had a #scoped method, but we're deprecating that for
    AR::Base, so it doesn't make sense to have it here.
    
    This was requested by DHH, to facilitate code like this:
    
        Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do
          @topics      = @project.topics.scope
          @todolists   = @project.todolists.scope
          @attachments = @project.attachments.scope
          @documents   = @project.documents.scope
        end

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations_test.rb

commit 26d3e32	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-01 22:28:26 +0100

    Use explicit delegations
    
    This makes it easier to see what the documentation refers to.
    
    It also means that we are not doing unnecessary work for delegations
    that have no args / splats / block / etc.

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 74cf196	refs/tags/v3.2.8.rc2
Author: Santiago Pastorino 
Date:   2012-08-01 18:08:48 -0300

    This entry is wrong

M	activerecord/CHANGELOG.md

commit 66aaca4	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-01 21:55:24 +0100

    Refactor a bit
    
    This doesn't change the exernal behavior, but it moves some code around
    to where I think it properly belongs.

M	activerecord/lib/active_record/relation.rb

commit 437851e	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-01 21:42:38 +0100

    Add `Relation#load`
    
    This method explicitly loads the records and then returns `self`.
    
    Rather than deciding between "do I want an array or a relation?",
    most people are actually asking themselves "do I want to eager load
    or lazy load?" Therefore, this method provides a way to explicitly
    eager-load without having to switch from a `Relation` to an array.
    
    Example:
    
        @posts = Post.where(published: true).load

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit fcccbac	refs/tags/v3.2.8.rc1 (tag: v3.2.8.rc1)
Author: Santiago Pastorino 
Date:   2012-08-01 17:50:48 -0300

    Bump to 3.2.8.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit f50a5d2	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-08-01 15:59:39 -0300

    Revert "Deprecate link_to_function and button_to_function helpers"
    
    This reverts commit 9dc57fe9c4807fc0ad4b1590a931891d9faa3164.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit e826a5c	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-08-01 15:58:56 -0300

    Revert "Deprecate `:mouseover` options for `image_tag` helper."
    
    This reverts commit 1aff7725c7a04cde202cca906208560a55409e6a.
    
    Conflicts:
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit af65b8c	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-08-01 15:52:18 -0300

    Revert "Deprecate ActiveSupport::JSON::Variable"
    
    This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/json/variable.rb
M	activesupport/test/json/encoding_test.rb

commit 857697b	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-08-01 15:49:57 -0300

    Fix CHANGELOGS

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit 4efebde	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 17:59:27 +0100

    Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/company_in_module.rb
M	activerecord/test/models/project.rb

commit 7f3b475	refs/heads/master
Author: Jon Leighton 
Date:   2012-08-01 19:15:23 +0100

    Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."
    
    This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    It will be deprecated only in 4.0, and removed properly in 4.1.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/company_in_module.rb
M	activerecord/test/models/project.rb

commit 81542f9	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-08-01 20:40:03 +0200

    removes the deprecation of update_attribute
    
    Applying the new policy here to not deprecate stuff in point releases.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/persistence.rb

commit fb08039	refs/heads/master
Merge: 601d9d8 ad7f9cd
Author: Carlos Antonio da Silva 
Date:   2012-08-01 11:32:56 -0700

    Merge pull request #7217 from freerobby/no_password_requirement_if_validations_skipped
    
    has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.

commit f203be9	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-08-01 20:16:59 +0200

    revises the deprecation warning of update_attribute
    
    We have decided not to drop this important method in 4.0 and give
    it a longer deprecation cycle. On the other hand we do not expect
    to have update_column around for a long time, it is going to be
    replaced in favor of update_columns.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/persistence.rb

commit 89177ba	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-08-01 15:12:53 -0300

    Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option"
    
    Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers."
    
    This reverts commit fc092a9cba5fceec38358072e50e09250cf58840.
    This reverts commit e9051e20aeb2c666db06b6217954737665878db7.
    This reverts commit d47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1.
    This reverts commit 21141e777bdce8534e3755c8de7268324b3d8714.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb

commit 736bf14	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-08-01 15:09:56 -0300

    Revert "Deprecating composed_of in ActiveRecord"
    
    This reverts commit 44b313bc4e3762da64dde7894548f81c595147de.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/aggregations.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/models/customer.rb
M	activerecord/test/models/developer.rb

commit 0c52702	refs/tags/v3.2.8.rc1
Author: Jon Leighton 
Date:   2012-08-01 19:11:46 +0100

    Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."
    
    This reverts commit a79bfa92e7bdc31b346d13ee5447d3fdac382bfb.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    We shouldn't introducing deprecations in point releases.
    It will be deprecated in 4.0 instead.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/company_in_module.rb
M	activerecord/test/models/project.rb

commit 6764b7b	refs/tags/v3.2.8.rc1
Author: Santiago Pastorino 
Date:   2012-08-01 14:38:04 -0300

    Add missing CHANGELOG entries
    
    [ci skip]

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 601d9d8	refs/heads/master
Merge: 0d45d4e 79dc922
Author: Carlos Antonio da Silva 
Date:   2012-08-01 10:12:27 -0700

    Merge pull request #7228 from kennyj/move_to_ar2
    
    Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e96659a8de985
    
    [ci skip]

commit 79dc922	refs/heads/master
Author: kennyj 
Date:   2012-08-02 01:44:11 +0900

    Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e96659a8de985

M	activerecord/CHANGELOG.md

commit 0d45d4e	refs/heads/master
Merge: 26c1a4a e35c67a
Author: José Valim 
Date:   2012-08-01 08:52:32 -0700

    Merge pull request #7224 from kennyj/move_to_ar
    
    The use_schema_cache_dump configuration moved to ActiveRecord.

commit e35c67a	refs/heads/master
Author: kennyj 
Date:   2012-08-01 23:16:04 +0900

    The use_schema_cache_dump configuration moved to ActiveRecord.

M	activerecord/lib/active_record/railtie.rb
M	railties/lib/rails/application/configuration.rb

commit 26c1a4a	refs/heads/master
Merge: 08ee16e 0f6865e
Author: Carlos Antonio da Silva 
Date:   2012-08-01 11:57:26 -0300

    Merge branch 'refactor-dependency-check'
    
    Extract dependency check logic that raises ArgumentError in case of an
    invalid :dependent option given to an association.
    
    Closes #7054

commit 0f6865e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-08-01 11:46:40 -0300

    Refactor dependency check validation
    
    Move the logic for validation check to the same method, and cache
    dependent option in a variable to reuse inside the dependency
    configuration methods instead of relying on the options hash.

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb

commit 08a6b57	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-07-14 15:21:30 +0200

    move method for dependent option check

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb

commit 3fb0100	refs/heads/master
Author: Franco Catena 
Date:   2012-08-01 10:32:08 -0300

    Fix string interpolation in belongs_to docs

M	activerecord/lib/active_record/associations.rb

commit 08ee16e	refs/heads/master
Merge: 3d55957 083ddec
Author: Rafael Mendonça França 
Date:   2012-08-01 06:06:24 -0700

    Merge pull request #7219 from jmazzi/master
    
    Restoring documentation for env_config

commit 3e01a2a	refs/tags/v3.2.8.rc1
Merge: 69fd0e8 c6ad167
Author: Rafael Mendonça França 
Date:   2012-08-01 06:06:18 -0700

    Merge pull request #7070 from jmazzi/3-2-stable
    
    Update documentation for Rails::Application#env_config

commit 083ddec	refs/heads/master
Author: Justin Mazzi 
Date:   2012-07-31 22:26:00 -0400

    Restoring documentation for env_config per #7070

M	railties/lib/rails/application.rb

commit 69fd0e8	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-07-31 23:14:06 -0300

    Merge pull request #7147 from pferdefleisch/scaffold_controller_docs
    
    Updated scaffold_controller generator docs #7146

M	railties/lib/rails/generators/rails/scaffold_controller/USAGE

commit 3d55957	refs/heads/master
Merge: ddd804e a725585
Author: Rafael Mendonça França 
Date:   2012-07-31 23:14:06 -0300

    Merge pull request #7147 from pferdefleisch/scaffold_controller_docs
    
    Updated scaffold_controller generator docs #7146

commit a725585	refs/heads/master
Author: Aaron Cruz 
Date:   2012-07-24 19:50:49 +0200

    Updated scaffold_controller generator docs #7146
    
    It was just a copy of the controller generator documentation which was
    misleading.  It doesn't accept arguments for views.  This seems more
    descriptive as well.
    
    Respect 80 char limit. #7147
    
    Made a nicer paragraph #7147

M	railties/lib/rails/generators/rails/scaffold_controller/USAGE

commit ddd804e	refs/heads/master
Merge: b6ab441 5906881
Author: Rafael Mendonça França 
Date:   2012-07-31 18:40:10 -0700

    Merge pull request #7204 from frodsan/update_conventions
    
    Follow code conventions in metal/live

commit b6ab441	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-07-31 22:25:54 -0300

    html_escape should escape single quotes
    
    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215

M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/text_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit ad7f9cd	refs/heads/master
Author: Robby Grossman 
Date:   2012-07-31 16:16:21 -0400

    has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.

M	activemodel/lib/active_model/secure_password.rb
M	activemodel/test/cases/secure_password_test.rb
A	activemodel/test/models/oauthed_user.rb

commit cbcfbdd	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-31 14:16:46 -0500

    fix punctuation in #resources and #match documentation [ci skip]

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 8453add	refs/heads/master
Author: Robert Pankowecki 
Date:   2012-07-31 20:28:02 +0200

    Update #match documentation [ci skip]

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit c5fcc9a	refs/heads/master
Author: Robert Pankowecki 
Date:   2012-07-31 20:22:44 +0200

    Update #resources documentation [ci skip]

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit a893672	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-07-31 14:45:23 -0300

    Add CHANGELOG entry [ci skip]

M	activerecord/CHANGELOG.md

commit 7b7501b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-31 11:43:17 -0500

    update ActiveModel::Observer documentation [ci skip]

M	activemodel/lib/active_model/observing.rb

commit d9ac5b2	refs/heads/master
Author: David Celis 
Date:   2012-07-31 09:41:02 -0700

    Fix a mistake in the I18n guide: English => Spanish [ci skip]
    
    Signed-off-by: David Celis 

M	guides/source/i18n.textile

commit cf21657	refs/heads/master
Author: David Celis 
Date:   2012-07-31 09:17:16 -0700

    Update I18n guide with details on multilingual Inflector [ci skip]
    
    Sorry; I forgot about the guides when I submitted this patch.
    
    Signed-off-by: David Celis 

M	guides/source/i18n.textile

commit db25ca7	refs/heads/master
Author: Accessd 
Date:   2012-07-31 18:10:41 +0400

    fix ActiveRecord::Associations::CollectionProxy documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit c102022	refs/heads/master
Merge: 0e3c666 7dae39a
Author: Rafael Mendonça França 
Date:   2012-07-31 06:41:47 -0700

    Merge pull request #7212 from accessd/small-typo-fix
    
    small fix typo in collection proxy

commit 7dae39a	refs/heads/master
Author: Accessd 
Date:   2012-07-31 17:37:33 +0400

    fix typo in collection proxy

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 0e3c666	refs/heads/master
Author: José Valim 
Date:   2012-07-31 15:48:17 +0300

    Update activesupport/CHANGELOG.md

M	activesupport/CHANGELOG.md

commit 13af5ac	refs/heads/master
Merge: b09d6aa 7db0b07
Author: José Valim 
Date:   2012-07-31 05:46:25 -0700

    Merge pull request #7197 from davidcelis/i18n_inflector
    
    Make ActiveSupport::Inflector locale aware and multilingual

commit b09d6aa	refs/heads/master
Merge: 10cdeb8 92641ef
Author: Rafael Mendonça França 
Date:   2012-07-31 05:08:23 -0700

    Merge pull request #7176 from bogdan/reverse_order
    
    AR::Relation#order: make new order prepend old one.

commit 92641ef	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-07-31 10:24:18 +0300

    AR::Relation#order: make new order prepend old one
    
        User.order("name asc").order("created_at desc")
        # SELECT * FROM users ORDER BY created_at desc, name asc
    
    This also affects order defined in `default_scope` or any kind of associations.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	guides/source/active_record_querying.textile
M	guides/source/upgrading_ruby_on_rails.textile

commit 7db0b07	refs/heads/master
Author: David Celis 
Date:   2012-07-29 15:31:53 -0700

    Make ActiveSupport::Inflector locale aware and multilingual
    
    The Inflector is currently not very supportive of internationalized
    websites. If a user wants to singularize and/or pluralize words based on
    any locale other than English, they must define each case in locale
    files. Rather than create large locale files with mappings between
    singular and plural words, why not allow the Inflector to accept a
    locale?
    
    This patch makes ActiveSupport::Inflector locale aware and uses `:en`` unless
    otherwise specified. Users will still be provided a list of English (:en)
    inflections, but they may additionally define inflection rules for other
    locales. Each list is kept separately and permanently. There is no reason to
    limit users to one list of inflections:
    
        ActiveSupport::Inflector.inflections(:es) do |inflect|
          inflect.plural(/$/, 's')
          inflect.plural(/([^aeéiou])$/i, '\1es')
          inflect.plural(/([aeiou]s)$/i, '\1')
          inflect.plural(/z$/i, 'ces')
          inflect.plural(/á([sn])$/i, 'a\1es')
          inflect.plural(/é([sn])$/i, 'e\1es')
          inflect.plural(/í([sn])$/i, 'i\1es')
          inflect.plural(/ó([sn])$/i, 'o\1es')
          inflect.plural(/ú([sn])$/i, 'u\1es')
    
          inflect.singular(/s$/, '')
          inflect.singular(/es$/, '')
    
          inflect.irregular('el', 'los')
        end
    
        'ley'.pluralize(:es)   # => "leyes"
        'ley'.pluralize(:en)   # => "leys"
        'avión'.pluralize(:es) # => "aviones"
        'avión'.pluralize(:en) # => "avións"
    
    A multilingual Inflector should be of use to anybody that is tasked with
    internationalizing their Rails application.
    
    Signed-off-by: David Celis 

M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/inflections.rb
M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb

commit ab53cc7	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 23:32:48 -0500

    update ActiveModel::ObserverArray documentation [ci skip]

M	activemodel/lib/active_model/observer_array.rb

commit 1d537fd	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 23:19:15 -0500

    add :nodoc: to ActiveModel::Observing#inherited [ci skip]

M	activemodel/lib/active_model/observing.rb

commit cb15fe5	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 23:15:27 -0500

    update ActiveModel::Observing documentation [ci skip]

M	activemodel/lib/active_model/observing.rb

commit d67b289	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 21:32:44 -0500

    update ActiveModel::Serializers documentation [ci skip]

M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/serializers/xml.rb

commit 4ff5a5d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 21:19:35 -0500

    add documentation to ActiveModel #from_json method [ci skip]

M	activemodel/lib/active_model/serializers/json.rb

commit 10cdeb8	refs/heads/master
Merge: f6068f1 829ec37
Author: Carlos Antonio da Silva 
Date:   2012-07-30 16:50:54 -0700

    Merge pull request #7205 from frodsan/fix_nodoc_live
    
    Fix nodoc in metal/live [ci skip]

commit ba94c6b	refs/heads/master
Author: Novikov Andrey 
Date:   2012-07-31 09:15:06 +1000

    Add 'Writing Rake Tasks' subsection to Command Line Guide

M	guides/source/command_line.textile

commit 829ec37	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 18:06:13 -0500

    fix nodoc in metal/live

M	actionpack/lib/action_controller/metal/live.rb

commit 5906881	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 17:08:05 -0500

    update coding conventions in metal/live

M	actionpack/lib/action_controller/metal/live.rb

commit f6068f1	refs/heads/master
Merge: 4ac81de eae1903
Author: Rafael Mendonça França 
Date:   2012-07-30 14:58:06 -0700

    Merge pull request #7203 from frodsan/typo_live
    
    fix typo in metal/live [ci skip]

commit eae1903	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 16:54:33 -0500

    fix typo in metal/live [ci skip]

M	actionpack/lib/action_controller/metal/live.rb

commit 7c8424e	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-07-30 23:57:20 +0530

    allow perform deliveries to be set within mailer action

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/lib/action_mailer/delivery_methods.rb
M	actionmailer/test/delivery_methods_test.rb

commit 1ca957c	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-30 10:55:06 -0500

    fix #after_validation example [ci skip]

M	activemodel/lib/active_model/validations/callbacks.rb

commit 4ac81de	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-30 10:50:18 -0300

    Remove the deprecation of update_column.
    
    update_column was suggested as replacement of update_attribute at the
    last release of 3-2-stable, so deprecating it now will confuse the
    users.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/persistence_test.rb

commit 2f930df	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-07-30 10:15:26 -0300

    Revert "Add update_columns and the suggestion of using update_columns
    instead of update_column"
    
    This reverts commit 9fa06c3d9811113259cb6e00a3a8454b3974add7.
    
    This reverts commit 17a64de4980683da3ca3c185205013a29a8cf88d.
    
    This reverts commit def9c85ffbdcf63e6c412b6bd4abafaa32ccdb5c, reversing
    changes made to 6b7d26cf3c061907aedc44f7f36776c9b36950fd.
    
    Reason: This was supposed to be released with 3.2.7 before the
    suggestion to use update_column. Since it was not release now is not
    good to suggest to use another method because it will confusing the
    people.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/persistence_test.rb
M	railties/guides/source/active_record_validations_callbacks.textile

commit 81bf120	refs/heads/master
Author: Vladimir Strakhov 
Date:   2012-07-30 11:06:02 +0400

    add mysql authentification command to chapter 2.Running the Test Suite

M	guides/source/contributing_to_ruby_on_rails.textile

commit 8601f73	refs/heads/master
Author: José Valim 
Date:   2012-07-30 08:19:15 +0200

    Revert "DRY class_attribute code"
    
    class_attribute is a building block and using define_method
    can be much slower for such basic method definitions.
    
    This reverts commit d59208d7032e2be855a89ad8d4685cc08dd7cdb3.

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 69f62ec	refs/heads/master
Merge: 0899be5 7db29f9
Author: Rafael Mendonça França 
Date:   2012-07-29 22:48:20 -0700

    Merge pull request #7198 from cfcosta/refactor-cache_control_headers
    
    Refactor ActionDispatch::Http::Cache::Response#cache_control_headers

commit 7db29f9	refs/heads/master
Author: Cainã Costa 
Date:   2012-07-30 02:40:13 -0300

    Refactor ActionDispatch::Http::Cache::Response#cache_control_headers.

M	actionpack/lib/action_dispatch/http/cache.rb

commit 0899be5	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 21:42:42 -0700

    updated changelog

M	actionpack/CHANGELOG.md

commit fa3c4ea	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 20:33:16 -0700

    close the response when the response body is set so that normal render calls will work

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/test/controller/live_stream_test.rb

commit 4509494	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 20:26:40 -0700

    header hash is duped before being sent up the rack stack

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/controller/live_stream_test.rb

commit b3d1f5b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 19:51:21 -0700

    freeze the header object

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/test/dispatch/live_response_test.rb

commit 619e7c8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 19:46:36 -0700

    make sure set_response! sets the correct response object

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/test/controller/live_stream_test.rb

commit 08b107e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 19:36:40 -0700

    adding a more docs on closing response streams

M	actionpack/lib/action_controller/metal/live.rb

commit dd871a3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 19:34:59 -0700

    pushing Buffer up to Live

M	actionpack/lib/action_controller/metal/live.rb

commit c83e147	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 19:33:14 -0700

    adding some docs

M	actionpack/lib/action_controller/metal/live.rb

commit 38cfbb8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 19:23:19 -0700

    Controller actions are processed in a separate thread for live
    responses.
    
    Processing controller actions in a separate thread allows us to work
    around the rack api - we can allow the user to set status and headers,
    then block until the first bytes are written.  As soon as the first
    bytes are written, the main thread can return the status, headers, and
    (essentially) a queue for the body.

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/live_stream_test.rb

commit 06c9e17	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 17:55:39 -0700

    raise exceptions on header set after response committed

M	actionpack/lib/action_controller/metal/live.rb
M	actionpack/lib/action_dispatch.rb
M	actionpack/test/dispatch/live_response_test.rb

commit 01b8126	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 17:29:20 -0700

    make sure appropriate headers are set and deleted

M	actionpack/test/dispatch/live_response_test.rb

commit af0a9f9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 17:26:07 -0700

    added live responses which can be written and read in separate threads

M	actionpack/lib/action_controller.rb
A	actionpack/lib/action_controller/metal/live.rb
A	actionpack/test/controller/live_stream_test.rb
A	actionpack/test/dispatch/live_response_test.rb
A	activesupport/lib/active_support/concurrency/latch.rb

commit ea881ef	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 23:23:45 -0500

    update AR::Validations::AssociatedValidator documentation [ci skip]

M	activerecord/lib/active_record/validations/associated.rb

commit 1cd40de	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 23:20:27 -0500

    update AR::Validations::UniquenessValidator documentation [ci skip]

M	activerecord/lib/active_record/validations/uniqueness.rb

commit 4d17947	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 23:09:24 -0500

    add :nodoc: directives to ActiveModel Sanitizers [ci skip]

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb

commit c57b8d2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 22:56:04 -0500

    fix class reference in AM::MassAssignmentSecurity documentation [ci skip]

M	activemodel/lib/active_model/mass_assignment_security.rb

commit cb6c3e2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 22:40:37 -0500

    update ActiveModel::Validations::Callbacks documentation [ci skip]

M	activemodel/lib/active_model/validations/callbacks.rb

commit d4433a3	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-29 23:38:33 -0300

    ActionController::DataStreaming::FileBody doesn't respond to #close.

M	actionpack/lib/action_dispatch/http/response.rb

commit 097bfc8	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 20:08:42 -0500

    update #validates and #validates! documentation [ci skip]

M	activemodel/lib/active_model/validations/validates.rb

commit 0557273	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 19:57:48 -0500

    update ActiveModel::Valdations#validates_with docs [ci skip]

M	activemodel/lib/active_model/validations/with.rb

commit 01e61ee	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 19:52:25 -0500

    update ActiveModel::Validations docs [ci skip]

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validator.rb

commit a6bdae1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 17:02:00 -0700

    flushing output should write to the stream rather than mutating the response object

M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/test/controller/send_file_test.rb

commit 19e68e9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 16:00:50 -0700

    remove dead test

M	actionpack/test/controller/streaming_test.rb

commit 356787f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 15:51:21 -0700

    adding a buffered stream to the response object

M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_dispatch/http/response.rb
A	actionpack/test/controller/streaming_test.rb
M	actionpack/test/dispatch/response_test.rb

commit 76d75f4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-29 14:39:03 -0700

    initialize ivars, refactor recycle! to call initialize

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/response.rb

commit 82667c8	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-29 17:47:05 -0300

    Remove warning renaming the test classes to use the test convention

M	actionpack/test/controller/layout_test.rb
M	actionpack/test/controller/url_for_test.rb

commit 6b9004a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-29 16:11:48 -0300

    Remove deprecation warning, since scoped waas deprecated

M	actionpack/test/fixtures/reply.rb

commit 7850267	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 13:35:33 -0500

    update ActiveModel::Validator docs [ci skip]

M	activemodel/lib/active_model/secure_password.rb
M	activemodel/lib/active_model/validator.rb

commit 0c315c7	refs/heads/master
Merge: 324ff46 66529fc
Author: Aaron Patterson 
Date:   2012-07-29 11:15:13 -0700

    Merge pull request #7196 from rimidl/fix-incorrect-require-mysql-in-mysql_rake_test
    
    Fix incorrect usage `require mysql` in the activerecord/.../mysql_rake_test

commit 324ff46	refs/heads/master
Merge: f7b4016 915b6b3
Author: Carlos Antonio da Silva 
Date:   2012-07-29 10:26:32 -0700

    Merge pull request #7188 from rodrigoflores/master
    
    Documentation Fix: Pointing the case when no dependent option is given to a association method

commit f7b4016	refs/heads/master
Merge: 07ecaf5 fd0004b
Author: Carlos Antonio da Silva 
Date:   2012-07-29 10:24:24 -0700

    Merge pull request #7192 from bogdan/sqlite_tests_fix
    
    More polite cleanup for sqlite tests

commit 07ecaf5	refs/heads/master
Merge: 1f870a2 d59208d
Author: Carlos Antonio da Silva 
Date:   2012-07-29 10:23:02 -0700

    Merge pull request #7194 from alexandrz/master
    
    DRY class_attribute

commit 66529fc	refs/heads/master
Author: Vladimir Strakhov 
Date:   2012-07-29 21:16:42 +0400

    fix incorrect usage `require mysql` in the activerecord/test/.../mysql_rake_test.rb

M	activerecord/test/cases/tasks/mysql_rake_test.rb

commit f0f7786	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-29 12:04:43 -0500

    update ActiveModel::SecurePassword docs [ci skip]

M	activemodel/lib/active_model/secure_password.rb

commit d59208d	refs/heads/master
Author: Aleksandr Zykov 
Date:   2012-07-29 22:33:39 +0600

    DRY class_attribute code

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit fd0004b	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-07-29 14:47:15 +0300

    More polite cleanup for sqlite tests

M	activerecord/test/cases/tasks/sqlite_rake_test.rb

commit 1f870a2	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-28 20:40:27 -0700

    issue a warning when we cannot construct a controller

M	actionpack/lib/action_controller/test_case.rb

commit f79b29a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-28 20:30:39 -0700

    this test is not a controller test, so switch to AS::TC

M	actionpack/test/controller/url_rewriter_test.rb

commit 915b6b3	refs/heads/master
Author: Rodrigo Flores 
Date:   2012-07-28 23:13:15 -0300

    Explaining a bit better about the default behaviour of dependent

M	activerecord/lib/active_record/associations.rb

commit cc712f2	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-07-29 00:23:48 +0200

    removes the AR session store from eager loaded code [fixes #7160]
    
    See the comment in the file activerecord/lib/active_record.rb
    added by this patch for the rationale.

M	activerecord/lib/active_record.rb

commit 8bf1088	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-29 00:23:48 +0200

    removes the AR session store from eager loaded code [fixes #7160]
    
    See the comment in the file activerecord/lib/active_record.rb
    added by this patch for the rationale.

M	activerecord/lib/active_record.rb

commit 79b8778	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-28 14:24:56 -0500

    add example to ActiveModel::StrictValidationFailed [ci skip]

M	activemodel/lib/active_model/errors.rb

commit be408d6	refs/tags/v3.2.8.rc1
Merge: bf16456 3326b8b
Author: Rafael Mendonça França 
Date:   2012-07-28 12:03:44 -0700

    Merge pull request #7187 from frodsan/fix_test_help
    
    Backport #6995 to 3-2 stable

commit 3326b8b	refs/tags/v3.2.8.rc1
Author: Francesco Rodriguez 
Date:   2012-07-28 13:59:08 -0500

    Backport #6995 to 3-2 stable
    
    Update `test_help` to config properly turn natural language option.
    Last versions of Turn don't monkey patch MiniTest to setup
    the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3).
    
    This patches the following behaviour:
    
        $ rake test:units
        `': undefined method `use_natural_language_case_names='
        for MiniTest::Unit:Class (NoMethodError)

M	railties/lib/rails/test_help.rb

commit 4d87c4e	refs/heads/master
Merge: ab0359c 8b6301a
Author: Rafael Mendonça França 
Date:   2012-07-28 10:33:27 -0700

    Merge pull request #7186 from rimidl/fix-failure-test-in-actionpack
    
    Fix test_can_wait_until_commit(ResponseTest) in /actionpack/test/dispatch/response_test.rb

commit ab0359c	refs/heads/master
Merge: 0cda0b3 8f4b54a
Author: Rafael Mendonça França 
Date:   2012-07-28 09:18:38 -0700

    Merge pull request #7185 from route/reset_table_name_refactoring
    
    Refactor to reset_table_name

commit 8b6301a	refs/heads/master
Author: Vladimir Strakhov 
Date:   2012-07-28 20:12:35 +0400

    fix failure test 'test_can_wait_until_commit(ResponseTest)' in actionpack

M	actionpack/test/dispatch/response_test.rb

commit bf16456	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-07-28 17:51:56 +0200

    missing require: the AR session store depends on the AP abstract store
    
    This require makes the dependency even more clear.
    In particular we are eager loading the session
    store but that does not work if AR is used
    outside Rails, this patch is preliminary work
    in fixing #7160.

M	activerecord/lib/active_record/session_store.rb

commit 0cda0b3	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-28 17:51:56 +0200

    missing require: the AR session store depends on the AP abstract store
    
    This require makes the dependency even more clear.
    In particular we are eager loading the session
    store but that does not work if AR is used
    outside Rails, this patch is preliminary work
    in fixing #7160.

M	activerecord/lib/active_record/session_store.rb

commit 8f4b54a	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-07-28 18:55:41 +0400

    Refactor to reset_table_name

M	activerecord/lib/active_record/model_schema.rb

commit b867291	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-28 01:19:38 -0500

    add example to ActiveModel::MissingAttributeError [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit ac18d64	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-28 00:58:21 -0500

    update ActiveModel::MassAssignmentSecurity docs [ci skip]

M	activemodel/lib/active_model/mass_assignment_security.rb

commit b8e4f71	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-27 23:38:34 -0500

    add example to ActiveModel::Naming#model_name [ci skip]

M	activemodel/lib/active_model/naming.rb

commit 36ebafd	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-27 23:16:51 -0500

    fix AM::Naming examples [ci skip]

M	activemodel/lib/active_model/naming.rb

commit 0340493	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-27 21:02:08 -0500

    update to_param docs [ci skip]

M	activesupport/lib/active_support/core_ext/object/to_param.rb

commit db340da	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-07-28 00:56:59 +0200

    adds a missing require from Active Support
    
    This file uses mattr_accessor.

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit b5dfc47	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-28 00:56:59 +0200

    adds a missing require from Active Support
    
    This file uses mattr_accessor.

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit acb6848	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-27 15:54:11 -0700

    threads can wait on responses to be committed

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/dispatch/response_test.rb

commit 74262e6	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-27 19:36:44 -0300

    Revert "Removed reference to composed_of."
    
    This reverts commit c34c1916d1d6cd6ba219aa39eb97fa2e77c4c61f.
    
    Reason: composed_of was added from now to discuss better

M	activerecord/lib/active_record/sanitization.rb

commit 61e31f2	refs/remotes/origin/async (origin/async)
Merge: 648e198 c01810d
Author: Aaron Patterson 
Date:   2012-07-27 15:25:46 -0700

    Merge branch 'master' into async
    
    * master: (29 commits)
      Don't test language-level exception messages
      Modity the :json_data_empty attribute from `:null => false` to `:null => true` to address ORA-01400 errors with Oracle enhanced adapter.
      Add Object#try! with the old NoMethodError raising behavior
      will now return nil instead of raise a NoMethodError if the receiving object does not implement the method
      Changelog and doc updates for the previous changes.
      Deprecate Relation#all.
      Deprecate ActiveRecord::Base.scoped.
      ActiveRecord::Base.all returns a Relation.
      Only require the `:rails_env` task where is needed.
      Modify the preference attribute from `:null => false` to `:null => true` to address ORA-01400 errors with Oracle enhanced adapter.
      * Do not convert digest auth strings to symbols. CVE-2012-3424
      fix typo in documentation
      Refactor ActiveRecord::Inheritance.base_class logic
      Missed extend for eager_autoload
      Update activerecord/CHANGELOG.md
      Switched update_column recommendation in changelog to update_columns
      Eager autoload ActiveRecord association helpers
      Use string datatype for the setting attribute to make store works all database adapters.
      remove duplicate build runs in travis.  These extra runs were used to test identity map and not fully removed when the feature was removed.
      Deprecate update_column in favor of update_columns.
      ...

commit f4d818d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-27 18:21:29 -0300

    Revert "Removing composed_of from ActiveRecord."
    
    This reverts commit 14fc8b34521f8354a17e50cd11fa3f809e423592.
    
    Reason: we need to discuss a better path from this removal.
    
    Conflicts:
    	activerecord/lib/active_record/reflection.rb
    	activerecord/test/cases/base_test.rb
    	activerecord/test/models/developer.rb

M	activerecord/CHANGELOG.md
M	activerecord/README.rdoc
M	activerecord/lib/active_record.rb
A	activerecord/lib/active_record/aggregations.rb
M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/sanitization.rb
A	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/customer.rb
M	activerecord/test/models/developer.rb

commit c01810d	refs/remotes/origin/async
Merge: f3bfcbb 708b5c0
Author: Rafael Mendonça França 
Date:   2012-07-27 13:02:39 -0700

    Merge pull request #7182 from yahonda/address_7178
    
    Modity the :json_data_empty attribute from `:null => false` to `:null => true`

commit f3bfcbb	refs/remotes/origin/async
Merge: 1fab518 e113480
Author: Rafael Mendonça França 
Date:   2012-07-27 12:58:37 -0700

    Merge pull request #7181 from jfirebaugh/rbx
    
    Don't test language-level exception messages

commit e113480	refs/remotes/origin/async
Author: John Firebaugh 
Date:   2012-07-27 12:50:21 -0700

    Don't test language-level exception messages
    
    Ruby implementations should be free to produce exception
    messages that are not identical to MRI. For example,
    Rubinius produces 'Expected an even number, got 5'.

M	activesupport/test/ordered_hash_test.rb

commit 708b5c0	refs/remotes/origin/async
Author: Yasuo Honda 
Date:   2012-07-28 03:26:49 +0900

    Modity the :json_data_empty attribute from `:null => false` to `:null => true`
    to address ORA-01400 errors with Oracle enhanced adapter.
    
    The original commit 3c0bf043 requires :json_data_empty attribute
    has empty string OR null, then setting `:default => ""` is enough.

M	activerecord/test/schema/schema.rb

commit 1fab518	refs/remotes/origin/async
Merge: 04998cd 9feda92
Author: José Valim 
Date:   2012-07-27 11:02:29 -0700

    Merge pull request #6827 from zephyr-dev/master
    
    Validates_presence_of associated object marked for destruction

commit 46b24c9	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-27 12:59:05 -0500

    use 'HTTP_AUTHORIZATION' instead of :authorization as key when dealing with HTTP Token authentication in integration tests

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 04998cd	refs/remotes/origin/async
Author: David Heinemeier Hansson 
Date:   2012-07-27 12:33:02 -0500

    Add Object#try! with the old NoMethodError raising behavior

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 99ea1a8	refs/remotes/origin/async
Author: David Heinemeier Hansson 
Date:   2012-07-27 12:20:50 -0500

     will now return nil instead of raise a NoMethodError if the receiving object does not implement the method

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 3205c76	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-07-27 18:08:18 +0100

    Changelog and doc updates for the previous changes.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/query_methods.rb
M	guides/source/active_record_querying.textile

commit d109954	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-07-27 17:55:43 +0100

    Deprecate Relation#all.
    
    It has been moved to active_record_deprecated_finders.
    
    Use #to_a instead.

M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/readonly_test.rb

commit b658cf1	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-07-27 17:27:47 +0100

    Deprecate ActiveRecord::Base.scoped.
    
    It doesn't serve much purpose now that ActiveRecord::Base.all returns a
    Relation.
    
    The code is moved to active_record_deprecated_finders.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/models/bulb.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/models/developer.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/project.rb
M	activerecord/test/models/topic.rb

commit 6a81ccd	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-07-27 12:01:25 +0100

    ActiveRecord::Base.all returns a Relation.
    
    Previously it returned an Array.
    
    If you want an array, call e.g. `Post.to_a` rather than `Post.all`. This
    is more explicit.
    
    In most cases this should not break existing code, since
    Relations use method_missing to delegate unknown methods to #to_a
    anyway.

M	activemodel/lib/active_model/observing.rb
M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/explain_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb

commit f1afd77	refs/remotes/origin/async
Author: Rafael Mendonça França 
Date:   2012-07-27 01:20:17 -0300

    Only require the `:rails_env` task where is needed.
    
    `:rails_env` tasks is not needed in all the tasks that depends of
    `load_config`, only in the tasks that uses `Rails.env`.
    
    Since `:rails_env` task set the `Rails.env` to be "development" if it is
    not set we don't need the `||` statements too
    
    Fix #7175.
    
    Conflicts:
    	activerecord/lib/active_record/railties/databases.rake

M	activerecord/lib/active_record/railties/databases.rake

commit 4b8b8c1	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-07-27 01:20:17 -0300

    Only require the `:rails_env` task where is needed.
    
    `:rails_env` tasks is not needed in all the tasks that depends of
    `load_config`, only in the tasks that uses `Rails.env`.
    
    Since `:rails_env` task set the `Rails.env` to be "development" if it is
    not set we don't need the `||` statements too
    
    Fix #7175.

M	activerecord/lib/active_record/railties/databases.rake

commit 87f3bd0	refs/remotes/origin/async
Merge: fee0bc5 dab8ca5
Author: Rafael Mendonça França 
Date:   2012-07-26 19:58:13 -0700

    Merge pull request #7173 from yahonda/address_7138
    
    Modify the preference attribute from `:null => false` to `:null => true`

commit dab8ca5	refs/remotes/origin/async
Author: Yasuo Honda 
Date:   2012-07-27 10:28:06 +0900

    Modify the preference attribute from `:null => false` to `:null => true`
    to address ORA-01400 errors with Oracle enhanced adapter.
    
    Issue #4856 had been fixed and tested with
    the attribute `:null => false, :default => ""`.
    Now `:null => false` attribute is not necessary to test this issue.

M	activerecord/test/schema/schema.rb

commit fee0bc5	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-26 13:30:15 -0700

    * Do not convert digest auth strings to symbols. CVE-2012-3424
    
    Conflicts:
    	actionpack/lib/action_controller/metal/http_authentication.rb

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 133754e	refs/tags/v3.2.8.rc1
Merge: 3dae440 d1b9cf2
Author: Aaron Patterson 
Date:   2012-07-26 15:07:19 -0700

    Merge branch '3-2-rel' into 3-2-stable
    
    * 3-2-rel:
      updating release date
      bumping to 3.2.7
      updating the changelog
      * Do not convert digest auth strings to symbols. CVE-2012-3424
      updating the version
      updating changelogs

commit 3166606	refs/tags/v3.0.16 (tag: v3.0.16)
Author: Aaron Patterson 
Date:   2012-07-26 14:59:39 -0700

    bumping to 3.0.16

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit d314a48	refs/tags/v3.1.7 (tag: v3.1.7)
Author: Aaron Patterson 
Date:   2012-07-26 14:58:51 -0700

    bumping to 3.1.7

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 4a0370b	refs/tags/v3.0.16
Author: Aaron Patterson 
Date:   2012-07-26 14:57:45 -0700

    updating release date

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 6cf68d7	refs/tags/v3.1.7
Author: Aaron Patterson 
Date:   2012-07-26 14:55:18 -0700

    updating rails release date

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit d1b9cf2	refs/tags/v3.2.7 (tag: v3.2.7)
Author: Aaron Patterson 
Date:   2012-07-26 14:34:31 -0700

    updating release date

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 21bcac1	refs/tags/v3.2.7
Author: Aaron Patterson 
Date:   2012-07-26 14:26:23 -0700

    bumping to 3.2.7

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit fe48ad3	refs/tags/v3.0.16
Author: Aaron Patterson 
Date:   2012-07-26 13:32:58 -0700

    updating changelog with CVE

M	actionpack/CHANGELOG

commit b88cc8a	refs/tags/v3.0.16
Author: Aaron Patterson 
Date:   2012-07-26 13:30:15 -0700

    * Do not convert digest auth strings to symbols. CVE-2012-3424

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 140a70a	refs/tags/v3.1.7
Author: Aaron Patterson 
Date:   2012-07-26 13:32:08 -0700

    updating changelog with CVE

M	actionpack/CHANGELOG.md

commit eb69ad2	refs/tags/v3.1.7
Author: Aaron Patterson 
Date:   2012-07-26 13:30:15 -0700

    * Do not convert digest auth strings to symbols. CVE-2012-3424

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit fb89f6f	refs/tags/v3.2.7
Author: Aaron Patterson 
Date:   2012-07-26 13:30:25 -0700

    updating the changelog

M	actionpack/CHANGELOG.md

commit 27311fe	refs/tags/v3.2.7
Author: Aaron Patterson 
Date:   2012-07-26 13:30:15 -0700

    * Do not convert digest auth strings to symbols. CVE-2012-3424

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 90c9ae5	refs/remotes/origin/async
Merge: f4c2a12 d0aebd5
Author: Rafael Mendonça França 
Date:   2012-07-26 12:32:27 -0700

    Merge pull request #7171 from beerlington/refactor_inheritance_base_class
    
    Refactor ActiveRecord::Inheritance.base_class logic

commit f4c2a12	refs/remotes/origin/async
Merge: b1d7283 103a313
Author: Rafael Mendonça França 
Date:   2012-07-26 11:56:45 -0700

    Merge pull request #7170 from makaroni4/master
    
    Fix typo in documentation

commit 103a313	refs/remotes/origin/async
Author: Anatoly Makarevich 
Date:   2012-07-26 22:44:36 +0400

    fix typo in documentation

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	activesupport/lib/active_support/callbacks.rb

commit d0aebd5	refs/remotes/origin/async
Author: beerlington 
Date:   2012-07-26 13:46:49 -0400

    Refactor ActiveRecord::Inheritance.base_class logic
    
    Moved logic from class_of_active_record_descendant(class) to the
    base_class method. This method was confusing because it required
    an argument, but that argument was 'self'.
    
    Moved base_class tests to inheritance_test.rb and added some test
    coverage for some untested cases.

M	activerecord/lib/active_record/inheritance.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/inheritance_test.rb

commit b1d7283	refs/remotes/origin/async
Merge: 88c205b 8cf300c
Author: José Valim 
Date:   2012-07-26 03:13:07 -0700

    Merge pull request #7167 from route/missed_extend
    
    Missed extend for eager_autoload

commit 8cf300c	refs/remotes/origin/async
Author: Dmitry Vorotilin 
Date:   2012-07-26 14:04:32 +0400

    Missed extend for eager_autoload

M	activerecord/lib/active_record/associations.rb

commit 88c205b	refs/remotes/origin/async
Merge: 07c455d c046a29
Author: Jon Leighton 
Date:   2012-07-26 01:07:02 -0700

    Merge pull request #7166 from ayrton/patch-1
    
    Update activerecord/CHANGELOG.md

commit 07c455d	refs/remotes/origin/async
Merge: dc464b9 a052fc9
Author: Jon Leighton 
Date:   2012-07-26 01:05:17 -0700

    Merge pull request #7161 from michaelfairley/eager_load_active_record_association_helpers
    
    Eager autoload ActiveRecord association helpers

commit c046a29	refs/remotes/origin/async
Author: Ayrton De Craene 
Date:   2012-07-26 10:30:50 +0300

    Update activerecord/CHANGELOG.md
    
    Fixed markdown code indenting

M	activerecord/CHANGELOG.md

commit dc464b9	refs/remotes/origin/async
Merge: 0dc356e ffe8b0a
Author: Rafael Mendonça França 
Date:   2012-07-25 21:08:34 -0700

    Merge pull request #7165 from parndt/patch-5
    
    Switched update_column recommendation in changelog to update_columns

commit ffe8b0a	refs/remotes/origin/async
Author: Philip Arndt 
Date:   2012-07-26 16:01:51 +1200

    Switched update_column recommendation in changelog to update_columns
    
    Related to #7164
    
    Looks like the last one; thanks!

M	activerecord/CHANGELOG.md

commit 3dae440	refs/tags/v3.2.8.rc1
Merge: 17a64de 9fa06c3
Author: Rafael Mendonça França 
Date:   2012-07-25 20:57:09 -0700

    Merge pull request #7164 from parndt/patch-4
    
    Switched update_column recommendation in changelog to update_columns

commit 9fa06c3	refs/tags/v3.2.8.rc1
Author: Philip Arndt 
Date:   2012-07-26 15:43:16 +1200

    Switched update_column recommendation in changelog to update_columns
    
    This is related to #7159

M	activerecord/CHANGELOG.md

commit 17a64de	refs/tags/v3.2.8.rc1
Author: Carlos Antonio da Silva 
Date:   2012-07-25 22:43:21 -0300

    Fix AR#update_columns tests on Ruby 1.8.7

M	activerecord/test/cases/persistence_test.rb

commit a052fc9	refs/remotes/origin/async
Author: Michael Fairley 
Date:   2012-07-25 17:34:39 -0700

    Eager autoload ActiveRecord association helpers

M	activerecord/lib/active_record/associations.rb

commit 0dc356e	refs/remotes/origin/async
Merge: b5c2384 4b1bca0
Author: Aaron Patterson 
Date:   2012-07-25 16:59:19 -0700

    Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2
    
    Postgresql auto reconnect 2

commit def9c85	refs/tags/v3.2.8.rc1
Merge: 6b7d26c a0b85b9
Author: Aaron Patterson 
Date:   2012-07-25 16:50:07 -0700

    Merge pull request #7159 from parndt/update_columns
    
    Backport update_columns to Rails 3.2

commit a0b85b9	refs/tags/v3.2.8.rc1
Author: Philip Arndt 
Date:   2012-07-26 11:44:38 +1200

    Suggest using update_columns instead of update_column.
    
    update_column is deprecated in Rails 4.0 so it makes no sense to
    recommend adopting it only to require changing to update_columns
    in the very next release.

M	activerecord/lib/active_record/persistence.rb

commit f27a8eb	refs/tags/v3.2.8.rc1
Author: Sebastian Martinez 
Date:   2011-05-21 13:14:55 -0300

    New #update_columns method.

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/persistence_test.rb
M	railties/guides/source/active_record_validations_callbacks.textile

commit b5c2384	refs/remotes/origin/async
Merge: c324f42 05895c6
Author: Rafael Mendonça França 
Date:   2012-07-25 10:59:36 -0700

    Merge pull request #7158 from yahonda/use_string_for_settings
    
    Use string datatype for the setting attribute

commit 05895c6	refs/remotes/origin/async
Author: Yasuo Honda 
Date:   2012-07-26 00:34:55 +0900

    Use string datatype for the setting attribute
    to make store works all database adapters.

M	activerecord/test/schema/schema.rb

commit c324f42	refs/remotes/origin/async
Merge: 864b49d 0c1c0c6
Author: Carlos Antonio da Silva 
Date:   2012-07-24 21:02:27 -0700

    Merge pull request #7151 from graceliu/travis-rm-dup-run
    
    remove duplicate build runs in travis

commit 0c1c0c6	refs/remotes/origin/async
Author: Grace Liu 
Date:   2012-07-24 16:44:20 -0700

    remove duplicate build runs in travis.  These extra runs were used to
    test identity map and not fully removed when the feature was removed.

M	ci/travis.rb

commit 864b49d	refs/remotes/origin/async
Merge: 2d6af1d 2d9e5a2
Author: Rafael Mendonça França 
Date:   2012-07-24 20:20:48 -0300

    Merge branch 'update_columns'

commit 2d9e5a2	refs/remotes/origin/async
Author: Rafael Mendonça França 
Date:   2012-07-24 20:20:03 -0300

    Deprecate update_column in favor of update_columns.
    
    Closes #1190

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit da84ccb	refs/remotes/origin/async
Author: Rafael Mendonça França 
Date:   2012-07-24 19:13:18 -0300

    Use update_columns to implemente the update_column

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/persistence_test.rb

commit 87ffc36	refs/remotes/origin/async
Author: Sebastian Martinez 
Date:   2011-05-21 13:14:55 -0300

    New #update_columns method.

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/persistence_test.rb
M	guides/source/active_record_validations_callbacks.textile

commit 2d6af1d	refs/remotes/origin/async
Merge: d7856d3 0da4950
Author: Rafael Mendonça França 
Date:   2012-07-24 12:28:27 -0700

    Merge pull request #7148 from yahonda/address_6195
    
    Addresses ORA-01400 errors and also supports #6115

commit d7856d3	refs/remotes/origin/async
Merge: 66b859b 9a020bd
Author: Rafael Mendonça França 
Date:   2012-07-24 12:24:01 -0700

    Merge pull request #7150 from lucasmazza/flush_option
    
    Replace the flush parameter with a Hash.

commit 9a020bd	refs/remotes/origin/async
Author: Lucas Mazza 
Date:   2012-07-24 16:19:14 -0300

    Replace the flush parameter with a Hash.

M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/test/template/capture_helper_test.rb

commit 0da4950	refs/remotes/origin/async
Author: Yasuo Honda 
Date:   2012-07-24 22:46:17 +0900

    This pull requests addresses ORA-01400 errors and also supports #6115 issue tested.
    
    Issue #6115 has been fixed and tested with
    the attribute `:null => false, :default => ""`
    However `:null => false` attribute is not necessary to test this issue,
    which causes many ORA-01400 errors with Oracle enhanced adapter.

M	activerecord/test/schema/schema.rb

commit c74ff7f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-24 13:13:14 -0500

    Update performance testing guide [ci skip]
    
    * Update test templates.
    * Remove some 1.8 references.
    * Update guide format to be easier for contributors.

M	guides/source/performance_testing.textile

commit 66b859b	refs/remotes/origin/async
Merge: aac9d2c ae3fdac
Author: Rafael Mendonça França 
Date:   2012-07-24 10:40:23 -0700

    Merge pull request #6991 from frodsan/performance_test_generator
    
    update performance test template to use test method

commit 648e198	refs/remotes/origin/async
Merge: 7854451 aac9d2c
Author: Aaron Patterson 
Date:   2012-07-24 10:17:36 -0700

    Merge branch 'master' into async
    
    * master: (55 commits)
      fix typo in callbacks test
      Add CHANGELOG entry
      Remove ActionDispatch::Head middleware in favor of Rack::Head
      Fix build. Bump Journey requirements to 2.0.0.
      Bump Journey requirements to 1.0.4
      Add one more test case to make sure that data attributes are being escaped
      Restore connection_id on error.
      don't escape options in option_html_attributes method
      fixing :nodoc:s in AS::JSON::Encoding
      Remove deprecation warnings
      Add back `:disable_with` and change deprecation horizon to 4.1
      Add back `:confirm` and change deprecation horizon to 4.1
      +"foo"+ doesn't generate code tag [ci skip]
      Lets be consistent with whitespaces at documentation
      Copy-edits at Rails::Queueing documentation
      update 4.0 release notes [ci skip]
      improve NullRelation docs [ci skip]
      minor copy edits [ci skip]
      Revert "Make it clear that you can also pass a full url to assert_routing."
      makes a pass over the API of ActiveSupport::HashWithIndifferentAccess
      ...

commit aac9d2c	refs/remotes/origin/async
Merge: 14a1df1 f35f6ab
Author: Santiago Pastorino 
Date:   2012-07-24 04:54:53 -0700

    Merge pull request #7143 from accessd/fix-typo-callbacks-test
    
    fix typo in validations callbacks test

commit f35f6ab	refs/remotes/origin/async
Author: Accessd 
Date:   2012-07-24 12:01:41 +0400

    fix typo in callbacks test

M	activemodel/test/cases/validations/callbacks_test.rb

commit 5ca11fe	refs/heads/master
Author: Seamus Abshere 
Date:   2012-07-23 17:33:00 -0500

    Make sure :environment task is executed before db:schema:load or db:structure:load
    
    Otherwise, if schema_format = :sql, you will see:
    $ rake db:setup --trace
    ** Invoke db:setup (first_time)
    ** Invoke db:schema:load_if_ruby (first_time)
    ** Invoke db:create (first_time)
    ** Invoke db:load_config (first_time)
    ** Invoke rails_env (first_time)
    ** Execute rails_env
    ** Execute db:load_config
    ** Execute db:create
    db_example_development already exists
    db_example_test already exists
    ** Execute db:schema:load_if_ruby       #<-------- :environment hasn't been executed yet
    ** Invoke db:schema:load (first_time)
    ** Invoke environment (first_time)
    ** Execute environment
    ** Execute db:schema:load
    ~/db_example/db/schema.rb doesn't exist yet. Run `rake db:migrate` to create it then try again.

M	activerecord/lib/active_record/railties/databases.rake

commit 753c546	refs/tags/v3.2.7.rc1 (tag: v3.2.7.rc1)
Author: Aaron Patterson 
Date:   2012-07-23 14:41:02 -0700

    updating the version

M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 32b4cbc	refs/tags/v3.0.16
Author: Aaron Patterson 
Date:   2012-07-23 14:38:48 -0700

    updating changelogs

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit a4b8a7e	refs/tags/v3.1.7
Author: Aaron Patterson 
Date:   2012-07-23 14:32:54 -0700

    updating changelog

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 125dfdf	refs/tags/v3.2.7.rc1
Author: Aaron Patterson 
Date:   2012-07-23 14:26:16 -0700

    updating changelogs

M	RAILS_VERSION
M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 14a1df1	refs/remotes/origin/async
Author: Santiago Pastorino 
Date:   2012-07-23 14:37:09 -0300

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit 449039a	refs/remotes/origin/async
Author: Santiago Pastorino 
Date:   2012-07-23 13:50:48 -0300

    Remove ActionDispatch::Head middleware in favor of Rack::Head
    
    Closes #7110 there's more work to do on rack-cache issue 69

M	actionpack/lib/action_dispatch/http/request.rb
D	actionpack/lib/action_dispatch/middleware/head.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/dispatch/request_test.rb
M	railties/lib/rails/application.rb
M	railties/test/application/middleware_test.rb
M	railties/test/application/rack/logger_test.rb

commit 998189a	refs/remotes/origin/async
Merge: 4d7a102 6ebfe8b
Author: Rafael Mendonça França 
Date:   2012-07-23 10:27:32 -0700

    Merge pull request #7137 from kennyj/fix_installing_problem_journey
    
    Fix build. There is journey-1.0.4 on the 1-0-stable branch.

commit 6ebfe8b	refs/remotes/origin/async
Author: kennyj 
Date:   2012-07-24 02:25:38 +0900

    Fix build. Bump Journey requirements to 2.0.0.

M	actionpack/actionpack.gemspec

commit c34c191	refs/heads/master
Author: Steve Klabnik 
Date:   2012-07-23 04:13:18 -0400

    Removed reference to composed_of.
    
    It was previously removed from the code, so we shouldn't mention
    it in the docs

M	activerecord/lib/active_record/sanitization.rb

commit 4d7a102	refs/remotes/origin/async
Author: Andrew White 
Date:   2012-07-23 07:08:38 +0100

    Bump Journey requirements to 1.0.4
    
    There are some Action Pack tests for regressions from 3.1 that require
    a later version of Journey to pass so bump to the current version.

M	actionpack/actionpack.gemspec

commit 6b7d26c	refs/tags/v3.2.8.rc1
Author: Andrew White 
Date:   2012-07-23 07:04:30 +0100

    Bump Journey requirements to 1.0.4
    
    There are some Action Pack tests for regressions from 3.1 that require
    a later version of Journey to pass so bump to the current version.

M	actionpack/actionpack.gemspec

commit 738a0e1	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-22 19:51:17 -0500

    fix removed ruby tag in commit 890b9dd [ci skip]

M	guides/source/engines.textile

commit 890b9dd	refs/heads/master
Author: Weston Platter 
Date:   2012-07-22 17:24:49 -0400

    added 2 strategies for extending engine models

M	guides/source/engines.textile

commit c12024b	refs/heads/master
Author: dm1try 
Date:   2012-07-22 23:47:30 +0300

    tiny mistake in description

M	guides/source/configuring.textile

commit b7b97fa	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-22 13:26:43 -0500

    add :nodoc: directive to AM::ObserverArray internal methods [ci skip]

M	activemodel/lib/active_model/observer_array.rb

commit 580fa0c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-22 13:57:42 -0300

    Add one more test case to make sure that data attributes are being
    escaped

M	actionpack/test/template/form_options_helper_test.rb

commit 61be340	refs/heads/master
Merge: 440a5eb 8ca93c7
Author: Rafael Mendonça França 
Date:   2012-07-22 08:56:30 -0700

    Merge pull request #7130 from kennyj/fix_restoring_query_cache
    
    Restore connection_id on error.

commit 8ca93c7	refs/heads/master
Author: kennyj 
Date:   2012-07-23 00:46:00 +0900

    Restore connection_id on error.

M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit 440a5eb	refs/heads/master
Merge: 1b2a7ba dacbcbe
Author: Rafael Mendonça França 
Date:   2012-07-22 08:10:31 -0700

    Merge pull request #7123 from nashby/data-in-options
    
    don't escape options in option_html_attributes method

commit dacbcbe	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-07-21 13:34:03 +0300

    don't escape options in option_html_attributes method
    
    we don't need to escape values in this method as we pass
    these html attributes to `tag_options` method that handle escaping as
    well.
    
    it fixes the case when we want to pass html5 data options

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 1b2a7ba	refs/heads/master
Merge: 5b9d0a6 12ae9d6
Author: Rafael Mendonça França 
Date:   2012-07-21 14:48:38 -0700

    Merge pull request #7126 from frodsan/fix_nodoc_encoding
    
    fixing :nodoc:s in AS::JSON::Encoding

commit 12ae9d6	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-21 16:38:02 -0500

    fixing :nodoc:s in AS::JSON::Encoding

M	activesupport/lib/active_support/json/encoding.rb

commit 5b9d0a6	refs/heads/master
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-07-21 16:47:58 -0300

    Remove deprecation warnings

M	actionpack/test/fixtures/project.rb
M	actionpack/test/fixtures/reply.rb

commit 0106e5f	refs/heads/master
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-07-21 16:19:40 -0300

    Add back `:disable_with` and change deprecation horizon to 4.1

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb

commit 9345a11	refs/heads/master
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-07-21 15:20:26 -0300

    Add back `:confirm` and change deprecation horizon to 4.1

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb

commit f5d0e3d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-21 14:11:37 -0300

    +"foo"+ doesn't generate code tag [ci skip]

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit f1a317b	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-21 14:05:19 -0300

    Lets be consistent with whitespaces at documentation

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit b4ef4d7	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-21 13:55:22 -0300

    Copy-edits at Rails::Queueing documentation

M	railties/lib/rails/queueing.rb

commit 9694b75	refs/heads/master
Author: Vijay Dev 
Date:   2012-07-21 22:26:21 +0530

    update 4.0 release notes [ci skip]

M	guides/source/4_0_release_notes.textile

commit dad5446	refs/heads/master
Merge: db4fdb5 8fe5f01
Author: Vijay Dev 
Date:   2012-07-21 21:50:14 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 8fe5f01	refs/heads/master
Author: Vijay Dev 
Date:   2012-07-21 21:45:32 +0530

    improve NullRelation docs [ci skip]

M	activerecord/lib/active_record/null_relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb

commit c851def	refs/heads/master
Author: Vijay Dev 
Date:   2012-07-21 21:44:16 +0530

    minor copy edits [ci skip]

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb

commit 60df591	refs/heads/master
Author: Vijay Dev 
Date:   2012-07-21 21:16:49 +0530

    Revert "Make it clear that you can also pass a full url to assert_routing."
    
    This reverts commit 5a6f30ff0f11f6d685d2601a60700784e3555b8b.

M	actionpack/lib/action_dispatch/testing/assertions/routing.rb

commit db4fdb5	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-21 13:03:19 +0200

    makes a pass over the API of ActiveSupport::HashWithIndifferentAccess

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit b669353	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-21 08:08:30 +0200

    Revert "Fix a reference"
    
    The sentence itself was not exact, [] and fetch are different. Reverting
    in docrails because it has been reworded in master and 3-2-stable,see
    98f4aee8dac22d9e9bb3c122b43e9e5ee8ba7d1c.
    
    This reverts commit 69879667dcf4494915f1b9d826f17856bff11887.

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit a37b90c	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-07-21 08:04:37 +0200

    Hash#fetch(fetch) is not the same as doing hash[key]

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit 98f4aee	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-21 08:04:37 +0200

    Hash#fetch(fetch) is not the same as doing hash[key]

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit 3561e85	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-21 07:30:53 +0200

    copy-edits 9674d2c

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit d721148	refs/heads/master
Merge: 2f6e33d 9674d2c
Author: Xavier Noria 
Date:   2012-07-20 22:19:23 -0700

    Merge pull request #7100 from shigeya/fix_mime_responds_to_doc
    
    Clarification to doc of ActionController::MimeResponse.respond_to

commit 9feda92	refs/remotes/origin/async
Author: Brent Wheeldon & Nick Monje 
Date:   2012-06-22 12:09:48 -0400

    AR has a subclass of AM:PresenceValidator.
    
    This allows us to mark the parent object as invalid if all associated objects
    in a presence validated association are marked for destruction.
    
    See: https://github.com/rails/rails/issues/6812

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/validations.rb
A	activerecord/lib/active_record/validations/presence.rb
A	activerecord/test/cases/validations/presence_validation_test.rb
M	guides/source/active_record_validations_callbacks.textile

commit 2f6e33d	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 19:35:02 +0100

    rm unnecessary test
    
    interpolation is no longer a thing separate from "normal" assoc
    conditions.

M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/tagging.rb

commit f7d8aac	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 19:31:17 +0100

    rm redundant test
    
    now everything is converted to the new style, this is not needed

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/author.rb

commit 45285f5	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 19:18:12 +0100

    remove unused method

M	activerecord/lib/active_record/reflection.rb

commit df0b7a8	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 19:16:31 +0100

    remove references to :finder_sql, :counter_sql, :delete_sql, :insert_sql from guides

M	guides/source/active_support_core_extensions.textile
M	guides/source/association_basics.textile

commit ac48b62	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 19:00:38 +0100

    we don't need this arg

M	activerecord/lib/active_record/associations/collection_association.rb

commit 3803fcc	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 18:52:35 +0100

    Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/company_in_module.rb
M	activerecord/test/models/project.rb

commit 70a86c6	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 18:36:47 +0100

    Remove obsolete line.
    
    This code is broken (it should say association_scope.uniq_value rather
    than options[:uniq]) but the tests still pass.
    
    I think it is designed to uniq-ify associations using finder_sql.
    However, I am about to remove that anyway.

M	activerecord/lib/active_record/associations/collection_association.rb

commit a63f7a1	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-20 14:23:05 -0300

    Update documentation and change the range method name to delimiter.

M	activemodel/lib/active_model/validations/clusivity.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb

commit 089371a	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-07-20 14:12:01 -0300

    `validates_inclusion_of` and `validates_exclusion_of` now accept
    `:within` option as alias of `:in` as documented.
    
    Fix #7118

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit 770fa81	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-20 14:10:25 -0300

    Don't pass `:within` option to the i18n

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb

commit a79bfa9	refs/tags/v3.2.8.rc1
Author: Jon Leighton 
Date:   2012-07-20 17:59:27 +0100

    Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/company_in_module.rb
M	activerecord/test/models/project.rb

commit 53edd32	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-20 13:53:31 -0300

    `validates_inclusion_of` and `validates_exclusion_of` now accept
    `:within` option as alias of `:in` as documented.
    
    Fix #7118

M	activemodel/lib/active_model/validations/clusivity.rb
M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit f3e4d20	refs/heads/master
Merge: e1cfa6e 35fe310
Author: Rafael Mendonça França 
Date:   2012-07-20 06:30:19 -0700

    Merge pull request #7099 from f1sherman/sweeper-clean-up-if-exception-raised
    
    Clean up Sweeper controller accessor when an Error is raised

commit e1cfa6e	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-13 19:34:40 +0100

    Convert association macros to the new syntax

M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/book.rb
M	activerecord/test/models/car.rb
M	activerecord/test/models/category.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/company_in_module.rb
M	activerecord/test/models/developer.rb
M	activerecord/test/models/liquid.rb
M	activerecord/test/models/member.rb
M	activerecord/test/models/person.rb
M	activerecord/test/models/pirate.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/project.rb
M	activerecord/test/models/sponsor.rb
M	activerecord/test/models/tagging.rb

commit 7a271a8	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-20 13:32:55 +0100

    Avoid options ever being nil
    
    This fixes active_record_deprecated_finders.

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/builder/association.rb

commit 3a07fdc	refs/heads/master
Merge: cabb447 b0ab8dc
Author: Carlos Antonio da Silva 
Date:   2012-07-20 05:06:45 -0700

    Merge pull request #7106 from LTe/default_separator_updated
    
    Use join without default separator in tagged logger

commit 35fe310	refs/heads/master
Author: Brian John 
Date:   2012-07-18 19:50:25 -0500

    Clean up Sweeper controller accessor when an Error is raised

M	actionpack/lib/action_controller/caching/sweeping.rb
M	actionpack/test/controller/filters_test.rb

commit cabb447	refs/heads/master
Author: Andrew White 
Date:   2012-07-20 10:50:38 +0100

    Don't assume resource param is :id when using shallow routes
    
    Since #5581 added support for resources with custom params we should
    not assume that it is :id when using shallow resource routing.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 27619e3	refs/heads/master
Author: Andrew White 
Date:   2012-07-20 09:59:37 +0100

    Support constraints on resource custom params when nesting
    
    The Mapper looks for a :id constraint in the scope to see whether it
    should apply a constraint for nested resources. Since #5581 added support
    for resource params other than :id, we need to check for a constraint on
    the parent resource's param name and not assume it's :id.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 5a6f30f	refs/heads/master
Author: Sytse Sijbrandij 
Date:   2012-07-20 09:44:54 +0200

    Make it clear that you can also pass a full url to assert_routing.

M	actionpack/lib/action_dispatch/testing/assertions/routing.rb

commit b0ab8dc	refs/heads/master
Author: Piotr Niełacny 
Date:   2012-07-19 14:16:03 +0200

    Use join without default separator
    
    Use lstrip method

M	activesupport/lib/active_support/tagged_logging.rb

commit b16e7ed	refs/tags/v3.2.8.rc1
Author: Carlos Antonio da Silva 
Date:   2012-06-05 05:35:42 -0700

    Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3
    
    Resolver tests fail if mysql adapter not installed

M	activerecord/test/cases/connection_specification/resolver_test.rb

commit 7854451	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-09 16:28:38 -0700

    fix variable names

M	actionpack/lib/action_controller/metal/rack_delegation.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/response.rb

commit 65253df	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-09 16:00:29 -0700

    move the latch to the response object

M	actionpack/lib/action_controller/metal/rack_delegation.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/response.rb
D	activesupport/lib/active_support/concurrency/latch.rb

commit 9fcdc4d	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-06 17:11:20 -0700

    copy thread locals over to new thead

M	actionpack/lib/action_controller/metal/rack_delegation.rb

commit eb68521	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-05 15:34:35 -0700

    removing the transver encoding header

M	actionpack/lib/action_controller/metal/rack_delegation.rb

commit b403935	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-05 14:02:56 -0700

    stream is available on the response

M	actionpack/lib/action_controller/metal/rack_delegation.rb

commit 6471467	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-04 15:45:16 -0700

    make sure the latch is released on exceptions

M	actionpack/lib/action_controller/metal/rack_delegation.rb

commit a6a5fda	refs/remotes/origin/async
Author: Aaron Patterson 
Date:   2012-07-04 15:00:20 -0700

    perform request inside a thread

M	actionpack/lib/action_controller/metal/rack_delegation.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/response.rb
A	activesupport/lib/active_support/concurrency/latch.rb

commit 3b3ca13	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-19 12:09:39 -0700

    adding Rails::Queueing::Container
    
    This allows us to do:
    
    In your configuration:
    Rails.queue[:image_queue] = SomeQueue.new
    Rails.queue[:mail_queue]  = SomeQueue.new
    
    In your app code:
    Rails.queue[:mail_queue].push MailJob.new
    
    Both jobs pushed to the same default queue
    Rails.queue.push DefaultJob.new
    Rails.queue[:default].push DefaultJob.new

M	railties/lib/rails/application.rb
M	railties/lib/rails/queueing.rb
M	railties/test/application/queue_test.rb
A	railties/test/queueing/container_test.rb

commit 11d488d	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-19 11:16:02 -0700

    Fix typos

M	activerecord/lib/active_record/relation.rb

commit 6987966	refs/heads/master
Author: Erich Kist 
Date:   2012-07-19 14:19:43 -0300

    Fix a reference

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit fa3c84f	refs/heads/master
Merge: 2897bf1 1b25283
Author: Rafael Mendonça França 
Date:   2012-07-19 08:06:15 -0700

    Merge pull request #7078 from kennyj/logging_query_plan
    
    Log query plan when we use count_by_sql method.

commit 22880de	refs/tags/v3.2.8.rc1
Merge: 827f369 89dee0e
Author: Rafael Mendonça França 
Date:   2012-07-19 06:39:05 -0700

    Merge pull request #7108 from arunagw/mocha_bump
    
    Bumping mocha!

commit 89dee0e	refs/tags/v3.2.8.rc1
Author: Arun Agrawal 
Date:   2012-07-19 19:06:37 +0530

    Bumping mocha!
    
    Reason:- 0.12.0 introduced a bug where you got a exception
    which is now in 0.12.1 is a warning only!

M	Gemfile

commit 2897bf1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-19 09:05:53 -0300

    Create default join table name using a Symbol
    
    Lets stick with a symbol in join table name, it was removed in
    993e1643650b7b0939437f86b7b4cda0d92b0b8f and broke the build.

M	activerecord/lib/active_record/migration/join_table.rb

commit 2470501	refs/heads/master
Author: José Valim 
Date:   2012-07-19 09:05:54 +0300

    Use attributes instead of table names in migration example

M	activerecord/CHANGELOG.md

commit 993e164	refs/heads/master
Merge: e482100 5a7d319
Author: José Valim 
Date:   2012-07-18 23:04:00 -0700

    Merge pull request #7097 from lexmag/join_table_gen_attr
    
    Add fkey attributes to `join_table` migration generator

commit 9674d2c	refs/heads/master
Author: Shigeya Suzuki 
Date:   2012-07-19 09:57:34 +0900

    Clarification to doc of ActionController::MimeResponse.respond_to
    
    - #respond_to's documentation refer to .respond_to, but it was
      written as just . Added class name for clarification.

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit e482100	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-18 13:32:21 -0700

    Revert "Merge pull request #7084 from LTe/logger_default_separator"
    
    This reverts commit c08f30ff5fcda7e07cd9275a073acb2091e4b3f7, reversing
    changes made to e243a8a32eb4c8777f07ca4b974bd7e38d9477d3.

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit 5a7d319	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-19 00:24:21 +0400

    Add fkey attributes to `join_table` migration generator

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/migration/join_table.rb
M	activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/migration_generator_test.rb

commit fe5b943	refs/heads/master
Merge: 3507216 ccf7cd0
Author: Rafael Mendonça França 
Date:   2012-07-18 09:39:23 -0700

    Merge pull request #7095 from davekaro/master
    
    revert Default timestamps to non-null

commit ccf7cd0	refs/heads/master
Author: Dave Kroondyk 
Date:   2012-07-18 10:03:36 -0400

    revert Default timestamps to non-null
    
    Commit 3dbedd2 added NOT NULL constraints to timestamps.
    Commit fcef728 started to revert this, but was incomplete.
    With this commit, 3dbedd2 should be fully reverted and
    timestamps will no longer default to NOT NULL.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/test/cases/migration/change_schema_test.rb
M	activerecord/test/cases/migration/column_attributes_test.rb

commit 3507216	refs/heads/master
Merge: c08f30f fb8a830
Author: Rafael Mendonça França 
Date:   2012-07-18 06:41:50 -0700

    Merge pull request #6614 from carlosgaldino/data-confirm
    
    Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option

commit fb8a830	refs/heads/master
Author: Carlos Galdino 
Date:   2012-06-01 16:54:21 -0300

    Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option
    
    This applies to the following helpers:
    `button_to`
    `button_tag`
    `image_submit_tag`
    `link_to`
    `submit_tag`

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	guides/code/getting_started/app/views/comments/_comment.html.erb
M	guides/code/getting_started/app/views/posts/index.html.erb
M	guides/source/ajax_on_rails.textile
M	guides/source/getting_started.textile
M	guides/source/layouts_and_rendering.textile
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb

commit c08f30f	refs/heads/master
Merge: e243a8a dc97a9a
Author: José Valim 
Date:   2012-07-18 00:52:20 -0700

    Merge pull request #7084 from LTe/logger_default_separator
    
    Don't use default separator in tagged logger

commit e243a8a	refs/heads/master
Author: José Valim 
Date:   2012-07-18 09:21:57 +0200

    Update changelog for migration generator change

M	activerecord/CHANGELOG.md

commit dc97a9a	refs/heads/master
Author: Piotr Niełacny 
Date:   2012-07-18 09:44:45 +0200

    Don't use default separator
    
    When the default separator is set logger will create incorrect output

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit 1b39d39	refs/heads/master
Merge: 58ccc9f 1b5298e
Author: José Valim 
Date:   2012-07-18 00:38:35 -0700

    Merge pull request #7082 from jalkoby/lazy_lookup_in_abstract_controller
    
    add lazy look up in abstract controller's translate method

commit 1b5298e	refs/heads/master
Author: Sergey Pchelincev 
Date:   2012-07-18 10:33:14 +0300

    add lazy look up in abstract controller's translate method

M	actionpack/lib/abstract_controller/translation.rb
M	actionpack/test/abstract/translation_test.rb

commit 58ccc9f	refs/heads/master
Merge: 17b6fa8 211d88b
Author: José Valim 
Date:   2012-07-18 00:16:39 -0700

    Merge pull request #7028 from lexmag/join_table_indexes
    
    Add indexes to create_join_table method

commit 17b6fa8	refs/heads/master
Merge: d00b635 eb19ca3
Author: José Valim 
Date:   2012-07-17 23:59:16 -0700

    Merge pull request #6626 from route/render_formats
    
    Add additional formats to lookup context

commit eb19ca3	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-07-11 12:18:52 +0400

    Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
A	actionpack/test/fixtures/test/_changing_priority.html.erb
A	actionpack/test/fixtures/test/_changing_priority.json.erb
A	actionpack/test/fixtures/test/_first_json_partial.json.erb
A	actionpack/test/fixtures/test/_json_change_priority.json.erb
A	actionpack/test/fixtures/test/_second_json_partial.json.erb
A	actionpack/test/fixtures/test/change_priorty.html.erb
A	actionpack/test/fixtures/test/html_template.html.erb
M	actionpack/test/template/render_test.rb

commit 27014bb	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-17 16:21:22 -0700

    Add nodocs to delegation module and docs for merge!

M	activerecord/lib/active_record/relation/delegation.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb

commit 21123d3	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-17 16:10:27 -0700

    Update batches docs

M	activerecord/lib/active_record/relation/batches.rb

commit 28e5341	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-17 16:04:52 -0700

    Add nodoc to HashMerger and Merger

M	activerecord/lib/active_record/relation/merger.rb

commit 30bf42b	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-17 15:53:36 -0700

    Fix typos and add nodocs to NullRelation

M	activerecord/lib/active_record/null_relation.rb
M	activerecord/lib/active_record/relation.rb

commit 2c050e1	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-17 15:48:03 -0700

    Improve docs for AR Relation

M	activerecord/lib/active_record/relation.rb

commit 827f369	refs/tags/v3.2.8.rc1
Merge: 71d274d 9b5309f
Author: Jon Leighton 
Date:   2012-07-17 15:20:58 -0700

    Merge pull request #7080 from jfirebaugh/to_param_regression
    
    AR::Integration must be included after AM::Conversion

commit d00b635	refs/heads/master
Merge: d8745de 80f6125
Author: Jon Leighton 
Date:   2012-07-17 15:20:45 -0700

    Merge pull request #7081 from jfirebaugh/to_param_regression_master
    
    AR::Integration must be included after AM::Conversion

commit 80f6125	refs/heads/master
Author: John Firebaugh 
Date:   2012-07-17 15:16:43 -0700

    AR::Integration must be included after AM::Conversion
    
    Integration's definition of #to_param must override
    Conversion's. Otherwise, there is a regression from
    3.1 in the behavior of a non-persisted AR::Base instance
    which nevertheless has an id.

M	activerecord/lib/active_record/model.rb
M	activerecord/test/cases/base_test.rb

commit 9b5309f	refs/tags/v3.2.8.rc1
Author: John Firebaugh 
Date:   2012-07-17 13:56:47 -0700

    AR::Integration must be included after AM::Conversion
    
    Integration's definition of #to_param must override
    Conversion's. Otherwise, there is a regression from
    3.1 in the behavior of a non-persisted AR::Base instance
    which nevertheless has an id.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 211d88b	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-11 01:38:21 +0400

    Add join table migration generator
    
    For instance, running
    
        rails g migration CreateMediaJoinTable artists musics:uniq
    
    will create a migration with
    
        create_join_table :artists, :musics do |t|
          # t.index [:artist_id, :music_id]
          t.index [:music_id, :artist_id], unique: true
        end

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/migration/join_table.rb
M	activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	activerecord/test/cases/migration/create_join_table_test.rb
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/migration_generator_test.rb

commit 71d274d	refs/tags/v3.2.8.rc1
Author: Andrew White 
Date:   2012-07-17 19:15:10 +0100

    Add support for optional root segments containing slashes
    
    Optional segments with a root scope need to have the leading slash
    outside of the parentheses, otherwise the generated url will be empty.
    However if the route has non-optional elements then the leading slash
    needs to remain inside the parentheses otherwise the generated url
    will have two leading slashes, e.g:
    
    Blog::Application.routes.draw do
      get '/(:category)', :to => 'posts#index', :as => :root
      get '/(:category)/author/:name', :to => 'posts#author', :as => :author
    end
    
    $ rake routes
      root GET /(:category)(.:format)              posts#index
    author GET (/:category)/author/:name(.:format) posts#author
    
    This change adds support for optional segments that contain a slash,
    allowing support for urls like /page/2 for the root path, e.g:
    
    Blog::Application.routes.draw do
      get '/(page/:page)', :to => 'posts#index', :as => :root
    end
    
    $ rake routes
    root GET /(page/:page)(.:format) posts#index
    
    Fixes #7073
    (cherry picked from commit d8745decaf59aad32aa2f09abdba99b8d0e48b31)

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit d8745de	refs/heads/master
Author: Andrew White 
Date:   2012-07-17 19:15:10 +0100

    Add support for optional root segments containing slashes
    
    Optional segments with a root scope need to have the leading slash
    outside of the parentheses, otherwise the generated url will be empty.
    However if the route has non-optional elements then the leading slash
    needs to remain inside the parentheses otherwise the generated url
    will have two leading slashes, e.g:
    
    Blog::Application.routes.draw do
      get '/(:category)', :to => 'posts#index', :as => :root
      get '/(:category)/author/:name', :to => 'posts#author', :as => :author
    end
    
    $ rake routes
      root GET /(:category)(.:format)              posts#index
    author GET (/:category)/author/:name(.:format) posts#author
    
    This change adds support for optional segments that contain a slash,
    allowing support for urls like /page/2 for the root path, e.g:
    
    Blog::Application.routes.draw do
      get '/(page/:page)', :to => 'posts#index', :as => :root
    end
    
    $ rake routes
    root GET /(page/:page)(.:format) posts#index
    
    Fixes #7073

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 1b25283	refs/heads/master
Author: kennyj 
Date:   2012-07-18 03:02:11 +0900

    Log query plan when we use count_by_sql method.

M	activerecord/lib/active_record/querying.rb
M	activerecord/test/cases/explain_test.rb

commit 939f014	refs/heads/master
Merge: d0ba994 414008f
Author: Aaron Patterson 
Date:   2012-07-17 10:30:28 -0700

    Merge pull request #7076 from kennyj/fix_class_eval
    
    Fix class_eval without __FILE__ and __LINE__.

commit d0ba994	refs/heads/master
Merge: 15bfaa3 0c3c227
Author: Jon Leighton 
Date:   2012-07-17 10:17:31 -0700

    Merge pull request #7072 from beerlington/fix_validations_with_scope
    
    Use database value for uniqueness validation scope

commit 414008f	refs/heads/master
Author: kennyj 
Date:   2012-07-18 01:16:55 +0900

    Fix class_eval without __FILE__ and __LINE__.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activesupport/test/multibyte_chars_test.rb
M	railties/test/generators_test.rb

commit e23ec4c	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-20 14:08:23 -0300

    Merge pull request #4396 from kennyj/fix_4259
    
    Fix GH #4259. When we execute schema dumper, we must remove table_name_prefix and table_name_suffix.

M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit 0c3c227	refs/heads/master
Author: beerlington 
Date:   2012-07-17 07:27:54 -0400

    Fixes "Cannot visit ..." with validates_uniqueness_of
    
    Fixes issue with overrding ActiveRecord reader methods with a
    composed object and using that attribute as the scope of a
    validates_uniqueness_of validation.

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 5edbeb0	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-16 23:17:22 -0700

    Add docs for Relation initialize, create and create!

M	activerecord/lib/active_record/relation.rb

commit 9887440	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-16 22:45:33 -0700

    Don't link to edgeguides in docs

M	activerecord/lib/active_record/relation.rb

commit 15bfaa3	refs/heads/master
Merge: 4a0f6e6 df6aa8c
Author: Piotr Sarnacki 
Date:   2012-07-16 14:24:13 -0700

    Merge pull request #7006 from jaredbeck/issue_7005_explain_asset_debug
    
    A more informative comment for config.asset.debug

commit b64599a	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-16 12:36:52 -0700

    Typo

M	activerecord/lib/active_record/relation/query_methods.rb

commit 993ef9e	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-16 12:28:53 -0700

    Add documentation for query_methods bang methods

M	activerecord/lib/active_record/relation/query_methods.rb

commit 37afdef	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-16 12:02:45 -0700

    Add nodoc to create_with_value
    
    Reason: all *_value methods are defined dynamically and so don't appear
    in the documentation.

M	activerecord/lib/active_record/relation/query_methods.rb

commit c0e186c	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-16 11:55:46 -0700

    Add documentation for arel and build_arel

M	activerecord/lib/active_record/relation/query_methods.rb

commit 9735076	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-16 11:31:22 -0700

    Add documentation for create_with

M	activerecord/lib/active_record/relation/query_methods.rb

commit c6ad167	refs/tags/v3.2.8.rc1
Author: Justin Mazzi 
Date:   2012-07-16 14:06:53 -0400

    Update documentation for Rails::Application#env_config

M	railties/lib/rails/application.rb

commit 4b1bca0	refs/remotes/origin/async
Author: Steve Jorgensen 
Date:   2012-07-16 10:01:16 -0700

    Stop being silly with formatting of method aliasing.

M	activerecord/test/cases/adapters/postgresql/connection_test.rb

commit 6d5f4de	refs/remotes/origin/async
Author: Steve Jorgensen 
Date:   2012-06-06 17:31:23 -0700

    Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/connection_test.rb
M	activerecord/test/config.example.yml

commit 0d63cda	refs/remotes/origin/async
Author: Steve Jorgensen 
Date:   2012-05-21 09:50:29 -0700

    Don't crash exception translation w/ nil result attribute.
    
    Exception.result is nil when attempting a query after PostgreSQL
    disconnect, resulting in new exception:
    NoMethodError: undefined method `error_field' for nil:NilClass

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit df6aa8c	refs/heads/master
Author: Jared Beck 
Date:   2012-07-16 08:05:49 -0400

    A more informative comment for config.asset.debug

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit 4a0f6e6	refs/heads/master
Merge: a80e1e4 9c243b4
Author: Rafael Mendonça França 
Date:   2012-07-16 05:02:44 -0700

    Merge pull request #7066 from wkang/master
    
    Fix activerecord model to_ary method comment 'see also' link

commit 9c243b4	refs/heads/master
Author: Kang Wen 
Date:   2012-07-16 14:53:37 +0800

    Fix activerecord model to_ary method comment 'see also' link

M	activerecord/lib/active_record/core.rb

commit a80e1e4	refs/heads/master
Merge: aa6f512 92dcdc5
Author: Vijay Dev 
Date:   2012-07-15 19:36:19 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit aa6f512	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-15 00:36:57 +0200

    adds a missing require [fixes #6896]
    
    This file uses Time.zone, which is defined in
    active_support/core_ext/time/zones.rb.

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/zones.rb

commit b3693bf	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-07-15 00:36:57 +0200

    adds a missing require [fixes #6896]
    
    This file uses Time.zone, which is defined in
    active_support/core_ext/time/zones.rb.

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/zones.rb

commit 92dcdc5	refs/heads/master
Author: kennyj 
Date:   2012-07-15 02:56:08 +0900

    session_id column is string in default

M	activerecord/lib/active_record/session_store.rb

commit 1156300	refs/heads/master
Merge: b7ad71b cd44862
Author: Rafael Mendonça França 
Date:   2012-07-14 10:05:02 -0700

    Merge pull request #7057 from kennyj/fix_sql_bypass_problem
    
    Fix SqlBypass.data_column problem.

commit cd44862	refs/heads/master
Author: kennyj 
Date:   2012-07-15 01:35:05 +0900

    Fix SqlBypass.data_column= problem. SqlBypass.find_by_session_id method didn't use this assignment.

M	activerecord/lib/active_record/session_store.rb
M	activerecord/test/cases/session_store/sql_bypass_test.rb

commit b7ad71b	refs/heads/master
Merge: 9b7401b 088022e
Author: Rafael Mendonça França 
Date:   2012-07-14 08:37:07 -0700

    Merge pull request #7056 from kennyj/avoid_twice_call
    
    Avoid to call send(store_attribute) twice.

commit 088022e	refs/heads/master
Author: kennyj 
Date:   2012-07-15 00:04:30 +0900

    Avoid to call send(store_attribute) twice.

M	activerecord/lib/active_record/store.rb

commit 9b7401b	refs/heads/master
Merge: d08fee3 4940dc2
Author: Xavier Noria 
Date:   2012-07-14 05:54:51 -0700

    Merge pull request #7053 from pferdefleisch/activesupport-timely-requires
    
    Added time related req files to AS core_ext #6896

commit 4940dc2	refs/heads/master
Author: Aaron Cruz 
Date:   2012-07-14 14:26:20 +0200

    Added time related req files to AS core_ext #6896
    
    This way you can `require 'active_record/core_ext/time'` for example
    I see these libs are available through `active_record/time` but not
    individually

A	activesupport/lib/active_support/core_ext/date.rb
A	activesupport/lib/active_support/core_ext/date_time.rb
A	activesupport/lib/active_support/core_ext/time.rb

commit d08fee3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-13 16:58:57 -0700

    teaching the mysql adapter how to typecast strings returned from the database

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/calculations_test.rb

commit 0736e16	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-13 15:30:52 -0700

    fixing tests to deal with data differences between prepared statements and non-prepared statements
    
    Conflicts:
    	activerecord/test/cases/query_cache_test.rb

M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/query_cache_test.rb

commit 220864e	refs/heads/master
Author: Jeremy Cole 
Date:   2012-07-13 15:02:18 -0700

    Fixing texts; down to three failing tests.
    
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 2f9a0f7	refs/heads/master
Author: Jeremy Cole 
Date:   2012-07-13 09:42:48 -0700

    Only use prepared statements when bind variables are present
    
    Prepared statements (prepare/execute/close) were being used unnecessarily
    when no bind variables were present, and disabling prepared statement using
    prepared_statements:false was principally broken. While bind variables were
    correctly substituted with prepared_statements:false, the prepared statement
    interface was still used, costing an extra two round trips per query.
    
    In addition to making this behavioral change, I also cleaned up the internals
    of exec_stmt and exec_without_stmt so that they behave the same (calling log
    and constructing the ActiveRecord::Result in the same way).
    
    Moving the check for binds.empty? to exec_query also will mean that several
    code paths explicitly calling exec_without_stmt could be cleaned up to once
    again call exec_query instead. I have also left the check for binds.empty? in
    exec_stmt, since it is not a private method and could be called directly with
    an empty binds array. For the sake of clarity in this patch, I have not made
    those changes.
    
    = The previous behavior =
    
    When issuing a Foo.find(1) with prepared_statements:true, the bind variable
    is present in the prepared query, and execute shows a value passed:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    When issuing a Foo.find(1) with prepared_statements:false, the bind variable
    has already been removed and substituted with the value, but the prepared
    statement interface is used anyway:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    = With this patch applied =
    
    When issuing a Foo.find(1) with prepared_statements:true, the bind variable
    is present in the prepared query, and execute shows a value passed:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    When issuing a Foo.find(1) with prepared_statements:false, the bind variable
    has been removed and substituted with the value, and the query interface is
    used instead of the prepared statement interface:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Query	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Quit

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit f7ef7ca	refs/tags/v3.2.8.rc1
Author: Aaron Patterson 
Date:   2012-07-13 15:30:52 -0700

    fixing tests to deal with data differences between prepared statements and non-prepared statements

M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/query_cache_test.rb

commit 8f43230	refs/tags/v3.2.8.rc1
Author: Jeremy Cole 
Date:   2012-07-13 15:02:18 -0700

    Fixing texts; down to three failing tests.

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 7fa9cb5	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-13 21:20:12 +0100

    fix association :extend option

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/relation_test.rb

commit 8baaa45	refs/heads/master
Merge: fd9655c 87a8644
Author: Rafael Mendonça França 
Date:   2012-07-13 12:07:26 -0700

    Merge pull request #7048 from kennyj/tiny_fixes
    
    [tiny fixes] Remove more duplicated code.

commit 87a8644	refs/heads/master
Author: kennyj 
Date:   2012-07-10 01:54:22 +0900

    Remove duplicated unique index name.

M	activerecord/lib/active_record/schema_migration.rb

commit 539b69e	refs/heads/master
Author: kennyj 
Date:   2012-07-10 01:31:27 +0900

    Remove instance level quote_value method. This method is private and also exists in class method.

M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/sanitization.rb

commit fd9655c	refs/heads/master
Merge: bf6d64c 6c7c89a
Author: Rafael Mendonça França 
Date:   2012-07-13 10:58:54 -0700

    Merge pull request #7045 from kennyj/remove_duplicated_code_20120714
    
    Remove duplicated code in the AR::Store.

commit bf6d64c	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-13 19:52:22 +0200

    revises RUNNING_UNIT_TESTS to delegate stuff to the contributing guide

M	activerecord/RUNNING_UNIT_TESTS

commit ac4d101	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-13 18:55:38 +0100

    move the deprecated options into active_record_deprecated_finders

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb

commit 09d2f16	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-13 18:43:55 +0100

    stop using class_attribute where methods/inheritance will suffice.

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/builder/singular_association.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/test/cases/autosave_association_test.rb

commit 6c7c89a	refs/heads/master
Author: kennyj 
Date:   2012-07-14 02:50:28 +0900

    Remove duplicated code in the AR::Store.

M	activerecord/lib/active_record/store.rb

commit c733b8e	refs/heads/master
Merge: a734902 7e5c686
Author: Xavier Noria 
Date:   2012-07-13 10:47:29 -0700

    Merge pull request #7044 from kytrinyx/documentation-ar-unit-tests
    
    Add note about needing mysql superuser for unit tests.

commit 7e5c686	refs/heads/master
Author: Katrina Owen 
Date:   2012-07-13 19:44:56 +0200

    Add link to relevant rails guide to Active Record unit test docs.

M	activerecord/RUNNING_UNIT_TESTS

commit bc65d0c	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-12 13:39:26 -0500

    add note about requiring gem dependencies before initialization [ci skip]

M	guides/source/engines.textile

commit ec4245c	refs/heads/master
Author: Katrina Owen 
Date:   2012-07-13 19:24:48 +0200

    Add note about needing mysql superuser for unit tests.

M	activerecord/RUNNING_UNIT_TESTS

commit a734902	refs/heads/master
Merge: 35edd18 848c1b4
Author: Xavier Noria 
Date:   2012-07-13 10:07:41 -0700

    Merge pull request #7043 from kytrinyx/documentation-ar-observer
    
    Add documentation for ActiveRecord::Observer.

commit 848c1b4	refs/heads/master
Author: Katrina Owen 
Date:   2012-07-13 18:58:29 +0200

    Add documentation for ActiveRecord::Observer.
    
    The instructions about configuration covered only rails-specific usage.

M	activerecord/lib/active_record/observer.rb

commit e4ef90a	refs/tags/v3.2.8.rc1
Author: Jeremy Cole 
Date:   2012-07-13 09:42:48 -0700

    Only use prepared statements when bind variables are present
    
    Prepared statements (prepare/execute/close) were being used unnecessarily
    when no bind variables were present, and disabling prepared statement using
    prepared_statements:false was principally broken. While bind variables were
    correctly substituted with prepared_statements:false, the prepared statement
    interface was still used, costing an extra two round trips per query.
    
    In addition to making this behavioral change, I also cleaned up the internals
    of exec_stmt and exec_without_stmt so that they behave the same (calling log
    and constructing the ActiveRecord::Result in the same way).
    
    Moving the check for binds.empty? to exec_query also will mean that several
    code paths explicitly calling exec_without_stmt could be cleaned up to once
    again call exec_query instead. I have also left the check for binds.empty? in
    exec_stmt, since it is not a private method and could be called directly with
    an empty binds array. For the sake of clarity in this patch, I have not made
    those changes.
    
    = The previous behavior =
    
    When issuing a Foo.find(1) with prepared_statements:true, the bind variable
    is present in the prepared query, and execute shows a value passed:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    When issuing a Foo.find(1) with prepared_statements:false, the bind variable
    has already been removed and substituted with the value, but the prepared
    statement interface is used anyway:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    = With this patch applied =
    
    When issuing a Foo.find(1) with prepared_statements:true, the bind variable
    is present in the prepared query, and execute shows a value passed:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
        Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Close stmt
        Quit
    
    When issuing a Foo.find(1) with prepared_statements:false, the bind variable
    has been removed and substituted with the value, and the query interface is
    used instead of the prepared statement interface:
    
        Connect	root@localhost on rails_test
        Query	SET SQL_AUTO_IS_NULL=0
        Statistics
        Query	SHOW FULL FIELDS FROM `foos`
        Query	SHOW TABLES LIKE 'foos'
        Query	SHOW CREATE TABLE `foos`
        Query	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
        Quit

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 35edd18	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-13 17:40:26 +0100

    extract deprecated association options to active_record_deprecated_finders

M	activerecord/lib/active_record/associations/builder/association.rb

commit 8ee3651	refs/heads/master
Author: Steve Klabnik 
Date:   2012-07-13 12:26:44 -0400

    Added note about feature requests and rails-core list.

M	guides/source/contributing_to_ruby_on_rails.textile

commit 65843e1	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-06 18:20:20 +0100

    Represent association scope options as AR::Relations insternally.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/associations/preloader.rb
M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/lib/active_record/associations/preloader/collection_association.rb
M	activerecord/lib/active_record/associations/preloader/has_many_through.rb
M	activerecord/lib/active_record/associations/preloader/has_one.rb
M	activerecord/lib/active_record/associations/preloader/through_association.rb
M	activerecord/lib/active_record/reflection.rb
A	activerecord/test/cases/associations/association_scope_test.rb
M	activerecord/test/cases/reflection_test.rb

commit 76d3397	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-06 17:23:33 +0100

    fix assertion arguments order

M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 5a54bff	refs/heads/master
Author: Jon Leighton 
Date:   2012-06-22 11:40:13 +0100

    Allow associations to take a lambda which builds the scope

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/author.rb

commit 4b4a855	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-13 11:44:35 +0100

    support relations created with a table alias

M	Gemfile
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 5fcf885	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2012-07-12 21:33:49 +0200

    Updated with_routing example to 3.x syntax [ci skip]

M	actionpack/lib/action_dispatch/testing/assertions/routing.rb

commit acec6d3	refs/heads/master
Author: Scott Stewart 
Date:   2012-07-12 22:50:45 -0400

    Change Assertion language to Expected/Actual from obj1/obj2

M	guides/source/testing.textile

commit 1420d4e	refs/heads/master
Author: Xavier Noria 
Date:   2012-07-12 23:03:15 +0200

    testing guide: start of a pass

M	guides/source/testing.textile

commit 6a58f9c	refs/heads/master
Merge: 2075ada 201156b
Author: Vijay Dev 
Date:   2012-07-12 09:37:02 -0700

    Merge pull request #7037 from evantravers/misspelling
    
    add second t to overwritten

commit 201156b	refs/heads/master
Author: Evan Travers 
Date:   2012-07-12 11:21:09 -0500

    add second t to overwritten
    
    fixing a misspelling in the documentation

M	actionpack/lib/action_view/context.rb

commit 1f87adf	refs/heads/master
Author: Andy Lindeman 
Date:   2012-07-11 10:42:25 -0500

    Fixes typo in CommentsController#create example
    
    * comments.build will not actually persist the comment

M	guides/source/engines.textile

commit e72d876	refs/tags/v3.2.8.rc1
Merge: 3b1de4a 8d3eafe
Author: Piotr Sarnacki 
Date:   2012-07-11 02:40:22 -0700

    Merge pull request #7031 from robbkidd/rename_sequences_too_backport_to_3-2
    
    Back-port #6874 to 3.2: psql adapter should rename a default pk sequence during rename_table

commit 2075ada	refs/heads/master
Merge: b1dbebc 783fc29
Author: Vijay Dev 
Date:   2012-07-10 21:59:59 -0700

    Merge pull request #7032 from necrodome/patch-1
    
    Fix code comment to reflect its intent.

commit 94527ea	refs/heads/master
Author: Chun-wei Kuo 
Date:   2012-07-11 11:42:03 +0800

    Fix typo

M	guides/source/active_record_querying.textile

commit 783fc29	refs/heads/master
Author: Selem Delul 
Date:   2012-07-11 06:19:38 +0300

    Fix code comment to reflect its intent.

M	actionpack/lib/action_controller/metal/responder.rb

commit 8d3eafe	refs/tags/v3.2.8.rc1
Author: Robb Kidd 
Date:   2012-07-10 21:33:24 -0400

    Update psql adapter to rename a default pkey sequence during rename_table.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/migration_test.rb

commit b1dbebc	refs/heads/master
Merge: 542637e 01fd8e5
Author: Carlos Antonio da Silva 
Date:   2012-07-10 17:42:09 -0700

    Merge pull request #7030 from robbkidd/dry_up_rename_table_tests
    
    Add teardown method to AR::Mig::RenameTableTest

commit 01fd8e5	refs/heads/master
Author: Robb Kidd 
Date:   2012-06-27 10:25:02 -0400

    Add teardown method to AR::Mig::RenameTableTest
    
    Dry up reseting the renamed table after each test.
    
    Also made use of the AR::Base.connection object already
    available from AR::MigrationTest#connection.

M	activerecord/test/cases/migration/rename_table_test.rb

commit 542637e	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-07-11 02:07:25 +0200

    Fix indentation.

M	actionpack/test/controller/http_token_authentication_test.rb

commit df40d79	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-07-11 01:56:38 +0200

    Don't raise an error if http auth token isn't well formatted
    
    When someone sends malformed authorization header, like:
    
        Authorization: Token foobar
    
    given token should be just ignored and resource should not be authorized,
    instead of raising error. Before this patch controller would return 401 header
    only for well formed tokens, like:
    
        Authorization: Token token=foobar
    
    and would return 500 in former case.

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_token_authentication_test.rb

commit afa68eb	refs/heads/master
Author: Carl Lerche 
Date:   2012-07-10 16:16:00 -0700

    Raise a helpful error message on #mount misuse

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/mapper_test.rb

commit 3b1de4a	refs/tags/v3.2.8.rc1
Merge: 45d78a3 27c8deb
Author: Rafael Mendonça França 
Date:   2012-07-10 13:17:28 -0700

    Merge pull request #7025 from rustygeldmacher/select_options_valid_html
    
    Select options valid html

commit 89dc481	refs/heads/master
Merge: d7b8f0c 1a935ad
Author: Rafael Mendonça França 
Date:   2012-07-10 13:17:20 -0700

    Merge pull request #7026 from rustygeldmacher/select_options_valid_html_master
    
    Fixed bug creating invalid HTML in select options

commit d7b8f0c	refs/heads/master
Merge: 836016e d735abf
Author: Aaron Patterson 
Date:   2012-07-10 12:54:56 -0700

    Merge pull request #6874 from robbkidd/rename_sequences_too
    
    Rename default sequence when table is renamed? [AR:postgres]

commit 1a935ad	refs/heads/master
Author: Rusty Geldmacher 
Date:   2012-07-10 15:03:37 -0400

    Fixed bug creating invalid HTML in select options
    
    When a select tag is created for a field with errors, then the inserted
    options will errantly have a 
 wrapping
    them.

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/active_model_helper_test.rb

commit 27c8deb	refs/tags/v3.2.8.rc1
Author: Rusty Geldmacher 
Date:   2012-07-10 12:14:06 -0400

    Fixed bug creating invalid HTML in select options
    
    When a select tag is created for a field with errors, and that select
    tag has :prompt or :include_blank options, then the inserted first
    option will errantly have a 
 wrapping
    it.
    
    See https://github.com/rails/rails/issues/7017

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/active_model_helper_test.rb

commit 40ee167	refs/heads/master
Author: Simon Hengel 
Date:   2012-07-10 12:37:50 +0200

    [getting started] update a code listing

M	guides/source/getting_started.textile

commit 897f8f5	refs/heads/master
Author: Jakub Kuźma 
Date:   2012-07-10 10:02:28 +0200

    use 'use_zone' method in example, instead of reimplementing it

M	activesupport/lib/active_support/core_ext/time/zones.rb

commit 836016e	refs/heads/master
Merge: d481170 c175563
Author: Xavier Noria 
Date:   2012-07-10 00:25:54 -0700

    Merge pull request #7022 from bogdan/validations_doc
    
    AM::Validations: remove documentation duplicates

commit c175563	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-07-10 10:07:38 +0300

    AM::Validations: remove documentation duplicates

M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activemodel/lib/active_model/validations/validates.rb

commit 9650d95	refs/heads/master
Author: Marten Veldthuis 
Date:   2012-07-09 22:31:24 +0200

    Add info note about sass/coffeescript use in engine assets to guide

M	guides/source/engines.textile

commit d481170	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-09 13:11:05 -0700

    deprecate `describe` without a block.
    
    minitest/spec provides `describe`, so deprecate the rails version and
    have people use the superclass version

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/new_base/render_action_test.rb
M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/new_base/render_text_test.rb
M	activesupport/lib/active_support/test_case.rb
D	activesupport/lib/active_support/testing/declarative.rb

commit 45d78a3	refs/tags/v3.2.8.rc1
Merge: 7adc4f2 904eace
Author: Xavier Noria 
Date:   2012-07-09 09:38:03 -0700

    Merge pull request #7015 from sikachu/3-2-stable-code-style
    
    Update coding convention from master

commit 904eace	refs/tags/v3.2.8.rc1
Author: Prem Sichanugrist 
Date:   2012-07-09 12:33:33 -0400

    Update coding convention from master

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 5610ae2	refs/heads/master
Author: Jakub Kuźma 
Date:   2012-07-09 12:15:17 +0200

    Fixed second assert_match - previous one didn't make any sense (if the first passed, the second passed as well)

M	guides/source/action_mailer_basics.textile

commit ad1c447	refs/heads/master
Author: Jakub Kuźma 
Date:   2012-07-09 11:53:22 +0200

    It's better to pass strings to assert_match - it converts them to regular expressions, escaping special chars like '.'. It seems email.encoded contains some unexpected line breaks (due to encoding), it's better to assert_match email.body.to_s.

M	guides/source/action_mailer_basics.textile

commit 8139daa	refs/heads/master
Author: Dan Patrick 
Date:   2012-07-08 20:03:39 -0500

    Revert "Select missing formbuilder typo."
    
    This reverts commit bf97795e7327e15774666d2197f1c0b8ada57a84.

M	guides/source/form_helpers.textile

commit bf97795	refs/heads/master
Author: Dan Patrick 
Date:   2012-07-08 19:53:02 -0500

    Select missing formbuilder typo.

M	guides/source/form_helpers.textile

commit d1c4acc	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-08 17:45:22 -0300

    Remove AS declarative extension from erb tag test
    
    The extension was removed in 22bc12ec374b8bdeb3818ca0a3eb787dd3ce39d8,
    making "test" an alias for minitest's "it".

M	actionpack/test/template/erb/tag_helper_test.rb

commit 5921cf0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-08 14:51:57 -0700

    we still need `describe` as the implementation differs from minitest

M	activesupport/lib/active_support/test_case.rb
A	activesupport/lib/active_support/testing/declarative.rb

commit 3dc54d7	refs/heads/master
Merge: bbc08c7 359af59
Author: Xavier Noria 
Date:   2012-07-08 12:39:15 -0700

    Merge pull request #7004 from philiqq/master
    
    [Guide] Fix broken links

commit bbc08c7	refs/heads/master
Merge: 22bc12e 07ebc53
Author: Rafael Mendonça França 
Date:   2012-07-08 12:12:15 -0700

    Merge pull request #6956 from lexmag/ref_migration_generator
    
    Add references statements to migration generator

commit 359af59	refs/heads/master
Author: Philipp Franke 
Date:   2012-07-08 20:49:08 +0200

    Fix broken links in 2.2 release notes, i18n, debugging, security, 2.3 release notes, plugins

M	guides/source/2_2_release_notes.textile
M	guides/source/2_3_release_notes.textile
M	guides/source/debugging_rails_applications.textile
M	guides/source/i18n.textile
M	guides/source/plugins.textile
M	guides/source/security.textile

commit 07ebc53	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-08 17:20:43 +0400

    Update migrations guide
    
    Add a paragraph about references statements in migration generator
    and the subchapter "Supported type modifiers"

M	guides/source/migrations.textile

commit 0cae7c6	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-08 17:01:49 +0400

    Add references statements to migration generator
    
    AddXXXToYYY/RemoveXXXFromYYY migrations are produced with references
    statements, for instance
    
        rails g migration AddReferencesToProducts user:references
    supplier:references{polymorphic}
    
    will generate the migration with:
    
        add_reference :products, :user, index: true
        add_reference :products, :supplier, polymorphic: true, index: true

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	railties/CHANGELOG.md
M	railties/test/generators/migration_generator_test.rb

commit 3cebfa4	refs/heads/master
Author: Frederick Cheung 
Date:   2012-07-08 19:01:51 +0100

    Document building complex forms using accepts_nested_attributes_for

M	guides/source/form_helpers.textile

commit 22bc12e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-08 10:54:21 -0700

    minitest provides "it" and "describe"
    
    Remove rails implementation of describe, alias "test" to "it"

M	activesupport/lib/active_support/test_case.rb
D	activesupport/lib/active_support/testing/declarative.rb

commit 3270156	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-08 10:50:21 -0700

    minitest is a gem dep, so remove this conditional

M	activesupport/lib/active_support/test_case.rb

commit 367b0c6	refs/heads/master
Merge: 3bbc2fb 266ccc3
Author: Carlos Antonio da Silva 
Date:   2012-07-08 09:55:16 -0700

    Merge pull request #7003 from philiqq/master
    
    Fix Bleak House link in debugging guide. Closes #7002

commit 3bbc2fb	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-08 13:30:42 -0300

    Improve and fix AP changelog, sync release notes [ci skip]

M	actionpack/CHANGELOG.md
M	guides/source/4_0_release_notes.textile

commit 9c4afcf	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-08 13:25:45 -0300

    Rename RouteInspector to RoutesInspector
    
    Follow the consistency defined in dbc43bc.

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/lib/action_dispatch/routing/inspector.rb
M	actionpack/test/dispatch/routing/inspector_test.rb
M	railties/lib/rails/info_controller.rb
M	railties/lib/rails/tasks/routes.rake

commit 21c5bc9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-08 13:15:53 -0300

    Remove RoutesInspector from railties, since it was moved to AP
    
    Changes introduced in 7404cda9f61e41d52ce244d60abbf598684a96c4.
    Fix railties build.

D	railties/lib/rails/application/routes_inspector.rb
M	railties/lib/rails/info_controller.rb
D	railties/test/application/routes_inspect_test.rb

commit 266ccc3	refs/heads/master
Author: Philipp Franke 
Date:   2012-07-08 15:17:18 +0200

    fix broken bleak_house link

M	guides/source/debugging_rails_applications.textile

commit 15d80eb	refs/heads/master
Merge: 7404cda 2a408bd
Author: Carlos Antonio da Silva 
Date:   2012-07-08 07:16:14 -0700

    Merge pull request #6998 from robin850/patch-1
    
    Add few information on Fedora and CentOS [ci skip]

commit 7404cda	refs/heads/master
Merge: ee20be7 bbfd29a
Author: José Valim 
Date:   2012-07-08 02:10:12 -0700

    Merge pull request #6696 from schneems/schneems/sextant-routing-error
    
    Show Routes while Debugging RoutingError

commit 2a408bd	refs/heads/master
Author: Robin Dupret 
Date:   2012-07-07 16:10:24 +0300

    Add few information on Fedora and CentOS

M	guides/source/contributing_to_ruby_on_rails.textile

commit bbfd29a	refs/heads/master
Author: schneems 
Date:   2012-07-07 15:55:54 -0500

    show routes while debugging added to changelog

M	actionpack/CHANGELOG.md

commit e68f63e	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-07 13:53:38 -0700

    Add docs for having, lock and readonly

M	activerecord/lib/active_record/relation/query_methods.rb

commit ef91cdd	refs/heads/master
Author: @schneems and @mattt 
Date:   2012-07-01 20:00:10 -0700

    move route_inspector to actionpack
    
    this is so we can show route output in the development when we get a routing error. Railties can use features of ActionDispatch, but ActionDispatch should not depend on Railties.

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
A	actionpack/lib/action_dispatch/routing/inspector.rb
A	actionpack/test/dispatch/routing/inspector_test.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/info_controller.rb
M	railties/lib/rails/tasks/routes.rake

commit fa714ec	refs/heads/master
Author: schneems 
Date:   2012-06-09 14:54:49 -0500

    show routes while debugging RoutingError
    
    If someone receives a routing error, they likely need to view the routes. Rather than making them visit '/rails/info/routes' or run `rake routes` we can give them that information on the page.

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb

commit 8e7470a	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-07 11:36:03 -0700

    Add doc for joins and improve includes doc

M	activerecord/lib/active_record/relation/query_methods.rb

commit 91c8d91	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-07 10:20:22 -0700

    Add docs for eager_laod and preload

M	activerecord/lib/active_record/relation/query_methods.rb

commit ee20be7	refs/heads/master
Merge: 5fde4d4 700e5ff
Author: Vijay Dev 
Date:   2012-07-07 20:44:49 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 700e5ff	refs/heads/master
Author: Vijay Dev 
Date:   2012-07-07 20:43:48 +0530

    minor text change [ci skip]

M	activerecord/lib/active_record/relation/query_methods.rb

commit f7562c0	refs/heads/master
Author: Vijay Dev 
Date:   2012-07-07 20:42:22 +0530

    Revert "Add nodoc to relation methods"
    
    This reverts commit c47a698d5d497340d4e349257522212173865838.
    
    Reason: Let's revert pending further discussions

M	activerecord/lib/active_record/relation/query_methods.rb

commit 5fde4d4	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-07 11:28:59 -0300

    Refactor locked? method in query cache
    
    Introduced in 75b340d1a4bcf2f1233fb65a15ff6b8059e2230e

M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb

commit d8ca791	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-07 14:52:09 +0100

    Load all records in Relation#inspect
    
    A test was failing due to the way that Relation#inspect causes
    association proxies to ignore unsaved records added to the association.
    
    This is fixed by simply calling to_a and letting to_a figure out how to
    get the records (which, in the case of associations, takes into account
    new records).
    
    I think it is acceptable to do this rather than limiting the query at
    the database level:
    
    * It's what we've done in all released Rails versions up to this point
    * The goal of the limit is to not flood the console with output - this
      is the problem we're targeting, rather than the actual loading of the
      records from the database
    * You probably want to do something with those records later anyway,
      otherwise you wouldn't have built a relation for them.

M	activerecord/lib/active_record/relation.rb

commit d4f5978	refs/heads/master
Merge: 84b9781 fde7fd8
Author: Carlos Antonio da Silva 
Date:   2012-07-07 06:39:56 -0700

    Merge pull request #6938 from acapilleri/as_json_refactoring
    
    Small refactoring of as_json method

commit 84b9781	refs/heads/master
Merge: ea7b48b 188d671
Author: Carlos Antonio da Silva 
Date:   2012-07-07 05:58:01 -0700

    Merge pull request #6838 from kennyj/added_registration_task
    
    Allow to register database tasks from different adapters

commit ea7b48b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-07 09:16:48 -0300

    Use "instance_accessor" for flash types class attribute

M	actionpack/lib/action_controller/metal/flash.rb
M	actionpack/test/controller/flash_test.rb

commit 90e42ff	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-07 10:08:14 +0100

    fixup changelog

M	activerecord/CHANGELOG.md

commit c433adf	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-07 10:07:28 +0100

    Relation#inspect handles doesn't perform a new query on an already-loaded relation

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit b76b9e2	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-07 09:58:56 +0100

    Simplify Relation#inspect

M	activerecord/lib/active_record/relation.rb

commit 8a6780b	refs/heads/master
Merge: c55df93 238a425
Author: José Valim 
Date:   2012-07-07 01:20:27 -0700

    Merge pull request #6992 from kennyj/improve_6977-2
    
    Allow people to register their own flash types.

commit 238a425	refs/heads/master
Author: kennyj 
Date:   2012-07-07 03:34:56 +0900

    Added support add_flash_types

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/flash.rb
M	actionpack/test/controller/flash_test.rb
M	actionpack/test/template/test_case_test.rb

commit c55df93	refs/heads/master
Merge: b3da67d 8fe9b43
Author: José Valim 
Date:   2012-07-07 00:57:01 -0700

    Merge pull request #6993 from morgoth/engine-table-name-prefix-generator-fix
    
    Engine table name prefix generator fix

commit b3da67d	refs/heads/master
Merge: c7779c6 1498071
Author: José Valim 
Date:   2012-07-07 00:49:56 -0700

    Merge pull request #6996 from kennyj/remove_unused_code_20120707
    
    Remove unused code.

commit c7779c6	refs/heads/master
Merge: 967f5f3 75322ac
Author: José Valim 
Date:   2012-07-07 00:48:59 -0700

    Merge pull request #6997 from kennyj/fix_stored_attributes
    
    Added *instance_writer: false* to stored/serialized attributes.

commit 967f5f3	refs/heads/master
Author: José Valim 
Date:   2012-07-07 10:48:26 +0300

    Update master

M	guides/source/4_0_release_notes.textile

commit 25fb6cc	refs/heads/master
Merge: 9f5d2b1 7d0053e
Author: José Valim 
Date:   2012-07-07 00:45:24 -0700

    Merge pull request #6987 from dmathieu/limit_inspect
    
    Limit the number of records in Relation#inspect

commit 75322ac	refs/heads/master
Author: kennyj 
Date:   2012-07-07 16:35:45 +0900

    Added *instance_writer: false* for stored/serialized attributes.

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/store_test.rb

commit 1498071	refs/heads/master
Author: kennyj 
Date:   2012-07-07 14:59:49 +0900

    Remove unused code.

M	actionpack/test/controller/flash_test.rb

commit 9f5d2b1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-06 23:12:48 -0300

    Fix failing AM test due to missing template

M	actionmailer/test/base_test.rb

commit 3009c63	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-06 22:51:31 -0300

    Improve docs, changelog and release notes for Action Mailer default_options=
    
    [ci skip]

M	actionmailer/CHANGELOG.md
M	actionmailer/lib/action_mailer/base.rb
M	guides/source/4_0_release_notes.textile
M	guides/source/configuring.textile

commit c47a698	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-06 18:50:53 -0700

    Add nodoc to relation methods

M	activerecord/lib/active_record/relation/query_methods.rb

commit 842f27d	refs/heads/master
Merge: 4503926 edaa2c4
Author: Carlos Antonio da Silva 
Date:   2012-07-06 18:36:27 -0700

    Merge pull request #6950 from paneq/default_from2
    
    Introduce config.action_mailer.default_options=
    
    Allows to easily set :from, :replay_to, etc. options in
    config/application.rb using simple syntax:
    
        config.action_mailer.default_options = { from: "no-replay@example.org" }
    
    Closes #6747

commit 4503926	refs/heads/master
Merge: cb46e7a df10279
Author: Carlos Antonio da Silva 
Date:   2012-07-06 18:02:48 -0700

    Merge pull request #6995 from frodsan/update_test_help
    
    update test_help to config properly turn natural language option

commit df10279	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-06 18:04:33 -0500

    update test_help to config properly turn natural language option
    
    Last versions of Turn don't monkey patch MiniTest to setup
    the natural language option. Here is an
    [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3).
    
    This patches the following behaviour:
    
        $ rake test:units
        `': undefined method `use_natural_language_case_names='
        for MiniTest::Unit:Class (NoMethodError)

M	railties/lib/rails/test_help.rb

commit 7adc4f2	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-07-06 07:07:46 -0700

    Merge pull request #6985 from sidonath/disable-query-cache-for-locks
    
    Disable query cache for lock queries
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb

M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit ae3fdac	refs/remotes/origin/async
Author: Francesco Rodriguez 
Date:   2012-07-06 15:53:17 -0500

    update performance test template to use test method

M	railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
M	railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb

commit 8fe9b43	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2012-07-06 21:22:53 +0200

    Fixed generating namespaced table_name_prefix in engines

M	activerecord/lib/rails/generators/active_record/model/templates/module.rb
M	railties/test/generators/namespaced_generators_test.rb

commit f874b15	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2012-07-06 21:22:14 +0200

    Added failing test for generating namespaced table_name_prefix in engines

M	railties/test/railties/generators_test.rb

commit cb46e7a	refs/heads/master
Merge: 717aa92 021f3d2
Author: José Valim 
Date:   2012-07-06 11:44:04 -0700

    Merge pull request #6990 from mirceapricop/bug/mime-type-method-name
    
    Fix: Mime type names conflict with Object methods

commit 021f3d2	refs/heads/master
Author: Mircea Pricop 
Date:   2012-07-06 17:19:20 +0200

    Prevent conflict between mime types and Object methods
    
    Assuming the type ":touch", Collector.new was calling
    send(:touch), which instead of triggering method_missing
    and generating a new collector method, actually
    invoked the private method `touch` inherited from
    Object.
    
    By generating the method for each mime type as it
    is registered, the private methods on Object can
    never be reached by `send`, because the `Collector`
    will have them before `send` is called on it.
    
    To do this, a callback mechanism was added to Mime::Type
    
    This allows someone to add a callback for whenever
    a new mime type is registered. The callback then
    gets called with the new mime as a parameter.
    
    This is then used in AbstractController::Collector
    to generate new collector methods after each mime
    is registered.

M	actionpack/lib/abstract_controller/collector.rb
M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/dispatch/mime_type_test.rb

commit 7d0053e	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2012-07-06 16:53:33 +0200

    Limit the number of records in Relation#inspect
    
    While it's interesting to have the results array, it can make a console or a webpage freeze if there are a lot of them.
    So this limits the number of records displayed in #inspect to 10 and tells how much were effectively found.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 717aa92	refs/heads/master
Merge: 48fe382 75b340d
Author: Rafael Mendonça França 
Date:   2012-07-06 07:07:46 -0700

    Merge pull request #6985 from sidonath/disable-query-cache-for-locks
    
    Disable query cache for lock queries

commit 75b340d	refs/heads/master
Author: Damir Zekic 
Date:   2012-07-06 13:03:49 +0200

    Disable query cache for lock queries
    
    Fixes #867

M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit 48fe382	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-06 08:55:49 -0300

    Update release notes with AR::Relation#inspect change [ci skip]
    
    See 07314e64fd62fb8e6165c8c539420160da9437e9.
    Also fix some tabs in AR Changelog.

M	activerecord/CHANGELOG.md
M	guides/source/4_0_release_notes.textile

commit d38f611	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-06 08:53:51 -0300

    Remove mention to csv fixtures from test_helper in guides [ci skip]

M	guides/code/getting_started/test/test_helper.rb

commit 03dcdc3	refs/tags/v3.2.8.rc1
Author: José Valim 
Date:   2012-07-06 13:59:52 +0300

    Since Rails 3.2, use layout false to render no layout

M	railties/guides/source/layouts_and_rendering.textile

commit 07314e6	refs/heads/master
Author: Jon Leighton 
Date:   2012-07-06 10:39:46 +0100

    Show the records in Relation#inspect
    
    The reason for removing the previous implementation of `#inspect` was
    that it hid from you that you were dealing with a `Relation` rather than
    an `Array`.
    
    But it is still useful to be able to see the records, particularly if you're
    writing something like the following in tests:
    
        assert_equal [foo], Post.where(:bar)
    
    If the assertion fails, you want to see what records were actually
    loaded.
    
    So this implementation makes it clear that you've got a `Relation`, but
    also shows your records.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit ca802fd	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-06 00:17:13 -0500

    add :nodoc: to internal implementations of AM::Validator [ci skip]

M	activemodel/lib/active_model/validations/clusivity.rb
M	activemodel/lib/active_model/validator.rb

commit 9a7702a	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-06 00:09:08 -0500

    update ActiveModel::Serialization documentation [ci skip]

M	activemodel/lib/active_model/serialization.rb

commit 8ce61a3	refs/heads/master
Merge: a5efd58 a1ad02a
Author: Carlos Antonio da Silva 
Date:   2012-07-05 20:06:29 -0700

    Merge pull request #6927 from parndt/patch-3
    
    Make ArgumentError message more consistent in nested attributes

commit a1ad02a	refs/heads/master
Author: Philip Arndt 
Date:   2012-07-02 14:21:05 +1200

    Made ArgumentError messages consistent.

M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit ad91908	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-05 19:02:58 -0700

    Add order docs

M	activerecord/lib/active_record/relation/query_methods.rb

commit d7a2309	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-05 19:01:00 -0700

    Add group documentation

M	activerecord/lib/active_record/relation/query_methods.rb

commit d203a0e	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-05 18:43:48 -0700

    Add documentation for includes

M	activerecord/lib/active_record/relation/query_methods.rb

commit aa43fa9	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-05 18:28:44 -0700

    Update list of AR Relation methods

M	guides/source/active_record_querying.textile

commit 9a62551	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-07-05 18:21:09 -0700

    Bump query guide to latest version

M	guides/source/active_record_querying.textile

commit a5efd58	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-05 15:46:14 -0700

    Revert "push parameter instantiation to one method"
    
    This reverts commit 9669f6f7883787aa209207cab68b1069636aed9e.
    
    This breaks Sam Ruby's tests for some reason.  Revert until we figure it
    out.

M	actionpack/lib/action_controller/test_case.rb

commit a7826bd	refs/heads/master
Merge: c8d6dde 6d0394c
Author: Aaron Patterson 
Date:   2012-07-05 14:03:57 -0700

    Merge branch 'master' into testclean
    
    * master:
      Add documentation for inheritance_column method
      Use ArgumentError vs. RuntimeError, which is more precise.
      CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that
      fix quoting for ActiveSupport::Duration instances
      Add few information on the field types
      Add the options method to action_controller testcase.

commit 6d0394c	refs/heads/master
Merge: cb8ac7d 2942192
Author: Carlos Antonio da Silva 
Date:   2012-07-05 09:21:36 -0700

    Merge pull request #6976 from vitorbal/master
    
    Add documentation for inheritance_column method [ci skip]

commit 70c4676	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-05 11:19:20 -0500

    fix syntax of AM::Validations::HelperMethods examples [ci skip]

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb

commit 2942192	refs/heads/master
Author: Vitor Balocco 
Date:   2012-07-05 18:59:42 +0300

    Add documentation for inheritance_column method

M	activerecord/lib/active_record/model.rb

commit 07dad77	refs/heads/master
Author: Kelley Reynolds 
Date:   2012-07-05 11:23:01 -0400

    Change JoinPart test from an integration to a unit test

M	activerecord/test/cases/associations/eager_test.rb
A	activerecord/test/cases/associations/join_dependency_test.rb

commit cb8ac7d	refs/heads/master
Merge: 5534733 0303c23
Author: Carlos Antonio da Silva 
Date:   2012-07-05 05:41:09 -0700

    Merge pull request #6957 from francois2metz/options_method
    
    Add the options method to action_controller testcase.

commit 5534733	refs/heads/master
Merge: 6c9c50c 2f6004d
Author: José Valim 
Date:   2012-07-05 05:38:05 -0700

    Merge pull request #6959 from robin850/patch-1
    
    Add few information on the field types

commit c7afc42	refs/tags/v3.2.8.rc1
Merge: 7faa620 ffdca21
Author: Rafael Mendonça França 
Date:   2012-07-05 04:58:13 -0700

    Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2
    
    MIssed backport for 3.2

commit 6c9c50c	refs/heads/master
Merge: 3257355 b5bb353
Author: Rafael Mendonça França 
Date:   2012-07-05 04:55:28 -0700

    Merge pull request #6967 from frodsan/quite_as_duration
    
    fix quoting for ActiveSupport::Duration instances

commit ffdca21	refs/tags/v3.2.8.rc1
Author: Dmitry Vorotilin 
Date:   2012-04-29 19:16:32 +0400

    Show in log correct wrapped keys

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 3257355	refs/heads/master
Merge: 9f57ee5 9208879
Author: Jeremy Kemper 
Date:   2012-07-04 23:22:00 -0700

    Merge pull request #6969 from mkdynamic/patch-1
    
    Use ArgumentError vs. RuntimeError, which is more precise

commit 9208879	refs/heads/master
Author: Mark Dodwell 
Date:   2012-07-04 22:34:31 -0700

    Use ArgumentError vs. RuntimeError, which is more precise.

M	actionmailer/lib/action_mailer/collector.rb

commit 68df230	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-05 00:09:29 -0500

    update ActiveModel::Validations::HelperMethods documentation [ci skip]

M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb

commit 9f57ee5	refs/heads/master
Merge: 6f74d36 5be3d89
Author: Rafael Mendonça França 
Date:   2012-07-04 21:58:03 -0700

    Merge pull request #6968 from guilleiguaran/update-test-helper
    
    CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that

commit 5be3d89	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-07-04 23:47:41 -0500

    CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that

M	railties/lib/rails/generators/rails/app/templates/test/test_helper.rb

commit 6e00099	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-04 23:11:47 -0500

    update ActiveModel::Conversion documentation [ci skip]

M	activemodel/lib/active_model/conversion.rb

commit b5bb353	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-04 22:39:16 -0500

    fix quoting for ActiveSupport::Duration instances
    
    This patch fixes quoting for ActiveSupport::Duration instances:
    
        # before
        >> ActiveRecord::Base.connection.quote 30.minutes
        => "'--- 1800\n...\n'"
    
        # after
        >> ActiveRecord::Base.connection.quote 30.minutes
        => "1800"
    
    Also, adds a test for type casting ActiveSupport::Duration instances.
    
    Related to #1119.

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
M	activerecord/test/cases/column_test.rb
M	activerecord/test/cases/quoting_test.rb

commit c8d6dde	refs/heads/master
Merge: 9669f6f 6f74d36
Author: Aaron Patterson 
Date:   2012-07-04 11:18:20 -0700

    Merge branch 'master' into testclean
    
    * master:
      activesupport gem dependencies should reflect the versions we actually use
      fix link and add activeresource link in release notes page [ci skip]
      Update 4.0 Release Notes
      Kill not used constant since removal of runner method

commit 6f74d36	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-04 11:16:21 -0700

    activesupport gem dependencies should reflect the versions we actually use

M	Gemfile
M	activesupport/activesupport.gemspec
M	activesupport/lib/active_support/test_case.rb

commit 2f6004d	refs/heads/master
Author: Robin Dupret 
Date:   2012-07-04 17:26:19 +0300

    Add few information on the field types

M	railties/lib/rails/generators/rails/model/USAGE

commit a66f498	refs/heads/master
Merge: b5a2f24 4981fa5
Author: Santiago Pastorino 
Date:   2012-07-04 09:59:33 -0700

    Merge pull request #6961 from frodsan/fix_release_note
    
    fix link and add activeresource link in release notes page [ci skip]

commit 4981fa5	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-04 11:06:33 -0500

    fix link and add activeresource link in release notes page [ci skip]

M	guides/source/4_0_release_notes.textile

commit 0303c23	refs/heads/master
Author: François de Metz 
Date:   2012-07-04 14:57:31 +0200

    Add the options method to action_controller testcase.
    
    Signed-off-by: François de Metz 

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_case_test.rb

commit b5a2f24	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-04 08:23:51 -0300

    Update 4.0 Release Notes
    
    Related with 17d2115e3df6caf15d554b44e28177069fa3ed5b

M	guides/source/4_0_release_notes.textile

commit b70f427	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2012-07-04 10:53:41 +0200

    There is only task for installing migrations when using engines

M	railties/lib/rails/engine.rb

commit 9669f6f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 18:01:11 -0700

    push parameter instantiation to one method

M	actionpack/lib/action_controller/test_case.rb

commit 7ef6a27	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 17:51:27 -0700

    add Mime.fetch so we can have default mime types

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/mime_type.rb

commit 142d50e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 17:37:47 -0700

    make the default environment have actual defaults
    
    instead of deleting keys on every instantiation, create defaults we
    actually use.  eventually we can pass an environment in to the request,
    and create a new req / res object on each call.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/testing/test_request.rb

commit 5ee2763	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 17:29:46 -0700

    assing the request on the response only once

M	actionpack/lib/action_controller/test_case.rb

commit 4f2cd3e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 17:18:31 -0700

    group things that are alike

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb

commit 9f4dafb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 17:13:04 -0700

    push functional test specific methods to it's own module

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb

commit f335389	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-03 21:02:46 -0300

    Kill not used constant since removal of runner method
    
    Runner method was removed in ada571bfcdbad669ae43a4dd18277ef227680a0b.

M	activesupport/lib/active_support/testing/setup_and_teardown.rb

commit b5442b5	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 16:35:07 -0700

    test should be testing to_param not to_s, remove Array subclass

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_case_test.rb

commit edaa2c4	refs/heads/master
Author: Robert Pankowecki 
Date:   2012-06-15 17:20:47 +0000

    Introduce config.action_mailer.default_from=
    
    Allows to easily set :from, :replay_to, etc. options in
    config/application.rb using simple syntax:
    
      config.action_mailer.default_options = {from:"no-replay@example.org"}
    
    This was not possible using #default method because
    
      config.action_mailer.default(from: "no-replay@example.org")
    
    is interpreated as reader method and just returns nil.
    It would not call ActionMailer::Base.default method. The only
    way of calling this method from config/application.rb was to use
    the direct syntax which looks ugly in my opinion:
    
      config.assets.enabled = false
      config.assets.version = '1.0'
      config.encoding = "utf-8"
      config.action_mailer.default_url_options= {
        host:"example.org",
        protocol:"https"
      }
      ActionMailer::Base.default(from: "no-replay@example.org")

M	actionmailer/CHANGELOG.md
M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/test/base_test.rb
M	guides/source/configuring.textile

commit e136fbd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-02 15:14:55 -0700

    push the cookie writing stuff out of the controller
    
    merging cookies is responsibility of the test runner

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb

commit 4528cd0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-02 14:43:56 -0700

    extend the controller with special logic on recycle
    
    For some reason, this special logic is only supposed to be executed on
    the second request.  For now, we'll extend on recycle, but we should
    figure out why this functionality can't be run on every request

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb

commit 9eef933	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-02 14:29:19 -0700

    push req / res setting to the test runner
    
    Try to avoid making the controller mutate itself so that we can
    eventually make the response async

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb

commit 46eba6c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-02 14:01:42 -0700

    extract response setting to a method

M	actionpack/lib/action_controller/metal/rack_delegation.rb

commit b7a4fe1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 14:28:01 -0700

    remove duplicate requires of mocha.
    
    Mocha is already required by AS::TestCase, so remove the duplicate
    requires.

M	activerecord/test/cases/helper.rb
M	activesupport/test/abstract_unit.rb
M	railties/test/generators_test.rb

commit ada571b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 14:23:42 -0700

    remove the runner method copied from minitest

M	activesupport/lib/active_support/testing/setup_and_teardown.rb

commit 089da2e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-03 14:21:53 -0700

    hook mocha in through m/t before_setup, after_teardown hooks

M	Gemfile
M	activesupport/lib/active_support/test_case.rb
A	activesupport/lib/active_support/testing/mocha_module.rb
D	activesupport/lib/active_support/testing/mochaing.rb

commit 1337d51	refs/heads/master
Merge: 823ff55 1c5722c
Author: Rafael Mendonça França 
Date:   2012-07-03 10:00:38 -0700

    Merge pull request #6948 from frodsan/plugin_skip_ignore
    
    remove test/dummy from gitignore when "plugin new -T"

commit 1c5722c	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-03 11:58:17 -0500

    remove test/dummy from gitignore when "plugin new -T"

M	railties/lib/rails/generators/rails/plugin_new/templates/gitignore
M	railties/test/generators/plugin_new_generator_test.rb

commit 823ff55	refs/heads/master
Merge: a967487 719ea77
Author: Rafael Mendonça França 
Date:   2012-07-03 13:48:30 -0300

    Merge branch 'lexmag-reference_statements'
    
    Closes #6920

commit 719ea77	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-03 13:24:55 -0300

    Don't need to use delete in the options hash

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 17d2115	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-02 23:44:17 +0400

    Add changelog entry for references statements

M	activerecord/CHANGELOG.md

commit 68f0ef9	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-02 23:43:56 +0400

    Refactor references schema definitions

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/test/cases/migration/change_table_test.rb

commit 057fa33	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-02 23:42:31 +0400

    Make references statements reversible

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit cfb2458	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-07-02 23:41:49 +0400

    Add references schema statements
    
    Examples:
    
        add_reference :products, :supplier, polymorphic: true, index: true
        remove_reference :products, :user
    
    `add_belongs_to` and `remove_belongs_to` are
    acceptable.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/migration/helper.rb
A	activerecord/test/cases/migration/references_statements_test.rb

commit a967487	refs/heads/master
Merge: eedca4a b44104a
Author: Aaron Patterson 
Date:   2012-07-03 08:44:21 -0700

    Merge pull request #6946 from threedaymonk/queue-refs
    
    Ensure that queued jobs are marshallable

commit fde7fd8	refs/heads/master
Author: Angelo Capilleri 
Date:   2012-07-03 08:38:02 +0200

    small refactoring of as_json method
    
    with this change root has always one assignment

M	activemodel/lib/active_model/serializers/json.rb

commit b44104a	refs/heads/master
Author: Paul Battley 
Date:   2012-07-03 13:03:48 +0100

    Make TestQueueTest work with marshalling queue
    
    This requires all jobs to be instances of named classes, without block
    implementations of methods.

M	railties/test/queueing/test_queue_test.rb

commit eedca4a	refs/heads/master
Merge: 55456ad 17fa4ef
Author: Carlos Antonio da Silva 
Date:   2012-07-03 04:44:33 -0700

    Merge pull request #6940 from acapilleri/observer_update
    
    Observer #update refactoring

commit a3ade2e	refs/heads/master
Author: Paul Battley 
Date:   2012-07-03 11:59:38 +0100

    Ensure jobs do not refer to the queue
    
    Jobs pushed to the queue should not contain a reference to it. As the queue
    itself cannot be marshalled, and as a consequence of checking the
    marshallability of all jobs in the test environment, we can now guarantee this
    to be the case in the test environment when using the default TestQueue
    implementation.

M	railties/test/application/queue_test.rb

commit 33113ba	refs/heads/master
Author: Paul Battley 
Date:   2012-07-03 11:55:46 +0100

    Ensure test jobs are marshallable
    
    By marshalling and unmarshalling jobs when adding them to the test queue, we
    can ensure that jobs created during test runs are valid candidates for
    marshalling, and, thus, that they can be used with queueing backends other than
    the default simple in-process implementation.
    
    This will also be used in a subsequent commit to ensure that jobs pushed to the
    queue do not contain a reference to the queue itself.

M	railties/lib/rails/queueing.rb
M	railties/test/application/queue_test.rb

commit 8e1d8fd	refs/heads/master
Author: Paul Battley 
Date:   2012-07-03 10:29:32 +0100

    Track queue threading with named classes
    
    Using an anonymous class prevented marshalling: we're not doing that yet, but
    the next commit will introduce this. This also provided an opportunity to
    improve the expressivity of the tests and to make the assertion failure
    messages clearer.

M	railties/test/application/queue_test.rb

commit 17fa4ef	refs/heads/master
Author: Angelo Capilleri 
Date:   2012-07-03 09:08:33 +0200

    observer update refactoring

M	activemodel/lib/active_model/observing.rb

commit 55456ad	refs/heads/master
Merge: 215d41d 9196b93
Author: Rafael Mendonça França 
Date:   2012-07-02 20:27:10 -0700

    Merge pull request #6934 from kennyj/fix_store
    
    Don't mark the store as changed if an attribute isn't changed.

commit 9196b93	refs/heads/master
Author: kennyj 
Date:   2012-07-03 01:29:37 +0900

    Don't mark the store as changed if an attribute isn't changed.

M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb

commit 7faa620	refs/tags/v3.2.8.rc1
Author: Mark J. Titorenko 
Date:   2012-05-08 15:37:18 +0100

    Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations.  While I'm at it, wrap long comment lines consistently.
    
    Conflicts:
    	actionpack/lib/action_view/helpers/number_helper.rb
    
    There was just one conflict related to the addition of the :format
    option to number_to_percentage.

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 215d41d	refs/remotes/origin/async
Author: Carlos Antonio da Silva 
Date:   2012-07-01 14:34:47 -0300

    Update 4.0 Release Notes with changelogs [ci skip]
    
    Also fix some wrong formatting.
    
    Related discussion:
    https://github.com/rails/rails/commit/ab72040b74f742b6676b2d2a5dd029bfdca25a7a#commitcomment-1525256

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	guides/source/4_0_release_notes.textile

commit 65dc45e	refs/remotes/origin/async
Author: Xavier Noria 
Date:   2012-07-02 23:56:13 +0200

    explains why the file update checker ignores mtimes in the future, plus a little refactor for the same price

M	activesupport/lib/active_support/file_update_checker.rb

commit b8a5bb2	refs/heads/master
Author: Aaron Patterson 
Date:   2012-07-02 11:41:28 -0700

    push response creation down since third param is never used.

M	actionpack/lib/action_controller/metal/rack_delegation.rb

commit dacc947	refs/tags/v3.2.8.rc1
Merge: 9e0b3fc b1e509a
Author: Rafael Mendonça França 
Date:   2012-07-02 10:15:07 -0700

    Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705cd806b5408
    
    Backport #3329 to 3-2-stable

commit b1e509a	refs/tags/v3.2.8.rc1
Author: Francesco Rodriguez 
Date:   2012-07-02 11:57:10 -0500

    Backport #3329 to 3-2-stable
    
    Fix bug with autosave collection association on new record with a marked
    for destroy record in autosave collection.
    
    Fixes #6918.

M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/test/cases/autosave_association_test.rb

commit a5e4796	refs/heads/master
Merge: 822c858 40262ab
Author: Carlos Antonio da Silva 
Date:   2012-07-02 05:18:24 -0700

    Merge pull request #6919 from rahul100885/master
    
    Make file name and class name consistant
    
    Related to dbc43bcce69aa4aaf0ae309bf410e2b786c4e3f6

commit 40262ab	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2012-07-02 11:40:27 +0530

    Made file name and class name consistant

M	railties/test/application/routes_inspect_test.rb

commit 822c858	refs/heads/master
Author: Andrew White 
Date:   2012-07-02 07:05:17 +0100

    Improve performance of DateTime#seconds_since_unix_epoch
    
    Calculate the seconds since the UNIX epoch using the difference in
    Julian day numbers from the epoch date. By reducing the Rational math
    to just the offset component this gives a significant improvement.
    
    Benchmark:
    
    Calculating --------------------------------------------
           new     27733 i/100ms
       current     15031 i/100ms
           new     27737 i/100ms
       current     15549 i/100ms
    --------------------------------------------------------
           new   548182.1 (±0.9%) i/s - 2745567 in 5.008943s
       current   216380.9 (±1.6%) i/s - 1082232 in 5.002781s
           new   510281.9 (±1.2%) i/s - 2551804 in 5.001525s
       current   219858.3 (±1.8%) i/s - 1103979 in 5.023039s

M	activesupport/lib/active_support/core_ext/date_time/conversions.rb
M	activesupport/test/core_ext/date_time_ext_test.rb

commit 62463d1	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-07-01 15:53:27 -0500

    remove :nodoc: of AR::Scoping#unscoped [ci skip]

M	activerecord/lib/active_record/scoping/default.rb

commit 83302a4	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-07-01 13:54:42 -0300

    Fix failing test related to persist glob when replacing a path
    
    Introduced in pull request #6910, merged in 2ee3fa1a48513a2c42833e2e1f60fe03769bc295

M	railties/test/paths_test.rb

commit 6ebc8ca	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-01 13:53:16 -0300

    Use strings for the table names
    
    connection.tables returns an array of strings

M	activerecord/test/cases/migration/create_join_table_test.rb

commit d441de3	refs/heads/master
Author: Andrew White 
Date:   2012-07-01 17:27:49 +0100

    Revert "Use strftime to convert DateTime to numeric"
    
    There appears to be a bug with DateTime#strftime("%s") on 32-bit platforms.
    Bug report: http://bugs.ruby-lang.org/issues/6683
    
    This reverts commit 210cd756a628cc19c0d6e44bee8c33dfb2d9d598.

M	activesupport/lib/active_support/core_ext/date_time/conversions.rb

commit aafa00f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-07-01 12:57:48 -0300

    Unify the collation API for the database adpters

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/connection_test.rb
M	activerecord/test/cases/tasks/postgresql_rake_test.rb

commit 36938b4	refs/heads/master
Merge: 2ee3fa1 0fb1327
Author: Rafael Mendonça França 
Date:   2012-07-01 08:56:51 -0700

    Merge pull request #6914 from lexmag/migration_tests
    
    Refactor migration test_helper

commit 0fb1327	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-06-30 17:09:35 +0400

    Refactor migration test_helper
    
    and create_join_table_test

M	activerecord/test/cases/migration/create_join_table_test.rb
M	activerecord/test/cases/migration/helper.rb

commit 2ee3fa1	refs/heads/master
Merge: 98b46bf 0f4d005
Author: José Valim 
Date:   2012-07-01 02:54:33 -0700

    Merge pull request #6910 from mulder/fix_path_glob
    
    Persist glob when replacing a path

commit 98b46bf	refs/heads/master
Author: Andrew White 
Date:   2012-07-01 09:11:21 +0100

    Make Time#change work with offsets other than UTC or local
    
    Use Time.new to create times where the current offset is not zero or
    not in the local time zone - closes #4847 and #6651.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 73bddd1	refs/heads/master
Author: Andrew White 
Date:   2012-07-01 08:48:40 +0100

    Remove rescue clause from ActiveSupport::TimeZone#to_f
    
    Time#at no longer raises an error for large values so we can remove
    the rescue clause from ActiveSupport::TimeZone#to_f.

M	activesupport/lib/active_support/values/time_zone.rb

commit c685d12	refs/heads/master
Author: Andrew White 
Date:   2012-07-01 08:02:41 +0100

    Remove DateTime#to_time override
    
    Currently if the offset is not zero then to_time returns self which
    can lead to errors where a developer assumes that the value is a
    Time. To solve this we can use the native implementation of
    DateTime#to_time in Ruby 1.9.3 as it handles offsets properly and
    is faster than our override.

M	activesupport/lib/active_support/core_ext/date_time/conversions.rb

commit 210cd75	refs/heads/master
Author: Andrew White 
Date:   2012-07-01 07:42:38 +0100

    Use strftime to convert DateTime to numeric
    
    The native implementation of the seconds since the UNIX epoch in
    strftime is significantly faster than our method.
    
    Benchmark:
    ----------
    require 'benchmark/ips'
    require 'date'
    require 'time'
    
    date = DateTime.civil(1253,7,6,20,4,0)
    
    Benchmark.ips do |x|
      x.report("strftime.to_i") { date.strftime('%s').to_i }
      x.report("ssue.to_i") { ((date - DateTime.civil(1970)) * 86400).to_i }
    
      x.report("strftime.to_f") { date.strftime('%s').to_f }
      x.report("ssue.to_f") { ((date - DateTime.civil(1970)) * 86400).to_f }
    end
    
    Output:
    -------
    Calculating -------------------------------------
           strftime.to_i     26480 i/100ms
               ssue.to_i     13818 i/100ms
           strftime.to_f     26561 i/100ms
               ssue.to_f     14479 i/100ms
    -------------------------------------------------
           strftime.to_i   616937.3 (±2.4%) i/s - 3098160 in 5.024749s
               ssue.to_i   200108.8 (±6.9%) i/s -  994896 in 4.999278s
           strftime.to_f   553581.3 (±2.2%) i/s - 2788905 in 5.040397s
               ssue.to_f   204260.3 (±4.3%) i/s - 1028009 in 5.043072s

M	activesupport/lib/active_support/core_ext/date_time/conversions.rb

commit 0149a6e	refs/heads/master
Author: Laknath 
Date:   2012-07-01 10:14:13 +0530

    Changed attr_accessible example to reflect grouped roles
    
    Related to the request #5699 - https://github.com/rails/rails/pull/5699 and
    not documented.

M	activemodel/lib/active_model/mass_assignment_security.rb

commit 167a0b9	refs/heads/master
Author: Nick Howard 
Date:   2012-06-30 16:04:08 -0600

    ActionDispatch::ClosedError no longer is raised. See d142572567 for more info.

M	actionpack/lib/action_controller/metal/streaming.rb

commit 0d400ae	refs/heads/master
Author: Nick Howard 
Date:   2012-06-30 16:01:57 -0600

    use config.action_controller instead of ActionController::Base in example code for asset_tag_helper

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit 0f4d005	refs/heads/master
Author: Nicholas Mulder 
Date:   2012-06-29 10:47:44 -0400

    Persist glob when replacing a path
    
    When Rails::Paths::Root's []= is used to replace a path it should persist the previous path's glob. Without passing the glob along we get gnarly bugs when trying to wire up things like engines.
    
        module FooEngine
          class Engine < ::Rails::Engine
            isolate_namespace FooEngine
    
            config.paths['config/initializers'] = "lib/foo_engine/initializers"
          end
        end
    
        ## Example of behaviour before this commit.
        #
        # Before the initializer override:
        >> FooEngine::Engine.config.paths["config/initializers"].glob
        => "**/*.rb"
    
        # After the initializer override:
        >> FooEngine::Engine.config.paths["config/initializers"].glob
        => nil
    
        ## Example of behaviour after this commit.
        #
        # Before the initializer override:
        >> FooEngine::Engine.config.paths["config/initializers"].glob
        => "**/*.rb"
    
        # After the initializer override:
        >> FooEngine::Engine.config.paths["config/initializers"].glob
        => "**/*.rb"

M	railties/lib/rails/paths.rb
M	railties/test/paths_test.rb

commit ab72040	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-30 16:31:40 -0300

    Update AR and AP changelogs [ci skip]

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit 9b45f0f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-30 14:26:19 -0500

    fix AR::SchemaStatements#column_exists? example [ci skip]

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 6727e3c	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-30 14:18:31 -0500

    update AR::SchemaStatements#column_exists? documentation [ci skip]

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 49d069d	refs/heads/master
Merge: 4d9be13 166dbaa
Author: Carlos Antonio da Silva 
Date:   2012-06-30 12:16:17 -0700

    Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-ap
    
    Remove Active Model dependency from Action Pack

commit 4d9be13	refs/heads/master
Merge: 6b9d1a0 59e23e2
Author: Carlos Antonio da Silva 
Date:   2012-06-30 12:02:26 -0700

    Merge pull request #6913 from lexmag/column_exists_options
    
    Add :default and :null options to column_exists? method
    
    Examples:
    
        column_exists?(:testings, :taggable_id, :integer, null: false)
        column_exists?(:testings, :taggable_type, :string, default: 'Photo')

commit 59e23e2	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-06-30 02:23:20 +0400

    Add more options to column_exists? method
    
    Also fix failures in check options for nil

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/migration/change_schema_test.rb

commit 6b9d1a0	refs/heads/master
Merge: 4662c5f 32c28e8
Author: Vijay Dev 
Date:   2012-06-30 23:15:22 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	activemodel/lib/active_model/errors.rb

commit 4662c5f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-30 14:23:11 -0300

    Fix collation database task to use begin..rescue..end

M	activerecord/lib/active_record/railties/databases.rake

commit 350e9c6	refs/heads/master
Merge: cca614b 67dd94a
Author: José Valim 
Date:   2012-06-30 09:37:36 -0700

    Merge pull request #6908 from apotonick/av-prepare2
    
    Av prepare2

commit cca614b	refs/heads/master
Merge: f021467 bece59e
Author: Rafael Mendonça França 
Date:   2012-06-30 09:22:12 -0700

    Merge pull request #6906 from kennyj/extract_collation
    
    Extract collation tasks to database tasks.

commit 166dbaa	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-06-28 23:54:12 -0500

    Remove ActiveModel dependency from ActionPack
    
    ActiveModel is used in ActionPack for ActiveModel::Naming for a few,
    mostly optional aspects of ActionPack related to automatically converting
    an ActiveModel compliant object into a key for params and routing. It uses
    only three methods of ActiveModel (ActiveModel::Naming.route_key,
    ActiveModel::Naming.singular_route_key and ActiveModel::Naming.param_key).

M	actionpack/actionpack.gemspec
A	actionpack/lib/action_controller/model_naming.rb
M	actionpack/lib/action_controller/record_identifier.rb
M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/lib/action_view/helpers/form_helper.rb

commit bece59e	refs/heads/master
Author: kennyj 
Date:   2012-06-29 20:35:49 +0900

    Extract collation tasks to database tasks.

M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/test/cases/tasks/database_tasks_test.rb
M	activerecord/test/cases/tasks/mysql_rake_test.rb
M	activerecord/test/cases/tasks/postgresql_rake_test.rb
M	activerecord/test/cases/tasks/sqlite_rake_test.rb

commit f021467	refs/heads/master
Merge: 58c83d4 05c7e0a
Author: Jon Leighton 
Date:   2012-06-30 01:31:21 -0700

    Merge pull request #6869 from bcardarella/active_relation_inspect
    
    Remove ActiveRelation#inspect

commit 05c7e0a	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-26 14:33:21 -0400

    Remove ActiveRelation#inspect

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 9e0b3fc	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-06-29 21:29:14 +0200

    make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884]

M	activesupport/lib/active_support/inflections.rb
M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb

commit 58c83d4	refs/heads/master
Author: Xavier Noria 
Date:   2012-06-29 21:29:14 +0200

    make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884]

M	activesupport/lib/active_support/inflections.rb
M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb

commit 33192cf	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-29 15:08:08 -0300

    Fix failing test in file update checker
    
    Introduced in 1abe31670fdad2c357b4356b40a4567a46d16693
    
    The test was failing when running on isolation, because the extensions were
    not being loaded, thus 1.year.from_now was failing. Just use mktime
    instead, adding 1 year to Time.now.

M	activesupport/test/file_update_checker_test.rb

commit a4dd871	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-29 14:55:07 -0300

    Remove another missing test related to draw external routes
    
    Related with 5e7d6bb

M	railties/test/engine_test.rb

commit 7406d69	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-29 14:33:09 -0300

    Remove more tests related to draw external routes files
    
    Related with 5e7d6bba79393de0279917f93b82f3b7b176f4b5

M	actionpack/test/dispatch/mapper_test.rb
M	actionpack/test/dispatch/routing_test.rb
D	actionpack/test/fixtures/routes/bogus.rb
D	actionpack/test/fixtures/routes/external.rb

commit 1abe316	refs/heads/master
Merge: 5e7d6bb 20519ef
Author: José Valim 
Date:   2012-06-29 08:56:02 -0700

    Merge pull request #6911 from abonec/master
    
    Bug with FileUpdateChecker with wrong mtime

commit 5e7d6bb	refs/heads/master
Author: José Valim 
Date:   2012-06-29 17:39:50 +0200

    Revert "Allow loading external route files from the router"
    
    This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b.
    
    Usage of this feature did not reveal any improvement in existing apps.
    
    Conflicts:
    
    	actionpack/lib/action_dispatch/routing/mapper.rb
    	guides/source/routing.textile
    	railties/lib/rails/engine.rb
    	railties/lib/rails/paths.rb
    	railties/test/paths_test.rb

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	guides/source/routing.textile
M	railties/lib/rails/application/routes_reloader.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/engine/configuration.rb
M	railties/lib/rails/paths.rb
M	railties/test/application/paths_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/paths_test.rb

commit 20519ef	refs/heads/master
Author: abonec 
Date:   2012-06-29 19:43:33 +0400

    fix FileUpdateChecker when file has wrong mtime (from future)

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/test/file_update_checker_test.rb

commit 50b6110	refs/heads/master
Author: José Valim 
Date:   2012-06-29 16:50:51 +0200

    Remove unused responsibilities and add a few load definitions to engines
    
    Since plugins were removed, we can clean up a few methods in engines.
    We also use this opportunity to move `load_console`, `load_tasks` and
    `load_runner` to Rails::Engine. This means that, if someone wants to
    improve script/rails for engines to support console or runner commands,
    part of the work is already done.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie.rb
M	railties/test/railties/engine_test.rb

commit 0470ddc	refs/heads/master
Author: José Valim 
Date:   2012-06-29 15:25:47 +0200

    Remove unnecessary Railties structure now that plugins are gone

M	railties/lib/rails/application.rb
D	railties/lib/rails/application/railties.rb
M	railties/lib/rails/engine.rb
D	railties/lib/rails/engine/railties.rb
M	railties/test/isolation/abstract_unit.rb

commit e9e6f63	refs/heads/master
Author: José Valim 
Date:   2012-06-29 15:24:12 +0200

    Depend on thor 0.15.4

M	railties/railties.gemspec

commit dbc43bc	refs/heads/master
Author: José Valim 
Date:   2012-06-29 14:04:18 +0200

    Rename RouteInspect to RoutesInspector for consistency

D	railties/lib/rails/application/route_inspector.rb
A	railties/lib/rails/application/routes_inspector.rb
M	railties/lib/rails/info_controller.rb
M	railties/lib/rails/tasks/routes.rake
D	railties/test/application/route_inspect_test.rb
A	railties/test/application/routes_inspect_test.rb

commit e39f218	refs/heads/master
Merge: 809bdf3 8fe458a
Author: Santiago Pastorino 
Date:   2012-06-29 04:37:44 -0700

    Merge pull request #6905 from kennyj/add_changelog_entry_20120629
    
    Added a changelog entry about fda24312d3.

commit 67dd94a	refs/heads/master
Author: Nick Sutterer 
Date:   2012-06-29 13:02:44 +0200

    removing the AV::Base.helpers class attribute as it is not needed.

M	actionpack/lib/action_view/base.rb

commit 8fe458a	refs/heads/master
Author: kennyj 
Date:   2012-06-29 19:18:44 +0900

    Added an entry about fda24312d3 in the CHANGELOG.

M	activerecord/CHANGELOG.md

commit 1b01ab4	refs/heads/master
Author: Nick Sutterer 
Date:   2012-06-29 11:33:37 +0200

    remove AV.prepare and move all helper-related logic into the controller. this decouples the view since it no longer knows about routes internals.
    this is a result of an ongoing discussion at https://github.com/rails/rails/pull/6826.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_view/base.rb

commit 32c28e8	refs/heads/master
Author: Alex Nisnevich 
Date:   2012-06-28 20:10:58 -0700

    Remove mention of `convert_key` now that it's been taken out in 1eecd9483b0439ab4913beea36f0d0e2aa0518c7

M	activesupport/lib/active_support/core_ext/hash/except.rb

commit a9bb136	refs/heads/master
Author: Chris Adams 
Date:   2012-06-29 00:08:43 +0100

    Rails now uses the ActiveSupport BufferedLogger class
    
    Instead of the standard Ruby logger

M	guides/source/debugging_rails_applications.textile

commit debb3a1	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-28 18:02:07 -0500

    update AR::FinderMethods#exists?(false) example [ci skip]

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 48601c2	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-27 11:20:23 -0700

    Merge pull request #6878 from masarakki/master
    
    fix bug in limit of enum columns of mysql
    
    Closes #6432

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
A	activerecord/test/cases/adapters/mysql/enum_test.rb
A	activerecord/test/cases/adapters/mysql2/enum_test.rb
M	activerecord/test/schema/mysql2_specific_schema.rb
M	activerecord/test/schema/mysql_specific_schema.rb

commit 809bdf3	refs/heads/master
Merge: b64488d e2abd8d
Author: Carlos Antonio da Silva 
Date:   2012-06-28 13:22:46 -0700

    Merge pull request #6902 from frodsan/mailer_async_doc
    
    fix ActionMailer::Async docs and update to follow coding conventions

commit e2abd8d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-28 15:09:32 -0500

    fix ActionMailer::Async docs and update to follow coding conventions

M	actionmailer/lib/action_mailer/async.rb
M	actionmailer/lib/action_mailer/base.rb

commit 10e5685	refs/tags/v3.2.8.rc1
Author: Carlos Antonio da Silva 
Date:   2012-06-28 11:56:47 -0700

    Merge pull request #6900 from cbandy/issue-6898
    
    Require URI in ConnectionSpecification
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/connection_specification.rb

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

commit b64488d	refs/heads/master
Merge: fda2431 4f58a4b
Author: Carlos Antonio da Silva 
Date:   2012-06-28 11:56:47 -0700

    Merge pull request #6900 from cbandy/issue-6898
    
    Require URI in ConnectionSpecification

commit 4f58a4b	refs/heads/master
Author: Chris Bandy 
Date:   2012-06-28 13:48:49 -0500

    Require URI

M	activerecord/lib/active_record/connection_adapters/connection_specification.rb

commit fda2431	refs/heads/master
Merge: 2596aeb 138934f
Author: Rafael Mendonça França 
Date:   2012-06-28 11:11:17 -0700

    Merge pull request #6895 from kennyj/support_collate_for_postgresql
    
    Support collate for postgresql

commit 138934f	refs/heads/master
Author: kennyj 
Date:   2012-06-29 00:40:13 +0900

    Support collate and ctype on the PostgreSQL.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/connection_test.rb
M	activerecord/test/cases/tasks/postgresql_rake_test.rb

commit 2596aeb	refs/heads/master
Merge: 4563995 b6ce230
Author: Rafael Mendonça França 
Date:   2012-06-28 06:41:49 -0700

    Merge pull request #6894 from subbarao/master
    
    fixing typo in active record from method

commit b6ce230	refs/heads/master
Author: Subba Rao Pasupuleti 
Date:   2012-06-28 09:38:26 -0400

    fixing typo in from documentation

M	activerecord/lib/active_record/relation/query_methods.rb

commit 4563995	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-28 00:45:41 -0300

    Remove some aggregation tests related to composed_of
    
    Since composed_of was removed in 051747449e7afc817c599e4135bc629d4de064eb,
    these tests were working "by mistake", due to the matching "address"
    string in the error message, but with a different error message than the
    expected multiparameter assignment error.
    
    Since "address" is not an attribute from Customer anymore, the error was
    "undefined method klass for nil", where nil was supposed to be the
    column object.

M	activerecord/test/cases/base_test.rb
M	activerecord/test/models/developer.rb

commit 100ad21	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 23:50:58 -0300

    Move newly added multiparameter tests to base_test file
    
    All other multiparameter assignment tests are in the same file, so it
    makes sense to have all of them here.

M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/base_test.rb

commit 4903577	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-28 09:36:21 -0300

    Bump minitest to 3.2.0

M	Gemfile

commit e70ac2a	refs/heads/master
Merge: 3dc753f 88de905
Author: Carlos Antonio da Silva 
Date:   2012-06-28 05:30:46 -0700

    Merge pull request #6890 from yahonda/address_test_setting_time_attribute_oracle
    
    Skip test_setting_time_attribute for Oracle database

commit 88de905	refs/heads/master
Author: Yasuo Honda 
Date:   2012-06-28 10:58:30 +0900

    Skip test_setting_time_attribute because Oracle database
    does not have TIME data type.

M	activerecord/test/cases/attribute_methods_test.rb

commit 3dc753f	refs/heads/master
Merge: 692b64e f6bedc9
Author: Carlos Antonio da Silva 
Date:   2012-06-27 18:00:33 -0700

    Merge pull request #6886 from nertzy/faster_stringify_and_symbolize_keys
    
    Speed up Hash#transform_keys using Hash#each_key

commit f6bedc9	refs/heads/master
Author: Grant Hutchins 
Date:   2012-06-27 20:09:30 -0400

    Speed up Hash#transform_keys using Hash#each_key
    
    See https://gist.github.com/3007749 for justification

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 456489f	refs/heads/master
Author: Chris Gunther 
Date:   2012-06-27 19:33:25 -0400

    Mention effect of accepts_nested_attributes_for on association autosave option [ci skip]

M	activerecord/lib/active_record/associations.rb

commit 692b64e	refs/heads/master
Merge: 2076efe f498000
Author: Rafael Mendonça França 
Date:   2012-06-27 11:20:23 -0700

    Merge pull request #6878 from masarakki/master
    
    fix bug in limit of enum columns of mysql
    
    Closes #6432

commit f498000	refs/heads/master
Author: Yamada Masaki 
Date:   2012-06-27 19:10:36 +0900

    fix: limit of enum columns of mysql

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
A	activerecord/test/cases/adapters/mysql/enum_test.rb
A	activerecord/test/cases/adapters/mysql2/enum_test.rb
M	activerecord/test/schema/mysql2_specific_schema.rb
M	activerecord/test/schema/mysql_specific_schema.rb

commit 2076efe	refs/heads/master
Merge: d79ca92 ab7c1c4
Author: Rafael Mendonça França 
Date:   2012-06-27 11:00:02 -0700

    Merge pull request #6873 from mauricio/fix-for-6825
    
    Fixes #6825, adds tests covering cases and error possibilities

commit ab7c1c4	refs/heads/master
Author: Mauricio Linhares 
Date:   2012-06-27 14:31:22 -0300

    Fixes #6825, adds tests covering cases and error possibilities, also changes SQLite3 driver to correctly generate a time column instead of datetime

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/errors.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit d735abf	refs/heads/master
Author: Robb Kidd 
Date:   2012-06-27 00:07:10 -0400

    Update psql adapter to rename a default pkey sequence when renaming a table.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/migration/rename_table_test.rb

commit d79ca92	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-27 13:06:47 -0300

    Add changelog entry for polymorphic option in model generator
    
    Pull request #6856, merged in 52f6e47682003c83b0466bf5e140ee302498a226.
    [ci skip]

M	railties/CHANGELOG.md

commit 565d54d	refs/heads/master
Merge: 52f6e47 6498bbe
Author: Carlos Antonio da Silva 
Date:   2012-06-27 09:03:34 -0700

    Merge pull request #6880 from kennyj/fix_20120628
    
    Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task.

commit 52f6e47	refs/heads/master
Merge: bb16b0e 94b230e
Author: Carlos Antonio da Silva 
Date:   2012-06-27 08:46:00 -0700

    Merge pull request #6856 from lexmag/polymorphic_generators
    
    Add polymorphic option to model generator
    
    For instance,
    
        $ rails g model Product supplier:references{polymorphic}
    
    generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.

commit 6498bbe	refs/heads/master
Author: kennyj 
Date:   2012-06-28 00:38:35 +0900

    Fix wrong environment. env should be RAILS_ENV or test.

M	activerecord/lib/active_record/railties/databases.rake

commit 066e839	refs/heads/master
Author: kennyj 
Date:   2012-06-28 00:33:08 +0900

    Fix wrong testcase. This is a testcase for db:test:prepare.

M	railties/test/application/rake_test.rb

commit bb16b0e	refs/heads/master
Merge: 21f9f1c 23859d0
Author: Rafael Mendonça França 
Date:   2012-06-27 07:58:17 -0700

    Merge pull request #6879 from yahonda/address_basic_inclusion_model_test_oracle
    
    Address test_basic_model test error with Oracle enhanced adapter

commit 23859d0	refs/heads/master
Author: Yasuo Honda 
Date:   2012-06-27 23:51:50 +0900

    Address test_basic_model test error with Oracle enhanced adapter
    which ids start from 1000 as a default.

M	activerecord/test/cases/inclusion_test.rb

commit 94b230e	refs/heads/master
Author: Aleksey Magusev 
Date:   2012-06-25 22:01:31 +0400

    Add polymorphic option to model generator
    
    For instance,
    
        $ rails g model Product supplier:references{polymorphic}
    
    generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.
    
    Also fix model_generator_test.rb#L196 and #L201

M	activerecord/lib/rails/generators/active_record/model/templates/model.rb
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/generated_attribute_test.rb
M	railties/test/generators/model_generator_test.rb

commit 21f9f1c	refs/heads/master
Merge: 4a20fcf 6a85915
Author: Xavier Noria 
Date:   2012-06-26 23:25:40 -0700

    Merge pull request #6863 from bcardarella/asyn-actionmailer-guides
    
    Guide update for Async ActionMailer

commit 4a20fcf	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-25 15:06:11 -0300

    Refactor attribute method matcher to use Hash#fetch

M	activemodel/lib/active_model/attribute_methods.rb

commit 7fad77f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-25 14:45:39 -0300

    Cleanup attribute methods a bit, use map! when accepting *args
    
    Since we're dealing with a new array instance, it's safe to use map! and
    we avoid an extra array object.
    
    Also remove the symbolize_keys! from AttributeMethodMatcher, since it's
    an internal class that always receives symbol keys from the prefix/suffix
    methods implementations.

M	activemodel/lib/active_model/attribute_methods.rb

commit fef781c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-25 14:38:42 -0300

    Use default + merge! instead of reverse_merge
    
    Since we're not directly requiring the reverse_merge extension, we can
    avoid another hash creation by using default_hash.merge! instead.

M	activemodel/lib/active_model/validations/acceptance.rb

commit 0ee6aa7	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-25 14:24:46 -0300

    Set hash value instead of merge a single key, and use flatten! if possible
    
    There's no need to create two extra hashes with options.merge(another_hash),
    with the goal of setting only one value, so lets just set it.
    
    Also refactor validates_each to use _merge_attributes, like other
    validates_* helpers do.

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/with.rb

commit 60571b8	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-26 12:54:22 -0300

    Ensure Array#to_sentence does not modify given hash
    
    Also simplify I18n logic for Array#to_sentence, doing only one lookup
    for all keys and using merge!, instead of one lookup for each option key.

M	activesupport/lib/active_support/core_ext/array/conversions.rb
M	activesupport/test/core_ext/array_ext_test.rb
M	activesupport/test/i18n_test.rb

commit 6a85915	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-26 10:16:51 -0400

    Guide update for Async ActionMailer

M	guides/source/action_mailer_basics.textile

commit 5847f59	refs/heads/master
Merge: 99e10eb 600f027
Author: Rafael Mendonça França 
Date:   2012-06-26 13:27:23 -0700

    Merge pull request #6870 from erichmenge/patch/base_test_oracle
    
    Setup each test with default ActiveRecord timezone settings to ensure ea...

commit 600f027	refs/heads/master
Author: Erich Menge 
Date:   2012-06-26 14:54:05 -0500

    Setup each test with default ActiveRecord timezone settings to ensure each test starts with a clean slate.
    Fixes #6867.

M	activerecord/test/cases/base_test.rb

commit 8371b0b	refs/heads/master
Author: Eric Carty-Fickes 
Date:   2012-06-26 15:00:11 -0500

    corrected URLs and controller benchmark method call

M	guides/source/performance_testing.textile

commit 99e10eb	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-26 10:48:13 -0300

    Remove file added by mistake at 88230b7cf77181c2088cce3314493caa9b3ac1fb

D	actionpack/action_pack_url_generator.rb

commit cfd21f0	refs/heads/master
Merge: a5ebf33 88230b7
Author: José Valim 
Date:   2012-06-26 01:30:15 -0700

    Merge pull request #6859 from bogdan/deprecate_monkey_patch
    
    AS::Callbacks: deprecate monkey patch code

commit a5ebf33	refs/heads/master
Merge: ee74366 38f7eba
Author: José Valim 
Date:   2012-06-26 00:41:47 -0700

    Merge pull request #6858 from amatsuda/av_no_such_method_update_details
    
    :update_details method no more exists on @lookup_context

commit ee74366	refs/heads/master
Merge: 755d163 35717a9
Author: Aaron Patterson 
Date:   2012-06-26 00:04:09 -0700

    Merge pull request #6839 from bcardarella/async-actionmailer
    
    Async actionmailer

commit 88230b7	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-06-24 10:30:34 +0300

    AS::Callbacks: deprecate monkey patch code
    
    Deprecate usage of filter object with #before and #after
    methods as around callback

A	actionpack/action_pack_url_generator.rb
M	actionpack/lib/action_controller/caching/sweeping.rb
M	actionpack/test/controller/filters_test.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/callbacks.rb

commit 38f7eba	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-26 12:13:58 +0900

    :update_details method no more exists on @lookup_context
    
    the method has gone in this commit: 119e9e2dafb0cdc5b85613b730333679aef534af

M	actionpack/lib/action_view/renderer/abstract_renderer.rb

commit 755d163	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-25 21:50:20 -0300

    Use args.flatten! in query methods when applicable
    
    Try to use more destructive methods on *args when applicable, to avoid
    creating new objects.

M	activerecord/lib/active_record/relation/query_methods.rb

commit 3fccf6a	refs/tags/v3.2.8.rc1
Author: Carlos Antonio da Silva 
Date:   2012-06-25 13:47:38 -0700

    Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require
    
    Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 9e1a199	refs/heads/master
Merge: e5abb89 359592b
Author: Piotr Sarnacki 
Date:   2012-06-25 14:48:54 -0700

    Merge pull request #6544 from flexoid/issue-6431
    
    exists?(false) returns false

commit f8f4ac9	refs/tags/v3.2.8.rc1
Author: Carlos Antonio da Silva 
Date:   2012-06-25 17:36:24 -0300

    Ensure Arel columns are typecasted properly when grouping with calculation
    
    Fix build issue with postgresql.
    
    Conflicts:
    	activerecord/lib/active_record/relation/calculations.rb
    	activerecord/test/cases/calculations_test.rb

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit e5abb89	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-25 17:36:24 -0300

    Ensure Arel columns are typecasted properly when grouping with calculation
    
    Fix build issue with postgresql.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 07875be	refs/heads/master
Merge: 1981159 e6d4dc3
Author: Carlos Antonio da Silva 
Date:   2012-06-25 13:47:38 -0700

    Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require
    
    Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+

commit e6d4dc3	refs/heads/master
Author: Rhett Sutphin 
Date:   2012-06-25 14:54:40 -0500

    Add missing require.
    
    If you selectively require core_exts (e.g., require
    'active_support/core_ext/string'), it is possible for
    'active_support/core_ext/time/calculations' to be required when
    `ActiveSupport::TimeWithZone` is not available. If this happens, the next call
    to Time.=== will fail with a NameError.

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 1981159	refs/heads/master
Merge: 51b055b 04002db
Author: Rafael Mendonça França 
Date:   2012-06-25 12:26:06 -0700

    Merge pull request #6855 from kennyj/refactor_database_tasks
    
    Refactor and improve database tasks.

commit 04002db	refs/heads/master
Author: kennyj 
Date:   2012-06-26 03:04:21 +0900

    Move to db:structure namespace, because these methods are global.

M	activerecord/lib/active_record/railties/databases.rake

commit 09bb777	refs/heads/master
Author: kennyj 
Date:   2012-06-26 03:01:48 +0900

    Remove session_table_name method because this is global and used only once.

M	activerecord/lib/active_record/railties/databases.rake

commit 20e8344	refs/heads/master
Author: kennyj 
Date:   2012-06-26 02:47:51 +0900

    Add a description about ENV["SCOPE"]

M	activerecord/lib/active_record/railties/databases.rake

commit 0ebd4f2	refs/heads/master
Author: kennyj 
Date:   2012-06-26 02:40:06 +0900

    Change the behavior of db:test:prepare task when schema_format is sql for consistency.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake_test.rb

commit 9ab805d	refs/heads/master
Author: kennyj 
Date:   2012-06-26 02:33:08 +0900

    Change the behavior of db:test:clone task when schema_format is sql for consistency.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake_test.rb

commit 7d3e846	refs/heads/master
Author: kennyj 
Date:   2012-06-26 02:26:27 +0900

    Change an order of methods for readbility.

M	activerecord/lib/active_record/railties/databases.rake

commit 51b055b	refs/heads/master
Merge: 2a7cfee 65362af
Author: Rafael Mendonça França 
Date:   2012-06-25 10:17:12 -0700

    Merge pull request #6853 from frodsan/nodoc_patch2
    
    add :nodoc: to internal implementations [ci skip]

commit 65362af	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-25 12:14:50 -0500

    add :nodoc: to internal implementations [ci skip]

M	activemodel/lib/active_model/mass_assignment_security/permission_set.rb
M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activemodel/lib/active_model/validations/with.rb

commit 2a7cfee	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-25 13:12:49 -0300

    Make internal callback model definitions private in AMo
    
    These _define class methods don't need to be exposed to objects that
    extend ActiveModel::Callbacks.
    
    Also use merge! options to avoid the creation of an extra hash.

M	activemodel/lib/active_model/callbacks.rb

commit 809d4f8	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-25 10:40:54 -0500

    update ActiveModel::Name documentation [ci skip]

M	activemodel/lib/active_model/naming.rb

commit 359592b	refs/heads/master
Author: Egor Lynko 
Date:   2012-05-30 00:36:28 +0300

    exists?(false) returns false
    
    `FinderMethods#exists?` finder method now returns *false* with the *false* argument

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 24a4cc7	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-25 12:04:50 -0300

    Rails 4 will be 1.9.3+ only [ci skip]

M	guides/source/getting_started.textile

commit 5130d86	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-25 02:23:33 -0500

    fix punctuation in activemodel/errors [ci skip]

M	activemodel/lib/active_model/errors.rb

commit ceb68d1	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-25 02:27:26 +0200

    Revert "Merge pull request #6344"
    
    This commit needs to be reverted because it introduces difficulties when
    using sqlite3 in development and other databases in production. This
    happens because when you create time column in sqlite3, it's dumped as
    datetime in schema.rb file.
    
    This reverts commit 57d534ee9e441d078fcc161c0c78ebaa5aacd736, reversing
    changes made to 20f049fb50daee0c5e5a69b55b529af5737e8e3f.
    
    Conflicts:
    
    	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit e941eaa	refs/heads/master
Merge: df640f9 d6aea12
Author: Carlos Antonio da Silva 
Date:   2012-06-24 19:33:16 -0300

    Merge branch 'number-helpers-refactor'
    
    Refactor and improve a bit number helpers code.

commit d6aea12	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-23 19:39:59 -0300

    Get rid of the clear_i18n hack by using a different locale
    
    Use a different and very specific locale for testing currency negative
    format, and an empty store for currency defaults.

M	activesupport/test/number_helper_i18n_test.rb

commit dc766c9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-23 19:36:00 -0300

    Move number helper i18n related tests to AS
    
    They also make more sense here since all the related logic with I18n is
    handled by AS::NumberHelper, and not by AV anymore.

D	actionpack/test/template/number_helper_i18n_test.rb
A	activesupport/test/number_helper_i18n_test.rb

commit feec54b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-23 18:55:46 -0300

    Refactor AV number helper tests with invalid numbers
    
    Just make use of the returning exception from assert_raise, instead of
    calling the method again with a rescue clause to test the saved
    exception number.

M	actionpack/test/template/number_helper_test.rb

commit 36d863c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-23 18:52:17 -0300

    Move constants to the top, remove freeze

M	activesupport/lib/active_support/number_helper.rb

commit 77b89c2	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-23 18:46:29 -0300

    Do not propagate the :raise option to AS number helpers
    
    ActiveSupport::NumberHelper does not make use of :raise, so there's no
    need to propagate it down.

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 06d50b9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-23 18:31:35 -0300

    Remove some not used variables and improve code a bit

M	activesupport/lib/active_support/number_helper.rb

commit 35717a9	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-24 17:17:06 -0400

    Some final syntax fixes

M	actionmailer/lib/action_mailer/async.rb
M	actionmailer/test/base_test.rb

commit df640f9	refs/heads/master
Merge: 8635f6a 008023c
Author: Carlos Antonio da Silva 
Date:   2012-06-24 14:15:57 -0700

    Merge pull request #6847 from benolee/patch-1
    
    Correct line numbers for reader and writer methods in AS configurable
    
    The line number for the reader method is off by one due to the local variable line being reassigned to the writer's line.
    
    This commit would provide correct line numbers for backtraces and method introspection (for example, method(:reader).source_location).

commit 008023c	refs/heads/master
Author: benolee 
Date:   2012-06-24 14:39:49 -0500

    correct line numbers for reader and writer methods

M	activesupport/lib/active_support/configurable.rb

commit a11fcd9	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-24 04:30:29 -0400

    Better documentation for ActionMailer.async

M	actionmailer/lib/action_mailer/base.rb

commit d5badc4	refs/heads/master
Author: Perry Smith 
Date:   2012-06-24 10:01:46 -0500

    Fixed example in 1.2 so help will be defined as the text implies

M	guides/source/routing.textile

commit 12ac977	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-24 06:42:41 -0700

    Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculations
    
    Stop assuming strings for grouped calculations
    Conflicts:
    	activerecord/lib/active_record/relation/calculations.rb

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 8635f6a	refs/heads/master
Merge: ebe8a45 a1c05dd
Author: Rafael Mendonça França 
Date:   2012-06-24 06:42:41 -0700

    Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculations
    
    Stop assuming strings for grouped calculations

commit 188d671	refs/heads/master
Author: kennyj 
Date:   2012-06-24 03:06:40 +0900

    Added a feature to add a database task. e.g. OracleDatabaseTasks

M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/test/cases/tasks/database_tasks_test.rb

commit a1c05dd	refs/heads/master
Author: Ernie Miller 
Date:   2012-06-24 08:39:54 -0400

    Stop assuming strings for grouped calculations
    
    Execute_grouped_calculation is one of those places where
    ActiveRecord forgets that it has ARel underpinnings, and
    assumes that the values provided to group_values are
    strings. This artificially hobbles otherwise functional
    code. This patch stops assuming that incoming values
    respond to to_sym, stops using string interpolation for
    table aliases on objects that support aliasing, and stops
    unnecessarily joining group_values on the relation.
    
    Additionally, it calls to_sql, if available, on objects
    sent to column_alias_for, in order to get a more reasonable
    alias string than a non-string's default to_str method.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit aee4eec	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-24 04:28:52 -0400

    Better documentation for ActionMailer.async

M	actionmailer/lib/action_mailer/base.rb

commit 33334d0	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-24 04:21:02 -0400

    Forcing the message sending is no longer necessary

M	actionmailer/lib/action_mailer/async.rb
M	actionmailer/test/base_test.rb

commit 812d1e8	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 23:42:03 -0400

    Support for custom queues on the mailer
    
    Credit goes to *Aaron Patterson* (tenderlove)

M	actionmailer/lib/action_mailer/async.rb
M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/test/base_test.rb

commit 87615f2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-23 16:58:36 -0500

    update ActiveModel::Naming documentation

M	activemodel/lib/active_model/naming.rb

commit 956c8e5	refs/heads/master
Merge: cca9a21 0c22ac2
Author: Francesco Rodríguez 
Date:   2012-06-23 14:22:37 -0700

    Merge pull request #104 from udaykadaboina/typofix
    
    fixed a typo [ci skip]

commit dee0b23	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 16:38:44 -0400

    Removed unecessary splatting

M	actionmailer/lib/action_mailer/async.rb

commit cca9a21	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-23 15:12:33 -0500

    update ActiveModel::Model documentation [ci skip]

M	activemodel/lib/active_model/model.rb

commit ebe8a45	refs/heads/master
Merge: 5fb21ba 8471edc
Author: Carlos Antonio da Silva 
Date:   2012-06-23 13:06:12 -0700

    Merge pull request #6805 from tim-vandecasteele/uploadedfile-paramify
    
    Don't paramify ActionDispatch::Http::UploadedFile in tests

commit 5337149	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 16:06:04 -0400

    Use Delegator for a cleaner QueuedMessage class
    
    Credit goes to *Nicolás Sanguinetti* (foca) for this suggestion

M	actionmailer/lib/action_mailer/async.rb

commit ffe16b1	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-23 14:49:22 -0500

    add description ActiveModel::StrictValidationField [ci skip]

M	activemodel/lib/active_model/errors.rb

commit d1d6c36	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 15:21:33 -0400

    Updated Changelogs

M	actionmailer/CHANGELOG.md
M	railties/CHANGELOG.md

commit dc9f6fc	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 15:10:49 -0400

    Force message delivery despite async

M	actionmailer/lib/action_mailer/async.rb
M	actionmailer/test/base_test.rb

commit b6792e9	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 15:04:15 -0400

    Add commented out ActionMailer async config option

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 0cb154b	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 14:45:16 -0400

    AsyncMailer documention

M	actionmailer/lib/action_mailer/async.rb
M	actionmailer/lib/action_mailer/base.rb

commit dc7fd82	refs/heads/master
Author: Brian Cardarella 
Date:   2012-06-23 14:36:09 -0400

    Asynchronous ActionMailer
    
    Any ActionMailer class can be set to render and delier messages using
    the new Rails Queue.
    
    Some of this work was borrowed (with permission) from Nick Plante's
    (zapnap) reqsue_mailer gem.

A	actionmailer/lib/action_mailer/async.rb
M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/test/base_test.rb
A	actionmailer/test/fixtures/async_mailer/welcome.erb
A	actionmailer/test/mailers/async_mailer.rb

commit 5fb21ba	refs/heads/master
Merge: 1327660 a1a2db4
Author: Carlos Antonio da Silva 
Date:   2012-06-23 09:34:57 -0700

    Merge pull request #6837 from kennyj/move_to_tasks_dir
    
    Move Active Record rake tasks tests to under the tasks dir [ci skip]

commit a1a2db4	refs/heads/master
Author: kennyj 
Date:   2012-06-24 01:27:03 +0900

    Move tasks(rake) tests to under the tasks dir.

D	activerecord/test/cases/database_tasks_test.rb
D	activerecord/test/cases/mysql_rake_test.rb
D	activerecord/test/cases/postgresql_rake_test.rb
D	activerecord/test/cases/sqlite_rake_test.rb
A	activerecord/test/cases/tasks/database_tasks_test.rb
A	activerecord/test/cases/tasks/mysql_rake_test.rb
A	activerecord/test/cases/tasks/postgresql_rake_test.rb
A	activerecord/test/cases/tasks/sqlite_rake_test.rb

commit 1327660	refs/heads/master
Merge: 95b0f63 a6a4813
Author: Carlos Antonio da Silva 
Date:   2012-06-23 07:36:44 -0700

    Merge pull request #6836 from flyerhzm/ruby_19_hash
    
    Ruby 1.9 hash syntax for generated code

commit 95b0f63	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-23 19:54:52 +0530

    format the 4.0 release notes [ci skip]

M	guides/source/4_0_release_notes.textile

commit a6a4813	refs/heads/master
Author: Richard Huang 
Date:   2012-06-23 18:42:00 +0800

    ruby 1.9 hash syntax for generated code
    
    app/controllers/application_controller.rb
    app/views/layouts/application.html.erb
    config/application.rb
    config/routes.rb
    test/performance/browsing_test.rb

M	railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt
M	railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/routes.rb
M	railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
M	railties/test/application/configuration_test.rb

commit 5befeba	refs/heads/master
Author: Andrew White 
Date:   2012-06-23 10:43:00 +0100

    Add test cases for 46492949b8c09f99db78b9f7a02d039e7bc6a702

M	activerecord/test/cases/reflection_test.rb

commit 0c22ac2	refs/heads/master
Author: Uday Kadaboina 
Date:   2012-06-23 02:52:57 -0600

    fixed another typo in edge guides

M	guides/source/getting_started.textile

commit ab5eb50	refs/heads/master
Author: Uday Kadaboina 
Date:   2012-06-23 02:43:34 -0600

    fixed a typo

M	guides/source/getting_started.textile

commit e1838bf	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-22 17:11:57 -0700

    eliminating another string subclass

M	actionpack/lib/action_view/template/text.rb

commit 03e9a64	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-22 16:21:58 -0700

    fix some accidental nils

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb

commit 62a1309	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 18:01:12 -0500

    update ActiveModel::Lint documentation [ci skip]

M	activemodel/lib/active_model/lint.rb

commit 311810b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 16:48:50 -0500

    update ActiveModel::Errors#include? documentation [ci skip]

M	activemodel/lib/active_model/errors.rb

commit 3726080	refs/heads/master
Merge: 96ce1f2 bc7ac33
Author: Rafael Mendonça França 
Date:   2012-06-22 14:41:06 -0700

    Merge pull request #6832 from frodsan/nodoc_patch1
    
    add :nodoc: to internal implementations [ci skip]

commit bc7ac33	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 16:29:59 -0500

    add :nodoc: to internal implementations [ci skip]

M	actionpack/lib/action_controller/test_case.rb
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/lib/active_model/callbacks.rb
M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/model.rb
M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activesupport/lib/active_support/concern.rb
M	activesupport/lib/active_support/testing/declarative.rb
M	activesupport/lib/active_support/testing/isolation.rb
M	railties/lib/rails/initializable.rb

commit 1727f43	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 16:04:16 -0500

    add documentation and examples to ActiveModel::Errors [ci skip]

M	activemodel/lib/active_model/errors.rb

commit 96ce1f2	refs/heads/master
Merge: a232831 6657ec9
Author: Rafael Mendonça França 
Date:   2012-06-22 11:19:56 -0700

    Merge pull request #6821 from tonywok/pg_datetime_precision
    
    Allow precision option for postgresql datetimes

commit 6657ec9	refs/heads/master
Author: Tony Schneider 
Date:   2012-06-21 17:40:54 -0400

    Allow precision option for postgresql datetimes
    
    This patch addresses the difficulty of retrieving datetime fields. By default, the database holds a higher precision than the time as a String.
    
    This issue is discussed at length at the following links:
    - [#3519](https://github.com/rails/rails/issues/3519)
    - [#3520](https://github.com/rails/rails/issues/3520)
    
    Also, kudos to @mattscilipoti

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/timestamp_test.rb

commit a232831	refs/heads/master
Merge: 35ee8fa 629bc03
Author: Rafael Mendonça França 
Date:   2012-06-22 10:51:53 -0700

    Merge pull request #6829 from frodsan/misunderstood_param
    
    change param name to improve documentation

commit 629bc03	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 12:42:32 -0500

    change param name to improve documentation
    
    The keys of the error messages are actually attribute names. It makes
    the documentation easier to understand:
    
        # Returns +true+ if the error messages include an error for the given
        # +attribute+, +false+ otherwise.
        #
        #   person.errors.messages # => { :name => ["can not be nil"] }
        #   person.errors.include?(:name) # => true
        #   person.errors.include?(:age)  # => false
        def include?(attribute)
          (v = messages[attribute]) && v.any?
        end

M	activemodel/lib/active_model/errors.rb

commit bc818e4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 11:52:57 -0500

    update ActiveModel::Errors documentation and minor fixes [ci skip]

M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/dirty.rb
M	activemodel/lib/active_model/errors.rb

commit d9238d0	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 10:44:53 -0500

    update ActiveModel::Conversion documentation [ci skip]

M	activemodel/lib/active_model/conversion.rb

commit 35ee8fa	refs/heads/master
Merge: fb8cf55 6285675
Author: Vijay Dev 
Date:   2012-06-22 22:15:27 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 6285675	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-22 22:14:29 +0530

    fixes a few mistakes in api docs [ci skip]

M	actionpack/lib/action_view/helpers/form_helper.rb
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/lib/active_model/validations.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activesupport/lib/active_support/deprecation/reporting.rb
M	activesupport/lib/active_support/testing/assertions.rb

commit 741cb5b	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-22 22:07:21 +0530

    copy edit the assets guide[ci skip]

M	guides/source/asset_pipeline.textile

commit fb8cf55	refs/heads/master
Merge: 9298d60 f984b81
Author: Rafael Mendonça França 
Date:   2012-06-22 07:51:11 -0700

    Merge pull request #6800 from mschneider/dynamic_finders_for_aliased_attributes
    
    Dynamic finders for aliased attributes

commit f984b81	refs/heads/master
Author: Maximilian Schneider 
Date:   2012-06-22 16:44:01 +0200

    made dynamic finders alias_attribute aware
    
    previously dynamic finders only worked in combination with the actual
    column name and not its alias defined with #alias_attribute

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/models/topic.rb

commit 9298d60	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-22 09:44:30 -0300

    Fix changelog typo [ci skip]

M	activerecord/CHANGELOG.md

commit d59b2ab	refs/heads/master
Merge: 8b173f3 e5cd300
Author: Carlos Antonio da Silva 
Date:   2012-06-22 09:40:39 -0300

    Merge branch 'pluck-multiple-columns'
    
    Allow ActiveRecord::Relation#pluck to accept multiple columns. Returns an
    array of arrays containing the type casted values:
    
        Person.pluck(:id, :name)
        # SELECT people.id, people.name FROM people
        # [[1, 'David'], [2, 'Jeremy'], [3, 'Jose']]
    
    Closes #6500

commit e5cd300	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-22 09:30:00 -0300

    Add changelog entry and guide updates for pluck with multiple columns

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/calculations.rb
M	guides/source/active_record_querying.textile

commit 6aae17e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-19 22:12:01 -0300

    Refactor pluck with multiple columns
    
    Ensure it works with mix of symbols and strings, and with a select
    clause possibly containing more than one column.
    
    Also remove support for pluck with an array of columns, in favor of
    passing the list of attributes:
    
        Model.pluck(:a, :b)
    
    See comments: https://github.com/rails/rails/pull/6500#issuecomment-6030292

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 2e379c1	refs/heads/master
Author: jeroeningen 
Date:   2012-05-26 19:17:05 +0200

    ActiveRecord#pluck now accepts multiple columns

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 8b173f3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-22 00:27:00 -0300

    Fix serializable_hash with xml generation and default :except option
    
    When generating xml with a custom implementation of serializable_hash,
    if using the :except option, it was being overriden by the default AR
    implementation that attempts to ignore the inheritance column from STI
    automatically. So, if you have an implementation like this:
    
        def serializable_hash(options={})
          super({ except: %w(some_attr) }.merge!(options))
        end
    
    The :except option was correctly being used for :json generation, but
    not for :xml, because the options hash already contained the :except
    key with the inheritance column, thus overriding the customization.
    
    This commit fixes this problem by removing the :except logic from the
    xml serializer, that happened before calling serializable_hash. Since
    serializable_hash also does the same check for inheritance column, this
    logic was duplicated in both places, thus it's safe to remove it from
    xml serializer (see ActiveRecord::Serialization#serializable_hash).
    
    This is an attempt to solve issue #2498, that claims for a
    "Single transformation API for both xml and json representations".

M	activerecord/lib/active_record/serializers/xml_serializer.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/xml_serialization_test.rb

commit 965b779	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-22 00:25:23 -0300

    Add some coverage for AR serialization with serializable_hash
    
    ActiveRecord json/xml serialization should use as base
    serializable_hash, provided by ActiveModel. Add some more coverage
    around options :only and :except for both json and xml serialization.

M	activemodel/test/cases/serializers/xml_serialization_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activerecord/test/models/contact.rb

commit 70d3625	refs/heads/master
Author: Jon Leighton 
Date:   2012-06-22 10:29:32 +0100

    disallow mutating a relation once loaded

M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit bacfa9d	refs/heads/master
Author: Andrew White 
Date:   2012-06-22 10:19:34 +0100

    It's AR::Reflection not AR::Relation

M	activerecord/CHANGELOG.md

commit 8471edc	refs/heads/master
Author: Tim Vandecasteele 
Date:   2012-06-21 10:16:28 +0200

    Don't paramify ActionDispatch::Http::UploadedFile in tests
    
    To test uploading a file without using fixture_file_upload, a posted
    ActionDispatch::Http::UploadedFile should not be paramified (just like
    Rack::Test::UploadedFile).
    (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
    share the same API, tempfile is not accessible on
    Rack::Test::UploadedFile as discussed in
    https://github.com/brynary/rack-test/issues/30)

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_case_test.rb

commit d569bfe	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-22 00:32:54 -0500

    update ActiveModel::Callbacks documentation [ci skip]

M	activemodel/lib/active_model/callbacks.rb

commit 4649294	refs/heads/master
Author: Andrew White 
Date:   2012-06-21 20:47:12 +0100

    Improve the derivation of HABTM assocation join table names
    
    Improve the derivation of HABTM join table name to take account of nesting.
    It now takes the table names of the two models, sorts them lexically and
    then joins them, stripping any common prefix from the second table name.
    
    Some examples:
    
      Top level models
      (Category <=> Product)
      Old: categories_products
      New: categories_products
    
      Top level models with a global table_name_prefix
      (Category <=> Product)
      Old: site_categories_products
      New: site_categories_products
    
      Nested models in a module without a table_name_prefix method
      (Admin::Category <=> Admin::Product)
      Old: categories_products
      New: categories_products
    
      Nested models in a module with a table_name_prefix method
      (Admin::Category <=> Admin::Product)
      Old: categories_products
      New: admin_categories_products
    
      Nested models in a parent model
      (Catalog::Category <=> Catalog::Product)
      Old: categories_products
      New: catalog_categories_products
    
      Nested models in different parent models
      (Catalog::Category <=> Content::Page)
      Old: categories_pages
      New: catalog_categories_content_pages
    
    Also as part of this commit the validity checks for HABTM assocations have
    been moved to ActiveRecord::Reflection One side effect of this is to move when
    the exceptions are raised from the point of declaration to when the association
    is built. This is consistant with other association validity checks.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/join_helper.rb
M	activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
A	activerecord/test/fixtures/reserved_words/distinct_select.yml
D	activerecord/test/fixtures/reserved_words/distincts_selects.yml
M	activerecord/test/models/member.rb
M	activerecord/test/schema/schema.rb

commit 4bbd35f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-21 22:54:14 -0300

    Set the hash value directly instead of using merge!

M	activerecord/lib/active_record/associations/collection_association.rb

commit c3025e8	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-21 16:56:40 -0500

    add description to ActiveModel::MissingAttributeError [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit a4cc79d	refs/heads/master
Merge: 6d71080 1ce803d
Author: Rafael Mendonça França 
Date:   2012-06-21 14:48:36 -0700

    Merge pull request #6818 from frodsan/add_nodoc_instancemethod
    
    add :nodoc: to AM::AttributeMethods#instance_method_already_implemented?...

commit 1ce803d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-21 16:40:17 -0500

    add :nodoc: to AM::AttributeMethods#instance_method_already_implemented? [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit 95a938a	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-21 16:19:40 -0500

    add example to ActiveModel::AttributeMethods#undefine_attribute_methods [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit 6d71080	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-21 13:54:14 -0700

    use mutex_m rather than use a delegate system

M	actionpack/lib/action_view/template/resolver.rb

commit f975c4b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-21 15:51:37 -0500

    add docs to AM::AttributeMethods#define_attribute_method [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit a010fc1	refs/heads/master
Merge: 6688cd2 67bf728
Author: Yehuda Katz 
Date:   2012-06-21 13:47:18 -0700

    Merge pull request #6428 from pinetops/resolver_concurrency_fix
    
    Make the Resolver template cache threadsafe

commit 6688cd2	refs/heads/master
Merge: 188cc90 1cb2cb8
Author: Rafael Mendonça França 
Date:   2012-06-21 13:43:09 -0700

    Merge pull request #6815 from frodsan/add_nodoc_attrmethodmatcher
    
    add :nodoc: to AM::AttributeMethods::AttributeMethodMatcher

commit 1cb2cb8	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-21 15:37:09 -0500

    add :nodoc: to AM::AttributeMethods::AttributeMethodMatcher [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit 188cc90	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-21 12:13:13 -0700

    stop subclassing string

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/template/testing/null_resolver_test.rb

commit b5b350a	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-21 12:51:39 -0500

    fix ActiveModel::AttributeMethods#alias_attribute documentation [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit bf3332b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-21 12:26:14 -0500

    update ActiveModel::AttributeMethods documentation [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit 200e6a6	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-21 11:24:00 -0300

    Remove waning of unused variable

M	activerecord/test/cases/persistence_test.rb

commit 40617c7	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-19 01:55:33 -0300

    Merge branch 'acapilleri-update_nested_attributes'
    
    Closes #6675
    
    Conflicts:
    	activerecord/lib/active_record/attribute_methods/dirty.rb

M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit e76ced0	refs/heads/master
Merge: 682d247 c3a5be0
Author: Carlos Antonio da Silva 
Date:   2012-06-21 05:37:36 -0700

    Merge pull request #6804 from acapilleri/firm_changes_from_zero_to_string
    
    changed the firm of changes_from_zero_to_string?

commit 682d247	refs/heads/master
Merge: e769559 fe933be
Author: Carlos Antonio da Silva 
Date:   2012-06-21 05:35:31 -0700

    Merge pull request #6806 from chancancode/add_test_singularize_of_irregularity
    
    Inflector: Added missing tests cases to ensure idempotency of singularize and pluralize

commit e769559	refs/heads/master
Merge: 26a4e5e 6f6111e
Author: Carlos Antonio da Silva 
Date:   2012-06-21 05:22:32 -0700

    Merge pull request #6808 from arunagw/warning_removed_actionpack
    
    Removed warnings.

commit 6f6111e	refs/heads/master
Author: Arun Agrawal 
Date:   2012-06-21 17:00:19 +0530

    Removed warnings.
    
    1. Change in test name as already defined.
    2. ambiguous first argument; put parentheses or
    even spaces

M	actionpack/test/controller/render_test.rb

commit 8421361	refs/heads/master
Author: Godfrey Chan 
Date:   2012-06-21 02:19:32 -0700

    Small typo in Backporting instructions.

M	guides/source/contributing_to_ruby_on_rails.textile

commit fe933be	refs/heads/master
Author: Godfrey Chan 
Date:   2012-06-21 02:16:48 -0700

    Adds missing inflector tests to ensure idempotency
    
    This is a follow up to #4719. It appears that singularize and pluralize
    are supposed to be idempotent - i.e. when you call singularize or
    pluralize multiple times on the same string, you should get the same
    result. (At least for the "officially supported" cases that the stock
    inflector is designed to handle.) #4719 added the missing tests for
    regular cases, and this commit added the missing tests for the
    irregularities.
    
    While I'm at that, I also synced up the irregularity test cases with
    the current set of irregularity cases that we ship out-of-the-box.

M	activesupport/test/inflector_test.rb
M	activesupport/test/inflector_test_cases.rb

commit c3a5be0	refs/heads/master
Author: Angelo capilleri 
Date:   2012-06-21 09:32:10 +0200

    changed the firm of changes_from_zero_to_string?
    
    delete *column* because is unused by the method.

M	activerecord/lib/active_record/attribute_methods/dirty.rb

commit 26a4e5e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-20 14:21:23 -0700

    logger is a singleton, just flush the singleton

M	activesupport/lib/active_support/log_subscriber.rb

commit 8edd6de	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-20 14:20:55 -0700

    explain listener does not care about time, so use evented listener

M	activerecord/lib/active_record/explain_subscriber.rb
M	activerecord/test/cases/explain_subscriber_test.rb

commit b9f9951	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-20 13:21:27 -0700

    use thread local queues.
    
    Log listener is a singleton shared across threads, so make sure the
    event queues are local to each thread.

M	activesupport/lib/active_support/log_subscriber.rb

commit c1c4ecb	refs/heads/master
Merge: b046ea4 45b1045
Author: Rafael Mendonça França 
Date:   2012-06-20 13:09:54 -0700

    Merge pull request #6801 from dmathieu/mailer_raise_if_no_implicit_template
    
    Mailer with no implicit template

commit 45b1045	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2012-06-20 21:20:12 +0200

    raise an error if no implicit mailer template could be found

M	actionmailer/CHANGELOG.md
M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/test/base_test.rb
A	actionmailer/test/fixtures/base_mailer/attachment_with_hash.html.erb
A	actionmailer/test/fixtures/base_mailer/attachment_with_hash_default_encoding.html.erb
A	actionmailer/test/fixtures/base_mailer/welcome_with_headers.html.erb
A	actionmailer/test/fixtures/base_test/after_filter_mailer/welcome.html.erb
A	actionmailer/test/fixtures/base_test/before_filter_mailer/welcome.html.erb
A	actionmailer/test/fixtures/base_test/default_inline_attachment_mailer/welcome.html.erb
A	actionmailer/test/fixtures/mail_delivery_test/delivery_mailer/welcome.html.erb
A	actionmailer/test/fixtures/proc_mailer/welcome.html.erb

commit b046ea4	refs/heads/master
Merge: 323ee20 4d68539
Author: Rafael Mendonça França 
Date:   2012-06-20 11:39:49 -0700

    Merge pull request #6799 from kennyj/refactor_long_codes
    
    Refactor testcase codes. It's repeated.

commit 4d68539	refs/heads/master
Author: kennyj 
Date:   2012-06-21 03:26:32 +0900

    Refactor testcase codes. It's repeated.

M	activerecord/test/cases/database_tasks_test.rb

commit 323ee20	refs/heads/master
Merge: 1bdc098 30c84aa
Author: Carlos Antonio da Silva 
Date:   2012-06-20 10:12:27 -0700

    Merge pull request #6798 from kennyj/db-rake-structure-load
    
    Refactor db:structure:load task.

commit 1bdc098	refs/heads/master
Merge: 4f700ed 211dcde
Author: Rafael Mendonça França 
Date:   2012-06-20 14:08:23 -0300

    Merge pull request #4396 from kennyj/fix_4259
    
    Fix GH #4259. When we execute schema dumper, we must remove table_name_prefix and table_name_suffix.

commit 30c84aa	refs/heads/master
Author: kennyj 
Date:   2012-06-21 01:49:52 +0900

    Remove duplicated codes.

M	activerecord/test/cases/database_tasks_test.rb

commit 1991195	refs/heads/master
Author: kennyj 
Date:   2012-06-21 01:35:26 +0900

    Refactor db:structure:load task.

M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
M	activerecord/test/cases/database_tasks_test.rb
M	activerecord/test/cases/mysql_rake_test.rb
M	activerecord/test/cases/postgresql_rake_test.rb
M	activerecord/test/cases/sqlite_rake_test.rb

commit a4726d3	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2012-06-20 18:23:57 +0300

    just specify what's to be done, not what's not to be.

M	actionmailer/lib/action_mailer/base.rb

commit d0f088e	refs/heads/master
Author: Ben Oakes 
Date:   2012-06-20 12:09:53 -0300

    Fix delivery_method usage

M	actionmailer/lib/action_mailer/base.rb

commit 4f700ed	refs/heads/master
Merge: 265f134 2773257
Author: Carlos Antonio da Silva 
Date:   2012-06-20 11:42:21 -0300

    Merge pull request #6402 from paranoiase/prev-and-next-quarter
    
    Add prev_quarter and next_quarter methods in Time/Date/DateTime calculations.
    
    Similar to prev_month and next_month, it returns the date with the same day
    in the previous or next quarter:
    
        t = Time.local(2010, 5, 8) # => Sat, 08 May 2010
        t.prev_quarter             # => Mon, 08 Feb 2010
        t.next_quarter             # => Sun, 08 Aug 2010
    
    Closes #6402

commit 2773257	refs/heads/master
Author: paranoiase Kang 
Date:   2012-05-20 14:33:58 +0900

    Add prev_quarter and next_quarter method in Time/Date/DateTime

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	guides/source/active_support_core_extensions.textile

commit 065e02d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-20 09:37:10 -0500

    switch to prototype also modifies application.js [ci skip]

M	guides/source/ajax_on_rails.textile

commit 1bb2f5a	refs/heads/master
Merge: 81d5d27 ef19e80
Author: Carlos Antonio da Silva 
Date:   2012-06-20 07:21:39 -0700

    Merge pull request #6426 from pinetops/template_concurrency_master
    
    Prevent concurrent compilation of templates - closes #6400

commit 81d5d27	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-20 11:07:20 -0300

    Bump minitest to 3.1.0

M	Gemfile

commit 02a4ef7	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-19 23:10:21 -0500

    remove deprecated methods [ci skip]

M	guides/source/ajax_on_rails.textile

commit 12d5732	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-19 23:08:35 -0500

    update Built-in Rails Helpers section [ci skip]

M	guides/source/ajax_on_rails.textile

commit 3a1cac4	refs/heads/master
Merge: 39dec69 84403ae
Author: Aaron Patterson 
Date:   2012-06-19 20:46:26 -0700

    Merge pull request #6789 from takoyakikamen/aptests
    
    Correct the AP test。

commit 84403ae	refs/heads/master
Author: タコ焼き仮面 
Date:   2012-06-19 20:44:45 -0700

    Correct the AP test。

M	activesupport/lib/active_support/log_subscriber.rb

commit a59b1ee	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-19 22:33:50 -0500

    fix typo [ci skip]

M	guides/source/ajax_on_rails.textile

commit 39dec69	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-19 23:21:00 -0300

    Run the logger tests in isolation

M	activesupport/lib/active_support/testing/isolation.rb
M	railties/test/application/rack/logger_test.rb

commit 4531885	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-19 23:13:47 -0300

    CORES needs to be a integer

M	activesupport/lib/active_support/testing/isolation.rb

commit f945d15	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 19:08:13 -0700

    run the notes tests in isolation

M	railties/test/application/rake/notes_test.rb

commit 265f134	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 17:08:15 -0700

    run railties tests in parallel, default to 2 cores

M	activesupport/lib/active_support/testing/isolation.rb
M	railties/test/isolation/abstract_unit.rb

commit a7e715e	refs/heads/master
Merge: 2f79d91 1579f12
Author: Rafael Mendonça França 
Date:   2012-06-19 21:03:02 -0300

    Merge branch 'aderyabin-fix7'
    
    Closes #6007

commit 1579f12	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-19 20:49:27 -0300

    Remove unneeded code since pluck is respecting joins now

M	activerecord/lib/active_record/associations/collection_association.rb

commit 60ffe41	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-19 00:36:30 -0300

    Extract conditional to a method to avoid duplication
    
    Also use if/else block to not use short circuit return

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 2f79d91	refs/heads/master
Merge: 7b6efb9 949a773
Author: Carlos Antonio da Silva 
Date:   2012-06-19 16:58:58 -0700

    Merge pull request #6787 from frodsan/add_nodoc_asset_helpers
    
    add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and
    AssetIncludeTag [ci skip]

commit 1f98493	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 10:15:28 +0700

    handle joins/includes correctly for pluck and calculation.
    
    Fix #5990

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 949a773	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-19 18:44:17 -0500

    add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTag

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

commit 7b6efb9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 16:27:54 -0700

    join any extra args to the tmp path

M	railties/test/isolation/abstract_unit.rb

commit c445f0d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 15:41:52 -0700

    expand the tmpdir to the realpath so tests on OS X pass

M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/generators_test.rb

commit 056dbf4	refs/heads/master
Merge: 7896f35 bf8e205
Author: Aaron Patterson 
Date:   2012-06-19 15:33:40 -0700

    Merge branch 'remote'
    
    * remote:
      move fanout back to a global variable, add a mutex for safety

commit bf8e205	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 15:33:14 -0700

    move fanout back to a global variable, add a mutex for safety

M	activesupport/lib/active_support/notifications.rb
M	activesupport/lib/active_support/notifications/fanout.rb

commit 7896f35	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 14:27:52 -0700

    use system tmpdir rather than our own

M	railties/lib/rails/generators/test_case.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/generators_test.rb

commit a6fd462	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 11:56:27 -0700

    make logger a singleton on the class

M	activesupport/lib/active_support/log_subscriber.rb

commit c6af764	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 11:01:33 -0700

    listeners are per thread, so remove nested hash

M	activesupport/lib/active_support/log_subscriber.rb

commit 7f66ee9	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-19 15:08:13 -0500

    add documentation to AS::TestCase#assert_nothing_raised

M	activesupport/lib/active_support/test_case.rb

commit ceba010	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-19 17:04:07 -0300

    Add missing require

M	activesupport/lib/active_support/notifications/instrumenter.rb

commit b912bca	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-19 14:47:46 -0500

    update AS::Testing::Assertions docs

M	activesupport/lib/active_support/testing/assertions.rb

commit 24587c2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-19 14:25:11 -0500

    fix typo [ci skip]

M	activesupport/lib/active_support/testing/assertions.rb

commit 3b4d286	refs/heads/master
Author: Andrés Mejía 
Date:   2012-06-19 13:41:36 -0500

    Typo in documentation.

M	activerecord/lib/active_record/callbacks.rb

commit 9edeb32	refs/heads/master
Merge: 82cf95c d8dfcac
Author: Rafael Mendonça França 
Date:   2012-06-19 11:20:46 -0700

    Merge pull request #6782 from kennyj/db-rake-structure-dump
    
    Refactor db:structure:dump task.

commit 82cf95c	refs/heads/master
Merge: b2ca26a db03f13
Author: Carlos Antonio da Silva 
Date:   2012-06-19 11:00:54 -0700

    Merge pull request #6784 from msgehard/active_support_cleanup
    
    Remove extra test case.

commit db03f13	refs/heads/master
Author: Mike Gehard 
Date:   2012-06-18 19:23:28 -0600

    Remove extra test case.
    Make the test description better reflect what is happening

M	activesupport/test/clean_backtrace_test.rb

commit b2ca26a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 10:35:26 -0700

    subscribers are per thread, so remove the nested hash access

M	activesupport/lib/active_support/notifications/fanout.rb

commit 0b38152	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 10:33:32 -0700

    documenting concurrency rules for the Fanout class

M	activesupport/lib/active_support/notifications/fanout.rb

commit 644a179	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 10:19:48 -0700

    remove global cache

M	activesupport/lib/active_support/notifications.rb

commit e4de78a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 10:15:48 -0700

    reduce thread locals

M	activesupport/lib/active_support/notifications.rb

commit a01d9da	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-19 10:06:49 -0700

    make the fanout notifier local to the current thread

M	activesupport/lib/active_support/notifications.rb

commit 9bda519	refs/heads/master
Merge: becc3f1 77aca61
Author: Carlos Antonio da Silva 
Date:   2012-06-19 09:46:17 -0700

    Merge pull request #6785 from kennyj/rename_testcase_name
    
    Rename testcase name. It's wrong in the context.

commit 77aca61	refs/heads/master
Author: kennyj 
Date:   2012-06-20 01:42:17 +0900

    Rename testcase name. It's wrong in the context.

M	activerecord/test/cases/mysql_rake_test.rb

commit becc3f1	refs/heads/master
Merge: 1aa052c aca3cc6
Author: Rafael Mendonça França 
Date:   2012-06-19 09:39:13 -0700

    Merge pull request #6783 from kennyj/rename_testname
    
    Rename MySQLTestPurge to MySQLPurgeTest for consistency.

commit aca3cc6	refs/heads/master
Author: kennyj 
Date:   2012-06-20 01:37:31 +0900

    Rename MySQLTestPurge to MySQLPurgeTest for consistency.

M	activerecord/test/cases/mysql_rake_test.rb

commit d8dfcac	refs/heads/master
Author: kennyj 
Date:   2012-06-20 01:28:44 +0900

    Refactor db:structure:dump task.

M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
M	activerecord/test/cases/database_tasks_test.rb
M	activerecord/test/cases/mysql_rake_test.rb
M	activerecord/test/cases/postgresql_rake_test.rb
M	activerecord/test/cases/sqlite_rake_test.rb

commit 1aa052c	refs/heads/master
Merge: 4d69cdb 363ab88
Author: Carlos Antonio da Silva 
Date:   2012-06-19 07:41:44 -0700

    Merge pull request #6779 from simonjefford/db-rake-charset
    
    Refactor db:charset task

commit 363ab88	refs/heads/master
Author: Simon Jefford 
Date:   2012-06-18 20:49:52 +0100

    Refactor db:charset task
    
    In a similar vein to Pat's work on create, drop etc, the db:charset
    task is now a one liner in databases.rake

M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
M	activerecord/test/cases/database_tasks_test.rb
M	activerecord/test/cases/mysql_rake_test.rb
M	activerecord/test/cases/postgresql_rake_test.rb
M	activerecord/test/cases/sqlite_rake_test.rb

commit 4d69cdb	refs/heads/master
Merge: 23c5894 e8f9e66
Author: Carlos Antonio da Silva 
Date:   2012-06-19 05:43:07 -0700

    Merge pull request #6777 from route/logger_in_metal_tests
    
    Added test for case when view doesn't have logger method when using
    ActionController::Metal controller.

commit 23c5894	refs/heads/master
Merge: 2ab9ff5 0b4e8c8
Author: José Valim 
Date:   2012-06-18 23:27:42 -0700

    Merge pull request #6776 from raggi/cache_control
    
    Ensure that cache-control headers are merged

commit e8f9e66	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-06-16 00:52:22 +0400

    Added test for case when view doesn't have logger method when using ActionController::Metal controller.

M	actionpack/test/controller/render_test.rb

commit 2ab9ff5	refs/heads/master
Merge: 69f19b2 17ce0b1
Author: Rafael Mendonça França 
Date:   2012-06-19 01:55:33 -0300

    Merge branch 'acapilleri-update_nested_attributes'
    
    Closes #6675

commit 17ce0b1	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-19 01:53:34 -0300

    Refactor the conditionals

M	activerecord/lib/active_record/attribute_methods/dirty.rb

commit b9ec47d	refs/heads/master
Author: Angelo capilleri 
Date:   2012-06-08 10:09:28 +0200

    Validates_numericality_of is skipped when changing 0 to to non-empty string
    
    This happens when A has_many many B and A accepts_nested_attributes B that has a numeric colum
    with initial 0 value. So a.update_attributes({:b_attributes => { :id => b.id, :numeric => 'foo' }})
    passes the validation test but, the value of :numeric doesn't change.
    his commit forces that the update fails with the above conditions.
    
    Fixes #6393
    Fixes #2331

M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit 69f19b2	refs/heads/master
Merge: df2104e 8593964
Author: Carlos Antonio da Silva 
Date:   2012-06-18 23:54:37 -0300

    Merge pull request #5412 from tilsammans/stored_attributes
    
    Added `stored_attributes` hash which contains the attributes stored using
    ActiveRecord::Store. This allows you to retrieve the list of attributes
    you've defined.
    
        class User < ActiveRecord::Base
          store :settings, accessors: [:color, :homepage]
        end
    
        User.stored_attributes[:settings] # [:color, :homepage]

commit 8593964	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-25 09:42:28 -0300

    Refactor and use class_attribute

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/store.rb

commit 757f723	refs/heads/master
Author: Joost Baaij 
Date:   2012-03-13 16:14:20 +0100

    Remember the stored attributes in a config attribute.
    
    This allows you to retrieve the list of attributes you've defined.
    Usable for e.g. selects in the view, or interators based on the
    attributes you wish to store in the serialized column.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb

commit 94489a2	refs/tags/v3.2.8.rc1
Author: José Valim 
Date:   2012-06-17 01:23:02 -0700

    Merge pull request #6758 from caironoleto/master
    
    Fixing load config in some tasks
    Conflicts:
    	activerecord/lib/active_record/railties/databases.rake

M	activerecord/lib/active_record/railties/databases.rake

commit df2104e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-18 22:59:53 -0300

    Improve the CHANGELOG entry [ci skip]

M	activerecord/CHANGELOG.md

commit 27411a7	refs/heads/master
Merge: 32c65d8 808592b
Author: Carlos Antonio da Silva 
Date:   2012-06-18 21:54:43 -0300

    Merge branch 'hash_with_indifferent_access_fix'
    
    The problem:
    Accessing a HashWithIndifferentAccess does not return the the same object
    that is stored in the hash (i.e. equal?) causing unexpected results:
    
        hash = HashWithIndifferentAccess.new {|h, k| h[k] = []}
        hash[:a] << 1  # => [1]
        hash[:a]       # => [], expected [1]
    
    The cause:
    When a block is provided to generate default values the generated values
    are duped if they are arrays. The duped value is stored in the hash but
    the original value is returned when the hash is accessed.
    
    The fix:
    The duping is there for allowing frozen arrays containing hashes to be
    modified. The fix restricts the duping to this case. Note that if default
    function generates a frozen array an error will be raised on assignment
    before and after the patch.
    
    Closes #3811

commit 808592b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-18 21:52:55 -0300

    Use map! instead of replace + map

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit 8c07696	refs/heads/master
Author: Chris Zetter 
Date:   2011-11-30 15:04:35 +0000

    Fix lookup on HashWithIndifferentAccess for array values.

M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 32c65d8	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-18 21:30:05 -0300

    Refactor Relation#update a bit to avoid an extra Enumerator instance

M	activerecord/lib/active_record/relation.rb

commit b5fc47c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-18 21:14:17 -0300

    Make DatabaseTasks a module with real private methods

M	activerecord/lib/active_record/tasks/database_tasks.rb

commit 2363aaf	refs/tags/v3.2.8.rc1
Merge: ffcecf2 4717c2f
Author: Carlos Antonio da Silva 
Date:   2012-06-18 17:03:08 -0700

    Merge pull request #6649 from route/logger_in_metal_3_2
    
    Logger in metal backport for 3.2

commit 30d8c39	refs/heads/master
Merge: 7fe0f27 c6d86a5
Author: Aaron Patterson 
Date:   2012-06-18 16:52:48 -0700

    Merge pull request #6775 from takoyakikamen/events
    
    make events not use date and time to determine parent_of. fixes #5932

commit 0b4e8c8	refs/heads/master
Author: James Tucker 
Date:   2012-06-18 16:49:03 -0700

    Ensure that cache-control headers are merged
    
    There are several aspects to this commit, that don't well fit into broken down
    commits, so they are detailed here:
    
     * When a user uses response.headers['Cache-Control'] = some_value, then the
       documented convention in ConditionalGet is not adhered to, in this case,
       response.cache_control is ignored due to `return if
       self[CACHE_CONTROL].present?`
     * When a middleware sets cache-control headers that would clobber, they're
       converted to symbols directly, without underscores. This would lead to bugs.
     * Items that would live in :extras if set through expires_in, are placed
       directly in the @cache_control hash, and not respected in many cases
       (somewhat adhering to the aforementioned documentation).
     * Although quite useless, any directive named 'extras' would be ignored.
    
    The general convention applied is that expires_* take precedence, but no longer
    overwrite everything and expires_* are ALWAYS applied, even if the header is
    set.
    
    I am still unhappy about the contents of this commit, and the code in general.
    Ideally it should be refactored to no longer use :extras. I'd likely recommend
    expanding @cache_control into a class, and giving it the power to handle the
    merge in a more efficient fashion. Such a commit would be a larger change that
    could have additional semantic changes for other libraries unless they utilize
    expires_in in very standard ways.

M	actionpack/lib/action_dispatch/http/cache.rb
M	actionpack/test/controller/render_test.rb

commit c6d86a5	refs/heads/master
Author: タコ焼き仮面 
Date:   2012-06-18 16:34:23 -0700

    make events not use date and time to determine parent_of. fixes #5932

M	activesupport/lib/active_support/log_subscriber.rb
M	activesupport/lib/active_support/notifications/instrumenter.rb
M	activesupport/test/notifications_test.rb

commit 55f8b0d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-18 15:00:58 -0500

    add example to AS::Deprecation#deprecate_methods [ci skip]

M	activesupport/lib/active_support/deprecation/method_wrappers.rb

commit 7fe0f27	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-18 16:48:12 -0300

    Add CHANGELOG entry to composed_of removal

M	activerecord/CHANGELOG.md

commit ffcecf2	refs/tags/v3.2.8.rc1
Merge: 83451be 44b313b
Author: Rafael Mendonça França 
Date:   2012-06-18 12:39:42 -0700

    Merge pull request #6742 from steveklabnik/deprecate_composed_of
    
    Deprecate composed of

commit 44b313b	refs/tags/v3.2.8.rc1
Author: Steve Klabnik 
Date:   2012-06-15 11:04:43 +0200

    Deprecating composed_of in ActiveRecord
    
    This feature adds a lot of complication to ActiveRecord for dubious
    value. Let's talk about what it does currently:
    
    class Customer < ActiveRecord::Base
      composed_of :balance, :class_name => "Money", :mapping => %w(balance
    amount)
    end
    
    Instead, you can do something like this:
    
        def balance
          @balance ||= Money.new(value, currency)
        end
    
        def balance=(balance)
          self[:value] = balance.value
          self[:currency] = balance.currency
          @balance = balance
        end
    
    Since that's fairly easy code to write, and doesn't need anything
    extra from the framework, if you use composed_of today, you'll
    have to add accessors/mutators like that.
    
    This feature will be removed in Rails 4.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/aggregations.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/models/customer.rb
M	activerecord/test/models/developer.rb

commit 0517474	refs/heads/master
Merge: fda195d 14fc8b3
Author: Rafael Mendonça França 
Date:   2012-06-18 16:01:32 -0300

    Merge pull request #6743 from steveklabnik/remove_composed_of
    
    Removing composed_of

commit 14fc8b3	refs/heads/master
Author: Steve Klabnik 
Date:   2012-06-15 11:19:40 +0200

    Removing composed_of from ActiveRecord.
    
    This feature adds a lot of complication to ActiveRecord for dubious
    value. Let's talk about what it does currently:
    
    class Customer < ActiveRecord::Base
      composed_of :balance, :class_name => "Money", :mapping => %w(balance amount)
    end
    
    Instead, you can do something like this:
    
        def balance
          @balance ||= Money.new(value, currency)
        end
    
        def balance=(balance)
          self[:value] = balance.value
          self[:currency] = balance.currency
          @balance = balance
        end
    
    Since that's fairly easy code to write, and doesn't need anything
    extra from the framework, if you use composed_of today, you'll
    have to add accessors/mutators like that.
    
    Closes #1436
    Closes #2084
    Closes #3807

M	activerecord/README.rdoc
M	activerecord/lib/active_record.rb
D	activerecord/lib/active_record/aggregations.rb
M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/sanitization.rb
D	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/customer.rb
M	activerecord/test/models/developer.rb

commit e925d56	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-06-18 22:52:15 +0400

    Fix misprint in UrlHelper module

M	actionpack/lib/action_view/helpers/url_helper.rb

commit fda195d	refs/heads/master
Merge: 5683946 5d815bd
Author: Rafael Mendonça França 
Date:   2012-06-18 11:35:38 -0700

    Merge pull request #6772 from yahonda/reset_sequence_name_oracle
    
     ORA-02289: sequence does not exist for `SELECT "BLACK_JOKES_SEQ".NEXTVAL FROM dual`

commit 5d815bd	refs/heads/master
Author: Yasuo Honda 
Date:   2012-06-19 02:12:48 +0900

    Add ensure Joke.reset_sequence_name
    to avoid ORA-02289: sequence does not exist
    for `SELECT "BLACK_JOKES_SEQ".NEXTVAL FROM dual`

M	activerecord/test/cases/base_test.rb

commit 5683946	refs/heads/master
Merge: 8c02918 052e415
Author: Carlos Antonio da Silva 
Date:   2012-06-18 13:06:58 -0300

    Merge branch 'eliminate_notice_messages'
    
    Closes #6754

commit 052e415	refs/heads/master
Author: kennyj 
Date:   2012-06-16 23:44:20 +0900

    Change minimum (default) log level in PostgreSQL to warning.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/connection_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

commit 8c02918	refs/heads/master
Author: José Valim 
Date:   2012-06-18 15:30:53 +0200

    Require thor 0.15.3 onwards

M	railties/lib/rails/generators/base.rb
M	railties/railties.gemspec

commit 961cbcb	refs/heads/master
Merge: ab551be dd9d874
Author: Carlos Antonio da Silva 
Date:   2012-06-18 10:32:58 -0300

    Merge branch 'dp_docs'
    
    Closes #6697

commit 83451be	refs/tags/v3.2.8.rc1
Author: José Valim 
Date:   2012-06-18 16:32:18 +0300

    Use strict_args_position! if available from Thor

M	railties/lib/rails/generators/base.rb

commit dd9d874	refs/heads/master
Author: David Paschich 
Date:   2012-06-09 20:41:11 -0700

    Documentation for where and where! methods on relations.
    
    Based on examples seen in the Rails test suite. [ci skip]

M	activerecord/lib/active_record/relation/query_methods.rb

commit ab551be	refs/heads/master
Merge: a6cda54 7fd7747
Author: Rafael Mendonça França 
Date:   2012-06-17 23:48:50 -0700

    Merge pull request #6767 from frodsan/fix_sqlite_rake_tests
    
    fix invalid syntax and sqlite rake failing tests

commit 7fd7747	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-18 01:44:15 -0500

    fix invalid syntax and sqlite rake failing tests

M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
M	activerecord/test/cases/mysql_rake_test.rb
M	activerecord/test/cases/postgresql_rake_test.rb
M	activerecord/test/cases/sqlite_rake_test.rb

commit a6cda54	refs/heads/master
Merge: b9660bd 588e80f
Author: Rafael Mendonça França 
Date:   2012-06-17 23:19:00 -0700

    Merge pull request #6766 from frodsan/refactor_db_tasks
    
    add :nodoc: to AR::Tasks and update to follow the coding conventions

commit 588e80f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-18 01:16:44 -0500

    add :nodoc: to AR::Tasks and update to follow the coding conventions

M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb

commit b9660bd	refs/heads/master
Merge: 7571408 b6d2997
Author: Rafael Mendonça França 
Date:   2012-06-17 22:40:12 -0700

    Merge pull request #6765 from frodsan/fix_build_railties
    
    Fix build: check if sqlite3 file exists before remove

commit b6d2997	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-18 00:37:02 -0500

    check if sqlite3 file exists before remove

M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb

commit 284ebf2	refs/tags/v3.2.8.rc1
Merge: ed93c86 a556c7e
Author: Rafael Mendonça França 
Date:   2012-06-17 21:40:34 -0700

    Merge pull request #6764 from frodsan/patch-4
    
    bump AS deprecation_horizon to 4.0

commit a556c7e	refs/tags/v3.2.8.rc1
Author: Francesco Rodríguez 
Date:   2012-06-17 23:19:18 -0500

    bump AS deprecation_horizon to 4.0

M	activesupport/lib/active_support/deprecation.rb

commit 7571408	refs/heads/master
Merge: 69881ec 55f8dfd
Author: Jon Leighton 
Date:   2012-06-17 13:38:25 -0700

    Merge pull request #6761 from freelancing-god/db-rake
    
    Get logic out of db rake tasks, and into classes and objects

commit 55f8dfd	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 22:16:45 +0200

    Rails is the default (but now override able) source for environment and path.

M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
M	activerecord/test/cases/database_tasks_test.rb
M	activerecord/test/cases/sqlite_rake_test.rb

commit 8d5710c	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 21:37:44 +0200

    Cleaning up after some warnings, adding slightly higher-level tests.

M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
A	activerecord/test/cases/database_tasks_test.rb
M	activerecord/test/cases/sqlite_rake_test.rb

commit 0b66543	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-17 11:30:20 -0700

    Rewrite some parts of the Rails initialization guide

M	guides/source/initialization.textile

commit 58598d9	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-17 11:23:48 -0700

    Add initialization section

M	guides/source/initialization.textile

commit c7a7294	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-17 11:19:28 -0700

    Rewrite rails command section

M	guides/source/initialization.textile

commit b0da716	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-17 11:14:19 -0700

    Add tip for browsing source code on Github

M	guides/source/initialization.textile

commit 636794e	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-17 11:11:22 -0700

    Not focusing on Passenger for now

M	guides/source/initialization.textile

commit 69881ec	refs/heads/master
Merge: 8690d5a 8247336
Author: José Valim 
Date:   2012-06-17 10:59:55 -0700

    Merge pull request #6762 from frodsan/patch-3
    
    bump AS deprecation_horizon to 4.1

commit 8247336	refs/heads/master
Author: Francesco Rodríguez 
Date:   2012-06-17 12:49:11 -0500

    bump AS deprecation_horizon to 4.1

M	activesupport/lib/active_support/deprecation.rb

commit 5085380	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-17 12:31:40 -0500

    add example to AS::Deprecation#silence [ci skip]

M	activesupport/lib/active_support/deprecation/reporting.rb

commit 4422e03	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 18:09:20 +0200

    One line db:create/db:drop tasks.
    
    Now isn't that better?
    
    And yes, I know that private has no impact on class methods - it's a visual distinction, not a technical one.

M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb

commit bca52b0	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 17:39:12 +0200

    db:drop and some of db:test:purge.

M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
M	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
M	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
M	activerecord/test/cases/mysql_rake_test.rb
M	activerecord/test/cases/postgresql_rake_test.rb
M	activerecord/test/cases/sqlite_rake_test.rb

commit 8690d5a	refs/heads/master
Merge: 625c495 cbca13c
Author: Santiago Pastorino 
Date:   2012-06-17 08:12:04 -0700

    Merge pull request #6760 from kennyj/bump_20120617
    
    Bump tzinfo gem.

commit 625c495	refs/heads/master
Merge: ebe9679 c989160
Author: Santiago Pastorino 
Date:   2012-06-17 08:11:47 -0700

    Merge pull request #6759 from dylanahsmith/only-catch-standard-error
    
    Avoid unnecessary catching of Exception instead of StandardError.

commit cbca13c	refs/heads/master
Author: kennyj 
Date:   2012-06-17 21:50:05 +0900

    Bump tzinfo gem.

M	actionpack/actionpack.gemspec
M	activesupport/activesupport.gemspec

commit e678d41	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 14:03:32 +0200

    db:create for PostgreSQL pulled out into a class.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
A	activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
M	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
A	activerecord/test/cases/postgresql_rake_test.rb

commit d297272	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 13:43:24 +0200

    db:create for MySQL now much cleaner.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/tasks/database_tasks.rb
A	activerecord/lib/active_record/tasks/mysql_database_tasks.rb
A	activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
A	activerecord/test/cases/mysql_rake_test.rb

commit 8aaeaf6	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 11:57:31 +0200

    Confirm connection is not established if file exists.

M	activerecord/test/cases/sqlite_rake_test.rb

commit ebe9679	refs/heads/master
Merge: 7381968 f8df3f3
Author: José Valim 
Date:   2012-06-17 01:23:02 -0700

    Merge pull request #6758 from caironoleto/master
    
    Fixing load config in some tasks

commit c989160	refs/heads/master
Author: Dylan Smith 
Date:   2012-06-17 03:26:10 -0400

    Avoid unnecessary catching of Exception instead of StandardError.

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activesupport/lib/active_support/log_subscriber.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit f8df3f3	refs/heads/master
Author: Cairo Noleto 
Date:   2012-06-16 22:39:59 -0300

    Adding `load_config` task as dependency.
    
    Without this, some tasks won't load configurations
    like custom engines.

M	activerecord/lib/active_record/railties/databases.rake

commit 619453d	refs/heads/master
Author: Pat Allan 
Date:   2012-06-17 01:44:29 +0200

    A beginning of sorts.
    
    Minimal implementation that supports db:create SQLite replacement

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/railties/databases.rake
A	activerecord/lib/active_record/tasks/database_tasks.rb
A	activerecord/test/cases/sqlite_rake_test.rb

commit a7a4e91	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-16 18:07:46 -0500

    change not valid syntax [ci-skip]

M	guides/source/ajax_on_rails.textile

commit 4d2eb49	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-16 17:59:05 -0500

    fix example with data: { disable-with: '' } [ci skip]

M	guides/source/ajax_on_rails.textile

commit 15a6305	refs/heads/master
Author: Gustavo Beathyate 
Date:   2012-06-16 17:57:58 -0500

    update DOM and HTML vs AJAX communication [ci skip]

M	guides/source/ajax_on_rails.textile

commit f20f230	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-16 17:52:26 -0500

    unnecessary reference to link_to_remote method in rails 4.0 [ci skip]

M	guides/source/ajax_on_rails.textile

commit 7ed3890	refs/heads/master
Author: Florent Guilleux 
Date:   2012-06-16 17:41:43 -0500

    Add documentation for ActiveRecord::QueryMethods#reverse_order [ci skip]

M	activerecord/lib/active_record/relation/query_methods.rb

commit a28eda1	refs/heads/master
Author: Ulises Cabanillas 
Date:   2012-06-16 17:32:10 -0500

    Add documentation for ActiveRecord::QueryMethods#offset [ci skip]

M	activerecord/lib/active_record/relation/query_methods.rb

commit 8a8aa67	refs/heads/master
Author: Gustavo Beathyate 
Date:   2012-06-16 17:31:53 -0500

    update AJAX guide intro [ci skip]

M	guides/source/ajax_on_rails.textile

commit d62645c	refs/heads/master
Author: Florent Guilleux 
Date:   2012-06-16 17:16:10 -0500

    Add documentation for ActiveRecord::QueryMethods#limit [ci skip]

M	activerecord/lib/active_record/relation/query_methods.rb

commit ed93c86	refs/tags/v3.2.8.rc1
Merge: 52d0963 909a4a5
Author: Rafael Mendonça França 
Date:   2012-06-16 12:08:01 -0700

    Merge pull request #6756 from arunagw/build_fix_ap
    
    Build fix actionpack

commit 909a4a5	refs/tags/v3.2.8.rc1
Author: Arun Agrawal 
Date:   2012-06-16 15:05:49 -0400

    It should also include text/css => Build Fix

M	actionpack/test/template/asset_tag_helper_test.rb

commit 7381968	refs/heads/master
Merge: bebfa5c ee64abb
Author: Rafael Mendonça França 
Date:   2012-06-16 10:49:20 -0700

    Merge pull request #6755 from kennyj/remove_csv_support
    
    Don't read csv file during executing db:fixtures:load.

commit ee64abb	refs/heads/master
Author: kennyj 
Date:   2012-06-17 02:37:00 +0900

    Don't read csv file during executing db:fixtures:load.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake_test.rb

commit 52d0963	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-16 09:09:38 -0700

    Merge pull request #6752 from steveklabnik/fix_5680
    
    Respect absolute paths in compute_source_path.

M	actionpack/lib/action_view/asset_paths.rb
A	actionpack/test/fixtures/public/foo/baz.css
M	actionpack/test/template/asset_tag_helper_test.rb

commit bebfa5c	refs/heads/master
Merge: 27846d8 afb053b
Author: Rafael Mendonça França 
Date:   2012-06-16 09:09:38 -0700

    Merge pull request #6752 from steveklabnik/fix_5680
    
    Respect absolute paths in compute_source_path.

commit afb053b	refs/heads/master
Author: Steve Klabnik 
Date:   2012-06-16 12:02:35 +0200

    Respect absolute paths in compute_source_path.
    
    When using compute_source_path to determine the full path of an
    asset, if our source begins with '/', we don't want to include
    the directory. Examples are illustrative:
    
    > compute_source_path("foo", "stylesheets", "css")
    => "/Users/steve/src/my_app/public/stylesheets/foo.css"
    > compute_source_path("/foo", "stylesheets", "css")
    => "/Users/steve/src/my_app/public/foo.css"
    
    Before this patch, the second example would return the same as the
    first.
    
    Fixes #5680.

M	actionpack/lib/action_view/asset_paths.rb
A	actionpack/test/fixtures/public/foo/baz.css
M	actionpack/test/template/asset_tag_helper_test.rb

commit 27846d8	refs/heads/master
Merge: d28ba0d c779a47
Author: José Valim 
Date:   2012-06-16 04:45:48 -0700

    Merge pull request #6753 from schnittchen/patch-1
    
    Documentation: "asynchronously" is misleading here

commit c779a47	refs/heads/master
Author: Schnittchen 
Date:   2012-06-16 14:35:55 +0300

    Documentation: make it clearer that subscribers are not notified asynchronously, but saved for later use.

M	activesupport/lib/active_support/notifications.rb

commit f713bf6	refs/heads/master
Author: Andrey Vakarev 
Date:   2012-06-16 02:32:59 +0300

    Extend assets cache store section in Assets Pipeline Guide [ci skip]

M	guides/source/asset_pipeline.textile

commit 4717c2f	refs/tags/v3.2.8.rc1
Author: Dmitry Vorotilin 
Date:   2012-06-16 00:52:22 +0400

    Added test for case when view doesn't have logger method when using ActionController::Metal controller.

M	actionpack/test/controller/render_test.rb

commit 3b1ea3d	refs/tags/v3.2.8.rc1
Author: Dmitry Vorotilin 
Date:   2012-06-05 11:03:00 +0400

    ActionController::Metal doesn't have logger method, check it and then delegate

M	actionpack/lib/action_view/helpers/controller_helper.rb

commit b5cc89a	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-06-16 01:49:44 +0530

    Add rdoc to phone_field
    
    [API docs](http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-phone_field) for `phone_field` provide no information on what the method actually does. no description nor access to source code. so added this

M	actionpack/lib/action_view/helpers/form_helper.rb

commit d28ba0d	refs/heads/master
Merge: 8b35a23 fce1735
Author: Rafael Mendonça França 
Date:   2012-06-15 12:52:05 -0700

    Merge pull request #6748 from marcandre/dasherize_doc
    
    Fix doc example for dasherize

commit fce1735	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-06-15 15:50:08 -0400

    Fix doc example for dasherize

M	activesupport/lib/active_support/core_ext/string/inflections.rb

commit 8b35a23	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-15 11:36:21 -0700

    TestCase does not need to be loaded when loading the framework

M	actionpack/lib/action_view.rb
M	railties/test/application/configuration_test.rb

commit 65df7b3	refs/heads/master
Author: Jon Leighton 
Date:   2012-06-15 19:12:21 +0100

    no need to define methods in included hook

M	activerecord/lib/active_record/attribute_methods.rb

commit 641611a	refs/heads/master
Author: Jon Leighton 
Date:   2012-06-15 19:03:41 +0100

    Fix deprecation warnings when using config.active_record.mass_assignment_sanitizer=

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/test/cases/mass_assignment_security_test.rb

commit ae3767c	refs/heads/master
Author: Jon Leighton 
Date:   2012-06-15 18:04:13 +0100

    Fix observers with AR::Model

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/railtie.rb
M	railties/test/application/configuration_test.rb

commit a205bf8	refs/heads/master
Author: Jon Leighton 
Date:   2012-06-15 16:01:38 +0100

    Fix config.active_record.whitelist_attributes with AR::Model

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/railtie.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	railties/test/application/configuration_test.rb

commit e030f26	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-25 15:58:16 +0100

    Simplify AR configuration code.
    
    Get rid of ActiveModel::Configuration, make better use of
    ActiveSupport::Concern + class_attribute, etc.

M	activemodel/lib/active_model.rb
M	activemodel/lib/active_model/attribute_methods.rb
D	activemodel/lib/active_model/configuration.rb
M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/validations.rb
D	activemodel/test/cases/configuration_test.rb
M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/callbacks.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_handling.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/lib/active_record/explain.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/lib/active_record/railtie.rb
M	activerecord/lib/active_record/readonly_attributes.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/scoping/default.rb
M	activerecord/lib/active_record/serialization.rb
M	activerecord/lib/active_record/timestamp.rb
M	activerecord/test/active_record/connection_adapters/fake_adapter.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb

commit 61826bc	refs/heads/master
Author: Jon Leighton 
Date:   2012-06-15 12:09:19 +0100

    refactor

M	activerecord/lib/active_record/railtie.rb

commit 62f6277	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-15 00:31:06 -0500

    add example to ActiveModel::Validations#validators [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/lib/active_model/validations.rb

commit 3c65c4c	refs/heads/master
Author: Casey Watts 
Date:   2012-06-15 12:25:17 -0400

    included another upgrading pinfall - accidentally having duplicate js files

M	guides/source/asset_pipeline.textile

commit 9abe098	refs/heads/master
Merge: c1b1956 c42a7a0
Author: Carlos Antonio da Silva 
Date:   2012-06-15 09:14:19 -0700

    Merge pull request #6646 from kennyj/fix_3470
    
    Support unicode character route directly in config/routes.rb. Fix #3470.

commit c42a7a0	refs/heads/master
Author: kennyj 
Date:   2012-06-06 00:59:01 +0900

    Support unicode character route in config/routes.rb.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/routing.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	guides/source/routing.textile
M	guides/source/upgrading_ruby_on_rails.textile

commit c1b1956	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-14 21:58:05 -0300

    Use status, content_type, body method signature for render too

M	actionpack/lib/action_dispatch/middleware/public_exceptions.rb

commit 9611d56	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-06-14 21:28:37 -0300

    Refactor public exceptions to reuse render format method

M	actionpack/lib/action_dispatch/middleware/public_exceptions.rb

commit a8e22ae	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-14 20:24:32 -0300

    Remove unneded tests.
    
    Before b081f6b59fb3f15d12043072ad9b331ffd2bc56e, this test are
    asserting that update_attribute does the dirty tracking. Since we
    deprecated this method and update_column write in the database directly
    this tests will always fail.

M	activerecord/test/cases/dirty_test.rb

commit 46a2917	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-14 19:27:13 -0300

    Remove unneded tests.
    
    Before 7f4b0a1231bf3c65db2ad4066da78c3da5ffb01, this test are asserting
    that update_attribute does the dirty tracking. Since we remove this
    method and update_column write in the database directly this tests will
    always fail>

M	activerecord/test/cases/dirty_test.rb

commit 508834c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-14 19:21:58 -0300

    Add CHANGELOG entry to the uuid datatype support to PostgreSQL adpter

M	activerecord/CHANGELOG.md

commit 57a952a	refs/heads/master
Merge: 86af7d3 12e9a75
Author: Rafael Mendonça França 
Date:   2012-06-14 18:55:10 -0300

    Merge pull request #6713 from etehtsea/activerecord-uuid
    
    Add uuid datatype support to PostgreSQL adapter

commit 86af7d3	refs/heads/master
Author: Xavier Noria 
Date:   2012-06-14 23:28:16 +0200

    registers the removal of update_attribute in the CHANGELOG

M	activerecord/CHANGELOG.md

commit 2109fd5	refs/tags/v3.2.8.rc1
Author: Xavier Noria 
Date:   2012-06-14 23:26:06 +0200

    registers the deprecation of update_attribute in the CHANGELOG

M	activerecord/CHANGELOG.md

commit 776fd51	refs/heads/master
Merge: b92860f a7f4b0a
Author: Xavier Noria 
Date:   2012-06-14 14:19:11 -0700

    Merge pull request #6738 from steveklabnik/master
    
    Remove update_attribute.

commit 63bcfbb	refs/tags/v3.2.8.rc1
Merge: e7d1849 b081f6b
Author: Xavier Noria 
Date:   2012-06-14 14:18:25 -0700

    Merge pull request #6739 from steveklabnik/3-2-stable
    
    Deprecate update_attribute

commit b92860f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-14 10:55:30 -0700

    adding a test for #6459

M	actionpack/test/controller/routing_test.rb

commit b081f6b	refs/tags/v3.2.8.rc1
Author: Steve Klabnik 
Date:   2012-06-14 18:46:38 +0200

    Deprecate update_attribute.
    
    Historically, update_attribute and update_attributes are similar, but
    with one big difference: update_attribute does not run validations.
    These two methods are really easy to confuse given their similar
    names. Therefore, update_attribute is being deprecated in favor of
    update_column, and will be removed in Rails 4.
    
    See the discussion on rails-core here:
    https://groups.google.com/d/topic/rubyonrails-core/BWPUTK7WvYA/discussion

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit e7d1849	refs/tags/v3.2.8.rc1
Author: Aaron Patterson 
Date:   2012-06-14 10:55:30 -0700

    adding a test for #6459

M	actionpack/test/controller/routing_test.rb

commit 906215f	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-14 23:59:21 +0530

    fix some formatting [ci skip]

M	guides/source/active_support_core_extensions.textile

commit 10da140	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-14 10:56:59 -0700

    Revert "AV::TestCase does not need to be loaded when eagerly loading the"
    
    This reverts commit f5e7cb84cd377feb1b60c5356ce02123e9c94380.

M	actionpack/lib/action_view.rb

commit 28e744d	refs/tags/v3.1.7
Author: Aaron Patterson 
Date:   2012-06-14 10:55:30 -0700

    adding a test for #6459

M	actionpack/test/controller/routing_test.rb

commit ff859f5	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-14 23:14:32 +0530

    modify middleware docs [ci skip]

M	guides/source/rails_on_rack.textile

commit cd4a0a3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-14 10:40:12 -0700

    we raise a subclass of LoadError, so rescue that

M	actionpack/test/abstract/helper_test.rb

commit c04d02b	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-14 14:28:42 -0300

    Add docs about how to remove some middleware

M	guides/source/rails_on_rack.textile

commit c1474ff	refs/heads/master
Merge: f5e7cb8 5795efa
Author: Vijay Dev 
Date:   2012-06-14 22:52:38 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 5795efa	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-14 22:51:29 +0530

    move the info about cosmetic changes to a diff location [ci skip]

M	guides/source/contributing_to_ruby_on_rails.textile

commit 0a83e89	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-14 22:45:42 +0530

    moar copy edits [ci skip]

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 6efc5bf	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-14 22:37:17 +0530

    copy editing [ci skip]

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit a7f4b0a	refs/heads/master
Author: Steve Klabnik 
Date:   2012-06-14 18:54:22 +0200

    Remove update_attribute.
    
    Historically, update_attribute and update_attributes are similar, but
    with one big difference: update_attribute does not run validations.
    These two methods are really easy to confuse given their similar
    names. Therefore, update_attribute is being removed in favor of
    update_column.
    
    See the thread on rails-core here:
    https://groups.google.com/forum/?fromgroups#!topic/rubyonrails-core/BWPUTK7WvYA

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit 3b55b7f	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-14 22:15:55 +0530

    Revert "Add a note about JavaScript runtime"
    
    This reverts commit d63b69ba7f2b9111aeb04b50884949c2a4b6e584.

M	guides/source/contributing_to_ruby_on_rails.textile

commit f5e7cb8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-14 09:42:24 -0700

    AV::TestCase does not need to be loaded when eagerly loading the
    framework

M	actionpack/lib/action_view.rb

commit b9b9e39	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-14 09:37:45 -0700

    i suck, fixing error message

M	actionpack/lib/abstract_controller/helpers.rb

commit 68021d3	refs/heads/master
Merge: 99c9d18 bc7c0b5
Author: José Valim 
Date:   2012-06-14 09:35:36 -0700

    Merge pull request #6671 from mrbrdo/master
    
    Bad Regexp exploits "fix" master branch

commit bc7c0b5	refs/heads/master
Author: MrBrdo 
Date:   2012-06-08 00:08:51 +0200

    prevent users from unknowingly using bad regexps that can compromise security (http://homakov.blogspot.co.uk/2012/05/saferweb-injects-in-various-ruby.html)

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/test/cases/validations/format_validation_test.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb
M	guides/source/active_model_basics.textile
M	guides/source/security.textile

commit 32664e7	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-14 09:05:10 -0700

    Add server.run example
    
    This is the last chapter before I go back and make sure the guide is
    complete/review

M	guides/source/initialization.textile

commit 99c9d18	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-14 09:01:43 -0700

    Wrap up missing helper exceptions
    
    The `path` method on missing helper errors is inconsistent with the
    implementation on LoadError in Ruby 2.0.  Wrap up the missing helper
    exceptions so that the inconsistent behavior is mirrored in Ruby 2.0
    (until we can figure out *why* it's inconsistent).

M	actionpack/lib/abstract_controller/helpers.rb

commit 12e9a75	refs/heads/master
Author: Konstantin Shabanov 
Date:   2012-06-12 18:10:08 +0400

    Add uuid type support to PostgreSQL adapter

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/column_definition_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/schema/postgresql_specific_schema.rb

commit f278b06	refs/heads/master
Author: Xavier Noria 
Date:   2012-06-14 11:42:01 +0200

    removes item in the Active Record CHANGELOG
    
    That change to update_attribute was considered
    to be too subtle and was reverted in 30ea923
    just before Rails 3 shipped. Later we introduced
    update_column (Rails 3.1).

M	activerecord/CHANGELOG.md

commit 666a48a	refs/tags/v3.1.7
Author: Xavier Noria 
Date:   2012-06-14 11:42:01 +0200

    removes item in the Active Record CHANGELOG
    
    That change to update_attribute was considered
    to be too subtle and was reverted in 30ea923
    just before Rails 3 shipped. Later we introduced
    update_column (Rails 3.1).

M	activerecord/CHANGELOG.md

commit 5d50bef	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-13 18:01:03 -0700

    using hax to fix tests on Ruby 2.0

M	actionpack/lib/abstract_controller/helpers.rb

commit 6d7e374	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-13 20:21:35 -0300

    Fix build

M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit b5d5f96	refs/heads/master
Merge: 459de6f e995734
Author: Santiago Pastorino 
Date:   2012-06-13 14:40:53 -0700

    Merge pull request #6721 from homakov/patch-2
    
    These lines don't help to mitigate CVE. They only turn [nil] into nil, w...

commit f48c576	refs/heads/master
Author: Nathan Long 
Date:   2012-06-13 15:49:31 -0400

    Show how to add attributes to options

M	guides/source/form_helpers.textile

commit 7f93791	refs/tags/v3.2.8.rc1
Author: Santiago Pastorino 
Date:   2012-06-13 16:14:11 -0300

    ActionController::Caching depends on RackDelegation and AbstractController::Callbacks

M	actionpack/lib/action_controller/caching.rb
A	actionpack/test/metal/caching_test.rb

commit 459de6f	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-13 16:14:11 -0300

    ActionController::Caching depends on RackDelegation and AbstractController::Callbacks

M	actionpack/lib/action_controller/caching.rb
A	actionpack/test/metal/caching_test.rb

commit 62f81f4	refs/tags/v2.3.15
Author: Justin Collins 
Date:   2012-06-01 19:02:11 -0700

    Fix SQL injection via nested hashes in conditions

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/finder_test.rb

commit 18faa5b	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-13 08:59:14 -0700

    Show when Rack middlewares are executed

M	guides/source/initialization.textile

commit 1f07ff9	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-13 08:48:45 -0700

    Add initialize! explanation

M	guides/source/initialization.textile

commit 81fd371	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-13 08:34:48 -0700

    Close explanation of config/environment

M	guides/source/initialization.textile

commit e995734	refs/heads/master
Author: Egor Homakov 
Date:   2012-06-13 17:49:29 +0400

    These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o them [nil] turns into [] and that is quite innocent.
    generated  SQL - `IN (NULL)`
    compact! did all the job.

M	actionpack/lib/action_dispatch/http/request.rb

commit def7543	refs/tags/v3.0.15 (tag: v3.0.15)
Author: Aaron Patterson 
Date:   2012-06-12 20:05:46 -0700

    3.0.15

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit a5a0338	refs/tags/v3.0.15
Author: Aaron Patterson 
Date:   2012-06-12 17:05:57 -0700

    we haven't monkey patched the Result class, so use each

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 56a1bb2	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-12 16:19:51 -0700

    raise the same exception in order to keep path info
    
    Ruby 2.0.0 implements LoadError#path, but newly raised load errors will
    not contain the path information.  Replace the error message, copy
    blame, and rereaise the same exception object

M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/dependencies_test.rb

commit 966371a	refs/tags/v3.2.8.rc1
Merge: 10cdbbc eed1cfe
Author: Rafael Mendonça França 
Date:   2012-06-12 15:18:56 -0700

    Merge pull request #6716 from frodsan/patch-2
    
    Fix Build

commit eed1cfe	refs/tags/v3.2.8.rc1
Author: Francesco Rodríguez 
Date:   2012-06-12 17:10:10 -0500

    Fix build

M	activemodel/test/models/book.rb

commit 00d8ee8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-12 14:34:44 -0700

    fixing security email address

M	RELEASING_RAILS.rdoc

commit 2be40a8	refs/heads/master
Merge: 6ff78a1 24894fc
Author: Aaron Patterson 
Date:   2012-06-12 14:25:45 -0700

    Merge branch 'master-sec'
    
    * master-sec:
      Array parameters should not contain nil values.

commit 10cdbbc	refs/tags/v3.2.8.rc1
Merge: 5dd2cfc 8381d39
Author: Aaron Patterson 
Date:   2012-06-12 14:25:27 -0700

    Merge branch '3-2-stable-rel' into 3-2-stable
    
    * 3-2-stable-rel:
      updating changelogs
      bumping version numbers
      updating changelogs with security fixes
      updating changelogs
      Array parameters should not contain nil values.
      Additional fix for CVE-2012-2661

commit 24894fc	refs/heads/master
Author: Aaron Patterson 
Date:   2012-06-10 22:44:54 -0500

    Array parameters should not contain nil values.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit 4be9dbf	refs/tags/v3.0.14 (tag: v3.0.14)
Author: Aaron Patterson 
Date:   2012-06-12 14:05:21 -0700

    updating changelogs

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 63dce16	refs/tags/v3.1.6 (tag: v3.1.6)
Author: Aaron Patterson 
Date:   2012-06-12 14:03:38 -0700

    updating changelogs

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 8381d39	refs/tags/v3.2.6 (tag: v3.2.6)
Author: Aaron Patterson 
Date:   2012-06-12 14:02:40 -0700

    updating changelogs

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 5dd2cfc	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-12 11:43:12 -0700

    Merge pull request #6715 from arunagw/add_asserts
    
    Need a assert here in tests

M	activerecord/test/cases/mass_assignment_security_test.rb

commit 6ff78a1	refs/heads/master
Merge: a268d2d ddf58fa
Author: Rafael Mendonça França 
Date:   2012-06-12 11:43:12 -0700

    Merge pull request #6715 from arunagw/add_asserts
    
    Need a assert here in tests

commit ddf58fa	refs/heads/master
Author: Arun Agrawal 
Date:   2012-06-12 14:39:40 -0400

    Need a assert here in tests

M	activerecord/test/cases/mass_assignment_security_test.rb

commit 32709ea	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-12 10:45:19 -0700

    Merge pull request #6676 from aurelian/master
    
    Don't assign the attributes if the list is empty

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/test/cases/mass_assignment_security_test.rb

commit a268d2d	refs/heads/master
Merge: fa4b029 79c8c4f
Author: Rafael Mendonça França 
Date:   2012-06-12 10:45:19 -0700

    Merge pull request #6676 from aurelian/master
    
    Don't assign the attributes if the list is empty

commit 6522a12	refs/tags/v3.2.8.rc1
Merge: 0ccdeeb b97e0a1
Author: Rafael Mendonça França 
Date:   2012-06-12 10:21:52 -0700

    Merge pull request #6682 from acapilleri/dup_validation_fix_backport_for_1_9_3
    
    Dup validation fix backport for 1 9 3

commit 5dd4358	refs/heads/master
Author: Andrew Hooker 
Date:   2012-06-12 13:55:00 -0300

    Adding note about cosmetic changes not being accepted

M	guides/source/contributing_to_ruby_on_rails.textile

commit fa4b029	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-12 13:41:44 -0300

    content_type is already a Mime::Type object

M	actionpack/lib/action_dispatch/middleware/public_exceptions.rb

commit 0e06e8a	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-12 13:24:56 -0300

    This consider_all_requests_local doesn't make sense
    
    This middleware is only for Public Exceptions.
    This follows bd8c0b8a

M	actionpack/lib/action_dispatch/middleware/public_exceptions.rb
M	actionpack/test/controller/show_exceptions_test.rb

commit b97e0a1	refs/tags/v3.2.8.rc1
Author: Angelo capilleri 
Date:   2012-06-08 19:39:17 +0200

    Fix the the backport of the object dup with the ruby 1.9.3p194.
    
    At the end of initialize_dup was added the call to super if it exists,
    so it also works with 1.8.7 where initialize_dup doesn't exist.
    This issu was introduced with the pull request #6324

M	activemodel/lib/active_model/validations.rb
M	activemodel/test/cases/validations_test.rb
A	activemodel/test/models/book.rb

commit 14ccb0d	refs/heads/master
Merge: 122f6de 34492af
Author: Rafael Mendonça França 
Date:   2012-06-12 06:36:01 -0700

    Merge pull request #6444 from kennyj/create_extenstion_hstore
    
    Create hstore extension when building PostgreSQL databases (for rails contributor).

commit 595b8bc	refs/heads/master
Author: Jakub Kuźma 
Date:   2012-06-12 13:00:17 +0200

    fixed http token authentication formatting

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 34492af	refs/heads/master
Author: kennyj 
Date:   2012-05-23 03:37:02 +0900

    Create hstore extension when building PostgreSQL databases.

M	activerecord/Rakefile
M	guides/source/contributing_to_ruby_on_rails.textile

commit 122f6de	refs/heads/master
Merge: 5ea2b11 a599c03
Author: José Valim 
Date:   2012-06-12 02:34:07 -0700

    Merge pull request #6711 from takkanm/fix-warning-LoadError-path-method
    
    fix method redefined warning in Ruby2.0

commit a599c03	refs/heads/master
Author: Mitsutaka Mimura 
Date:   2012-06-12 17:37:56 +0900

    fix method redefined warning in Ruby2.0
    
    Ruby2.0 already has LoadError#path.

M	activesupport/lib/active_support/core_ext/load_error.rb

commit 5ea2b11	refs/heads/master
Author: José Valim 
Date:   2012-06-12 10:36:13 +0200

    Stop relying on mutable structures in the FileUpdateChecker

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/i18n_railtie.rb

commit e6ea3fe	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-11 21:54:12 -0300

    Remove warnings and unused code

M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/query_cache_test.rb

commit 3fb762a	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-06-11 16:08:58 -0700

    bumping to 3.0.14

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 8cecac7	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-06-11 16:07:42 -0700

    updating changelogs with security fixes

M	actionpack/CHANGELOG
M	activerecord/CHANGELOG

commit 2c95963	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-06-11 16:02:50 -0700

    bumping versions in the CHANGELOG

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit b9e048c	refs/tags/v3.0.14
Merge: 6c0c40b 2f3bc04
Author: Aaron Patterson 
Date:   2012-06-11 15:56:53 -0700

    Merge branch '3-0-stable-sec' into 3-0-stable-rel
    
    * 3-0-stable-sec:
      Array parameters should not contain nil values.
      Additional fix for CVE-2012-2661

commit 6c0c40b	refs/tags/v3.0.14
Author: kennyj 
Date:   2012-03-03 22:25:15 +0900

    Fix GH #3163. Should quote database on mysql/mysql2.
    
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb

commit 4e7d571	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-06-11 15:48:26 -0700

    bumping version numbers

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit bee42f3	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-06-11 15:48:04 -0700

    updating changelogs with security fixes

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit 75d039f	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-06-11 15:46:26 -0700

    adding version number to changelogs

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 64e30e8	refs/tags/v3.1.6
Merge: 3e2c00a f4174ad
Author: Aaron Patterson 
Date:   2012-06-11 15:42:40 -0700

    Merge branch '3-1-stable-sec' into 3-1-stable-rel
    
    * 3-1-stable-sec:
      Array parameters should not contain nil values.
      Additional fix for CVE-2012-2661

commit ee4209a	refs/tags/v3.2.6
Author: Aaron Patterson 
Date:   2012-06-11 15:40:36 -0700

    bumping version numbers

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit ceb8ec3	refs/tags/v3.2.6
Author: Aaron Patterson 
Date:   2012-06-11 15:39:59 -0700

    updating changelogs with security fixes

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit 301974a	refs/tags/v3.2.6
Author: Aaron Patterson 
Date:   2012-06-11 15:32:24 -0700

    updating changelogs

M	actionmailer/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 07d3466	refs/heads/master
Author: Sam Oliver 
Date:   2012-06-11 23:29:59 +0100

    Fix cache_store configuration example

M	guides/source/caching_with_rails.textile

commit 65d584c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-11 17:45:37 -0300

    No need to cache table metadata in advance now that #6683 was merged.

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 3e2c00a	refs/tags/v3.1.6
Author: Rafael Mendonça França 
Date:   2012-06-11 18:09:09 -0300

    Mysql and Mysql2 adapters accepts only two arguments in the tables
    method.
    
    Fix build http://travis-ci.org/#!/rails/rails/builds/1594492

M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit bd8c0b8	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-11 16:58:24 -0300

    Return proper format on exceptions

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/middleware/public_exceptions.rb
M	actionpack/test/controller/show_exceptions_test.rb

commit 38edea0c	refs/tags/v3.2.6
Author: Aaron Patterson 
Date:   2012-06-10 22:44:54 -0500

    Array parameters should not contain nil values.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit cc2903d	refs/tags/v3.2.6
Author: Ernie Miller 
Date:   2012-06-08 16:32:08 -0400

    Additional fix for CVE-2012-2661
    
    While the patched PredicateBuilder in 3.1.5 prevents a user
    from specifying a table name using the `table.column` format,
    it doesn't protect against the nesting of hashes changing the
    table context in the next call to build_from_hash. This fix
    covers this case as well.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/relation/where_test.rb

commit 174f36a	refs/heads/master
Merge: 2d1ca38 02b2335
Author: Rafael Mendonça França 
Date:   2012-06-11 17:26:33 -0300

    Merge pull request #6492 from pmahoney/fair-connection-pool2
    
    Fair connection pool2
    
    Conflicts:
    	activerecord/test/cases/associations/eager_test.rb

commit 2d1ca38	refs/heads/master
Merge: c53ff33 998ef50
Author: Rafael Mendonça França 
Date:   2012-06-11 13:04:43 -0700

    Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125
    
    current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6

commit 998ef50	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-12 04:50:30 +0900

    current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6

M	activerecord/test/cases/query_cache_test.rb

commit c53ff33	refs/heads/master
Merge: 0d1f98c 2d3e488
Author: José Valim 
Date:   2012-06-11 12:37:05 -0700

    Merge pull request #6708 from amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted
    
    ignore .gitignore'd files in rake test:uncomitted

commit 2d3e488	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-12 03:29:48 +0900

    ignore .gitignore'd files in rake test:uncomitted

M	railties/lib/rails/test_unit/testing.rake

commit 8e6ed58	refs/tags/v3.1.6
Author: kennyj 
Date:   2012-03-07 03:17:14 +0900

    Change the string to use in  test case.
    
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb

M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 023eaf8	refs/tags/v3.1.6
Author: kennyj 
Date:   2012-03-03 22:25:15 +0900

    Fix GH #3163. Should quote database on mysql/mysql2.
    
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 0ccdeeb	refs/tags/v3.2.8.rc1
Author: kennyj 
Date:   2012-03-07 03:17:14 +0900

    Change the string to use in  test case.
    
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb

M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 22994b2	refs/tags/v3.2.8.rc1
Author: kennyj 
Date:   2012-03-03 22:25:15 +0900

    Fix GH #3163. Should quote database on mysql/mysql2.
    
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 0d1f98c	refs/heads/master
Merge: 0e97aa2 73d1046
Author: Rafael Mendonça França 
Date:   2012-06-11 10:52:25 -0700

    Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix
    
    TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9

commit 0391ae9	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-11 09:40:39 -0700

    Merge pull request #6690 from suginoy/fix-templates-copy
    
    Fix: 'rake rails:templates:copy' doesn't work
    Conflicts:
    	railties/test/application/rake_test.rb

M	railties/lib/rails/tasks/framework.rake
M	railties/test/application/rake_test.rb

commit 73d1046	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-12 02:41:58 +0900

    TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9

M	activerecord/test/cases/migration/column_attributes_test.rb

commit 0e97aa2	refs/heads/master
Merge: 5304ae1 c74662a
Author: Rafael Mendonça França 
Date:   2012-06-11 10:37:02 -0700

    Merge pull request #6705 from ganeshkumar/string_method_changes
    
    both string and symbol will be interpolated as string no need to convert to_s

commit 588bb6b	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-12 02:29:21 +0900

    Range#cover? is not implemented in AS now

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb

commit c74662a	refs/heads/master
Author: ganesh 
Date:   2012-06-11 22:57:11 +0530

    both string and sumbol will be interpolated as string no need to convert to_s

M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/test/dispatch/mime_type_test.rb

commit 5304ae1	refs/heads/master
Merge: 04a7426 fa2af42
Author: José Valim 
Date:   2012-06-11 09:55:20 -0700

    Merge pull request #6704 from amatsuda/lambda_respond_to_binding
    
    Proc always respond_to :binding

commit fa2af42	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-12 01:43:28 +0900

    Proc always respond_to :binding

M	activesupport/test/test_test.rb

commit 04a7426	refs/heads/master
Merge: 2eb4ebe 358c5e8
Author: Rafael Mendonça França 
Date:   2012-06-11 09:40:39 -0700

    Merge pull request #6690 from suginoy/fix-templates-copy
    
    Fix: 'rake rails:templates:copy' doesn't work

commit 358c5e8	refs/heads/master
Author: kennyj 
Date:   2012-06-10 23:26:55 +0900

    Added a testcase for #6690.

M	railties/test/application/rake_test.rb

commit 2eb4ebe	refs/heads/master
Merge: b5d82e2 fa1ea34
Author: Rafael Mendonça França 
Date:   2012-06-11 11:56:20 -0300

    Merge pull request #6699 from takkanm/fix-character-class-duplicated-range-warning
    
    fix warning in Ruby2.0.0

commit a6e4c0f	refs/heads/master
Author: chrismcc 
Date:   2012-06-11 09:54:54 -0300

    Fixed typo.

M	activerecord/lib/active_record/store.rb

commit fa1ea34	refs/heads/master
Author: takkanm 
Date:   2012-06-11 13:25:46 +0900

    fix warning in Ruby2.0.0
    
    ```
    rails/activesupport/lib/active_support/multibyte/chars.rb:136: warning:
    character class has duplicated range: /\b('?[\S])/
    ```

M	activesupport/lib/active_support/multibyte/chars.rb

commit f4174ad	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-06-10 22:44:54 -0500

    Array parameters should not contain nil values.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit 2f3bc04	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-06-10 22:44:54 -0500

    Array parameters should not contain nil values.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit c9f27e3	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-10 19:49:02 -0700

    Merge pull request #6698 from yahonda/address_ora_911_master
    
    Address ORA-00911 errors because of the heading underscore.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit b5d82e2	refs/heads/master
Merge: f48e767 a0363e2
Author: Rafael Mendonça França 
Date:   2012-06-10 19:49:02 -0700

    Merge pull request #6698 from yahonda/address_ora_911_master
    
    Address ORA-00911 errors because of the heading underscore.

commit a0363e2	refs/heads/master
Author: Yasuo Honda 
Date:   2012-06-11 11:41:07 +0900

    Address ORA-00911 errors because of the heading underscore.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 57170af	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-10 18:45:03 -0700

    Remove initialization explanation for each framework
    
    We no longer go through all the files and  frameworks that are required
    by Rails. Instead we will only focus on the code that gets executed as
    well as important concepts.

M	guides/source/initialization.textile

commit 3c025de	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-10 18:26:54 -0700

    Add config/application to initialization guide

M	guides/source/initialization.textile

commit 50d9781	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-10 18:20:40 -0700

    Rewrite Rails server initialization section

M	guides/source/initialization.textile

commit 028f5b1	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-10 18:07:04 -0700

    Refactor Action Dispatch description to be more concise

M	guides/source/initialization.textile

commit bbec883	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-10 18:03:41 -0700

    Merge pull request #6521 from Empact/throw-result
    
    Fix that #exists? can blow up with ThrowResult exception
    Conflicts:
    	activerecord/lib/active_record/relation/finder_methods.rb

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit f48e767	refs/heads/master
Merge: d17fa45 340a93f
Author: Rafael Mendonça França 
Date:   2012-06-10 18:03:41 -0700

    Merge pull request #6521 from Empact/throw-result
    
    Fix that #exists? can blow up with ThrowResult exception

commit fb5d928	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-10 17:55:12 -0700

    Change initialization guide introduction
    
    We will no longer cover every single file that is loaded by Rails, as
    this would be too difficult and time consuming to maintain.
    
    We also expect the reader to know about rails server at this point.

M	guides/source/initialization.textile

commit 340a93f	refs/heads/master
Author: Ben Woosley 
Date:   2012-05-28 09:52:27 -0700

    Fix that #exists? raises ThrowResult when called with an empty limited
    reflection.
    
    ActiveRecord::FinderMethods#construct_limited_ids_condition will raise
    ThrowResult if the limited reflection comes back empty. The other callers
    of #construct_limited_ids_condition handle this exception (more specifically,
    the callers of construct_relation_for*), but #exists? didn't until now.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit d17fa45	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-10 17:23:57 -0300

    Remove bundle exec from the exception message

M	activerecord/lib/active_record/migration.rb

commit 9e6eb8b	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-10 17:22:06 -0300

    Remove warning

M	activerecord/test/cases/migration_test.rb

commit 179276e	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-10 17:04:15 -0300

    Add test to column alias in `exists?` SQL.
    
    This behavior was added in dd286a4c735dac1db8c9262581c7f29c44d1f695
    
    Closes #1139.
    
    Fixes #2553, #1141, #1623 and #2062.

M	activerecord/test/cases/finder_test.rb

commit dd286a4	refs/tags/v3.2.8.rc1
Author: iaddict 
Date:   2011-05-19 02:00:08 -0700

    Minimal change to query generation of exists? that makes SQLServer and others happy that do not work without a column alias.
    Conflicts:
    	activerecord/lib/active_record/relation/finder_methods.rb

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 6cc5e9a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-10 16:57:03 -0300

    Add test to column alias in `exists?` SQL.
    
    This behavior was added in be4ecdcc87984e9421ff5d5c90d33f475e0fbc01.
    
    Closes #1139.
    
    Fixes #2553, #1141, #1623 and #2062.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit be4ecdc	refs/heads/master
Author: iaddict 
Date:   2011-05-19 02:00:08 -0700

    Minimal change to query generation of exists? that makes SQLServer and others happy that do not work without a column alias.
    Conflicts:
    	activerecord/lib/active_record/relation/finder_methods.rb

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 35c89a4	refs/tags/v3.2.8.rc1
Merge: 5dfb01e 01f8f29
Author: Rafael Mendonça França 
Date:   2012-06-10 12:08:38 -0700

    Merge pull request #6688 from c42engineering/buffered_logger_level_while_creation
    
    BufferedLogger level while creation

commit 5dfb01e	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-10 08:45:28 -0700

    Merge pull request #6695 from kennyj/fix_6635
    
    Fix #6635. We should call Scoping methods, before calling Array methods.

M	activerecord/lib/active_record/relation/delegation.rb
M	activerecord/test/cases/named_scope_test.rb

commit 0711708	refs/heads/master
Author: Tobi Lehman 
Date:   2012-06-08 17:38:09 -0700

    Fix typo 'ActiveSpport'.

M	guides/source/initialization.textile

commit 4da1af7	refs/heads/master
Merge: c2e61aa cd1be1a
Author: Rafael Mendonça França 
Date:   2012-06-10 08:45:28 -0700

    Merge pull request #6695 from kennyj/fix_6635
    
    Fix #6635. We should call Scoping methods, before calling Array methods.

commit c2e61aa	refs/heads/master
Author: Andrew White 
Date:   2012-06-10 16:23:34 +0100

    Ensure that mass assignment options are preserved
    
    There are two possible scenarios where the @mass_assignment_options
    instance variable can become corrupted:
    
    1. If the assign_attributes doesn't complete correctly, then
       subsequent calls to a nested attribute assignment method will use
       whatever options were passed to the previous assign_attributes call.
    
    2. With nested assign_attributes calls, the inner call will overwrite
       the current options. This will only affect nested attributes as the
       attribute hash is sanitized before any methods are called.
    
    To fix this we save the current options in a local variable and then
    restore these options in an ensure block.

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/models/person.rb

commit cd1be1a	refs/heads/master
Author: kennyj 
Date:   2012-06-07 12:55:39 +0900

    Fix #6635. We should call Scoping methods, before calling Array methods.

M	activerecord/lib/active_record/relation/delegation.rb
M	activerecord/test/cases/named_scope_test.rb

commit 42259f6	refs/heads/master
Merge: 613357c 05558a4
Author: José Valim 
Date:   2012-06-10 03:46:49 -0700

    Merge pull request #6694 from arunagw/build_fix_master
    
    Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fba

commit 05558a4	refs/heads/master
Author: Arun Agrawal 
Date:   2012-06-10 16:14:19 +0530

    Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fba

M	activerecord/lib/active_record/migration.rb

commit 613357c	refs/heads/master
Merge: 03f2249 4c82d3f
Author: José Valim 
Date:   2012-06-10 02:40:44 -0700

    Merge pull request #6692 from schneems/schneems/something-went-wrong
    
    Add Prompt to 404 & 500 Pages to Check Logs in Production

commit 6cc941d	refs/tags/v3.2.8.rc1
Merge: eaeebc2 e66c240
Author: José Valim 
Date:   2012-06-10 02:39:27 -0700

    Merge pull request #6693 from jkraemer/3-2-stable
    
    Bugfix: Namespace collision with test-unit-activesupport 1.0.0

commit 03f2249	refs/heads/master
Author: José Valim 
Date:   2012-06-10 11:38:37 +0200

    Use . instead of :: for class methods, add CHANGELOG entries

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb
M	railties/CHANGELOG.md
M	railties/test/application/configuration_test.rb

commit 4845c06	refs/heads/master
Merge: fdcc252 d741a4c
Author: José Valim 
Date:   2012-06-10 02:33:14 -0700

    Merge pull request #6665 from schneems/schneems/raise-migration-error
    
    Notify A User they Have Pending Migrations

commit e66c240	refs/tags/v3.2.8.rc1
Author: Jens Kraemer 
Date:   2012-06-10 11:22:56 +0200

    fix namespace collision with test-unit-activesupport

M	activesupport/lib/active_support/testing/deprecation.rb

commit fdcc252	refs/heads/master
Merge: d3a99c3 88d6ae3
Author: Rafael Mendonça França 
Date:   2012-06-09 19:49:36 -0700

    Merge pull request #6683 from stevecj/fix-fragile-assert-queries
    
    Fix fragile #assert_queries implementation and usages.

commit d3a99c3	refs/heads/master
Author: Xavier Noria 
Date:   2012-06-10 00:35:18 +0200

    removes the obsolete require_association method from dependencies
    
    This is an obsolete method from the very early days,
    apparently it was used circa 2004 because STI support
    was not smart enough. This method is not public
    interface, and we are heading a major version, so
    removal seems right.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/dependencies_test.rb

commit 88d6ae3	refs/heads/master
Author: Steve Jorgensen 
Date:   2012-06-08 11:10:22 -0700

    Fix fragile #assert_queries implementation and usages.
    
    Several tests that passed when run in the order they are loaded
    by rake test were failing when run in different sequences due to
    problems with the implementation of assert_queries and
    assert_no_queries as well as incorrect assumptions made about
    how many queries might be executed by a database adapter in
    various cases.

M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit 4c82d3f	refs/heads/master
Author: schneems 
Date:   2012-06-09 14:30:45 -0500

    add prompt to 404 & 500 pages to check logs
    
    When new programmers push their code to a production server and receive an error they often don't know to check the logs, this simple reminder will help. Most professional applications have custom error pages so this change shouldn't affect them. The wording of the message should not confuse non-developer visitors.

M	railties/lib/rails/generators/rails/app/templates/public/404.html
M	railties/lib/rails/generators/rails/app/templates/public/500.html

commit 661fe76	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-09 12:26:17 -0700

    Add files required by action_dispatch

M	guides/source/initialization.textile

commit 2f6e809	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-06-09 12:20:47 -0700

    Add missing requires for rails/commands/server

M	guides/source/initialization.textile

commit f202088	refs/heads/master
Author: Robb Kidd 
Date:   2012-06-09 16:04:01 -0300

    Make observer enable/disable documentation more informative.
    
    * Moved the simplest case--enable/disable all on all--to the top.
    * Made clear what "ORM" means to avoid having to teach people how to solve "uninitialized constant ORM"
      errors in their test reports.

M	activemodel/lib/active_model/observer_array.rb

commit d741a4c	refs/heads/master
Author: schneems 
Date:   2012-06-06 15:47:03 -0500

    test errors for pending migrations
    
    App should raise error on page_load

M	railties/test/application/configuration_test.rb

commit 96f19f6	refs/heads/master
Author: schneems 
Date:   2012-06-05 19:15:16 -0500

    raise error for pending migration
    
    can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications.

M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/railtie.rb
M	activerecord/test/cases/migration_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/test/test_helper.rb

commit 6bd729e	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-09 10:41:21 -0300

    Remove conditional committed by accident

M	activerecord/lib/active_record/relation/predicate_builder.rb

commit f9cfe9a4b	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-06-09 09:40:55 -0300

    Use each_with_object instead of each here

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb

commit aa2bfd6	refs/heads/master
Author: José Valim 
Date:   2012-06-09 03:24:41 -0700

    Merge pull request #6687 from tiegz/3-2-optimizations
    
    ActiveRecord#attributes optimization: minimize objects created

M	activerecord/lib/active_record/attribute_methods.rb

commit eaeebc2	refs/tags/v3.2.8.rc1
Merge: 6900a4e 6e4a064
Author: José Valim 
Date:   2012-06-09 03:24:41 -0700

    Merge pull request #6687 from tiegz/3-2-optimizations
    
    ActiveRecord#attributes optimization: minimize objects created

commit ca1edd4	refs/heads/master
Author: Sugino Yasuhiro 
Date:   2012-06-09 16:45:18 +0900

    fix stylesheet template dir

M	railties/lib/rails/tasks/framework.rake

commit 6900a4e	refs/tags/v3.2.8.rc1
Merge: 8475cdd f36fd0e
Author: Andrew White 
Date:   2012-06-09 00:14:37 -0700

    Merge pull request #6689 from arunagw/duplicate_test_removed
    
    Duplicate test removed

commit f36fd0e	refs/tags/v3.2.8.rc1
Author: Arun Agrawal 
Date:   2012-06-09 12:28:00 +0530

    Duplicate tests removed.

M	actionpack/test/template/url_helper_test.rb

commit 01f8f29	refs/tags/v3.2.8.rc1
Author: Niranjan Paranjape 
Date:   2012-06-09 12:18:39 +0530

    buffered logger is initialized with the log level passed trough the initializer

M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/test/buffered_logger_test.rb

commit 6e4a064	refs/tags/v3.2.8.rc1
Author: Tieg Zaharia 
Date:   2012-06-09 00:42:55 -0400

    ActiveRecord#attributes optimization: minimize objects created

M	activerecord/lib/active_record/attribute_methods.rb

commit 066e6c6	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-09 03:15:39 +0200

    Fix tests, active_authorizer shouldn't include blank values
    
    Fix for a test failing after: 00ff0a6776

M	railties/test/application/configuration_test.rb

commit 176af7e	refs/tags/v3.0.14
Author: Ernie Miller 
Date:   2012-06-08 16:42:01 -0400

    Additional fix for CVE-2012-2661
    
    While the patched PredicateBuilder in 3.0.13 prevents a user
    from specifying a table name using the `table.column` format,
    it doesn't protect against the nesting of hashes changing the
    table context in the next call to build_from_hash. This fix
    covers this case as well.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/relation/where_test.rb

commit 8355abf	refs/tags/v3.1.6
Author: Ernie Miller 
Date:   2012-06-08 16:32:08 -0400

    Additional fix for CVE-2012-2661
    
    While the patched PredicateBuilder in 3.1.5 prevents a user
    from specifying a table name using the `table.column` format,
    it doesn't protect against the nesting of hashes changing the
    table context in the next call to build_from_hash. This fix
    covers this case as well.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/relation/where_test.rb

commit 41d6371	refs/heads/master
Merge: d1136e6 00ff0a6
Author: Piotr Sarnacki 
Date:   2012-06-08 11:35:13 -0700

    Merge pull request #6668 from pomnikita/master
    
    Compact array of values added to PermissionSet instance

commit b1f634a	refs/heads/master
Author: João Britto 
Date:   2012-06-08 15:23:12 -0300

    A blank line is required before code blocks. The generated output breaks otherwise.

M	guides/source/active_support_core_extensions.textile

commit 8475cdd	refs/tags/v3.2.8.rc1
Author: Piotr Sarnacki 
Date:   2012-06-08 19:09:18 +0200

    Don't add sqlite3 to gemspec with -O on rails plugin new
    
    (closes #6672)

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
M	railties/test/generators/plugin_new_generator_test.rb

commit d1136e6	refs/heads/master
Merge: 523820f 5fa8728
Author: Rafael Mendonça França 
Date:   2012-06-08 10:25:29 -0700

    Merge pull request #6681 from arunagw/plugin_gen_fix
    
    Plugin gen fix

commit 523820f	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-08 19:09:18 +0200

    Don't add sqlite3 to gemspec with -O on rails plugin new
    
    (closes #6672)

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
M	railties/test/generators/plugin_new_generator_test.rb

commit 5fa8728	refs/heads/master
Author: Arun Agrawal 
Date:   2012-06-08 18:29:23 +0530

    We should not include engine.rake file into rake
    
    if we are passing -T which is skip_test_unit
    
    See issue #6673 for more details.
    
    I saw that we are not creating dummy app even if
    we do skip_test_unit.
    
    Fixes #6673

M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/test/generators/plugin_new_generator_test.rb

commit cbfcabc	refs/heads/master
Author: Arun Agrawal 
Date:   2012-06-08 17:46:15 +0530

    Removed protected as we already doing it above.

M	railties/test/generators/plugin_new_generator_test.rb

commit 0e4d16f	refs/tags/v3.2.8.rc1
Merge: dfb1ebe 8b1d475
Author: Rafael Mendonça França 
Date:   2012-06-08 09:44:36 -0700

    Merge pull request #6678 from arunagw/fix_issue_6673
    
    Fix issue 6673

commit dfb1ebe	refs/tags/v3.2.8.rc1
Merge: fa352c4 7ad5f8b
Author: Rafael Mendonça França 
Date:   2012-06-08 06:20:09 -0700

    Merge pull request #6677 from arunagw/3-2-stable
    
    Removed protected as we already doing it above.

commit 8b1d475	refs/tags/v3.2.8.rc1
Author: Arun Agrawal 
Date:   2012-06-08 18:29:23 +0530

    We should not include engine.rake file into rake
    
    if we are passing -T which is skip_test_unit
    
    See issue #6673 for more details.
    
    I saw that we are not creating dummy app even if
    we do skip_test_unit.
    
    Fixes #6673

M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/test/generators/plugin_new_generator_test.rb

commit 7ad5f8b	refs/tags/v3.2.8.rc1
Author: Arun Agrawal 
Date:   2012-06-08 17:46:15 +0530

    Removed protected as we already doing it above.

M	railties/test/generators/plugin_new_generator_test.rb

commit 79c8c4f	refs/heads/master
Author: Aurelian Oancea 
Date:   2012-06-08 12:41:46 +0200

    Don't assign the attributes if the list is empty.

M	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/test/cases/mass_assignment_security_test.rb

commit fa352c4	refs/tags/v3.2.8.rc1
Author: Piotr Sarnacki 
Date:   2012-06-08 00:14:05 +0200

    Fix railties test suite
    
    Apparently asset_environment should not be invoked if it's not needed.
    This fixes broken build by getting back to the code more similar to the
    version changed here: 5b0a891

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 7495b26	refs/heads/master
Merge: 6dfcc1b a74f840
Author: Rafael Mendonça França 
Date:   2012-06-07 14:51:52 -0700

    Merge pull request #6667 from yahonda/skip_polymorphic_index_with_oracle
    
    Skip two tests with polymorphic if current adapter is Oracle Adapter.

commit 6dfcc1b	refs/heads/master
Merge: e638c61 ab11a27
Author: Rafael Mendonça França 
Date:   2012-06-07 14:31:51 -0700

    Merge pull request #6597 from frodsan/am_include_root_to_false
    
    change AMS::JSON.include_root_in_json default value to false

commit a74f840	refs/heads/master
Author: Yasuo Honda 
Date:   2012-06-08 06:21:26 +0900

    Skip two tests with polymorphic if current adapter is Oracle Adapter.
    because Oracle Adapter does not support foreign keys if :polymorphic => true is used.

M	activerecord/test/cases/migration/references_index_test.rb

commit 00ff0a6	refs/heads/master
Author: Nikita Pomyashchiy 
Date:   2012-06-08 01:00:34 +0400

    Compact array of values added to PermissionSet instance

M	activemodel/lib/active_model/mass_assignment_security/permission_set.rb
M	activemodel/test/cases/mass_assignment_security/permission_set_test.rb

commit 5b0a891	refs/tags/v3.2.8.rc1
Author: Piotr Sarnacki 
Date:   2012-06-02 14:34:11 +0200

    Fix asset tags for files with more than one dot
    
    After the fix done in 39f9f02a, there are cases that will not work
    correctly. If you have file with "2 extensions", like foo.min.js and you
    reference the file without extension, like:
    
        javascript_include_tag "foo.min"
    
    it will fail because sprockets finds foo.min.js with foo.min argument.
    
    This commit fixes this case and will get the right file even when
    referrencing it without extension.
    
    (closes #6598)

M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/fixtures/sprockets/app/javascripts/foo.min.js
A	actionpack/test/fixtures/sprockets/app/stylesheets/style.min.css
M	actionpack/test/template/sprockets_helper_test.rb

commit 68d3e1f	refs/tags/v3.2.8.rc1
Author: Jon Leighton 
Date:   2012-06-07 20:45:23 +0100

    Make test cover previous reversion

M	activerecord/test/cases/associations/callbacks_test.rb

commit 959fb8e	refs/tags/v3.2.8.rc1
Author: Jon Leighton 
Date:   2012-06-07 20:02:49 +0100

    Revert "Perf: Don't load the association for #delete_all."
    
    This reverts commit b98d1e21635d8776de8893cc09bd86c71f6c78f0.
    
    Closes #6609
    
    Conflicts:
    
    	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 5c17aa5	refs/heads/master
Author: Daniel Lopes 
Date:   2012-06-07 15:43:13 -0300

    on CSRF whitelisting the argument for :if must be a symbol

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit faf2744	refs/heads/master
Author: Daniel Lopes 
Date:   2012-06-07 15:33:38 -0300

    fix typos on the CSRF whitelisting doc

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 3985662	refs/heads/master
Author: Daniel Lopes 
Date:   2012-06-07 15:19:49 -0300

    Document the CSRF whitelisting on get requests

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit e638c61	refs/heads/master
Merge: b4fb80c 4faaa81
Author: Carlos Antonio da Silva 
Date:   2012-06-06 10:39:03 -0700

    Merge pull request #6629 from marcandre/destroy
    
    Add ActiveRecord::Base#destroy!

commit 4faaa81	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-06-05 02:35:05 -0400

    + ActiveRecord::Base#destroy!

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/persistence_test.rb

commit b4fb80c	refs/heads/master
Merge: 9612397 ef9bbb8
Author: Carlos Antonio da Silva 
Date:   2012-06-06 08:49:38 -0700

    Merge pull request #6645 from amatsuda/reduce_string_instance
    
    Reduce number of String instance

commit ef9bbb8	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-05 07:10:57 +0900

    reduce number of Strings

M	activerecord/lib/active_record/schema_dumper.rb
M	railties/lib/rails/generators/named_base.rb

commit 9612397	refs/heads/master
Merge: 9fb7003 7fe6002
Author: Rafael Mendonça França 
Date:   2012-06-06 06:24:21 -0700

    Merge pull request #6647 from amatsuda/192_minitest_method_name
    
    MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__

commit 7fe6002	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-06 21:56:27 +0900

    MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__

M	activesupport/lib/active_support/test_case.rb

commit 2635a29	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-05 07:05:29 +0900

    no need to to_s here. Both String and Symbol can be interpolated into String

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 0996396	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-05 05:24:55 +0900

    Symbol responds_to :upcase & :downcase in Ruby >= 1.9

M	actionpack/lib/abstract_controller/collector.rb
M	actionpack/lib/action_controller/caching/pages.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activesupport/lib/active_support/log_subscriber.rb
M	activesupport/lib/active_support/xml_mini.rb

commit edee2c7	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-05 04:59:34 +0900

    stop `to_s`ing method names
    
    Module#methods are Symbols in Ruby >= 1.9

M	actionpack/test/controller/helper_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activesupport/lib/active_support/core_ext/date_time/conversions.rb
M	activesupport/lib/active_support/log_subscriber.rb
M	railties/test/railties/engine_test.rb

commit 9fb7003	refs/heads/master
Merge: 45427e2 2488966
Author: Andrew White 
Date:   2012-06-06 03:02:10 -0700

    Merge pull request #6644 from amatsuda/fix_meaningless_test_case
    
    fix meaningless test case

commit 2488966	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-05 04:27:44 +0900

    fix meaningless test case
    
    Module#instance_methods returns an Array of Symbols in Ruby >= 1.9
    So this was not actually testing anything

M	actionpack/test/template/form_helper_test.rb

commit 45427e2	refs/heads/master
Author: Andrew White 
Date:   2012-06-06 10:27:55 +0100

    Make method name consistent with existing methods

M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/controller/templates/controller.rb

commit 7682f70	refs/heads/master
Merge: 870310d 686966a
Author: José Valim 
Date:   2012-06-06 02:16:33 -0700

    Merge pull request #6643 from fredwu/fix_require_dependency
    
    Fixed the application_controller require_dependency path generated by the app generator

commit 686966a	refs/heads/master
Author: Fred Wu 
Date:   2012-06-06 19:02:11 +1000

    Fixed the application_controller require_dependency path generated by the app generator

M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/test/generators/namespaced_generators_test.rb

commit 6b6c1de	refs/tags/v3.2.8.rc1
Merge: 3cba6ee 029936e
Author: José Valim 
Date:   2012-06-06 00:18:59 -0700

    Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch
    
    Fix human attribute_name to handle deeply nested attributes

commit ab11a27	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-06 01:11:39 -0500

    change AMS::JSON.include_root_in_json default value to false
    
    Changes:
    
    * Update `include_root_in_json` default value to false for default value
      to false for `ActiveModel::Serializers::JSON`.
    * Remove unnecessary change to include_root_in_json option in
      wrap_parameters template.
    * Update `as_json` documentation.
    * Fix JSONSerialization tests.
    
    Problem:
    
    It's confusing that AM serializers behave differently from AR,
    even when AR objects include AM serializers module.
    
        class User < ActiveRecord::Base; end
    
        class Person
          include ActiveModel::Model
          include ActiveModel::AttributeMethods
          include ActiveModel::Serializers::JSON
    
          attr_accessor :name, :age
    
          def attributes
            instance_values
          end
        end
    
        user.as_json
        => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true}
        # root is not included
    
        person.as_json
        => {"person"=>{"name"=>"Francesco", "age"=>22}}
        # root is included
    
        ActiveRecord::Base.include_root_in_json
        => false
    
        Person.include_root_in_json
        => true
    
        # different default values for include_root_in_json
    
    Proposal:
    
    Change the default value of AM serializers to false, update
    the misleading documentation and remove unnecessary change
    to false of include_root_in_json option with AR objects.
    
        class User < ActiveRecord::Base; end
    
        class Person
          include ActiveModel::Model
          include ActiveModel::AttributeMethods
          include ActiveModel::Serializers::JSON
    
          attr_accessor :name, :age
    
          def attributes
            instance_values
          end
        end
    
        user.as_json
        => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true}
        # root is not included
    
        person.as_json
        => {"name"=>"Francesco", "age"=>22}
        # root is not included
    
        ActiveRecord::Base.include_root_in_json
        => false
    
        Person.include_root_in_json
        => false
    
        # same behaviour, more consistent
    
    Fixes #6578.

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/test/cases/serializers/json_serialization_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 029936e	refs/tags/v3.2.8.rc1
Author: Tsutomu Kuroda 
Date:   2012-06-06 12:45:37 +0900

    Fix human attribute_name to handle deeply nested attributes
    
    This is a back-port of b0e2fc84 to Rails 3.2.
    See #5843 and #3859 also.

M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit 5907b0b	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-06-05 20:42:08 -0700

    Document ActiveSupport::JSON.parse_error [ci skip]

M	activesupport/lib/active_support/json/decoding.rb

commit 1790b23	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-05 15:53:20 -0500

    add :nodoc: to AS::NumberHelper private methods [ci skip]

M	activesupport/lib/active_support/number_helper.rb

commit 870310d	refs/heads/master
Author: Andrew White 
Date:   2012-06-05 20:39:26 +0100

    Eliminate dependency on Rails::VERSION::STRING
    
    To facilitate the use of ActiveSupport::Testing::Performance outside
    of a Rails application conditionally check for the presence of
    Rails::VERSION::STRING before including it in the environment string.

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/test/core_ext/kernel_test.rb
M	activesupport/test/testing/performance_test.rb

commit 3cba6ee	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-05 15:10:20 -0300

    Revert "fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called"
    
    This reverts commits e3069c64b2c5ddc7a5789b55b8efd4902d9e9729 and 2b2983d76fd11efc219273036a612f47cfaa5bfa.
    
    Reason: This add a non-backward compatible change in the way that flash
    works now (swept in every request).

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb
M	railties/test/application/middleware/session_test.rb

commit f7cde3e	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-03 15:11:45 -0300

    Add test to flash sweep after two redirects
    
    This test is needed to avoid regressions in the way that flash works
    now (swept in every request).

M	actionpack/test/controller/flash_test.rb

commit 6347554	refs/tags/v3.2.8.rc1
Merge: 9f52d15 fc092a9
Author: Rafael Mendonça França 
Date:   2012-06-05 11:42:19 -0700

    Merge pull request #6613 from carlosgaldino/3-2-data-confirm
    
    Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option

commit fc092a9	refs/tags/v3.2.8.rc1
Author: Carlos Galdino 
Date:   2012-06-01 19:10:18 -0300

    Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option
    
    This deprecation applies to:
    `button_to`
    `button_tag`
    `image_submit_tag`
    `link_to`
    `submit_tag`
    
    As :confirm is an UI specific option is better to use the data attributes,
    teaching users about unobtrusive JavaScript and how Rails works with it.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb

commit 9b742fd	refs/heads/master
Merge: 5b3d140 ebb906d
Author: José Valim 
Date:   2012-06-05 11:08:09 -0700

    Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assert
    
    bundle exec rake assets:precompile shouldn't fail quietly.

commit 5b3d140	refs/heads/master
Merge: 8359a2f 5e1d40f
Author: Rafael Mendonça França 
Date:   2012-06-05 10:46:34 -0700

    Merge pull request #6638 from frodsan/config_accessor
    
    add instance_accessor option to config_accessor

commit ebb906d	refs/heads/master
Author: John Yani 
Date:   2012-06-05 01:14:42 +0300

    bundle exec rake assets:precompile shouldn't fail quietly.
    
    If JavaScript runtime is not installed, execjs fails with error quietly,
    while tests continue to run. This should not happen since it causes tests
    to fail for unknown reason (#6621).
    
    This commit assures that if JavaScript runtime is not installed, an assertion
    is raised.

M	railties/test/application/assets_test.rb

commit 5e1d40f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-05 10:50:48 -0500

    add instance_accessor option to ActiveSupport::Configurable#config_accessor
    
    Changes:
    
    * Add `instance_accessor` option to opt out of the instance writer and
      instance reader methods.
    * Raises a NameError if the name of the attribute is not valid.
    * Update documentation and tests.
    * Add CHANGELOG entry in activesupport.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/configurable.rb
M	activesupport/test/configurable_test.rb

commit 8359a2f	refs/heads/master
Merge: 272a7b9 a36bda8
Author: Carlos Antonio da Silva 
Date:   2012-06-05 05:35:42 -0700

    Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3
    
    Resolver tests fail if mysql adapter not installed

commit 272a7b9	refs/heads/master
Merge: 76830e1 425608e
Author: José Valim 
Date:   2012-06-05 04:08:30 -0700

    Merge pull request #6632 from route/one_line_code_for_logger
    
    One-liner code for logger in ActionView::Helpers::ControllerHelper

commit 425608e	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-06-05 14:06:18 +0400

    One-liner code for logger in ActionView::Helpers::ControllerHelper

M	actionpack/lib/action_view/helpers/controller_helper.rb

commit 76830e1	refs/heads/master
Merge: fedb0e2 0ec88cd
Author: José Valim 
Date:   2012-06-05 01:20:43 -0700

    Merge pull request #6631 from yuki24/use_block_in_button_helper
    
    Accept a block in FormHelper#button

commit fedb0e2	refs/heads/master
Merge: 560b143 126586a
Author: José Valim 
Date:   2012-06-05 01:15:27 -0700

    Merge pull request #6628 from fredwu/fix_skip_gemspec
    
    Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' command

commit 560b143	refs/heads/master
Merge: 2186540 ccaf982
Author: José Valim 
Date:   2012-06-05 01:13:22 -0700

    Merge pull request #6630 from route/logger_in_metal
    
    Metal controller doesn't have logger method, check it and then delegate

commit ccaf982	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-06-05 11:03:00 +0400

    Metal controller doesn't have logger method, check it and then delegate

M	actionpack/lib/action_view/helpers/controller_helper.rb

commit 126586a	refs/heads/master
Author: Fred Wu 
Date:   2012-06-05 15:49:40 +1000

    Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' command

M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
M	railties/test/generators/plugin_new_generator_test.rb

commit 20ded91	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-04 23:43:43 -0500

    add example to AS::Gzip

M	activesupport/lib/active_support/gzip.rb

commit 4072de2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-06-04 23:21:48 -0500

    remove double hyphen that doesn't allow properly parsing

M	activesupport/lib/active_support/core_ext/object/try.rb

commit d63b69b	refs/heads/master
Author: John Yani 
Date:   2012-06-05 02:07:21 +0300

    Add a note about JavaScript runtime

M	guides/source/contributing_to_ruby_on_rails.textile

commit 0ec88cd	refs/heads/master
Author: Yuki Nishijima 
Date:   2012-06-05 04:30:40 +0900

    accept a block in button helper.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 9f52d15	refs/tags/v3.2.8.rc1
Merge: 43f0af4 510ef2b
Author: Rafael Mendonça França 
Date:   2012-06-04 07:00:28 -0700

    Merge pull request #6622 from kennyj/fix_6591-32
    
    [3-2-stable back ported] Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes

commit 510ef2b	refs/tags/v3.2.8.rc1
Author: kennyj 
Date:   2012-06-04 21:08:41 +0900

    Fix #6591. If a field with timezone isn't changed, we don't call will_change!.

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

commit bebbdb5	refs/tags/v3.2.8.rc1
Author: Evan Arnold 
Date:   2012-06-01 12:09:33 -0700

    Add failing test for 3.2.5  datetime attribute regression

M	activerecord/test/cases/dirty_test.rb

commit 2186540	refs/heads/master
Merge: d10eb69 635032f
Author: Piotr Sarnacki 
Date:   2012-06-04 03:47:10 -0700

    Merge pull request #6619 from kennyj/fix_6591
    
    Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes

commit c5e9dc4	refs/heads/master
Merge: 40c8ca5 cba59f1
Author: John Yani 
Date:   2012-06-04 03:16:18 -0700

    Merge pull request #103 from Vanuan/contributing
    
    bundle exec is needed even if running a single test.

commit cba59f1	refs/heads/master
Author: John Yani 
Date:   2012-06-04 13:12:24 +0300

    bundle exec is needed even if running a single test.

M	guides/source/contributing_to_ruby_on_rails.textile

commit 635032f	refs/heads/master
Author: kennyj 
Date:   2012-06-04 03:12:21 +0900

    Fix #6591. If a field with timezone isn't changed, we don't call will_change!.

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

commit cfc7f60	refs/heads/master
Author: Evan Arnold 
Date:   2012-06-01 12:09:33 -0700

    Add failing test for 3.2.5  datetime attribute regression

M	activerecord/test/cases/dirty_test.rb

commit a36bda8	refs/heads/master
Author: David Paschich 
Date:   2012-06-02 19:16:49 -0700

    The resolver tests fail if the mysql gem is not installed; this breaks
    being able to run the sqlite3 tests without that gem. This fix ensures
    the tests will only run if the mysql gem is installed.
    
    A better solution might be to move these tests into the per-adapter tests,
    and test each adapter's resolver.

M	activerecord/test/cases/connection_specification/resolver_test.rb

commit 40c8ca5	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-06-04 01:03:39 +0200

    remove unnecessary text

M	guides/source/layouts_and_rendering.textile

commit e5b3986	refs/heads/master
Author: schneems 
Date:   2012-06-03 15:07:11 -0500

    add convenience methods for checking migrations
    
    if a rails project needs to be migrated ActiveRecord::Migrator.needs_migration? will be true or false if the current version matches the last version.

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb

commit d10eb69	refs/heads/master
Merge: 9dbcaeb b3702ab
Author: Vijay Dev 
Date:   2012-06-03 03:07:06 -0700

    Merge pull request #6607 from parndt/patch-2
    
    Updated guide to say Rails 4.0 requires 1.9.3 or higher, not Rails 3.2.

commit 9dbcaeb	refs/heads/master
Merge: 806d023 37a4dd5
Author: Jon Leighton 
Date:   2012-06-03 01:20:31 -0700

    Merge pull request #6605 from amatsuda/ar_merge_association_test
    
    a test case that ensures AR::Relation#merge can merge associations

commit b3702ab	refs/heads/master
Author: Philip Arndt 
Date:   2012-06-03 17:54:57 +1200

    Updated guide to say Rails 4.0 requires 1.9.3 or higher, not Rails 3.2.

M	guides/source/4_0_release_notes.textile

commit 566c8d5	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-03 14:20:49 +0900

    AR::Relation#model would be a better API than AR::Relation#klass

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relation_test.rb

commit 37a4dd5	refs/heads/master
Author: Akira Matsuda 
Date:   2012-03-29 12:10:25 +0900

    a test case that ensures AR::Relation#merge can merge associations

M	activerecord/test/cases/relations_test.rb

commit 806d023	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-31 16:50:31 +0530

    starting with the Rails 4.0 release notes
    
    just a consolidation of the changelogs with minimal formatting
    
    [ci skip]

A	guides/source/4_0_release_notes.textile

commit 40d5303	refs/heads/master
Merge: a769fe9 ab2bf81
Author: Vijay Dev 
Date:   2012-06-02 21:50:02 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit ab2bf81	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-02 21:46:39 +0530

    copy edit AS guide [ci skip]

M	guides/source/active_support_core_extensions.textile

commit 313c528	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-02 21:46:28 +0530

    copy edit routing guide [ci skip]

M	guides/source/routing.textile

commit 983687a	refs/heads/master
Author: Vijay Dev 
Date:   2012-06-02 21:38:32 +0530

    fix up the example app for getting started guide [ci skip]

D	guides/code/getting_started/app/controllers/home_controller.rb
A	guides/code/getting_started/app/controllers/welcome_controller.rb
D	guides/code/getting_started/app/helpers/home_helper.rb
A	guides/code/getting_started/app/helpers/welcome_helper.rb
M	guides/code/getting_started/config/routes.rb
D	guides/code/getting_started/test/functional/home_controller_test.rb
A	guides/code/getting_started/test/functional/welcome_controller_test.rb

commit faf550c	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-06-02 15:04:35 +0200

    better explanations for acts_like?, try and deep_dup

M	guides/source/active_support_core_extensions.textile

commit 43f0af4	refs/tags/v3.2.8.rc1
Merge: f550d4d 7544c7a
Author: Rafael Mendonça França 
Date:   2012-06-01 12:37:06 -0700

    Merge pull request #6593 from yahonda/skip_test_remove_column_with_array_as_an_argument_is_deprecated
    
    Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle

commit f550d4d	refs/tags/v3.2.8.rc1
Author: Piotr Sarnacki 
Date:   2012-06-01 17:42:33 +0200

    Allow to use mounted helpers in ActionView::TestCase
    
    Similarly to 6525002, this allows to use routes helpers for mounted
    helpers, but this time in ActionView::TestCase

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/template/test_case_test.rb

commit a769fe9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-01 12:18:11 -0300

    Revert some ActiveSupport::Callbacks changes.
    
    This reverts commits 911a0859ac065aa8e8834ac985353d659c7c7b65 and
    30b31f51af6f7094c4a27b086755fc66c368d6fa.
    
    Reason: these changes make the Active Model tests fail randomly.
    
    Some examples:
    http://travis-ci.org/#!/rails/rails/jobs/1498992
    http://travis-ci.org/#!/rails/rails/jobs/1496948
    http://travis-ci.org/#!/rails/rails/jobs/1489985
    
    This script was used to reproduce these breaks:
    https://gist.github.com/f6828a03ee4d40bffbc3
    
    200 times, 0 failures

M	activesupport/lib/active_support/callbacks.rb

commit 7544c7a	refs/tags/v3.2.8.rc1
Author: Yasuo Honda 
Date:   2012-06-02 00:59:19 +0900

    Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle adapter.
    Because Oracle adapter supports only remove_column :table_name, :column_name syntax
    and it has never supported remove_column :table_name, [:column_name].

M	activerecord/test/cases/migration_test.rb

commit 60b4290	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-01 17:42:33 +0200

    Allow to use mounted helpers in ActionView::TestCase
    
    Similarly to 6525002, this allows to use routes helpers for mounted
    helpers, but this time in ActionView::TestCase

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/template/test_case_test.rb

commit afcc7cc	refs/heads/master
Author: Xavier Noria 
Date:   2012-06-01 16:57:52 +0200

    minor comment revision

M	activerecord/lib/active_record/explain.rb

commit 5c565a2	refs/heads/master
Author: José Valim 
Date:   2012-06-01 07:40:41 -0700

    Merge pull request #6588 from nbibler/polymorphic_to_model
    
    Correct the use of to_model in polymorphic routing

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb

commit 3449b75	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-06-01 11:41:30 -0300

    Sync CHANGLOG with the 3-2-stable branch

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activesupport/CHANGELOG.md

commit 5b6b0df	refs/tags/v3.2.8.rc1
Merge: b13d89e 537ede9
Author: José Valim 
Date:   2012-06-01 07:40:41 -0700

    Merge pull request #6588 from nbibler/polymorphic_to_model
    
    Correct the use of to_model in polymorphic routing

commit 537ede9	refs/tags/v3.2.8.rc1
Author: Nathaniel Bibler 
Date:   2012-06-01 10:11:01 -0400

    Use to_model delegates for polymorphic route generation

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb

commit b13d89e	refs/tags/v3.2.8.rc1
Author: Rafael Mendonça França 
Date:   2012-06-01 11:30:44 -0300

    Add release date of 3.2.5 on the CHANGELOG

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md

commit 8d4f63a	refs/tags/v3.2.8.rc1
Author: Piotr Sarnacki 
Date:   2012-06-01 15:53:52 +0200

    Include routes.mounted_helpers into integration tests
    
    In integration tests, you might want to use helpers from engines that
    you mounted in your application. It's not hard to add it by yourself,
    but it's unneeded boilerplate. mounted_helpers are now included by
    default. That means that given engine mounted like:
    
        mount Foo::Engine => "/foo", :as => "foo"
    
    you will be able to use paths from this engine in tests this way:
    
        foo.root_path #=> "/foo"
    
    (closes #6573)

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit ecd1722	refs/tags/v3.2.8.rc1
Merge: b57fa0b 8984bc2
Author: Rafael Mendonça França 
Date:   2012-06-01 07:20:31 -0700

    Merge pull request #6587 from amatsuda/controller_generator_remove_blank_line_32
    
    Backporting #6586 patch to 3-2-stable

commit 6525002	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-06-01 15:53:52 +0200

    Include routes.mounted_helpers into integration tests
    
    In integration tests, you might want to use helpers from engines that
    you mounted in your application. It's not hard to add it by yourself,
    but it's unneeded boilerplate. mounted_helpers are now included by
    default. That means that given engine mounted like:
    
        mount Foo::Engine => "/foo", :as => "foo"
    
    you will be able to use paths from this engine in tests this way:
    
        foo.root_path #=> "/foo"
    
    (closes #6573)

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit 8984bc2	refs/tags/v3.2.8.rc1
Author: Akira Matsuda 
Date:   2012-06-01 22:51:15 +0900

    remove unneeded blank line from !namespeced? controller generators

M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

commit 7013f73	refs/heads/master
Merge: 070454c ec106e9
Author: Rafael Mendonça França 
Date:   2012-06-01 06:57:25 -0700

    Merge pull request #6586 from amatsuda/generator_blank_line
    
    remove unneeded blank line from !namespeced? generated controllers

commit ec106e9	refs/heads/master
Author: Akira Matsuda 
Date:   2012-06-01 22:51:15 +0900

    remove unneeded blank line from !namespeced? controller generators

M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

commit 070454c	refs/heads/master
Merge: ec9636e 76531cb
Author: Piotr Sarnacki 
Date:   2012-06-01 02:28:21 -0700

    Merge pull request #6583 from amatsuda/rake_dsl_19
    
    Revert "Only include Rake::DSL if it's defined."

commit ec9636e	refs/heads/master
Merge: 47896d2 c1ea574
Author: Xavier Noria 
Date:   2012-06-01 02:21:21 -0700

    Merge pull request #6584 from amatsuda/ar_explain_inspect_readability
    
    improve readability of AR explain result

commit c1ea574	refs/heads/master
Author: Akira Matsuda 
Date:   2012-05-31 16:58:17 +0900

    improve readability of AR explain result

M	activerecord/lib/active_record/explain.rb

commit 47896d2	refs/heads/master
Merge: c1a0c77 c8882c1
Author: José Valim 
Date:   2012-05-31 23:58:48 -0700

    Merge pull request #6579 from amatsuda/null_relation_modulize
    
    modulize AR::NullRelation

commit cd31eb1	refs/heads/master
Author: spyhole 
Date:   2012-06-01 02:56:42 -0400

    change welcome_helper.rb to home_helper.rb

A	guides/code/getting_started/app/helpers/home_helper.rb
D	guides/code/getting_started/app/helpers/welcome_helper.rb

commit f820668	refs/heads/master
Author: spyhole 
Date:   2012-06-02 13:33:39 +0800

    Update guides/code/getting_started/test/functional/home_controller_test.rb

M	guides/code/getting_started/test/functional/home_controller_test.rb

commit 890c4b7	refs/heads/master
Author: spyhole 
Date:   2012-06-02 13:20:17 +0800

    the file name should be changed to home_helper.rb

M	guides/code/getting_started/app/helpers/welcome_helper.rb

commit 81281be	refs/heads/master
Author: spyhole 
Date:   2012-06-02 12:17:48 +0800

    Update guides/code/getting_started/app/controllers/home_controller.rb

M	guides/code/getting_started/app/controllers/home_controller.rb

commit b4f1c16	refs/heads/master
Author: spyhole 
Date:   2012-06-02 12:17:13 +0800

    Update guides/code/getting_started/config/routes.rb

M	guides/code/getting_started/config/routes.rb

commit e636663	refs/heads/master
Author: schneems 
Date:   2012-06-01 16:44:41 +0200

    routes are viewable in browser (update guides)
    
    From the Pull Request #6461

M	guides/source/routing.textile

commit 76531cb	refs/heads/master
Author: Akira Matsuda 
Date:   2012-05-31 19:18:56 +0900

    Revert "Only include Rake::DSL if it's defined."
    
    This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7.
    
    Reason: Ruby 1.9.3 is shipped with Rake > 0.9

M	railties/lib/rails/tasks/documentation.rake

commit c8882c1	refs/heads/master
Author: Akira Matsuda 
Date:   2012-05-31 20:59:23 +0900

    unused method arguments

M	activerecord/lib/active_record/null_relation.rb

commit 212a74d	refs/heads/master
Author: Akira Matsuda 
Date:   2012-05-31 16:31:35 +0900

    modulize AR::NullRelation
    
    now we can invoke previously added scope extension methods

M	activerecord/lib/active_record/null_relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit b57fa0b	refs/tags/v3.2.5 (tag: v3.2.5)
Author: Aaron Patterson 
Date:   2012-05-31 20:38:03 -0700

    bumping to 3.2.5

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 7056079	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-06-01 03:03:50 +0100

    Restore behavior of Active Record 3.2.3 scopes
    
    A series of commits relating to preloading and scopes caused a regression.
    Cloning the relation calls initialize_copy which resets a number of instance
    variables to nil. Without this the scope thinks that it is already loaded
    when it is called again.
    
    Reverts the following commits:
    13f1401a6cf0266a3b0a91b173f976db2d4e50f3
    8491740ca5361ba9df20e1c8b906c709f5bfbc12
    dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e
    
    Fixes #6575, #6576 & #6577

M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/comment.rb

commit c1a0c77	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-31 11:56:08 -0700

    Rake::DSL should always be available

M	railties/lib/rails/railtie.rb

commit a1a71ab	refs/tags/v3.1.6
Merge: aa6e56b aa18c0c
Author: Aaron Patterson 
Date:   2012-05-31 11:26:57 -0700

    Merge branch '3-1-rel' into 3-1-stable
    
    * 3-1-rel:
      bumping to 3.1.5
      updating the CHANGELOG
      bumping to 3.1.5.rc1

commit 4df96807	refs/tags/v3.2.5
Merge: d66fd08 febd652
Author: Aaron Patterson 
Date:   2012-05-31 11:26:44 -0700

    Merge branch '3-2-rel' into 3-2-stable
    
    * 3-2-rel:
      bumping to 3.2.4
      adding security notifications to CHANGELOGs
      updating changelogs
      Merge pull request #6558 from parndt/fix_regression

commit b2feff2	refs/tags/v3.0.14
Merge: 33f8e4b 7102fe8
Author: Aaron Patterson 
Date:   2012-05-31 11:26:25 -0700

    Merge branch '3-0-rel' into 3-0-stable
    
    * 3-0-rel:
      bumping to 3.0.13
      updating CHANGELOGs
      bumping to 3.0.13.rc1

commit 33f8e4b	refs/tags/v3.0.14
Merge: 349fce2 c202638
Author: Aaron Patterson 
Date:   2012-05-31 11:26:16 -0700

    Merge branch '3-0-stable-sec' into 3-0-stable
    
    * 3-0-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this

commit aa6e56b	refs/tags/v3.1.6
Merge: 2f42815 5b83bbf
Author: Aaron Patterson 
Date:   2012-05-31 11:26:07 -0700

    Merge branch '3-1-stable-sec' into 3-1-stable
    
    * 3-1-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this

commit d66fd08	refs/tags/v3.2.5
Merge: f8f6ad6 dff6db1
Author: Aaron Patterson 
Date:   2012-05-31 11:25:54 -0700

    Merge branch '3-2-stable-sec' into 3-2-stable
    
    * 3-2-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
      bumping to 3.2.4.rc1

commit 5f91ea3	refs/heads/master
Merge: 51af1e2 060c91c
Author: Aaron Patterson 
Date:   2012-05-31 11:25:19 -0700

    Merge branch 'master-sec'
    
    * master-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this

commit 51af1e2	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-31 11:21:45 -0700

    Explicitly require rake so its DSL is available

M	railties/lib/rails/railtie.rb

commit 7102fe8	refs/tags/v3.0.13 (tag: v3.0.13)
Author: Aaron Patterson 
Date:   2012-05-31 10:55:00 -0700

    bumping to 3.0.13

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 86c97e1	refs/tags/v3.0.13
Author: Aaron Patterson 
Date:   2012-05-31 10:54:26 -0700

    updating CHANGELOGs

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit c8af45e	refs/tags/v3.0.13
Merge: 88e7f51 c202638
Author: Aaron Patterson 
Date:   2012-05-31 10:43:19 -0700

    Merge branch '3-0-stable-sec' into 3-0-rel
    
    * 3-0-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this

commit aa18c0c	refs/tags/v3.1.5 (tag: v3.1.5)
Author: Aaron Patterson 
Date:   2012-05-31 10:42:35 -0700

    bumping to 3.1.5

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit a7ed198	refs/tags/v3.1.5
Author: Aaron Patterson 
Date:   2012-05-31 10:41:47 -0700

    updating the CHANGELOG

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit a9c1898	refs/tags/v3.1.5
Merge: bd8ee8c 5b83bbf
Author: Aaron Patterson 
Date:   2012-05-31 10:29:46 -0700

    Merge branch '3-1-stable-sec' into 3-1-rel
    
    * 3-1-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this

commit febd652	refs/tags/v3.2.4 (tag: v3.2.4)
Author: Aaron Patterson 
Date:   2012-05-31 10:27:47 -0700

    bumping to 3.2.4

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 44aca7b	refs/tags/v3.2.4
Author: Aaron Patterson 
Date:   2012-05-31 10:23:39 -0700

    adding security notifications to CHANGELOGs

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit 7182748	refs/tags/v3.2.4
Merge: d3e5d1c dff6db1
Author: Aaron Patterson 
Date:   2012-05-31 10:19:41 -0700

    Merge branch '3-2-stable-sec' into 3-2-rel
    
    * 3-2-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this

commit d3e5d1c	refs/tags/v3.2.4
Author: Aaron Patterson 
Date:   2012-05-31 10:19:29 -0700

    updating changelogs

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 709e432	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-31 09:48:12 -0700

    Rake is in 1.9 stdlib, no need for gem dep

M	Gemfile

commit 5f690b9	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-31 09:46:52 -0700

    Psych is always available on 1.9

M	activerecord/lib/active_record/coders/yaml_column.rb
M	activerecord/lib/active_record/fixtures/file.rb

commit da048de	refs/heads/master
Merge: 67b9479 4791822
Author: Rafael Mendonça França 
Date:   2012-05-31 09:43:55 -0700

    Merge pull request #6571 from jeremyf/extract-force-ssl-filter-logic-to-separate-method
    
    Extracted redirect logic from ActionController::Force::ClassMethods.forc...

commit 4791822	refs/heads/master
Author: Jeremy Friesen 
Date:   2012-05-31 10:06:17 -0400

    Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl
    
    Prior to this patch the existing .force_ssl method handles both defining
    the filter and handling the logic for performing the redirect.
    
    With this patch the logic for redirecting to the HTTPS protocol is
    separated from the filter logic that determines if a redirect should
    occur.  By separating the two levels of behavior, an instance method
    for ActionController (i.e. #force_ssl_redirect) is exposed and available
    for more granular SSL enforcement.
    
    Cleaned up indentation.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/force_ssl.rb
M	actionpack/test/controller/force_ssl_test.rb

commit 67b9479	refs/heads/master
Author: Andrew White 
Date:   2012-05-31 17:18:25 +0100

    Reduce warning messages when running Active Support tests
    
    Eliminate the warnings generated by redefining methods and constants.

M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/test/core_ext/kernel_test.rb

commit 5752b31	refs/heads/master
Merge: c51fb02 a48b3f1
Author: Rafael Mendonça França 
Date:   2012-05-31 07:19:09 -0700

    Merge pull request #6566 from arunagw/add-javascripts-to-rake-stats-task
    
    Add code statistics for Javascript and CoffeeScript files

commit c51fb02	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-31 10:10:12 -0300

    Fix changelog example for count method with block [ci skip]
    
    Missed that too, thanks again @splattael.

M	activerecord/CHANGELOG.md

commit 959a360	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-31 10:07:43 -0300

    Fix wrong example for count method with block [ci skip]
    
    Thanks @splattael.

M	activerecord/lib/active_record/relation/calculations.rb

commit e2f5f01	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-31 09:18:14 -0300

    Simplify link_to using content_tag
    
    Add some tests for link_to with blocks and escaping content.

M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit b6eb22c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-30 22:53:14 -0300

    Make link_to arguments explicit

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 6471e09	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-30 22:44:30 -0300

    Make button_to arguments explicit and refactor a bit
    
    Prefer Hash#[]= over Hash#merge when setting a value.

M	actionpack/lib/action_view/helpers/url_helper.rb

commit a76b0cf	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-30 21:24:11 -0300

    Simplify logic to initialize valid conditions in RouteSet
    
    Remove :to_sym call from public_instance_methods iteration, as such
    methods in Ruby 1.9 already return symbols. Initialize valid conditions
    with controller/action instead of setting them afterwards.

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit a48b3f1	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-31 16:15:35 +0530

    Add code statistics for Javascript and
    
    CoffeeScript files to `rake stats` task
    
    Orignal PR was #2270
    
    Thanks to @nfm

M	railties/lib/rails/code_statistics.rb
M	railties/lib/rails/tasks/statistics.rake

commit f87820d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-31 05:06:00 -0500

    update ActiveModel::Dirty documentation

M	activemodel/lib/active_model/dirty.rb

commit 08477a6	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-31 00:47:50 -0700

    Work around undiagnosed bug that's draining a relation's bind_values

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit d5354af	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-30 23:18:08 -0700

    Fix backward compatibility with stored Hash values. Wrap coders to convert serialized values to indifferent access.

M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb
M	activerecord/test/fixtures/admin/users.yml

commit 9a30d82	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-30 23:29:47 -0300

    Set RACK_ENV to nil in the dbconsole test
    
    This will fix the travis-ci build

M	railties/test/commands/dbconsole_test.rb

commit f8f6ad6	refs/tags/v3.2.5
Merge: 4c8805d 9bbdceb
Author: Rafael Mendonça França 
Date:   2012-05-30 18:58:59 -0700

    Merge pull request #6562 from martinoconnor/generator-fix-stable
    
    3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.

commit 9bbdceb	refs/tags/v3.2.5
Author: Martin O'Connor 
Date:   2012-05-30 21:56:09 -0400

    Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
    
    Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
    Updating tests.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 3015649	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-30 22:46:53 -0300

    Fix app_generator_test with the changes introduced at
    f4d7af67ffc90f2542afa50c7579fc83ea4f45f2

M	railties/test/generators/app_generator_test.rb

commit ac7b162	refs/heads/master
Merge: 4056915 f4d7af6
Author: Rafael Mendonça França 
Date:   2012-05-30 18:34:39 -0700

    Merge pull request #6560 from martinoconnor/generator_fix
    
    Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.

commit f4d7af6	refs/heads/master
Author: Martin O'Connor 
Date:   2012-05-30 21:25:00 -0400

    Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
    
    Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.

M	railties/lib/rails/generators/app_base.rb

commit ac465d5	refs/tags/v3.2.4
Author: Aaron Patterson 
Date:   2012-05-30 17:26:15 -0700

    Merge pull request #6558 from parndt/fix_regression
    
    Fix regression

M	activerecord/lib/active_record/base.rb

commit 4c8805d	refs/tags/v3.2.5
Merge: b6727a1 4ce7f98
Author: Aaron Patterson 
Date:   2012-05-30 17:26:15 -0700

    Merge pull request #6558 from parndt/fix_regression
    
    Fix regression

commit 4ce7f98	refs/tags/v3.2.5
Author: Philip Arndt 
Date:   2012-05-31 12:15:38 +1200

    Revert "Removes unneeded caching from ActiveRecord::Base.relation"
    This reverts commit ebfa58abc895c0639211cb896a47b04e424322c8.
    
    This change caused a regression in my application's tests:
    
    * Failing build http://travis-ci.org/#!/resolve/refinerycms/builds/1461242
    
    Broken tests pass after this change is reverted.

M	activerecord/lib/active_record/base.rb

commit c202638	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-05-30 15:13:03 -0700

    Strip [nil] from parameters hash.
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
    
    Conflicts:
    
    	actionpack/lib/action_dispatch/http/request.rb

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit 5b83bbf	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-05-30 15:13:03 -0700

    Strip [nil] from parameters hash.
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit dff6db1	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-05-30 15:13:03 -0700

    Strip [nil] from parameters hash.
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit 060c91c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-30 15:13:03 -0700

    Strip [nil] from parameters hash.
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb

commit 9340f89	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-30 15:09:13 -0700

    predicate builder should not recurse for determining where columns.
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb
A	activerecord/test/cases/relation/where_test.rb

commit 99f0309	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-05-30 15:06:12 -0700

    predicate builder should not recurse for determining where columns.
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661

M	activerecord/lib/active_record/relation/predicate_builder.rb
A	activerecord/test/cases/relation/where_test.rb

commit b71d4ab	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-05-30 15:05:19 -0700

    predicate builder should not recurse for determining where columns.
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb
A	activerecord/test/cases/relation/where_test.rb

commit 71f7917	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-05-30 15:04:11 -0700

    predicate builder should not recurse for determining where columns.
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb
A	activerecord/test/cases/relation/where_test.rb

commit 4056915	refs/heads/master
Merge: c56ef67 dce0afd
Author: Rafael Mendonça França 
Date:   2012-05-30 14:49:59 -0700

    Merge pull request #6276 from samoli/fix_console_arguments
    
    Fix various bugs with console arguments and improve test coverage

commit dce0afd	refs/heads/master
Author: Sam Oliver 
Date:   2012-05-15 10:37:54 +0100

    Remove support for rails server RAILS_ENV=env-name

M	railties/lib/rails/commands/server.rb
M	railties/test/commands/server_test.rb

commit cdd6d9b	refs/heads/master
Author: Sam Oliver 
Date:   2012-05-11 22:19:58 +0100

    Fix various bugs with console arguments.
    Allow hyphens in environment names again.

M	railties/lib/rails/commands.rb
M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/commands/dbconsole.rb
M	railties/test/commands/console_test.rb
M	railties/test/commands/dbconsole_test.rb

commit b6727a1	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-05-30 13:43:11 -0700

    Merge pull request #6477 from steveklabnik/close_discovered_pg_connection
    
    Properly discover a connection is closed in postgresql_adapter

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit c56ef67	refs/heads/master
Merge: fd97266 4dacac3
Author: Rafael Mendonça França 
Date:   2012-05-30 13:43:11 -0700

    Merge pull request #6477 from steveklabnik/close_discovered_pg_connection
    
    Properly discover a connection is closed in postgresql_adapter

commit fd97266	refs/heads/master
Merge: aab0d4e ab7a80e
Author: Rafael Mendonça França 
Date:   2012-05-30 13:33:32 -0700

    Merge pull request #6556 from lest/patch-1
    
    accept a block in button_to helper

commit ab7a80e	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-05-30 23:15:15 +0300

    accept a block in button_to helper
    
    Make possible to use a block in button_to helper if button text is hard
    to fit into the name parameter, e.g.:
    
        <%= button_to [:make_happy, @user] do %>
          Make happy <%= @user.name %>
        <% end %>
        # => "
        #      

        #        
        #      

        #    "

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit 9f1b689	refs/tags/v3.2.5
Merge: c470001 bcfa013
Author: Piotr Sarnacki 
Date:   2012-05-30 13:06:50 -0700

    Merge pull request #6553 from erichmenge/3-2-stable-json-patch
    
    3 2 stable json patch

commit aab0d4e	refs/heads/master
Merge: d5025f1 1f5dddc
Author: Piotr Sarnacki 
Date:   2012-05-30 13:04:33 -0700

    Merge pull request #6554 from erichmenge/remove-json-variable
    
    Remove deprecated ActiveSupport::JSON::Variable.

commit 1376f4c	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-05-30 23:02:26 +0300

    no need to pass an empty block to button_to helper

M	actionpack/test/controller/request_forgery_protection_test.rb

commit 1f5dddc	refs/heads/master
Author: Erich Menge 
Date:   2012-05-30 12:18:29 -0500

    Remove deprecated ActiveSupport::JSON::Variable.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/json/encoding.rb
D	activesupport/lib/active_support/json/variable.rb
M	activesupport/test/json/encoding_test.rb

commit bcfa013	refs/tags/v3.2.5
Author: Erich Menge 
Date:   2012-05-30 11:29:09 -0500

    Deprecate ActiveSupport::JSON::Variable

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/json/variable.rb
M	activesupport/test/json/encoding_test.rb

commit d5025f1	refs/heads/master
Merge: 61bb6c2 7b6bf02
Author: Rafael Mendonça França 
Date:   2012-05-30 12:15:21 -0700

    Merge pull request #6541 from tjouan/tj/activesupport-fix-tests-requiring-unsafe-umask
    
    Make  tests pass with umask

commit c470001	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-05-30 11:26:59 -0700

    Merge pull request #5810 from kennyj/fix_5797
    
    Fix #5797. Error calling dup method on AR model with serialized field
    Conflicts:
    	activerecord/lib/active_record/core.rb

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/test/cases/base_test.rb

commit 61bb6c2	refs/heads/master
Merge: 1b07522 0460949
Author: Rafael Mendonça França 
Date:   2012-05-30 11:44:13 -0700

    Merge pull request #6555 from schneems/schneems/remove-reload-code
    
    Remove Unused Route Reloading Code

commit 0460949	refs/heads/master
Author: schneems 
Date:   2012-05-30 20:38:26 +0200

    remove unused route reloading code
    
    Since the environment is initialized each time rake is run, routes don't need to be re-loaded. https://github.com/rails/rails/pull/6461#r869953

M	railties/lib/rails/tasks/routes.rake

commit 1b07522	refs/heads/master
Merge: 7c1b61e d09b2fd
Author: Aaron Patterson 
Date:   2012-05-30 11:26:59 -0700

    Merge pull request #5810 from kennyj/fix_5797
    
    Fix #5797. Error calling dup method on AR model with serialized field

commit 7c1b61e	refs/heads/master
Merge: 9ed62ad 576d700
Author: Aaron Patterson 
Date:   2012-05-30 11:06:49 -0700

    Merge pull request #6386 from kennyj/fix_logs_name_consistency
    
    Fix logs name consistency.

commit da0ef60	refs/heads/master
Author: Erich Menge 
Date:   2012-05-30 12:48:57 -0500

    Fix typo [ci skip]

M	activesupport/lib/active_support/json/encoding.rb

commit 9ed62ad	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-30 23:08:00 +0530

    cut down spaces [ci skip]

M	guides/source/active_record_querying.textile

commit 3b6d66a	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-30 23:05:48 +0530

    Revert "Revert "[AR querying guide] Add examples for take(limit), first(limit) and last(limit)""
    
    This reverts commit 5559a2ae98dcda6854f38890025b52edfb2836f5.
    
    Reason: These are for selecting multiple objects and there isn't a need
    to club them with the selecting single objects section, as discussed
    with the author.

M	guides/source/active_record_querying.textile

commit ec74763	refs/heads/master
Merge: 0406a13 032f502
Author: Vijay Dev 
Date:   2012-05-30 22:53:52 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 032f502	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-30 22:40:49 +0530

    copy edit the batches docs [ci skip]

M	activerecord/lib/active_record/relation/batches.rb

commit 2adba2e	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-30 22:40:31 +0530

    let's not add too much details upfront in the introduction [ci skip]

M	guides/source/migrations.textile

commit 5559a2a	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-30 22:29:02 +0530

    Revert "[AR querying guide] Add examples for take(limit), first(limit) and last(limit)"
    
    This reverts commit 724d6fa6bb48b61798c223b47dd27155839c40d5.
    
    Reason: This is already documented in another section, albeit without
    the arguments examples. Let's add them in another commit in the
    appropriate sections
    
    [ci skip]

M	guides/source/active_record_querying.textile

commit e591b7b	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-30 22:28:58 +0530

    some copy edits [ci skip]

M	activesupport/lib/active_support/core_ext/array/conversions.rb

commit 624f801	refs/tags/v3.2.5
Author: Erich Menge 
Date:   2012-05-30 10:24:23 -0500

    True, False, and Nil should be represented in as_json as themselves.
    
    Conflicts:
    
    	activesupport/lib/active_support/json/encoding.rb
    	activesupport/test/json/encoding_test.rb

M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/json/encoding_test.rb

commit 0406a13	refs/heads/master
Merge: 0cc4e37 f7ed0af
Author: José Valim 
Date:   2012-05-30 08:19:05 -0700

    Merge pull request #6551 from kennyj/add_entry_20120531
    
    Add a railtie's changelog entry about runner hook.

commit f7ed0af	refs/heads/master
Author: kennyj 
Date:   2012-05-31 00:16:13 +0900

    Add a changelog entry about runner hook.

M	railties/CHANGELOG.md

commit d09b2fd	refs/heads/master
Author: kennyj 
Date:   2012-04-11 02:48:28 +0900

    Fix #5797. Error calling dup method on AR model with serialized field

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/test/cases/base_test.rb

commit 0cc4e37	refs/heads/master
Merge: 555d815 397e47d8
Author: José Valim 
Date:   2012-05-30 02:34:09 -0700

    Merge pull request #6550 from arunagw/warning_removed_assert_match
    
    Some of the warnings removed from "railties"

commit 397e47d8	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-30 14:45:30 +0530

    Unused variable warning removed.

M	railties/test/generators_test.rb

commit 05f8802	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-30 14:38:56 +0530

    More assert_match warnings fixed.

M	railties/test/application/configuration_test.rb
M	railties/test/commands/console_test.rb
M	railties/test/commands/dbconsole_test.rb
M	railties/test/generators_test.rb

commit 4646b2e	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-30 14:35:55 +0530

    Warnings removed for "assert_match /".

M	railties/test/application/rake/notes_test.rb

commit 555d815	refs/heads/master
Merge: 70bc0d7 b0e2fc8
Author: José Valim 
Date:   2012-05-29 23:26:26 -0700

    Merge pull request #5843 from kuroda/translation_of_deeply_nested_model_attributes
    
    Fix human attribute_name to handle deeply nested attributes

commit 70bc0d7	refs/heads/master
Merge: 669694f 1e335ad
Author: Jeremy Kemper 
Date:   2012-05-29 21:22:55 -0700

    Merge pull request #6546 from erichmenge/patch-as-json
    
    True, False, and Nil should be represented in as_json as themselves.

commit f09ae85	refs/tags/v3.2.5
Merge: 12e5c72 2f71d40
Author: Carlos Antonio da Silva 
Date:   2012-05-29 20:54:57 -0700

    Merge pull request #6519 from oscardelben/3-2-stable
    
    Display annotations in coffee files

commit 2f71d40	refs/tags/v3.2.5
Author: Oscar Del Ben 
Date:   2012-05-29 08:49:53 -0700

    Remove irrelevant assertion

M	railties/test/application/rake/notes_test.rb

commit 1e335ad	refs/heads/master
Author: Erich Menge 
Date:   2012-05-29 16:40:43 -0500

    True, False, and Nil should be represented in as_json as themselves.

M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/json/encoding_test.rb

commit 6ae626b	refs/heads/master
Author: Brent Vatne 
Date:   2012-05-29 16:35:57 -0700

    fix typo in render_template [ci skip]

M	actionpack/lib/action_view/renderer/template_renderer.rb

commit a546f7f	refs/heads/master
Author: Saulius Grigaliunas 
Date:   2012-05-29 23:44:30 +0100

    Revert my own commit, didnt notice that this was intentional. [ci skip]

M	guides/source/routing.textile

commit 87ba0b4	refs/heads/master
Author: Saulius Grigaliunas 
Date:   2012-05-29 22:46:58 +0100

    Routing guide: route constraints are anchored by default, remove ^ character. [ci skip]

M	guides/source/routing.textile

commit 669694f	refs/heads/master
Merge: 70ad12a eb362e5
Author: Xavier Noria 
Date:   2012-05-29 14:09:08 -0700

    Merge pull request #6502 from rafmagana/guides_refactor_rakefile
    
    [Guides] refactor rakefile to have a :guides namespace and a task that shows help

commit 7b6bf02	refs/heads/master
Author: Thibault Jouan 
Date:   2012-05-29 20:31:21 +0000

    Make File#atomic_write tests pass with umask
    
      Assertions on file permissions only pass with some combinations of
    file create mode and the process file mode creation mask. This mask
    should be applied on the file create mode before related assertions.

M	activesupport/test/core_ext/file_test.rb

commit 97fb1b6	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-29 15:08:53 -0500

    fix typo on ActiveSupport instrumentation guide [ci skip]

M	guides/source/active_support_instrumentation.textile

commit 70ad12a	refs/heads/master
Author: Xavier Noria 
Date:   2012-05-29 21:26:04 +0200

    copy edits the upgrading guide

M	guides/source/upgrading_ruby_on_rails.textile

commit 9fa3926	refs/heads/master
Merge: d46a368 c0ba0f0
Author: José Valim 
Date:   2012-05-29 08:48:00 -0700

    Merge pull request #6518 from kennyj/fix_5847-4
    
    (Try again) Fix #5847 and #4045.

commit c0ba0f0	refs/heads/master
Author: kennyj 
Date:   2012-05-29 00:47:10 +0900

    Fix #5847 and #4045 on master.

M	activerecord/lib/active_record/railtie.rb

commit cc7dd66	refs/heads/master
Author: kennyj 
Date:   2012-05-29 23:43:46 +0900

    Use runner hook to load ActiveRecord::Base.

M	activerecord/lib/active_record/railtie.rb

commit f8e7904	refs/heads/master
Author: kennyj 
Date:   2012-05-29 23:31:27 +0900

    Add support runner hook.

M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/runner.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie.rb
M	railties/test/application/runner_test.rb
M	railties/test/railties/railtie_test.rb

commit 5cc9c7e	refs/heads/master
Author: kennyj 
Date:   2012-05-29 00:31:24 +0900

    SchemaMigration should be loaded lazily.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/migration.rb

commit 8d01c61	refs/heads/master
Author: kennyj 
Date:   2012-05-29 00:10:04 +0900

    Add a testcase for #5847.

M	railties/test/application/rake_test.rb

commit d46a368	refs/heads/master
Merge: 6ba93ac 3335cb7
Author: Carlos Antonio da Silva 
Date:   2012-05-29 05:05:14 -0700

    Merge pull request #6535 from arunagw/jruby_module_test
    
    JRuby return different Array for module contents.

commit 3335cb7	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-29 17:26:50 +0530

    JRuby return different Array for module contents.
    
    Test was failing against JRuby.
    
    It loads like [Constant3 Constant1]

M	activesupport/test/core_ext/module_test.rb

commit 2f42815	refs/tags/v3.1.6
Merge: a74b6a0 4cd3285
Author: Rafael Mendonça França 
Date:   2012-05-29 04:03:18 -0700

    Merge pull request #6532 from freerange/3-1-stable-minitest-passthrough-exceptions
    
    Exceptions like Interrupt should not be rescued in tests.

commit 12e5c72	refs/tags/v3.2.5
Merge: 0e69705 0813b45
Author: Rafael Mendonça França 
Date:   2012-05-29 03:56:34 -0700

    Merge pull request #6531 from freerange/3-2-stable-minitest-passthrough-exceptions
    
    Exceptions like Interrupt should not be rescued in tests.

commit 4cd3285	refs/tags/v3.1.6
Author: James Mead 
Date:   2012-05-29 11:14:50 +0100

    Exceptions like Interrupt should not be rescued in tests.
    
    This is a back-port of rails/rails#6525. See the commit notes there for
    details.

M	activesupport/lib/active_support/testing/setup_and_teardown.rb
M	activesupport/test/test_case_test.rb

commit 0813b45	refs/tags/v3.2.5
Author: James Mead 
Date:   2012-05-29 11:14:50 +0100

    Exceptions like Interrupt should not be rescued in tests.
    
    This is a back-port of rails/rails#6525. See the commit notes there for
    details.

M	activesupport/lib/active_support/testing/setup_and_teardown.rb
M	activesupport/test/test_case_test.rb

commit 73cf866	refs/remotes/origin/cat-gemfile-test (origin/cat-gemfile-test)
Author: Piotr Sarnacki 
Date:   2012-05-29 10:40:14 +0200

    `cat Gemfile.lock` after installing gems on travis
    
    It may be useful to view Gemfile.lock. If the build fails we can inspect
    it locally with exactly the same environment.

M	.travis.yml

commit 6ba93ac	refs/heads/master
Merge: 2d898cd 7d8e5fa
Author: José Valim 
Date:   2012-05-29 01:35:40 -0700

    Merge pull request #6525 from freerange/minitest-passthrough-exceptions
    
    Exceptions like Interrupt & NoMemoryError should not be rescued in tests.

commit 7d8e5fa	refs/heads/master
Author: James Mead 
Date:   2012-05-29 09:28:22 +0100

    Avoid dependency on MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.

M	activesupport/lib/active_support/testing/setup_and_teardown.rb

commit 2d898cd	refs/heads/master
Merge: d4a7dee 5db367a
Author: José Valim 
Date:   2012-05-29 01:01:38 -0700

    Merge pull request #6528 from frodsan/update_hash_syntax_gemfile_template
    
    update Gemfile template to 1.9 hash syntax

commit 5db367a	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-29 00:20:05 -0500

    update Gemfile template to 1.9 hash syntax

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 5487dab	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-29 00:00:32 -0500

    fix example format and add markup in Module#mattr_accessor documentation [ci skip]

M	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb

commit d4a7dee	refs/heads/master
Merge: 3d4ede2 598f8bd
Author: Carlos Antonio da Silva 
Date:   2012-05-28 21:54:36 -0700

    Merge pull request #6526 from appfolio/decoupling_activesupport_from_actionivew
    
    Decoupling ActiveSupport from ActionView

commit 34f82ab	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 23:41:49 -0500

    fix typos on migrations guide [ci skip]

M	guides/source/migrations.textile

commit 598f8bd	refs/heads/master
Author: Andrew Mutz 
Date:   2012-05-28 20:09:54 -0700

    decoupling activesupport performance testing from actionview and adding tests

M	activesupport/lib/active_support/testing/performance.rb
A	activesupport/test/testing/performance_test.rb

commit 3d4ede2	refs/heads/master
Merge: 8795ac5 b89553c
Author: Carlos Antonio da Silva 
Date:   2012-05-28 21:04:40 -0700

    Merge pull request #6527 from frodsan/add_test_to_delete_by_fixnum_or_string
    
    Add tests to delete by fixnum or string id with has many through associations

commit b89553c	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 22:31:41 -0500

    Add tests to delete by fixnum or string id with has many through associations

M	activerecord/test/cases/associations/join_model_test.rb

commit 8795ac5	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-29 00:19:39 -0300

    Add note about CollectionAssociation#delete change to upgrading guide [ci skip]

M	guides/source/upgrading_ruby_on_rails.textile

commit 18af5da	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-29 00:18:27 -0300

    Fix failing build related to change in CollectionAssociation#delete
    
    Merge commit 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e

M	activerecord/test/cases/associations/join_model_test.rb

commit 400c5fe	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-28 23:48:05 -0300

    Review requires from number helper
    
    Some of these requires are now only necessary in
    ActiveSupport::NumberHelper. Add hash/keys require due to symbolize_keys
    usage in number helpers. Also remove some whitespaces.
    
    Closes #6414

M	actionpack/lib/action_view/helpers/number_helper.rb
M	activesupport/lib/active_support/core_ext/numeric/conversions.rb
M	activesupport/lib/active_support/number_helper.rb

commit 2c4da97	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-28 21:46:52 -0500

    [contributing guide] add instructions to update fork [ci skip]

M	guides/source/contributing_to_ruby_on_rails.textile

commit f9cb645	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-24 20:50:44 -0300

    Yield only one argument instead of splatting.
    
    Add Changelog entry. Closes #4003

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/calculations.rb

commit 9cc2bf6	refs/heads/master
Author: chrisfinne 
Date:   2011-12-16 08:10:05 -0800

    Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 6f1d9d0	refs/heads/master
Merge: ef3e696 39f0698
Author: Carlos Antonio da Silva 
Date:   2012-05-28 19:15:21 -0700

    Merge pull request #6511 from frodsan/add_fixnum_string_support_for_delete
    
    Add support for CollectionAssociation#delete by Fixnum or String

commit ef3e696	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-28 22:58:41 -0300

    Parse float value only once in number helpers
    
    Refactor number helpers output with safety handling to call float
    parsing only once. Also remove 'erb' require.

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 39f0698	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 19:56:54 -0500

    Add support for CollectionAssociation#delete by Fixnum or String
    
    I found the next issue between CollectionAssociation `delete`
    and `destroy`.
    
        class Person < ActiveRecord::Base
          has_many :pets
        end
    
        person.pets.destroy(1)
        # => OK, returns the destroyed object
    
        person.pets.destroy("2")
        # => OK, returns the destroyed object
    
        person.pets.delete(1)
        # => ActiveRecord::AssociationTypeMismatch
    
        person.pets.delete("2")
        # => ActiveRecord::AssociationTypeMismatch
    
    Adding support for deleting with a fixnum or string like
    `destroy` method.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit cfe731c	refs/heads/master
Author: jordanstaub 
Date:   2012-05-28 20:53:04 -0400

    Added information regarding the schema_migrations table in Active Record Migrations guide.

M	guides/source/migrations.textile

commit b057fab	refs/heads/master
Author: James Mead 
Date:   2012-05-28 22:44:28 +0100

    Exceptions like Interrupt should not be rescued.
    
    Neither Test::Unit nor MiniTest rescue exceptions like Interrupt or
    NoMemoryError, but ActiveSupport::Testing::SetupAndTeardown#run which
    overrides MiniTest::Unit::TestCase#run rescues them.
    
    Rescuing an Interrupt exception is annoying, because it means when you
    are running a lot of tests e.g. when running one of the rake test tasks,
    you cannot break out using ctrl-C.
    
    Rescuing exceptions like NoMemoryError is foolish, because the most
    sensible thing to happen is for the process to terminate as soon as
    possible.
    
    This solution probably needs some finessing e.g. I'm not clear whether
    the assumption is that only MiniTest is supported. Also early versions
    of MiniTest did not have this behaviour. However, hopefully it's a
    start.
    
    Integrating with Test::Unit & MiniTest has always been a pain. It would
    be great if both of them provided sensible extension points for the kind
    of things that both Rails and Mocha want to do.

M	activesupport/lib/active_support/testing/setup_and_teardown.rb
M	activesupport/test/test_case_test.rb

commit eb362e5	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-28 16:21:25 -0500

    [guides] fix reference to railties directory, guides are no longer there

M	guides/rails_guides/generator.rb

commit 15b229e	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-28 16:20:10 -0500

    [guides] guides:generate:kindle is the new interface to generate .mobi file instead of using KINDLE=1

M	guides/Rakefile
M	guides/rails_guides/generator.rb
M	guides/source/ruby_on_rails_guides_guidelines.textile

commit 1b5e1c1	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-28 16:17:00 -0500

    [guides] get rid of any reference to the generator script since rake tasks are now the new interface

M	guides/Rakefile
M	guides/rails_guides/generator.rb

commit 68f23be	refs/heads/master
Merge: f5e26bc d64b254
Author: José Valim 
Date:   2012-05-28 13:46:53 -0700

    Merge pull request #6522 from lest/patch-1
    
    ActiveSupport require and dependencies

commit d64b254	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-05-28 23:32:14 +0300

    make AS::Multibyte::Chars work w/o multibyte core ext
    
    Use ActiveSupport::Multibyte::Chars.new instead of String#mb_chars.
    It allows to use ActiveSupport::Multibyte::Chars without requiring
    String multibyte core extension.

M	activesupport/lib/active_support/multibyte/chars.rb

commit 7dd80d6	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-05-28 23:32:04 +0300

    remove unnecessary require
    
    AS::Multibyte are no longer required by access and filters string
    core extensions.

M	activesupport/lib/active_support/core_ext/string/access.rb
M	activesupport/lib/active_support/core_ext/string/filters.rb

commit fe4dfdd	refs/tags/v3.2.4.rc1 (tag: v3.2.4.rc1)
Author: Aaron Patterson 
Date:   2012-05-28 11:58:15 -0700

    bumping to 3.2.4.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit bd8ee8c	refs/tags/v3.1.5.rc1 (tag: v3.1.5.rc1)
Author: Aaron Patterson 
Date:   2012-05-28 11:54:56 -0700

    bumping to 3.1.5.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 88e7f51	refs/tags/v3.0.13.rc1 (tag: v3.0.13.rc1)
Author: Aaron Patterson 
Date:   2012-05-28 11:48:02 -0700

    bumping to 3.0.13.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 4ababde	refs/tags/v3.2.5
Author: Bartlomiej Kozal 
Date:   2012-02-05 16:29:24 +0100

    Display annotations from .coffee files in `rake notes`

M	railties/lib/rails/source_annotation_extractor.rb
M	railties/test/application/rake/notes_test.rb

commit 724d6fa	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-28 11:20:13 -0500

    [AR querying guide] Add examples for take(limit), first(limit) and last(limit)

M	guides/source/active_record_querying.textile

commit 501d98b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 10:41:42 -0500

    change example on CollectionProxy#delete to accept multiple values

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit f5e26bc	refs/heads/master
Merge: 5acb10d b3ccd7b
Author: José Valim 
Date:   2012-05-28 07:08:05 -0700

    Merge pull request #6517 from purcell/validates-false-value
    
    Don't enable validations when passing false hash values to ActiveModel.validates

commit b3ccd7b	refs/heads/master
Author: Steve Purcell 
Date:   2012-05-28 14:39:09 +0100

    Don't enable validations when passing false hash values to ActiveModel.validates
    
    Passing a falsey option value for a validator currently causes that validator to
    be enabled, just like "true":
    
        ActiveModel.validates :foo, :presence => false
    
    This is rather counterintuitive, and makes it inconvenient to wrap `validates` in
    methods which may conditionally enable different validators.
    
    As an example, one is currently forced to write:
    
          def has_slug(source_field, options={:unique => true})
            slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? }
            before_validation slugger
            validations = { :presence => true, :slug => true }
            if options[:unique]
              validations[:uniqueness] = true
            end
            validates :slug, validations
          end
    
    because the following reasonable-looking alternative fails to work as expected:
    
          def has_slug(source_field, options={:unique => true})
            slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? }
            before_validation slugger
            validates :slug, :presence => true, :slug => true, :uniqueness => options[:unique]
          end
    
    (This commit includes a test, and all activemodel and activerecord tests pass as before.)

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/test/cases/validations_test.rb

commit 5acb10d	refs/heads/master
Merge: 135f620 371508c
Author: José Valim 
Date:   2012-05-28 01:52:40 -0700

    Merge pull request #6512 from jaredbeck/fix_number_to_currency_neg_format
    
    Fix handling of negative zero in number_to_currency

commit 371508c	refs/heads/master
Author: Jared Beck 
Date:   2012-05-28 04:42:53 -0400

    Fix handling of negative zero in number_to_currency

M	activesupport/lib/active_support/number_helper.rb
M	activesupport/test/number_helper_test.rb

commit 95fde2c	refs/heads/master
Author: Alvaro Pereyra 
Date:   2012-05-28 03:24:52 -0500

    Updates Array conversions method documentations and clean ups

M	activesupport/lib/active_support/core_ext/array/conversions.rb

commit 2bef137	refs/heads/master
Author: Alvaro Pereyra 
Date:   2012-05-28 03:24:37 -0500

    Adds to Batch processing documentation [ci skip]

M	activerecord/lib/active_record/relation/batches.rb

commit 21fee1b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 03:17:41 -0500

    add ActiveSupport::JSON.decode documentation [ci skip]

M	activesupport/lib/active_support/json/decoding.rb

commit 070fb46	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 03:10:51 -0500

    add example to ActiveSupport::JSON.encode [ci skip]

M	activesupport/lib/active_support/json/encoding.rb

commit a3d18d2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 02:55:11 -0500

    fix typo and remove 'examples' noise [ci skip]

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 39e872b	refs/heads/master
Merge: 19de3d8 a42bc4c
Author: Alvaro Pereyra 
Date:   2012-05-28 02:52:21 -0500

    Merge branch 'master' of github.com:lifo/docrails

commit 19de3d8	refs/heads/master
Author: Alvaro Pereyra 
Date:   2012-05-28 02:51:47 -0500

    Updates examples for FinderMethods [ci skip]

M	activerecord/lib/active_record/relation/finder_methods.rb

commit a42bc4c	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 02:40:26 -0500

    fix empty lines [ci skip]

M	activesupport/lib/active_support/core_ext/array/conversions.rb
M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb

commit 72973a3	refs/heads/master
Merge: 0118636 0ad2146
Author: Alvaro Pereyra 
Date:   2012-05-28 02:29:46 -0500

    Merge branch 'master' of github.com:lifo/docrails

commit 0118636	refs/heads/master
Author: Alvaro Pereyra 
Date:   2012-05-28 02:28:35 -0500

    Adds examples to FinderMethods#first [ci skip]

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 422d3a4	refs/heads/master
Author: Alvaro Pereyra 
Date:   2012-05-28 02:25:05 -0500

    Updates documentation with cleaner examples and texts [ci skip]

M	activesupport/lib/active_support/core_ext/array/conversions.rb
M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb

commit 0ad2146	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 02:18:35 -0500

    remove :nodoc: from Class#subclasses [ci skip]

M	activesupport/lib/active_support/core_ext/class/subclasses.rb

commit 135f620	refs/heads/master
Merge: e4aaac1 155cd5e
Author: José Valim 
Date:   2012-05-28 00:09:46 -0700

    Merge pull request #6315 from appfolio/moving_number_helper_methods_to_active_support
    
    Moving number helper from ActionView to Active Support

commit ca65dcb	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-28 01:47:48 -0500

    [command line guide] Use actual output of a Rails 3.2.x app

M	guides/source/command_line.textile

commit da4252f	refs/heads/master
Author: Alvaro Pereyra 
Date:   2012-05-28 01:45:33 -0500

    Updates validations examples to be more attuned on the new Rails 3.0 conventions

M	activerecord/README.rdoc

commit fabd2ce	refs/heads/master
Merge: c6219b0 da4252f
Author: Xenda 
Date:   2012-05-27 23:42:52 -0700

    Merge pull request #102 from xenda/master
    
    Small fix to update the README using more up to date conventions.

commit c6219b0	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 01:24:34 -0500

    add :locale option to Array#to_sentence documentation [ci skip]

M	activesupport/lib/active_support/core_ext/array/conversions.rb

commit 1e1d1da	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 01:23:38 -0500

    add examples to Array#to_sentence [ci skip]

M	activesupport/lib/active_support/core_ext/array/conversions.rb

commit b4f0beb	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-28 00:32:17 -0500

    update documentation of array/access methods [ci skip]

M	activesupport/lib/active_support/core_ext/array/access.rb

commit ef49805	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-28 00:17:20 -0500

    [security guide] use info, note and warning where applicable

M	guides/source/security.textile

commit de64945	refs/heads/master
Merge: d138921 dc8957a
Author: Francesco Rodríguez 
Date:   2012-05-27 22:03:57 -0700

    Merge pull request #101 from lazylester/master
    
    small addition to engines guide

commit e4aaac1	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-27 14:01:44 +0200

    Fix sorting of helpers from different paths
    
    When more than one directory for helpers is provided to a controller, it
    should preserver the order of directories. Given 2 paths:
    
        MyController.helpers_paths = ["dir1/helpers", "dir2/helpers"]
    
    helpers from dir1 should be loaded first. Before this commit, all
    helpers were mixed and then sorted alphabetically, which essentially
    would require to rename helpers to get desired order.
    
    This is a problem especially for engines, where you would like to be
    able to predict accurately which engine helpers will load first.
    
    (closes #6496)

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/helpers.rb
M	actionpack/test/controller/helper_test.rb
A	actionpack/test/fixtures/helpers1_pack/pack1_helper.rb
A	actionpack/test/fixtures/helpers2_pack/pack2_helper.rb
M	guides/source/upgrading_ruby_on_rails.textile

commit e625056	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-27 23:33:54 -0500

    [guides] update generator.rb to refer to guides:generate instead of generate_guides

M	guides/rails_guides/generator.rb

commit 840e688	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-27 23:30:38 -0500

    [guides] update guides guidelines with the new generation and validation rake tasks

M	guides/source/ruby_on_rails_guides_guidelines.textile

commit 155cd5e	refs/heads/master
Author: Andrew Mutz 
Date:   2012-05-14 17:47:55 -0700

    Moving NumberHelpers from ActionView to ActiveSupport

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/locale/en.yml
M	actionpack/test/template/number_helper_test.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
M	activesupport/lib/active_support/core_ext/numeric.rb
A	activesupport/lib/active_support/core_ext/numeric/conversions.rb
M	activesupport/lib/active_support/locale/en.yml
A	activesupport/lib/active_support/number_helper.rb
M	activesupport/test/core_ext/bigdecimal_test.rb
M	activesupport/test/core_ext/numeric_ext_test.rb
A	activesupport/test/number_helper_test.rb
M	guides/source/active_support_core_extensions.textile

commit d138921	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-05-27 08:25:00 -0700

    "a sql" -> "an SQL" per API documentation guidelines

M	activerecord/lib/active_record/relation/calculations.rb
M	guides/source/active_support_instrumentation.textile

commit 490b52e	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-27 20:01:55 +0530

    some asset path changes and formatting fixes in AV overview [ci skip]

M	guides/source/action_view_overview.textile

commit 523d0f0	refs/heads/master
Merge: cf992fb 903a9d5
Author: Vijay Dev 
Date:   2012-05-27 19:51:33 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 903a9d5	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-27 19:45:52 +0530

    copy edits [ci skip]

M	guides/source/security.textile

commit cf992fb	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-27 12:28:26 +0200

    Fix railties_order when application object is passed
    
    railites_order method, introduced in 40b19e0, had a bug that was causing
    loading application instance twice in initializers if railties_order
    already included application instance. So for example
    
        railties_order = [Foo::Engine, :main_app, Bar::Engine]
    
    would result in such railties array:
    
        [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]
    
    In order to fix it, we need to check for existence of application in
    both railties_order and railties arrays.

M	railties/lib/rails/application.rb
M	railties/test/railties/engine_test.rb

commit 0e69705	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-27 12:28:26 +0200

    Fix railties_order when application object is passed
    
    railites_order method, introduced in 40b19e0, had a bug that was causing
    loading application instance twice in initializers if railties_order
    already included application instance. So for example
    
        railties_order = [Foo::Engine, :main_app, Bar::Engine]
    
    would result in such railties array:
    
        [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]
    
    In order to fix it, we need to check for existence of application in
    both railties_order and railties arrays.

M	railties/lib/rails/application.rb
M	railties/test/railties/engine_test.rb

commit 81ad94e	refs/tags/v3.2.5
Merge: c90f3de ba6d935
Author: José Valim 
Date:   2012-05-27 00:30:19 -0700

    Merge pull request #6494 from pwim/no-memcache-require
    
    memcache require not needed for cache store

commit 4f031c8	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-26 23:07:37 -0500

    update Module#mattr_accessor documentation [ci skip]

M	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb

commit 4df16f3	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-26 22:51:26 -0500

    remove unnecessary ruby 1.8 reference from active_record/core [ci skip]

M	activerecord/lib/active_record/core.rb

commit 55c0527	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-26 22:43:24 -0500

    add CollectionProxy#uniq documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 29713d7	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-26 22:28:49 -0500

    update Hash documentation with 1.9 syntax [ci skip]

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit ac50b63	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-26 22:24:06 -0500

    add examples to Hash#deep_stringify_keys and Hash#deep_symbolize_keys [ci skip]

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 349fce2	refs/tags/v3.0.14
Author: Rafael Mendonça França 
Date:   2012-05-26 22:53:17 -0300

    Remove test for not accepted protocols to auto_link

M	actionpack/test/template/text_helper_test.rb

commit 7d8474e	refs/heads/master
Author: Erich Menge 
Date:   2012-05-26 16:39:18 -0500

    Add some information about handle_unverified_request to guides.

M	guides/source/security.textile

commit 4c34cb3	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-27 01:39:54 +0530

    Update initialization guide [ci skip]
    
    * update rails versions
    * remove outdated code snippets
    * few more corrections

M	guides/source/initialization.textile

commit db57e6d	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-26 15:05:52 -0500

    [guides] Add rake task to show help and make it the default one

M	guides/Rakefile

commit e6d7eea	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-26 14:29:47 -0500

    [guides] Add :guides namespace and :html and :kindle tasks to Rakefile

M	guides/Rakefile

commit ef4b3ee	refs/heads/master
Author: Deepak Kannan 
Date:   2012-05-26 23:05:48 +0530

    Revert "Small correction to contributing_to_rails in the section for testing ActiveRecord
"

This reverts commit 0cfbaa030a0684aaa89d3d3c85528e80c1995836.
Sorry did not see the section on MySql and PostgreSQL

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD ..." to unstage)
#
#	modified:   guides/source/contributing_to_ruby_on_rails.textile
#

M	guides/source/contributing_to_ruby_on_rails.textile

commit 2c2b0be	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-26 14:11:28 -0300

    Add `:escape` option for `truncate`
    
    This options can be used to not escape the result by default.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit eedc513	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-26 13:56:42 -0300

    Update the documentation and add CHANGELOG entry

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/text_helper.rb
M	activesupport/lib/active_support/core_ext/string/filters.rb

commit 0cfbaa0	refs/heads/master
Author: Deepak Kannan 
Date:   2012-05-26 22:28:03 +0530

    Small correction to contributing_to_rails in the section for testing ActiveRecord
    
    Initially the guide suggests to install gems via "bundle install --without db"
    But tests for ActiveRecord need to install the gems in db group also, like mysql.
    The patch clears the bundler options in ".bundle/config" and installs all the gems in Gemfile

M	guides/source/contributing_to_ruby_on_rails.textile

commit 4ce3b5d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-26 13:44:30 -0300

    Test that the block used in truncate is escaped if it is not HTML safe
    
    Refactoring the truncate method to not do a sort-circuit return

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit dc8957a	refs/heads/master
Author: Les Nightingill 
Date:   2012-05-26 09:53:16 -0700

    add small note about how to get the full list of options for rails plugin new

M	guides/source/engines.textile

commit 9c8132c	refs/heads/master
Merge: 2114e21 38813da
Author: Rafael Mendonça França 
Date:   2012-05-26 13:34:31 -0300

    Merge pull request #6031 from lellisga/truncate_readme
    
    Truncate now has the ability to receive a html option that allows it to call rails helpers.

commit 5989ffb	refs/tags/v3.0.14
Merge: f7cf745 f35c93f
Author: Rafael Mendonça França 
Date:   2012-05-26 09:25:51 -0700

    Merge pull request #6495 from homakov/3-0-stable
    
    auto_link shouldn't always sanitize

commit 38813da	refs/heads/master
Author: Li Ellis Gallardo 
Date:   2012-04-28 01:48:28 -0500

    Truncate now has the ability to receive a html option that allows it to call rails helpers.
    This way if my text is long I don't have to do something like this:
    
    .text
    = truncate(@text, :length => 27)
    
     if @text.size >= 27
        = link_to "continue", notes_path, ....."")

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 2114e21	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-26 18:07:17 +0530

    some small corrections & wrapping changes in the initialization guide
    
    This guide is currently a wip and pending reviews. [ci skip]

M	guides/source/initialization.textile

commit 575e77b	refs/heads/master
Merge: e8cac28 0673153
Author: Vijay Dev 
Date:   2012-05-26 17:49:59 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 0673153	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-26 17:48:40 +0530

    fix mention of ruby versions that rails 4 won't run on [ci skip]

M	guides/source/initialization.textile

commit 6999b36	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-26 17:45:58 +0530

    make it explicit that bundle install at the time of app creation
    installs only the gems that are already in the gemfile
    
    [ci skip]

M	guides/source/getting_started.textile

commit e8cac28	refs/heads/master
Merge: 4b91183 7cabb57
Author: Vijay Dev 
Date:   2012-05-26 04:56:47 -0700

    Merge pull request #6454 from rafmagana/guides_rails_on_rack
    
    [guides] Update rails on rack

commit 4b91183	refs/heads/master
Merge: 1ca3133 12111e2
Author: Vijay Dev 
Date:   2012-05-26 04:48:56 -0700

    Merge pull request #6491 from rafmagana/getting_started_update_setting_app_home_page
    
    [getting started] Update Setting the Application Home Page to show the generated get "welcome/index" route

commit f35c93f	refs/tags/v3.0.14
Author: homakov 
Date:   2012-05-26 11:25:07 +0400

    do not force sanitize and whitelist protocols for auto_link
    
    sanitize is not always required so we cannot make it. let's just
    whitelist protocols

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 9122143	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-26 16:12:06 +1000

    [routing guide] Add mention of get '/:username' route
    
    This is fairly common in Rails applications and is requested a lot of the time on Stack Overflow and #rubyonrails

M	guides/source/routing.textile

commit 7a323e2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-25 23:09:47 -0500

    add :nodoc: to CollectionProxy#initialize

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit bb55f52	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-25 23:01:38 -0500

    add CollectionProxy#== documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit f81798d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-25 22:45:22 -0500

    add CollectionProxy#count documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 390d86a	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-25 22:18:56 -0500

    add CollectionProxy#to_ary documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 29463aa	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-25 22:08:59 -0500

    add CollectionProxy#delete documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit ba6d935	refs/tags/v3.2.5
Author: Brian Durand 
Date:   2012-02-28 18:14:47 -0600

    remove unnecessary memcache equire in ActionDispatch::Session::CacheStore

M	actionpack/lib/action_dispatch/middleware/session/cache_store.rb

commit 1ca3133	refs/heads/master
Merge: 85c56b0 5662ea5
Author: Aaron Patterson 
Date:   2012-05-25 17:03:21 -0700

    Merge pull request #4132 from Juanmcuello/clone_structure
    
    Reset postgreSQL search path in db:test:clone_structure.

commit 85c56b0	refs/heads/master
Merge: 0777773 1d485d5
Author: Rafael Mendonça França 
Date:   2012-05-25 17:46:54 -0300

    Merge pull request #6493 from markmcspadden/hash_keys_order_methods
    
    Reorder deep_symbolize_keys methods

commit 1d485d5	refs/heads/master
Author: Mark McSpadden 
Date:   2012-05-25 15:29:01 -0500

    Reorder deep_symbolize_keys methods

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 02b2335	refs/heads/master
Author: Patrick Mahoney 
Date:   2012-05-25 13:19:19 -0500

    Make connection pool fair with respect to waiting threads.
    
    The core of this fix is a threadsafe, fair Queue class.  It is
    very similar to Queue in stdlib except that it supports waiting
    with a timeout.
    
    The issue this solves is that if several threads are contending for
    database connections, an unfair queue makes is possible that a thread
    will timeout even while other threads successfully acquire and release
    connections.  A fair queue means the thread that has been waiting the
    longest will get the next available connection.
    
    This includes a few test fixes to avoid test ordering issues that
    cropped up during development of this patch.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
M	activerecord/test/cases/connection_pool_test.rb

commit 40cfcac	refs/heads/master
Author: Yasuo Honda 
Date:   2012-05-24 00:55:53 +0900

    Cache metadata in advance to avoid extra sql statements while testing.
    
    Reason: If metadata is not cached extra sql statements
    will be executed, which causes failures tests with assert_queries().

M	activerecord/test/cases/associations/eager_test.rb

commit 0777773	refs/heads/master
Merge: 1c3469b 6f3489c
Author: Aaron Patterson 
Date:   2012-05-25 10:38:13 -0700

    Merge pull request #5872 from evtuhovich/prepared_statement_fix
    
    Remove prepared statement from system query in postgresql adapter

commit f7cf745	refs/tags/v3.0.14
Merge: e74e479 3af3385
Author: Aaron Patterson 
Date:   2012-05-25 10:31:24 -0700

    Merge pull request #6485 from homakov/3-0-stable
    
    auto_link sanitize output

commit 096cc0e	refs/heads/master
Author: Tadas Tamosauskas 
Date:   2012-05-25 18:25:59 +0100

    Update paths in action_view_overview raislguide to reflect asset pipeline conventions.

M	guides/source/action_view_overview.textile

commit 12111e2	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-25 12:23:04 -0500

    [getting started] Update Setting the Application Home Page to show the get "welcome/index" route

M	guides/source/getting_started.textile

commit c90f3de	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-05-25 12:00:00 -0300

    Merge pull request #5244 from fotos/myqsl2_wait_timeout
    
    Maximum wait_timeout on Windows is 2147483

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 10f16e6	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-25 11:17:14 -0500

    [getting started] specify which kind of temporary files are stored in the /tmp folder

M	guides/source/getting_started.textile

commit 4ce51e3	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-25 09:15:31 -0700

    [Guides] Add missing file descriptions

M	guides/source/initialization.textile

commit 2614926	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-25 08:59:00 -0700

    [Guides] Add inflector example

M	guides/source/initialization.textile

commit 3e7d43b	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-25 11:10:48 -0500

    [getting started] specify what # and $ denotes in the prompt in unix-like OSs

M	guides/source/getting_started.textile

commit 470c151	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-25 11:01:03 -0500

    [getting started] specify that rails new blog executes bundle install

M	guides/source/getting_started.textile

commit 1c3469b	refs/heads/master
Merge: 8e1d46c a2bf014
Author: Rafael Mendonça França 
Date:   2012-05-25 12:00:00 -0300

    Merge pull request #5244 from fotos/myqsl2_wait_timeout
    
    Maximum wait_timeout on Windows is 2147483

commit b98a343	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-25 16:34:34 +0200

    Add comment for attr_accessible/attr_protected :as option. [ci skip]

M	activemodel/lib/active_model/mass_assignment_security.rb

commit cb25bce	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-25 18:30:56 +0400

    Fix unbalanced braces in Hash#typecast_xml_value internal comment

M	activesupport/lib/active_support/core_ext/hash/conversions.rb

commit 8e1d46c	refs/heads/master
Merge: 56417b4 b4167d3
Author: Rafael Mendonça França 
Date:   2012-05-25 07:17:36 -0700

    Merge pull request #6487 from avakhov/range-sum-optimization
    
    Fix Range#sum optimized version

commit b4167d3	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-25 17:46:53 +0400

    Fix Range#sum optimized version
    
    At 1bd4d1c67459a91415ee73a8f55d2309c0d62a87 was added Range#sum
    optimized version for arithmetic progressions. This improvment injected
    a defect with not integer range boundaries. The defect was fixed by
    e0adfa82c05f9c975005f102b4bcaebfcd17d241. The second commit really
    disabled optimization at all because in Ruby integer-valued numbers are
    instances of Fixnum and Bignum classes. We should #use is_a?
    (#kind_of?) method instead #instance_of? to check if value is numerical:
    
        1.class                 # => Fixnum
        1.instance_of?(Integer) # => false
        1.is_a?(Integer)        # => true
    
        -100_000_000_000.class                 # => Bignum
        -100_000_000_000.instance_of?(Integer) # => false
        -100_000_000_000.is_a?(Integer)        # => true
    
    Moreover original implementation of Range#sum has a defect with reverse
    range boundaries. If the first boundary is less than the second range is
    empty. Current commit fixes and tests this case too.

M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/test/core_ext/enumerable_test.rb

commit a1a16de	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-25 17:00:51 +0400

    Clean Date#beginning_of_month description
    
    Unnecessary peace of text was injected at
    507da04a149b44e20c5a0ba72a218fe1762b6baf by mistake.

M	activesupport/lib/active_support/core_ext/date/calculations.rb

commit 852ff78	refs/heads/master
Merge: 17eedd8 d834111
Author: Mikhail Vaysman <9996113+github@gmail.com>
Date:   2012-05-25 16:59:13 +0400

    Merge branch 'master' of github.com:lifo/docrails

commit 17eedd8	refs/heads/master
Author: Mikhail Vaysman <9996113+github@gmail.com>
Date:   2012-05-25 16:58:43 +0400

    references to the old behavior removed

M	actionpack/lib/action_dispatch/testing/integration.rb

commit d834111	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-25 16:47:00 +0400

    Update examples of Array #in_groups and #in_groups_of
    
    Examples should be not square to visually underline a difference between
    Array#in_groups and Array#in_groups_of.

M	activesupport/lib/active_support/core_ext/array/grouping.rb

commit 56417b4	refs/heads/master
Merge: 73db73f c140a27
Author: José Valim 
Date:   2012-05-25 00:29:07 -0700

    Merge pull request #4785 from ayamomiji/add-self-to-allow-method-name-using-ruby-keyword
    
    add `self.` to allow method name using ruby keyword

commit 73db73f	refs/heads/master
Author: José Valim 
Date:   2012-05-25 09:27:39 +0200

    Remove implicit dependency on pathname

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 3af3385	refs/tags/v3.0.14
Author: homakov 
Date:   2012-05-25 11:06:22 +0400

    auto_link final sanitize

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 05ae220	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-25 10:23:44 +0400

    Fix ActiveSupport Cache decrement method description

M	activesupport/lib/active_support/cache.rb

commit ec8c4b5	refs/heads/master
Merge: 641ab7c baa3363
Author: José Valim 
Date:   2012-05-24 23:23:05 -0700

    Merge pull request #6482 from waseem/fix_build_4008
    
    Fixes build 4008.1

commit baa3363	refs/heads/master
Author: Waseem Ahmad 
Date:   2012-05-25 09:49:34 +0530

    Fixes build 4008.1
    
    This fixex build 4008.1[1] because of the changes made in
    
    4001835db00ce44cb75bca33ec02cd76b8ccc790
    
    [1] http://travis-ci.org/#!/rails/rails/jobs/1429671

M	railties/test/paths_test.rb

commit 641ab7c	refs/heads/master
Merge: d476129 4459125
Author: Rafael Mendonça França 
Date:   2012-05-24 19:35:59 -0700

    Merge pull request #6481 from schneems/schneems/sextant-routes
    
    Remove Unnecessary Test from route_inspect_test

commit 4459125	refs/heads/master
Author: schneems 
Date:   2012-05-24 21:31:09 -0500

    remove unnecessary test from route_inspect_test

M	railties/test/application/route_inspect_test.rb

commit d476129	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-24 15:54:30 -0700

    do not set the ENGINE_PATH to nil

M	railties/lib/rails/tasks/engine.rake

commit d5dc462	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-24 14:55:38 -0700

    `name` should be public.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit 317f494	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-24 19:18:28 -0300

    Add missing requires for deep_dup and hash ext test

M	activesupport/lib/active_support/core_ext/object/deep_dup.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 6775ad8	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-24 15:12:11 -0700

    Merge pull request #5925 from Juanmcuello/pg_structure_dump
    
    Quote arguments in db:structure:dump for PostgreSQL.

M	activerecord/lib/active_record/railties/databases.rake

commit a9af9f1	refs/tags/v3.2.5
Merge: 356f2a6 587de84
Author: Carlos Antonio da Silva 
Date:   2012-05-24 15:12:11 -0700

    Merge pull request #5925 from Juanmcuello/pg_structure_dump
    
    Quote arguments in db:structure:dump for PostgreSQL.

commit b0ebdf3	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-24 17:23:26 -0300

    Use deep_dup in the deep_transform_keys tests.
    
    Using only dup make some tests to not catch up an implementation error
    because the methods were changing the nested hashes.
    
    Related to:
    https://github.com/rails/rails/commit/541429fbe49b0671adb3842ab1818230d670ef9f#L1R96

M	activesupport/test/core_ext/hash_ext_test.rb

commit 8186754	refs/heads/master
Merge: abccf82 c3e3102
Author: Andrew White 
Date:   2012-05-24 11:44:03 -0700

    Merge pull request #6461 from schneems/schneems/sextant-routes
    
    View your Routes without waiting on Rake

commit 4dacac3	refs/heads/master
Author: Steve Klabnik 
Date:   2012-05-24 14:36:14 -0400

    Properly discover a connection is closed in postgresql_adapter
    
    PQstatus doesn't properly test if future operations will succeed. A
    PQping function is added to libpq in PostgreSQL 9.1, but if we rely
    on it, everyone on earlier versions of Postgres is out of luck,
    and the pg gem wouldn't have the 'fix' until the next release.
    
    Thanks to @cbrecabarren and @ged for handling all the dirty details.
    
    Closes #3392.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit c3e3102	refs/heads/master
Author: schneems 
Date:   2012-05-23 14:42:28 -0500

    Rails::InfoController tests passing
    
    This includes new tests for /rails/info/routes

M	railties/test/application/route_inspect_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/rails_info_controller_test.rb

commit cb44e0f	refs/heads/master
Author: schneems 
Date:   2012-05-22 18:23:17 -0500

    /rails/info/routes path shows routing information
    
    Will show similar contents to the output of `$ rake routes` in the browser in development. This speeds the time required to generate routes, since the application is already initialized.

M	railties/CHANGELOG.md
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/application/route_inspector.rb
M	railties/lib/rails/info_controller.rb
A	railties/lib/rails/templates/layouts/application.html.erb
A	railties/lib/rails/templates/rails/info/properties.html.erb
A	railties/lib/rails/templates/rails/info/routes.html.erb

commit 0b11840	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-24 08:52:46 -0700

    [Guides] Update rack example

M	guides/source/initialization.textile

commit 2ccc210	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-24 08:51:32 -0700

    [Guides] Add core_ext/object section

M	guides/source/initialization.textile

commit cd6aa9f	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-24 08:43:29 -0700

    [Guides] Rewrite Rails application section

M	guides/source/initialization.textile

commit 27874a8	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-24 08:35:05 -0700

    [Guides] Add extract_options section

M	guides/source/initialization.textile

commit f819b90	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-24 08:29:33 -0700

    [Guides] Update ruby version check

M	guides/source/initialization.textile

commit f2c60c7	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-24 08:26:59 -0700

    [Guides] Add sprockets to list of loaded frameworks

M	guides/source/initialization.textile

commit f1c2727	refs/heads/master
Author: Rory O’Kane 
Date:   2012-05-24 11:39:55 -0400

    capitalize HTML5 in Getting Started Guide
    
    these pages capitalize “HTML5”:
    
    http://en.wikipedia.org/wiki/HTML5
    http://dev.w3.org/html5/spec/
    http://www.html5rocks.com/en/

M	guides/source/getting_started.textile

commit aa54d29	refs/heads/master
Author: Rory O’Kane 
Date:   2012-05-24 11:39:31 -0300

    grammar fixes in a tip in Rails routing guide

M	guides/source/routing.textile

commit abccf82	refs/heads/master
Merge: 95c49f2 66db0b9
Author: José Valim 
Date:   2012-05-24 01:06:43 -0700

    Merge pull request #6471 from parndt/rails_root_should_be_join_able
    
    Fixes possible backward incompatibility

commit 95c49f2	refs/heads/master
Merge: 880481a c97fb88
Author: Piotr Sarnacki 
Date:   2012-05-23 23:08:39 -0700

    Merge pull request #6447 from chancancode/add_backporting_instructions_to_contrib_guides
    
    Added instructions for backporting changes to guides.

commit 66db0b9	refs/heads/master
Author: Philip Arndt 
Date:   2012-05-24 16:29:08 +1200

    Fixed backward incompatibility for engines.
    
    - Many engines rely on being able to join directories to the Rails root:
    
        Rails.root.join('somedir')
    
    - This was now impossible because Rails.root returned a String:
    
        NoMethodError: undefined method `join' for "/code/myrailsapp":String
    
    - This was broken in 4001835db00ce44cb75bca33ec02cd76b8ccc790

M	railties/lib/rails/engine.rb

commit 880481a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-23 16:43:16 -0700

    use File.join rather than depend on Pathname

M	railties/lib/rails/commands/server.rb

commit 9875574	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-23 16:41:40 -0700

    Revert "require the constants we use. ensure that root always returns a Pathname"
    
    This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6.

M	railties/lib/rails/engine/configuration.rb

commit d77b576	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-23 16:12:51 -0700

    require the constants we use. ensure that root always returns a Pathname

M	railties/lib/rails/engine/configuration.rb

commit 4001835	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-23 15:56:49 -0700

    removing more pathnameisms

M	railties/lib/rails/engine.rb
M	railties/lib/rails/paths.rb

commit 4e5175e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-23 15:44:24 -0700

    use File.join to decrease dependencies on Pathname

M	railties/lib/rails/application.rb

commit 03fa708	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-05-24 00:41:13 +0300

    typos

M	guides/source/getting_started.textile

commit 356f2a6	refs/tags/v3.2.5
Merge: ff3cddf e663aa3
Author: Aaron Patterson 
Date:   2012-05-23 13:23:59 -0700

    Merge pull request #6467 from aselder/3-2-stable
    
    Synchronize the body of the ConnectionPool#release method to improve thread safety.

commit 7a23ada	refs/heads/master
Merge: 82b05fb 2b5b60f
Author: Rafael Mendonça França 
Date:   2012-05-23 11:41:58 -0700

    Merge pull request #6466 from markmcspadden/hash_deep_transform_keys
    
    Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert ...

commit 82b05fb	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-23 15:32:05 -0300

    Whitespaces :scissors:

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 925f6bd	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-23 15:30:07 -0300

    PGconn doesn't accepts :checkout_timeout option.
    
    This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e
    renaming the :wait_timeout option.
    
    Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 2b5b60f	refs/heads/master
Author: Mark McSpadden 
Date:   2012-05-23 12:31:35 -0500

    Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert deep_*_keys to use deep_transform_keys.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/hash/keys.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	guides/source/active_support_core_extensions.textile

commit e663aa3	refs/tags/v3.2.5
Author: Andrew Selder 
Date:   2012-05-23 11:08:41 -0700

    Synchronize the ConnectionPool#release method to avoid thread safety issues [#6464]
    
    Fixes #6464
    
    Synchronize the contents of the release method in ConnectionPool due to
    errors when running in high concurrency environments.
    
        Detected invalid hash contents due to unsynchronized modifications
    with concurrent users
        org/jruby/RubyHash.java:1356:in `keys'
    /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
    ctive_record/connection_adapters/abstract/connection_pool.rb:294:in
    `release'
    
    /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
    ctive_record/connection_adapters/abstract/connection_pool.rb:282:in
    `checkin'

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit c97fb88	refs/heads/master
Author: Godfrey Chan 
Date:   2012-05-22 13:16:39 -0700

    Added instructions for backporting changes to guides.
    
    I was looking for instructions on backporting changes the other day and
    wasn't able to find it anywhere. I updated the contrib guides based on
    the disccusion in #6420, #6215 and #6447.

M	guides/source/contributing_to_ruby_on_rails.textile

commit 91305ad	refs/heads/master
Merge: 9ae0c66 1c94868
Author: Vijay Dev 
Date:   2012-05-23 23:26:39 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 9ae0c66	refs/heads/master
Merge: 030e04f d3f57fb
Author: Vijay Dev 
Date:   2012-05-23 10:49:06 -0700

    Merge pull request #6383 from oscardelben/add_oscardelben_to_authors
    
    Add oscardelben to authors

commit 030e04f	refs/heads/master
Merge: 92fd212 60da3bd
Author: Vijay Dev 
Date:   2012-05-23 10:45:57 -0700

    Merge pull request #6194 from ayrton/optimized_images
    
    Optimizing all images used in the guides

commit 1c94868	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-23 23:12:35 +0530

    copy edits in collection proxy docs [ci skip]

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 92fd212	refs/heads/master
Merge: 43893f3 6c7b250
Author: José Valim 
Date:   2012-05-23 10:24:50 -0700

    Merge pull request #6462 from grosser/feature/licenses
    
    Add license field to gemspecs, by Matt Griffin

commit d31b765	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-23 22:49:39 +0530

    Revert "Remove Obsolute root specifiying short syntax"
    
    This reverts commit feaa7b35a0214240eb34780ab51b843571e74904.
    
    Reason: Incorrect change. That's a Rails 4 feature and will not
    obviously work in 3.2.3.
    
    [ci skip]

M	guides/source/routing.textile

commit 1ad0b37	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-23 22:43:08 +0530

    Revert "Remove blank trailing comments"
    
    This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.
    
    Reason: Not a fan of such massive changes. We usually close such changes
    if made to Rails master as a pull request. Following the same principle
    here and reverting.
    
    [ci skip]

M	Rakefile
M	actionmailer/lib/action_mailer/delivery_methods.rb
M	actionmailer/lib/rails/generators/mailer/templates/mailer.rb
M	actionpack/lib/abstract_controller/helpers.rb
M	actionpack/lib/action_controller/base.rb
M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_controller/metal/helpers.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_dispatch/http/mime_negotiation.rb
M	actionpack/lib/action_dispatch/middleware/reloader.rb
M	actionpack/lib/action_dispatch/routing.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/helpers/output_safety_helper.rb
M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	actionpack/lib/action_view/helpers/rendering_helper.rb
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/lib/action_view/helpers/tags/select.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/lib/action_view/template/resolver.rb
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/lib/active_model/callbacks.rb
M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/lint.rb
M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/observing.rb
M	activemodel/lib/active_model/serialization.rb
M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/lib/active_model/validator.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb
M	activerecord/lib/active_record/aggregations.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/callbacks.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/observer.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/models/subject.rb
M	activesupport/lib/active_support/benchmarkable.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/concern.rb
M	activesupport/lib/active_support/configurable.rb
M	activesupport/lib/active_support/core_ext/array/conversions.rb
M	activesupport/lib/active_support/core_ext/array/uniq_by.rb
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/hash/except.rb
M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
M	activesupport/lib/active_support/core_ext/integer/inflections.rb
M	activesupport/lib/active_support/core_ext/kernel/reporting.rb
M	activesupport/lib/active_support/core_ext/module/anonymous.rb
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/lib/active_support/core_ext/module/introspection.rb
M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/lib/active_support/core_ext/object/duplicable.rb
M	activesupport/lib/active_support/core_ext/object/with_options.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/lib/active_support/lazy_load_hooks.rb
M	activesupport/lib/active_support/log_subscriber.rb
M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/notifications.rb
M	activesupport/lib/active_support/ordered_options.rb
M	activesupport/lib/active_support/string_inquirer.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/configuration.rb
M	railties/lib/rails/engine/configuration.rb
M	railties/lib/rails/generators/active_model.rb
M	railties/lib/rails/generators/base.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/resource_helpers.rb
M	railties/lib/rails/generators/test_case.rb
M	railties/lib/rails/railtie.rb
M	railties/test/generators/shared_generator_tests.rb

commit 2642c29	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-23 22:42:49 +0530

    copy edit[ci skip]

M	actionpack/lib/abstract_controller/base.rb

commit 43893f3	refs/heads/master
Merge: 541429f cb6f839
Author: Aaron Patterson 
Date:   2012-05-23 09:39:09 -0700

    Merge pull request #6463 from jrochkind/connection_pool_timeout_keys
    
    ConnectionPool wait_timeout no longer used for different types of timeouts. #6441

commit 6c7b250	refs/heads/master
Author: Matt Griffin 
Date:   2011-10-21 14:24:33 -0400

    Add license field to gemspecs, by Matt Griffin

M	actionmailer/actionmailer.gemspec
M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activerecord/activerecord.gemspec
M	activesupport/activesupport.gemspec
M	rails.gemspec
M	railties/railties.gemspec

commit 541429f	refs/heads/master
Merge: c1487f6 a4bb195
Author: Carlos Antonio da Silva 
Date:   2012-05-23 09:19:56 -0700

    Merge pull request #6060 from lucashungaro/master
    
    Adding deep versions of stringify_keys and symbolize_keys (plain and bang) for nested hashes

commit cb6f839	refs/heads/master
Author: Jonathan Rochkind 
Date:   2012-05-23 12:08:11 -0400

    ConnectionPool wait_timeout no longer used for different types of timeouts. #6441
    
    An AR ConnectionSpec `wait_timeout` is pre-patch used for three
    different things:
    
    * mysql2 uses it for MySQL's own wait_timeout (how long MySQL
      should allow an idle connection before closing it), and
      defaults to 2592000 seconds.
    * ConnectionPool uses it for "number of seconds to block and
      wait for a connection before giving up and raising a timeout error",
      default 5 seconds.
    * ConnectionPool uses it for the Reaper, for deciding if a 'dead'
      connection can be reaped. Default 5 seconds.
    
    Previously, if you want to change these from defaults, you need
    to change them all together. This is problematic _especially_
    for the mysql2/ConnectionPool conflict, you will generally _not_
    want them to be the same, as evidenced by their wildly different
    defaults. This has caused real problems for people #6441 #2894
    
    But as long as we're changing this, forcing renaming the
    ConnectionPool key to be more specific, it made sense
    to seperate the two ConnectionPool uses too -- these two
    types of ConnectionPool timeouts ought to be able to be
    changed independently, you won't neccesarily want them
    to be the same, even though the defaults are (currently)
    the same.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/reaper_test.rb

commit 07f7321	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-23 09:01:21 -0700

    [Guides] Fix sample code

M	guides/source/initialization.textile

commit 13612ae	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-23 08:53:08 -0700

    [Guides] Rewrite server start section

M	guides/source/initialization.textile

commit 05a4d8b	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-23 08:45:48 -0700

    [Guides] Rewrite server start section

M	guides/source/initialization.textile

commit a4bb195	refs/heads/master
Author: Lucas Húngaro 
Date:   2012-04-29 15:43:06 -0300

    Adding deep versions of stringify_keys and symbolize_keys (plain and bang) for nested hashes

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/hash/keys.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	guides/source/active_support_core_extensions.textile

commit c1487f6	refs/heads/master
Merge: a6d0e37 6ff8873
Author: Rafael Mendonça França 
Date:   2012-05-23 07:27:21 -0700

    Merge pull request #6259 from markmcspadden/hash_transform_keys
    
    Add Hash#transform_keys and Hash#transform_keys!

commit 6ff8873	refs/heads/master
Author: Mark McSpadden 
Date:   2012-05-10 16:05:19 -0500

    Add Hash#transform_keys and Hash#transform_keys! and refactor *_keys methods to use them.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/hash/keys.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	guides/source/active_support_core_extensions.textile

commit a6d0e37	refs/heads/master
Merge: 90d8c8a 5646d65
Author: Carlos Antonio da Silva 
Date:   2012-05-23 05:52:44 -0700

    Merge pull request #6446 from acapilleri/mini_xml_4
    
    Change xml type datetime to dateTime

commit 5646d65	refs/heads/master
Author: Angelo capilleri 
Date:   2012-05-23 09:59:13 +0200

    changed xml type datetime to dateTime, fixes #6328
    XmlMini define the xml 'datatime', but according to
    http://www.w3.org/TR/xmlschema-2/#dateTime could be better
    change this to 'dateTime' with upper case letter 'T.
    So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime'
    
    add the changing to the changelog

M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/test/cases/serializers/xml_serialization_test.rb
M	activerecord/lib/active_record/serializers/xml_serializer.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/lib/active_support/xml_mini.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 90d8c8a	refs/heads/master
Merge: cb92efb bd9953f
Author: Carlos Antonio da Silva 
Date:   2012-05-23 05:39:31 -0700

    Merge pull request #6455 from ugisozols/master
    
    Remove unnecessary comment.

commit bd9953f	refs/heads/master
Author: Uģis Ozols 
Date:   2012-05-23 11:45:08 +0300

    Remove unnecessary comment.

M	railties/test/generators/assets_generator_test.rb

commit cb92efb	refs/heads/master
Merge: 41cfe17 6ac458d
Author: José Valim 
Date:   2012-05-22 22:49:14 -0700

    Merge pull request #6453 from parndt/session_keys
    
    Added session.keys and session.values back to ActionDispatch::Request::Session

commit 7cabb57	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-22 22:09:43 -0500

    use ActionDispatch::MiddlewareStack instead of ActionController::MiddlewareStack

M	guides/source/rails_on_rack.textile

commit 56ad6ca	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-22 22:02:20 -0500

    update loaded middlewares and use of Rack::Server instead of Rack::Builder

M	guides/source/rails_on_rack.textile

commit 2227064	refs/heads/master
Author: David Morton 
Date:   2012-05-22 22:00:31 -0500

    Fix incorrect example for fields_for - without the '=' it will not output anything.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 587de84	refs/tags/v3.2.5
Author: Juan M. Cuello 
Date:   2012-04-21 17:59:30 -0300

    Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.
    
    fixes #5913

M	activerecord/lib/active_record/railties/databases.rake

commit 6ac458d	refs/heads/master
Author: Philip Arndt 
Date:   2012-05-23 14:24:08 +1200

    Added ActionDispatch::Request::Session#keys and ActionDispatch::Request::Session#values

M	actionpack/lib/action_dispatch/request/session.rb
M	actionpack/test/dispatch/request/session_test.rb

commit 41cfe17	refs/heads/master
Merge: d7de7a7 30847b4
Author: Rafael Mendonça França 
Date:   2012-05-22 19:43:58 -0700

    Merge pull request #6452 from carlosgaldino/refactor-date-helpers
    
    Refactor date related input helpers

commit 83f62a0	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-22 21:33:49 -0500

    use ApplicationName::Application instead of ActionController::Dispatcher.new since Dispatcher class no longer exists

M	guides/source/rails_on_rack.textile

commit 30847b4	refs/heads/master
Author: Carlos Galdino 
Date:   2012-05-22 21:04:12 -0300

    Add tests for time_field and date_field helpers
    
    These tests check the values of 'min' and 'max' input attrs

M	actionpack/test/template/form_helper_test.rb

commit a9a9e8a	refs/heads/master
Author: Carlos Galdino 
Date:   2012-05-21 18:52:56 -0300

    Refactor date related helpers

M	actionpack/lib/action_view/helpers/tags/date_field.rb
M	actionpack/lib/action_view/helpers/tags/datetime_field.rb
M	actionpack/lib/action_view/helpers/tags/datetime_local_field.rb
M	actionpack/lib/action_view/helpers/tags/month_field.rb
M	actionpack/lib/action_view/helpers/tags/time_field.rb
M	actionpack/lib/action_view/helpers/tags/week_field.rb

commit d7de7a7	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-22 19:21:56 -0700

    I guess we have to return a pathname object. o_O

M	railties/lib/rails/engine.rb

commit 3f870f6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-22 17:22:06 -0700

    use File.realpath and avoid making Pathname objects

M	railties/lib/rails/engine.rb

commit 1ca1b1a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-22 16:43:12 -0700

    use RUBY_PLATFORM in case of cross compiled ruby

M	railties/lib/rails/engine.rb

commit 580333f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-22 16:36:08 -0700

    initialize instance variables

M	railties/lib/rails/application.rb

commit 8662722	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-22 16:33:08 -0700

    initialize our instance variables

M	railties/lib/rails/engine.rb

commit 65d2a60	refs/heads/master
Merge: 5089d65 b02d14a
Author: Jeremy Kemper 
Date:   2012-05-22 16:17:40 -0700

    Merge pull request #6359 from carlosgaldino/add-html5-inputs
    
    Add HTML5 color and date/time inputs

commit 5089d65	refs/heads/master
Merge: 7c69e2d 40c0b3a
Author: Rafael Mendonça França 
Date:   2012-05-22 16:06:15 -0700

    Merge pull request #6433 from parndt/fix_typo
    
    Fixed typo new_defautls -> new_defaults.

commit 40c0b3a	refs/heads/master
Author: Philip Arndt 
Date:   2012-05-22 18:56:23 +1200

    Fixed typo new_defautls -> new_defaults.
    * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults
    * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit ff3cddf	refs/tags/v3.2.5
Merge: 9ee8528 d3715f6
Author: Rafael Mendonça França 
Date:   2012-05-22 15:35:23 -0700

    Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_state_on_rollback
    
    Fixes the build break caused by 9ee8528 in #6445.

commit d3715f6	refs/tags/v3.2.5
Author: Godfrey Chan 
Date:   2012-05-22 14:13:39 -0700

    Fixes the build break caused by 9ee8528 in #6445.
    
    Ruby 1.8 raises a TypeError when trying to modify a frozen Hash, while
    Ruby 1.9 raises a RuntimeError instead. Also, Ruby < 1.9.3 uses a
    lowercase 'hash' in the exception message while Ruby >= 1.9.3 uses an
    uppercase 'Hash' instead. This commit normalizes those issues in the
    test case.

M	activerecord/test/cases/transactions_test.rb

commit 9ee8528	refs/tags/v3.2.5
Merge: 56b86a3 a543002
Author: Rafael Mendonça França 
Date:   2012-05-22 12:15:06 -0700

    Merge pull request #6445 from chancancode/3-2-stable_restore_frozen_state_on_rollback
    
    Restore the frozen state on rollback. (Backports #6420)

commit a543002	refs/tags/v3.2.5
Author: Godfrey Chan 
Date:   2012-05-22 12:08:51 -0700

    Restore the frozen state on rollback. Fixes #6417.
    
    This is a 3-2-stable backport for #6420 which was merged into master.
    
    Currently, when saving a frozen record, an exception would be thrown
    which causes a rollback. However, there is a bug in active record that
    "defrost" the record as a side effect:
    
        >> t = Topic.new
        => #
        >> t.freeze
        => #
        >> t.save
        RuntimeError: can't modify a frozen Hash
        >> t.frozen?
        => false
        >> t.save
        => true
    
    This patch fixes the bug by explictly restoring the frozen state on the
    attributes Hash after every rollback.

M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/transactions_test.rb

commit f09c84c	refs/heads/master
Author: Rory O’Kane 
Date:   2012-05-22 15:50:19 -0300

    clarified how file naming affects load order of initializers

M	guides/source/configuring.textile

commit 7c69e2d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-22 15:01:36 -0300

    Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"
    
    This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing
    changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c.
    
    Conflicts:
    	activerecord/test/cases/connection_pool_test.rb
    
    Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490)
    and we don't have any solution until now. I asked the author to try to
    fix it and open a new pull request.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
M	activerecord/test/cases/connection_pool_test.rb

commit eb2c0a4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 12:34:12 -0500

    add CollectionProxy#length documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit f539d98	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 12:17:00 -0500

    add CollectionProxy#size documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 3e847af	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 11:55:30 -0500

    add :call-seq: to +first+ and +last+ CollectionProxy methods

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 7e5beca	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 11:52:14 -0500

    add CollectionProxy#create! documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 9c38cfc	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 11:39:13 -0500

    add CollectionProxy#create documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit e0859e5	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 11:27:04 -0500

    add more examples to CollectionProxy#find

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 21f4c2e	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 11:13:31 -0500

    adding :call-seq: to CollectionProxy methods

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 2c62dd6	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 11:02:43 -0500

    add CollectionProxy#build documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 63f094b	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-22 08:55:59 -0700

    [Guides] Update rails commands section

M	guides/source/initialization.textile

commit ba55dd5	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-22 08:48:46 -0700

    [Guides] Change bundler section

M	guides/source/initialization.textile

commit 987a74d	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-22 08:43:14 -0700

    [Guides] Review bin/rails section

M	guides/source/initialization.textile

commit d4d8794	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-22 08:35:49 -0700

    [Guides] change rails bin section

M	guides/source/initialization.textile

commit acdf8ac	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-22 08:32:12 -0700

    The initialization guide will cover Rails 4

M	guides/source/initialization.textile

commit 344ea04	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-22 12:10:35 -0300

    Fix the build

M	actionpack/lib/action_view.rb
M	activemodel/lib/active_model.rb
M	activerecord/lib/active_record.rb
M	activesupport/lib/active_support.rb

commit d1cab8e	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-22 09:55:13 -0500

    remove repeated documentation in CollectionProxy#clear

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 1d4d731	refs/heads/master
Merge: 38293ea 43fa48e
Author: Jeremy Kemper 
Date:   2012-05-22 07:35:50 -0700

    Merge pull request #6440 from gaurish/route_move_top
    
    Move root method at TOP of routes file

commit 38293ea	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-22 11:01:16 -0300

    require active_support/lazy_load_hooks where is needed

M	actionpack/lib/action_view.rb
M	activemodel/lib/active_model.rb
M	activerecord/lib/active_record.rb
M	activesupport/lib/active_support.rb
M	activesupport/lib/active_support/i18n.rb

commit d3ee0a2	refs/heads/master
Merge: 6b9f077 940c135
Author: Jeremy Kemper 
Date:   2012-05-22 07:31:40 -0700

    Merge pull request #6368 from Antiarchitect/store-indifferent-access
    
    Support migrating from Hash to HashWithIndifferentAccess for accessing attributes.

commit 43fa48e	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-05-22 19:51:02 +0530

    Move root method at TOP of routes file
    
    Made the change as per the following text in routing guide:-
    "You should put the root route at the top of the file,
    because it is the most popular route and should be matched first."
    
    However, if root is best left at bottom. We will change to fix that text

M	railties/lib/rails/generators/rails/app/templates/config/routes.rb

commit 940c135	refs/heads/master
Author: Andrey Voronkov 
Date:   2012-05-22 18:08:36 +0400

    Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.
    
    In order to make migration from 3.x apps easier, we should try to
    convert
    Hash instances to HashWithIndifferentAccess, to allow accessing values
    with both symbol and a string. This is follow up to changes in 3c0bf043.

M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb

commit feaa7b3	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-05-22 19:29:25 +0530

    Remove Obsolute root specifiying short syntax
    
    This syntax does not seem to work. Throws the error
      "can't convert String into Hash (TypeError)"
    
    Tested on:
    * Ruby 1.9.3
    * Rails 3.2.3

M	guides/source/routing.textile

commit 6b9f077	refs/heads/master
Merge: f909e14 a807db9
Author: José Valim 
Date:   2012-05-22 06:54:32 -0700

    Merge pull request #6439 from janx/remove_useless_require
    
    refactor lazy_load_hooks load position, fix #6435

commit a807db9	refs/heads/master
Author: Jan Xie 
Date:   2012-05-22 21:50:16 +0800

    refactor lazy_load_hooks load position

M	activesupport/lib/active_support.rb
M	activesupport/lib/active_support/i18n.rb

commit 67bf728	refs/heads/master
Author: Tom Clarke 
Date:   2012-05-21 21:31:40 -0400

    Improve the readability of the Resolver change detection code

M	actionpack/lib/action_view/template/resolver.rb

commit f909e14	refs/heads/master
Merge: 0638e6b fe7038e
Author: José Valim 
Date:   2012-05-22 03:10:26 -0700

    Merge pull request #6437 from avakhov/gen-gem-method
    
    Use new hash syntax for generators gem method

commit fe7038e	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-22 13:26:06 +0400

    Use new hash syntax for generators gem method
    
    The Gemfile of new application uses ruby 1.9 hashes. Gem method of
    generators should use them too. It prevents from mixing two kinds of
    syntax in one file.

M	railties/lib/rails/generators/actions.rb
M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/actions_test.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 0638e6b	refs/heads/master
Merge: 29d17d3 3ed92c8
Author: Piotr Sarnacki 
Date:   2012-05-22 02:04:32 -0700

    Merge pull request #6435 from janx/remove_useless_require
    
    remove useless require

commit 56b86a3	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-22 01:40:51 -0700

    Use require_dependency in generated controllers
    
    Using require in development mode will prevent required files from
    reloading, even if they're changed. In order to keep namespaced
    application_controller reloadable, we need to use require_dependency
    instead of require.

M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/test/generators/namespaced_generators_test.rb

commit 29d17d3	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-22 01:40:51 -0700

    Use require_dependency in generated controllers
    
    Using require in development mode will prevent required files from
    reloading, even if they're changed. In order to keep namespaced
    application_controller reloadable, we need to use require_dependency
    instead of require.

M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/test/generators/namespaced_generators_test.rb

commit 3ed92c8	refs/heads/master
Author: Jan Xie 
Date:   2012-05-22 16:18:42 +0800

    remove useless require

M	activesupport/lib/active_support/dependencies/autoload.rb

commit 09be692	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-22 11:45:59 +0400

    Remove obsolete comment from generator gem method
    
    This comment about :env option for gem method was actual for rails 2.3
    without bundler. Now bundler uses grups for this goal.

M	railties/lib/rails/generators/actions.rb

commit d22859e	refs/heads/master
Merge: 1447aca 1fed1f1
Author: Piotr Sarnacki 
Date:   2012-05-21 23:04:24 -0700

    Merge pull request #6150 from avakhov/dbconsole-fixes
    
    Rails db console improvements

commit 4220290	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-05-22 11:19:32 +0530

    Fix broken link

M	guides/source/debugging_rails_applications.textile

commit 1fed1f1	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-04 22:04:53 +0400

    Fix `rails db -h` and cosmetic fixes in usage banners
    
    Ruby tries to use '-h' as short version of '--header' by default
    https://github.com/ruby/ruby/blob/trunk/lib/optparse.rb#L1372-1381.
    To force `rails db -h` prints an usage message we should add the `-h`
    options explicitly.

M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/commands/dbconsole.rb
M	railties/lib/rails/commands/runner.rb
M	railties/test/commands/dbconsole_test.rb

commit a060c41	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-04 12:54:20 +0400

    Use relative path to sqlite3 db in `rails db` command
    
    Rails uses sqlit3 db file with a path relative to the rails root. It
    allows to execute server not from rails root only. For example you
    can fire `./spec/dummy/script/rails s` to start dummy application
    server if you develop some engine gem.
    
    Now the `rails db` command uses relative paths also and you can explore
    your dummy db via `./spec/dummy/script/rails db` command.

M	railties/lib/rails/commands/dbconsole.rb
M	railties/test/commands/dbconsole_test.rb

commit 8281194	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-21 23:51:31 -0500

    update CollectionProxy#clear documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 1bcd5e4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-21 23:49:41 -0500

    update CollectionProxy#delete_all documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit f9a718e	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-21 23:30:13 -0500

    add CollectionProxy#delete_all documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 1447aca	refs/heads/master
Merge: e44009a cb847b9
Author: Piotr Sarnacki 
Date:   2012-05-21 20:55:03 -0700

    Merge pull request #6420 from chancancode/master_restore_frozen_state_on_rollback
    
    Restore frozen state on rollback, fixes #6417

commit e44009a	refs/heads/master
Merge: edb87b1 b52c66f
Author: Michael Koziarski 
Date:   2012-05-21 19:02:48 -0700

    Merge pull request #5125 from winston/log_exception_when_cache_read_fails
    
    #read_entry in ActiveSupport::Cache::FileStore should log details of the exception when an exception is thrown

commit edb87b1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-21 16:20:18 -0700

    using __method__ for the command method calls

M	railties/lib/rails/configuration.rb
A	railties/test/configuration/middleware_stack_proxy_test.rb

commit c5fc159	refs/heads/master
Merge: 03886d8 89ebd28
Author: Carlos Antonio da Silva 
Date:   2012-05-21 15:34:51 -0700

    Merge pull request #6429 from marcandre/fix_test_request
    
    Fix bug when Rails.application is defined but is nil. See #881

commit cb847b9	refs/heads/master
Author: Godfrey Chan 
Date:   2012-05-21 14:57:04 -0700

    Restore the frozen state on rollback. Fixes #6417.
    
    Currently, when saving a frozen record, an exception would be thrown
    which causes a rollback. However, there is a bug in active record that
    "defrost" the record as a side effect:
    
        >> t = Topic.new
        => #
        >> t.freeze
        => #
        >> t.save
        RuntimeError: can't modify a frozen Hash
        >> t.frozen?
        => false
        >> t.save
        => true
    
    This patch fixes the bug by explictly restoring the frozen state on the
    attributes Hash after every rollback.

M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/transactions_test.rb

commit 5b7b705	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-22 01:37:03 +0400

    Fix AR preloader example

M	activerecord/lib/active_record/associations/preloader.rb

commit 03886d8	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-21 18:35:44 -0300

    Remove not used variables from connection poll test
    
    These variables were issuing some "not used" warnings.

M	activerecord/test/cases/connection_pool_test.rb

commit d5d9a28	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-21 18:34:31 -0300

    Refactor aggregation writer method
    
    Only constantize class_name once.

M	activerecord/lib/active_record/aggregations.rb
M	activerecord/test/models/customer.rb

commit f260dc5	refs/heads/master
Merge: 776ea10 e4569b5
Author: Carlos Antonio da Silva 
Date:   2012-05-21 13:43:36 -0700

    Merge pull request #5156 from avakhov/class-attribute-instance-accessor
    
    Add instance_accessor option to class_attribute

commit e4569b5	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-25 01:29:00 +0400

    Add instance_accessor option to class_attribute

M	actionpack/lib/abstract_controller/layouts.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/class/attribute.rb
M	activesupport/test/core_ext/class/attribute_test.rb

commit b02d14a	refs/heads/master
Author: Carlos Galdino 
Date:   2012-05-16 18:24:16 -0300

    Add several HTML5 input helpers
    
    The input types added are:
    
    - input[type="month"]
    
    - input[type="week"]
    
    - input[type="datetime"]
    
    - input[type="datetime-local"]

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/datetime_field.rb
A	actionpack/lib/action_view/helpers/tags/datetime_local_field.rb
A	actionpack/lib/action_view/helpers/tags/month_field.rb
A	actionpack/lib/action_view/helpers/tags/week_field.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	guides/source/form_helpers.textile

commit 1ce4b5b	refs/heads/master
Author: Carlos Galdino 
Date:   2012-05-16 19:20:32 -0300

    Add HTML5 input[type="color"] helper

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/color_field.rb
M	actionpack/test/lib/controller/fake_models.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	guides/source/form_helpers.textile

commit 89ebd28	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-05-21 15:24:18 -0400

    Fix bug when Rails.application is defined but is nil. See #881

M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/dispatch/test_request_test.rb

commit 63f3393	refs/heads/master
Author: Tom Clarke 
Date:   2012-05-21 09:41:04 -0400

    More granular locking of the Resolver template cache
    
    In order to avoid holding a global lock when doing template
    resolution, instead add individual locks on a per cache entry
    basis. The global lock is now only used for manipulation of the main
    cache data structure.

M	actionpack/lib/action_view/template/resolver.rb

commit 2a12187	refs/heads/master
Author: Tom Clarke 
Date:   2012-05-20 01:03:34 -0400

    Make the Resolver template cache threadsafe  - closes #6404
    
    The Template cache in the Resolver can be accessed by multiple threads
    similtaneously in multi-threaded environments. The cache is implemented
    using a Hash, which isn't threadsafe in all VMs (notably JRuby).
    
    This commit extracts the cache to a new Cache class and adds mutexes to
    prevent concurrent access.

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/template/lookup_context_test.rb

commit 776ea10	refs/heads/master
Author: José Valim 
Date:   2012-05-21 21:01:02 +0200

    Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"
    
    This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing
    changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/template/lookup_context_test.rb

commit ef19e80	refs/heads/master
Author: Tom Clarke 
Date:   2012-05-20 12:41:58 -0400

    Prevent concurrent compilation of templates - closes #6400
    
    This addresses an issue where in multi-threaded environments
    multiple threads can attempt to compile a template at the same time,
    which occasionally causes particular templates to end up in a bad
    state.
    
    So, add synchronization such that only a single thread can attempt to
    compile a template at one time.

M	actionpack/lib/action_view/template.rb

commit 254c042	refs/heads/master
Merge: 513a052 719b008
Author: Aaron Patterson 
Date:   2012-05-21 11:29:25 -0700

    Merge pull request #6425 from pinetops/resolver_concurrency_fix
    
    Resolver concurrency fix

commit 719b008	refs/heads/master
Author: Tom Clarke 
Date:   2012-05-21 09:41:04 -0400

    More granular locking of the Resolver template cache
    
    In order to avoid holding a global lock when doing template
    resolution, instead add individual locks on a per cache entry
    basis. The global lock is now only used for manipulation of the main
    cache data structure.

M	actionpack/lib/action_view/template/resolver.rb

commit 685192b	refs/heads/master
Author: Tom Clarke 
Date:   2012-05-20 01:03:34 -0400

    Make the Resolver template cache threadsafe  - closes #6404
    
    The Template cache in the Resolver can be accessed by multiple threads
    similtaneously in multi-threaded environments. The cache is implemented
    using a Hash, which isn't threadsafe in all VMs (notably JRuby).
    
    This commit extracts the cache to a new Cache class and adds mutexes to
    prevent concurrent access.

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/template/lookup_context_test.rb

commit 513a052	refs/heads/master
Merge: d2901f0 dde5b87
Author: Aaron Patterson 
Date:   2012-05-21 11:00:43 -0700

    Merge pull request #2549 from trek/RoutingErrorForMissingControllers
    
    When a route references a missing controller, raise ActionController::RoutingError with clearer message

commit d2901f0	refs/heads/master
Merge: 525839f d06674d
Author: Aaron Patterson 
Date:   2012-05-21 10:29:01 -0700

    Merge pull request #6416 from pmahoney/threadsafe-connection-pool
    
    Make connection pool fair with respect to waiting threads.

commit ab2e2a9	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-21 12:26:04 -0500

    fix CollectionProxy documentation markup

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 158a71b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-21 12:19:34 -0500

    add CollectionProxy#reload documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 5d6cca1	refs/tags/v3.2.5
Merge: f051071 36fdb72
Author: Aaron Patterson 
Date:   2012-05-21 09:58:46 -0700

    Merge pull request #6418 from pwnall/pgsql_bytea_limit3
    
    Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)

commit 1f5c1a1	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-21 11:56:00 -0500

    improve CollectionProxy#destroy documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 525839f	refs/heads/master
Merge: 9c3cd9c fa5f037
Author: Aaron Patterson 
Date:   2012-05-21 09:46:24 -0700

    Merge pull request #6143 from senny/composed_of_converter_returns_nil
    
    allow the :converter Proc form composed_of to return nil

commit 9c3cd9c	refs/heads/master
Merge: ae8b09c ff83df3
Author: Jeremy Kemper 
Date:   2012-05-21 09:17:20 -0700

    Merge pull request #6424 from avakarev/refactoring_unless-else
    
    Refactoring: just turn unless/else into if/else

commit ff83df3	refs/heads/master
Author: Andrey Vakarev 
Date:   2012-05-21 19:13:24 +0300

    Refactoring: turn unless/else into if/else

M	actionpack/examples/performance.rb

commit d831734	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-21 10:16:43 -0500

    add CollectionProxy#destroy documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit f051071	refs/tags/v3.2.5
Merge: 64e12ff 39f9f02
Author: Carlos Antonio da Silva 
Date:   2012-05-21 06:02:56 -0700

    Merge pull request #6423 from lest/patch-2
    
    assets: don't add extension if other given and file exists

commit 39f9f02	refs/tags/v3.2.5
Author: Sergey Nartimov 
Date:   2012-05-21 15:32:13 +0300

    Assets: don't add extension if other given and file exists
    
    We should lookup if asset without appended extension exists.
    When sprockets are disabled the asset tag helpers incorporate
    this logic. When sprockets are enabled we should have the same
    logic.
    
    For example, we have style.ext file in app/assets/stylesheets and
    we use stylesheet_link_tag in the layout. In this case we should
    have /assets/style.ext instead of /assets/style.ext.css in the
    output.
    
    Closes #6310

M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/fixtures/sprockets/app/stylesheets/style.ext
M	actionpack/test/template/sprockets_helper_test.rb

commit 36fdb72	refs/tags/v3.2.5
Author: Victor Costan 
Date:   2012-05-09 23:38:24 -0400

    Postgresql doesn't accept limits on binary (bytea) columns.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/schema/schema.rb

commit 64e12ff	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-21 00:07:34 -0700

    More info on commit messages in contributing guide
    
    Add more info on how to write a good commit messages along with
    example showing nicely formatted commit message.
    
    Rails git history does not look too well when you try to figure out why
    particular changes were introduced. We can do much better than that and
    it's never too late to start.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit ae8b09c	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-20 23:30:37 -0700

    More info on commit messages in contributing guide
    
    Add more info on how to write a good commit messages along with
    example showing nicely formatted commit message.
    
    Rails git history does not look too well when you try to figure out why
    particular changes were introduced. We can do much better than that and
    it's never too late to start.

M	guides/source/contributing_to_ruby_on_rails.textile

commit d06674d	refs/heads/master
Author: Patrick Mahoney 
Date:   2012-05-20 21:46:08 -0500

    Make connection pool fair with respect to waiting threads.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
M	activerecord/test/cases/connection_pool_test.rb

commit b0f8355	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-20 16:19:11 -0700

    Fix generators to help with ambiguous `ApplicationController` issue
    
    In development mode, dependencies are loaded dynamically at runtime,
    using `const_missing`. Because of that, when one of the constants is
    already loaded and `const_missing` is not triggered, user can end up
    with unexpected results.
    
    Given such file in an Engine:
    
    ```ruby
    module Blog
      class PostsController < ApplicationController
      end
    end
    ```
    
    If you load it first, before loading any application files, it will
    correctly load `Blog::ApplicationController`, because second line will
    hit `const_missing`. However if you load `ApplicationController` first,
    the constant will be loaded already, `const_missing` hook will not be
    fired and in result `PostsController` will inherit from
    `ApplicationController` instead of `Blog::ApplicationController`.
    
    Since it can't be fixed in `AS::Dependencies`, the easiest fix is to
    just explicitly load application controller.
    
    closes #6413

M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/test/generators/namespaced_generators_test.rb

commit 7c95be5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-20 16:19:11 -0700

    Fix generators to help with ambiguous `ApplicationController` issue
    
    In development mode, dependencies are loaded dynamically at runtime,
    using `const_missing`. Because of that, when one of the constants is
    already loaded and `const_missing` is not triggered, user can end up
    with unexpected results.
    
    Given such file in an Engine:
    
    ```ruby
    module Blog
      class PostsController < ApplicationController
      end
    end
    ```
    
    If you load it first, before loading any application files, it will
    correctly load `Blog::ApplicationController`, because second line will
    hit `const_missing`. However if you load `ApplicationController` first,
    the constant will be loaded already, `const_missing` hook will not be
    fired and in result `PostsController` will inherit from
    `ApplicationController` instead of `Blog::ApplicationController`.
    
    Since it can't be fixed in `AS::Dependencies`, the easiest fix is to
    just explicitly load application controller.
    
    closes #6413

M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/test/generators/namespaced_generators_test.rb

commit 74c4e7b	refs/heads/master
Author: José Valim 
Date:   2012-05-20 14:01:52 -0700

    Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c
    
    Template concurrency fixes
    Conflicts:
    
    	actionpack/lib/action_view/template.rb

M	actionpack/lib/action_view/template.rb

commit a78ee05	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-20 18:16:03 -0300

    Fix CHANGELOG order and add a brief description of the changes in the
    Action Pack in the upgrading guide. [ci skip]

M	actionpack/CHANGELOG.md
M	guides/source/upgrading_ruby_on_rails.textile

commit 03402d2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-20 16:11:52 -0500

    update CollectionProxy#destroy_all documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 68a454c	refs/tags/v3.2.5
Merge: fe9731e 39b9c94
Author: Rafael Mendonça França 
Date:   2012-05-20 14:02:50 -0700

    Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable
    
    TagHelper creates invalid data attributes when value is a BigDecimal

commit fe9731e	refs/tags/v3.2.5
Merge: 6ef9fda 565c1b0
Author: José Valim 
Date:   2012-05-20 14:01:52 -0700

    Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c
    
    Template concurrency fixes

commit 39b9c94	refs/tags/v3.2.5
Author: Bodacious 
Date:   2012-05-20 20:42:16 +0100

    Fixed tag_helper data-attribute bug with BigDecimals

M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/tag_helper_test.rb

commit 46fcce9	refs/heads/master
Merge: 08a5b10 45d059b
Author: Carlos Antonio da Silva 
Date:   2012-05-20 12:36:57 -0700

    Merge pull request #6408 from ivankukobko/master
    
    Fixed typo in AR test name

commit 45d059b	refs/heads/master
Author: Ivan Kukobko 
Date:   2012-05-20 22:11:32 +0300

    fixed typo in word finiding

M	activerecord/test/cases/relations_test.rb

commit 08a5b10	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-20 11:11:20 -0700

    Revert "Merge pull request #5702 from oscardelben/patch-4"
    
    This reverts commit cae1ca7d1be9c79c7ef012a1f62aef9d3bb815f8, reversing
    changes made to da97cf016a8ffd1f54f804cd881f393e5d6efc18.
    
    These changes break the build, it needs more investigation.

M	activemodel/lib/active_model/attribute_methods.rb

commit 79b38c3	refs/heads/master
Author: Andrew White 
Date:   2012-05-20 19:02:58 +0100

    Escape the extension when normalizing the action cache path.
    
    Although no recognized formats use non-ASCII characters, sometimes they
    can be included in the :format parameter because of invalid URLS. To
    prevent encoding incompatibility errors we need to escape them before
    passing the path to URI.unescape.
    
    Closes #4379

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 3fc561a	refs/heads/master
Author: Andrew White 
Date:   2012-05-20 16:44:42 +0100

    Return 400 Bad Request for URL paths with invalid encoding.
    
    Passing path parameters with invalid encoding is likely to trigger errors
    further on like `ArgumentError (invalid byte sequence in UTF-8)`. This will
    result in a 500 error whereas the better error to return is a 400 error which
    allows exception notification libraries to filter it out if they wish.
    
    Closes #4450

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 66eb3f0	refs/heads/master
Author: Andrew White 
Date:   2012-05-20 10:04:12 +0100

    Raise ActionController::BadRequest for malformed parameter hashes.
    
    Currently Rack raises a TypeError when it encounters a malformed or
    ambiguous hash like `foo[]=bar&foo[4]=bar`. Rather than pass this
    through to the application this commit captures the exception and
    re-raises it using a new ActionController::BadRequest exception.
    
    The new ActionController::BadRequest exception returns a 400 error
    instead of the 500 error that would've been returned by the original
    TypeError. This allows exception notification libraries to ignore
    these errors if so desired.
    
    Closes #3051

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/exceptions.rb
M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb
M	actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
M	actionpack/test/dispatch/request_test.rb

commit 972376a	refs/heads/master
Author: Andrew White 
Date:   2012-05-20 09:58:15 +0100

    Correct order of expected and actual arguments

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 565c1b0	refs/tags/v3.2.5
Author: Tom Clarke 
Date:   2012-05-20 12:41:58 -0400

    Prevent concurrent compilation of templates - closes #6400

M	actionpack/lib/action_view/template.rb

commit ad3f47d	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-20 21:12:25 +0530

    fix closing tag [ci skip]

M	actionpack/lib/action_view/helpers/tag_helper.rb

commit ed024f6	refs/heads/master
Merge: 3655d66 dcce011
Author: José Valim 
Date:   2012-05-20 05:15:36 -0700

    Merge pull request #6399 from dchelimsky/issue-5899
    
    Raise Assertion instead of RoutingError for routing assertion failures.

commit dcce011	refs/heads/master
Author: David Chelimsky 
Date:   2012-05-19 16:28:14 -0500

    Raise Assertion instead of RoutingError for routing assertion failures.
    
    Before this change, assert_recognizes, assert_generates, and
    assert_routing raised ActionController::RoutingError when they failed to
    recognize the route.
    
    This commit changes them to raise Assertion instead. This aligns with
    convention for logical failures, and supports reporting tools that care
    about the difference between logical failures and errors e.g. the
    summary at the end of a test run.
    
    - Fixes #5899

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/dispatch/routing_assertions_test.rb

commit 3655d66	refs/heads/master
Merge: 2575508 32a433e
Author: José Valim 
Date:   2012-05-20 02:53:13 -0700

    Merge pull request #6050 from route/wrapped_keys_in_log
    
    Show in log correct wrapped keys

commit 6ef9fda	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-20 00:24:35 -0700

    Improve docs for `try` by adding note on `BasicObject`
    
    [ci skip] closes #5790

M	activesupport/lib/active_support/core_ext/object/try.rb

commit 2575508	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-20 00:24:35 -0700

    Improve docs for `try` by adding note on `BasicObject`
    
    [ci skip] closes #5790

M	activesupport/lib/active_support/core_ext/object/try.rb

commit cae1ca7	refs/heads/master
Merge: da97cf0 42d0b1c
Author: Piotr Sarnacki 
Date:   2012-05-19 23:57:58 -0700

    Merge pull request #5702 from oscardelben/patch-4
    
    Call undefine_attribute_methods only when defining new attributes

commit 0d73d6e	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-19 23:52:22 -0700

    Fix uniqueness validator with `allow_nil: false` also for mysql
    
    MySQL's adapter was changing value for case sensitive comparison. We
    don't need to do it for `nil`.

M	activerecord/lib/active_record/validations/uniqueness.rb

commit 32a433e	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-04-29 19:16:32 +0400

    Show in log correct wrapped keys

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit f7d01ec	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-19 21:49:55 -0700

    Fix `validates_uniqueness_off :field, :allow_nil => false`
    
    Closes (#5853)
    
    Uniqueness validator was not properly checking if there are any existing
    records, when value was `nil` and column was text type. `nil` was
    converted to string, which resulted in queries looking like:
    
    ```sql
    SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1
    ```
    
    instead of
    
    ```sql
    SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1
    ```

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit da97cf0	refs/heads/master
Merge: fa41c92 117382f
Author: Piotr Sarnacki 
Date:   2012-05-19 19:02:38 -0700

    Merge pull request #5631 from avakhov/ac-log-subsriber-small-refac
    
    Make AC::LogSubscriber#send_file like #send_data

commit fa6d921	refs/heads/master
Author: Henrik Hodne 
Date:   2012-05-20 01:29:13 +0200

    Remove blank trailing comments
    
    For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace
    with the first match, and voilà! Note that the regex matches a little bit too
    much, so you probably want to `git add -i .` and go through every single diff
    to check if it actually should be changed.

M	Rakefile
M	actionmailer/lib/action_mailer/delivery_methods.rb
M	actionmailer/lib/rails/generators/mailer/templates/mailer.rb
M	actionpack/lib/abstract_controller/helpers.rb
M	actionpack/lib/action_controller/base.rb
M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_controller/metal/helpers.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_dispatch/http/mime_negotiation.rb
M	actionpack/lib/action_dispatch/middleware/reloader.rb
M	actionpack/lib/action_dispatch/routing.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/helpers/output_safety_helper.rb
M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	actionpack/lib/action_view/helpers/rendering_helper.rb
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/lib/action_view/helpers/tags/select.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/lib/action_view/template/resolver.rb
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/lib/active_model/callbacks.rb
M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/lint.rb
M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/observing.rb
M	activemodel/lib/active_model/serialization.rb
M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/lib/active_model/validator.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb
M	activerecord/lib/active_record/aggregations.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/callbacks.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/observer.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/models/subject.rb
M	activesupport/lib/active_support/benchmarkable.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/concern.rb
M	activesupport/lib/active_support/configurable.rb
M	activesupport/lib/active_support/core_ext/array/conversions.rb
M	activesupport/lib/active_support/core_ext/array/uniq_by.rb
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/hash/except.rb
M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
M	activesupport/lib/active_support/core_ext/integer/inflections.rb
M	activesupport/lib/active_support/core_ext/kernel/reporting.rb
M	activesupport/lib/active_support/core_ext/module/anonymous.rb
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/lib/active_support/core_ext/module/introspection.rb
M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/lib/active_support/core_ext/object/duplicable.rb
M	activesupport/lib/active_support/core_ext/object/with_options.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/lib/active_support/lazy_load_hooks.rb
M	activesupport/lib/active_support/log_subscriber.rb
M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/notifications.rb
M	activesupport/lib/active_support/ordered_options.rb
M	activesupport/lib/active_support/string_inquirer.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/configuration.rb
M	railties/lib/rails/engine/configuration.rb
M	railties/lib/rails/generators/active_model.rb
M	railties/lib/rails/generators/base.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/resource_helpers.rb
M	railties/lib/rails/generators/test_case.rb
M	railties/lib/rails/railtie.rb
M	railties/test/generators/shared_generator_tests.rb

commit 7eb09ae	refs/heads/master
Author: Henrik Hodne 
Date:   2012-05-20 00:50:22 +0200

    Update documentation for AbstractController::Base

M	actionpack/lib/abstract_controller/base.rb

commit c520504	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-05-19 18:24:16 -0300

    Use right option for excerpt text helper in tests, fix build
    
    `excerpt` text helper uses `:radius`, not `line_width` (that is used by
    `word_wrap` helper).
    
    Also cleanup some whitespaces.

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit a6940f2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 16:18:59 -0500

    add CollectionProxy#select documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 952737a	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 14:58:19 -0500

    add CollectionProxy#find documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 879611f	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-05-19 11:39:17 -0700

    Merge pull request #6398 from pmahoney/threadsafe-connection-pool
    
    Synchronize read and modification of @reserved_connections

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit fa41c92	refs/heads/master
Merge: 23fad29 2fe2813
Author: Aaron Patterson 
Date:   2012-05-19 11:46:13 -0700

    Merge pull request #6397 from kennyj/fix_translate_exception
    
    Fix a problem of translate_exception method in a Japanese (non English) environment.

commit 23fad29	refs/heads/master
Merge: 777d539 c2d416f
Author: Aaron Patterson 
Date:   2012-05-19 11:39:17 -0700

    Merge pull request #6398 from pmahoney/threadsafe-connection-pool
    
    Synchronize read and modification of @reserved_connections

commit ba896d3	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-19 10:53:52 -0700

    Revert typo

M	activerecord/lib/active_record/aggregations.rb

commit fae4a26	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-19 10:34:42 -0700

    Typo

M	activerecord/lib/active_record/aggregations.rb

commit 05fdb31	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-19 10:02:16 -0700

    Getting started guide has been completely rewritten and edited.

M	guides/source/getting_started.textile

commit c2d416f	refs/heads/master
Author: Patrick Mahoney 
Date:   2012-05-19 11:45:55 -0500

    Synchronize read and modification of @reserved_connections hash to avoid concurrency error.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 2fe2813	refs/heads/master
Author: kennyj 
Date:   2012-05-20 01:38:14 +0900

    Fix a problem of translate_exception method in Japanese.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 777d539	refs/heads/master
Merge: 6df96c9 e5e2ba1
Author: Rafael Mendonça França 
Date:   2012-05-19 08:27:27 -0700

    Merge pull request #6396 from kennyj/dont_use_assert_block
    
    Don't use assert_block method. It will be removed.

commit 6df96c9	refs/heads/master
Merge: 26bdcf7 8d3cd53
Author: Rafael Mendonça França 
Date:   2012-05-19 08:19:39 -0700

    Merge pull request #3359 from mrreynolds/datamapper_naming_fix
    
    Fixed DataMapper namings in symbols and constants.

commit e5e2ba1	refs/heads/master
Author: kennyj 
Date:   2012-05-20 00:14:40 +0900

    Don't use assert_block method. It will be deprecated.

M	actionpack/test/ts_isolated.rb
M	activesupport/test/ts_isolated.rb

commit 26bdcf7	refs/heads/master
Merge: 329a5a4 3f1caaf
Author: Rafael Mendonça França 
Date:   2012-05-19 07:57:30 -0700

    Merge pull request #6395 from kennyj/fix_warning_20120519-2
    
    Fix warning: shadowing outer local variable - constant.

commit 3f1caaf	refs/heads/master
Author: kennyj 
Date:   2012-05-19 23:54:52 +0900

    Fix warning: shadowing outer local variable - constant.

M	activesupport/lib/active_support/inflector/methods.rb

commit 329a5a4	refs/heads/master
Author: Andrew White 
Date:   2012-05-19 15:46:12 +0100

    Add CHANGELOG entry for constantize - closes #6165.

M	activesupport/CHANGELOG.md

commit 3d0e489	refs/heads/master
Author: Andrew White 
Date:   2012-05-19 15:44:19 +0100

    Handle case where ancestor is not the end of the chain

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/constantize_test_cases.rb

commit eb09411	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-05-05 10:13:33 -0400

    Fix constantize so top level constants are looked up properly.

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/constantize_test_cases.rb

commit 99e9a73	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-05-04 23:57:11 -0400

    Make constantize look down the ancestor chain (excluding Object)

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/constantize_test_cases.rb

commit 1551de3	refs/heads/master
Merge: 71a83a9 4adfd8e
Author: Vijay Dev 
Date:   2012-05-19 19:36:48 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 4adfd8e	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-19 19:33:51 +0530

    copy edits [ci skip]

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit b0f55c6	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 08:20:49 -0500

    add CollectionProxy#last documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 71a83a9	refs/heads/master
Author: Andrew White 
Date:   2012-05-19 14:18:37 +0100

    Add CHANGELOG entry for #6369 & #6391

M	railties/CHANGELOG.md

commit 8405aad	refs/heads/master
Merge: f20032f 1596878
Author: Carlos Antonio da Silva 
Date:   2012-05-19 06:16:10 -0700

    Merge pull request #4835 from pacoguzman/refactor_define_restrict_dependency_method
    
    Refactor define_restrict_dependency_method using reflection

commit 75d7101	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 08:15:27 -0500

    add CollectionProxy#first documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit f20032f	refs/heads/master
Merge: 0e207a4 cf833b9
Author: Carlos Antonio da Silva 
Date:   2012-05-19 06:08:33 -0700

    Merge pull request #5678 from troyk/patch-1
    
    Remove sort on attributes.keys

commit 0e207a4	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-19 09:49:01 -0300

    Clarify grouped_options_for_select method API, add changelog entry
    
    Make the method API more clear by explicitly showing the expected
    arguments. This means that the options cannot be passed as second
    argument because we are not relying on extract_options! anymore,
    you are expected to give a selected key or `nil` if you want to pass
    options, as it is the last argument.
    
    Notice that this does not change the current method arguments contract
    available in 3.2, it just brings back the same functionality with the
    divider addition.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 3e70706	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-19 09:22:05 -0300

    Remove delegated methods from generators test case
    
    `class_attribute` already generates instance readers/writers by default,
    so there's no need to add delegation methods.
    
    Removes some "method redefined" warnings.

M	railties/lib/rails/generators/test_case.rb

commit d641646	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-18 12:47:55 -0700

    Ensure that CollectionAssociation#replace returns proper target
    
    The fix commited in e2a070c was returning the `new_target`, as
    a try to return whatever user replaced association with. The
    problem is, the resulting association target may be ordered
    differently. In such case we want to return the target that
    will be later used for that association.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 573448f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-19 09:17:07 -0300

    Remove warning in namespaced generator test

M	railties/test/generators/namespaced_generators_test.rb

commit d0a3be3	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-19 17:40:40 +0530

    copy edits [ci skip]

M	guides/source/rails_on_rack.textile

commit 6c7c997	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-19 17:38:44 +0530

    Revert "You can add a custom primary key to a table"
    
    This reverts commit 23a98ffbd9b39ee70094ded1671cf1879d0d3591.
    
    [ci skip]

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit bd838c0	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-19 04:49:07 -0700

    Fix railties tests
    
    Minitest uses different signature for assert_no_match, so we have to
    swap arguments.

M	railties/test/generators/namespaced_generators_test.rb

commit 099bb5d	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-18 12:47:55 -0700

    Ensure that CollectionAssociation#replace returns proper target
    
    The fix commited in e2a070c was returning the `new_target`, as
    a try to return whatever user replaced association with. The
    problem is, the resulting association target may be ordered
    differently. In such case we want to return the target that
    will be later used for that association.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit ec77498	refs/heads/master
Author: Andrew White 
Date:   2012-05-19 11:22:00 +0100

    Improve `rake routes` output for redirects - closes #6369.

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit 12b6307	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2012-05-19 11:06:24 +0300

    fix typo. probem => problem

M	guides/source/getting_started.textile

commit bc8b7e0	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 01:01:51 -0500

    improve CollectionProxy#concat documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 970a146	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 00:48:43 -0500

    fix CollectionProxy#<< documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 117382f	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-28 12:23:21 +0400

    Make AC::LogSubscriber#send_file like #send_data

M	actionpack/lib/action_controller/log_subscriber.rb

commit bb887b9	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 00:37:47 -0500

    add CollectionProxy#<< documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 3f46f73	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-19 00:21:50 -0500

    add CollectionProxy#clear documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 98657ad	refs/heads/master
Merge: 49b72fa 900dbc5
Author: Jeremy Kemper 
Date:   2012-05-18 17:30:35 -0700

    Merge pull request #6376 from jgaskins/timestamp-microseconds
    
    Increase numeric-timestamp precision to nanoseconds

commit 5111ec4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 19:28:09 -0500

    add CollectionProxy#include? documentation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 900dbc5	refs/heads/master
Author: Jamie Gaskins 
Date:   2012-05-18 18:42:35 +0800

    Increase `AR#cache_key` precision to nanoseconds

M	activerecord/lib/active_record/integration.rb
M	activerecord/test/cases/base_test.rb
M	activesupport/lib/active_support/core_ext/time/conversions.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 49b72fa	refs/heads/master
Merge: 6f0c9cd 7e82ebd
Author: Jeremy Kemper 
Date:   2012-05-18 17:15:32 -0700

    Merge pull request #6384 from ihid/tidy_text_helpers
    
    Tidied and standardised text_helper implementations.

commit ec430d4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 19:11:50 -0500

    minor fix wrapper tag documentation

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 7e82ebd	refs/heads/master
Author: Jeremy Walker 
Date:   2012-05-18 16:50:02 +0100

    Tidied and standardised text_helper implementations.

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 6f0c9cd	refs/heads/master
Merge: 40bdf55 5f7bfb7
Author: Piotr Sarnacki 
Date:   2012-05-18 14:59:05 -0700

    Merge pull request #6391 from strzalek/redirect_route_inspect
    
    Redirect route inspect

commit 5f7bfb7	refs/heads/master
Author: Łukasz Strzałkowski 
Date:   2012-05-18 23:21:20 +0200

    Fix inspecting route redirections, closes #6369
    
    This commit fixes route inspection in `rake routes`
    
    Before:
    
      foo  /foo(.:format) :controller#:action"
    
    After:
    
      foo  /foo(.:format)  Redirect (301)

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit 61fc10d	refs/heads/master
Author: Łukasz Strzałkowski 
Date:   2012-05-18 23:19:14 +0200

    More DRY route inspect tests

M	railties/test/application/route_inspect_test.rb

commit 23a98ff	refs/heads/master
Author: Avi Tzurel 
Date:   2012-05-19 00:47:53 +0300

    You can add a custom primary key to a table

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 90a2438	refs/heads/master
Author: Avi Tzurel 
Date:   2012-05-19 00:44:11 +0300

    Minor fix to the wrapper tag documentation, the options hash is the last one, added blank hash before that in the args list

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 7827920	refs/heads/master
Merge: ede5e9b 1b5c775
Author: Avi Tzurel 
Date:   2012-05-19 00:42:34 +0300

    Merge branch 'master' of github.com:lifo/docrails

commit ede5e9b	refs/heads/master
Author: Avi Tzurel 
Date:   2012-05-19 00:39:31 +0300

    Added wrapper tag documentation to the simple_format method

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 4dd4621	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-05-17 23:42:37 -0700

    Merge pull request #5020 from KL-7/fix-blank-image_tag-source
    
    Render img tag with empty src if empty string is passed to image_tag.

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 40bdf55	refs/heads/master
Merge: 8b4ecbe dcdde7d
Author: Jeremy Kemper 
Date:   2012-05-18 14:10:25 -0700

    Merge pull request #6183 from nashby/fix-issue-6179
    
    wrap time ranges with timezones

commit 8ad8f61	refs/tags/v3.2.5
Merge: 855fabc 3b444ee
Author: Rafael Mendonça França 
Date:   2012-05-18 13:47:56 -0700

    Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtm
    
    Invalid ruby18 syntax in habtm

commit 8b4ecbe	refs/heads/master
Merge: 906009c 5c02e30
Author: Rafael Mendonça França 
Date:   2012-05-18 13:37:28 -0700

    Merge pull request #6388 from kennyj/fix_warning_20120519
    
    Fix warning: possibly useless use of % in void context

commit 3b444ee	refs/tags/v3.2.5
Author: Ernie Miller 
Date:   2012-05-18 16:35:21 -0400

    Fix HABTM syntax error in Ruby 1.8.x

M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

commit 5c02e30	refs/heads/master
Author: kennyj 
Date:   2012-05-19 05:32:43 +0900

    Fix warning: possibly useless use of % in void context

M	activesupport/test/core_ext/string_ext_test.rb

commit 1b5c775	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 15:27:29 -0500

    move docs from CollectionAssociation to CollectionProxy

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 906009c	refs/heads/master
Merge: dcc576d 130b0d2
Author: Rafael Mendonça França 
Date:   2012-05-18 13:16:21 -0700

    Merge pull request #6387 from kennyj/fix_test_20120519
    
    Fix build: can't convert Regexp to String

commit 130b0d2	refs/heads/master
Author: kennyj 
Date:   2012-05-19 05:13:28 +0900

    Fix build: can't convert Regexp to String

M	actionpack/test/template/benchmark_helper_test.rb

commit 855fabc	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-05-18 21:11:34 +0100

    fix #delete_all with habtm with :delete_sql

M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb

commit dcc576d	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-18 21:11:34 +0100

    fix #delete_all with habtm with :delete_sql

M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb

commit a1dd008	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-18 21:07:21 +0100

    no longer need #delete_all_on_destroy

M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb

commit db77b16	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 15:06:47 -0500

    add explanation of raising errors when a limit scope is supplied in Relation#delete_all

M	activerecord/lib/active_record/relation.rb

commit 80f1694	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-18 20:48:11 +0100

    Perf: Don't load the association for #delete_all.
    
    Bug #6289

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit b98d1e2	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-05-18 20:48:11 +0100

    Perf: Don't load the association for #delete_all.
    
    Bug #6289
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 576d700	refs/heads/master
Author: kennyj 
Date:   2012-05-19 04:40:36 +0900

    Fix logs name consistency.

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/adapters/postgresql/connection_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/helper.rb

commit a6dbc3f	refs/heads/master
Merge: 476ef2d 2c423b3
Author: Rafael Mendonça França 
Date:   2012-05-18 12:01:26 -0700

    Merge pull request #6355 from amutz/fix_number_with_delimiter_escaping
    
    NumberHelper.number_with_delimiter should html_escape both delimiters and separators

commit 2c423b3	refs/heads/master
Author: Andrew Mutz 
Date:   2012-05-16 13:22:52 -0700

    reverting decoupling of NumberHelper from safe_join and adding tests for escaping of delimiters and separators

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb
M	activesupport/lib/active_support/testing/performance.rb

commit 476ef2d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-18 10:23:13 -0700

    port some mocha to minitest/mock

M	Gemfile
M	activerecord/test/cases/helper.rb
A	activerecord/test/cases/migration/change_table_test.rb
M	activerecord/test/cases/migration_test.rb

commit f491c6a	refs/heads/master
Merge: fa561a5 925f2e9
Author: José Valim 
Date:   2012-05-18 09:28:36 -0700

    Merge pull request #6382 from oscardelben/refactor_migration_generator
    
    Refactor migration generator

commit 925f2e9	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-18 08:36:27 -0700

    Refactor migration generator

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb

commit fa561a5	refs/heads/master
Merge: 1ae68ea 3b1c30c
Author: José Valim 
Date:   2012-05-18 09:04:51 -0700

    Merge pull request #6380 from nashby/output-safety-interpolation
    
    doesn't modify params in SafeBuffer#%

commit 42d0b1c	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-02 16:41:43 +0300

    Call undefine_attribute_methods only when defining new attributes

M	activemodel/lib/active_model/attribute_methods.rb

commit d3f57fb	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-18 08:45:03 -0700

    Add oscardelben to authors

A	guides/assets/images/oscardelben.jpg
M	guides/source/credits.html.erb

commit b5e15f3	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-18 08:41:27 -0700

    Revert "Add oscardelben to authors"
    
    This reverts commit 33284014c65f7cb0c342caeeda32baf10db71cfc.
    
    Reason: this change doesn't belong to DocRails.

D	guides/assets/images/oscardelben.jpg
M	guides/source/credits.html.erb

commit 1ae68ea	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-18 16:39:37 +0100

    fix typo [ci skip]

M	activerecord/CHANGELOG.md

commit 3b1c30c	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-18 18:17:43 +0300

    doesn't modify params in SafeBuffer#%

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 103ce30	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-18 16:30:05 +0100

    add changelogs about deprecated stuff [ci skip]

M	activerecord/CHANGELOG.md

commit 2802ad0	refs/tags/v3.2.5
Merge: 75e8e77 616c91d
Author: Rafael Mendonça França 
Date:   2012-05-18 07:24:01 -0700

    Merge pull request #6377 from ihid/depreciate_old_text_helper_apis
    
    Deprecate old APIs for highlight, excerpt and word_wrap

commit 616c91d	refs/tags/v3.2.5
Author: Jeremy Walker 
Date:   2012-05-18 13:36:09 +0100

    Deprecate old APIs for highlight, excerpt and word_wrap

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 62c6ac2	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-18 15:04:36 +0100

    quarantine more deprecated stuff

M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/relations_test.rb

commit ee16fea	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-18 14:46:54 +0100

    quarantine deprecated tests

M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
A	activerecord/test/cases/deprecated_dynamic_methods_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb

commit 83153c7	refs/heads/master
Author: Peter Suschlik 
Date:   2012-05-18 12:24:19 +0200

    Fix typo.

M	activerecord/lib/active_record/core.rb

commit dcdde7d	refs/heads/master
Author: Vasiliy Ermolovich + Sergey Nartimov 
Date:   2012-05-18 13:07:52 +0300

    respect nsec in TimeWithZone
    
    when we pass fractional usec to Time methods we should use Rational
    instead of Float because of accuracy problem
    
        Time.local(2011,6,12,23,59,59,999999.999).nsec
        # => 999999998
    
        Time.local(2011,6,12,23,59,59,Rational(999999999, 1000)).nsec
        # => 999999999

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 88949f8	refs/heads/master
Merge: a6a8957 911a085
Author: José Valim 
Date:   2012-05-17 23:56:32 -0700

    Merge pull request #6373 from bogdan/callbacks_fix
    
    AS::Callbacks: fix run_callbacks for objects with negative id

commit 21bff1d	refs/heads/master
Author: Rich Healey 
Date:   2012-05-18 16:52:52 +1000

    The middleware stack is compliant with Enumarable and bits of Array
    
    Try to clarify the docs so that it's more clear how the stack behaves.

M	guides/source/rails_on_rack.textile

commit 911a085	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-05-18 09:50:09 +0300

    AS::Callbacks: fix run_callbacks for objects with negative id

M	activesupport/lib/active_support/callbacks.rb

commit a6a8957	refs/heads/master
Merge: 6bb86e1 793205c
Author: José Valim 
Date:   2012-05-17 23:45:43 -0700

    Merge pull request #6372 from richo/bugs/middleware_stack_as_array
    
    Add some common Array methods to the middleware stack

commit 6bb86e1	refs/heads/master
Merge: d8e8ab1 3e9ec24
Author: José Valim 
Date:   2012-05-17 23:42:37 -0700

    Merge pull request #5020 from KL-7/fix-blank-image_tag-source
    
    Render img tag with empty src if empty string is passed to image_tag.

commit 793205c	refs/heads/master
Author: Rich Healey 
Date:   2012-05-18 16:41:52 +1000

    Add the #unshift method to the middleware stack
    
    The docs suggest that the middleware stack is an Array, so I've added
    the unshift method to it. Originally I added some more Array methods,
    but it was agreed that they lacked usecases.

M	actionpack/lib/action_dispatch/middleware/stack.rb
M	actionpack/test/dispatch/middleware_stack_test.rb

commit 48acd29	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 01:15:41 -0500

    remove incorrect example of CollectionAssociation#empty?

M	activerecord/lib/active_record/associations/collection_association.rb

commit d8e8ab1	refs/heads/master
Merge: b23ac93 446940c
Author: Jeremy Kemper 
Date:   2012-05-17 23:13:39 -0700

    Merge pull request #5715 from soulim/add_time_input_control
    
    Add HTML5 input[type="time"] helper

commit bf55f28	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 01:11:37 -0500

    add docs to CollectionAssociation#empty?

M	activerecord/lib/active_record/associations/collection_association.rb

commit d029d50	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 01:03:40 -0500

    add docs to CollectionAssociation#any?

M	activerecord/lib/active_record/associations/collection_association.rb

commit 10d375e	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-18 00:22:32 -0500

    add examples to CollectionAssociation#concat

M	activerecord/lib/active_record/associations/collection_association.rb

commit 3ef1f94	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-17 23:39:15 -0500

    fix CollectionAssociation docs

M	activerecord/lib/active_record/associations/collection_association.rb

commit 446940c	refs/heads/master
Author: Alex Soulim 
Date:   2012-04-03 16:01:00 +0400

    Add HTML5 input[type="time"] helper

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/time_field.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	guides/source/form_helpers.textile

commit fcc13f4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-17 23:30:51 -0500

    add example to CollectionAssociation#destroy_all

M	activerecord/lib/active_record/associations/collection_association.rb

commit c0c0ef5	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-17 23:25:27 -0500

    add more explanation to CollectionAssociation docs

M	activerecord/lib/active_record/associations/collection_association.rb

commit e66c0fc	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-17 23:20:21 -0500

    add CollectionAssociation hierarchy

M	activerecord/lib/active_record/associations/collection_association.rb

commit 3c91c81	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-17 22:43:51 -0500

    add docs to CollectionAssociation#many?

M	activerecord/lib/active_record/associations/collection_association.rb

commit 2e2d381	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-18 12:16:42 +1000

    [engines] initializer method call needs an argument for initializer name

M	guides/source/engines.textile

commit 3e9ec24	refs/heads/master
Author: Kirill Lashuk 
Date:   2012-02-13 01:09:44 +0300

    Render img tag with empty src if empty string is passed to image_tag.

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 3328401	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-17 14:34:53 -0700

    Add oscardelben to authors

A	guides/assets/images/oscardelben.jpg
M	guides/source/credits.html.erb

commit b23ac93	refs/heads/master
Merge: 598fc20 90ec863
Author: Rafael Mendonça França 
Date:   2012-05-17 14:05:31 -0700

    Merge pull request #6371 from ihid/remove_old_text_helper_api
    
    Removed old text_helper apis for highlight, excerpt and word_wrap

commit 90ec863	refs/heads/master
Author: Jeremy Walker 
Date:   2012-05-17 21:52:49 +0100

    Removed old text_helper apis for highlight, excerpt and word_wrap

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 598fc20	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-17 13:17:17 -0700

    Fix incorrect assert_block -> assert conversion. Assumed too much from the MiniTest deprecation message.

M	actionpack/lib/action_controller/test_case.rb

commit ea1477f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-17 15:05:39 -0500

    fix CollectionAssociation#replace docs

M	activerecord/lib/active_record/associations/collection_association.rb

commit a00bca6	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-17 23:01:35 +0300

    update AS docs

M	guides/source/active_support_core_extensions.textile

commit 75e8e77	refs/tags/v3.2.5
Merge: 0f43592 4bbd05c
Author: Vijay Dev 
Date:   2012-05-17 11:46:47 -0700

    Merge pull request #6367 from frodsan/fix_validators_docs
    
    Fix validators docs [3-2-stable]

commit 0f5cc34	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-17 10:19:04 -0700

    Revert changes related to `bundle install` fixes in `rails new`
    
    Reverted changes:
      f3482a9 Fix tests in railties
      5904295 improve #6318
      aed906a prevent using already loaded Gemfile for 'bundle install'
    
    In order to fix this, we need a fix in bundler related to GEM_PATH,
    which will allow to run tests properly. I will get this changes back
    when it happens.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 319903b	refs/heads/master
Merge: 8067857 56aabfd
Author: Rafael Mendonça França 
Date:   2012-05-17 11:01:21 -0700

    Merge pull request #2036 from Bodacious/tag_helper_data_fix
    
    TagHelper creates invalid data attributes when value is a BigDecimal

commit 8067857	refs/heads/master
Merge: 165acf3 99ed99b
Author: Aaron Patterson 
Date:   2012-05-17 10:56:39 -0700

    Merge pull request #6238 from pwnall/pgsql_bytea_limit
    
    Postgresql doesn't accept limits on binary (bytea) columns.

commit 165acf3	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-17 09:08:45 -0700

    MiniTest deprecated #assert_block in favor of calling #assert with a block

M	actionpack/lib/action_controller/test_case.rb

commit cd840c3	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-17 12:40:35 -0500

    Add docs to CollectionAssociation#replace

M	activerecord/lib/active_record/associations/collection_association.rb

commit 1b604c7	refs/heads/master
Merge: de29c30 f021377
Author: Aaron Patterson 
Date:   2012-05-17 10:32:15 -0700

    Merge pull request #6215 from erichmenge/fix_has_secure_password
    
    Fix has secure password

commit de29c30	refs/heads/master
Author: José Valim 
Date:   2012-05-17 20:21:01 +0300

    Update actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md

commit f5ebc9a	refs/heads/master
Merge: 6ada771 8bea607
Author: José Valim 
Date:   2012-05-17 10:19:27 -0700

    Merge pull request #6309 from steveklabnik/fix-2394
    
    Created a Raw handler for templates.

commit 56aabfd	refs/heads/master
Author: Bodacious 
Date:   2012-05-17 18:15:43 +0100

    Fixed tag_helper data-attribute bug with BigDecimals

M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/tag_helper_test.rb

commit 8bea607	refs/heads/master
Author: Steve Klabnik 
Date:   2012-05-13 20:22:29 -0400

    Created a Raw handler for templates.
    
    Fixes #2394

M	actionpack/lib/action_view/template/handlers.rb
A	actionpack/lib/action_view/template/handlers/raw.rb
M	actionpack/lib/action_view/template/resolver.rb
A	actionpack/test/fixtures/plain_text.raw
A	actionpack/test/fixtures/plain_text_with_characters.raw
M	actionpack/test/template/render_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/testing/fixture_resolver_test.rb
M	actionpack/test/template/testing/null_resolver_test.rb

commit 6ada771	refs/heads/master
Merge: a8f568e a8b370f
Author: Aaron Patterson 
Date:   2012-05-17 09:56:21 -0700

    Merge pull request #6250 from iGEL/dont_destroy_readonly_models
    
    Don't allow to destroy readonly models

commit a8f568e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-17 11:55:04 -0300

    Make MockLogger work with blocks.

M	activesupport/lib/active_support/log_subscriber/test_helper.rb

commit 4bbd05c	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-17 10:54:29 -0500

    fix validations docs

M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activemodel/lib/active_model/validations/with.rb

commit 66d0be6	refs/heads/master
Merge: 85ac143 6a48c79
Author: Aaron Patterson 
Date:   2012-05-17 08:53:39 -0700

    Merge pull request #6365 from kennyj/fix_warning_20120518
    
    Fix warning: ambiguous first argument.

commit a8b370f	refs/heads/master
Author: Johannes Barre 
Date:   2012-05-10 13:47:50 +0200

    Don't destroy readonly models

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/readonly_test.rb

commit 6a48c79	refs/heads/master
Author: kennyj 
Date:   2012-05-18 00:50:17 +0900

    Fix warning: ambiguous first argument.

M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit 85ac143	refs/heads/master
Merge: ad8b0a4 b3e1d08
Author: Vijay Dev 
Date:   2012-05-17 07:03:46 -0700

    Merge pull request #6363 from markmcspadden/fix_duplicable_documentation
    
    Fix documentation around duplicable regarding Class and Module.

commit b3e1d08	refs/heads/master
Author: Mark McSpadden 
Date:   2012-05-17 09:22:36 -0400

    Fix documentation around duplicable regarding Class and Module.

M	activesupport/lib/active_support/core_ext/object/duplicable.rb

commit ad8b0a4	refs/heads/master
Merge: 77a4072 30b31f5
Author: José Valim 
Date:   2012-05-17 05:47:03 -0700

    Merge pull request #6351 from bogdan/callbacks
    
    AS::Callbacks remove useless code, improve performance

commit 77a4072	refs/heads/master
Merge: 03f8a57 64872d1
Author: Jon Leighton 
Date:   2012-05-17 05:30:33 -0700

    Merge pull request #6058 from RStankov/relation-from-to-accept-other-relation-objects
    
    Relation#from to accept other Relation objects

commit 03f8a57	refs/heads/master
Merge: 17f583b 612f7fe
Author: Vijay Dev 
Date:   2012-05-17 17:49:33 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	activerecord/lib/active_record/core.rb

commit 612f7fe	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-17 17:44:40 +0530

    fix word_wrap eg output [ci skip]

M	actionpack/lib/action_view/helpers/text_helper.rb

commit a39d144	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-17 17:22:45 +0530

    copy edits assets guide [ci skip]

M	guides/source/asset_pipeline.textile

commit a3dd7a4	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-17 17:19:57 +0530

    copy edit and remove nodoc on instance_values method [ci skip]

M	activesupport/lib/active_support/core_ext/object/instance_variables.rb

commit b71a900	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-17 17:11:53 +0530

    Revert "Update docs in sqlite3 adapter"
    
    This reverts commit 8d7c38b858b0190ac56998f4a4baba250eaf1e4e.
    
    Reason: Lot of the additions aren't adding value.
    
    [ci skip]

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit a3a25e7	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 20:32:44 +1000

    [getting started] remove two more beginningruby links

M	guides/source/getting_started.textile

commit 39b3a10	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 20:32:33 +1000

    [getting started] add comma in 'First we will make a comment partial'

M	guides/source/getting_started.textile

commit 9540747	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 20:29:52 +1000

    [getting started] remove another beginning ruby link

M	guides/source/getting_started.textile

commit a9f029e	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 20:27:15 +1000

    [getting started] briefly explain form_for with array parameters

M	guides/source/getting_started.textile

commit 2c2d70e	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 20:24:15 +1000

    [getting started] Remove beginning ruby link in posts/show

M	guides/source/getting_started.textile

commit a4db311	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 19:18:00 +1000

    [getting started] generating routes manually was done as a learning
    exercise, fix typos

M	guides/source/getting_started.textile

commit cc9a6f2	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 19:17:49 +1000

    [getting started] split up section about rake routes after 'resources' call

M	guides/source/getting_started.textile

commit 42c6f89	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 19:17:17 +1000

    [getting started] dialog box is not automatic, is provided through jquery_ujs, which is necessary to have in application layout

M	guides/source/getting_started.textile

commit 9fc5b45	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 19:16:47 +1000

    [getting started] Fix index template after destroy action addition

M	guides/source/getting_started.textile

commit a99417b	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 19:11:47 +1000

    [getting started] dabase -> database

M	guides/source/getting_started.textile

commit 00dce85	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 19:11:36 +1000

    [getting started guide] more explanation around the delete routing method:

M	guides/source/getting_started.textile

commit 53aaf95	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-17 19:07:24 +1000

    [getting started] explain :as option

M	guides/source/getting_started.textile

commit 17f583b	refs/heads/master
Merge: 6950d74 8a72e7e
Author: José Valim 
Date:   2012-05-17 02:28:19 -0700

    Merge pull request #6362 from bogdan/callbacks_simplify_statement
    
    AS::Callbacks: simplify logical statement

commit 146105a	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2012-05-17 10:25:59 +0200

    explain why we also add attr_accessible in the model

M	guides/source/getting_started.textile

commit 8a72e7e	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-05-17 11:24:39 +0300

    AS::Callbacks: simplify logical statement

M	activesupport/lib/active_support/callbacks.rb

commit 334c433	refs/heads/master
Author: Hendy Tanata 
Date:   2012-05-17 16:12:21 +0800

    Fix code example for word_wrap helper.

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 6950d74	refs/heads/master
Merge: 313f292 2f06d58
Author: José Valim 
Date:   2012-05-17 00:07:10 -0700

    Merge pull request #6361 from markmcspadden/issue_6265
    
    Remove special cases for duplicable? on Class and Module

commit 2f06d58	refs/heads/master
Author: Mark McSpadden 
Date:   2012-05-17 03:00:31 -0400

    Remove special cases for duplicable? on Class and Module

M	activesupport/lib/active_support/core_ext/object/duplicable.rb
M	activesupport/test/core_ext/duplicable_test.rb

commit 313f292	refs/heads/master
Author: José Valim 
Date:   2012-05-17 08:52:40 +0200

    Ensure blocks given to subscriber are properly yield

M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	activesupport/test/log_subscriber_test.rb

commit 6057a1d	refs/heads/master
Merge: 47971a1 bc51ad9
Author: José Valim 
Date:   2012-05-16 23:36:03 -0700

    Merge pull request #6356 from andhapp/fix-bug-with-inflections
    
    Fix an issue with inflection

commit 32f3c27	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-05-16 22:48:30 -0700

    Fix some code formatting in core_ext guide
    
    [ci skip]
    
     is nonstandard Textile; RailsGuides::TextileExtensions::plusplus
    is the method that causes multiple code-formatted `+` symbols to
    generate crap like
    
        1 + 2 ...
    
    instead of the expected output:
    
        1 + 2 ...

M	guides/source/active_support_core_extensions.textile

commit e2e5136	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-06 23:33:12 +0300

    wrap time ranges with timezones, closes #6179

M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 47971a1	refs/heads/master
Merge: 251b22f e3f8b53
Author: Aaron Patterson 
Date:   2012-05-16 21:54:28 -0700

    Merge pull request #6360 from bcardarella/logger_debug_fix
    
    Fixed logger bug introduced by #2237

commit e3f8b53	refs/heads/master
Author: Brian Cardarella 
Date:   2012-05-17 00:34:30 -0400

    Fixed logger bug introduced by #2237

M	activesupport/lib/active_support/log_subscriber/test_helper.rb

commit 251b22f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-16 21:33:49 -0300

    Don't need to force size to nil

M	actionpack/lib/action_view/helpers/tags/date_field.rb
M	actionpack/lib/action_view/helpers/tags/file_field.rb
M	actionpack/lib/action_view/helpers/tags/hidden_field.rb
M	actionpack/lib/action_view/helpers/tags/number_field.rb

commit 0821295	refs/heads/master
Merge: fc3b3b9 f31670d
Author: Aaron Patterson 
Date:   2012-05-16 17:32:00 -0700

    Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when_already_loaded
    
    When Active Record has already loaded a unique association `.size` returns the wrong number.

commit fc3b3b9	refs/heads/master
Merge: 9c734c5 80a2c9e
Author: Aaron Patterson 
Date:   2012-05-16 17:26:18 -0700

    Merge pull request #6357 from takai/improve_logging_of_mass_assignment_sanitizer
    
    Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer

commit 0f43592	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-09 19:35:34 -0700

    Fix CollectionAssociation#replace to return new target (closes #6231)
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 9c734c5	refs/heads/master
Merge: e2a070c a57990f
Author: Aaron Patterson 
Date:   2012-05-16 17:24:07 -0700

    Merge pull request #6358 from jfirebaugh/schema_define
    
    Call methods on the correct instance in AR::Schema.define

commit e2a070c	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-09 19:35:34 -0700

    Fix CollectionAssociation#replace to return new target (closes #6231)

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 1f0e2de	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-16 21:04:46 -0300

    Document the usage of grouped_options_for_select with divider option

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 982ed06	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-16 20:52:27 -0300

    Make :prompt work as documented

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 6f04975	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-16 20:51:33 -0300

    Test deprecation and fix the documentation of grouped_options_for_select

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 7aa96a1	refs/heads/master
Merge: 835df6f 3fa0007
Author: Aaron Patterson 
Date:   2012-05-16 16:50:04 -0700

    Merge pull request #2237 from jackdempsey/log_redirect_to
    
    log at debug level what line caused the redirect_to

commit 64872d1	refs/heads/master
Author: Radoslav Stankov 
Date:   2012-04-29 21:17:57 +0300

    Relation#from to accept other Relation objects
    
    Record.from("(#{sub_query.to_sql})")    -> Record.from(sub_query)
    Record.from("(#{sub_query.to_sql}) a")  -> Record.from(sub_query, :a)

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb

commit 3fa0007	refs/heads/master
Author: Jack Dempsey 
Date:   2011-07-23 21:39:57 -0700

    log at debug level what line caused the redirect_to

M	actionpack/lib/action_controller/metal/redirecting.rb

commit 835df6f	refs/heads/master
Merge: 66cbde0 0e1c651
Author: Aaron Patterson 
Date:   2012-05-16 16:29:43 -0700

    Merge pull request #6192 from danmcclain/add_inet_and_cidr_types_to_postgresql_adapter
    
    Add support for macaddr, inet, and cidr types to PostgreSQL adapter

commit 66cbde0	refs/heads/master
Merge: 8e5f07d a1ae17e
Author: Aaron Patterson 
Date:   2012-05-16 16:15:50 -0700

    Merge pull request #5369 from Greenie0506/add_separator_to_grouped_options_for_select
    
    Add separator option to grouped_options_for_select

commit 8e5f07d	refs/heads/master
Merge: 8bc1e53 c8792c7
Author: Aaron Patterson 
Date:   2012-05-16 16:06:49 -0700

    Merge pull request #5535 from markmcspadden/issue_5527_rollbacks
    
    Allow manual rollbacks in after_save to reset object correctly

commit e3033e3	refs/tags/v3.2.5
Merge: 8470fdb 9f4c4f6
Author: Aaron Patterson 
Date:   2012-05-16 16:02:10 -0700

    Merge pull request #6340 from bcardarella/patch-3
    
    Changing the indentation level of the block comment close for Sass

commit 8bc1e53	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-16 15:40:57 -0700

    Load all the env files available in config.paths (closes #6335)

M	railties/CHANGELOG.md
M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb

commit a57990f	refs/heads/master
Author: John Firebaugh 
Date:   2012-05-16 15:08:17 -0700

    Call methods on the correct instance in AR::Schema.define
    
    Now that migrations support instance methods, we should
    use the same instance rather than relying on delegation
    to a global instance. This allows subclassing AR::Schema.

M	activerecord/lib/active_record/schema.rb
M	activerecord/test/cases/ar_schema_test.rb

commit bc51ad9	refs/heads/master
Author: Anuj Dutta 
Date:   2012-05-16 22:56:08 +0100

    Fix an issue with inflection where my_analyses (in plular form) incorrectly converted to my_analyasis(in singular form).

M	activesupport/lib/active_support/inflections.rb
M	activesupport/test/inflector_test_cases.rb

commit 80a2c9e	refs/heads/master
Author: Naoto Takai 
Date:   2012-05-17 06:55:14 +0900

    Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
M	activemodel/test/cases/mass_assignment_security_test.rb

commit 78b6fdd	refs/heads/master
Merge: d6e4c06 ef703b5
Author: Aaron Patterson 
Date:   2012-05-16 14:39:46 -0700

    Merge pull request #6337 from bcardarella/patch-1
    
    Changing the indentation level of the block comment close for Sass

commit d6e4c06	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-16 14:16:57 -0700

    assuming there is only one column, we can simplify the type cast loop

M	activerecord/lib/active_record/relation/calculations.rb

commit 2a38fd5	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-16 14:07:10 -0700

    MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless
    an alias is provided.  Without the alias, the column cannot be found
    and properly typecast.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit bf0212b	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-17 01:48:25 +0530

    remove stray text in getting started guide [ci skip]

M	guides/source/getting_started.textile

commit 6a12900	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-05-16 13:17:09 -0700

    Fix typos in docs for ActiveRecord::Core::arel_table [ci skip]

M	activerecord/lib/active_record/core.rb

commit eb06d58	refs/heads/master
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-05-16 17:10:17 -0300

    Revert "Merge pull request #6354 from lest/patch-1"
    
    This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing
    changes made to 9adf28c026070afb78b80027521a4ddddd68d697.
    
    Reason: This broke the actionmailer tests

M	activesupport/lib/active_support/core_ext/string/access.rb
M	activesupport/lib/active_support/core_ext/string/filters.rb
M	activesupport/lib/active_support/inflector/transliterate.rb

commit 98bfccb	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-17 01:32:21 +0530

    document the AR::Base#ids method introduced in 9307616 [ci skip]

M	guides/source/active_record_querying.textile

commit e8feaff	refs/heads/master
Merge: 9adf28c f88f699
Author: Rafael Mendonça França 
Date:   2012-05-16 12:51:16 -0700

    Merge pull request #6354 from lest/patch-1
    
    remove unnecessary require

commit b1dfcc9	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-16 14:44:57 -0500

    update AS:OrderedHash docs

M	activesupport/lib/active_support/ordered_hash.rb

commit 9adf28c	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-17 01:13:19 +0530

    fix bad formatting [ci skip]

M	activesupport/lib/active_support/deprecation/behaviors.rb

commit f88f699	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-05-16 22:39:56 +0300

    remove unnecessary require
    
    - access & filters don't use multibyte ext
    - transliterate requires only AS::Multibyte but not multibyte ext

M	activesupport/lib/active_support/core_ext/string/access.rb
M	activesupport/lib/active_support/core_ext/string/filters.rb
M	activesupport/lib/active_support/inflector/transliterate.rb

commit 2a67a8c	refs/heads/master
Merge: 4025efb 279fef1
Author: Aaron Patterson 
Date:   2012-05-16 11:27:24 -0700

    Merge pull request #6136 from mhfs/sqlbypass_fixes
    
    Bring SqlByPassTest to light and fix broken tests

commit 4025efb	refs/heads/master
Merge: 2ee8ed4 56cef49
Author: Aaron Patterson 
Date:   2012-05-16 11:25:43 -0700

    Merge pull request #6349 from erichmenge/patch-raise-type-errors
    
    Integer limit out of range should be allowed to raise. Closes #6272

commit 2ee8ed4	refs/heads/master
Merge: aa96420 9fb21e9
Author: Aaron Patterson 
Date:   2012-05-16 11:17:42 -0700

    Merge pull request #6353 from nashby/safe-interpolation
    
    fix safe string interpolation with SafeBuffer#%

commit aa96420	refs/heads/master
Merge: e296269 c90f16d
Author: Carlos Antonio da Silva 
Date:   2012-05-16 11:17:04 -0700

    Merge pull request #6336 from erichmenge/patch-pluck-fragment
    
    Fixes issue where SQL fragments prevented type casting based on column

commit 9fb21e9	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-16 21:04:31 +0300

    fix safe string interpolation with SafeBuffer#%, closes #6352

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit c90f16d	refs/heads/master
Author: Erich Menge 
Date:   2012-05-15 19:51:27 -0500

    Fixes issue where SQL fragments prevented type casting based on column type.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit e296269	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-16 21:17:10 +0530

    remove image_tag onmouseover option docs [ci skip]

M	guides/source/layouts_and_rendering.textile

commit 3004bc2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-16 10:01:43 -0500

    fixing removed empty lines and examples

M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb

commit a9e66c6	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-16 08:56:31 -0500

    fixing validates_with docs

M	activemodel/lib/active_model/validations/with.rb

commit 30b31f5	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-05-16 16:49:30 +0300

    AS::Callbacks remove useless code, improve performance

M	activesupport/lib/active_support/callbacks.rb

commit 56cef49	refs/heads/master
Author: Erich Menge 
Date:   2012-05-11 14:45:26 -0500

    Integer limit out of range should be allowed to raise. Closes #6272

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/test/cases/migration/change_schema_test.rb
M	activerecord/test/cases/migration/column_attributes_test.rb
M	activerecord/test/cases/migration_test.rb

commit f94567a	refs/heads/master
Author: Richard Hulse 
Date:   2012-05-16 22:06:10 +1200

    [guides] add note about cosequences of option changes

M	guides/source/asset_pipeline.textile

commit 950a7b4	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 18:11:21 +1000

    [getting started] explain that posts_path exists due to how we defined routes earlier

M	guides/source/getting_started.textile

commit 8cfde22	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 18:10:55 +1000

    [getting started] Split up refactoring of new and edit templates

M	guides/source/getting_started.textile

commit dd3ee84	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 18:10:39 +1000

    [getting started] don't call it 'a _form partial', just 'a partial'

M	guides/source/getting_started.textile

commit 0c90bf0	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 18:02:55 +1000

    [getting started] remove tab in form partial

M	guides/source/getting_started.textile

commit 038af99	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 18:02:22 +1000

    [getting started] Prefix users templates with 'users' to show that's where they're coming from

M	guides/source/getting_started.textile

commit f76e0a5	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 18:01:50 +1000

    [getting started] split up adding link for edit to index and show templates

M	guides/source/getting_started.textile

commit 9c76aa0	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 17:57:24 +1000

    [getting started] grammatical changes at beginning of update action section

M	guides/source/getting_started.textile

commit 9073cf8	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 17:52:10 +1000

    [getting started] some more handholding around where exactly the error would appear when a post is invalid

M	guides/source/getting_started.textile

commit 10dfbaa	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 17:51:03 +1000

    [getting started] fix weird linebreak when talking about pluralize

M	guides/source/getting_started.textile

commit e91a1a0	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 17:50:46 +1000

    [getting started] re-add new action back to PostsController, explain that it'll be explained in a short while

M	guides/source/getting_started.textile

commit 926e160	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 17:47:53 +1000

    [getting started] Explain the create action check for validations better

M	guides/source/getting_started.textile

commit 9a8c91d	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 17:47:34 +1000

    [getting started] add attr_accessible to Post model

M	guides/source/getting_started.textile

commit aa7f2a3	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 17:47:21 +1000

    [getting started] split up addition of links to index/show/new area

M	guides/source/getting_started.textile

commit 4edb497	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-16 00:40:21 -0700

    Remove unneeded tests

M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit 80ba7a8	refs/heads/master
Merge: f3482a9 2baa8ba
Author: Vijay Dev 
Date:   2012-05-15 23:56:23 -0700

    Merge pull request #6347 from avakhov/ar-changelog-misprint
    
    Fix misprint in AR changelog

commit 95e14d1	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-16 01:23:46 -0500

    better format and fixes to validators docs

M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb

commit f3482a9	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-15 22:42:36 -0700

    Fix tests in railties
    
    Since `bundle install` was fixed in `rails plugin new`, it
    now requires `rails 4.0.0.beta` version in filesystem when
    running tests. Instead of providing it, we can run tested
    command with `--dev` option, to use rails from the local
    directory.

M	railties/test/generators/plugin_new_generator_test.rb

commit 5904295	refs/heads/master
Author: Michal Papis 
Date:   2012-05-15 23:39:19 +0200

    improve #6318

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit d8e8473	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-16 00:24:38 -0500

    removing 1.8 reference

M	activesupport/lib/active_support/core_ext/object/instance_variables.rb

commit 57d534e	refs/heads/master
Merge: 20f049f d9fc180
Author: Piotr Sarnacki 
Date:   2012-05-15 22:14:54 -0700

    Merge pull request #6344 from erichmenge/patch_sqlite_time_type
    
    SQLite3 doesn't actually support the 'time' type.

commit 2baa8ba	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-16 09:06:01 +0400

    Fix misprint in AR changelog

M	activerecord/CHANGELOG.md

commit 007c3d8	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-16 00:03:03 -0500

    better example format in validates_exclusion_of docs

M	activemodel/lib/active_model/validations/exclusion.rb

commit 0e07a80	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-16 09:00:26 +0400

    Update AR has_one association example

M	activerecord/lib/active_record/associations.rb

commit 20f049f	refs/heads/master
Merge: 379b110 e8b8090
Author: Piotr Sarnacki 
Date:   2012-05-15 21:59:00 -0700

    Merge pull request #6346 from oscardelben/patch-9
    
    Remove useless check of adapter

commit e8b8090	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-15 20:48:51 -0700

    Remove useless check of adapter

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 8d7c38b	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-15 20:38:41 -0700

    Update docs in sqlite3 adapter

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 379b110	refs/heads/master
Merge: 7994496 2fac915
Author: Rafael Mendonça França 
Date:   2012-05-15 20:28:47 -0700

    Merge pull request #6343 from oscardelben/bump_sqlite3
    
    Bump sqlite3 gem

commit 279fef1	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-05-02 23:57:27 -0300

    Rename test file so that the test suite matches it, implement `persisted?` for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).

M	activerecord/lib/active_record/session_store.rb
D	activerecord/test/cases/session_store/sql_bypass.rb
A	activerecord/test/cases/session_store/sql_bypass_test.rb

commit 2fac915	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-15 20:25:30 -0700

    Bumo sqlite3 gem

M	Gemfile

commit d9fc180	refs/heads/master
Author: Erich Menge 
Date:   2012-05-15 22:05:00 -0500

    SQLite3 doesn't actually support the 'time' type.

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit 46156b8	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-15 19:46:40 -0700

    Update action view context docs.

M	actionpack/lib/action_view/context.rb

commit 9f4c4f6	refs/tags/v3.2.5
Author: Brian Cardarella 
Date:   2012-05-15 23:00:00 -0300

    Changing the indentation level of the block comment close for SASS
    
    If one wants to use use SASS for application.css.sass the comment block indentation is invalid.

M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit ef703b5	refs/heads/master
Author: Brian Cardarella 
Date:   2012-05-15 22:57:14 -0300

    Changing the indentation level of the block comment close for SASS
    
    If one wants to use use SASS for application.css.sass the comment block indentation is invalid.

M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit ca18e2f	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 11:02:49 +1000

    [getting started] add segue at the end of posts/index section

M	guides/source/getting_started.textile

commit af2a6ac	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 10:51:11 +1000

    [getting started] indent iteration in posts/index template

M	guides/source/getting_started.textile

commit 533bcd7	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-16 10:50:57 +1000

    [getting started] Split up creation of route, action and view for PostsController#index

M	guides/source/getting_started.textile

commit b0e2fc8	refs/heads/master
Author: Tsutomu Kuroda 
Date:   2012-04-14 18:00:54 +0900

    Fix human attribute_name to handle deeply nested attributes
    
    When a model nests another model that also nests yet another model
    using accepts_nested_attributes_for method, its Errors object can
    have an attribute name with "contacts.addresses.street" style.
    
    In this case, the dots within the namespace should be substituted
    with slashes so that we can provide the translation under the
    "activemodel.attributes.person/contacts/addresses.street" key.
    
    This commit is related to #3859.

M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit 7994496	refs/heads/master
Merge: dafc734 4bb14b0
Author: Rafael Mendonça França 
Date:   2012-05-15 15:58:11 -0700

    Merge pull request #6273 from KensoDev/feature/simple_format_refactoring
    
    Feature/simple format refactoring

commit dafc734	refs/heads/master
Merge: 6f226e0 6c79e82
Author: Rafael Mendonça França 
Date:   2012-05-15 15:28:46 -0700

    Merge pull request #6333 from carlosgaldino/unnecessary-call
    
    Remove unnecessary calls to primary_key on sqlite3_adapter

commit 6c79e82	refs/heads/master
Author: Carlos Galdino 
Date:   2012-05-15 19:25:15 -0300

    Remove unnecessary calls to primary_key on sqlite3_adapter

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 6f226e0	refs/heads/master
Merge: bc4ebaf 53debf1
Author: Carlos Antonio da Silva 
Date:   2012-05-15 14:16:51 -0700

    Merge pull request #6325 from kennyj/fix_5832-3
    
    Remove unnecessary assertions.

commit 8470fdb	refs/tags/v3.2.5
Merge: 2dfa8b5 e885b18
Author: Rafael Mendonça França 
Date:   2012-05-15 12:53:01 -0700

    Merge pull request #6329 from acapilleri/backport_dup_validation_3_2
    
    Backport dup validation 3 2

commit e885b18	refs/tags/v3.2.5
Author: Angelo Capilleri 
Date:   2012-05-15 21:32:10 +0200

    add backport for the pull request #6324

M	activemodel/lib/active_model/validations.rb

commit bc4ebaf	refs/heads/master
Merge: ea50d53 80b6816
Author: Carlos Antonio da Silva 
Date:   2012-05-15 12:01:47 -0700

    Merge pull request #6327 from nashby/string-interpolation
    
    remove backported string interpolation

commit 0666e7b	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-15 21:00:42 +0300

    update docs on String#at about ruby version

M	guides/source/active_support_core_extensions.textile

commit 80b6816	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-15 20:53:28 +0300

    remove backported string interpolation

M	activesupport/lib/active_support/core_ext/string.rb
D	activesupport/lib/active_support/core_ext/string/interpolation.rb
M	guides/source/active_support_core_extensions.textile

commit a1ae17e	refs/heads/master
Author: Greenie0506 
Date:   2012-05-15 13:45:12 -0400

    Add separator argument to grouped_options_for_select
    
    Change prompt to options hash in grouped_options_for_select

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit ea50d53	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-15 10:21:58 -0700

    Expand and improve #pluck docs

M	activerecord/lib/active_record/relation/calculations.rb

commit 3f352d0	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-15 10:21:38 -0700

    Restore support for Model.pluck('sql fragment')

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 2dfa8b5	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-05-15 13:41:49 -0300

    Fix indent from previous merge

M	activemodel/lib/active_model/validations.rb

commit e2322a9	refs/heads/master
Author: David Jones 
Date:   2012-05-15 09:40:24 -0700

    Make the 'Using Models in Your Migrations' example code more concise by using update_all method

M	guides/source/migrations.textile

commit 9b4f504	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-15 13:38:29 -0300

    Kill whitespaces :scissors:

M	activemodel/lib/active_model/validations.rb
M	activemodel/test/cases/validations_test.rb

commit 53debf1	refs/heads/master
Author: kennyj 
Date:   2012-05-16 01:33:52 +0900

    Remove unnecessary assertions. We should only test the before_seq isn't same to the after_seq when using sequencer.

M	activerecord/test/cases/base_test.rb

commit 2649fba	refs/heads/master
Merge: 1c3e5be 0bbcc91
Author: Rafael Mendonça França 
Date:   2012-05-15 09:33:26 -0700

    Merge pull request #6322 from acapilleri/some_mispelling_errors
    
    corrected some misspelling

commit 9a868a0	refs/tags/v3.2.5
Merge: 007539d 396e383
Author: Rafael Mendonça França 
Date:   2012-05-15 09:32:46 -0700

    Merge pull request #6324 from acapilleri/dup_validation_3_2
    
    Dup validation 3 2

commit 396e383	refs/tags/v3.2.5
Author: Angelo capilleri 
Date:   2012-05-15 18:16:28 +0200

    clean the errors if an object that includes validations errors is duped,for 3-2-stable
    It Fixes #5953 in 3-2-stable, it's the same pull request of #6284

M	activemodel/lib/active_model/validations.rb
M	activemodel/test/cases/validations_test.rb

commit 0bbcc91	refs/heads/master
Author: Angelo capilleri 
Date:   2012-05-15 18:01:40 +0200

    corrected some misspelling

M	activerecord/CHANGELOG.md

commit ceafd76	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-15 21:12:06 +0530

    Revert "corrected some misspelling"
    
    This reverts commit 3b6c0e35d0c6e2671c423fd8524e88b3bf25503b.
    
    Reason: changelogs aren't meant to be edited in docrails.

M	activerecord/CHANGELOG.md

commit bcacfae	refs/heads/master
Merge: 3b6c0e3 1f62b12
Author: Vijay Dev 
Date:   2012-05-15 08:39:52 -0700

    Merge pull request #99 from GRoguelon/master
    
    Fix an error in methods example of instanciated fixtures.

commit 3b6c0e3	refs/heads/master
Author: Angelo capilleri 
Date:   2012-05-15 17:25:06 +0200

    corrected some misspelling

M	activerecord/CHANGELOG.md

commit 1c3e5be	refs/heads/master
Merge: e3cc49c 03becb1
Author: Aaron Patterson 
Date:   2012-05-15 08:24:25 -0700

    Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master
    
    [#5559] Do not black out the system timezone DST jump hour if Time.zone ...

commit 007539d	refs/tags/v3.2.5
Merge: e9051e2 b2f73c4
Author: Vijay Dev 
Date:   2012-05-15 08:14:51 -0700

    Merge pull request #6321 from frodsan/backport_docs
    
    Backporting docs

commit b2f73c4	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-15 10:00:09 -0500

    Backporting some docs on core_ext/hash

M	activesupport/lib/active_support/core_ext/hash/deep_dup.rb
M	activesupport/lib/active_support/core_ext/hash/deep_merge.rb
M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit b026f7e	refs/heads/master
Author: Peter Suschlik 
Date:   2012-05-15 15:37:18 +0200

    Fix typo [ci skip]

M	activerecord/lib/active_record/core.rb

commit e3cc49c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-15 10:00:59 -0300

    Remove extra `end` in arel_table docs. [ci skip]
    
    Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4

M	activerecord/lib/active_record/core.rb

commit 3d1b078	refs/heads/master
Merge: dd42e89 f9ae1ba
Author: Carlos Antonio da Silva 
Date:   2012-05-15 05:20:57 -0700

    Merge pull request #6284 from acapilleri/dup_validation
    
    clean the erros if an object that includes validation  is duped.

commit dd42e89	refs/heads/master
Author: José Valim 
Date:   2012-05-15 10:06:27 +0200

    Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_tag`, `button_tag` and `button_to` helpers.""
    
    Finally remove `:disable_with` but use `:data => { :disable_with => ... }`
    in examples to show off a better API (which looks nicer in Ruby 1.9)
    
    This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	guides/source/ajax_on_rails.textile

commit a5c38a9	refs/heads/master
Author: José Valim 
Date:   2012-05-15 09:55:30 +0200

    Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_tag`, `button_tag` and `button_to` helpers."
    
    `disable_with:` is much easier to type than `"data-disable-with" =>`,
    and the fact it uses "data-disable-with" => is an implementation concern,
    it should not affect the public API.
    
    This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	guides/source/ajax_on_rails.textile

commit 59b03d4	refs/heads/master
Merge: 0be7fab 7cd8884
Author: Vijay Dev 
Date:   2012-05-15 13:13:55 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit 7cd8884	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-15 13:10:08 +0530

    missing dot [ci skip]

M	activesupport/lib/active_support/core_ext/hash/deep_merge.rb

commit 1f62b12	refs/heads/master
Author: Geoffrey Roguelon 
Date:   2012-05-15 09:40:03 +0200

    Fix an error in example in methods of instanciated fixtures.

M	activerecord/lib/active_record/fixtures.rb

commit 8972829	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-15 13:00:25 +0530

    copy edit asset guide [ci skip]

M	guides/source/asset_pipeline.textile

commit 0be7fab	refs/heads/master
Merge: 3bc73df aed906a
Author: José Valim 
Date:   2012-05-15 00:24:51 -0700

    Merge pull request #6318 from mpapis/master
    
    fix `bundle exec rails new app` not running `bundle install` properly

commit aed906a	refs/heads/master
Author: Michal Papis 
Date:   2012-05-15 08:55:58 +0200

    prevent using already loaded Gemfile for 'bundle install', fix #6314

M	railties/lib/rails/generators/app_base.rb

commit fc0391f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-15 01:51:54 -0500

    Removing ==Examples and last blank lines of docs from actionpack

M	actionpack/lib/action_controller/caching/pages.rb
M	actionpack/lib/action_controller/metal/conditional_get.rb
M	actionpack/lib/action_controller/metal/helpers.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/lib/action_controller/metal/renderers.rb
M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_controller/metal/url_for.rb
M	actionpack/lib/action_controller/record_identifier.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/filter_parameters.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/lib/action_dispatch/testing/assertions/dom.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_dispatch/testing/assertions/tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/action_view/helpers/cache_helper.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/debug_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/lib/action_view/helpers/text_helper.rb

commit 632f279	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-05-14 22:37:34 -0700

    code-format italicized 'production' env [ci skip]

M	guides/source/configuring.textile

commit b83f4c7	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-05-14 22:33:45 -0700

    s/aff/add [ci skip]

M	guides/source/getting_started.textile

commit 7ecfe3d	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-14 20:30:34 -0700

    Add documentation for arel_table

M	activerecord/lib/active_record/core.rb

commit 3bc73df	refs/heads/master
Merge: 8ad58af 0d3172c
Author: Piotr Sarnacki 
Date:   2012-05-14 20:04:31 -0700

    Merge pull request #6317 from korny/routes-draw-backtrace
    
    add tests and external file backtrace for Routing::Mapper#draw

commit 0d3172c	refs/heads/master
Author: Kornelius Kalnbach 
Date:   2012-05-15 04:28:10 +0200

    add tests and external file backtrace for Routing::Mapper#draw

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb
A	actionpack/test/fixtures/routes/bogus.rb
A	actionpack/test/fixtures/routes/external.rb

commit 8ad58af	refs/heads/master
Merge: 2c0add7 3188f81
Author: Rafael Mendonça França 
Date:   2012-05-14 18:28:14 -0700

    Merge pull request #6186 from anydiem/fix_unconventional_pks
    
    Set the primary key during #copy_table if necessary. Fixes [#2312]

commit c4b0087	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-14 14:14:59 -0700

    Minor editing of getting started guide

M	guides/source/getting_started.textile

commit f2af398	refs/heads/master
Merge: 59462c1 151aa9a
Author: Oscar Del Ben 
Date:   2012-05-14 13:56:26 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit 2c0add7	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-14 17:51:54 -0300

    Use merge! instead reverse_merge! here

M	actionpack/lib/action_view/helpers/url_helper.rb

commit e9051e2	refs/tags/v3.2.5
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-05-14 16:55:13 -0300

    Deprecate `:disable_with` for `button_tag` too

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb

commit 3188f81	refs/heads/master
Author: Sean Scally 
Date:   2012-05-14 14:47:25 -0500

    Set the primary key during #copy_table if necessary. Fixes [#2312]

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/copy_table_test.rb

commit d47d6e7	refs/tags/v3.2.5
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-05-14 16:26:27 -0300

    Fix typo

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 21141e7	refs/tags/v3.2.5
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-05-14 16:22:53 -0300

    Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb

commit 683fc4d	refs/heads/master
Author: Carlos Galdino + Rafael Mendonça França 
Date:   2012-05-14 16:40:43 -0300

    Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_tag`, `button_tag` and `button_to` helpers.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	guides/source/ajax_on_rails.textile

commit 151aa9a	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-14 21:49:42 +0300

    remove docs on Range#step

M	guides/source/active_support_core_extensions.textile

commit c5bcb0d	refs/heads/master
Merge: 017632f 00c94d7
Author: Rafael Mendonça França 
Date:   2012-05-14 09:50:21 -0700

    Merge pull request #6220 from frodsan/pass_multiple_value
    
    Allow define_attribute_methods to pass multiple values

commit 00c94d7	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-14 11:38:23 -0500

    updating define_attribute_methods documentation

M	activemodel/README.rdoc
M	activemodel/lib/active_model/dirty.rb
M	activemodel/test/cases/dirty_test.rb
M	guides/source/active_model_basics.textile

commit 05234b3	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-14 11:34:35 -0500

    allow define_attribute_methods to pass multiple values

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 17059a4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-14 10:50:40 -0500

    Removing ==Examples and last blank lines of docs from railties

M	railties/lib/rails.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/actions.rb
M	railties/lib/rails/generators/base.rb
M	railties/lib/rails/generators/migration.rb

commit 017632f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-14 12:31:51 -0300

    Remove not used date variable and another test warning

M	railties/test/generators/app_generator_test.rb

commit f4c8f8c	refs/heads/master
Author: José Valim 
Date:   2012-05-14 18:09:53 +0300

    Remove assertion on date from humans.txt tests

M	railties/test/generators/app_generator_test.rb

commit e7a83df	refs/heads/master
Author: José Valim 
Date:   2012-05-14 17:37:06 +0300

    Remove dates and environment variables from humans.txt

M	railties/lib/rails/generators/rails/app/templates/public/humans.txt.tt

commit 4bb14b0	refs/heads/master
Author: Avi Tzurel 
Date:   2012-05-14 01:15:46 +0300

    Added the wrapper tag option to simple_format

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 09fcac9	refs/heads/master
Author: Avi Tzurel 
Date:   2012-05-11 21:46:39 +0300

    simple_format refactoring
    
    using split_paragraphs method and content_tag instead of string
    concatination

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 2506d4a	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-05-14 06:18:42 -0700

    Merge pull request #6018 from lest/patch-1
    
    mailer can be anonymous

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/test/base_test.rb
A	actionmailer/test/fixtures/anonymous/welcome.erb

commit 647285b	refs/heads/master
Merge: c13a3f0 c17d200
Author: Carlos Antonio da Silva 
Date:   2012-05-14 06:18:42 -0700

    Merge pull request #6018 from lest/patch-1
    
    mailer can be anonymous

commit 888383e	refs/heads/master
Author: Ayrton De Craene 
Date:   2012-05-14 14:04:24 +0200

    'Netherlands locale' does not make any sense, it's Dutch locale [ci skip]

M	guides/source/i18n.textile

commit ee4e48e	refs/heads/master
Author: Ayrton De Craene 
Date:   2012-05-14 13:24:32 +0200

    Improved the readability of some sentences [ci skip]

M	guides/source/i18n.textile

commit 8ef67de	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-14 15:17:59 +0530

    fix format in getting started guide [ci skip]

M	guides/source/getting_started.textile

commit ec68258	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-05-14 08:03:40 +0200

    Default escape_html_entities_in_json to true in new apps

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit c13a3f0	refs/heads/master
Author: José Valim 
Date:   2012-05-14 08:02:45 +0200

    Since escape_html_entities_in_json was moved to 3-2-stable, make it true in AS, closes #6287

M	activesupport/lib/active_support/json/encoding.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 4588684	refs/tags/v3.2.5
Author: Egor Homakov 
Date:   2012-05-12 10:26:22 +0400

    Update railties/lib/rails/generators/rails/app/templates/config/application.rb
    
    Signed-off-by: José Valim 

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit d7c4d0c	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-14 00:18:57 -0500

    adding examples to deep_dup method

M	activesupport/lib/active_support/core_ext/object/deep_dup.rb

commit 7a95d07	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-14 09:13:59 +0400

    Missed colon

M	activemodel/lib/active_model/serialization.rb

commit 9199ddf	refs/tags/v3.2.5
Merge: 1aff772 5ecd14c
Author: Carlos Antonio da Silva 
Date:   2012-05-13 18:56:27 -0700

    Merge pull request #6266 from alexeymuranov/remove_unused_private_method
    
    Remove unused private method

commit fa03e37	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 20:26:53 -0500

    removing unnecessary 'examples' noise from activesupport

M	activesupport/lib/active_support/backtrace_cleaner.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/date/conversions.rb
M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/date_time/conversions.rb
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/hash/diff.rb
M	activesupport/lib/active_support/core_ext/module/aliasing.rb
M	activesupport/lib/active_support/core_ext/range/conversions.rb
M	activesupport/lib/active_support/core_ext/string/inquiry.rb
M	activesupport/lib/active_support/duration.rb
M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/lib/active_support/inflector/transliterate.rb
M	activesupport/lib/active_support/multibyte.rb
M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/lib/active_support/multibyte/unicode.rb
M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/lib/active_support/values/time_zone.rb

commit bbd3775	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 19:47:27 -0500

    Fixing Hash#stringify_keys docs

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 1839ecd	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 20:12:00 -0300

    MySQL doesn't allow default values for blobs.

M	activerecord/test/schema/schema.rb

commit 71931e2	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 19:55:44 -0300

    Remove `:mouseover` option from `image_tag` helper.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 1aff772	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-05-13 19:49:24 -0300

    Deprecate `:mouseover` options for `image_tag` helper.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 2ef29ef	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 19:15:00 -0300

    Merge pull request #3237 from sakuro/data-url-scheme
    
    Support data: url scheme
    
    Conflicts:
    	actionpack/lib/action_view/asset_paths.rb

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 9ff97b0	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-05-13 19:15:00 -0300

    Merge pull request #3237 from sakuro/data-url-scheme
    
    Support data: url scheme

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit a74b6a0	refs/tags/v3.1.6
Merge: e7f8f5f c57aec5
Author: Rafael Mendonça França 
Date:   2012-05-13 19:15:00 -0300

    Merge pull request #3237 from sakuro/data-url-scheme
    
    Support data: url scheme

commit 9b40f5c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 19:04:33 -0300

    Copy edit [ci skip]

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/store.rb

commit f443e11	refs/heads/master
Merge: d3c83a4 3c0bf04
Author: Rafael Mendonça França 
Date:   2012-05-13 15:02:31 -0700

    Merge pull request #5807 from Antiarchitect/store-improvement
    
    Custom coders support for ActiveRecord::Store.

commit d3c83a4	refs/heads/master
Merge: ecfb32c aa07d59
Author: Rafael Mendonça França 
Date:   2012-05-13 14:54:19 -0700

    Merge pull request #4431 from lest/refactor-1-9
    
    use const_defined? with second argument in AS::Dependencies

commit ecfb32c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-13 18:35:35 -0300

    Remove dependency on safe_join from number helpers
    
    Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	activesupport/lib/active_support/testing/performance.rb

commit 60de801	refs/heads/master
Merge: 116ab8f 22e3177
Author: Carlos Antonio da Silva 
Date:   2012-05-13 14:30:06 -0700

    Merge pull request #6305 from arunagw/ruby-prof-fixes
    
    Ruby prof fixes

commit f9ae1ba	refs/heads/master
Author: Angelo Capilleri 
Date:   2012-05-12 15:03:21 +0200

    clean the erros if an object that includes validations errors is duped. Fixes #5953

M	activemodel/lib/active_model/validations.rb
M	activemodel/test/cases/validations_test.rb

commit c81f11d	refs/heads/master
Merge: d4801d0 8e4148b
Author: Angelo Capilleri 
Date:   2012-05-13 14:13:56 -0700

    Merge pull request #98 from acapilleri/mispelling_asset
    
    mispelling asset_tag_helper

commit 8e4148b	refs/heads/master
Author: Angelo Capilleri 
Date:   2012-05-13 23:11:46 +0200

    mispelling asset_tag_helper

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit d4801d0	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-14 07:06:41 +1000

    Correct code wrapping around content of welcome/index.html.erb

M	guides/source/getting_started.textile

commit 5f7caff	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-14 07:02:58 +1000

    Wrap 'Missing template posts/new' error message in a blockquote for better formatting

M	guides/source/getting_started.textile

commit dbd131f	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-14 06:56:43 +1000

    Rails actually has one root route defined

M	guides/source/getting_started.textile

commit 96fb77f	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-14 06:55:45 +1000

    Separate CR out in CRUD explanation, explain each letter one at a time

M	guides/source/getting_started.textile

commit 9e4fd33	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-14 06:54:40 +1000

    Re-enforce/re-explain what happens when you go to root route (Welcome#index) better

M	guides/source/getting_started.textile

commit e6e6f4e	refs/heads/master
Author: Ryan Bigg 
Date:   2012-05-14 06:52:50 +1000

    Briefly explain static file routing in the getting started guide

M	guides/source/getting_started.textile

commit 116ab8f	refs/heads/master
Merge: 8ce6b0c 27dd500
Author: Carlos Antonio da Silva 
Date:   2012-05-13 13:32:47 -0700

    Merge pull request #6307 from oscardelben/refactor_app_generator_test
    
    Refactor App Generator Test

commit e7d5ba3	refs/tags/v3.2.5
Merge: 8a5b51e 3f7ed52
Author: Carlos Antonio da Silva 
Date:   2012-05-13 13:24:42 -0700

    Merge pull request #6306 from erichmenge/3-2-stable-guide-fix
    
    3 2 stable guide fix [ci skip]

commit 8ce6b0c	refs/heads/master
Author: Andrew White 
Date:   2012-05-13 20:29:43 +0100

    Autoload ActionDispatch::Request::Session to avoid circular require.

M	actionpack/lib/action_dispatch/http/request.rb

commit 16301cc	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 12:52:54 -0500

    marking self in Hash#symbolize_keys!

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit aa07d59	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-13 00:53:50 +0300

    use const_defined? with second argument in AS::Dependencies
    
    there is no need in local_const_defined? helper method

M	activesupport/lib/active_support/dependencies.rb

commit 92dbdb2	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 12:49:15 -0500

    added example to Hash#symbolize_keys

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 817f9e6	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 12:45:25 -0500

    unnecessary 'examples' noise in Hash#assert_valid_keys docs

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit cb61f57	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 12:44:17 -0500

    added example to Hash#stringify_keys

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 873ac28	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 12:22:43 -0500

    adding examples to Hash#deep_merge method

M	activesupport/lib/active_support/core_ext/hash/deep_merge.rb

commit 2b6f566	refs/heads/master
Merge: 1c481be a1f6952
Author: José Valim 
Date:   2012-05-13 10:15:10 -0700

    Merge pull request #6308 from nashby/blockless-step
    
    remove useless tests for Range#step

commit a1f6952	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-13 20:10:31 +0300

    remove useless tests for Range#step

M	activesupport/test/core_ext/range_ext_test.rb

commit c140a27	refs/heads/master
Author: ayaya 
Date:   2012-01-31 18:43:54 +0800

    fix `alias_attribute` will raise a syntax error if make an alias on a
    column that named as a ruby keyword

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 27dd500	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-13 09:44:43 -0700

    Refactor App Generator Test

M	railties/test/generators/app_generator_test.rb

commit 1c481be	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-13 13:44:35 -0300

    Remove blockless_step leave all that up to Ruby
    
    Closes #6297

M	activesupport/lib/active_support/core_ext/range.rb
D	activesupport/lib/active_support/core_ext/range/blockless_step.rb
M	activesupport/test/core_ext/range_ext_test.rb

commit e7f8f5f	refs/tags/v3.1.6
Merge: d2ae955 03e2895
Author: Santiago Pastorino 
Date:   2012-05-13 09:35:23 -0700

    Merge pull request #6300 from guilleiguaran/upgrade-sprockets-3-1-stable
    
    Upgrade sprockets to 2.0.4

commit 8a5b51e	refs/tags/v3.2.5
Merge: 3d0e7ad 62b74b1
Author: Santiago Pastorino 
Date:   2012-05-13 09:35:20 -0700

    Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stable
    
    Upgrade sprockets to 2.1.3

commit 6e55d30	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-13 13:33:20 -0300

    Remove remaining require 'rubygems'

M	guides/code/getting_started/config/boot.rb
M	guides/rails_guides.rb
M	guides/source/initialization.textile
M	guides/w3c_validator.rb
M	railties/lib/rails/generators/app_base.rb

commit 59b7737	refs/heads/master
Merge: aeac0bf d8c1949
Author: Santiago Pastorino 
Date:   2012-05-13 09:25:01 -0700

    Merge pull request #6303 from korny/remove-require-rubygems
    
    require "rubygems" is obsolete in Ruby 1.9.3

commit 3f7ed52	refs/tags/v3.2.5
Author: Mikhail Dieterle 
Date:   2012-03-23 18:30:16 +0800

    :foreign_key option should be on has_many side of association

M	railties/guides/source/association_basics.textile

commit 22e3177	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-13 21:10:16 +0530

    Need to include "OutputSaftyHelper" here to prevent
    
    `number_with_delimiter': undefined method
    `safe_join' for
    #
Date:   2012-05-13 21:08:46 +0530

    Fixed ruby-prof changes and let's use latest ruby-prof now.

M	Gemfile
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 88fc749	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-13 08:21:06 -0700

    Update docs to public_send for Object#try

M	activesupport/lib/active_support/core_ext/object/try.rb

commit d8c1949	refs/heads/master
Author: Kornelius Kalnbach 
Date:   2012-05-13 14:47:25 +0200

    require "rubygems" is obsolete in Ruby 1.9.3

M	guides/source/action_view_overview.textile
M	guides/source/active_model_basics.textile
M	load_paths.rb
M	railties/lib/rails/commands/application.rb
M	railties/lib/rails/commands/plugin_new.rb
M	railties/lib/rails/generators/rails/app/templates/config/boot.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
M	railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
M	tools/profile

commit aeac0bf	refs/heads/master
Merge: 7d67880 53b12cf
Author: Rafael Mendonça França 
Date:   2012-05-13 05:35:55 -0700

    Merge pull request #6298 from frodsan/fix_todo_skip
    
    fixme: use minitest skip instead of return nil

commit a7e0b2f	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-13 14:25:41 +0300

    update docs on Object#try

M	activesupport/lib/active_support/core_ext/object/try.rb

commit c17d200	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-05-13 14:21:00 +0300

    mailer can be anonymous
    
    closes #5970

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/test/base_test.rb
A	actionmailer/test/fixtures/anonymous/welcome.erb

commit 03e2895	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2012-05-13 03:08:37 -0500

    Upgrade sprockets to 2.0.4

M	actionpack/actionpack.gemspec

commit 62b74b1	refs/tags/v3.2.5
Author: Guillermo Iguaran 
Date:   2012-05-13 03:04:33 -0500

    Upgrade sprockets to 2.1.3

M	actionpack/actionpack.gemspec

commit 7d67880	refs/heads/master
Merge: d582fd6 a3315ef
Author: José Valim 
Date:   2012-05-13 01:00:17 -0700

    Merge pull request #5729 from oscardelben/use_tap
    
    Use the more idiomatic tap method

commit d582fd6	refs/heads/master
Merge: e28b6f5 700c583
Author: José Valim 
Date:   2012-05-13 00:58:00 -0700

    Merge pull request #6293 from carlosantoniodasilva/render-partial-refactor
    
    Improve and cleanup a bit partial renderer

commit 53b12cf	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-13 02:27:52 -0500

    fix todo: use minitest skip instead of return nil

M	activerecord/test/cases/bind_parameter_test.rb

commit 3d0e7ad	refs/tags/v3.2.5
Merge: 41e7a2a 2f4696d
Author: Vijay Dev 
Date:   2012-05-12 23:56:45 -0700

    Merge pull request #6294 from frodsan/docs_backport
    
    Adding examples and docs [3-2-stable]

commit e28b6f5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 00:54:49 -0300

    Copy edit the documentation

M	guides/source/form_helpers.textile

commit 521e964	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 00:47:34 -0300

    Do not add `:include_blank` option if prompt is present

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 3081856	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 00:42:19 -0300

    Only set `:include_blank` if the value of this options is not present

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 94d84c5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-13 00:41:26 -0300

    `:include_blank` should be true if the size option is nil

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_options_helper_test.rb

commit a8cfaed	refs/heads/master
Merge: 871b1c2 2e9c7cd
Author: Rafael Mendonça França 
Date:   2012-05-13 01:00:01 -0300

    Merge pull request #6225 from acapilleri/select_with_required_true_include_first_option_blank
    
    HTML5 validation error with options_from_collection_for_select
    
    Fixes #5908
    
    Conflicts:
    	actionpack/CHANGELOG.md

commit 26e2c08	refs/heads/master
Author: Richard Hulse 
Date:   2012-05-13 14:16:50 +1200

    [guides] add local precompilation section

M	guides/source/asset_pipeline.textile

commit 2f4696d	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-12 20:48:00 -0500

    adding examples and docs

M	activesupport/lib/active_support/core_ext/integer/multiple.rb
M	activesupport/lib/active_support/core_ext/string/conversions.rb
M	activesupport/lib/active_support/core_ext/string/exclude.rb

commit 700c583	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-26 22:21:47 -0300

    Improve and cleanup a bit partial renderer
    
    * Remove template assignment: there is no need for this assignment,
      given we are rendering a collection with possibly different templates,
      and a second call to render (with the same instance) would behave
      differently if the template is set.
    * Remove segments array in favor of Array#map
    * Use local vars whenever possible
    * Cache local template keys, remove defaults from find_template

M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 2e9c7cd	refs/heads/master
Author: Angelo Capilleri 
Date:   2012-05-13 02:23:41 +0200

    Changed the changelog and documentation about
    the select method (tag select) forces :include_blank  if is required and no multiple and
    display size is one

M	actionpack/CHANGELOG.md
M	guides/source/form_helpers.textile

commit 64af96b	refs/heads/master
Author: angelo giovanni capilleri 
Date:   2012-05-11 23:15:40 +0200

    Always include the options :include_blank if the select has a required attribute
    and display size 1 and not multiple attribute,  Fixes #5908

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 871b1c2	refs/heads/master
Merge: 7be33fe eea9777
Author: Rafael Mendonça França 
Date:   2012-05-12 16:34:36 -0700

    Merge pull request #6193 from mhfs/fix_oracle_spec
    
    Fix failing AR test on Oracle

commit 41e7a2a	refs/tags/v3.2.5
Merge: 9cead4a ccf80c2
Author: Rafael Mendonça França 
Date:   2012-05-12 16:14:26 -0700

    Merge pull request #6292 from erichmenge/3-2-stable-docfix
    
    3 2 stable guides fix

commit 7be33fe	refs/heads/master
Merge: 99e2a22 5636010
Author: Rafael Mendonça França 
Date:   2012-05-12 16:04:06 -0700

    Merge pull request #6171 from oscardelben/move_token_tag_if_block
    
    Switch token_tag if block

commit ccf80c2	refs/tags/v3.2.5
Author: Erich Menge 
Date:   2012-05-12 15:45:04 -0500

    Update 'getting started' guides for new whitelist security implementation. Closes #6286.

M	railties/guides/source/getting_started.textile

commit 99e2a22	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-05-12 15:49:26 -0300

    Remove tailing spaces :scissors: [ci skip]

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 45f6dcd	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-12 12:54:28 -0300

    Move AS set configs to AS Raitie

M	activesupport/lib/active_support/railtie.rb
M	railties/lib/rails/application/bootstrap.rb

commit bae190c	refs/heads/master
Merge: e5b91f2 5613fb0
Author: Santiago Pastorino 
Date:   2012-05-12 08:48:58 -0700

    Merge pull request #6271 from homakov/patch-5
    
    configuration for active_support and JSON Encoding

commit e5b91f2	refs/heads/master
Author: Xavier Noria 
Date:   2012-05-12 17:48:34 +0200

    copy-edits a recent CHANGELOG entry [ci skip]

M	activesupport/CHANGELOG.md

commit 65c3b12	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-12 19:56:55 +0530

    update example outputs of some asset helpers
    
    Changed /images and /fonts to /assets in the examples of
    image_path, image_tag and font_path helpers
    
    [ci skip]

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit b2b8158	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-12 19:40:57 +0530

    fixes a nodoc which swallowed the documentation for the rest of the methods [ci skip]

M	activerecord/lib/active_record/core.rb

commit 2c8b4a5	refs/heads/master
Merge: 70237e7 984bc75
Author: Vijay Dev 
Date:   2012-05-12 06:46:14 -0700

    Merge pull request #6285 from acapilleri/missplelling_error_in_abstract_mysql_adapter
    
    missplelling error in abstract_mysql_adapter

commit 70237e7	refs/heads/master
Merge: f2f6534 84d198b
Author: Vijay Dev 
Date:   2012-05-12 19:10:49 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	activesupport/lib/active_support/callbacks.rb

commit 984bc75	refs/heads/master
Author: Angelo Capilleri 
Date:   2012-05-12 15:39:40 +0200

    missplelling error in abstract_mysql_adapter

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

commit f2f6534	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-12 19:08:19 +0530

    s/wether/whether [ci skip]

M	activerecord/lib/active_record/core.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 98355fe	refs/heads/master
Merge: eab0520 1d19390
Author: José Valim 
Date:   2012-05-12 05:45:59 -0700

    Merge pull request #6277 from homakov/patch-6
    
    Comment for active_support's option in application.rb

commit eab0520	refs/heads/master
Author: José Valim 
Date:   2012-05-12 14:42:35 +0200

    Revert "Merge pull request #6142 from spartan-developer/master"
    
    This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing
    changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/lib/action_view/helpers/tags/text_area.rb

commit 84d198b	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-12 18:10:08 +0530

    copy edits [ci skip]

M	activerecord/lib/active_record/core.rb

commit f2af26d	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-12 18:07:26 +0530

    fix incorrect example [ci skip]

M	activesupport/lib/active_support/core_ext/integer/multiple.rb

commit d897255	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-12 18:07:10 +0530

    copy editing [ci skip]

M	guides/source/engines.textile

commit 3a59eab	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-12 09:18:37 -0300

    Remove wrong rack/utils dependency from AS
    
    Closes #6274

M	activesupport/lib/active_support/cache/file_store.rb

commit 905c48e	refs/heads/master
Merge: 9eddb8b 47570d4
Author: Vijay Dev 
Date:   2012-05-12 05:00:52 -0700

    Merge pull request #6281 from acapilleri/mispelling_errors_in_render_text_test
    
    mispelling errors in render_text_test.rb

commit 9eddb8b	refs/heads/master
Merge: 6f2aee3 38b4e7c
Author: Vijay Dev 
Date:   2012-05-12 04:56:13 -0700

    Merge pull request #6278 from GRoguelon/master
    
    Add commas missing in performance tests

commit 6f2aee3	refs/heads/master
Merge: 667d0bd b8f394f
Author: Jon Leighton 
Date:   2012-05-12 04:23:03 -0700

    Merge pull request #6280 from nashby/private-try
    
    Object#try can't call private methods

commit 47570d4	refs/heads/master
Author: angelo giovanni capilleri 
Date:   2012-05-12 13:12:15 +0200

    mispelling errors in render_text_test.rb and sqlite_specific_schema

M	actionpack/test/controller/new_base/render_text_test.rb
M	activerecord/test/schema/sqlite_specific_schema.rb

commit b8f394f	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-12 14:07:21 +0300

    Object#try can't call private methods

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 667d0bd	refs/heads/master
Merge: 4ae6bab 9596076
Author: José Valim 
Date:   2012-05-12 04:03:07 -0700

    Merge pull request #6142 from spartan-developer/master
    
    refactored extracting :size => 'XxY' into an extract_size! method

commit 4ae6bab	refs/heads/master
Merge: 2091e5a 39eff2d
Author: Xavier Noria 
Date:   2012-05-12 03:59:35 -0700

    Merge pull request #6279 from acapilleri/mispelling_error_in_actionpach_changelog
    
    mispelling error in actionpach changelog

commit 39eff2d	refs/heads/master
Author: angelo giovanni capilleri 
Date:   2012-05-12 12:37:16 +0200

    mispelling error in actionpach changelog

M	actionpack/CHANGELOG.md

commit 219342b	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-12 13:31:30 +0300

    remove docs related to ruby 1.8 from Array#wrap

M	activesupport/lib/active_support/core_ext/array/wrap.rb

commit 38b4e7c	refs/heads/master
Author: Geoffrey Roguelon 
Date:   2012-05-12 10:36:35 +0200

    Add commas missing in performance tests

M	guides/code/getting_started/test/performance/browsing_test.rb
M	railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb

commit 1d19390	refs/heads/master
Author: Egor Homakov 
Date:   2012-05-12 10:26:22 +0400

    Update railties/lib/rails/generators/rails/app/templates/config/application.rb

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 6f3489c	refs/heads/master
Author: Ivan Evtukhovich 
Date:   2012-04-17 12:26:23 +0400

    Remove prepared statement from system query in postgresql adapter

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit c78c295	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 23:16:44 -0500

    added examples to Integer#multiple_of?

M	activesupport/lib/active_support/core_ext/integer/multiple.rb

commit fc6ab69	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 23:02:05 -0500

    removing trailing spaces

M	activesupport/lib/active_support/core_ext/string/conversions.rb

commit 7dba512	refs/heads/master
Author: Erich Menge 
Date:   2012-05-11 18:51:01 -0500

    Better document the difference between #clone and #dup.
    Add #nodoc to initialize_dup and use :method: to document the #dup method.
    Relates to issue #6235

M	activerecord/lib/active_record/core.rb

commit 2091e5a	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-11 23:43:18 +0100

    Remove #=== quirk
    
    Makes it consistent with Relation. Can't see a use for this.

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit a0b46b5	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 17:30:46 -0500

    added docs to String#to_datetime

M	activesupport/lib/active_support/core_ext/string/conversions.rb

commit fbf1858	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-11 19:25:19 -0300

    Add test directory to TestTask's libs

M	actionpack/Rakefile

commit 53cc85f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 17:08:31 -0500

    added docs to String#to_date

M	activesupport/lib/active_support/core_ext/string/conversions.rb

commit 36dd185	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-11 13:56:05 -0300

    Remove useless load path modifications

M	actionmailer/lib/action_mailer.rb
M	actionmailer/test/abstract_unit.rb
M	actionpack/lib/abstract_controller.rb
M	actionpack/lib/action_dispatch.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/ts_isolated.rb
M	activemodel/lib/active_model.rb
M	activemodel/test/cases/helper.rb
M	activesupport/test/abstract_unit.rb
M	activesupport/test/ts_isolated.rb
M	railties/Rakefile
M	railties/test/isolation/abstract_unit.rb

commit a00228c	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-10 20:48:23 -0300

    Lazy load I18n

M	actionpack/lib/action_view.rb
M	activemodel/lib/active_model.rb
M	activerecord/lib/active_record.rb
M	activesupport/lib/active_support/i18n.rb

commit abd6f4a	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-10 19:50:56 -0300

    Move require to where it's needed

M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
M	actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/template/resolver.rb

commit a638104	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-10 19:28:02 -0300

    Remove ruby/shim
    
    require 'action_view' is now much faster

M	actionpack/lib/abstract_controller.rb
M	actionpack/lib/action_view.rb
D	activesupport/lib/active_support/ruby/shim.rb

commit 7bf6edf	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 16:42:23 -0500

    added examples to String#exclude?

M	activesupport/lib/active_support/core_ext/string/exclude.rb

commit ef440bb	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 16:21:32 -0500

    remove unnecessary 'examples' noise

M	activesupport/lib/active_support/core_ext/string/filters.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit ecef5a9	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-11 20:05:04 +0100

    this stuff can all be handled by Relation

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit be7c6ee	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-11 19:42:53 +0100

    extract deprecated code

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 8f50bbe	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-11 18:19:39 +0100

    set_owner_attributes is covered by the scoping

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit c86a32d	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-11 17:19:30 +0100

    CollectionProxy < Relation
    
    This helps bring the interfaces of CollectionProxy and Relation closer
    together, and reduces the delegation backflips we need to perform.
    
    For example, first_or_create is defined thus:
    
    class ActiveRecord::Relation
      def first_or_create(...)
        first || create(...)
      end
    end
    
    If CollectionProxy < Relation, then post.comments.first_or_create will
    hit the association's #create method which will actually add the new record
    to the association, just as post.comments.create would.
    
    With the previous delegation, post.comments.first_or_create expands to
    post.comments.scoped.first_or_create, where post.comments.scoped has no
    knowledge of the association.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/autosave_association_test.rb

commit a8637cf	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-11 17:17:29 +0100

    Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect collection-thing.

M	activemodel/lib/active_model/serialization.rb
M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/test/cases/serialization_test.rb
M	activemodel/test/cases/serializers/xml_serialization_test.rb

commit f915c28	refs/heads/master
Merge: 39c483f a0d9b79
Author: Scott Johnson <7.scott.j@gmail.com>
Date:   2012-05-11 12:10:43 -0700

    Merge pull request #97 from itchy/doc_make_engine_ApplicationController_inherit_from_main_app
    
    Update engines guide ApplicationController

commit a0d9b79	refs/heads/master
Author: Scott Johnson <7.scott.j@gmail.com>
Date:   2012-05-11 13:42:37 -0500

    update engines guide to show how to have an engine's ApplicationController inherit from the main application's ApplicationController

M	guides/source/engines.textile

commit 39c483f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 13:18:00 -0500

    fix String#last example

M	activesupport/lib/active_support/core_ext/string/access.rb

commit 53ef85d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 13:16:35 -0500

    fix String#last example

M	activesupport/lib/active_support/core_ext/string/access.rb

commit ed116ed	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 13:11:06 -0500

    added docs to String#last

M	activesupport/lib/active_support/core_ext/string/access.rb

commit b2e9d33	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 12:56:53 -0500

    improve String#first docs

M	activesupport/lib/active_support/core_ext/string/access.rb

commit 074359d	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 12:24:45 -0500

    fix typo in String#first

M	activesupport/lib/active_support/core_ext/string/access.rb

commit 84784b4	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 12:20:57 -0500

    added docs to String#first

M	activesupport/lib/active_support/core_ext/string/access.rb

commit 07045fa	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 11:47:40 -0500

    added docs to String#from

M	activesupport/lib/active_support/core_ext/string/access.rb

commit 0822dc0	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 11:41:22 -0500

    improve String#to docs

M	activesupport/lib/active_support/core_ext/string/access.rb

commit 3153508	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 11:35:26 -0500

    added docs to String#to

M	activesupport/lib/active_support/core_ext/string/access.rb

commit 7d07666	refs/heads/master
Merge: 1004ccc 7ce4ce3
Author: Eric Carty-Fickes 
Date:   2012-05-11 11:16:35 -0500

    Merge branch 'master' of https://github.com/lifo/docrails

commit 1004ccc	refs/heads/master
Author: Eric Carty-Fickes 
Date:   2012-05-11 11:12:32 -0500

    Clarify expire_action with namespaced controllers

M	guides/source/caching_with_rails.textile

commit 7ce4ce3	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-11 10:51:36 -0500

    added docs to String#at

M	activesupport/lib/active_support/core_ext/string/access.rb

commit d2ae955	refs/tags/v3.1.6
Merge: 7b7bf33 200d3da
Author: Santiago Pastorino 
Date:   2012-05-11 08:10:46 -0700

    Merge pull request #6263 from arunagw/3-1-stable
    
    3 1 stable

commit 9cead4a	refs/tags/v3.2.5
Merge: 62f098d 4b59961
Author: Santiago Pastorino 
Date:   2012-05-11 08:10:16 -0700

    Merge pull request #6262 from arunagw/ruby_prof_fix
    
    Ruby prof fix

commit 1b95670	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-05-11 16:27:21 +0200

    better wording

M	activerecord/lib/active_record/nested_attributes.rb

commit 5613fb0	refs/heads/master
Author: Egor Homakov 
Date:   2012-05-11 18:11:58 +0400

    Update railties/lib/rails/application/bootstrap.rb

M	railties/lib/rails/application/bootstrap.rb

commit bd2b1c1	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-05-11 16:09:10 +0200

    missing 'with'

M	activerecord/lib/active_record/aggregations.rb

commit 24e4bc3	refs/heads/master
Author: Elia Schito 
Date:   2012-05-11 14:47:26 +0200

    Move HTTP Token auth docs above the Token module

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 200d3da	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-05-11 08:59:41 +0530

    Ruby-Prof works with 1.9.3. Let's run.

M	Gemfile

commit b892b4c	refs/heads/master
Merge: fe3b742 21190f3
Author: Xavier Noria 
Date:   2012-05-11 05:18:15 -0700

    Merge pull request #6269 from edtsech/hash-except-test
    
    Add test Hash#except can receive more than one argument.

commit 21190f3	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-11 12:09:57 +0200

    Test Hash#except can receive more than one argument.

M	activesupport/test/core_ext/hash_ext_test.rb

commit d4f4b85	refs/heads/master
Author: Egor Homakov 
Date:   2012-05-11 15:40:03 +0400

    Update guides/source/configuring.textile

M	guides/source/configuring.textile

commit c9a4e65	refs/heads/master
Author: Egor Homakov 
Date:   2012-05-11 14:48:02 +0400

    Update guides/source/configuring.textile

M	guides/source/configuring.textile

commit fe3b742	refs/heads/master
Merge: 9b4514c 1abf156
Author: José Valim 
Date:   2012-05-11 03:23:51 -0700

    Merge pull request #6268 from carlesso/master
    
    In robots.txt User-agent should be all downcase except for the first 'U'

commit 1abf156	refs/heads/master
Author: Enrico Carlesso 
Date:   2012-05-11 11:50:15 +0200

    In robots.txt, User-agent should be all downcase except for the first 'U', according with http://en.wikipedia.org/wiki/Robots_exclusion_standard

M	guides/code/getting_started/public/robots.txt
M	railties/lib/rails/generators/rails/app/templates/public/robots.txt

commit 5ecd14c	refs/tags/v3.2.5
Author: Alexey Muranov 
Date:   2012-05-11 11:35:19 +0200

    Remove unused private method yaml_fixtures_key

M	activerecord/lib/active_record/fixtures.rb

commit 1065ef8	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-11 11:11:41 +0200

    Fix copypaste. [ci skip]

M	activesupport/test/core_ext/hash_ext_test.rb

commit 9b4514c	refs/heads/master
Author: Andrew White 
Date:   2012-05-11 07:23:24 +0100

    Copy literal route constraints to defaults - fixes #3571 and #6224.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_assertions_test.rb
M	actionpack/test/dispatch/routing_test.rb

commit 4b59961	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-05-11 08:54:45 +0530

    Ruby-Prof works with ruby-1.9.3 also.

M	Gemfile

commit 9d616ea	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-05-11 08:50:47 +0530

    Update performance profiler to work with latest ruby-prof
    
    Thanks to @carlosantoniodasilva

M	Gemfile
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 0d48b12	refs/heads/master
Author: David Padilla 
Date:   2012-05-10 15:56:13 -0500

    Fixes issue #6251
    
    Plugin generator crashes when using the --dummy-path option
    
    Code was assuming the application name in `config/application.rb`
    was module Dummy.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit b14d1cd	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-10 14:11:59 -0700

    Failing test for #6251

M	railties/test/generators/plugin_new_generator_test.rb

commit 7b7bf33	refs/tags/v3.1.6
Merge: e98893b b7080e7
Author: Piotr Sarnacki 
Date:   2012-05-10 17:16:09 -0700

    Merge pull request #6261 from carlosantoniodasilva/fix-build-3-1
    
    Fix build 3-1-stable

commit b7080e7	refs/tags/v3.1.6
Author: Carlos Antonio da Silva 
Date:   2012-05-10 21:10:59 -0300

    Update performance profiler to work with latest ruby-prof, fix 3-1-stable build

M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 62f098d	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-05-10 23:16:40 +0100

    Return false for exists? with new records - fixes #6199.
    (cherry picked from commit fa21b73ebb8339ad388f149c817c433b6254d490)

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/relations_test.rb

commit fa21b73	refs/heads/master
Author: Andrew White 
Date:   2012-05-10 23:16:40 +0100

    Return false for exists? with new records - fixes #6199.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/relations_test.rb

commit 09a48b2	refs/heads/master
Author: Andrew White 
Date:   2012-05-10 22:52:00 +0100

    Don't ignore nil positional arguments for url helpers - fixes #6196.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 66e338a	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-05-10 22:13:04 +0100

    Don't ignore nil positional arguments for url helpers - fixes #6196.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit e98893b	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-05-10 22:07:14 +0100

    Don't ignore nil positional arguments for url helpers - fixes #6196.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 7336b33	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-05-10 21:33:31 +0100

    Refactor the handling of default_url_options in integration tests
    
    This commit improves the handling of default_url_options in integration
    tests by making behave closer to how a real application operates.
    
    Specifically the following issues have been addressed:
    
    * Options specified in routes.rb are used (fixes #546)
    * Options specified in controllers are used
    * Request parameters are recalled correctly
    * Tests can override default_url_options directly

M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit f3aaac4	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-05-10 21:12:31 +0100

    Refactor the handling of default_url_options in integration tests
    
    This commit improves the handling of default_url_options in integration
    tests by making behave closer to how a real application operates.
    
    Specifically the following issues have been addressed:
    
    * Options specified in routes.rb are used (fixes #546)
    * Options specified in controllers are used
    * Request parameters are recalled correctly
    * Tests can override default_url_options directly

M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit e306ca3	refs/heads/master
Author: Andrew White 
Date:   2012-05-10 20:28:53 +0100

    Refactor the handling of default_url_options in integration tests
    
    This commit improves the handling of default_url_options in integration
    tests by making behave closer to how a real application operates.
    
    Specifically the following issues have been addressed:
    
    * Options specified in routes.rb are used (fixes #546)
    * Options specified in controllers are used
    * Request parameters are recalled correctly
    * Tests can override default_url_options directly

M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit 5277d55	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-10 17:24:53 +0530

    remove unnecessary 'examples' noise [ci skip]

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit c8f5a21	refs/heads/master
Author: Ben Wilhelm 
Date:   2012-05-10 11:15:32 -0700

    Modified template in sample is new.html.erb, not index.html.erb

M	guides/source/getting_started.textile

commit 9b1eb4f	refs/heads/master
Merge: 4142067 32dd5fc
Author: José Valim 
Date:   2012-05-10 10:02:56 -0700

    Merge pull request #6253 from rafmagana/master
    
    remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action

commit a9fc8a9	refs/tags/v3.2.5
Merge: 22a6072 c2193c1
Author: Jeremy Kemper 
Date:   2012-05-10 09:39:54 -0700

    Merge pull request #6230 from spectator/active_resource_exceptions
    
    ActiveResource::TimeoutError is not loaded

commit c2193c1	refs/tags/v3.2.5
Author: Yury Velikanau 
Date:   2012-05-09 10:54:20 -0700

    Make sure TimeoutError is loaded.

M	activeresource/lib/active_resource.rb
M	activeresource/lib/active_resource/base.rb

commit 32dd5fc	refs/heads/master
Author: Rafael Magana 
Date:   2012-05-10 08:59:44 -0700

    remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action

M	actionpack/lib/action_controller/log_subscriber.rb

commit 4142067	refs/heads/master
Merge: dd9ea8d b5005b6
Author: José Valim 
Date:   2012-05-10 08:57:59 -0700

    Merge pull request #6252 from grosser/unless_exist_for_memory_store
    
    add unless_exist option to memory store

commit b5005b6	refs/heads/master
Author: grosser 
Date:   2012-05-10 08:19:45 -0700

    add unless_exist option to memory store

M	activesupport/lib/active_support/cache/memory_store.rb
M	activesupport/test/caching_test.rb

commit dd9ea8d	refs/heads/master
Merge: ffa1c72 039917b
Author: José Valim 
Date:   2012-05-10 01:33:47 -0700

    Merge pull request #6244 from frodsan/fix_build_remove_key
    
    Remove key argument from run_callbacks to fix build

commit 039917b	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-10 03:29:46 -0500

    Remove key argument from run_callbacks to fix build

M	activesupport/lib/active_support/testing/performance.rb

commit ffa1c72	refs/heads/master
Merge: a45a5d8 e471aac
Author: José Valim 
Date:   2012-05-10 01:03:03 -0700

    Merge pull request #6242 from frodsan/fix_abstract_controller
    
    Removing key argument from run_callbacks method in abstract_controller

commit e471aac	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-10 02:56:36 -0500

    removing key argument from run_callbacks - fix build

M	actionpack/lib/abstract_controller/callbacks.rb

commit a45a5d8	refs/heads/master
Merge: 42a14c4 c1ce414
Author: José Valim 
Date:   2012-05-10 00:39:47 -0700

    Merge pull request #6241 from frodsan/deprecate_key_callbacks
    
    AS::Callbacks#run_callbacks remove key argument

commit c1ce414	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-10 02:21:03 -0500

    AS::Callbacks#run_callbacks remove key argument

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callback_inheritance_test.rb
M	activesupport/test/callbacks_test.rb

commit 6cbe8da	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-10 02:09:59 -0500

    deleting empty lines in docs parts

M	activesupport/lib/active_support/callbacks.rb

commit 99ed99b	refs/heads/master
Author: Victor Costan 
Date:   2012-05-09 23:38:24 -0400

    Postgresql doesn't accept limits on binary (bytea) columns.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/schema/schema.rb

commit 22a6072	refs/tags/v3.2.5
Merge: f8dae86 9810555
Author: Jeremy Kemper 
Date:   2012-05-09 19:01:34 -0700

    Merge pull request #6221 from alexeymuranov/deprecate__instantiate_fixtures__arity
    
    Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter

commit 42a14c4	refs/heads/master
Merge: ea40990 12ceb45
Author: Jeremy Kemper 
Date:   2012-05-09 19:01:03 -0700

    Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb
    
    Rename variables and remove unused code in fixtures.rb

commit ea40990	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-09 17:08:36 -0700

    Allow to run `connection_adapters/quoting_test.rb` independently

M	activerecord/test/cases/connection_adapters/quoting_test.rb

commit df0324f	refs/heads/master
Merge: 9bf1a0d 12c44fe
Author: Aaron Patterson 
Date:   2012-05-09 16:12:07 -0700

    Merge pull request #5362 from zenprogrammer/quoting_bug
    
    Fixed bug in ActiveRecord that caused classes to be quoted incorrectly

commit 9810555	refs/tags/v3.2.5
Author: Alexey Muranov 
Date:   2012-05-09 13:32:58 +0200

    Remove deprecated use of ::instantiate_fixtures

M	activerecord/lib/active_record/fixtures.rb

commit f02e7dc	refs/tags/v3.2.5
Author: Alexey Muranov 
Date:   2012-05-09 11:07:24 +0200

    Deprecate ::instantiate_fixtures unused parameter
    
    Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true).
    
    To be changed in master branch.

M	activerecord/lib/active_record/fixtures.rb

commit 9bf1a0d	refs/heads/master
Merge: fed9709 041b6c6
Author: Aaron Patterson 
Date:   2012-05-09 14:42:48 -0700

    Merge pull request #6226 from gnufied/master
    
    Update tranasaction state when record gets commited

commit 3a6ffbb	refs/heads/master
Author: Nick Novitski 
Date:   2012-05-09 13:20:19 -0700

    remove inappropriate comma
    
    A qualifying clause beginning with words like "as", "if", or "although" should have a comma separating it from any following clauses in a sentence, but should not have a comma immediately after the beginning word, unless it is to separate a third, non-essential clause.
    
    Example 1: "Although I would quite like to go to lunch with you, I find myself instead writing a detailed commit message to justify a single-character documentation change."
    
    Example 2: "Despite, as you might well imagine, wishing I hadn't even noticed it in the first place, I still felt the error was worth correcting."

M	guides/source/security.textile

commit f8dae86	refs/tags/v3.2.5
Merge: 8f5079f 0621ecb
Author: Santiago Pastorino 
Date:   2012-05-09 12:36:20 -0700

    Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicates
    
    Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets

commit 12ceb45	refs/heads/master
Author: Alexey Muranov 
Date:   2012-01-01 18:54:52 +0100

    Rename some variables
    
    Rename some parameters and instance and local variables, mostly in fixtures.rb.  Also remove an unused assignment to an instance variable.
    
    There are minor code changes.

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/helper.rb

commit 8f5079f	refs/tags/v3.2.5
Merge: b003ddf ba48e23
Author: Piotr Sarnacki 
Date:   2012-05-09 09:34:32 -0700

    Merge pull request #6219 from frodsan/fix_build
    
    Fix build - 3.2

commit 3c0bf04	refs/heads/master
Author: Andrey Voronkov 
Date:   2012-05-09 19:20:14 +0400

    Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be used out of the box.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb
M	activerecord/test/models/admin/user.rb
M	activerecord/test/schema/schema.rb

commit b003ddf	refs/tags/v3.2.5
Merge: 381f6e7 9b777d5
Author: Vijay Dev 
Date:   2012-05-09 07:23:26 -0700

    Merge pull request #6228 from mjtko/changelog-fixes-for-3-2-stable
    
    Updated activesupport CHANGELOG [for 3-2-stable]

commit fed9709	refs/heads/master
Merge: beea9f5 946875d
Author: Vijay Dev 
Date:   2012-05-09 07:22:29 -0700

    Merge pull request #6227 from mjtko/changelog-fixes
    
    Updated activesupport CHANGELOG

commit 041b6c6	refs/heads/master
Author: Hemant Kumar 
Date:   2012-05-09 18:43:18 +0530

    make both cached and record_updated accessors in one line

M	activerecord/test/cases/transaction_callbacks_test.rb

commit 1024c68	refs/heads/master
Author: Hemant Kumar 
Date:   2012-05-09 18:37:46 +0530

    after_commit :on => :update should be called when save is
    
    called from after_commit callback

M	activerecord/test/cases/transaction_callbacks_test.rb

commit 946875d	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-09 13:40:08 +0100

    Consistent CHANGELOG entry indentation.

M	activesupport/CHANGELOG.md

commit 8217713	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-09 13:35:49 +0100

    Add CHANGELOG section for unreleased Rails 3.2.4; document addition of #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.

M	activesupport/CHANGELOG.md

commit 9b777d5	refs/tags/v3.2.5
Author: Mark J. Titorenko 
Date:   2012-05-09 13:32:28 +0100

    Add CHANGELOG section for unreleased Rails 3.2.4; document addition of #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.

M	activesupport/CHANGELOG.md

commit 705a70f	refs/tags/v3.2.5
Author: Mark J. Titorenko 
Date:   2012-05-09 13:31:10 +0100

    Bring activesupport CHANGELOG up-to-date/consistent with master.

M	activesupport/CHANGELOG.md

commit 381f6e7	refs/tags/v3.2.5
Merge: cb242a9 fa34ace
Author: Andrew White 
Date:   2012-05-09 05:02:54 -0700

    Merge pull request #6223 from carlosantoniodasilva/remove-columns-deprecation-ruby187
    
    Stop showing deprecations for Ruby 1.8.7 with remove_column

commit 44d1804	refs/heads/master
Author: Hemant Kumar 
Date:   2012-05-09 17:32:15 +0530

    Fix transaction state not changing when after record gets commited

M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/transaction_callbacks_test.rb

commit fa34ace	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-05-09 08:52:44 -0300

    Stop showing deprecations for Ruby 1.8.7 with remove_column
    
    String is Enumerable in 1.8.7, which means that passing a String to
    remove_column was generating deprecation warnings during tests.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit beea9f5	refs/heads/master
Author: Andrew White 
Date:   2012-05-09 11:48:33 +0100

    Refactor Generator class to not rely on in-place editing the controller

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit e154823	refs/heads/master
Author: Nikita Beloglazov 
Date:   2012-04-26 21:05:56 +0300

    Fix bug when url_for changes controller.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit caeca1f	refs/heads/master
Author: Alexey Muranov 
Date:   2012-01-01 18:53:16 +0100

    Remove unused private method in fixtures.rb
    
    Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path).

M	activerecord/lib/active_record/fixtures.rb

commit af44c2b	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-31 19:03:16 +0100

    Remove unused parameter in ::instantiate_fixtures
    
    Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it.

M	activerecord/lib/active_record/fixtures.rb

commit f1cc45e	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-09 13:40:34 +0530

    fix a couple of formatting issues [ci skip]

M	actionpack/lib/action_view/helpers/text_helper.rb

commit cb242a9	refs/tags/v3.2.5
Merge: 5059c32 dd7e7b3
Author: Vijay Dev 
Date:   2012-05-09 00:11:15 -0700

    Merge pull request #6218 from frodsan/fix_docs_32stable
    
    Fix docs to support 1.8 syntax

commit dd7e7b3	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-09 02:05:20 -0500

    fix attribute_accessors docs to support 1.8 syntax

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit ba48e23	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-09 01:01:02 -0500

    Fix build

M	activerecord/test/cases/migration_test.rb

commit f021377	refs/heads/master
Author: Erich Menge 
Date:   2012-05-08 17:54:47 -0500

    Updated tests for has_secure_password.

M	activemodel/test/cases/secure_password_test.rb
M	activemodel/test/models/administrator.rb
M	activemodel/test/models/user.rb
M	activemodel/test/models/visitor.rb

commit 0e1e527	refs/heads/master
Author: Erich Menge 
Date:   2012-05-08 17:54:25 -0500

    has_secure_password shouldn't validate password_digest.  It should also take options to turn validations off.

M	activemodel/lib/active_model/secure_password.rb

commit ef9dd27	refs/heads/master
Author: Xavier Noria 
Date:   2012-05-09 00:47:45 +0200

    registers ceb1dcc in the CHANGELOG

M	railties/CHANGELOG.md

commit 5059c32	refs/tags/v3.2.5
Merge: ad4d408 16a9a87
Author: Vijay Dev 
Date:   2012-05-08 14:12:54 -0700

    Merge pull request #6213 from frodsan/cut_docs_dup
    
    Removing attribute_accessor docs duplication

commit 16a9a87	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-08 16:07:30 -0500

    removing docs duplication

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit 8a9e031	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-09 01:41:22 +0530

    update some examples in asset tag helper docs [ci skip]

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit ad4d408	refs/tags/v3.2.5
Merge: b12d03d 96fe0af
Author: Vijay Dev 
Date:   2012-05-08 13:02:30 -0700

    Merge pull request #6211 from frodsan/docs_attr_accessor_32stable
    
    Adding docs to attribute accessor methods.

commit 0e1c651	refs/heads/master
Author: Dan McClain 
Date:   2012-05-08 15:32:21 -0400

    Removes NetAddr dependency

M	activerecord/activerecord.gemspec
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb

commit 96fe0af	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-08 14:20:36 -0500

    added docs to attribute_accessors methods

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit 2882a3c	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-09 00:06:17 +0530

    remove redundant and stray line [ci skip]

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit 7918d7b	refs/heads/master
Merge: 882e750 7e26f7f
Author: Vijay Dev 
Date:   2012-05-08 23:56:25 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 7e26f7f	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-08 23:54:47 +0530

    simplify the alias_attribute example [ci skip]

M	activemodel/lib/active_model/attribute_methods.rb

commit f31613a	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-08 23:49:20 +0530

    cut some duplication and minor edits [ci skip]

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit b12d03d	refs/tags/v3.2.5
Merge: b86e0be 764e2de
Author: Santiago Pastorino 
Date:   2012-05-08 09:46:15 -0700

    Merge pull request #6200 from arunagw/3-2-stable
    
    locking ruby-prof for now.

commit e8c9aec	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-08 15:37:18 +0100

    Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations.  While I'm at it, wrap long comment lines consistently.

M	actionpack/lib/action_view/helpers/number_helper.rb

commit a9c27e7	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-08 16:26:26 +0200

    Add example for image_submit_tag with confirmation. [ci skip]

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 882e750	refs/heads/master
Merge: 30f5b1a 757a0ce
Author: Xavier Noria 
Date:   2012-05-08 05:42:42 -0700

    Merge pull request #6205 from arunagw/humnans_txt_test
    
    Adding test for humans.txt

commit 757a0ce	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-08 16:41:20 +0530

    Adding test for humans.txt

M	railties/test/generators/app_generator_test.rb

commit 30f5b1a	refs/heads/master
Merge: fc5c41e ceb1dcc
Author: Xavier Noria 
Date:   2012-05-08 03:48:49 -0700

    Merge pull request #2734 from paulca/humans
    
    add humans.txt

commit ceb1dcc	refs/heads/master
Author: Paul Campbell 
Date:   2012-05-08 11:44:58 +0100

    add humans.txt

A	railties/lib/rails/generators/rails/app/templates/public/humans.txt.tt

commit b3bd01c	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-08 11:08:15 +0200

    Add annotaion for class_eval in AbstractController#helper_method [ci skip]

M	actionpack/lib/abstract_controller/helpers.rb

commit fc5c41e	refs/heads/master
Merge: c52ba1b c09a92f
Author: José Valim 
Date:   2012-05-08 00:52:31 -0700

    Merge pull request #6201 from whistlerbrk/master
    
    Allow explicitly set content-type via head method when status code allows it according to the RFCs

commit c09a92f	refs/heads/master
Author: Kunal Shah 
Date:   2012-05-07 15:23:06 -0400

    Add failing test re #3436 which demonstrates content_type is not respected when using the :head method/shortcut

M	actionpack/test/controller/render_test.rb

commit 3ca28de	refs/heads/master
Author: Kunal Shah 
Date:   2012-05-07 18:56:36 -0400

    If content_type is explicitly passed to the :head method use the value or fallback

M	actionpack/lib/action_controller/metal/head.rb

commit e8d1f10	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-08 09:05:38 +0200

    Improve readability of metaprogramming annotations at AbstractController callbacks.

M	actionpack/lib/abstract_controller/callbacks.rb

commit 764e2de	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-05-08 12:32:14 +0530

    locking ruby-prof until we got a fix

M	Gemfile

commit b86e0be	refs/tags/v3.2.5
Merge: 7fb268d 4d52738
Author: José Valim 
Date:   2012-05-07 23:19:41 -0700

    Merge pull request #6198 from whistlerbrk/3-2-stable
    
    Address ActionPack head method not respecting explicitly set content-type #3436

commit 4831a89	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 22:47:35 -0500

    added docs to alias_attribute method

M	activemodel/lib/active_model/attribute_methods.rb

commit c52ba1b	refs/heads/master
Merge: 4d0e6db 0f8f99b
Author: Michael Koziarski 
Date:   2012-05-07 18:57:59 -0700

    Merge pull request #5500 from panthomakos/load-all
    
    Removed ActiveSupport#load_all!

commit 2805c28	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 19:37:00 -0500

    added docs to cattr_reader

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit 1ff3530	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 19:04:27 -0500

    better docs for cattr_accessor and cattr_writer

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit 4d52738	refs/tags/v3.2.5
Author: Kunal Shah 
Date:   2012-05-07 18:56:36 -0400

    If content_type is explicitly passed to the :head method use the value or fallback

M	actionpack/lib/action_controller/metal/head.rb

commit 2fb6d12	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 17:33:54 -0500

    added docs and examples to cattr_writer method

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit 4d0e6db	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-07 14:53:57 -0700

    Add passing tests for generating URLs with nested SCRIPT_NAMEs

M	actionpack/test/dispatch/mount_test.rb
M	actionpack/test/dispatch/url_generation_test.rb

commit ed2feb7	refs/heads/master
Merge: 7746bf9 d785b29
Author: Xavier Noria 
Date:   2012-05-07 13:01:58 -0700

    Merge pull request #6064 from gazay/fix_guides_for_as_core_ext
    
    Fix guides for as core ext

commit d785b29	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-05-07 22:40:59 +0400

    Changes for numeric api for Time because Time.current works different

M	activesupport/lib/active_support/core_ext/numeric/time.rb
M	guides/source/active_support_core_extensions.textile

commit 8b67a02	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-30 01:14:52 +0400

    Added tests for comparsion operator for Range

M	activesupport/test/core_ext/range_ext_test.rb

commit 66e0e42	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-30 00:40:19 +0400

    Fix some guides for AS core_ext

M	guides/source/active_support_core_extensions.textile

commit 6f38348	refs/tags/v3.2.5
Author: Kunal Shah 
Date:   2012-05-07 15:23:06 -0400

    Add failing test re #3436 which demonstrates content_type is not respected when using the :head method/shortcut

M	actionpack/test/controller/render_test.rb

commit 7b487e5	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 12:39:41 -0500

    added docs to cattr_accessor method

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit 60da3bd	refs/heads/master
Author: Ayrton De Craene 
Date:   2012-05-07 19:12:41 +0200

    Compressed all images from the guide through ImageOptim which saves sometimes up to 74.6% in size [ci skip]

M	guides/assets/images/belongs_to.png
M	guides/assets/images/book_icon.gif
M	guides/assets/images/challenge.png
M	guides/assets/images/chapters_icon.gif
M	guides/assets/images/check_bullet.gif
M	guides/assets/images/credits_pic_blank.gif
M	guides/assets/images/csrf.png
M	guides/assets/images/customized_error_messages.png
M	guides/assets/images/edge_badge.png
M	guides/assets/images/error_messages.png
M	guides/assets/images/getting_started/confirm_dialog.png
M	guides/assets/images/getting_started/form_with_errors.png
M	guides/assets/images/getting_started/index_action_with_edit_link.png
M	guides/assets/images/getting_started/new_post.png
M	guides/assets/images/getting_started/post_with_comments.png
M	guides/assets/images/getting_started/routing_error_no_controller.png
M	guides/assets/images/getting_started/routing_error_no_route_matches.png
M	guides/assets/images/getting_started/show_action_for_posts.png
M	guides/assets/images/getting_started/template_is_missing_posts_new.png
M	guides/assets/images/getting_started/undefined_method_post_path.png
M	guides/assets/images/getting_started/unknown_action_create_for_posts.png
M	guides/assets/images/getting_started/unknown_action_new_for_posts.png
M	guides/assets/images/grey_bullet.gif
M	guides/assets/images/habtm.png
M	guides/assets/images/has_many.png
M	guides/assets/images/has_many_through.png
M	guides/assets/images/has_one.png
M	guides/assets/images/has_one_through.png
M	guides/assets/images/header_backdrop.png
M	guides/assets/images/i18n/demo_html_safe.png
M	guides/assets/images/i18n/demo_localized_pirate.png
M	guides/assets/images/i18n/demo_translated_en.png
M	guides/assets/images/i18n/demo_translated_pirate.png
M	guides/assets/images/i18n/demo_translation_missing.png
M	guides/assets/images/i18n/demo_untranslated.png
M	guides/assets/images/icons/callouts/1.png
M	guides/assets/images/icons/callouts/10.png
M	guides/assets/images/icons/callouts/11.png
M	guides/assets/images/icons/callouts/12.png
M	guides/assets/images/icons/callouts/13.png
M	guides/assets/images/icons/callouts/14.png
M	guides/assets/images/icons/callouts/15.png
M	guides/assets/images/icons/callouts/2.png
M	guides/assets/images/icons/callouts/3.png
M	guides/assets/images/icons/callouts/4.png
M	guides/assets/images/icons/callouts/5.png
M	guides/assets/images/icons/callouts/6.png
M	guides/assets/images/icons/callouts/7.png
M	guides/assets/images/icons/callouts/8.png
M	guides/assets/images/icons/callouts/9.png
M	guides/assets/images/icons/caution.png
M	guides/assets/images/icons/example.png
M	guides/assets/images/icons/home.png
M	guides/assets/images/icons/important.png
M	guides/assets/images/icons/next.png
M	guides/assets/images/icons/note.png
M	guides/assets/images/icons/prev.png
M	guides/assets/images/icons/tip.png
M	guides/assets/images/icons/up.png
M	guides/assets/images/icons/warning.png
M	guides/assets/images/nav_arrow.gif
M	guides/assets/images/polymorphic.png
M	guides/assets/images/rails_guides_logo.gif
M	guides/assets/images/rails_welcome.png
M	guides/assets/images/session_fixation.png
M	guides/assets/images/tab_grey.gif
M	guides/assets/images/tab_info.gif
M	guides/assets/images/tab_note.gif
M	guides/assets/images/tab_red.gif
M	guides/assets/images/tab_yellow.gif
M	guides/assets/images/tab_yellow.png
M	guides/assets/images/validation_error_messages.png

commit eea9777	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-05-07 13:38:37 -0300

    Fix failing test on Oracle. Having a duplicated column specified in a
    select with order on the same column makes Oracle complain about "column
    ambiguously defined" when an order is defined on such column (introduced
    by default order on `first`) (fixes #6147).

M	activerecord/test/cases/relation_scoping_test.rb

commit 17ef794	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 11:28:03 -0500

    adding example about using cattr_accessor with subclasses

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

commit 700dd00	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-07 20:43:04 +0530

    Revert "fixing active model links in readme"
    
    This reverts commit c962680e1902d2c9474f0be8ba7b0b8ab361cae6.
    
    Reason: The links must be relative to work in both edge and stable api
    sites.

M	activemodel/README.rdoc

commit 40b5d28	refs/heads/master
Author: Xavier Noria 
Date:   2012-05-07 17:04:10 +0200

    Revert "Compressed all images from the guide through ImageOptim which saves sometimes up to 74.6% in size [ci skip]"
    
    Reason: this change can't really be done in docrails,
    see http://weblog.rubyonrails.org/2012/3/7/what-is-docrails/
    
    This reverts commit bc06e8d706fd8818d434c66f46d2e889ca24bd2d.

M	guides/assets/images/belongs_to.png
M	guides/assets/images/book_icon.gif
M	guides/assets/images/challenge.png
M	guides/assets/images/chapters_icon.gif
M	guides/assets/images/check_bullet.gif
M	guides/assets/images/credits_pic_blank.gif
M	guides/assets/images/csrf.png
M	guides/assets/images/customized_error_messages.png
M	guides/assets/images/edge_badge.png
M	guides/assets/images/error_messages.png
M	guides/assets/images/feature_tile.gif
M	guides/assets/images/footer_tile.gif
M	guides/assets/images/fxn.png
M	guides/assets/images/getting_started/confirm_dialog.png
M	guides/assets/images/getting_started/form_with_errors.png
M	guides/assets/images/getting_started/index_action_with_edit_link.png
M	guides/assets/images/getting_started/new_post.png
M	guides/assets/images/getting_started/post_with_comments.png
M	guides/assets/images/getting_started/routing_error_no_controller.png
M	guides/assets/images/getting_started/routing_error_no_route_matches.png
M	guides/assets/images/getting_started/show_action_for_posts.png
M	guides/assets/images/getting_started/template_is_missing_posts_new.png
M	guides/assets/images/getting_started/undefined_method_post_path.png
M	guides/assets/images/getting_started/unknown_action_create_for_posts.png
M	guides/assets/images/getting_started/unknown_action_new_for_posts.png
M	guides/assets/images/grey_bullet.gif
M	guides/assets/images/habtm.png
M	guides/assets/images/has_many.png
M	guides/assets/images/has_many_through.png
M	guides/assets/images/has_one.png
M	guides/assets/images/has_one_through.png
M	guides/assets/images/header_backdrop.png
M	guides/assets/images/header_tile.gif
M	guides/assets/images/i18n/demo_html_safe.png
M	guides/assets/images/i18n/demo_localized_pirate.png
M	guides/assets/images/i18n/demo_translated_en.png
M	guides/assets/images/i18n/demo_translated_pirate.png
M	guides/assets/images/i18n/demo_translation_missing.png
M	guides/assets/images/i18n/demo_untranslated.png
M	guides/assets/images/icons/callouts/1.png
M	guides/assets/images/icons/callouts/10.png
M	guides/assets/images/icons/callouts/11.png
M	guides/assets/images/icons/callouts/12.png
M	guides/assets/images/icons/callouts/13.png
M	guides/assets/images/icons/callouts/14.png
M	guides/assets/images/icons/callouts/15.png
M	guides/assets/images/icons/callouts/2.png
M	guides/assets/images/icons/callouts/3.png
M	guides/assets/images/icons/callouts/4.png
M	guides/assets/images/icons/callouts/5.png
M	guides/assets/images/icons/callouts/6.png
M	guides/assets/images/icons/callouts/7.png
M	guides/assets/images/icons/callouts/8.png
M	guides/assets/images/icons/callouts/9.png
M	guides/assets/images/icons/caution.png
M	guides/assets/images/icons/example.png
M	guides/assets/images/icons/home.png
M	guides/assets/images/icons/important.png
M	guides/assets/images/icons/next.png
M	guides/assets/images/icons/note.png
M	guides/assets/images/icons/prev.png
M	guides/assets/images/icons/tip.png
M	guides/assets/images/icons/up.png
M	guides/assets/images/icons/warning.png
M	guides/assets/images/jaimeiniesta.jpg
M	guides/assets/images/nav_arrow.gif
M	guides/assets/images/polymorphic.png
M	guides/assets/images/radar.png
M	guides/assets/images/rails_guides_kindle_cover.jpg
M	guides/assets/images/rails_guides_logo.gif
M	guides/assets/images/rails_welcome.png
M	guides/assets/images/session_fixation.png
M	guides/assets/images/tab_grey.gif
M	guides/assets/images/tab_info.gif
M	guides/assets/images/tab_note.gif
M	guides/assets/images/tab_red.gif
M	guides/assets/images/tab_yellow.gif
M	guides/assets/images/tab_yellow.png
M	guides/assets/images/validation_error_messages.png
M	guides/assets/images/vijaydev.jpg

commit 7746bf9	refs/heads/master
Merge: fef110d 9250e24
Author: Piotr Sarnacki 
Date:   2012-05-07 07:54:03 -0700

    Merge pull request #6191 from arunagw/ruby_prof_lock
    
    Locking ruby-prof for now.

commit ae0a4ca	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 09:49:54 -0500

    removing the surrounding +s in active model readme

M	activemodel/README.rdoc

commit fef110d	refs/heads/master
Merge: c35df12 7d2bbb6
Author: José Valim 
Date:   2012-05-07 07:35:42 -0700

    Merge pull request #5368 from andhapp/remove-max-stale
    
    Minor test improvement

commit bc06e8d	refs/heads/master
Author: Ayrton De Craene 
Date:   2012-05-07 15:40:08 +0200

    Compressed all images from the guide through ImageOptim which saves sometimes up to 74.6% in size [ci skip]

M	guides/assets/images/belongs_to.png
M	guides/assets/images/book_icon.gif
M	guides/assets/images/challenge.png
M	guides/assets/images/chapters_icon.gif
M	guides/assets/images/check_bullet.gif
M	guides/assets/images/credits_pic_blank.gif
M	guides/assets/images/csrf.png
M	guides/assets/images/customized_error_messages.png
M	guides/assets/images/edge_badge.png
M	guides/assets/images/error_messages.png
M	guides/assets/images/feature_tile.gif
M	guides/assets/images/footer_tile.gif
M	guides/assets/images/fxn.png
M	guides/assets/images/getting_started/confirm_dialog.png
M	guides/assets/images/getting_started/form_with_errors.png
M	guides/assets/images/getting_started/index_action_with_edit_link.png
M	guides/assets/images/getting_started/new_post.png
M	guides/assets/images/getting_started/post_with_comments.png
M	guides/assets/images/getting_started/routing_error_no_controller.png
M	guides/assets/images/getting_started/routing_error_no_route_matches.png
M	guides/assets/images/getting_started/show_action_for_posts.png
M	guides/assets/images/getting_started/template_is_missing_posts_new.png
M	guides/assets/images/getting_started/undefined_method_post_path.png
M	guides/assets/images/getting_started/unknown_action_create_for_posts.png
M	guides/assets/images/getting_started/unknown_action_new_for_posts.png
M	guides/assets/images/grey_bullet.gif
M	guides/assets/images/habtm.png
M	guides/assets/images/has_many.png
M	guides/assets/images/has_many_through.png
M	guides/assets/images/has_one.png
M	guides/assets/images/has_one_through.png
M	guides/assets/images/header_backdrop.png
M	guides/assets/images/header_tile.gif
M	guides/assets/images/i18n/demo_html_safe.png
M	guides/assets/images/i18n/demo_localized_pirate.png
M	guides/assets/images/i18n/demo_translated_en.png
M	guides/assets/images/i18n/demo_translated_pirate.png
M	guides/assets/images/i18n/demo_translation_missing.png
M	guides/assets/images/i18n/demo_untranslated.png
M	guides/assets/images/icons/callouts/1.png
M	guides/assets/images/icons/callouts/10.png
M	guides/assets/images/icons/callouts/11.png
M	guides/assets/images/icons/callouts/12.png
M	guides/assets/images/icons/callouts/13.png
M	guides/assets/images/icons/callouts/14.png
M	guides/assets/images/icons/callouts/15.png
M	guides/assets/images/icons/callouts/2.png
M	guides/assets/images/icons/callouts/3.png
M	guides/assets/images/icons/callouts/4.png
M	guides/assets/images/icons/callouts/5.png
M	guides/assets/images/icons/callouts/6.png
M	guides/assets/images/icons/callouts/7.png
M	guides/assets/images/icons/callouts/8.png
M	guides/assets/images/icons/callouts/9.png
M	guides/assets/images/icons/caution.png
M	guides/assets/images/icons/example.png
M	guides/assets/images/icons/home.png
M	guides/assets/images/icons/important.png
M	guides/assets/images/icons/next.png
M	guides/assets/images/icons/note.png
M	guides/assets/images/icons/prev.png
M	guides/assets/images/icons/tip.png
M	guides/assets/images/icons/up.png
M	guides/assets/images/icons/warning.png
M	guides/assets/images/jaimeiniesta.jpg
M	guides/assets/images/nav_arrow.gif
M	guides/assets/images/polymorphic.png
M	guides/assets/images/radar.png
M	guides/assets/images/rails_guides_kindle_cover.jpg
M	guides/assets/images/rails_guides_logo.gif
M	guides/assets/images/rails_welcome.png
M	guides/assets/images/session_fixation.png
M	guides/assets/images/tab_grey.gif
M	guides/assets/images/tab_info.gif
M	guides/assets/images/tab_note.gif
M	guides/assets/images/tab_red.gif
M	guides/assets/images/tab_yellow.gif
M	guides/assets/images/tab_yellow.png
M	guides/assets/images/validation_error_messages.png
M	guides/assets/images/vijaydev.jpg

commit c334175	refs/heads/master
Author: Dan Seaver 
Date:   2012-05-07 09:25:36 -0400

    Converts inet and cidr columns to NetAddr::CIDR

M	activerecord/activerecord.gemspec
M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb

commit c35df12	refs/heads/master
Merge: cf243be 5a2a72d
Author: José Valim 
Date:   2012-05-07 05:27:30 -0700

    Merge pull request #6182 from shaliko/change_unless_else_into_if_else
    
    Change unless + else into if + else

commit 9250e24	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-07 17:47:24 +0530

    Locking ruby-prof for now.
    
    Need to investigate why build is failing because of
    ruby-prof.

M	Gemfile

commit 89fff79	refs/heads/master
Author: Rob Zolkos 
Date:   2012-05-07 21:43:05 +1000

    Doc for ActiveRecord::Result empty? method

M	activerecord/lib/active_record/result.rb

commit 61587b1	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-07 12:24:40 +0100

    Remove accidentally pasted NOTE section during introduction of +beginning_of_hour+ and +end_of_hour+ documentation.

M	guides/source/active_support_core_extensions.textile

commit f174e8d	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-07 12:07:35 +0100

    Corrections to +beginning_of_day+ and +end_of_day+ example dates.

M	guides/source/active_support_core_extensions.textile

commit 8c4777f	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-07 12:04:51 +0100

    Added documentation for +beginning_of_hour+ and +end_of_hour+ to Active Support Core Extensions guide.

M	guides/source/active_support_core_extensions.textile

commit 59462c1	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-07 12:25:21 +0200

    Initial proof reading of getting started guide

M	guides/source/getting_started.textile

commit cf243be	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-07 12:18:51 +0530

    note that WIP guides are not in the index menu [ci skip]

M	guides/source/index.html.erb

commit 204a79f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 00:48:19 -0500

    fixing marked actived model classes in readme

M	activemodel/README.rdoc

commit 79f1daf	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 00:45:54 -0500

    marking some active model classes

M	activemodel/README.rdoc

commit c962680	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 00:40:00 -0500

    fixing active model links in readme

M	activemodel/README.rdoc

commit 9f3637f	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-05-07 00:33:26 -0500

    adding observer example

M	activemodel/README.rdoc

commit d98bbde	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 21:38:34 -0700

    Fix build

M	railties/test/commands/dbconsole_test.rb

commit 0558578	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 21:36:59 -0700

    Ensure that Rails.env is equal to "test" by default when running tests.
    
    Rails.env when running tests on localhost differs from travis ci
    which makes it harder to write tests that check env related things.

M	railties/test/abstract_unit.rb

commit 552f535	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-05-06 20:40:48 -0700

    are ran -> are run
    
    The former is grammatically incorrect.

M	guides/source/configuring.textile

commit 3ac93d6	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 19:06:49 -0700

    [guides] Add comments to deep_dup example, fix second example [ci skip]

M	guides/source/active_support_core_extensions.textile

commit b41bfb0	refs/heads/master
Merge: a29bc1c 346bb01
Author: Jeremy Kemper 
Date:   2012-05-06 16:23:38 -0700

    Merge pull request #5910 from route/rails-dbconsole
    
    Fast path starts the database console without loading the full Rails env

commit a29bc1c	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-05-06 12:44:03 -0700

    Fix that optimized named routes should also work as singleton methods on the url_helpers module

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 9d03e20	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 12:33:02 -0700

    Remove obsolete deep_dup requires

M	railties/lib/rails/configuration.rb

commit 346bb01	refs/heads/master
Author: Dmitry Vorotilin 
Date:   2012-05-04 18:40:32 +0400

    More faster rails dbconsole

M	railties/lib/rails/commands.rb
M	railties/lib/rails/commands/dbconsole.rb
M	railties/test/commands/dbconsole_test.rb

commit 9374270	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 10:54:25 -0700

    Use deep_dup in aciverecord default columns assignment

M	activerecord/lib/active_record/core.rb

commit 98553a5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 11:12:54 -0700

    Keep all  methods in object/deep_dup

M	activesupport/lib/active_support/core_ext/array.rb
D	activesupport/lib/active_support/core_ext/array/deep_dup.rb
M	activesupport/lib/active_support/core_ext/hash.rb
D	activesupport/lib/active_support/core_ext/hash/deep_dup.rb
M	activesupport/lib/active_support/core_ext/object/deep_dup.rb
M	activesupport/test/core_ext/deep_dup_test.rb

commit 0403928	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 10:56:38 -0700

    Updated CHANGELOG entry for `deep_dup`

M	activesupport/CHANGELOG.md

commit 352d033	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-06 10:53:27 -0700

    Reword guide entry for `deep_dup` method.

M	guides/source/active_support_core_extensions.textile

commit 5a2a72d	refs/heads/master
Author: Shaliko Usubov 
Date:   2012-05-06 21:49:31 +0400

    Change unless + else into if + else

M	actionpack/lib/action_view/helpers/date_helper.rb

commit aa5dd14	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-24 14:05:38 +0400

    Guides for deep_dup

M	guides/source/active_support_core_extensions.textile

commit 657b4ff	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-24 13:59:55 +0400

    Nice logic for deep_dup in rails

M	activesupport/lib/active_support/core_ext/array.rb
A	activesupport/lib/active_support/core_ext/array/deep_dup.rb
M	activesupport/lib/active_support/core_ext/hash/deep_dup.rb
M	activesupport/lib/active_support/core_ext/object.rb
A	activesupport/lib/active_support/core_ext/object/deep_dup.rb
A	activesupport/test/core_ext/deep_dup_test.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	railties/lib/rails/configuration.rb

commit ed1703b	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-06 22:32:22 +0530

    doc edits [ci skip]

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 8937600	refs/heads/master
Merge: 80cfb5f 3527852
Author: Vijay Dev 
Date:   2012-05-06 09:58:02 -0700

    Merge pull request #5924 from cjolly/signed-cookies-docs
    
    Improve signed cookies documentation

commit 80cfb5f	refs/heads/master
Merge: c02846f 19c91d7
Author: Vijay Dev 
Date:   2012-05-06 08:44:58 -0700

    Merge pull request #6180 from soulim/fix_submit_tag_doc
    
    Fix typo in submit_tag helper documentation

commit 19c91d7	refs/heads/master
Author: Alex Soulim 
Date:   2012-05-06 19:33:47 +0400

    Fix typo in submit_tag helper documentation

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 9b854cc	refs/heads/master
Author: Rob Zolkos 
Date:   2012-05-06 21:04:02 +1000

    Add missing public method doc to TimeWithZone.name

M	activesupport/lib/active_support/time_with_zone.rb

commit c02846f	refs/heads/master
Author: José Valim 
Date:   2012-05-06 12:11:40 +0300

    Update actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md

commit 13811ee	refs/heads/master
Merge: bad119c 6471ced
Author: José Valim 
Date:   2012-05-06 02:09:10 -0700

    Merge pull request #2313 from ssoroka/master
    
    Raise a rescuable exception, rather than responding with a head :not_acceptable (406)

commit 6471ced	refs/heads/master
Author: Steven Soroka 
Date:   2012-05-06 00:34:08 -0500

    remove .new from raise ActionController::UnknownFormat

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit ec4045c	refs/heads/master
Author: Steven Soroka 
Date:   2011-07-28 00:01:29 -0400

    added an integration test that checks ActionController::UnknownFormat renders 406 :not_acceptable

M	actionpack/test/controller/integration_test.rb

commit 3532200	refs/heads/master
Author: Steven Soroka 
Date:   2011-07-27 18:37:06 -0400

    Raise a rescuable exception when Rails doesn't know what to do with the format, rather than responding with a head :not_acceptable (406)

M	actionpack/lib/action_controller/metal/exceptions.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
M	actionpack/test/controller/mime_responds_test.rb

commit f9646c8	refs/heads/master
Author: Mitch Crowe 
Date:   2012-05-05 18:34:54 -0700

    SpawnMethods#merge returns the intersection when passed an array, and not the union. Update the documentation to reflect this.

M	activerecord/lib/active_record/relation/spawn_methods.rb

commit bad119c	refs/heads/master
Merge: 4d8bc1d 56bf1f7
Author: Jeremy Kemper 
Date:   2012-05-05 15:19:36 -0700

    Merge pull request #6173 from mhfs/takes_instead_first
    
    Use `take` instead of `first` to avoid unwanted implicit ordering. Closes #6147.

commit 4d8bc1d	refs/heads/master
Merge: 3af9e72 2054a17
Author: Jeremy Kemper 
Date:   2012-05-05 15:12:32 -0700

    Merge pull request #6069 from mipearson/use_strict_mode_in_mysql
    
    Use strict mode in mysql

commit 3af9e72	refs/heads/master
Merge: 06c787d 7f160b0
Author: Jon Leighton 
Date:   2012-05-05 13:40:42 -0700

    Merge pull request #6054 from flexoid/column-fix
    
    Prevent creating valid time-like objects from blank string from db

commit 06c787d	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-05 21:36:24 +0100

    Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_association_join_context_on_merge"
    
    This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing
    changes made to 58a49875df63729f07a9a81d1ee349087d258df5.

M	activerecord/lib/active_record/associations/join_dependency.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/test/cases/relations_test.rb

commit 7f160b0	refs/heads/master
Author: Egor Lynko 
Date:   2012-04-29 19:39:16 +0300

    Prevent creating valid time-like objects from blank string from db
    
    Issue #6045

M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/test/cases/column_test.rb

commit dcd04e7	refs/heads/master
Merge: 58a4987 0d8cf53
Author: Jon Leighton 
Date:   2012-05-05 13:01:57 -0700

    Merge pull request #5494 from armstrjare/active_record_relation_keep_association_join_context_on_merge
    
    ActiveRecord::Relation - maintain context of joined associations on merges

commit 58a4987	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-06 01:05:43 +0530

    Make RedCloth not convert double hyphens to emdashes. Closes #5292
    
    As mentioned in http://redcloth.org/textile/writing-paragraph-text/#dashes
    RedCloth converts double hyphens to emdashes. This causes problems in
    the guides where options like --database, --full are rendered incorrectly.
    
    This commit fixes it by customizing the emdash method in the
    RedCloth::Formatters::HTML module to just return '--'. See their FAQ
    http://redcloth.org/faq in the section 'How do I customize RedCloth?'

M	guides/rails_guides/textile_extensions.rb

commit b7e3f3c	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-06 00:46:16 +0530

    Revert "Play nice with some lint patterns"
    
    This reverts commit 7f536f9158588b66c0e5a6aa8772b919812f9cb9.
    
    Reason: If at all this is done, this should be done in rails master.

M	guides/assets/stylesheets/main.css

commit f54a35c	refs/heads/master
Merge: a966868 e0aadf1
Author: José Valim 
Date:   2012-05-05 12:10:13 -0700

    Merge pull request #6176 from nashby/checkboxes
    
    check checkboxes with array of strings as :checked option

commit a966868	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-05 23:54:16 +0530

    some corrections in the AR query guide [ci skip]

M	guides/source/active_record_querying.textile

commit ff1bcf6	refs/heads/master
Merge: acb3984 9d906d0
Author: Vijay Dev 
Date:   2012-05-05 11:06:26 -0700

    Merge pull request #6175 from mhfs/guide_take_first_last
    
    Update `first`, `last` and `take` in guides

commit f7b8fbd	refs/heads/master
Author: Dan Seaver 
Date:   2012-05-05 13:51:01 -0400

    Adds migration and schema dump support for INET, CIDR, and MACADDR

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit e0aadf1	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-05-05 20:34:06 +0300

    check checkboxes with array of strings as :checked option

M	actionpack/lib/action_view/helpers/tags/collection_helpers.rb
M	actionpack/test/template/form_collections_helper_test.rb

commit 9d906d0	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-05-05 13:15:09 -0300

    Update `first`, `last` and `take` in guides

M	guides/source/active_record_querying.textile

commit 56bf1f7	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-05-05 12:07:20 -0300

    Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147)

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/relations_test.rb

commit 5636010	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-05 14:12:08 +0200

    Switch token_tag if block

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 2054a17	refs/heads/master
Author: Michael Pearson 
Date:   2012-05-05 17:23:13 +1000

    Changelog entry regarding mysql(2) STRICT_ALL_TABLES

M	activerecord/CHANGELOG.md

commit 7c4d331	refs/heads/master
Author: Michael Pearson 
Date:   2012-05-05 17:11:33 +1000

    Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode.

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb

commit acb3984	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-05 00:42:12 -0700

    Try to convert object passed to debug_hash to hash
    
    SessionStore was recently changed to delegate to hash
    object instead of inherit from it. Since we don't want
    to extend SessionStore with every method implemented in
    Hash, it's better to just convert any object passed to
    debug_hash (which is also better as we don't require
    to pass Hash instance there, it can be any object that
    can be converted to Hash).

M	actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb

commit 7fb268d	refs/tags/v3.2.5
Merge: 915879c 145cc69
Author: Jeremy Kemper 
Date:   2012-05-05 00:40:44 -0700

    Merge pull request #6170 from mjtko/feature-beginning_of_hour-for-3-2-stable
    
    Backport beginning and end of hour support for Time and DateTime to 3-2-stable

commit d6e2c81	refs/heads/master
Merge: 2ce5e4f 14762dc
Author: José Valim 
Date:   2012-05-05 00:34:13 -0700

    Merge pull request #6169 from marcandre/respond_to_missing
    
    Respond to missing

commit 4b90560	refs/heads/master
Author: Michael Pearson 
Date:   2012-04-30 09:46:08 +1000

    Default to 'strict mode' in MySQL

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit a9721d8	refs/heads/master
Author: Michael Pearson 
Date:   2012-04-30 10:42:06 +1000

    Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is required to keep MySQL happy.

M	activerecord/test/schema/schema.rb

commit 14762dc	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-05-05 02:42:48 -0400

    Use respond_to_missing for TimeWithZone

M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 9bda374	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-05-05 02:34:18 -0400

    Use respond_to_missing? for Chars

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/test/multibyte_chars_test.rb

commit 3ea70f9	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-05-05 02:24:57 -0400

    Use respond_to_missing? for OrderedOptions

M	activesupport/lib/active_support/ordered_options.rb
M	activesupport/test/ordered_options_test.rb

commit 915879c	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-04 23:11:09 -0700

    Give more detailed instructions in script/rails in engine
    
    closes #4894

M	railties/lib/rails/engine/commands.rb

commit 2ce5e4f	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-04 23:11:09 -0700

    Give more detailed instructions in script/rails in engine
    
    closes #4894

M	railties/lib/rails/engine/commands.rb

commit c517602	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-04 00:54:04 -0700

    Duplicate column_defaults properly (closes #6115)

M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit 2ec6ef5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-04 21:39:41 -0700

    Change unless + ! into if

M	activerecord/lib/active_record/fixtures.rb

commit 80a292c	refs/tags/v3.2.5
Merge: efb054b 4657dba
Author: Aaron Patterson 
Date:   2012-05-04 19:00:26 -0700

    Merge pull request #6128 from frodsan/delete_all_limit_32
    
    Fix #4979 against 3-2-stable

commit 58950ee	refs/heads/master
Merge: d5cc711 06c23c4
Author: Aaron Patterson 
Date:   2012-05-04 16:47:35 -0700

    Merge pull request #3713 from kf8a/master
    
    postgresql adapter should quote not a number and infinity correctly for float columns

commit d5cc711	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-04 15:55:36 -0700

    need to dup the default options so that mutations will not impact us

M	actionpack/lib/action_dispatch/request/session.rb

commit d4838fd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-04 14:17:03 -0700

    make sure the superclass matches so load order does not matter

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb

commit fecfd61	refs/heads/master
Merge: db6a399 8c3f4be
Author: Jeremy Kemper 
Date:   2012-05-04 15:34:11 -0700

    Merge pull request #6156 from mjtko/feature-beginning_of_hour
    
    Beginning and end of hour support for Time and DateTime

commit db6a399	refs/heads/master
Merge: a8a9091 81f92cb
Author: Jeremy Kemper 
Date:   2012-05-04 14:00:42 -0700

    Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactor
    
    Use Hash#fetch instead of has_key? check

commit a8a9091	refs/heads/master
Merge: 7a09360 6223d72
Author: Andrew White 
Date:   2012-05-04 13:41:37 -0700

    Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-tests
    
    Enable misnamed time_with_timezone_tests in activesupport core_ext

commit 81f92cb	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-04 16:51:17 -0300

    Use Hash#fetch instead of has_key? check

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit 7a09360	refs/heads/master
Author: José Valim 
Date:   2012-05-04 12:44:34 -0700

    Merge pull request #4445 from nragaz/role_based_params_wrapping
    
    specify a role for identifying accessible attributes when wrapping params

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit efb054b	refs/tags/v3.2.5
Merge: 5384bdb bfb25f9
Author: José Valim 
Date:   2012-05-04 12:44:34 -0700

    Merge pull request #4445 from nragaz/role_based_params_wrapping
    
    specify a role for identifying accessible attributes when wrapping params

commit 2919fd8	refs/heads/master
Merge: 9ce057d 0d19a08
Author: José Valim 
Date:   2012-05-04 12:39:51 -0700

    Merge pull request #5808 from avakhov/assert-template-layout-improve
    
    Assert template layout improve

commit 0d19a08	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-11 12:45:28 +0600

    Improve assert_template layout checking

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/action_pack_assertions_test.rb

commit 4bd05a7	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-11 11:55:51 +0600

    Fix assert_template :layout => nil assertion

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/action_pack_assertions_test.rb

commit df36c5f	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-11 11:28:19 +0600

    Fix assert_template assertion with :layout option

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/action_pack_assertions_test.rb
A	actionpack/test/fixtures/test/hello_world_with_partial.html.erb

commit 145cc69	refs/tags/v3.2.5
Author: Mark J. Titorenko 
Date:   2012-05-04 20:27:32 +0100

    added beginning_of_hour support to core_ext calculations for Time and DateTime

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 9ce057d	refs/heads/master
Merge: 3f46e7a d03aa10
Author: Aaron Patterson 
Date:   2012-05-04 11:39:20 -0700

    Merge pull request #6160 from carlosantoniodasilva/resource-route-canonical-action
    
    Force given path to http methods in mapper to skip canonical action checking

commit 3f46e7a	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-04 23:58:15 +0530

    fix doc [ci skip]

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 26e7678	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-04 11:26:03 -0700

    session creation methods to a module

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
M	actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb

commit db93c1c	refs/heads/master
Merge: 319db7b 42eda20
Author: Vijay Dev 
Date:   2012-05-04 11:26:03 -0700

    Merge pull request #6154 from shaliko/patch-1
    
    Update documentation for button_to.

commit d03aa10	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-03 23:26:54 -0300

    Force given path to http methods in mapper to skip canonical action checking
    
    This fixes the following scenario:
    
        resources :contacts do
          post 'new', action: 'new', on: :collection, as: :new
        end
    
    Where the /new path is not generated because it's considered a canonical
    action, part of the normal resource actions:
    
        new_contacts POST   /contacts(.:format)          contacts#new
    
    Fixes #2999

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/dispatch/routing_test.rb

commit 319db7b	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-04 23:45:27 +0530

    update invalid partial error message as per 04202a3f8d66c0675eac41fbf63309f4be356e81

M	actionpack/test/template/render_test.rb

commit 06631b8	refs/heads/master
Merge: e2218b7 04202a3
Author: Vijay Dev 
Date:   2012-05-04 11:05:15 -0700

    Merge pull request #6159 from marcandre/fix_bad_partial_error_mess
    
    Adjust error message for partial names starting with an uppercase letter...

commit e2218b7	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-04 11:03:37 -0700

    create a request session in the cookie stores

M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb

commit 638d002	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-04 10:57:55 -0700

    create a request::session object in the memecache store middleware

M	actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb

commit 04202a3	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-05-04 13:48:02 -0400

    Adjust error message for partial names starting with an uppercase letter.

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 5384bdb	refs/tags/v3.2.5
Merge: 7c7fb3a b4ae94f
Author: Vijay Dev 
Date:   2012-05-04 10:39:08 -0700

    Merge pull request #6158 from Dagnan/3-2-stable
    
    improvements in "caching_with_rails" guide

commit c8e0571	refs/heads/master
Author: Ernesto Tagwerker 
Date:   2012-05-04 14:35:16 -0300

    Added reference to I18n.localize, as discussed here:
    https://github.com/rails/rails/issues/4027

M	actionpack/lib/action_view/helpers/translation_helper.rb

commit b4ae94f	refs/tags/v3.2.5
Author: kucaahbe 
Date:   2012-03-22 11:39:46 +0200

    improvements in "caching_with_rails" guide - backported from docrails
    
    Conflicts:
    
    	railties/guides/source/caching_with_rails.textile

M	railties/guides/source/caching_with_rails.textile

commit b13849d	refs/heads/master
Merge: c4f0229 510cf0a
Author: Aaron Patterson 
Date:   2012-05-04 10:14:10 -0700

    Merge branch 'master' into session
    
    * master: (55 commits)
      extract deprecated dynamic methods
      Add some docs and changelog entry
      Allow overriding exception handling in threaded consumer
      Allow configuring a different queue consumer
      actually don't need to expand the aggregates at all
      #to_sym is unnecessary
      de-globalise method
      extract code from AR::Base
      clean up implementation of dynamic methods. use method compilation etc.
      Fix ActiveModel README example
      mention database mapping in getting started guide
      Remove vestiges of the http_only! config from configuring guide
      Remove content-length as well
      Make ActionController#head pass rack-link
      RouteSet: optimize routes generation when globbing is used
      Allows assert_redirected_to to accept a regular expression
      use extract_options!
      No need to force conversion to Symbol since case ensures it's already one.
      No need to work around 1.8 warnings anymore.
      Update command line guide
      ...

commit 7f536f9	refs/heads/master
Author: Kristian Freeman 
Date:   2012-05-04 09:56:07 -0700

    Play nice with some lint patterns

M	guides/assets/stylesheets/main.css

commit 544a10e	refs/heads/master
Author: Mike Manewitz 
Date:   2012-05-04 10:24:56 -0500

    Editing log levels to reflect this doc: http://api.rubyonrails.org/classes/ActiveSupport/BufferedLogger/Severity.html

M	guides/source/debugging_rails_applications.textile

commit 6223d72	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-04 16:11:32 +0100

    enable tests for beginning_of_* and end_of_* within time zone tests; enable test for future_with_time_current_as_time_with_zone; fix beginning_of_month test.

M	activesupport/test/core_ext/time_with_zone_test.rb

commit 8c3f4be	refs/heads/master
Author: Mark J. Titorenko 
Date:   2012-05-04 15:18:59 +0100

    added beginning_of_hour support to core_ext calculations for Time and DateTime

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit bfb25f9	refs/tags/v3.2.5
Author: Nick Ragaz 
Date:   2012-01-13 01:07:18 -0500

    Add a role option to wrap_parameters.
    
    The role option identifies which parameters are accessible and should be wrapped. The default role is :default.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 42eda20	refs/heads/master
Author: Shalva Usubov 
Date:   2012-05-04 17:36:42 +0400

    Update documentation for button_to.

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 510cf0a	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-04 14:30:57 +0100

    extract deprecated dynamic methods

M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/test/cases/named_scope_test.rb

commit a33d9f4	refs/tags/v3.1.6
Merge: 0cfa6b7 29aa03a
Author: Jeremy Kemper 
Date:   2012-05-04 06:22:07 -0700

    Merge pull request #6152 from route/assets_precompile_task_3_1
    
    Just cherry-picked fixes for asset precompile for 3-1-stable

commit ffad360	refs/heads/master
Merge: 3d9673d 7a6116b
Author: José Valim 
Date:   2012-05-04 05:44:21 -0700

    Merge pull request #6153 from carlosantoniodasilva/queue-consumer
    
    Configurable queue consumer

commit 29aa03a	refs/tags/v3.1.6
Author: Dmitry Vorotilin 
Date:   2012-05-01 13:26:04 +0400

    Added test for assets:precompile for index files

M	railties/test/application/assets_test.rb

commit cf42971	refs/tags/v3.1.6
Author: Dmitry Vorotilin 
Date:   2012-05-01 03:53:13 +0400

    Fix #3993 assets:precompile task does not detect index files

M	actionpack/lib/sprockets/static_compiler.rb

commit 3d9673d	refs/heads/master
Merge: b24f1ce 616de66
Author: Vijay Dev 
Date:   2012-05-04 17:51:15 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 7a6116b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-03 22:26:30 -0300

    Add some docs and changelog entry

M	guides/source/configuring.textile
M	railties/CHANGELOG.md
M	railties/lib/rails/queueing.rb

commit 8fbf2e1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-03 00:15:50 -0300

    Allow overriding exception handling in threaded consumer

M	railties/lib/rails/queueing.rb
M	railties/test/queueing/threaded_consumer_test.rb

commit 1385388	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-03 00:10:27 -0300

    Allow configuring a different queue consumer
    
    Also make sure to not use default queue consumer with custom queue
    implementation. It is up to the new queue implementation to
    start / shutdown the consumer.

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/test/application/queue_test.rb

commit b24f1ce	refs/heads/master
Merge: d1729b9 0f2555f
Author: Vijay Dev 
Date:   2012-05-04 04:57:07 -0700

    Merge pull request #5650 from sekrett/master
    
    Documentation fix: Change the example for habtm association to use proc according to changelog

commit d1729b9	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-03 00:54:16 +0100

    actually don't need to expand the aggregates at all

M	activerecord/lib/active_record/dynamic_matchers.rb

commit 780e893	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-03 00:49:33 +0100

    #to_sym is unnecessary

M	activerecord/lib/active_record/dynamic_matchers.rb

commit 4bd9482	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-03 00:47:50 +0100

    de-globalise method

M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/sanitization.rb

commit 75a2281	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-03 00:38:30 +0100

    extract code from AR::Base

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/test/cases/named_scope_test.rb

commit 0c76a52	refs/heads/master
Author: Jon Leighton 
Date:   2012-05-02 23:57:52 +0100

    clean up implementation of dynamic methods. use method compilation etc.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
D	activerecord/lib/active_record/dynamic_finder_match.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
D	activerecord/lib/active_record/dynamic_scope_match.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
D	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit 0d8cf53	refs/heads/master
Author: Jared Armstrong 
Date:   2012-03-17 00:37:56 +1300

    Allow ActiveRecord::Relation merges to maintain context of joined associations

M	activerecord/lib/active_record/associations/join_dependency.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/test/cases/relations_test.rb

commit 616de66	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-04 12:32:35 +0400

    Fix ActiveModel README example

M	activemodel/README.rdoc

commit c058a77	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-04 08:36:30 +0200

    mention database mapping in getting started guide

M	guides/source/getting_started.textile

commit 5f62c86	refs/heads/master
Merge: 4f77f95 8edd21c
Author: José Valim 
Date:   2012-05-03 22:52:08 -0700

    Merge pull request #6148 from twinturbo/head-fix
    
    Make ActionController#head pass rack-link

commit 4f77f95	refs/heads/master
Merge: 7a3e43c 0e49ef4
Author: Piotr Sarnacki 
Date:   2012-05-03 22:47:29 -0700

    Merge pull request #5821 from Deradon/fix-engine-tasks
    
    Provided fix for calling rake tasks within mountable engines

commit 026e0d1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-03 22:16:04 -0300

    Remove vestiges of the http_only! config from configuring guide

M	guides/source/configuring.textile

commit 8edd21c	refs/heads/master
Author: twinturbo 
Date:   2012-05-03 17:24:05 -0700

    Remove content-length as well

M	actionpack/lib/action_controller/metal/head.rb
M	actionpack/test/controller/new_base/bare_metal_test.rb

commit 8eedd1a	refs/heads/master
Author: twinturbo 
Date:   2012-05-03 15:47:02 -0700

    Make ActionController#head pass rack-link

M	actionpack/lib/action_controller/metal/head.rb
M	actionpack/test/controller/new_base/bare_metal_test.rb

commit 7a3e43c	refs/heads/master
Merge: b55b77f e5425c8
Author: Aaron Patterson 
Date:   2012-05-03 15:56:54 -0700

    Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbed
    
    Fix cache (FileStore) clear to keep .gitkeep.

commit 0621ecb	refs/tags/v3.2.5
Author: Jorge Bejar 
Date:   2012-05-03 19:07:03 -0300

    Make sure that javascript_include_tag/stylesheet_link_tag methods in
    sprockets/helpers/rails_helper.rb discard duplicated assets

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit c4f0229	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-03 14:28:11 -0700

    bread AD::Request::Session to it's own file, consolidate HASH OF DOOM lookups

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
A	actionpack/lib/action_dispatch/request/session.rb

commit b55b77f	refs/heads/master
Merge: e539b2a 5d685f9
Author: Piotr Sarnacki 
Date:   2012-05-03 10:48:26 -0700

    Merge pull request #6012 from avakhov/dbconsole-test
    
    Cover Rails::DBConsole with tests

commit e539b2a	refs/heads/master
Merge: c1f4cb5 06ea1ba
Author: Aaron Patterson 
Date:   2012-05-03 10:39:51 -0700

    Merge pull request #4496 from makeable/master
    
    Active Support Cache - race_condition_ttl should be an integer

commit c1f4cb5	refs/heads/master
Merge: 9de9e6a 1ab0523
Author: José Valim 
Date:   2012-05-03 09:01:28 -0700

    Merge pull request #6144 from bogdan/routes
    
    RouteSet: optimize routes generation when globbing is used

commit 1ab0523	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-05-03 18:44:12 +0300

    RouteSet: optimize routes generation when globbing is used

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit fa5f037	refs/heads/master
Author: Yves Senn 
Date:   2011-10-24 14:47:01 +0200

    allow the :converter Proc form composed_of to return nil
    
    This makes it possible to filter invalid input values before they are passed
    into the value-object (like empty strings). This behaviour is only relevant
    if the :allow_nil options is set to true. Otherwise you will get
    the resulting NoMethodError.

M	activerecord/lib/active_record/aggregations.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/models/customer.rb

commit 9596076	refs/heads/master
Author: Nicholas Yianilos 
Date:   2012-05-03 09:41:29 -0400

    refactored extracting :size => 'XxY' into an extract_size! method

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/lib/action_view/helpers/tags/text_area.rb

commit 9de9e6a	refs/heads/master
Merge: fb7abea a544e00
Author: José Valim 
Date:   2012-05-03 06:20:07 -0700

    Merge pull request #6135 from alindeman/assert_redirect_to_with_regexp
    
    Allows assert_redirected_to to accept a regular expression

commit a544e00	refs/heads/master
Author: Andy Lindeman 
Date:   2012-05-03 09:16:38 -0400

    Allows assert_redirected_to to accept a regular expression

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/test/controller/action_pack_assertions_test.rb

commit fb7abea	refs/heads/master
Merge: 54174b5 e821611
Author: José Valim 
Date:   2012-05-03 05:41:03 -0700

    Merge pull request #6139 from pwim/extract_options-actionpack
    
    use extract_options!

commit 54174b5	refs/heads/master
Merge: ab7b550 5f2f9b5
Author: José Valim 
Date:   2012-05-03 05:26:39 -0700

    Merge pull request #6141 from mhfs/mailer_tweeks
    
    Minor ActionMailer tweaks

commit e821611	refs/heads/master
Author: Paul McMahon 
Date:   2012-05-03 18:02:25 +0900

    use extract_options!

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 5f2f9b5	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-05-03 09:11:31 -0300

    No need to force conversion to Symbol since case ensures it's already
    one.

M	actionmailer/lib/action_mailer/delivery_methods.rb

commit 3d02195	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-05-03 09:10:33 -0300

    No need to work around 1.8 warnings anymore.

M	actionmailer/test/abstract_unit.rb

commit ab7b550	refs/heads/master
Merge: 5c0cbb3 7273ada
Author: Vijay Dev 
Date:   2012-05-03 04:59:49 -0700

    Merge pull request #6137 from FLOChip/cache_documentation
    
    cache_store has an extra option of :null_store.

commit e608588	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-03 13:58:19 +0200

    Update command line guide

M	guides/source/command_line.textile

commit 5c0cbb3	refs/heads/master
Merge: 3e54179 da88d80
Author: José Valim 
Date:   2012-05-03 01:50:08 -0700

    Merge pull request #6138 from bogdan/routes
    
    RouteSet: remove some code dups

commit 7273ada	refs/heads/master
Author: Teng Siong Ong 
Date:   2012-05-03 03:28:32 -0500

    cache_store has an extra option of :null_store.

M	guides/source/configuring.textile

commit c9e809c	refs/heads/master
Author: Paul McMahon 
Date:   2012-05-03 17:20:59 +0900

    I found it strange that this guide is redirecting questions to a specific person. Heiko Webers' (@hawe) last blog post is a year and a half old, so it's not obvious that he's still active with Rails security. If he is, feel free to revert.

M	guides/source/security.textile

commit 3e54179	refs/heads/master
Merge: 36720af 5d26c8f
Author: Jon Leighton 
Date:   2012-05-03 00:53:21 -0700

    Merge pull request #6134 from carlosantoniodasilva/ar-relation-kernel-private-methods
    
    Fix issue with private kernel methods and collection associations

commit 5d26c8f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-02 23:09:40 -0300

    Fix issue with private kernel methods and collection associations. Closes #2508
    
    Change CollectionProxy#method_missing to use scoped.public_send, to
    avoid a problem described in issue #2508 when trying to use class
    methods with names like "open", that clash with private kernel methods.
    Also changed the dynamic matcher instantiator to send straight to
    scoped, to avoid another roundtrip to method_missing.

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/company.rb

commit 36720af	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-05-02 18:12:43 -0700

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit b93def9	refs/heads/master
Merge: 2601042 e737f14
Author: Santiago Pastorino 
Date:   2012-05-02 18:11:34 -0700

    Merge pull request #6131 from schneems/schneems/routes_backtrace
    
    Add backtrace to development routing error page

commit ce9e253	refs/heads/master
Author: Anuj Dutta 
Date:   2012-05-03 00:56:28 +0000

    Corrected the name of the module that should be included to get the url helpers.

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 9aa5bb4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 17:54:08 -0700

    extract options finding to a method

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 2601042	refs/heads/master
Merge: 5603050 878db1f
Author: Aaron Patterson 
Date:   2012-05-02 17:38:32 -0700

    Merge pull request #5153 from mhfs/first_finder_fix
    
    Made `first` finder consistent among database engines by adding a default order

commit 5b360db	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 17:29:33 -0700

    testing session store behavior

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
A	actionpack/test/dispatch/request/session_test.rb
A	actionpack/test/dispatch/session/abstract_store_test.rb

commit 878db1f	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-04-27 20:19:11 -0300

    Use arel nodes instead of raw sql

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/relation/finder_methods.rb

commit 2bf65ca	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-04-27 18:22:11 -0300

    Use Array#first instead of Array#[0]

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 66b9e4c	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-04-26 21:06:54 -0300

    Adding note about `first` and `take` to the changelog

M	activerecord/CHANGELOG.md

commit 1379375	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-04-26 21:03:25 -0300

    Introducing `take` as a replacement to the old behavior of `first`

M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 489166e	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-04-26 20:10:10 -0300

    Document `last`, check for primary key on default order and use quoted table and column names

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 07e5301	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-04-26 19:27:55 -0300

    Made `first` finder consistent among database engines by adding a
    default order clause (fixes #5103)

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 0cfa6b7	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-05-02 23:42:43 +0100

    Reset the request parameters after a constraints check
    
    A callable object passed as a constraint for a route may access the request
    parameters as part of its check. This causes the combined parameters hash
    to be cached in the environment hash. If the constraint fails then any subsequent
    access of the request parameters will be against that stale hash.
    
    To fix this we delete the cache after every call to `matches?`. This may have a
    negative performance impact if the contraint wraps a large number of routes as the
    parameters hash is built by merging GET, POST and path parameters.
    
    Fixes #2510.
    (cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b)

M	actionpack/lib/action_dispatch/http/parameters.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit e737f14	refs/heads/master
Author: schneems 
Date:   2012-04-30 16:29:49 -0500

    Add backtrace to development routing error page
    
    If a user gets a routing error due to a view helper such as using user_path without an :id they must go to their logs to see the backtrace. By adding in the trace template, a user can see which line the error occurred on without leaving the browser.
    
    When a routing error occurs outside of the view the application trace will be blank and will not confuse developers.

M	actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb

commit 7c7fb3a	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-05-02 23:42:43 +0100

    Reset the request parameters after a constraints check
    
    A callable object passed as a constraint for a route may access the request
    parameters as part of its check. This causes the combined parameters hash
    to be cached in the environment hash. If the constraint fails then any subsequent
    access of the request parameters will be against that stale hash.
    
    To fix this we delete the cache after every call to `matches?`. This may have a
    negative performance impact if the contraint wraps a large number of routes as the
    parameters hash is built by merging GET, POST and path parameters.
    
    Fixes #2510.
    (cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b)

M	actionpack/lib/action_dispatch/http/parameters.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 5603050	refs/heads/master
Author: Andrew White 
Date:   2012-05-02 23:42:43 +0100

    Reset the request parameters after a constraints check
    
    A callable object passed as a constraint for a route may access the request
    parameters as part of its check. This causes the combined parameters hash
    to be cached in the environment hash. If the constraint fails then any subsequent
    access of the request parameters will be against that stale hash.
    
    To fix this we delete the cache after every call to `matches?`. This may have a
    negative performance impact if the contraint wraps a large number of routes as the
    parameters hash is built by merging GET, POST and path parameters.
    
    Fixes #2510.

M	actionpack/lib/action_dispatch/http/parameters.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit dc2352c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 15:33:20 -0700

    initialize instance variables

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 4657dba	refs/tags/v3.2.5
Author: Francesco Rodriguez 
Date:   2012-05-02 17:26:26 -0500

    Fix #4979 against 3-2-stable - delete_all raise an error if a limit is provided

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 1ef527f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 15:14:47 -0700

    converted session hash to delegation

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 385afd4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 15:06:21 -0700

    session hash imported

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit c2807fb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 14:58:56 -0700

    oops, forgot some semicolons

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 8d33be7	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 14:57:27 -0700

    remove unused ivar

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 6c62883	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 14:56:00 -0700

    use hash fetches to populate the :id value

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 0830738	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 14:45:12 -0700

    imported options, switched to object composition

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit ebe994f	refs/tags/v3.2.5
Merge: 02ca915 580e767
Author: Jeremy Kemper 
Date:   2012-05-02 14:13:26 -0700

    Merge pull request #6095 from route/assets_precompile_task
    
    Fix that asset precompile didn't respect the index.js convention. Fixes #3993.

commit b656134	refs/heads/master
Merge: 2914b92 9a41edf
Author: José Valim 
Date:   2012-05-02 13:40:16 -0700

    Merge pull request #6125 from ncri/master
    
    Adding proc evaluation for action caching layout parameter

commit 9a41edf	refs/heads/master
Author: Nico 
Date:   2012-05-02 22:31:24 +0200

    added proc evaluation for action cache's layout parameter

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 2914b92	refs/heads/master
Merge: 976e7e4 61ba0fe
Author: Aaron Patterson 
Date:   2012-05-02 12:12:46 -0700

    Merge pull request #6122 from amerine/add_fetch_to_actiondispatch_http_headers
    
    Enable ActionDispatch::Http::Headers to support fetch

commit 976e7e4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-05-02 11:55:14 -0700

    * move exception message to exception constructor
    * save original exception
    * keep original backtrace

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 02ca915	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-05-01 16:10:34 -0700

    Deprecate remove_column with array as an argument

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/migration_test.rb

commit ae8f497	refs/heads/master
Merge: 6a4541d 6d6907e
Author: Piotr Sarnacki 
Date:   2012-05-02 11:45:48 -0700

    Merge pull request #3707 from ebeigarts/refactor_remove_column
    
    Refactored remove_column

commit 61ba0fe	refs/heads/master
Author: Mark Turner 
Date:   2012-05-02 11:14:40 -0700

    Enable ActionDispatch::Http::Headers to support fetch

M	actionpack/lib/action_dispatch/http/headers.rb
M	actionpack/test/dispatch/header_test.rb

commit da88d80	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-05-02 18:31:45 +0300

    RouteSet: remove some code dups

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 6a4541d	refs/heads/master
Merge: 2ad91ee e17cc4d
Author: Jeremy Kemper 
Date:   2012-05-02 06:21:12 -0700

    Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presence
    
    Gem const presence checking has been removed

commit 2ad91ee	refs/heads/master
Merge: 0d2001f 84feca4
Author: Jeremy Kemper 
Date:   2012-05-02 06:17:56 -0700

    Merge pull request #6116 from romanvbabenko/refactor/executable_rakefiles
    
    Rakefile executable attributes and shebang lines has been removed

commit 0d2001f	refs/heads/master
Merge: 1675c80 02f2e3d
Author: José Valim 
Date:   2012-05-02 06:09:33 -0700

    Merge pull request #6121 from bogdan/routes
    
    ActionPack routes: remove some useless code.

commit 02f2e3d	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-05-02 16:04:27 +0300

    ActionPack routes: remove some useless code.

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 1675c80	refs/heads/master
Merge: a03da41 1cfa34f
Author: José Valim 
Date:   2012-05-02 05:13:20 -0700

    Merge pull request #6120 from arunagw/build_fix_master_railties
    
    Fix build for railties generators

commit 1cfa34f	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-02 17:31:29 +0530

    Fix build for railties generators

M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit a03da41	refs/heads/master
Merge: 07438f9 1206e88
Author: José Valim 
Date:   2012-05-02 04:03:38 -0700

    Merge pull request #6118 from arunagw/build_fix_master
    
    build fix for SharedGeneratorTests

commit 1206e88	refs/heads/master
Author: Arun Agrawal 
Date:   2012-05-02 16:27:22 +0530

    build fix for SharedGeneratorTests

M	railties/test/generators/shared_generator_tests.rb

commit e17cc4d	refs/heads/master
Author: Roman V. Babenko 
Date:   2012-05-02 13:56:13 +0300

    Gem cont presence checking has been removed

M	railties/lib/rails/backtrace_cleaner.rb
M	railties/test/backtrace_cleaner_test.rb

commit 31500f7	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-02 13:44:08 +0300

    Typo

M	guides/source/getting_started.textile

commit 84feca4	refs/heads/master
Author: Roman V. Babenko 
Date:   2012-05-02 13:36:16 +0300

    Rakefile executable attributes and shebang lines has been removed

M	Rakefile
M	actionmailer/Rakefile
M	actionpack/Rakefile
M	activemodel/Rakefile
M	activerecord/Rakefile
M	activesupport/Rakefile
M	railties/Rakefile
M	railties/lib/rails/generators/rails/app/templates/Rakefile
M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile

commit b739464	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-02 12:34:35 +0200

    Mention mac os x installation tools on getting started guide

M	guides/source/getting_started.textile

commit 07438f9	refs/heads/master
Merge: 3b6a353 18aa1ae
Author: José Valim 
Date:   2012-05-02 03:16:04 -0700

    Merge pull request #6040 from Paymium/issue-6033
    
    BigDecimal string wrapping in JSON serialization can now be opted-out

commit 3b6a353	refs/heads/master
Merge: cf9f284 ce5c2b8
Author: José Valim 
Date:   2012-05-02 03:14:24 -0700

    Merge pull request #5962 from bogdan/routes
    
    Remove tests for undocumented private methods

commit cf9f284	refs/heads/master
Merge: c0a7038 5eb32af
Author: José Valim 
Date:   2012-05-02 03:07:49 -0700

    Merge pull request #6111 from oscardelben/new_hash_syntax_in_gemfile
    
    Use new hash syntax in generated Gemfile

commit c55ee77	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-02 11:39:36 +0200

    Remove tags from getting started guide and adapt some of the content to
    the new guide

M	guides/code/getting_started/app/controllers/comments_controller.rb
M	guides/code/getting_started/app/controllers/posts_controller.rb
M	guides/source/getting_started.textile

commit 323d2c4	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-02 11:13:20 +0200

    Rewrite refactoring section in getting started guide

M	guides/code/getting_started/app/views/comments/_comment.html.erb
M	guides/code/getting_started/app/views/comments/_form.html.erb
M	guides/code/getting_started/app/views/posts/show.html.erb
M	guides/source/getting_started.textile

commit 47ec492	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-02 10:42:59 +0200

    Rewrite comments action in getting started guide

A	guides/assets/images/getting_started/post_with_comments.png
M	guides/code/getting_started/app/views/posts/show.html.erb
M	guides/source/getting_started.textile

commit a411e88	refs/heads/master
Author: Ayrton De Craene 
Date:   2012-05-02 11:49:43 +0300

    Changed code examples to have a consistent code styling [ci skip]

M	guides/source/layouts_and_rendering.textile

commit 5eb32af	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-02 10:21:02 +0200

    Use new hash syntax in generated Gemfile

M	railties/lib/rails/generators/app_base.rb

commit 85f71c5	refs/heads/master
Author: Michael Pearson 
Date:   2012-05-02 17:42:33 +1000

    Add note about image_tag('') issue in Asset Pipeline guide (see rails issue #3080)

M	guides/source/asset_pipeline.textile

commit ce5c2b8	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-05-02 10:41:34 +0300

    ActionPack: remove tests for hash_for_* methods

M	actionpack/test/controller/routing_test.rb

commit 6d6907e	refs/heads/master
Author: Edgars Beigarts 
Date:   2011-11-21 10:30:07 +0200

    Refactored remove_column

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/migration_test.rb

commit b214ddd	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-02 09:28:43 +0400

    Fix example url in text helper

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 7b9faf7	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-05-02 09:20:50 +0400

    Fix form tag with non GET/POST method example

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 18aa1ae	refs/heads/master
Author: David FRANCOIS 
Date:   2012-04-28 23:44:51 +0200

    BigDecimal string wrapping in JSON serialization can now be opted-out, fixes #6033

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/json/encoding_test.rb

commit 5d685f9	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-27 11:28:53 +0400

    Add Rails::DBConsole tests

M	railties/lib/rails/commands/dbconsole.rb
A	railties/test/commands/dbconsole_test.rb

commit c0a7038	refs/heads/master
Merge: a06a84b a6c4160
Author: Santiago Pastorino 
Date:   2012-05-01 19:34:29 -0700

    Merge pull request #6109 from carlosantoniodasilva/fix-build
    
    Build fix for plugin new generator change

commit a6c4160	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-05-01 23:29:56 -0300

    Build fix for plugin new generator change
    
    Related to a06a84bf77082a7435973fa1b6c8254fb410f243

M	railties/test/generators/plugin_new_generator_test.rb

commit a06a84b	refs/heads/master
Merge: ed10107 3def2d6
Author: Santiago Pastorino 
Date:   2012-05-01 18:45:36 -0700

    Merge pull request #4345 from sunaku/patch-1
    
    gemspec assumes that user kept all generated files

commit ed10107	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-01 16:25:03 -0700

    Fix tests

M	railties/test/generators/shared_generator_tests.rb

commit 17f2958	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-05-01 13:01:29 -0700

    Use :github option in Gemfile and make hashes consistent

M	Gemfile
M	railties/lib/rails/generators/app_base.rb

commit e1724b5	refs/heads/master
Author: Rodrigo Pavano 
Date:   2012-05-01 19:18:53 -0300

    Documentation fix in options_for_select helper. Fixed display errors caused by mixing Ruby and HTML code inside the same pre tag [ci skip]

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit c35fd3d	refs/heads/master
Merge: 0ddec98 9ebfd63
Author: José Valim 
Date:   2012-05-01 13:09:03 -0700

    Merge pull request #6102 from rodrei/remove_unused_vars
    
    Removing unused local vars in Queue tests

commit 0ddec98	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-02 01:29:46 +0530

    copy-edit guide [ci skip]

M	guides/source/command_line.textile

commit eb3bfe2	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-02 01:10:59 +0530

    remove unused pguides rake task from railties

M	railties/Rakefile

commit ec94d84	refs/heads/master
Merge: 7d2df5f d538778
Author: Piotr Sarnacki 
Date:   2012-05-01 12:34:45 -0700

    Merge pull request #6096 from hasclass/as_json__encode_infinite_and_nan_bigdecimals_as_null
    
    JSON: encode BigDecimal NaN/Infinity as null.

commit 3305256	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-01 21:19:58 +0200

    Add empty rows to improve readability. [ci skip]

M	activerecord/lib/active_record/aggregations.rb

commit 7d2df5f	refs/heads/master
Merge: b2a24a1 2f68125
Author: Aaron Patterson 
Date:   2012-05-01 12:12:07 -0700

    Merge pull request #6089 from frodsan/delete_all_limit
    
    delete_all raise an error if a limit is provided - fixes #4979

commit 9ebfd63	refs/heads/master
Author: Rodrigo Pavano 
Date:   2012-05-01 15:54:15 -0300

    Removing unused local vars in Queue tests

M	railties/test/application/queue_test.rb

commit d752eab	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-01 20:52:41 +0200

    Add few lines to describe how aggregation part caching works. [ci skip]

M	activerecord/lib/active_record/aggregations.rb

commit b2a24a1	refs/heads/master
Merge: 5722915 13823a4
Author: Aaron Patterson 
Date:   2012-05-01 10:41:45 -0700

    Merge pull request #6092 from jsanders/issue_4001_error_typecasting_non_integer_castable
    
    Don't type cast values that don't respond to to_i to 1

commit 068e8b2	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-05-01 18:25:37 +0200

    simpler wording and explanations

M	activerecord/lib/active_record/aggregations.rb
M	activerecord/lib/active_record/associations.rb

commit 60aee4e	refs/heads/master
Author: Ben Pickles 
Date:   2012-05-01 16:38:35 +0200

    Lowercase.

M	activerecord/lib/active_record/relation/calculations.rb

commit ffd3289	refs/tags/v3.1.6
Author: Vijay Dev 
Date:   2012-05-01 19:42:19 +0530

    fix grammar in deprecation message [ci skip]

M	activerecord/lib/active_record/base.rb

commit 5722915	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-01 19:27:36 +0530

    changelog fixes. Closes #3911

M	activerecord/CHANGELOG.md

commit 0c9e7b6	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-01 19:18:47 +0530

    more edits [ci skip]

M	activerecord/lib/active_record/base.rb
M	activesupport/lib/active_support/values/time_zone.rb

commit 4ceac1a	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-01 19:14:42 +0530

    copy edit AS deprecation/behaviours docs [ci skip]

M	activesupport/lib/active_support/deprecation/behaviors.rb

commit 42ff22f	refs/heads/master
Merge: 3cc6995 339602b
Author: Vijay Dev 
Date:   2012-05-01 19:06:03 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 339602b	refs/heads/master
Author: Vijay Dev 
Date:   2012-05-01 18:54:24 +0530

    Revert "Added Short 1 line note about connection pools. 
"
    
    This reverts commit c3954baee92446219606621c1b185360553a6d5d.

M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

commit bb52fb0	refs/heads/master
Merge: 6e8f2be 073043f
Author: Vijay Dev 
Date:   2012-05-01 05:04:00 -0700

    Merge pull request #95 from RobZolkos/add_doc_for_utc_offset
    
    Add documention for utc_offset method

commit 6e8f2be	refs/heads/master
Author: Edward Tsech 
Date:   2012-05-01 13:52:21 +0200

    Add line which gives a little bit more information how *_will_change! works.

M	activemodel/lib/active_model/dirty.rb

commit 073043f	refs/heads/master
Author: Rob Zolkos 
Date:   2012-05-01 21:16:56 +1000

    Add documention for utc_offset method

M	activesupport/lib/active_support/values/time_zone.rb

commit b8d2fec	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-01 13:08:10 +0300

    Bump Rails version in action mailer guide.

M	guides/source/action_mailer_basics.textile

commit 580e767	refs/tags/v3.2.5
Author: Dmitry Vorotilin 
Date:   2012-05-01 13:26:04 +0400

    Added test for assets:precompile for index files

M	railties/test/application/assets_test.rb

commit 87ac6a2	refs/heads/master
Merge: 2a15598 dda6fa8
Author: Oscar Del Ben 
Date:   2012-05-01 10:58:31 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 2a15598	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-05-01 10:58:16 +0200

    Getting Started Guide Code Cleanup

D	guides/code/getting_started/test/fixtures/tags.yml
M	guides/source/getting_started.textile

commit d538778	refs/heads/master
Author: Sebi Burkhard 
Date:   2012-05-01 11:28:46 +0700

    JSON: encode BigDecimal NaN/Infinity as null.

M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/json/encoding_test.rb

commit 3cc6995	refs/heads/master
Merge: cb5b0cf 7b53d13
Author: Piotr Sarnacki 
Date:   2012-04-30 21:06:22 -0700

    Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_floats_as_null
    
    JSON: Encode infinite or NaN floats as `null` to generate valid JSON.

commit cb5b0cf	refs/heads/master
Merge: 206b43a dc74f0c
Author: Jeremy Kemper 
Date:   2012-04-30 19:18:10 -0700

    Merge pull request #6093 from marcandre/observer_public
    
    notify_observers should be public

commit dc74f0c	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-04-30 14:20:42 -0400

    notify_observers should be public

M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observing_test.rb

commit dda6fa8	refs/heads/master
Author: Erich Menge 
Date:   2012-04-30 20:17:10 -0500

    Minor English fix.

M	activesupport/lib/active_support/core_ext/hash/slice.rb

commit df84577	refs/tags/v3.2.5
Author: Dmitry Vorotilin 
Date:   2012-05-01 03:53:13 +0400

    Fix #3993 assets:precompile task does not detect index files

M	actionpack/lib/sprockets/static_compiler.rb

commit 206b43a	refs/heads/master
Merge: d7d3799 24c068d
Author: Aaron Patterson 
Date:   2012-04-30 16:43:22 -0700

    Merge pull request #6063 from marcandre/observer_extra_args
    
    Allow extra arguments for Observers

commit d7d3799	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-30 15:56:14 -0700

    remove useless assertions

M	activerecord/test/cases/base_test.rb

commit de6a067	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-30 15:55:50 -0700

    return value of block is returned

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/base_test.rb

commit f0182d5	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-30 15:51:09 -0700

    only yield to finder block if something is found

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/base_test.rb

commit 24c068d	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-04-29 16:30:54 -0400

    Allow extra arguments for Observers

M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observing_test.rb

commit 838101a	refs/heads/master
Author: Andrew White 
Date:   2012-04-30 22:15:29 +0100

    Fix PR #6091
    
    1. ActiveRecord::Base is not ActiveRecord::Relation
    2. The order of records from an SQL query is uncertain without an ORDER clause
    3. Run your own tests when submitting a pull request

M	activerecord/lib/active_record/querying.rb
M	activerecord/test/cases/calculations_test.rb

commit e74e479	refs/tags/v3.0.14
Author: Andrew White 
Date:   2012-04-30 21:52:39 +0100

    Lock mocha gem to fix the build
    
    New versions of mocha don't allow nil.stubs

M	Gemfile

commit b7ec875	refs/heads/master
Merge: 69c2307 297359b
Author: Jeremy Kemper 
Date:   2012-04-30 12:35:32 -0700

    Merge pull request #5181 from mcmire/issue_3560
    
    Handle distance_of_time_in_words boundary conditions. Fixes #3560.

commit 13823a4	refs/heads/master
Author: James Sanders & Jason Noble 
Date:   2012-04-30 11:37:31 -0600

    Don't type cast values that don't respond to to_i to 1

M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/test/cases/column_test.rb

commit 297359b	refs/heads/master
Author: Elliot Winkler 
Date:   2012-02-25 16:23:31 -0700

    distance_of_time_in_words: Add/tweak comments to understand time intervals better

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit d2f995e	refs/heads/master
Author: Elliot Winkler 
Date:   2012-02-25 16:55:30 -0700

    distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 69c2307	refs/heads/master
Merge: c435feb 9307616
Author: Yehuda Katz 
Date:   2012-04-30 10:09:26 -0700

    Merge pull request #6091 from twinturbo/add-ids
    
    Add ActiveRecord::Base#ids - Close #5812

commit 9307616	refs/heads/master
Author: twinturbo 
Date:   2012-04-30 09:45:00 -0700

    Add ActiveRecord::Base#ids

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 51582fe	refs/tags/v3.0.14
Merge: f47a303 389d1c5
Author: Yehuda Katz 
Date:   2012-04-30 09:16:25 -0700

    Merge pull request #5044 from dracco/3-0-stable
    
    Backport Bugfix: Stack Overflow (3-0-stable)

commit c435feb	refs/heads/master
Merge: 7d5146e 324201d
Author: Jeremy Kemper 
Date:   2012-04-30 09:00:48 -0700

    Merge pull request #5175 from jasonnoble/rake_notes_directories
    
    Custom directories for rake notes

commit 2f68125	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-04-30 10:49:20 -0500

    delete_all raise an error if a limit is provided - fixes #4979

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 324201d	refs/heads/master
Author: Jason Noble 
Date:   2012-04-30 09:16:29 -0600

    Remove empty lines.

M	railties/test/application/rake/notes_test.rb

commit c3954ba	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-04-30 19:29:40 +0530

    Added Short 1 line note about connection pools.
    
    I hope its okay to add this here. if not, then please revert back.

M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

commit 7731231	refs/heads/master
Author: Jason Noble 
Date:   2012-04-30 07:51:23 -0600

    Fixed styling issues brought up by @jeremy

M	railties/lib/rails/source_annotation_extractor.rb
M	railties/test/application/rake/notes_test.rb

commit 37e4e9b	refs/heads/master
Author: Jason Noble 
Date:   2012-04-29 23:18:27 -0600

    Add documentation to command_line.textile explaining how to use additional notes directories

M	guides/source/command_line.textile

commit e053b41	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2012-02-25 14:01:40 -0700

    Add ability to specify custom annotation directories
    
    SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes
    
       Searches app, config, lib, script, test (default)
       Also searches dir1, dir2
    
    References: #4536, #4540

M	railties/lib/rails/source_annotation_extractor.rb
M	railties/test/application/rake/notes_test.rb

commit b5472cf	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2012-02-25 13:56:52 -0700

    Add test coverage for rake notes
    
    Add separate tests to verify directories covered
    Add tests to verify file_types

M	railties/test/application/rake/notes_test.rb

commit 7d5146e	refs/heads/master
Merge: bca9a9e 16df67b
Author: Jeremy Kemper 
Date:   2012-04-30 06:47:07 -0700

    Merge pull request #5705 from lest/patch-3
    
    split CDATA end token in cdata_section helper

commit bca9a9e	refs/heads/master
Merge: 09de707 4121938
Author: José Valim 
Date:   2012-04-30 06:28:22 -0700

    Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores
    
    Support cookie jar options for all cookie stores

commit 09de707	refs/heads/master
Merge: 6be5999 2d18dd3
Author: José Valim 
Date:   2012-04-30 06:27:01 -0700

    Merge pull request #6082 from brainopia/smarter_cookie_jar
    
    Stream cookies only if needed

commit 6be5999	refs/heads/master
Merge: 0274112 8dba9f1
Author: José Valim 
Date:   2012-04-30 06:19:37 -0700

    Merge pull request #6083 from brainopia/remove_unused_closed_ivars
    
    Remove a couple of unused ivars left from previous refactoring

commit 16df67b	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-30 16:08:06 +0300

    split CDATA end token in cdata_section helper

M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/tag_helper_test.rb

commit 0274112	refs/heads/master
Merge: 63c00ba 57d9f8b
Author: José Valim 
Date:   2012-04-30 06:05:08 -0700

    Merge pull request #3726 from JanDupal/fix-date-helper-hidden
    
    fix Helpers::DateHelper with :use_hidden - hide separators

commit 2d18dd3	refs/heads/master
Author: brainopia 
Date:   2012-04-30 16:55:06 +0400

    Dont stream back cookie value if it was set to the same value

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit ff2667d	refs/heads/master
Author: brainopia 
Date:   2012-04-30 16:32:53 +0400

    Dont set cookie header for deletion of unexisting data

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit dbe5162	refs/heads/master
Author: brainopia 
Date:   2012-04-30 15:50:54 +0400

    Simplify matching with array of possible domains

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 312ee86	refs/heads/master
Author: brainopia 
Date:   2012-04-30 15:42:25 +0400

    Use more appropriate one-liner for class declaration

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 7b0c45d	refs/tags/v3.1.6
Author: Dave Gerton 
Date:   2012-04-13 13:02:40 -1000

    Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.
    
    Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011
    switching from UTC-11 to UTC+13. American Samoa did not make the change and
    remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and
    documentation about the dateline change is in austalasia at IANA.
    
    (cherry picked from commit 5fe88b11f11bb3b30bc23c57b36be4f027d915ba)

M	activesupport/lib/active_support/values/time_zone.rb

commit 5fe88b1	refs/tags/v3.2.5
Author: Dave Gerton 
Date:   2012-04-13 13:02:40 -1000

    Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.
    
    Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011
    switching from UTC-11 to UTC+13. American Samoa did not make the change and
    remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and
    documentation about the dateline change is in austalasia at IANA.
    
    (cherry picked from commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22)

M	activesupport/lib/active_support/values/time_zone.rb

commit 63c00ba	refs/heads/master
Merge: 8196a8d 1d08ce5
Author: Andrew White 
Date:   2012-04-30 05:49:03 -0700

    Merge pull request #5838 from IamNaN/patch-1
    
    Incorporating Pacific Island zone changes circa Dec 31 2011

commit 620cc9a	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-04-30 14:46:30 +0200

    add ActiveRecord::RecordInvalid to exceptions
    sort the exception names alphabetically

M	activerecord/lib/active_record/base.rb

commit 8196a8d	refs/heads/master
Merge: 0501a07 0141442
Author: Xavier Noria 
Date:   2012-04-30 05:12:47 -0700

    Merge pull request #6080 from carlosantoniodasilva/as-changelog-update
    
    Improve changelog of new :silence deprecation behavior

commit 0141442	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-30 09:11:11 -0300

    Improve changelog of new :silence deprecation behavior

M	activesupport/CHANGELOG.md

commit 0501a07	refs/heads/master
Merge: 81f6d7f 7f24807
Author: José Valim 
Date:   2012-04-30 03:04:22 -0700

    Merge pull request #6079 from arunagw/build_fix_master_observing_test
    
    build fix for observing_test.rb

commit 7f24807	refs/heads/master
Author: Arun Agrawal 
Date:   2012-04-30 15:25:02 +0530

    build fix for observing_test.rb
    
    introduced here 17c990b153f8635874c006a7460ee95817543fc1

M	activemodel/test/cases/observing_test.rb

commit 4eb482e	refs/heads/master
Merge: 06a1519 14cd5aa
Author: Oscar Del Ben 
Date:   2012-04-30 11:28:15 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 14cd5aa	refs/heads/master
Author: Brian Cardarella 
Date:   2012-04-30 03:58:39 -0400

    Rails 4.0 upgrade note for the ConfirmationValidator change

M	guides/source/upgrading_ruby_on_rails.textile

commit 81f6d7f	refs/heads/master
Merge: 64a54c3 4a2d53a
Author: José Valim 
Date:   2012-04-30 00:38:57 -0700

    Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_words_helper
    
    Replace boolean argument with an options hash.

commit 64a54c3	refs/heads/master
Merge: aa89bf7 5c1109a
Author: José Valim 
Date:   2012-04-30 00:26:45 -0700

    Merge pull request #5530 from malclocke/add_option_to_skip_index.html_on_rails_generate
    
    Added a generator option to skip the public/index.html file

commit 4a2d53a	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2012-04-30 10:11:34 +0300

    Replace boolean argument with an options hash.
    
    This replaces `include_seconds` argument with an option key
    `include_seconds => true` in options hash.
    
    Also `time_ago_in_words` now passes options hash, including a `locale`
    key, which makes in compatible with `distance_of_time_in_words`.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_i18n_test.rb
M	actionpack/test/template/date_helper_test.rb
M	guides/source/action_view_overview.textile

commit aa89bf7	refs/heads/master
Merge: c9cbc17 cbb264e
Author: José Valim 
Date:   2012-04-30 00:21:54 -0700

    Merge pull request #6078 from lest/patch-4
    
    allow send_file/send_data to skip disposition header, closes #2973

commit e23e684	refs/tags/v3.1.6
Author: Piotr Sarnacki 
Date:   2012-04-29 23:36:39 -0700

    Failing test for #6034

M	railties/test/application/middleware/session_test.rb

commit d625a7a	refs/tags/v3.1.6
Author: Will Bryant 
Date:   2012-01-24 00:10:13 +1300

    fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 2b2983d	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-04-29 23:36:39 -0700

    Failing test for #6034

M	railties/test/application/middleware/session_test.rb

commit e3069c6	refs/tags/v3.2.5
Author: Will Bryant 
Date:   2012-01-24 00:10:13 +1300

    fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb

commit c9cbc17	refs/heads/master
Author: José Valim 
Date:   2012-04-30 10:17:01 +0300

    Update activesupport/CHANGELOG.md

M	activesupport/CHANGELOG.md

commit e2b9709	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-29 23:36:39 -0700

    Failing test for #6034

M	railties/test/application/middleware/session_test.rb

commit 88b5f94	refs/heads/master
Merge: 4cff1a2 5638adf
Author: Piotr Sarnacki 
Date:   2012-04-30 00:16:10 -0700

    Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every_request_master
    
    Fix the Flash middleware loading the session on every request

commit 4cff1a2	refs/heads/master
Merge: 66c5ac3 17c990b
Author: Santiago Pastorino 
Date:   2012-04-30 00:15:51 -0700

    Merge pull request #6072 from marcandre/observer_simplify_test
    
    Observer: simplify tests

commit cbb264e	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-30 10:15:41 +0300

    no need to dup options in send_data
    
    options aren't modified inside send_file_headers!

M	actionpack/lib/action_controller/metal/data_streaming.rb

commit 66c5ac3	refs/heads/master
Merge: 976b170 16e7f2f
Author: José Valim 
Date:   2012-04-30 00:13:40 -0700

    Merge pull request #5177 from cap10morgan/fix-gh-issue-4374
    
    fix inflector bug where -ice gets singularized into -ouse

commit 9f64f20	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-30 10:12:55 +0300

    allow send_file/send_data to skip disposition header, closes #2973

M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/test/controller/send_file_test.rb

commit 06a1519	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-30 09:08:32 +0200

    Rewrite adding a second model section of Getting Started Guide

M	guides/code/getting_started/app/views/posts/_form.html.erb
M	guides/code/getting_started/app/views/posts/show.html.erb
M	guides/code/getting_started/config/routes.rb
M	guides/source/getting_started.textile

commit 976b170	refs/heads/master
Merge: 2162d16 f56d4de
Author: José Valim 
Date:   2012-04-30 00:01:03 -0700

    Merge pull request #6076 from arunagw/build_fix_observed_classes
    
    Build fix for observed_classes

commit 2162d16	refs/heads/master
Merge: 24f1437 c9f528d
Author: José Valim 
Date:   2012-04-30 00:00:17 -0700

    Merge pull request #6032 from lest/patch-2
    
    wrap translate defaults to use translate helper features

commit c9f528d	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-30 09:44:39 +0300

    wrap translate defaults to use translate helper features, closes #1102

M	actionpack/lib/action_view/helpers/translation_helper.rb
A	actionpack/test/fixtures/translations/templates/default.erb
M	actionpack/test/template/translation_helper_test.rb

commit a72fe84	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-04-30 06:37:19 +0100

    Add note about using 303 See Other for XHR requests other than GET/POST
    
    IE since version 6 and recently Chrome and Firefox have started following
    302 redirects from XHR requests other than GET/POST using the original request
    method. This can lead to DELETE requests being redirected amongst other things.
    
    Although it doesn't directly affect the Rails framework since it doesn't return
    a 302 redirect to any non-GET/POST request a note has been added to raise
    awareness of the issue. Some references:
    
    Original article from @technoweenie:
    http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/
    
    Hacker News discussion of the article:
    http://news.ycombinator.com/item?id=2903493
    
    WebKit bug report:
    https://bugs.webkit.org/show_bug.cgi?id=46183
    
    Firefox bug report and changeset:
    https://bugzilla.mozilla.org/show_bug.cgi?id=598304
    https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d
    
    Chrome bug report:
    http://code.google.com/p/chromium/issues/detail?id=56373
    
    HTTPbis bug report and changeset:
    http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160
    http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428
    
    Roy T. Fielding's history of the issue:
    http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html
    
    Automated browser tests for the issue:
    http://www.mnot.net/javascript/xmlhttprequest/
    
    Fixes #4144
    (cherry picked from commit 24f143789a8989f3bccde14ff28067de25cafd87)

M	actionpack/lib/action_controller/metal/redirecting.rb

commit 24f1437	refs/heads/master
Author: Andrew White 
Date:   2012-04-30 06:37:19 +0100

    Add note about using 303 See Other for XHR requests other than GET/POST
    
    IE since version 6 and recently Chrome and Firefox have started following
    302 redirects from XHR requests other than GET/POST using the original request
    method. This can lead to DELETE requests being redirected amongst other things.
    
    Although it doesn't directly affect the Rails framework since it doesn't return
    a 302 redirect to any non-GET/POST request a note has been added to raise
    awareness of the issue. Some references:
    
    Original article from @technoweenie:
    http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/
    
    Hacker News discussion of the article:
    http://news.ycombinator.com/item?id=2903493
    
    WebKit bug report:
    https://bugs.webkit.org/show_bug.cgi?id=46183
    
    Firefox bug report and changeset:
    https://bugzilla.mozilla.org/show_bug.cgi?id=598304
    https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d
    
    Chrome bug report:
    http://code.google.com/p/chromium/issues/detail?id=56373
    
    HTTPbis bug report and changeset:
    http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160
    http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428
    
    Roy T. Fielding's history of the issue:
    http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html
    
    Automated browser tests for the issue:
    http://www.mnot.net/javascript/xmlhttprequest/
    
    Fixes #4144

M	actionpack/lib/action_controller/metal/redirecting.rb

commit bb6bd01	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-29 22:33:41 -0700

    Fix stray capitalization

M	guides/source/caching_with_rails.textile

commit f56d4de	refs/heads/master
Author: Arun Agrawal 
Date:   2012-04-30 11:03:25 +0530

    Build fix for observed_classes
    
    introduced here
    bad44e4f8f690039bd0db92ac25f10af536c6e71

M	activerecord/test/cases/lifecycle_test.rb

commit 5baab23	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-29 22:30:13 -0700

    Fix rdoc formatting in Mime::Type

M	actionpack/lib/action_dispatch/http/mime_type.rb

commit dafb4d6	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-29 22:11:40 -0700

    Reword polymorphic routes + mounted engine rdoc
    
    Also correctly indent its example code.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb

commit cb9f7f4	refs/heads/master
Merge: 363d7ee 3acdd65
Author: Jeremy Kemper 
Date:   2012-04-29 21:55:15 -0700

    Merge pull request #5923 from rafaelfranca/remove_javascript_helpers
    
    Remove button_to_function and link_to_function helpers

commit 3acdd65	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-21 14:20:57 -0300

    Remove `button_to_function` and `link_to_function` helpers

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit d445ddd	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-21 12:38:13 -0300

    Add missing require when helpers are used in isolation

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb

commit 8fec5d7	refs/tags/v3.2.5
Merge: 6cad407 3005f58
Author: Jeremy Kemper 
Date:   2012-04-29 21:45:05 -0700

    Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers
    
    Deprecate link_to_function and button_to_function

commit 3005f58	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-21 14:09:12 -0300

    Add release data to Rails 3.2.3

M	actionmailer/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md

commit 342b54a	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-21 14:07:06 -0300

    Add CHANGELOG entry.
    
    Closes #5886
    Closes #3093

M	actionpack/CHANGELOG.md

commit 9dc57fe	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-21 13:17:39 -0300

    Deprecate link_to_function and button_to_function helpers

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 6b8a3a0	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-21 12:38:13 -0300

    Add missing require when helpers are used in isolation

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb

commit 363d7ee	refs/heads/master
Merge: ed7ea66 d56f5c8
Author: Jeremy Kemper 
Date:   2012-04-29 21:27:09 -0700

    Merge pull request #6074 from mark-rushakoff/unused-variables
    
    Remove some unused variable assignments

commit ed7ea66	refs/heads/master
Merge: 0393c7c bca1458
Author: Jeremy Kemper 
Date:   2012-04-29 21:11:25 -0700

    Merge pull request #6075 from arunagw/warning_removed_unused_variable
    
    railties variable is not required here.

commit 0393c7c	refs/heads/master
Merge: f975a86 bad44e4
Author: Jeremy Kemper 
Date:   2012-04-29 21:10:15 -0700

    Merge pull request #6071 from marcandre/observer_redef
    
    Fix Observer by acting on singleton class. Fixes #3505.

commit bca1458	refs/heads/master
Author: Arun Agrawal 
Date:   2012-04-30 09:09:36 +0530

    railties variable is not required here.

M	railties/test/railties/engine_test.rb

commit 17c990b	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-04-29 22:02:02 -0400

    Observer: simplify tests

M	activemodel/test/cases/observing_test.rb

commit bad44e4	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-04-29 21:50:48 -0400

    Fix Observer by acting on singleton class [#3505]
    Also [issue #1034] [pull #6068]

M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observing_test.rb

commit 8dba9f1	refs/heads/master
Author: brainopia 
Date:   2012-04-30 04:38:35 +0400

    Remove unused ivars left from close checks
    
    These ivars were missed in d142572567 when close checks were removed

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 4121938	refs/heads/master
Author: brainopia 
Date:   2012-04-30 04:14:51 +0400

    Support cookie jar options for all cookie stores

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/test/activerecord/active_record_store_test.rb

commit f975a86	refs/heads/master
Merge: 55fefdb 4433b1a
Author: Aaron Patterson 
Date:   2012-04-29 16:29:33 -0700

    Merge pull request #5942 from bcardarella/confirmation_error_message_on_confirmation_attribute
    
    confirmation validation error attribute

commit 55fefdb	refs/heads/master
Merge: a89827e c6e0bc6
Author: Aaron Patterson 
Date:   2012-04-29 16:22:54 -0700

    Merge pull request #6067 from Locke23rus/patch-2
    
    Fix typo

commit a89827e	refs/heads/master
Merge: 3de6a75 764f69e
Author: Jeremy Kemper 
Date:   2012-04-29 16:04:10 -0700

    Merge pull request #5999 from bogdan/callbacks
    
    AS::Callbacks#run_callbacks optimized to reduce backtrace

commit c6e0bc6	refs/heads/master
Author: Kirill Nikitin 
Date:   2012-04-30 03:03:59 +0400

    Fix typo

M	activesupport/CHANGELOG.md

commit 3de6a75	refs/heads/master
Merge: 75df4c1 72a2edd
Author: Santiago Pastorino 
Date:   2012-04-29 15:49:02 -0700

    Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactor
    
    Remove some warnings and minor refactor in RoutesReloader

commit 75df4c1	refs/heads/master
Author: Andrew White 
Date:   2012-04-29 23:12:42 +0100

    Restore interpolation of path option in redirect routes

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit c19acab	refs/heads/master
Merge: f7ccfdc 569fb1f
Author: Aaron Patterson 
Date:   2012-04-29 14:56:19 -0700

    Merge pull request #6062 from marcandre/tweak_observer
    
    Tweak observer

commit 6cad407	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-04-29 22:51:04 +0100

    Restore interpolation of path option in redirect routes

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit f7ccfdc	refs/heads/master
Merge: 958daaa 1cf55e6
Author: Xavier Noria 
Date:   2012-04-29 14:48:32 -0700

    Merge pull request #6065 from Locke23rus/patch-1
    
    Remove repeated word

commit 1cf55e6	refs/heads/master
Author: Kirill Nikitin 
Date:   2012-04-30 01:45:06 +0400

    Remove repeated word

M	activesupport/CHANGELOG.md

commit 4075a39	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-04-29 22:41:00 +0100

    Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 78c181b	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-04-29 21:37:03 +0100

    Escape interpolated params when redirecting - fixes #5688

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit 60ebd00	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-29 22:23:53 +0200

    Remove scaffold explanation from getting started guide

M	guides/source/getting_started.textile

commit b608cdd	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-04-29 21:19:18 +0100

    Escape interpolated params when redirecting - fixes #5688

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit 958daaa	refs/heads/master
Author: Andrew White 
Date:   2012-04-29 21:09:49 +0100

    Escape interpolated params when redirecting - fixes #5688

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit 978598b	refs/heads/master
Merge: 1c7bcde dee375a
Author: Piotr Sarnacki 
Date:   2012-04-29 13:04:42 -0700

    Merge pull request #6061 from twinturbo/scaffold-markup
    
    Close #3886 - Add THEAD and TBODY to scaffold markup

commit dee375a	refs/heads/master
Author: twinturbo 
Date:   2012-04-29 12:48:20 -0700

    Close #3886 - Add THEAD and TBODY to scaffold markup

M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb

commit 1c7bcde	refs/heads/master
Author: Andrew White 
Date:   2012-04-29 20:18:22 +0100

    Add failing test case for #6053

M	actionpack/test/controller/test_case_test.rb

commit 529a3ee	refs/heads/master
Author: Michael Schuerig 
Date:   2012-04-29 18:30:57 +0200

    Fix controller_class_name for anonymous controllers.

M	actionpack/lib/action_controller/test_case.rb

commit d99affe	refs/heads/master
Merge: cca5361 a872ac9
Author: José Valim 
Date:   2012-04-29 11:57:09 -0700

    Merge pull request #6059 from rafaelfranca/check_box_inverted
    
    Change check_box to work inverting the checked and unchecked value

commit a872ac9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-29 15:44:34 -0300

    Change check_box to work inverting the checked and unchecked value
    
    This fixes:
    
    * Boolean with inverted logic
    * Integer with inverted logic
    * BigDecimal with inverted logic
    
    Fixes #3995

M	actionpack/lib/action_view/helpers/tags/check_box.rb
M	actionpack/test/template/form_helper_test.rb

commit cca5361	refs/heads/master
Merge: 7bb7f0c ab318d2
Author: José Valim 
Date:   2012-04-29 11:10:15 -0700

    Merge pull request #6006 from carlosantoniodasilva/partial-layout-collection-item
    
    Partial layout collection item

commit d56f5c8	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-29 10:33:35 -0700

    Remove unused assignments

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activesupport/lib/active_support/testing/performance/jruby.rb
M	railties/lib/rails/commands/runner.rb

commit 7bb7f0c	refs/heads/master
Merge: de6d94f c8eeb9f
Author: Jeremy Kemper 
Date:   2012-04-29 11:03:04 -0700

    Merge pull request #6017 from larzconwell/remove_sanitize_dom_id
    
    Removed the sanitize_dom_id method

commit f00ab1d	refs/tags/v3.1.6
Merge: 8af2fd8 94a5431
Author: Jeremy Kemper 
Date:   2012-04-29 11:01:35 -0700

    Merge pull request #6046 from arunagw/lock_mocha_to_fix_build
    
    Lock mocha to fix build

commit 331007f	refs/heads/master
Merge: 110f3f4 74f328f
Author: twinturbo 
Date:   2012-04-29 10:49:56 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit 110f3f4	refs/heads/master
Author: twinturbo 
Date:   2012-04-29 10:49:21 -0700

    Document ActiveSupport::Deprecations.behavior

M	activesupport/lib/active_support/deprecation/behaviors.rb

commit ab318d2	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-26 22:06:41 -0300

    Add changelog entry and some docs for collection + layout

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	guides/source/layouts_and_rendering.textile

commit 228f991	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-26 21:24:58 -0300

    Move layout logic with collection to be handled only with explicit template is given
    
    Layout is never an available option when rendering with the shortcut
    `render @collection`.

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 0568fb5	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-26 20:47:22 -0300

    Allow access to current object_counter variable from layout when rendering with partial + collection

M	actionpack/lib/action_view/renderer/partial_renderer.rb
A	actionpack/test/fixtures/test/_b_layout_for_partial_with_object_counter.html.erb
M	actionpack/test/template/render_test.rb

commit d0c9c93	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-26 20:36:35 -0300

    Allow layout to access current object being rendered when using render partial + object

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/render_test.rb

commit e72374d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-26 20:24:53 -0300

    Allow layout rendering to access current object being rendered when using partial + collection

M	actionpack/lib/action_view/renderer/partial_renderer.rb
A	actionpack/test/fixtures/test/_b_layout_for_partial_with_object.html.erb
M	actionpack/test/template/render_test.rb

commit 74f328f	refs/heads/master
Author: Kevin Richardson 
Date:   2012-04-29 13:42:33 -0400

    Fix 'Can't mass-assign protected attributes: tags_attributes' in Rails 3.2.3.

M	guides/source/getting_started.textile

commit de6d94f	refs/heads/master
Merge: 82029c7 c809c47
Author: José Valim 
Date:   2012-04-29 10:40:52 -0700

    Merge pull request #6057 from jeremyf/remove-deprecation-warning-due-to-reload
    
    Removed extraneous .present? check for AR::Base#reload

commit c809c47	refs/heads/master
Author: Jeremy Friesen 
Date:   2012-04-29 13:33:54 -0400

    Removed extraneous .present? check for AR::Base#reload

M	activerecord/lib/active_record/persistence.rb

commit 82029c7	refs/heads/master
Merge: 8c2cf1a d3ccdf6
Author: José Valim 
Date:   2012-04-29 10:13:56 -0700

    Merge pull request #6056 from jeremyf/remove-deprecation-warning-due-to-reload
    
    Removed deprecation warning for #find as a result of AR::Base#reload

commit d3ccdf6	refs/heads/master
Author: Jeremy Friesen 
Date:   2012-04-29 13:10:43 -0400

    Removed deprecation warning for #find as a result of AR::Base#reload
    
    Cleaned up "DEPRECATION WARNING: Passing options to #find is
    deprecated. Please build a scope and then call #find on it."

M	activerecord/lib/active_record/persistence.rb

commit 54683f3	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-29 10:09:28 -0700

    Remove unused assignment in actionpack date helper test

M	actionpack/test/template/date_helper_test.rb

commit 140b825	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-29 10:02:58 -0700

    Remove unused assignments from activerecord tests

M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activerecord/test/cases/persistence_test.rb

commit 0df261a	refs/tags/v3.2.5
Merge: d6bbd33 b18603b
Author: José Valim 
Date:   2012-04-29 09:42:53 -0700

    Merge pull request #6051 from rafaelfranca/fix_build
    
    Fix the build

commit 8c2cf1a	refs/heads/master
Merge: 6bea191 65df4c5
Author: José Valim 
Date:   2012-04-29 08:39:13 -0700

    Merge pull request #6047 from carlosantoniodasilva/changelog-jsonp-mimetype
    
    Add changelog entry for jsonp mimetype change, fix failing test

commit b18603b	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-29 12:33:15 -0300

    Remove warning of unused variable

M	actionpack/test/template/record_tag_helper_test.rb

commit a782aa5	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-29 12:32:08 -0300

    Fix the build.
    
    * The method for persisted records in 3-2-branch is 'PUT'
    * size is generated by default in inputs

M	actionpack/test/template/form_helper_test.rb

commit 65df4c5	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-29 11:55:35 -0300

    Add changelog entry for jsonp mimetype change, fix failing test
    
    Fix failing test: Mime::JS generates "text/javascript"

M	actionpack/CHANGELOG.md
M	actionpack/test/controller/render_json_test.rb

commit 94a5431	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-04-29 17:05:20 +0530

    mocha can be locked here as new version is failing
    
    nil.stubs is not allowed in new version of mocha

M	Gemfile

commit 6bea191	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-29 15:50:31 +0530

    Removed unclear doc in AR querying guide [ci skip]
    
    The range example used in array conditions is unclear and talks about
    the old 'conditions' option. Closes #4943.

M	guides/source/active_record_querying.textile

commit 0b019cc	refs/heads/master
Merge: 7a80b69 0765364
Author: José Valim 
Date:   2012-04-29 03:08:41 -0700

    Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separator
    
    Tests for regexp separator in String#truncate

commit 8af2fd8	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-04-29 10:13:59 +0100

    Don't convert params if the request isn't HTML - fixes #5341
    (cherry picked from commit d6bbd337ef1b96ed246bccaaf6e8b15a7077b9aa)

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit 0765364	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-29 13:42:40 +0400

    Tests for regexp separator in String#truncate
    https://github.com/rails/rails/commit/5a7513593f64e0ff7e4de1ee37bac5eeddfae270

M	activesupport/lib/active_support/core_ext/string/filters.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit d6bbd33	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-04-29 10:13:59 +0100

    Don't convert params if the request isn't HTML - fixes #5341
    (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f)
    
    Conflicts:
    
    	actionpack/test/controller/test_test.rb

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit 7a80b69	refs/heads/master
Author: Andrew White 
Date:   2012-04-29 10:13:59 +0100

    Don't convert params if the request isn't HTML - fixes #5341

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_case_test.rb

commit bf7b8cf	refs/heads/master
Author: Tony Jian 
Date:   2012-04-29 17:07:30 +0800

    Revert "Make non English title indexable (such as Chinese or Japanese) using MD5."
    
    This reverts commit 70e0edf000289b1907b8aee386daf23577f6bc08.

M	guides/rails_guides/indexer.rb

commit ffc861c	refs/heads/master
Merge: e73f547 34599c4
Author: José Valim 
Date:   2012-04-29 01:24:27 -0700

    Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silence
    
    Add a "silence" behavior to completely turn off deprecation warnings.

commit e73f547	refs/heads/master
Author: José Valim 
Date:   2012-04-29 11:16:13 +0300

    Avoid calling content type multiple times

M	actionpack/lib/action_controller/metal/renderers.rb

commit d4dd1af	refs/heads/master
Merge: e6ab0d5 b4e1903
Author: José Valim 
Date:   2012-04-29 01:13:39 -0700

    Merge pull request #2321 from omjokine/master
    
    JSONP should use mimetype application/javascript

commit 70e0edf	refs/heads/master
Author: Tony Jian 
Date:   2012-04-29 14:15:36 +0800

    Make non English title indexable (such as Chinese or Japanese) using MD5.

M	guides/rails_guides/indexer.rb

commit beba826	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-04-28 23:02:39 -0700

    Lazy load `default_form_builder` if it's passed as a string
    
    closes #3341

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb
M	railties/guides/source/configuring.textile

commit d7532c1	refs/heads/master
Merge: 2c136ae 6659252
Author: twinturbo 
Date:   2012-04-28 22:33:11 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit e6ab0d5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-07 19:29:17 +0200

    Lazy load `default_form_builder` if it's passed as a string
    
    closes #3341

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb
M	guides/source/configuring.textile

commit 2c136ae	refs/heads/master
Author: twinturbo 
Date:   2012-04-28 22:32:18 -0700

    Document exception handling inside resce_from handlers

M	activesupport/lib/active_support/rescuable.rb

commit 569fb1f	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-04-29 00:51:56 -0400

    Generate appropriate error more judiciously

M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observing_test.rb

commit 6659252	refs/heads/master
Author: Francesco Rodriguez 
Date:   2012-04-28 23:04:36 -0500

    fix typo in ActiveSupport::Inflector#titleize

M	activesupport/lib/active_support/inflector/methods.rb

commit 85c056c	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2012-04-28 23:20:42 -0400

    Fix error message:
    - can pass the class, not the instance
    - "instance method" is confusing, use "method :instance" instead

M	activemodel/lib/active_model/observing.rb

commit 1a4e27f	refs/heads/master
Merge: ad2c5ea 432a65f
Author: Jeremy Kemper 
Date:   2012-04-28 20:18:26 -0700

    Merge pull request #5996 from gazay/remove_excess_selfs
    
    Active Support housekeeping and polish

commit 432a65f	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-29 01:13:04 +0400

    String quotes and trailing spaces

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
M	activesupport/lib/active_support/core_ext/date/conversions.rb
M	activesupport/lib/active_support/core_ext/date_time/conversions.rb
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/file/atomic.rb
M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/lib/active_support/core_ext/hash/except.rb
M	activesupport/lib/active_support/core_ext/hash/keys.rb
M	activesupport/lib/active_support/core_ext/kernel/reporting.rb
M	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/lib/active_support/core_ext/module/qualified_const.rb
M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/lib/active_support/core_ext/object/inclusion.rb
M	activesupport/lib/active_support/core_ext/object/with_options.rb
M	activesupport/lib/active_support/core_ext/range/include_range.rb
M	activesupport/lib/active_support/core_ext/string/filters.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/core_ext/string/inquiry.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/core_ext/time/conversions.rb

commit f122051	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-29 01:12:08 +0400

    Indentation for private methods
    https://github.com/rails/rails/commit/e7d55f734aae204115d0a04a2db774ac364c1312

M	activesupport/lib/active_support/core_ext/class/attribute.rb
M	activesupport/lib/active_support/core_ext/class/delegating_attributes.rb

commit 9257224	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-29 01:10:58 +0400

    AS core_ext refactoring pt.2

M	activesupport/lib/active_support/core_ext/array/conversions.rb
M	activesupport/lib/active_support/core_ext/array/grouping.rb
M	activesupport/lib/active_support/core_ext/array/uniq_by.rb
M	activesupport/lib/active_support/core_ext/date_time/conversions.rb
M	activesupport/lib/active_support/core_ext/date_time/zones.rb
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/file/atomic.rb
M	activesupport/lib/active_support/core_ext/hash/diff.rb
M	activesupport/lib/active_support/core_ext/hash/keys.rb
M	activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
M	activesupport/lib/active_support/core_ext/hash/slice.rb
M	activesupport/lib/active_support/core_ext/kernel/reporting.rb
M	activesupport/lib/active_support/core_ext/module/aliasing.rb
M	activesupport/lib/active_support/core_ext/module/attr_internal.rb
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/lib/active_support/core_ext/module/introspection.rb
M	activesupport/lib/active_support/core_ext/module/qualified_const.rb
M	activesupport/lib/active_support/core_ext/string/access.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 1946d7b	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-26 17:20:36 +0400

    AS core_ext refactoring

M	activesupport/lib/active_support/core_ext/array/access.rb
M	activesupport/lib/active_support/core_ext/array/conversions.rb
M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/date/conversions.rb
M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/logger.rb
M	activesupport/lib/active_support/core_ext/object/inclusion.rb
M	activesupport/lib/active_support/core_ext/string/conversions.rb
M	activesupport/lib/active_support/core_ext/string/filters.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/conversions.rb
M	activesupport/lib/active_support/core_ext/time/zones.rb

commit 7dc83f7	refs/tags/v3.2.5
Author: tomhuda 
Date:   2012-04-28 15:55:58 -0700

    Allow Thor 0.15 and 1.0, to be released shortly

M	railties/railties.gemspec

commit ad2c5ea	refs/heads/master
Author: tomhuda 
Date:   2012-04-28 15:55:58 -0700

    Allow Thor 0.15 and 1.0, to be released shortly

M	railties/railties.gemspec

commit 1823d53	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-28 15:05:49 -0700

    Don't create new directory for tests

A	railties/test/engine_test.rb
D	railties/test/unit/engine_test.rb

commit 5a2fdaa	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-28 14:27:08 -0700

    Fix Engine#routes to not call draw_paths multiple times

M	railties/lib/rails/engine.rb
M	railties/test/unit/engine_test.rb

commit d9239fd	refs/heads/master
Author: Roman V. Babenko 
Date:   2012-04-06 18:19:03 +0300

    Engine#routes? method has been fixed

M	railties/lib/rails/engine.rb

commit 28844ae	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-28 14:26:33 -0700

    Add a failing test for #5764

A	railties/test/unit/engine_test.rb

commit 5c18bdc	refs/heads/master
Author: Andrew White 
Date:   2012-04-28 22:23:58 +0100

    Merge session arg with existing session instead of overwriting
    
    This may break existing tests that are asserting the whole session contents
    but should not break existing tests that are asserting individual keys - e.g:
    
    class SomeControllerTest < ActionController::TestCase
      setup do
        session['user_id'] = 1
      end
    
      test "some test" do
        get :some_action, nil, { 'another_var' => 2 }
    
        # This assertion will now fail
        assert_equal({ 'another_var' => 2 }, session)
    
        # This assertion will still pass
        assert_equal 2, session['another_var]
      end
    end
    
    Fixes #1529.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_case_test.rb

commit 34599c4	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-28 18:22:11 -0300

    Add test for default silence and stderr deprecation behaviors

M	activesupport/test/deprecation_test.rb

commit 86559be	refs/tags/v3.2.5
Merge: 434be0f 61d84e0
Author: Piotr Sarnacki 
Date:   2012-04-28 12:10:57 -0700

    Merge pull request #6038 from arunagw/warning_removed_3-2-stable
    
    Warning removed 3 2 stable

commit 61d84e0	refs/tags/v3.2.5
Author: Oscar Del Ben 
Date:   2012-04-21 10:50:38 +0200

    Remove circular require of time/zones

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit e4c48ff	refs/heads/master
Merge: 71cf6ef 5156110
Author: Aaron Patterson 
Date:   2012-04-28 09:49:54 -0700

    Merge pull request #6028 from sikachu/master-fix_plpgsql
    
    Create plpgsql language if not available

commit 9608395	refs/heads/master
Author: twinturbo 
Date:   2012-04-17 22:01:06 +0200

    Document #behavior= and update CHANGELOG

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/deprecation/behaviors.rb

commit 76cd1ca	refs/heads/master
Author: Adam Hawkins 
Date:   2012-04-15 16:21:06 +0300

    Add a "silence" behavior to completely turn off deprecation warnings.

M	activesupport/lib/active_support/deprecation/behaviors.rb

commit 71cf6ef	refs/heads/master
Merge: 9fc9e89 f48d83b
Author: José Valim 
Date:   2012-04-28 09:00:14 -0700

    Merge pull request #6035 from carlosantoniodasilva/amo-translation-refactor
    
    Refactor AMo::Translation, avoid changing options in human attr name

commit 72a2edd	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-28 12:57:39 -0300

    Refactor RoutesReloader a bit to avoid creating extra hash objects

M	railties/lib/rails/application/routes_reloader.rb

commit af024f4	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-28 12:46:04 -0300

    Remove Declarative module extending, it is already part of AS::TestCase
    
    Removes method redefined warning.

M	railties/test/isolation/abstract_unit.rb

commit 2dab86c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-28 12:40:50 -0300

    Define only writer method for queue, as reader is declared
    
    Remove deprecation warning of method redefined.

M	railties/lib/rails/application.rb
M	railties/test/application/routing_test.rb

commit f48d83b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-28 12:06:51 -0300

    Refactor human attribute name

M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb

commit cafe6a3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-28 11:23:29 -0300

    Do not modify options hash in human_attribute_name, remove reverse_merge

M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit c6dbaac	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-28 16:45:05 +0400

    Fix misptint
    
    Injected at dab6c3aa484778b44c1b3cd2b9c46363916295ff

M	guides/source/contributing_to_ruby_on_rails.textile

commit 770c241	refs/heads/master
Author: Uģis Ozols 
Date:   2012-04-28 13:31:53 +0300

    Remove unnecessary ).

M	guides/source/routing.textile

commit 4e69a15	refs/heads/master
Merge: 9434101 0297e8e
Author: Oscar Del Ben 
Date:   2012-04-28 11:45:15 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 9434101	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-28 11:44:50 +0200

    Add REST section to getting started guide

M	guides/code/getting_started/config/routes.rb
M	guides/source/getting_started.textile

commit 5638adf	refs/heads/master
Author: Will Bryant 
Date:   2012-01-24 00:10:13 +1300

    fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 0297e8e	refs/heads/master
Author: Matthias Schmidt 
Date:   2012-04-28 11:29:11 +0200

    Correct small consistency issue in AR querying guide

M	guides/source/active_record_querying.textile

commit 9fc9e89	refs/heads/master
Author: José Valim 
Date:   2012-04-28 09:26:23 +0200

    Use Rails::Queueing::Queue instead of Queue so people can build their own consumers around stdlib's Queue

M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/lib/rails/queueing.rb
M	railties/test/application/queue_test.rb
M	railties/test/queueing/threaded_consumer_test.rb

commit fc6b115	refs/heads/master
Merge: d0e1c69 709b748
Author: José Valim 
Date:   2012-04-28 00:17:18 -0700

    Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactor
    
    Refactor AMo::Errors

commit d0e1c69	refs/heads/master
Merge: dd5524a 9d1f6ed
Author: José Valim 
Date:   2012-04-28 00:15:44 -0700

    Merge pull request #6024 from carlosantoniodasilva/amo-dirty-refactor
    
    Improve AMo::Dirty *_will_change! method

commit dd5524a	refs/heads/master
Merge: 47a87fb 3aec521
Author: José Valim 
Date:   2012-04-28 00:12:51 -0700

    Merge pull request #6029 from aderyabin/fix_depr
    
    removed deprecation warnings

commit 72795d7	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-27 22:46:45 -0700

    Code-format references to config settings

M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/reloader.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie.rb
M	railties/lib/rails/railtie/configuration.rb

commit dab6c3a	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-28 09:30:30 +0400

    Update guides - run single test for AR testing

M	guides/source/contributing_to_ruby_on_rails.textile

commit 7e75dcb	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-28 09:17:10 +0400

    Update contributing guide - run single test

M	guides/source/contributing_to_ruby_on_rails.textile

commit ea6bcce	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-28 08:58:15 +0400

    Update AM example

M	actionmailer/README.rdoc

commit c13d36c	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-27 21:33:56 -0700

    More using x instead of +x+ when the latter renders improperly.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_dispatch/middleware/reloader.rb
M	activerecord/lib/active_record/explain.rb

commit 3aec521	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-28 10:55:11 +0700

    removed deprecation warnings

M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/locking_test.rb

commit 5156110	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-04-27 22:53:07 -0400

    Create plpgsql language if not available
    
    This should fix the problem in Travis CI server.
    (http://travis-ci.org/#!/rails/rails/jobs/1194988)

M	activerecord/test/schema/postgresql_specific_schema.rb

commit 47a87fb	refs/heads/master
Merge: 3e8d88f 6d8ec0b
Author: Santiago Pastorino 
Date:   2012-04-27 19:03:04 -0700

    Merge pull request #6026 from sikachu/master-fix_warning
    
    Add parentheses to hide Ruby warning

commit 6d8ec0b	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-04-27 20:37:30 -0400

    Add parentheses to hide Ruby warning

M	railties/test/queueing/threaded_consumer_test.rb

commit 709b748	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-27 21:02:51 -0300

    Refactor AMo::Errors
    
    * Use merge!, remove reverse_merge
    * Use case statement instead of is_a? checks

M	activemodel/lib/active_model/errors.rb

commit 9d1f6ed	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-27 20:44:08 -0300

    Return earlier if attribute already changed in *_will_change! methods
    
    Avoid obtaining the value and duplicating it when possible.

M	activemodel/lib/active_model/dirty.rb

commit 3e8d88f	refs/heads/master
Merge: d8c3ad7 ff4eba9
Author: Aaron Patterson 
Date:   2012-04-27 15:54:46 -0700

    Merge pull request #6023 from carlosantoniodasilva/fix-queue-test
    
    Fix failing test related to TestQueue

commit ff4eba9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-27 19:51:40 -0300

    Fix failing test, TestQueue#contents is not #jobs

M	railties/lib/rails/queueing.rb
M	railties/test/application/queue_test.rb

commit 434be0f	refs/tags/v3.2.5
Merge: 05bee99 7006e97
Author: Aaron Patterson 
Date:   2012-04-27 15:39:52 -0700

    Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport
    
    Do not mutate options hash

commit 7006e97	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-01-17 23:05:18 -0200

    Do not mutate options hash

M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	actionpack/test/template/record_tag_helper_test.rb

commit d8c3ad7	refs/heads/master
Merge: 3fc16a9 4531ba7
Author: José Valim 
Date:   2012-04-27 15:24:14 -0700

    Merge pull request #6021 from sikachu/log_exception
    
    Log the exception from the ThreadConsumer

commit 4531ba7	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-04-27 18:00:58 -0400

    Log the exception from the ThreadConsumer
    
    This will make sure you know when there's an exception occur.

M	railties/lib/rails/queueing.rb
M	railties/test/queueing/threaded_consumer_test.rb

commit 3fc16a9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-27 15:07:35 -0700

    ensure that draining the queue will raise exceptions

M	railties/test/queueing/test_queue_test.rb

commit 0c076c0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-27 14:58:04 -0700

    adding the `jobs` method to the test queue for getting a list of test
    jobs.

M	railties/lib/rails/queueing.rb
M	railties/test/queueing/test_queue_test.rb

commit 90e90d6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-27 14:27:47 -0700

    oops!

M	railties/test/queueing/test_queue_test.rb

commit 2187b5f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-27 14:26:26 -0700

    Extend stdlib queue for the test queue

M	railties/lib/rails/queueing.rb
M	railties/test/queueing/test_queue_test.rb

commit 673fe05	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-27 13:51:54 -0700

    do not depend on time

M	railties/test/queueing/test_queue_test.rb

commit 3ca7b13	refs/heads/master
Merge: 4dcaffb 804db94
Author: Aaron Patterson 
Date:   2012-04-27 13:49:45 -0700

    Merge pull request #6020 from 7even/test_queue_order
    
    Rails::Queueing::TestQueue run order

commit 804db94	refs/heads/master
Author: Vsevolod Romashov <7@7vn.ru>
Date:   2012-04-28 00:21:51 +0400

    clean up empty lines

M	railties/test/queueing/test_queue_test.rb

commit 9d630d4	refs/heads/master
Author: Vsevolod Romashov <7@7vn.ru>
Date:   2012-04-28 00:15:51 +0400

    fixes run order in Rails::Queueing::TestQueue

M	railties/lib/rails/queueing.rb
M	railties/test/queueing/test_queue_test.rb

commit 4dcaffb	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-28 01:37:52 +0530

    made a few changes and fixes in getting started guide [ci skip]

M	guides/source/getting_started.textile

commit 43af34c	refs/heads/master
Merge: 50b1399 fc3d15d
Author: Vijay Dev 
Date:   2012-04-28 00:56:17 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 50b1399	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-28 00:36:14 +0530

    update docs - disabling prepared statements is not connected to managing connections externally [ci skip]

M	guides/source/configuring.textile

commit cd50b60	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-27 09:51:11 -0700

    add a factory method for queue construction so that apps can have multiple queues

M	railties/lib/rails/application.rb
M	railties/test/application/configuration_test.rb

commit c8eeb9f	refs/heads/master
Author: Larz Conwell 
Date:   2012-04-27 12:25:21 -0400

    Removed the sanitize_dom_id method because HTML5 doctype let's us use anything except nothing and whitespace for id's

M	actionpack/lib/action_controller/record_identifier.rb

commit 05bee99	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-01-20 10:23:46 -0800

    Merge pull request #4528 from j-manu/log-tailer-fix
    
    Fix for log tailer when the log file doesn't exist.

M	railties/lib/rails/rack/log_tailer.rb

commit 8de4d71	refs/heads/master
Merge: 3981a68 cd6ddc8
Author: Aaron Patterson 
Date:   2012-04-27 08:50:07 -0700

    Merge pull request #5698 from dougcole/support_postgresql_partitioning
    
    Support postgresql partitioning by making INSERT RETURNING optional

commit 3981a68	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-27 14:17:28 +0100

    remove deprecated calls

M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 0a8aec2	refs/heads/master
Author: José Valim 
Date:   2012-04-27 14:58:51 +0200

    Revert "Merge pull request #5995 from kennyj/fix_5847-3"
    
    Active Record should be lazy loaded and this pull request
    forced Active Record to always be loaded after initialization.
    
    This reverts commit 8cd14c0bc9f9429f03d1181912355d2f48b98157, reversing
    changes made to 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2.

M	activerecord/lib/active_record/railtie.rb
M	railties/test/application/rake_test.rb

commit a6e47b2	refs/heads/master
Merge: 20ea8df 68aadbc
Author: Jon Leighton 
Date:   2012-04-27 05:58:26 -0700

    Merge pull request #5989 from arunagw/warning_removed_master_ap
    
    Shadowing variable warning removed

commit fc3d15d	refs/heads/master
Merge: f444760 39574aa
Author: Oscar Del Ben 
Date:   2012-04-27 14:21:16 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit f444760	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-27 14:21:02 +0200

    Add delete post section to Getting Started guide

A	guides/assets/images/getting_started/confirm_dialog.png
M	guides/code/getting_started/app/controllers/posts_controller.rb
M	guides/code/getting_started/app/views/posts/index.html.erb
M	guides/code/getting_started/config/routes.rb
M	guides/source/getting_started.textile

commit 20ea8df	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-27 13:11:13 +0100

    more deprecations manually fixed

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/finder_test.rb

commit 0ed05b0	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-27 12:37:21 +0100

    find and replace deprecated keys

M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/comment.rb

commit 61555a0	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-27 11:52:34 +0100

    allow AssociationProxy#scoped to take options so that API is the same as Base#scoped

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations_test.rb

commit df6f971	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-27 11:42:22 +0100

    %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other things

M	activerecord/lib/active_record/session_store.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/models/developer.rb
M	activerecord/test/models/post.rb

commit a57b784	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-27 10:30:52 +0100

    remove unnecessary test code

M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/topic.rb

commit 4ed6167	refs/heads/master
Merge: cf1a83c 7d1a42a
Author: Jon Leighton 
Date:   2012-04-27 10:30:03 +0100

    Merge branch 'master' of github.com:rails/rails

commit 39574aa	refs/heads/master
Author: Bernat Foj Capell 
Date:   2012-04-27 11:12:40 +0200

    find_by_sql actually triggers after_find

M	guides/source/active_record_validations_callbacks.textile

commit 7d1a42a	refs/heads/master
Merge: 602000b d42b60a
Author: Jon Leighton 
Date:   2012-04-27 02:10:14 -0700

    Merge pull request #6011 from aderyabin/nosqlite
    
    Remove old sqlite adapter

commit ff44c33	refs/heads/master
Author: Mark Rushakoff 
Date:   2012-04-27 00:25:22 -0700

    Fix it's -> its

M	actionmailer/lib/action_mailer/base.rb

commit 764f69e	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-04-27 10:12:47 +0300

    AS::Callbacks optimized to reduce call backtrace

M	activesupport/lib/active_support/callbacks.rb

commit 8cc4159	refs/heads/master
Author: Mark Rushakof 
Date:   2012-04-27 00:00:30 -0700

    Use Foo::Bar instead of +Foo::Bar+
    
    The latter doesn't render as code in HTML output.
    
    Regex used in Rubymine to locate the latter form:
    
        (\+)(:*\w+:(?::|\w)+)(\+)

M	actionmailer/lib/action_mailer/base.rb
M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_controller/metal/streaming.rb
M	activemodel/lib/active_model/serialization.rb
M	railties/lib/rails/configuration.rb
M	railties/lib/rails/paths.rb

commit d42b60a	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 13:31:37 +0700

    fix tests for SQLite3Adapter

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/helper.rb

commit dd05a49	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 13:29:58 +0700

    renamed class SQLiteColumn to SQLite3Column

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 3cc9b5f	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 13:23:39 +0700

    removed tail of old sqlite versions

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 1a3d4f7	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 13:19:44 +0700

    fix SQLite3Adapter doc

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit fc1bf36	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 13:14:22 +0700

    Upgrade sqlite3 version to 1.3.6

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 27dea76	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 13:09:12 +0700

    fix tests for sqlite3

M	activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb

commit 7572efc	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-27 13:08:55 +0700

    merged sqlite and sqlite3 adapters

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
D	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 602000b	refs/heads/master
Author: Yehuda Katz 
Date:   2012-04-26 21:43:12 -0700

    Missing git add :trollface:

A	railties/lib/rails/queueing.rb
A	railties/test/application/queue_test.rb
A	railties/test/queueing/test_queue_test.rb
A	railties/test/queueing/threaded_consumer_test.rb

commit adff4a7	refs/heads/master
Author: Yehuda Katz 
Date:   2012-04-26 21:38:08 -0700

    Initial queue implementation

M	railties/lib/rails.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
M	railties/test/isolation/abstract_unit.rb

commit 504e539	refs/heads/master
Author: Rory O’Kane 
Date:   2012-04-26 18:24:38 -0300

    Active Support Core Extensions guide: reworded "on one hand" and similar to "for one thing"

M	guides/source/active_support_core_extensions.textile

commit 770c809	refs/heads/master
Merge: 8b0489c 67e8004
Author: Jon Leighton 
Date:   2012-04-26 13:48:21 -0700

    Merge pull request #6004 from lest/patch-1
    
    remove calls to deprecated find(:first) in actionpack test suite

commit 67e8004	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-26 21:50:35 +0300

    remove calls to deprecated find(:first) in actionpack test suite

M	actionpack/test/activerecord/render_partial_with_record_identification_test.rb

commit 8bf97d1	refs/heads/master
Author: Jonathan Roes 
Date:   2012-04-26 15:47:48 -0300

    Minor typo.

M	guides/source/getting_started.textile

commit 8b0489c	refs/heads/master
Merge: 14d1e55 10f90bd
Author: Jeremy Kemper 
Date:   2012-04-26 11:41:25 -0700

    Merge pull request #6002 from lest/patch-1
    
    Tiny refactoring in NumberHelper and RecordTagHelper

commit 10f90bd	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-26 21:24:38 +0300

    refactor content_tag_for helper
    
    - do not use merge! just for 2 values
    - there is no need to check block arity

M	actionpack/lib/action_view/helpers/record_tag_helper.rb

commit 0f848dd	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-26 21:24:12 +0300

    use safe_join in number helper

M	actionpack/lib/action_view/helpers/number_helper.rb

commit cf1a83c	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 19:05:24 +0100

    don't need this test

M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 14d1e55	refs/heads/master
Merge: 75f03ec 7554e5c
Author: Jeremy Kemper 
Date:   2012-04-26 10:50:50 -0700

    Merge pull request #6001 from nashby/patch-2
    
    remove unnecessary else statement

commit 7554e5c	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-04-26 20:46:37 +0300

    remove unnecessary else statement

M	actionpack/lib/action_controller/test_case.rb

commit 75f03ec	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 18:32:55 +0100

    remove calls to find(:first), find(:last) and find(:all)

M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/migration/column_attributes_test.rb
M	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/validations/association_validation_test.rb

commit b309963	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 17:59:30 +0100

    remove deprecate #all usage

M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/relations_test.rb

commit 5866321	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 17:46:04 +0100

    remove deprecated #first calls

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/relation_scoping_test.rb

commit 759d302	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 17:29:22 +0100

    remove deprecate #calculate calls

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/calculations_test.rb
D	activerecord/test/cases/deprecated_finder_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit f6ddb13	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 15:51:23 +0100

    remove deprecated #find_in_batches calls

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/batches_test.rb

commit bd91f70	refs/heads/master
Merge: 9a3d579 5decf83
Author: Xavier Noria 
Date:   2012-04-26 08:08:26 -0700

    Merge pull request #5997 from avakhov/test_namespaced_controller_dont_indent_blank_lines-refac
    
    Namedspaced generator indent method test refactoring

commit 9a3d579	refs/heads/master
Merge: 8cd14c0 9fd6403
Author: Xavier Noria 
Date:   2012-04-26 08:00:28 -0700

    Merge pull request #5998 from aderyabin/fix7
    
    EXPLAIN only for sqlite3

commit 9fd6403	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-26 21:53:18 +0700

    EXPLAIN only for sqlite3

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 2497fd9	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-26 18:32:01 +0400

    Fix misprints in assert_file & assert_instance_method docs

M	railties/lib/rails/generators/test_case.rb

commit 5decf83	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-26 18:16:00 +0400

    Namedspaced generator indent method test refactoring

M	railties/test/generators/namespaced_generators_test.rb

commit 8cd14c0	refs/heads/master
Merge: 2f0c8c5 627f89b
Author: Jon Leighton 
Date:   2012-04-26 06:11:00 -0700

    Merge pull request #5995 from kennyj/fix_5847-3
    
    Fix #5847 and #4045. Load AR::Base before loading an application model.

commit 2f0c8c5	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 13:29:10 +0100

    remove deprecate #update_all usage

M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb

commit 1606bee	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 12:44:20 +0100

    fix #scoped deprecations

M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit e1a8369	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 12:03:25 +0100

    remove deprecated scope stuff

M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/car.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/topic.rb

commit 519001d	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-26 10:20:57 +0100

    default_scope with a hash is deprecated

M	activerecord/test/cases/named_scope_test.rb

commit 627f89b	refs/heads/master
Author: kennyj 
Date:   2012-04-26 21:21:02 +0900

    Fix #5847 and #4045. Load AR::Base before loading an application model.

M	activerecord/lib/active_record/railtie.rb
M	railties/test/application/rake_test.rb

commit 006de25	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-04-26 15:23:09 +0530

    fix number_to_human docs [ci skip]

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 848276d	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-26 15:23:09 +0530

    fix number_to_human docs [ci skip]

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 8c16333	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-26 10:34:51 +0200

    minor docs improvements

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/with.rb

commit 26353b9	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-26 10:09:12 +0200

    Add documentation for validate options

M	activemodel/lib/active_model/validations.rb

commit b2ccae4	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-26 09:35:26 +0200

    Enhance validations documentation

M	activemodel/lib/active_model/validations.rb

commit 68aadbc	refs/heads/master
Author: Arun Agrawal 
Date:   2012-04-26 09:49:10 +0530

    Shadowing variable warning removed

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 363a06f	refs/heads/master
Author: Yehuda Katz 
Date:   2012-04-25 22:45:56 -0500

    Routes reloader knows how to reload external files

M	railties/lib/rails/application/routes_reloader.rb
M	railties/lib/rails/engine.rb
M	railties/test/application/routing_test.rb

commit 568ae22	refs/heads/master
Author: Yehuda Katz 
Date:   2012-04-25 17:01:27 -0500

    Fix missing Rails.env in route inspect tests

M	railties/test/application/route_inspect_test.rb

commit 47be2f1	refs/heads/master
Author: Yehuda Katz 
Date:   2012-04-25 16:43:01 -0500

    Fix the build

M	actionpack/test/dispatch/mapper_test.rb
M	railties/lib/rails/engine.rb

commit fe6573e	refs/heads/master
Author: Yehuda Katz 
Date:   2012-04-25 16:12:44 -0500

    Make files in paths consistent

M	railties/lib/rails/engine/configuration.rb

commit 6acebb3	refs/heads/master
Author: Jose and Yehuda 
Date:   2012-04-25 16:06:20 -0500

    Allow loading external route files from the router
    
    This feature enables the ability to load an
    external routes file from the router via:
      draw :filename
    
    External routes files go in +config/routes+. This
    feature works in both engines and applications.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	guides/source/routing.textile
M	railties/lib/rails/engine.rb
M	railties/lib/rails/engine/configuration.rb
M	railties/lib/rails/paths.rb
M	railties/test/application/paths_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/paths_test.rb

commit 3c100cf	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-25 18:03:06 +0100

    remove unused method

M	activerecord/test/models/developer.rb

commit 40a711c	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-25 17:31:26 +0100

    remove tests for #with_scope (it's now deprecated)

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/locking_test.rb
D	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/models/developer.rb

commit a2fac64	refs/heads/master
Merge: 0476001 7f04235
Author: Les Nightingill 
Date:   2012-04-25 09:40:43 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit 0476001	refs/heads/master
Author: Les Nightingill 
Date:   2012-04-25 09:40:09 -0700

    adds a mention of the fact that an engine's lib/assets directory is also on the load path

M	guides/source/engines.textile

commit bc7309c	refs/heads/master
Merge: 2a97636 1a05e15
Author: Aaron Patterson 
Date:   2012-04-25 09:11:23 -0700

    Merge pull request #5973 from academia-edu/master
    
    Always quote hstore keys and values

commit 7f04235	refs/heads/master
Author: James Strocel 
Date:   2012-04-25 09:01:59 -0700

    Copy Edit

M	guides/source/generators.textile

commit 2a97636	refs/heads/master
Merge: 8b941e9 7dc03cf
Author: Jon Leighton 
Date:   2012-04-25 16:25:42 +0100

    Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'

commit 8b941e9	refs/heads/master
Merge: 98de70e 365b8b6
Author: Jon Leighton 
Date:   2012-04-25 16:07:31 +0100

    Merge remote-tracking branch 'kennyj/fix_5563'
    
    Conflicts:
    	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 98de70e	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-25 16:04:57 +0100

    add missing test

M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit d242e46	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-22 13:14:50 +0200

    extract #with_scope and #with_exclusive_scope to active_record_deprecated_finders

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/scoping.rb

commit af27c8b	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-22 12:28:26 +0200

    extract deprecated code

M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/topic.rb

commit 618c5fc	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-22 11:44:55 +0200

    Extract deprecated code

M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/base_test.rb

commit ef1d1e1	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-22 11:34:55 +0200

    fix interpolation for hash merging

M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_test.rb

commit e8cdb3d	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-22 09:49:56 +0200

    allow merging a single where value

M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/test/cases/relation_test.rb

commit f3fce59	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-22 09:22:43 +0200

    extract to active_record_deprecated_finders

M	activerecord/lib/active_record/scoping/default.rb

commit 4084373	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-22 08:58:13 +0200

    giving a hash to default scope should not be deprecated (well, not for this reason)

M	activerecord/lib/active_record/scoping/default.rb
M	activerecord/test/cases/named_scope_test.rb

commit 2970e3f	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-04-25 07:11:39 -0700

    Remove blank line at the end of routes.rb

M	railties/lib/rails/generators/rails/app/templates/config/routes.rb

commit 4179141	refs/heads/master
Merge: ee4e712 4a3ce15
Author: Oscar Del Ben 
Date:   2012-04-25 15:43:29 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit ee4e712	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-25 15:43:10 +0200

    Add partials section to getting started guide

A	guides/assets/images/getting_started/undefined_method_post_path.png
M	guides/code/getting_started/app/views/posts/_form.html.erb
M	guides/code/getting_started/config/routes.rb
M	guides/source/getting_started.textile

commit 33d8091	refs/heads/master
Merge: cd65682 6ac9e49
Author: José Valim 
Date:   2012-04-25 06:15:12 -0700

    Merge pull request #5902 from avakhov/generator-no-indent-blank-lines
    
    Don't indent blank lines in named base generators

commit cd65682	refs/heads/master
Merge: 4a3ce15 9072a08
Author: Vijay Dev 
Date:   2012-04-25 06:06:14 -0700

    Merge pull request #5878 from oscardelben/refactor_observed_class
    
    Refactor Observer.observed_class

commit 4a3ce15	refs/heads/master
Merge: bb0906e 8189536
Author: Vijay Dev 
Date:   2012-04-25 18:33:36 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 8189536	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-25 18:30:21 +0530

    copy edits [ci skip]

M	guides/source/active_record_querying.textile
M	guides/source/generators.textile

commit 9e962ff	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-25 18:21:21 +0530

    Revert "Added warning that require_tree includes files in unspecified order. So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production. "
    
    This reverts commit 9dbd511172170f60b96012b7b87044638c3962b8.
    
    Reason: Sounds like something for the guide, not the template.

M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

commit dca1cd4	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-25 18:18:10 +0530

    removing changes made in ccd0b511c933d3e2c7f3e345622ad2cc17728de5 and 189a1728b561c19404f814979fd73adc5bea554d [ci skip]

M	railties/lib/rails/generators/rails/app/templates/config.ru

commit 9072a08	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-17 15:12:55 +0200

    Refactor Observer.observed_class

M	activemodel/lib/active_model/observing.rb

commit bb0906e	refs/heads/master
Merge: 5cfb0ae 6da2bc5
Author: Jeremy Kemper 
Date:   2012-04-25 05:18:04 -0700

    Merge pull request #5980 from gazay/valid_ips
    
    Remote ip logic and validation. IPv6 support.

commit 5cfb0ae	refs/heads/master
Merge: 6d095b4 d6b3dbe
Author: Jeremy Kemper 
Date:   2012-04-25 05:13:28 -0700

    Merge pull request #5976 from aderyabin/fix1
    
    Duplicate quote_table_name method

commit 6d095b4	refs/heads/master
Merge: bd6203f 53362fc
Author: Jeremy Kemper 
Date:   2012-04-25 05:12:47 -0700

    Merge pull request #5978 from aderyabin/fix2
    
    cleanliness in method parameters

commit bd6203f	refs/heads/master
Merge: 217e9c0 d6c831c
Author: Jeremy Kemper 
Date:   2012-04-25 05:09:14 -0700

    Merge pull request #5880 from asanghi/master
    
    Stamp out ruby-debug with debugger everywhere else in the code base

commit 217e9c0	refs/heads/master
Merge: 2aabf8c a631dd9
Author: José Valim 
Date:   2012-04-25 04:46:52 -0700

    Merge pull request #5977 from oscardelben/refactor_serializable_hash
    
    Minor refactor of serializable hash

commit ccbd32c	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-25 13:18:59 +0200

    Add partials explanation to getting started guide

M	guides/source/getting_started.textile

commit 6da2bc5	refs/heads/master
Author: Alexey Gaziev 
Date:   2012-04-25 14:31:00 +0400

    Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and tests.

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb
M	actionpack/test/dispatch/request_test.rb

commit 2aabf8c	refs/heads/master
Author: José Valim 
Date:   2012-04-25 13:45:56 +0300

    Remove unnecessary empty line

M	actionpack/lib/action_dispatch/http/url.rb

commit 6f09291	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-25 12:18:55 +0200

    Add screenshot to updating post section

A	guides/assets/images/getting_started/index_action_with_edit_link.png
M	guides/source/getting_started.textile

commit f9f5243	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-25 12:14:08 +0200

    fix code syntax

M	activemodel/lib/active_model/serialization.rb

commit d089ee8	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-25 12:00:19 +0200

    Add include documentation to serialization

M	activemodel/lib/active_model/serialization.rb

commit 53362fc	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-25 16:51:40 +0700

    cleanliness in method parameters

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit a631dd9	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-25 11:46:47 +0200

    Minor refactor of serializable hash

M	activemodel/lib/active_model/serialization.rb

commit e34a401	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-25 11:27:09 +0200

    improve serialization doc

M	activemodel/lib/active_model/serialization.rb

commit d6b3dbe	refs/heads/master
Author: Andrey Deryabin 
Date:   2012-04-25 15:05:45 +0700

    already defined in quoting

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit 6ac9e49	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-19 18:29:40 +0400

    Don't indent blank lines in named base generators

M	railties/lib/rails/generators/named_base.rb
M	railties/test/generators/namespaced_generators_test.rb

commit 93bcb0c	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-25 11:51:33 +0400

    Remove lonely number sign

M	railties/test/generators/namespaced_generators_test.rb

commit cd556c9	refs/heads/master
Merge: a837b30 27d6ccd
Author: José Valim 
Date:   2012-04-24 23:09:48 -0700

    Merge pull request #5841 from oscardelben/rename_count_observers
    
    Rename Observing#count_observers to Observing#observers_count

commit 1533853	refs/heads/master
Author: Uģis Ozols 
Date:   2012-04-25 08:04:23 +0300

    for get -> forget

M	guides/source/generators.textile

commit a837b30	refs/heads/master
Author: Jose and Yehuda 
Date:   2012-04-24 23:55:39 -0500

    Clean up some straggling build failures

M	actionmailer/test/i18n_with_controller_test.rb
M	actionmailer/test/url_test.rb
M	railties/test/application/route_inspect_test.rb

commit 1a05e15	refs/heads/master
Author: Ryan Fitzgerald 
Date:   2012-04-24 20:59:45 -0700

    Restore .to_s to escape_hstore

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 56cdc81	refs/heads/master
Author: Jose and Yehuda 
Date:   2012-04-24 22:32:09 -0500

    Remove default match without specified method
    
    In the current router DSL, using the +match+ DSL
    method will match all verbs for the path to the
    specified endpoint.
    
    In the vast majority of cases, people are
    currently using +match+ when they actually mean
    +get+. This introduces security implications.
    
    This commit disallows calling +match+ without
    an HTTP verb constraint by default. To explicitly
    match all verbs, this commit also adds a
    :via => :all option to +match+.
    
    Closes #5964

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/activerecord/active_record_store_test.rb
M	actionpack/test/controller/action_pack_assertions_test.rb
M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/controller/flash_test.rb
M	actionpack/test/controller/integration_test.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/new_base/content_type_test.rb
M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/new_base/render_test.rb
M	actionpack/test/controller/new_base/render_text_test.rb
M	actionpack/test/controller/redirect_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/controller/render_xml_test.rb
M	actionpack/test/controller/rescue_test.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/controller/test_case_test.rb
M	actionpack/test/controller/url_for_integration_test.rb
M	actionpack/test/controller/url_for_test.rb
M	actionpack/test/controller/url_rewriter_test.rb
M	actionpack/test/controller/webservice_test.rb
M	actionpack/test/dispatch/mapper_test.rb
M	actionpack/test/dispatch/prefix_generation_test.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/multipart_params_parsing_test.rb
M	actionpack/test/dispatch/request/query_string_parsing_test.rb
M	actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb
M	actionpack/test/dispatch/request_id_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/dispatch/session/cache_store_test.rb
M	actionpack/test/dispatch/session/cookie_store_test.rb
M	actionpack/test/dispatch/session/mem_cache_store_test.rb
M	actionpack/test/dispatch/url_generation_test.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/test_test.rb
M	actionpack/test/template/url_helper_test.rb
M	guides/source/routing.textile
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/engine.rb
M	railties/test/application/asset_debugging_test.rb
M	railties/test/application/assets_test.rb
M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/initializers/i18n_test.rb
M	railties/test/application/loading_test.rb
M	railties/test/application/middleware/cache_test.rb
M	railties/test/application/middleware/exceptions_test.rb
M	railties/test/application/route_inspect_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/application/url_generation_test.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/rails_info_controller_test.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/mounted_engine_test.rb

commit 0c46dbb	refs/heads/master
Author: Ryan Fitzgerald 
Date:   2012-04-24 20:43:10 -0700

    Always quote hstore keys and values
    
    escape_hstore uses quotation marks around keys and values only if it
    seems necessary. However, it currently breaks in the presence of some
    non-ASCII characters. Instead of trying to guess exactly which
    characters are safe, it seems better to always use quotes.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit d6c831c	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-04-24 21:56:41 -0500

    and one more time

M	activesupport/lib/active_support/core_ext/kernel/debugger.rb
M	guides/code/getting_started/README.rdoc
M	guides/source/debugging_rails_applications.textile
M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/commands/server.rb
M	railties/lib/rails/generators/rails/app/templates/README
M	railties/lib/rails/rack/debugger.rb

commit 7d95b81	refs/tags/v3.2.5
Merge: 9212083 20f398d
Author: Jeremy Kemper 
Date:   2012-04-24 19:23:35 -0700

    Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2
    
    Add extra order clause to fix failing test on Ruby 1.8.7

commit 20f398d	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-04-24 19:23:26 -0300

    Add extra order clause to fix failing test on Ruby 1.8.7

M	activerecord/test/cases/associations/eager_test.rb

commit 9212083	refs/tags/v3.2.5
Merge: db6787a d95f3d3
Author: Jeremy Kemper 
Date:   2012-04-24 13:29:39 -0700

    Merge pull request #5968 from sikachu/3-2-stable-backport
    
    Backport workarounds for Mocha behavior changes.

commit d95f3d3	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-04-25 01:31:26 +0900

    Fix build. It seems that the Mocha's behavior were changed.

M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/explain_test.rb

commit 189a172	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-04-25 01:30:05 +0530

    Added notice on how to enable gzip compression.
    
    (Fixed typo from previous commit: ccd0b511c933d3e2c7f3e345622ad2cc17728de5)

M	railties/lib/rails/generators/rails/app/templates/config.ru

commit ccd0b51	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-04-25 01:27:21 +0530

    Added notice on how to enable gzip compression in rails app using Rack::Deflater. it is disabled & commented out by default.

M	railties/lib/rails/generators/rails/app/templates/config.ru

commit cdc9031	refs/heads/master
Author: Jonathan Rochkind 
Date:   2012-04-24 16:47:44 -0300

    Remove references to 'vendored plugins' except to note they used to exist but are deprecated. 'gemified plugin' is the only supported option now.

M	guides/source/plugins.textile

commit 9dbd511	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-04-25 01:14:57 +0530

    Added warning that require_tree includes files in unspecified order. So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production.

M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

commit f45f1ba	refs/heads/master
Author: James Strocel 
Date:   2012-04-24 12:08:05 -0700

    Added some useful methods to the generators.textile

M	guides/source/generators.textile

commit 0cc32c5	refs/heads/master
Merge: f822024 692b3b6
Author: José Valim 
Date:   2012-04-24 10:50:44 -0700

    Merge pull request #5966 from oscardelben/fix_secure_password_setter
    
    Fix secure_password setter

commit 692b3b6	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-24 19:16:01 +0200

    Fix secure_password setter

M	activemodel/lib/active_model/secure_password.rb
M	activemodel/test/cases/secure_password_test.rb

commit f822024	refs/heads/master
Merge: c873167 55ceced
Author: Jeremy Kemper 
Date:   2012-04-24 10:12:14 -0700

    Merge pull request #5929 from FLOChip/notes
    
    `rake notes` and `rake notes:custom` now support css, scss, and css.

commit 52188c7	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-24 19:08:57 +0200

    Correct documentation of SecurePassword

M	activemodel/lib/active_model/secure_password.rb

commit c873167	refs/heads/master
Merge: dbef5a0 ffa974d
Author: José Valim 
Date:   2012-04-24 10:05:32 -0700

    Merge pull request #5965 from oscardelben/refactor_secure_password_authenticate
    
    Refactor SecurePassword#authenticate

commit ffa974d	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-24 19:03:59 +0200

    Refactor SecurePassword#authenticate

M	activemodel/lib/active_model/secure_password.rb

commit dbef5a0	refs/heads/master
Merge: 71bd509 2aa7c6d
Author: Jeremy Kemper 
Date:   2012-04-24 09:57:15 -0700

    Merge pull request #5963 from kennyj/fix_build_20120425
    
    Fix build. It seems that the Mocha's behavior was changed.

commit 2aa7c6d	refs/heads/master
Author: kennyj 
Date:   2012-04-25 01:31:26 +0900

    Fix build. It seems that the Mocha's behavior were changed.

M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/explain_test.rb

commit 71bd509	refs/heads/master
Merge: 4afdd97 0129499
Author: Jeremy Kemper 
Date:   2012-04-24 07:36:12 -0700

    Merge pull request #5961 from bogdan/routes
    
    Refactor ActionDispatch::HTTP::Url#url_for

commit 0129499	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-04-24 17:09:34 +0300

    ActionDispatch::HTTP::Url#url_for refactor method
    
    Separated right side url generation(before query string)
    from left side url generation(after query string)

M	actionpack/lib/action_dispatch/http/url.rb

commit 4afdd97	refs/heads/master
Merge: f7ddbaa 7322bd4
Author: Jeremy Kemper 
Date:   2012-04-24 06:38:26 -0700

    Merge pull request #5927 from avakhov/distance_of_time_in_words-swap
    
    Distance of time in words should work correctly if from_time > to_time

commit f7ddbaa	refs/heads/master
Merge: 10540e2 42b8bd5
Author: Jeremy Kemper 
Date:   2012-04-24 06:36:54 -0700

    Merge pull request #5956 from arunagw/mocha_upgrade
    
    Upgrading to Mocha 0.11.2 to fix Object#method override

commit 10540e2	refs/heads/master
Merge: 481ed89 f70d95e
Author: José Valim 
Date:   2012-04-24 06:08:04 -0700

    Merge pull request #5960 from homakov/patch-3
    
    Delete insecure and "bad practice" code.

commit f70d95e	refs/heads/master
Author: Egor Homakov 
Date:   2012-04-24 17:05:26 +0400

    Deleting insecure and "bad practice" code. related: http://homakov.blogspot.com/2012/04/whitelist-your-routes-match-is-evil.html

M	railties/lib/rails/generators/rails/app/templates/config/routes.rb

commit 481ed89	refs/heads/master
Merge: afcae34 2658d97
Author: Aaron Patterson 
Date:   2012-04-24 05:59:19 -0700

    Merge pull request #5959 from carlosantoniodasilva/refactor-route_set
    
    Refactor hash creation in routeset

commit 2658d97	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-24 09:53:51 -0300

    Refactor hash creation in routeset

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit f92814e	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-24 14:22:19 +0200

    make sample code more compact

M	guides/source/getting_started.textile

commit f0de717	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-24 14:21:07 +0200

    Add update post section to getting started guide

M	guides/code/getting_started/app/controllers/posts_controller.rb
M	guides/code/getting_started/app/views/posts/_form.html.erb
M	guides/code/getting_started/app/views/posts/edit.html.erb
M	guides/code/getting_started/app/views/posts/index.html.erb
M	guides/code/getting_started/app/views/posts/show.html.erb
M	guides/code/getting_started/config/routes.rb
M	guides/source/getting_started.textile

commit afcae34	refs/heads/master
Merge: 0b05380 65ec1e9
Author: José Valim 
Date:   2012-04-24 05:06:17 -0700

    Merge pull request #5957 from bogdan/routes
    
    RouteSet: decomplecting a way to handle positional args

commit 7322bd4	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-22 13:38:50 +0400

    Use leap years trick in distance_of_time_in_words only for distances between real date points

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 5fdd4cd	refs/heads/master
Author: Marcelo Casiraghi 
Date:   2012-04-23 19:16:02 -0300

    fixed non matching documentation behaviour with method semantics on distance_of_time_in_words

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit ff5b0d6	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-24 08:49:02 +0400

    Distance of time in words should work correct if from time > to_time

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 65ec1e9	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-04-24 14:52:33 +0300

    RouteSet: decomplecting a way to handle positional args

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 0b05380	refs/heads/master
Merge: 242f4d1 15c5060
Author: José Valim 
Date:   2012-04-24 04:12:18 -0700

    Merge pull request #5955 from bogdan/routes
    
    RouteSet: simplify routes helpers generation code

commit 42b8bd5	refs/heads/master
Author: Arun Agrawal 
Date:   2012-04-24 16:05:08 +0530

    Upgrading mocha 0.11.2

M	Gemfile

commit 5acb345	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-24 12:30:24 +0200

    Fix some code in getting started guide

D	guides/code/getting_started/app/helpers/home_helper.rb
A	guides/code/getting_started/app/helpers/welcome_helper.rb
M	guides/source/getting_started.textile

commit 15c5060	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-04-24 13:17:18 +0300

    RouteSet: simplify routes helpers generation code

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 242f4d1	refs/heads/master
Merge: 82c3aca ef7815b
Author: José Valim 
Date:   2012-04-24 02:00:30 -0700

    Merge pull request #5954 from bogdan/routes
    
    Add missing requires in routes

commit e6de208	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-24 09:25:54 +0400

    Missed checked in Form Helper example

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 4433b1a	refs/heads/master
Author: Brian Cardarella 
Date:   2012-04-24 01:05:41 -0400

    Support i18n attributes for confirmation

M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/test/cases/validations/confirmation_validation_test.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb

commit 3a749a9	refs/heads/master
Author: Brian Cardarella 
Date:   2012-04-23 21:30:24 -0400

    Reordered changelog entry

M	activemodel/CHANGELOG.md

commit d32cbee	refs/heads/master
Author: Brian Cardarella 
Date:   2012-04-23 21:04:10 -0400

    Updated CHANGELOG

M	activemodel/CHANGELOG.md

commit db6787a	refs/tags/v3.2.5
Merge: 0f5af60 0f3fd78
Author: Santiago Pastorino 
Date:   2012-04-23 16:30:38 -0700

    Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict
    
    Fix broken test from the earlier merge conflict

commit 0f3fd78	refs/tags/v3.2.5
Author: Prem Sichanugrist 
Date:   2012-04-23 16:54:11 -0500

    Fix broken test from the earlier merge conflict
    
    Seriously people, please run the test before submitting pull request.

M	actionpack/test/template/render_test.rb

commit fcc534e	refs/heads/master
Author: Brian Cardarella 
Date:   2012-04-23 17:16:05 -0400

    confirmation validation error attribute
    
    This will render the error message on :#{attribute}_confirmation instead
    of on attribute itself. When rendering confirmation errors inline on the
    form with form builders such as SimpleForm and Formtastic it is
    confusing to the ender user to see the confirmation error message on the
    attribute element. Instead it makes more sense to have this validation
    error render on the confirmation field instead.
    
    The i18n message has been updated for the confirmation validator error
    message to include the original attribute name.

M	activemodel/lib/active_model/locale/en.yml
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/test/cases/validations/confirmation_validation_test.rb
M	activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb
M	activemodel/test/cases/validations/validates_test.rb

commit 0f5af60	refs/tags/v3.2.5
Merge: dd01c11 6b8dd70
Author: Aaron Patterson 
Date:   2012-04-23 08:24:21 -0700

    Merge pull request #5866 from tiegz/minor_fixes_3-2-stable
    
    Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead

commit 82c3aca	refs/heads/master
Author: Joe Van Dyk 
Date:   2012-04-21 03:10:25 -0700

    Only include Rake::DSL if it's defined.
    
    rake < 0.9 doesn't define Rake::DSL.

M	railties/lib/rails/tasks/documentation.rake

commit dd01c11	refs/tags/v3.2.5
Merge: 979e9d0 07b1fe5
Author: Jeremy Kemper 
Date:   2012-04-23 06:03:18 -0700

    Merge pull request #5919 from joevandyk/rake-dsl-fix
    
    Only include Rake::DSL if it's defined (Rake >= 0.9)

commit ef7815b	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-04-23 14:31:38 +0300

    Add missing requires in routes

M	actionpack/lib/action_dispatch/http/mime_negotiation.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 5f6ef50	refs/heads/master
Merge: 5b80667 43946ee
Author: Vijay Dev 
Date:   2012-04-23 03:37:38 -0700

    Merge pull request #5887 from mcrowe/document-relation-merge
    
    Add documentation to the SpawnMethods#merge method.

commit 979e9d0	refs/tags/v3.2.5
Merge: 0ed6e13 21b1a79
Author: Vijay Dev 
Date:   2012-04-23 03:33:06 -0700

    Merge pull request #5936 from arunagw/other_readme_fixes
    
    Updated other README to point 3-2-stable

commit 21b1a79	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-04-23 15:55:23 +0530

    Updated other README to point 3-2-stable

M	actionmailer/README.rdoc
M	actionpack/README.rdoc
M	activemodel/README.rdoc
M	activerecord/README.rdoc
M	activesupport/README.rdoc
M	railties/README.rdoc

commit 0ed6e13	refs/tags/v3.2.5
Merge: c3d50b3 210713e
Author: Vijay Dev 
Date:   2012-04-23 03:24:48 -0700

    Merge pull request #5935 from arunagw/readme_fixes_3-2-stable
    
    As ARes is removed from master then 3-2-stable URL should be in README.

commit 210713e	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-04-23 15:51:18 +0530

    ARes URL should be pointed to 3-2-stable tree not master.

M	activeresource/README.rdoc

commit 5b80667	refs/heads/master
Merge: 9026980 a4c4fa3
Author: José Valim 
Date:   2012-04-22 23:56:42 -0700

    Merge pull request #5930 from carlosantoniodasilva/generated-attribute-refactor
    
    Refactor GeneratedAttributes

commit 50f79da	refs/heads/master
Author: Dmytrii Nagirniak 
Date:   2012-04-23 13:45:22 +1000

    Fix markdown in textile.

M	guides/source/active_record_querying.textile

commit 50c5005	refs/heads/master
Author: Dmytrii Nagirniak 
Date:   2012-04-23 13:14:52 +1000

    Make it explicit that Symbol-s are not officially supported.
    
    This will remove a lot of controversy.
    As an example, see https://github.com/ernie/squeel/issues/67#issuecomment-5270896

M	guides/source/active_record_querying.textile

commit a4c4fa3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-22 21:53:18 -0300

    Refactor GeneratedAttributes
    
    * Move reference? method to class to remove duplicated code
    * Move to_sym typecast from #initialize to .parse method (make it
      easier to refactor reference?), remove AS object/blank require
    * Use []= instead of merge!({})
    * Remove in? in favor of include?, remove AS object/inclusion require

M	railties/lib/rails/generators/generated_attribute.rb

commit 55ceced	refs/heads/master
Author: Teng Siong Ong 
Date:   2012-04-22 18:45:13 -0500

    `rake notes` and `rake notes:custom` now support
    css, scss and css.

M	railties/lib/rails/source_annotation_extractor.rb
M	railties/test/application/rake/notes_test.rb

commit 023cfd3	refs/heads/master
Merge: 594997f 9e60cc2
Author: Vijay Dev 
Date:   2012-04-22 13:33:16 -0700

    Merge pull request #92 from geetarista/add-favicon
    
    Adds favicon to guides layout

commit 9e60cc2	refs/heads/master
Author: Robby Colvin 
Date:   2012-04-22 13:20:22 -0700

    Adds favicon to guides layout

A	guides/assets/images/favicon.ico
M	guides/source/layout.html.erb

commit 594997f	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-22 13:20:22 +0400

    Add distance_of_time_in_words example for seconds

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 9026980	refs/heads/master
Merge: a719843 f98d929
Author: Piotr Sarnacki 
Date:   2012-04-21 14:06:03 -0700

    Merge pull request #5917 from oscardelben/master
    
    Remove circular require warning

commit be4a44f	refs/heads/master
Author: Bernard Kroes 
Date:   2012-04-21 22:16:38 +0200

    Fixed expected value in comment. Removed duplicate lines in example.

M	activemodel/README.rdoc

commit 3527852	refs/heads/master
Author: Chad Jolly 
Date:   2012-04-21 14:03:23 -0600

    Improve signed cookies documentation

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit c3d50b3	refs/tags/v3.2.5
Merge: f51557d 5e62670
Author: Jeremy Kemper 
Date:   2012-04-21 12:15:39 -0700

    Merge pull request #5896 from sferik/revert_5861
    
    Revert #5861. Feature-detect which MultiJson API to use.

commit a719843	refs/heads/master
Merge: ed81083 c670b57
Author: Vijay Dev 
Date:   2012-04-21 23:04:04 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit c670b57	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-21 22:52:38 +0530

    Revert "in feedback solicitation text, correct that docrails is fork, not branch"
    
    This reverts commit 7b7cc1341bd41106c0e6c5eb399f8aff39b43f52.
    
    Reason: docrails isn't a rails fork. See 5444ed56ab38a742b3ddf6612eadd8cf50d8d517
    
    [ci skip]

M	guides/source/layout.html.erb

commit c06c842	refs/heads/master
Merge: 3da2b53 63b4a00
Author: Oscar Del Ben 
Date:   2012-04-21 12:18:19 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 3da2b53	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-21 12:17:51 +0200

    Add validation code to getting started guide and improve validation
    section

A	guides/assets/images/getting_started/form_with_errors.png
M	guides/code/getting_started/app/controllers/posts_controller.rb
M	guides/code/getting_started/app/views/posts/_form.html.erb
M	guides/source/getting_started.textile

commit 07b1fe5	refs/tags/v3.2.5
Author: Joe Van Dyk 
Date:   2012-04-21 03:10:25 -0700

    Only include Rake::DSL if it's defined.
    
    rake < 0.9 doesn't define Rake::DSL.

M	railties/lib/rails/tasks/documentation.rake

commit 504ba12	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-21 12:01:33 +0200

    Add model validation section to Getting Started guide

D	guides/assets/images/posts_index.png
D	guides/code/getting_started/app/assets/javascripts/comments.js.coffee
D	guides/code/getting_started/app/assets/javascripts/home.js.coffee
D	guides/code/getting_started/app/assets/javascripts/posts.js.coffee
D	guides/code/getting_started/app/assets/stylesheets/comments.css.scss
D	guides/code/getting_started/app/assets/stylesheets/home.css.scss
D	guides/code/getting_started/app/assets/stylesheets/posts.css.scss
D	guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
M	guides/code/getting_started/app/controllers/posts_controller.rb
D	guides/code/getting_started/vendor/assets/stylesheets/.gitkeep
M	guides/source/getting_started.textile

commit f98d929	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-21 10:50:38 +0200

    Remove circular require of time/zones

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 63b4a00	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-21 11:14:37 +0400

    Comma missed

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit ed81083	refs/heads/master
Merge: 42f6e9f 5d8d639
Author: Aaron Patterson 
Date:   2012-04-20 16:23:27 -0700

    Merge pull request #5865 from tiegz/minor_fixes
    
    Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead

commit 42f6e9f	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-04-20 12:17:03 -0700

    Freeze the middleware stack after it's built
    
    So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole.
    
    Closes #5911

M	actionpack/lib/action_dispatch/middleware/stack.rb
M	railties/test/application/middleware/exceptions_test.rb
M	railties/test/application/middleware_test.rb

commit 7b7cc13	refs/heads/master
Author: Rory O’Kane 
Date:   2012-04-20 15:52:35 -0300

    in feedback solicitation text, correct that docrails is fork, not branch

M	guides/source/layout.html.erb

commit d717468	refs/heads/master
Merge: e7e72aa 09a22db
Author: Oscar Del Ben 
Date:   2012-04-20 12:53:43 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit e7e72aa	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-20 12:53:18 +0200

    Add index and links section to Getting started guide

M	guides/code/getting_started/app/controllers/home_controller.rb
M	guides/code/getting_started/app/controllers/posts_controller.rb
M	guides/code/getting_started/app/helpers/home_helper.rb
D	guides/code/getting_started/app/views/home/index.html.erb
M	guides/code/getting_started/app/views/posts/index.html.erb
M	guides/code/getting_started/app/views/posts/new.html.erb
M	guides/code/getting_started/app/views/posts/show.html.erb
A	guides/code/getting_started/app/views/welcome/index.html.erb
M	guides/code/getting_started/config/routes.rb
M	guides/code/getting_started/test/functional/home_controller_test.rb
M	guides/source/getting_started.textile

commit 2e2afc0	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-20 12:06:47 +0200

    Add show action in getting started guide

A	guides/assets/images/getting_started/show_action_for_posts.png
M	guides/code/getting_started/app/controllers/posts_controller.rb
M	guides/code/getting_started/app/models/post.rb
M	guides/code/getting_started/app/views/posts/show.html.erb
M	guides/code/getting_started/config/routes.rb
M	guides/source/getting_started.textile

commit dbb4c4d	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-20 10:47:38 +0200

    New Getting started guide wont have tags

M	guides/code/getting_started/app/helpers/posts_helper.rb
M	guides/code/getting_started/app/models/post.rb
D	guides/code/getting_started/app/models/tag.rb
M	guides/code/getting_started/app/views/posts/show.html.erb
D	guides/code/getting_started/app/views/tags/_form.html.erb
D	guides/code/getting_started/db/migrate/20110901013701_create_tags.rb

commit f6d5036	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-20 10:43:50 +0200

    Adapt "Getting started guide" code sample

M	guides/code/getting_started/app/controllers/posts_controller.rb
M	guides/code/getting_started/app/models/post.rb
M	guides/code/getting_started/app/views/posts/_form.html.erb
M	guides/code/getting_started/app/views/posts/new.html.erb
M	guides/code/getting_started/config/routes.rb
D	guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
A	guides/code/getting_started/db/migrate/20120420083127_create_posts.rb
M	guides/code/getting_started/db/schema.rb
M	guides/code/getting_started/test/fixtures/posts.yml

commit 09a22db	refs/heads/master
Author: Thibaut Courouble 
Date:   2012-04-20 11:28:24 +0300

    Fix example in ActionView::Helpers::FormHelper

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 0d5a7ad	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-20 09:59:30 +0200

    Add "Saving data in the controller" section

M	guides/source/getting_started.textile

commit 6054e36	refs/heads/master
Author: Kevin Musiorski 
Date:   2012-04-19 14:52:21 -0500

    removed extra "you"

M	guides/source/form_helpers.textile

commit f51557d	refs/tags/v3.2.5
Author: Akira Matsuda 
Date:   2012-04-19 22:04:13 +0900

    Be sure to correctly fetch PK name from MySQL even if the PK has some custom option
    
    Backports #5900
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

commit 99eae3f	refs/heads/master
Merge: 66ea296 851b816
Author: Jeremy Kemper 
Date:   2012-04-19 06:33:19 -0700

    Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_option
    
    current MySQL driver fails to fetch PK name when the PK has USING option

commit b9e5c5a	refs/tags/v3.2.5
Merge: 1166d49 ebfa58a
Author: Jeremy Kemper 
Date:   2012-04-19 06:26:13 -0700

    Merge pull request #5898 from benedikt/3-2-stable
    
    Readds the fix for #5667 and back ports the regression fix from #5718

commit 851b816	refs/heads/master
Author: Akira Matsuda 
Date:   2012-04-19 22:04:13 +0900

    be sure to currectly fetch PK name from MySQL even if the PK has some custom option

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

commit a4508ed	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-19 13:12:27 +0200

    Add model creation step to getting started guide

M	guides/source/getting_started.textile

commit e2575b6	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-19 12:07:35 +0200

    Fix broken images links

M	guides/source/getting_started.textile

commit 6f76bf1	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-19 11:33:25 +0200

    Add Ruby 1.9.3 recommendation

M	guides/source/getting_started.textile

commit 57a995b	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-19 11:16:15 +0200

    Put warning on getting started guide back

M	guides/source/getting_started.textile

commit b4d13ed	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-19 10:50:40 +0200

    Add "Using the change method" title back to make it stand out

M	guides/source/migrations.textile

commit e44b845	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-19 10:37:03 +0200

    Regenerate Gemfile for getting started guide

M	guides/code/getting_started/Gemfile

commit 6ece2ee	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-19 10:33:15 +0200

    Update guide for rails 3.2.3, fix code download link.

M	guides/source/getting_started.textile

commit ebfa58a	refs/tags/v3.2.5
Author: Benedikt Deicke 
Date:   2012-04-19 10:07:28 +0200

    Removes unneeded caching from ActiveRecord::Base.relation

M	activerecord/lib/active_record/base.rb

commit 2c21a2f	refs/tags/v3.2.5
Author: Benedikt Deicke 
Date:   2012-04-19 10:04:24 +0200

    Revert "Revert "Fix #5667. Preloading should ignore scoping.""
    
    This reverts commit 1166d49f62ccab789be208112163ad13183224e2.
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/preloader/association.rb

commit 8491740	refs/tags/v3.2.5
Author: Benedikt Deicke 
Date:   2012-04-03 21:13:24 +0200

    Adds test to check that circular preloading does not modify Model.unscoped (as described in #5667)
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/comment.rb

commit 13f1401	refs/tags/v3.2.5
Author: Benedikt Deicke 
Date:   2012-04-03 16:51:36 +0200

    Removes caching from ActiveRecord::Core::ClassMethods#relation
    
    The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.
    
    The four places with calls to relations are:
    
    activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
    activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
    activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
    activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb

M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/relations_test.rb

commit c666323	refs/heads/master
Author: Ivan Evtukhovich 
Date:   2012-04-17 12:57:19 +0400

    Add to guides info how to disable prepared statements

M	guides/source/configuring.textile

commit 5e62670	refs/tags/v3.2.5
Author: Erik Michaels-Ober 
Date:   2012-04-18 22:01:31 -0700

    Use `Object#respond_to?` to determine which MultiJson API to use

M	activesupport/lib/active_support/json/decoding.rb

commit e01bf0a	refs/tags/v3.2.5
Author: Erik Michaels-Ober 
Date:   2012-04-18 19:54:19 -0700

    Revert "multi_json is restricted to < 1.3 "
    
    This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b.

M	activesupport/activesupport.gemspec

commit 1166d49	refs/tags/v3.2.5
Author: Jeremy Kemper 
Date:   2012-04-18 19:27:04 -0700

    Revert "Fix #5667. Preloading should ignore scoping."
    
    Causes a subtle regression where record.reload includes the default
    scope. Hard to reproduce in isolation. Seems like the relation is
    getting infected by some previous usage.
    
    This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 3986139	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-04-17 19:17:02 -0300

    Add hook for add_resource_route

M	railties/CHANGELOG.md
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/resource/resource_generator.rb
A	railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb

commit 66ea296	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-04-18 13:29:49 -0300

    Remove unused generator options. This was added for the removed rails new --http

M	railties/lib/rails/generators/rails/resource/resource_generator.rb
M	railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

commit 17b8fd5	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-04-17 19:17:02 -0300

    Add hook for add_resource_route

M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/resource/resource_generator.rb
A	railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb

commit 476fa7a	refs/tags/v3.2.5
Merge: 89f99e8 d92166c
Author: Aaron Patterson 
Date:   2012-04-18 11:33:50 -0700

    Merge pull request #5894 from norman/3-2-fix-nil-logger
    
    Fix nil logger on 3.2

commit d92166c	refs/tags/v3.2.5
Author: Norman Clarke 
Date:   2012-04-18 14:44:32 -0300

    Check for nil logger

M	activerecord/lib/active_record/scoping/named.rb

commit 96cfadc	refs/heads/master
Merge: 595e14e 8f1a0af
Author: Jeremy Kemper 
Date:   2012-04-18 09:46:38 -0700

    Merge pull request #5891 from kennyj/remove_time_directory
    
    Remove dead code: active_support/time/autoload.rb was moved to active_support/time.rb

commit 8f1a0af	refs/heads/master
Author: kennyj 
Date:   2012-04-19 00:19:39 +0900

    Remove unused code. We should use 'active_support/time'.

D	activesupport/lib/active_support/time/autoload.rb

commit 595e14e	refs/heads/master
Merge: e9f778a c90b43f
Author: Santiago Pastorino 
Date:   2012-04-18 07:25:36 -0700

    Merge pull request #5889 from juanazam/juan-master
    
    Add missing dependency for active_record_deprecated_finders

commit 7dc03cf	refs/heads/master
Author: Jorge Bejar 
Date:   2012-04-12 00:41:25 -0300

    Define array methods in ActiveRecord::Associations::CollectionProxy
    
    if they are not defined or delegated.
    In this way, we have a performance boost invoking some array methods
    which are not defined in CollectionAssociation.

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit c90b43f	refs/heads/master
Author: Juan Manuel Azambuja 
Date:   2012-04-18 10:54:50 -0300

    Add missing dependency for active_record_deprecated_finders

M	railties/lib/rails/generators/app_base.rb

commit 7536731	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-18 15:23:06 +0200

    Improve observers documentation

M	activemodel/lib/active_model/observing.rb

commit 3333fe2	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-18 15:10:02 +0200

    Fix formatting

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 43946ee	refs/heads/master
Author: Mitch Crowe 
Date:   2012-04-17 18:56:33 -0700

    Add documentation to the SpawnMethods#merge method.

M	activerecord/lib/active_record/relation/spawn_methods.rb

commit e9f778a	refs/heads/master
Merge: e3a3a14 b9b9bd8
Author: Piotr Sarnacki 
Date:   2012-04-17 16:35:52 -0700

    Merge pull request #5869 from LachyGroom/patch-1
    
    Changes b tag to strong

commit 67ede88	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-04-18 02:24:44 +0530

    another attempt at the language

M	activesupport/lib/active_support/core_ext/kernel/debugger.rb
M	guides/code/getting_started/README.rdoc
M	guides/source/debugging_rails_applications.textile
M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/generators/rails/app/templates/README
M	railties/lib/rails/rack/debugger.rb

commit e3a3a14	refs/heads/master
Merge: 3b0ffb1 938464d
Author: Santiago Pastorino 
Date:   2012-04-17 13:51:50 -0700

    Merge pull request #5882 from vijaydev/fix_generated_attribute_build
    
    Fixing the build

commit 938464d	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-18 02:16:44 +0530

    the index option is always created if the type is one of references or belongs_to. Refactoring it to a simpler form and fixing the build

M	railties/lib/rails/generators/generated_attribute.rb

commit 6f80ea2	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-04-18 00:48:59 +0530

    review changes for #5875

M	activesupport/lib/active_support/core_ext/kernel/debugger.rb
M	guides/code/getting_started/README.rdoc
M	guides/source/debugging_rails_applications.textile

commit 3b0ffb1	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-18 00:36:58 +0530

    let's not use `and` in place of `&&`

M	railties/lib/rails/generators/generated_attribute.rb

commit 5b336ff	refs/heads/master
Merge: 1d26fcb b7e3c8e
Author: Vijay Dev 
Date:   2012-04-18 00:10:06 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit b7e3c8e	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-18 00:05:38 +0530

    let's keep the slash in the return value instead of the path variable [ci skip]

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 0c948a5	refs/heads/master
Author: Thibaut Courouble 
Date:   2012-04-17 19:02:40 +0300

    Fix confusing example in ActiveModel::Errors

M	activemodel/lib/active_model/errors.rb

commit 89f99e8	refs/tags/v3.2.5
Merge: 9a97699 56674db
Author: Jeremy Kemper 
Date:   2012-04-17 07:41:16 -0700

    Merge pull request #5874 from asanghi/3-2-stable
    
    replace ruby-debug19 with debugger on Rails 3-2 stable

commit 5bdf50d	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-17 15:57:38 +0200

    Warn about do end syntax in redirect option

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 1d26fcb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-17 06:31:44 -0700

    Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_autoload"
    
    This reverts commit 86c640a1625aa3a8ec8728c2f1c640c9718fcb0b, reversing
    changes made to a0c2cfdc51e16fc39c1d3b1e78bdd257188fa04e.

M	activesupport/lib/active_support.rb

commit 7169882	refs/heads/master
Merge: 3df776c 4b85acb
Author: José Valim 
Date:   2012-04-17 06:25:18 -0700

    Merge pull request #5871 from rafaelfranca/patch-1
    
    Remove unused test code.

commit 8d2487d	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-17 15:39:46 +0400

    Fix redirect with block example

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 86b30c4	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-17 15:01:41 +0400

    Fix example in flash middleware

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 0232543	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-04-17 15:31:05 +0530

    stamp out ruby-debug19 with extreme prejudice :)

M	activesupport/lib/active_support/core_ext/kernel/debugger.rb
M	guides/code/getting_started/Gemfile
M	guides/code/getting_started/README.rdoc
M	guides/source/debugging_rails_applications.textile
M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/commands/server.rb
M	railties/lib/rails/generators/rails/app/templates/README
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
M	railties/lib/rails/rack/debugger.rb

commit 56674db	refs/tags/v3.2.5
Author: Aditya Sanghi 
Date:   2012-04-17 15:00:33 +0530

    Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more maintained debugger gem

M	railties/guides/code/getting_started/Gemfile
M	railties/guides/source/debugging_rails_applications.textile
M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 4b85acb	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-16 23:38:31 -0300

    Remove unused test code.
    
    ActionController::RoutingError are raised in router execution time and can not be
    rescued in a controller.

M	actionpack/test/controller/rescue_test.rb

commit 3df776c	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-04-16 23:36:09 -0300

    Fix test

M	railties/test/generators/app_generator_test.rb

commit b9b9bd8	refs/heads/master
Author: CollectiveJam 
Date:   2012-04-16 17:26:25 -0700

    Changes b tag to strong
    
    
    The change is made due to importance of the attribute name (e.g. Name:) on the page (versus just stylistic / appearance sake tag).

M	railties/lib/rails/generators/erb/scaffold/templates/show.html.erb

commit 256e317	refs/heads/master
Author: Don Petersen 
Date:   2012-04-16 16:22:40 -0700

    Fix typo where a table name in a join was singular.

M	guides/source/active_record_querying.textile

commit 6b8dd70	refs/tags/v3.2.5
Author: Tieg Zaharia 
Date:   2012-04-16 15:33:15 -0400

    converting some tests to assert_raises, and DRY'ing retrieve_variable changes
    
    Conflicts:
    
    	actionpack/test/template/render_test.rb

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/render_test.rb

commit 5d8d639	refs/heads/master
Author: Tieg Zaharia 
Date:   2012-04-16 15:33:15 -0400

    converting some tests to assert_raises, and DRY'ing retrieve_variable changes

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/render_test.rb

commit dfab28b	refs/heads/master
Author: Tieg Zaharia 
Date:   2012-04-16 13:53:51 -0400

    catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/render_test.rb

commit dcc11b2	refs/tags/v3.2.5
Author: Tieg Zaharia 
Date:   2012-04-16 13:53:51 -0400

    catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/render_test.rb

commit 86c640a	refs/heads/master
Merge: a0c2cfd 387d4e7
Author: Aaron Patterson 
Date:   2012-04-16 10:52:40 -0700

    Merge pull request #5864 from vatrai/remove_ordered_hash_autoload
    
    remove autoload for OrderedHash, usages removed already

commit 387d4e7	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-04-16 22:22:36 +0530

    remove autoload for OrderedHash, usages removed already

M	activesupport/lib/active_support.rb

commit a0c2cfd	refs/heads/master
Merge: 625f4b9 41af36f
Author: Jeremy Kemper 
Date:   2012-04-16 09:06:58 -0700

    Merge pull request #5835 from asanghi/master
    
    Update Gemfile to use 'debugger' instead of unmaintained 'ruby-debug19'

commit 625f4b9	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-04-16 08:55:43 -0700

    Relax multi_json dependency to allow any 1.3 -> 1.x instead of just 1.3.x

M	activesupport/activesupport.gemspec

commit 4db5b55	refs/heads/master
Merge: fd12fe6 21f6d72
Author: Jeremy Kemper 
Date:   2012-04-16 07:51:18 -0700

    Merge pull request #5863 from rosenfeld/explicit-log-level
    
    Make log_level explicit in production.rb template

commit 4274a81	refs/tags/v3.1.6
Merge: 8c3ca29 eeba535
Author: Jeremy Kemper 
Date:   2012-04-16 07:47:58 -0700

    Merge pull request #5862 from arunagw/multi_json_fix_3-1-stable
    
    Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3

commit 9a97699	refs/tags/v3.2.5
Merge: a748eca 9b14e3f
Author: Jeremy Kemper 
Date:   2012-04-16 07:47:36 -0700

    Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable
    
    Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3

commit 9b14e3f	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-04-16 20:10:40 +0530

    multi_json is restricted to < 1.3
    
    Some API changes are there above 1.3.
    3-2-stable

M	activesupport/activesupport.gemspec

commit eeba535	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-04-16 20:08:58 +0530

    multi_json is restricted to < 1.3.
    
    Some API changes are there above 1.3.

M	activesupport/activesupport.gemspec

commit 21f6d72	refs/heads/master
Author: Rodrigo Rosenfeld Rosas 
Date:   2012-04-16 11:17:40 -0300

    Make log_level explicit in production.rb template
    
    The 'production' environment name is currently checked for setting up
    the default log_level to 'info' but that won't work if the environment
    is copied to staging.rb, for instance. Better to have it explicitly set.

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit fd12fe6	refs/heads/master
Merge: 039a118 57baa0e
Author: Piotr Sarnacki 
Date:   2012-04-16 06:48:01 -0700

    Merge pull request #5860 from arunagw/multi_json_upgrade_fix
    
    fixed broken build after multi_json upgrade

commit 57baa0e	refs/heads/master
Author: Arun Agrawal 
Date:   2012-04-16 19:10:04 +0530

    fixed broken build after multi_json upgrade
    
    Multi_json also upgraded.

M	activesupport/activesupport.gemspec
M	activesupport/lib/active_support/json/decoding.rb

commit 039a118	refs/heads/master
Merge: d97efd9 ba3e275
Author: Piotr Sarnacki 
Date:   2012-04-16 05:27:08 -0700

    Merge pull request #5856 from arunagw/build_fix_master
    
    fix scaffold_generator_test.rb

commit d97efd9	refs/heads/master
Merge: b8f7482 3638881
Author: Vijay Dev 
Date:   2012-04-16 03:37:17 -0700

    Merge pull request #5858 from bsodmike/master
    
    Update Rails 3.2.3 release date in changelogs as March 30, 2012

commit 3638881	refs/heads/master
Author: Michael de Silva 
Date:   2012-04-16 13:20:53 +0300

    Update Rails 3.2.3 release date in changelogs as March 30, 2012
    
    The release date details have been taken from
    http://weblog.rubyonrails.org/2012/3/30/ann-rails-3-2-3-has-been-released/

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit ba3e275	refs/heads/master
Author: Arun Agrawal 
Date:   2012-04-16 09:44:50 +0530

    fix scaffold_generator_test.rb and model_generator_test.rb
    
    Broken after this 6a054b0038bac288a1f6e45feb5470f4ee492081

M	railties/test/generators/model_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit b8f7482	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-15 18:13:15 -0700

    opening a connection will block if the pool is full

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit a748eca	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-04-15 23:37:16 +0200

    Add missing require in Active Support time zones (fixes #5854)
    
    I also removed the other require as it's already present in
    `activesupport/core_ext/time/calculations`

M	activesupport/lib/active_support/core_ext/time/zones.rb

commit 9a4bfd0	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-15 23:43:48 +0200

    Require for time_with_zone should stay in core_ext/time_zones :bomb:

M	activesupport/lib/active_support/core_ext/time/zones.rb

commit 6a6b799	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-15 23:37:16 +0200

    Add missing require in Active Support time zones (fixes #5854)
    
    I also removed the other require as it's already present in
    `activesupport/core_ext/time/calculations`

M	activesupport/lib/active_support/core_ext/time/zones.rb

commit 749ced1	refs/heads/master
Author: luke 
Date:   2012-04-15 20:54:04 +0200

    Fixed a typo in migrations

M	guides/source/migrations.textile

commit 6e8a1bd	refs/heads/master
Author: Jan Xie 
Date:   2012-04-15 20:42:58 +0800

    fix ActiveModel::Validations::Callbacks doc

M	activemodel/lib/active_model/validations/callbacks.rb

commit 6a054b0	refs/heads/master
Merge: d55eea1 ca0af82
Author: Jeremy Kemper 
Date:   2012-04-14 16:36:50 -0700

    Merge pull request #5262 from joshuap/references_index
    
    Automatically create indexes for references/belongs_to statements in migrations.

commit ca0af82	refs/heads/master
Author: Joshua Wood 
Date:   2012-03-02 17:59:23 -0800

    Automatically create indexes for references/belongs_to statements in migrations.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/rails/generators/active_record/model/model_generator.rb
A	activerecord/test/cases/migration/references_index_test.rb
M	activerecord/test/cases/migration_test.rb
M	guides/source/migrations.textile
M	railties/lib/rails/generators/generated_attribute.rb

commit d55eea1	refs/heads/master
Merge: f707f68 8a28e73
Author: José Valim 
Date:   2012-04-14 07:58:07 -0700

    Merge pull request #5846 from nashby/patch-1
    
    remove extra new line from generated Gemfile

commit 8a28e73	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-04-14 17:51:33 +0300

    remove extra new line from generated Gemfile

M	railties/lib/rails/generators/app_base.rb

commit f707f68	refs/heads/master
Merge: d1f4cda 978221b
Author: Santiago Pastorino 
Date:   2012-04-14 04:27:52 -0700

    Merge pull request #5842 from oscardelben/refactoring_notify_observers
    
    Rename notify_observers argument *arg to *args to make it more clear

commit 0631b26	refs/heads/master
Author: Michael de Silva 
Date:   2012-04-14 11:58:43 +0300

    fix bad format [ci skip]

M	activemodel/lib/active_model/model.rb

commit 978221b	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-14 10:54:10 +0200

    Rename notify_observers argument *arg to *args to make it more clear
    that the method accepts multiple arguments

M	activemodel/lib/active_model/observing.rb

commit 27d6ccd	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-14 10:48:53 +0200

    Rename Observing#count_observers to Observing#observers_count

M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observing_test.rb

commit d1f4cda	refs/heads/master
Merge: 789bade 7d65585
Author: Jon Leighton 
Date:   2012-04-14 01:21:49 -0700

    Merge pull request #5837 from yahonda/new_sequence_name_is_too_long
    
    Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix

commit 92a6cf0	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-14 10:35:44 +0300

    Improve example in initializer

M	activemodel/lib/active_model/model.rb

commit 1d08ce5	refs/heads/master
Author: Dave Gerton 
Date:   2012-04-13 13:02:40 -1000

    Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA.

M	activesupport/lib/active_support/values/time_zone.rb

commit 41af36f	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-04-14 01:45:48 +0530

    Hey, let's just make it easier for everyone and dump the unmaintained ruby-debug19 and move to debugger. Whats the consensus here? If we want better adoption on ruby1.9, please lets just use this fork.

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 418fb91	refs/heads/master
Author: Bertrand Chardon 
Date:   2012-04-13 12:08:03 -0700

    SQL query formatting
    
    Reformatted two SQL queries in Section 6) and 7) to avoid horizontal
    scrolling where possible.

M	guides/source/active_record_querying.textile

commit 789bade	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 19:59:50 +0100

    extract deprecated code for #find, #first, #last, #all

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 5aea01a	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 19:25:51 +0100

    extract deprecated #calculate code

M	activerecord/lib/active_record/relation/calculations.rb

commit d961f49	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 19:06:35 +0100

    move code out to active_record_deprecated_finders

M	activerecord/lib/active_record/relation/batches.rb

commit 1ad138c	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 18:26:04 +0100

    fix tests

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/relation_test.rb

commit 012bab8	refs/heads/master
Merge: 1391d74 f49d766
Author: Jon Leighton 
Date:   2012-04-13 08:54:14 -0700

    Merge pull request #5832 from kennyj/fix_5267
    
    Fix a wrong return value from reset_sequence_name method.

commit 1391d74	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 16:46:55 +0100

    move some of the update_all implementation to active_record_deprecated_finders

M	activerecord/lib/active_record/relation.rb

commit 1344ed4	refs/heads/master
Merge: 60ac540 491c680
Author: Piotr Sarnacki 
Date:   2012-04-13 08:40:53 -0700

    Merge pull request #5814 from lest/patch-4
    
    don't duplicate default values in text helper

commit f49d766	refs/heads/master
Author: kennyj 
Date:   2012-04-14 00:33:25 +0900

    Fix wrong return value from reset_sequence_name method.

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit 60ac540	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 16:17:28 +0100

    now we can just manipulate the values hash in #only and #except

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_test.rb

commit 6311975	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 15:59:47 +0100

    use a hash to store relation values

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_test.rb

commit 2f9fdbf	refs/tags/v3.2.5
Author: ask 
Date:   2012-04-09 22:26:52 +0600

    "rails new -h" shows message in rails directory

M	railties/lib/rails/commands.rb
M	railties/test/generators/app_generator_test.rb

commit 1480dfa	refs/heads/master
Merge: 7e0b6b2 00725d0
Author: Jon Leighton 
Date:   2012-04-13 05:49:51 -0700

    Merge pull request #5823 from avakhov/ac-test-case-remove-obsolete-code
    
    Remove obsolete code

commit 7e0b6b2	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 13:15:23 +0100

    doesn't make sense for select! to take a block

M	activerecord/lib/active_record/relation/query_methods.rb

commit be89e9a	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 13:12:28 +0100

    remove apply_finder_options call from AssociationScope

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_test.rb

commit 8d5be98	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 12:58:13 +0100

    Make Relation#extending work like other value methods

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_test.rb

commit 55ee6ed	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 12:22:19 +0100

    Add Relation#merge!

M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_test.rb

commit f52253c	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 12:15:43 +0100

    assert valid keys

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/test/cases/relation_test.rb

commit 0183193	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 12:10:51 +0100

    Allow Relation#merge to take a hash

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_test.rb

commit e4f0fbd	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 10:43:12 +0100

    we have no need for the ASSOCIATION_METHODS constant

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_test.rb

commit a258c27	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-13 10:35:24 +0100

    we don't need to test that constant assignment works

M	activerecord/test/cases/relation_test.rb

commit 88d1faf	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-12 18:28:54 +0100

    refactoring

M	activerecord/lib/active_record/relation/merger.rb

commit 3b86336	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-12 16:29:18 +0100

    Extract clusterfuck method for surgery

A	activerecord/lib/active_record/relation/merger.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb

commit 7d65585	refs/heads/master
Author: Yasuo Honda 
Date:   2012-04-13 07:19:38 -0400

    Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix

M	activerecord/test/cases/migration_test.rb

commit 38148a0	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-13 11:20:20 +0600

    Fix comment in AD http response
    
    response in integration test accessible without @ via attr_reader

M	actionpack/lib/action_dispatch/http/response.rb

commit 74f9bdd	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-13 10:01:35 +0600

    Fix HTML sanitizer allowed_css_properties comment

M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb

commit 4e3e513	refs/heads/master
Merge: 8c2c605 dcb2279
Author: Xavier Noria 
Date:   2012-04-12 19:58:08 -0700

    Merge pull request #5830 from raganwald/master
    
    Update RDoc to mention integer coercion in ActiveRecord’s find by id

commit dcb2279	refs/heads/master
Author: Reg Braithwaite 
Date:   2012-04-12 22:55:11 -0400

    mention that coercion only happens when the primary key is an integer and use +to_i+ formatting

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 859a91b	refs/heads/master
Author: Reg Braithwaite 
Date:   2012-04-12 22:24:21 -0400

    Documents that ActiveRecord's find by id uses to_i to coerce its arguments to integers

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 944ed4b	refs/heads/master
Author: Rodrigo Flores 
Date:   2012-04-12 22:12:08 -0300

    Revert "Added documentation to explain what happens if you don't set any values for the dependent option on has_many"
    
    This reverts commit 820a677d8622a540188704941a31871ed4d61461.

M	activerecord/lib/active_record/associations.rb

commit 820a677	refs/heads/master
Author: Rodrigo Flores 
Date:   2012-04-12 21:51:35 -0300

    Added documentation to explain what happens if you don't set any values for the dependent option on has_many

M	activerecord/lib/active_record/associations.rb

commit b744199	refs/heads/master
Author: Michael de Silva 
Date:   2012-04-13 01:24:43 +0300

    Add documentation to detail passing of an object as the second
    parameter passed to the ActiveSupport::Notifications.subscribe
    method instead of a block
    
    Example code sample and output is provided as well.

M	activesupport/lib/active_support/notifications.rb

commit 32df313	refs/heads/master
Author: Michael de Silva 
Date:   2012-04-13 00:48:53 +0300

    Fix further typos in ActiveSupport::Notifications

M	activesupport/lib/active_support/notifications.rb

commit 702d25e	refs/heads/master
Author: Michael de Silva 
Date:   2012-04-13 00:44:14 +0300

    Fix rdoc typo in ActiveSupport::Notifications

M	activesupport/lib/active_support/notifications.rb

commit 00725d0	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-12 23:42:24 +0600

    Remove obsolete code

M	actionpack/lib/action_controller/test_case.rb

commit 365b8b6	refs/heads/master
Author: kennyj 
Date:   2012-03-30 03:51:08 +0900

    Fix #5563. Should reflect the most recent change to either of association / id.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 0f3901e	refs/heads/master
Author: kennyj 
Date:   2012-04-12 20:33:06 +0900

    @stale_state should be nil when a model isn't saved.

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/associations/through_association.rb

commit 8c2c605	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-12 17:55:39 +0100

    Add bang versions of relation query methods.
    
    The main reason for this is that I want to separate the code that does
    the mutating from the code that does the cloning.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_test.rb

commit 5c51cd0	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-04-12 09:52:41 -0700

    #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.

M	actionpack/lib/action_controller/metal/data_streaming.rb

commit 611020b	refs/heads/master
Author: kennyj 
Date:   2012-04-13 01:25:58 +0900

    Fix typo on the add_index.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit efa9a1f	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-04-12 21:49:32 +0530

    fix typo in readme [ci skip]

M	activemodel/README.rdoc

commit c0e6a85	refs/tags/v3.2.5
Author: Prem Sichanugrist 
Date:   2012-04-09 09:48:30 -0400

    Fix code example in generator test case

M	railties/lib/rails/generators/test_case.rb

commit 8248f42	refs/heads/master
Merge: 6cab760 05ac392
Author: Vijay Dev 
Date:   2012-04-12 21:44:11 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 6cab760	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-12 21:29:03 +0530

    avoid autolinking by rdoc [ci skip]

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 018e832	refs/heads/master
Merge: 65be11f 300868d
Author: Jon Leighton 
Date:   2012-04-12 09:02:39 -0700

    Merge pull request #2733 from dasch/improve-delegate
    
    Improve the performance of #delegate

commit 65be11f	refs/heads/master
Merge: eda65f3 1e417d5
Author: Jon Leighton 
Date:   2012-04-12 09:01:10 -0700

    Merge pull request #5722 from kennyj/some_refactor_for_association
    
    Some refactor for association.

commit 05ac392	refs/heads/master
Author: Alfonso Cora 
Date:   2012-04-12 12:20:12 -0300

    Fixed markup in security guide

M	guides/source/security.textile

commit 1e417d5	refs/heads/master
Author: kennyj 
Date:   2012-04-04 01:29:19 +0900

    Some refactor for association.
    
    * Remove unused association_class method.
    * Remove a unnecessary assignment.
    * Move @updated to BelongsToAssociation that only reference this instance variable.
    * Reset @stale_state at the reset method. I think this place is right place.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/lib/active_record/associations/collection_association.rb

commit 0e49ef4	refs/heads/master
Author: Patrick Helm 
Date:   2012-04-12 16:25:28 +0200

    Provided fix for calling rake tasks within mountable engines

M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb

commit eda65f3	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-12 15:02:00 +0100

    move apply_finder_options to active_record_deprecated_finders

M	activerecord/lib/active_record/relation/spawn_methods.rb

commit dd2c9b9	refs/heads/master
Author: Jon Leighton 
Date:   2012-04-12 14:48:33 +0100

    add active_record_deprecated_finders as a dep

M	Gemfile
M	activerecord/activerecord.gemspec
M	activerecord/lib/active_record.rb

commit 300868d	refs/heads/master
Author: Daniel Schierbeck 
Date:   2012-04-12 15:03:19 +0200

    Remove the addition to the guides

M	guides/source/active_support_core_extensions.textile

commit 1d48e50	refs/heads/master
Author: Daniel Schierbeck 
Date:   2012-04-12 14:59:21 +0200

    Add changelog entry

M	activesupport/CHANGELOG.md

commit e473e1f	refs/tags/v3.2.5
Merge: e0fd4fc 96d81e5
Author: Jeremy Kemper 
Date:   2012-04-12 05:57:52 -0700

    Merge pull request #5820 from arunagw/more_ruby-2-0-fixes
    
    Update test for Ruby 2 compatibility

commit 5fb6bd8	refs/heads/master
Author: Daniel Schierbeck 
Date:   2012-04-12 14:55:30 +0200

    Remove Module#delegate!

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 402a119	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-10-11 15:38:17 +0200

    Add back the old `deprecate` method as `deprecate!`

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 3b1537a	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-09-01 15:23:32 +0200

    Document the changes to delegate in the guides

M	guides/source/active_support_core_extensions.textile

commit 2310db3	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-09-01 15:07:40 +0200

    Change API docs regarding delegation to non-public methods

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 1bac04e	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-29 13:07:03 +0200

    Optimize the performance of #delegate
    
    Remove the use of #__send__ in order to boost performance. This also
    means that you can no longer delegate to private methods on the
    target object.

M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit 96d81e5	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-26 11:32:21 -0700

    test against ruby features in order to fix tests on Ruby 2.0

M	activemodel/test/cases/attribute_methods_test.rb

commit 1db54df	refs/heads/master
Merge: e177525 47cbfbb
Author: Santiago Pastorino 
Date:   2012-04-11 19:43:50 -0700

    Merge pull request #5746 from jmbejar/index_method_form_builder
    
    Add method FormBuilder#index

commit 47cbfbb	refs/heads/master
Author: Jorge Bejar 
Date:   2012-04-05 13:17:11 -0300

    Add index method to FormBuilder. Useful when you use field_for and need to know the index number into the iteration.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit e177525	refs/heads/master
Merge: 19ecde0 e6cfd76
Author: Jon Leighton 
Date:   2012-04-11 16:20:42 -0700

    Merge pull request #5736 from oscardelben/configuration_errors_reporting
    
    Add better errors reporting for ActiveModel::Configuration

commit 19ecde0	refs/heads/master
Merge: ddefdd7 bfb9b71
Author: Jon Leighton 
Date:   2012-04-11 16:18:36 -0700

    Merge pull request #5720 from kennyj/should_use_klass_method
    
    Get a properly aliased_table_name, when we use a polymorphic association.

commit ddefdd7	refs/heads/master
Merge: 6da5002 1a20683
Author: Jon Leighton 
Date:   2012-04-11 15:41:02 -0700

    Merge pull request #5809 from xuanxu/null_relation_methods
    
    Override AR::Relation methods in NullRelation.

commit 63bd01d	refs/heads/master
Author: Tim Harvey 
Date:   2012-04-11 17:10:21 -0300

    Grammar fix in 3.2 Release Notes guide
    
    Could also be worded 'as an option', but plural made more sense given
    the mention of ':handlers and :formats'.

M	guides/source/3_2_release_notes.textile

commit 491c680	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-11 22:09:25 +0300

    don't duplicate default values in text helper

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 3bcfa61	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-11 22:43:50 +0530

    copy editing [ci skip]

M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

commit 4fb6527	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-11 22:39:36 +0530

    Revert "add instructions for adding additional manifests"
    
    This reverts commit f28f1d70b3f3dd9f694067f7cab2e717e302ee2b.
    
    Reason: This is already covered in this guide elsewhere.

M	guides/source/asset_pipeline.textile

commit 02a5847	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-11 22:37:17 +0530

    fix bad format [ci skip]

M	activemodel/README.rdoc

commit 6da5002	refs/heads/master
Merge: b79b784 332c3e1
Author: Xavier Noria 
Date:   2012-04-11 09:04:31 -0700

    Merge pull request #5792 from lest/patch-4
    
    no need in temporary array in number_to_phone helper

commit 1a20683	refs/heads/master
Author: Juanjo Bazán 
Date:   2012-04-11 15:24:23 +0200

    Override AR::Relation methods in NullRelation.
    So a NullRelation (Relation#none) is chainable with database methods.

M	activerecord/lib/active_record/null_relation.rb
M	activerecord/test/cases/relations_test.rb

commit b79b784	refs/heads/master
Merge: 1c8e222 248fa70
Author: Xavier Noria 
Date:   2012-04-11 04:24:13 -0700

    Merge pull request #5805 from dcurtis/master
    
    Corrected grammatical errors in schema_dumper and scoping/default

commit 248fa70	refs/heads/master
Author: dcurtis 
Date:   2012-04-10 22:05:43 -0700

    Corrected grammatical errors in schema_dumper and scoping/default

M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/lib/active_record/scoping/default.rb

commit 1c8e222	refs/heads/master
Merge: 84adc21 6f6c290
Author: Aaron Patterson 
Date:   2012-04-10 19:57:27 -0700

    Merge pull request #5649 from rafaelfranca/fix-delete_all
    
    Fix delete_all when chained with joins.

commit 6f6c290	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-29 00:42:24 -0300

    Fix delete_all when chained with joins.
    
    Closes #5202 and #919

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/persistence_test.rb

commit e0fd4fc	refs/tags/v3.2.5
Merge: a85ffd0 fedd87c
Author: Jeremy Kemper 
Date:   2012-04-10 08:41:05 -0700

    Merge pull request #5800 from arunagw/bigdecimal_dup
    
    Backport BigDecimal#duplicable? feature check from master

commit fedd87c	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-20 10:38:43 -0700

    probably should require the objects we monkey patch.

M	activesupport/lib/active_support/core_ext/object/duplicable.rb

commit 2991370	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-20 09:51:22 -0700

    bigdecimal can be duped on Ruby 2.0
    
    Conflicts:
    
    	activesupport/test/core_ext/duplicable_test.rb

M	activesupport/lib/active_support/core_ext/object/duplicable.rb
M	activesupport/test/core_ext/duplicable_test.rb

commit ca0c0a2	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-01-05 14:59:05 -0800

    add the class name to the assertion message

M	activesupport/test/core_ext/duplicable_test.rb

commit a85ffd0	refs/tags/v3.2.5
Merge: dab76b1 b1c28d7
Author: Vijay Dev 
Date:   2012-04-10 00:55:05 -0700

    Merge pull request #5799 from arunagw/readme_fix
    
    Readme fix

commit b1c28d7	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-04-10 13:07:23 +0530

    README fix! [skip ci]

M	activeresource/README.rdoc

commit 7298904	refs/heads/master
Author: Jonathan Mazin 
Date:   2012-04-09 15:41:50 -0300

    Fix small markup error; fix incorrect link

M	activemodel/README.rdoc

commit 332c3e1	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-09 21:40:54 +0300

    no need in temporary array in number_to_phone helper

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 84adc21	refs/heads/master
Merge: e065312 4bb76ee
Author: Santiago Pastorino 
Date:   2012-04-09 10:21:28 -0700

    Merge pull request #5788 from Ask11/rails_new_help
    
    "rails new -h" shows message in rails directory

commit dab76b1	refs/tags/v3.2.5
Merge: b125db8 6f19262
Author: Xavier Noria 
Date:   2012-04-09 10:05:32 -0700

    Merge pull request #5725 from kevmoo/remove_unused_castcode
    
    Remove unused castcode

commit e065312	refs/heads/master
Merge: 68a9788 283133a
Author: Santiago Pastorino 
Date:   2012-04-09 09:52:28 -0700

    Merge pull request #5787 from frankieroberto/itemscope-patch
    
    Adding itemscope to list of boolean attributes.

commit 4bb76ee	refs/heads/master
Author: ask 
Date:   2012-04-09 22:26:52 +0600

    "rails new -h" shows message in rails directory

M	railties/lib/rails/commands.rb
M	railties/test/generators/app_generator_test.rb

commit b125db8	refs/tags/v3.2.5
Author: Xavier Noria 
Date:   2012-04-09 18:26:23 +0200

    rewords the section about default_url_options in the Action Controller Overview guide

M	railties/guides/source/action_controller_overview.textile

commit 68a9788	refs/heads/master
Author: Xavier Noria 
Date:   2012-04-09 18:26:23 +0200

    rewords the section about default_url_options in the Action Controller Overview guide

M	guides/source/action_controller_overview.textile

commit bdac19e	refs/heads/master
Merge: f28f1d7 cf03daa
Author: Patrick Sharp 
Date:   2012-04-09 08:54:22 -0500

    Merge branch 'master' of github.com:lifo/docrails

commit f28f1d7	refs/heads/master
Author: Patrick Sharp 
Date:   2012-04-09 08:54:02 -0500

    add instructions for adding additional manifests

M	guides/source/asset_pipeline.textile

commit cf03daa	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-04-09 09:48:30 -0400

    Fix code example in generator test case

M	railties/lib/rails/generators/test_case.rb

commit 283133a	refs/heads/master
Author: Frankie Roberto 
Date:   2012-04-09 12:23:46 +0100

    Adding itemscope to list of boolean attributes.
    
    'itemscope' is defined within HTML5 for use in microdata markup. See
    http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht
    ml#attr-itemscope

M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/tag_helper_test.rb

commit e7671b5	refs/tags/v3.2.5
Merge: 05d4ccf 6f4f499
Author: Santiago Pastorino 
Date:   2012-04-08 20:58:09 -0700

    Merge pull request #5784 from rafaelfranca/default_url-3-2
    
    [3-2-stable] Document that default_url_options must return a hash with symbolized keys

commit 4c1dcb0	refs/heads/master
Merge: 500c9a1 c9945b3
Author: Santiago Pastorino 
Date:   2012-04-08 20:10:14 -0700

    Merge pull request #5783 from rafaelfranca/default_url_options
    
    Document that default_url_options must return a hash with symbolized keys

commit 6f4f499	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-08 23:54:59 -0300

    Document that default_url_options must return a hash with symbolized
    keys

M	railties/guides/source/action_controller_overview.textile

commit c9945b3	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-08 23:44:26 -0300

    Document that default_url_options must return a hash with symbolized
    keys

M	guides/source/action_controller_overview.textile

commit 5c7bcfc	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-08 23:54:36 -0300

    default_url_options does not receive one argument anymore

M	actionpack/test/controller/base_test.rb
M	actionpack/test/template/url_helper_test.rb
M	railties/guides/source/action_controller_overview.textile

commit 9efe01e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-08 23:42:02 -0300

    default_url_options does not receive one argument anymore

M	actionpack/test/controller/base_test.rb
M	actionpack/test/template/url_helper_test.rb
M	guides/source/action_controller_overview.textile

commit 500c9a1	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-04-08 22:43:22 -0300

    Revert "Merge pull request #5750 from ahoward/master"
    
    This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing
    changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a.
    The reverted commit improved the performance in the wrong place, now we
    have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement.

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/controller/url_for_test.rb

commit 6ddbd18	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-04-08 22:30:18 -0300

    Inline the symbolize_keys/stringify_keys methods
    
    user     system      total        real
    symbolize_keys  5.980000   0.070000   6.050000 (  6.048187)
    new_symbolize_keys  4.310000   0.050000   4.360000 (  4.364745)

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 2e43159	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-04-08 22:10:03 -0300

    Remove Fixnum#to_sym support in 1.8.7

M	activesupport/lib/active_support/core_ext/hash/keys.rb

commit 8f25db9	refs/heads/master
Author: Gaurish Sharma 
Date:   2012-04-09 01:41:04 +0530

    Added instructions on port number

M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

commit 9f37f33	refs/heads/master
Merge: e4f911a 402576b
Author: Jeremy Kemper 
Date:   2012-04-08 11:30:18 -0700

    Merge pull request #5718 from benedikt/master
    
    Removes caching from ActiveRecord::Core::ClassMethods#relation

commit e4f911a	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-04-08 07:28:31 -0700

    Fix a couple more script[type=text/javascript] tests affected by #5748

M	railties/test/application/asset_debugging_test.rb
M	railties/test/application/assets_test.rb

commit 0032da1	refs/heads/master
Merge: d2726a9 f3fb416
Author: Jeremy Kemper 
Date:   2012-04-08 06:56:44 -0700

    Merge pull request #5748 from ai/no_type_in_html5
    
    Remove unnecessary in HTML 5 type attribute with default value

commit 2c72a4a	refs/heads/master
Author: Jan Xie 
Date:   2012-04-08 19:21:10 +0800

    fix doc for ActiveSupport::Callbacks::Callback#define_conditional_callback

M	activesupport/lib/active_support/callbacks.rb

commit d2726a9	refs/heads/master
Merge: 206974a c5abd06
Author: Vijay Dev 
Date:   2012-04-08 02:20:55 -0700

    Merge pull request #5773 from trevor/patch-1
    
    url in comments - active_support/core_ext/integer/time.rb

commit cd6ddc8	refs/heads/master
Author: Doug Cole 
Date:   2012-04-07 18:23:26 -0700

    refactor configuration of insert_returning

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

commit c5abd06	refs/heads/master
Author: Trevor Wennblom 
Date:   2012-04-07 18:05:36 -0500

    update stdlib doc urls in comments - active_support/core_ext/[integer|numeric]/time.rb
    
    http://stdlib.rubyonrails.org/ last updated in 2005

M	activesupport/lib/active_support/core_ext/integer/time.rb
M	activesupport/lib/active_support/core_ext/numeric/time.rb

commit 206974a	refs/heads/master
Author: Xavier Noria 
Date:   2012-04-08 01:09:36 +0200

    adds a new test case for titleize

M	activesupport/test/inflector_test_cases.rb

commit 0864d6d	refs/heads/master
Merge: af422bf 1e36e02
Author: Piotr Sarnacki 
Date:   2012-04-07 15:07:16 -0700

    Merge pull request #5759 from romanvbabenko/refactor/rails_module_singleton_class_varibles
    
    Class variables has been fixed to Singleton instance variables at Rails ...

commit af422bf	refs/heads/master
Merge: 4b685aa fd3f550
Author: Xavier Noria 
Date:   2012-04-07 15:03:27 -0700

    Merge pull request #5772 from lest/patch-4
    
    use extract_options! in cycle helper

commit 4b685aa	refs/heads/master
Author: Xavier Noria 
Date:   2012-04-07 23:49:28 +0200

    revises the regexp used in titleize
    
    The regexp used in titleize matches saxon genitive
    and other contractions, only to call capitalize on
    the captured text and have the apostrophe upcased
    which yields the apostrophe itself. It is more
    clear that the regexp matches just what it has to
    match.

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test_cases.rb

commit cf9664a	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-08 02:13:51 +0530

    fix markup error [ci skip]

M	activerecord/lib/active_record/base.rb

commit b653c29	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-08 01:56:41 +0530

    avoid empty api pages

M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/abstract_controller/base.rb
M	actionpack/lib/abstract_controller/logger.rb

commit fd3f550	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-07 22:03:17 +0300

    use extract_options! in cycle helper

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 05d4ccf	refs/tags/v3.2.5
Author: Anil Wadghule 
Date:   2012-04-06 14:50:45 +0530

    Fix 'Everyday Git' link

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit bcd2269	refs/heads/master
Merge: 91b0ffc ef493c9
Author: Vijay Dev 
Date:   2012-04-07 22:11:47 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit ef493c9	refs/heads/master
Author: Ryan Bigg 
Date:   2012-04-07 11:23:47 -0500

    Don't use arel_table in published_and_commented example in querying guide

M	guides/source/active_record_querying.textile

commit 91b0ffc	refs/heads/master
Merge: 29089bf 13688cf
Author: Vijay Dev 
Date:   2012-04-07 08:04:44 -0700

    Merge pull request #5766 from lest/patch-4
    
    pass default value as argument to fetch

commit 83d4ce6	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-07 16:58:32 +0530

    Revert "Documents that ActiveRecord instances also support []/[]= methods for reading/writing attributes"
    
    This reverts commit a49fe6ec2cb9f22a3b18d7db5ae2ee90325e9d09.
    
    Reason: The existing doc about using self[:attribute] is clear enough.

M	activerecord/lib/active_record/base.rb

commit 5916403	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-07 16:47:32 +0530

    Revert "Where migration can get wrong help added"
    
    This reverts commit b11113f924d2eb2acbe836954d17a02163f45275.

M	guides/source/migrations.textile

commit e0672a8	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-07 16:47:28 +0530

    copy editing [ci skip]

M	guides/source/migrations.textile

commit c007d87	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-07 14:54:55 +0600

    Fix example action dispatch in mime type

M	actionpack/lib/action_dispatch/http/mime_type.rb

commit 13688cf	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-06 22:18:21 +0300

    pass default value as argument to fetch

M	actionpack/lib/action_view/helpers/tags/base.rb

commit bfd5c84	refs/tags/v3.2.5
Merge: 56d9945 1cd939a
Author: Vijay Dev 
Date:   2012-04-06 11:31:52 -0700

    Merge pull request #5765 from anildigital/3-2-stable
    
    Update getting started guide to change Rails version to Rails 3.2

commit 1cd939a	refs/tags/v3.2.5
Author: Anil Wadghule 
Date:   2012-04-06 23:40:05 +0530

    Fix Rails version in getting started guide.

M	railties/guides/source/getting_started.textile

commit a49fe6e	refs/heads/master
Author: Rodrigo Rosenfeld Rosas 
Date:   2012-04-06 11:31:29 -0300

    Documents that ActiveRecord instances also support []/[]= methods for reading/writing attributes
    
    Only write_attribute and read_attribute were documented and there was no mention to this alternative.

M	activerecord/lib/active_record/base.rb

commit 871cc8c	refs/heads/master
Author: Anil Wadghule 
Date:   2012-04-06 14:50:45 +0530

    Fix 'Everyday Git' link

M	guides/source/contributing_to_ruby_on_rails.textile

commit 5890ced	refs/heads/master
Author: xyctka@gmail.com 
Date:   2012-04-06 10:04:26 +0100

    Better class name

M	guides/source/i18n.textile

commit 74fa0d3	refs/heads/master
Author: xyctka@gmail.com 
Date:   2012-04-06 10:01:34 +0100

    Update Custom Exception Handler section of Internationalization guide
    
    The previous example with just_raise_that_exception method
    stopped working because MissingTranslation is not an instance of
    Exception class any more, but has a +to_exception+ method.
    
    Also the cleaner way is to re-raise only the desired exception, passing
     everything else to the default ExceptionHandler.
    
     Additionally this re-raising conflicts with Pluralization backend thus
     we have to add a check that certain missing translation keys should
     be ignored allowing the backend to fall back to the default
     pluralization rule.

M	guides/source/i18n.textile

commit 1e36e02	refs/heads/master
Author: Roman V. Babenko 
Date:   2012-04-06 07:59:57 +0300

    Class variables has been fixed to Singleton instance variables at Rails module

M	railties/lib/rails.rb

commit 29089bf	refs/heads/master
Author: Xavier Noria 
Date:   2012-04-05 14:33:47 -0700

    revises requires of some AS deprecation files

M	activesupport/lib/active_support/core_ext/module/deprecation.rb
M	activesupport/lib/active_support/deprecation.rb
M	activesupport/lib/active_support/deprecation/method_wrappers.rb

commit 8927987	refs/heads/master
Author: Xavier Noria 
Date:   2012-04-05 14:28:03 -0700

    documents the contract for the argument of AD::Routing::RouteSet#url_for

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit b11113f	refs/heads/master
Author: Sandip Ransing 
Date:   2012-04-06 01:11:42 +0530

    Where migration can get wrong help added

M	guides/source/migrations.textile

commit e59b669	refs/heads/master
Author: Sandip Ransing 
Date:   2012-04-06 00:44:56 +0530

    Improvement to migration guide

M	guides/source/migrations.textile

commit e535faa	refs/heads/master
Merge: ca879d2 ddbd1e4
Author: Xavier Noria 
Date:   2012-04-05 11:44:17 -0700

    Merge pull request #5751 from rafaelfranca/fix-build
    
    Fix url_for when options is nil

commit ddbd1e4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-05 15:14:00 -0300

    Make url_for work when option is nil and default_url_options has
    stringified keys

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/controller/url_for_test.rb

commit 8f4cf26	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-04-05 14:30:44 -0300

    Fix url_for when options is nil
    
    RouteSet#url_for was modifying the options hash that belong to the
    caller

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit ca879d2	refs/heads/master
Merge: 163258b b621ded
Author: José Valim 
Date:   2012-04-05 10:54:51 -0700

    Merge pull request #5753 from carlosantoniodasilva/as-remove-require-and-warnings
    
    Remove circular require from AS Deprecation, and fix warnings

commit b621ded	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-05 14:44:05 -0300

    Initialize variables in file update checker to avoid warnings

M	activesupport/lib/active_support/file_update_checker.rb

commit b1e5504	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-04-05 14:44:05 -0300

    Remove not used require from as to avoid circular requires

M	activesupport/lib/active_support/deprecation/method_wrappers.rb

commit 163258b	refs/heads/master
Merge: 6446203 1651270
Author: Vijay Dev 
Date:   2012-04-05 22:30:30 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 1651270	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-05 22:28:47 +0530

    lets not show too much output and shadow the intention [ci skip]

M	guides/source/rails_on_rack.textile

commit 8a82204	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-05 22:21:27 +0530

    minor fixes [ci skip]

M	railties/lib/rails/generators/actions.rb

commit c94e450	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-05 22:14:26 +0530

    fix boolean value in guide [ci skip]

M	guides/source/migrations.textile

commit ba60686	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-05 22:11:07 +0530

    Revert "Update activemodel rdoc links"
    
    This reverts commit ddb987551357d30301ab8cd99f4580988fa83340.
    
    Reason: The links must be relative so that they will work both in edge
    and stable api sites.

M	activemodel/README.rdoc

commit 6446203	refs/heads/master
Merge: 174cf8b a37c474
Author: Xavier Noria 
Date:   2012-04-05 09:39:17 -0700

    Merge pull request #5182 from castlerock/content_tag_instead_string
    
    content_tag used instead string for option

commit 174cf8b	refs/heads/master
Merge: 7ecd6a7 99c08c7
Author: Aaron Patterson 
Date:   2012-04-05 09:31:39 -0700

    Merge pull request #5750 from ahoward/master
    
    mo fasta and mo betta the url_for

commit 7ecd6a7	refs/heads/master
Merge: 91cb99e f58ff61
Author: Xavier Noria 
Date:   2012-04-05 08:55:19 -0700

    Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetch
    
    removed unnecessary block when using fetch

commit 99c08c7	refs/heads/master
Author: ara.t.howard 
Date:   2012-04-05 07:30:54 -0600

    url_for: avoid a nil check.  unroll a loop.  handle most common case 1st.

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 91cb99e	refs/heads/master
Merge: acae4fd 2ac6735
Author: José Valim 
Date:   2012-04-05 06:20:02 -0700

    Merge pull request #4446 from ayamomiji/patch-1
    
    prevent the cache sweeper ignores NoMethodError

commit acae4fd	refs/heads/master
Merge: 4adaf7b 21d27f6
Author: Xavier Noria 
Date:   2012-04-05 05:57:22 -0700

    Merge pull request #3084 from esad/master
    
    Dependency fix for activesupport

commit 4adaf7b	refs/heads/master
Merge: a9398a7 1f4f4d4
Author: Xavier Noria 
Date:   2012-04-05 04:52:44 -0700

    Merge pull request #5747 from mneisen/patch-1
    
    Optimistic locking: lock_version needed type information.

commit f3fb416	refs/heads/master
Author: Andrey A.I. Sitnik 
Date:   2012-04-05 15:32:37 +0400

    Remove unnecessary in HTML 5 type attribute with default value

M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/erb/tag_helper_test.rb
M	actionpack/test/template/javascript_helper_test.rb
M	actionpack/test/template/url_helper_test.rb
M	guides/source/action_view_overview.textile
M	guides/source/asset_pipeline.textile
M	guides/source/layouts_and_rendering.textile
M	railties/lib/rails/generators/rails/app/templates/public/404.html
M	railties/lib/rails/generators/rails/app/templates/public/422.html
M	railties/lib/rails/generators/rails/app/templates/public/500.html
M	railties/lib/rails/generators/rails/app/templates/public/index.html

commit d70e1a9	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2012-04-05 17:30:15 +0800

    Fix slightly awkward English in Action Caching section of Caching With Rails guide.
    
    In particular, removed "pages that require to restrict access somehow" and shortened "Action Caching works like Page Caching except for the fact that the incoming web request does go from the webserver to the Rails stack and Action Pack so that before filters can be run on it before the cache is served".

M	guides/source/caching_with_rails.textile

commit 1f4f4d4	refs/heads/master
Author: Martin Eisenhardt 
Date:   2012-04-05 11:13:09 +0300

    Optimistic locking: lock_version needed type information.

M	guides/source/active_record_querying.textile

commit 0693bc2	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-05 12:07:30 +0600

    Add AC record identifier example with not-persisted object

M	actionpack/lib/action_controller/record_identifier.rb

commit 697991a	refs/heads/master
Author: ara.t.howard 
Date:   2012-04-04 16:28:19 -0600

    carefully and quickly merge url_for options

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/controller/url_for_test.rb

commit c91d07f	refs/heads/master
Author: Sandip Ransing 
Date:   2012-04-05 02:40:20 +0530

    Small improvements added to getting started

M	guides/source/getting_started.textile

commit cc3e2c5	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-04 15:23:15 +0530

    Revert "update ActionPack README links"
    
    This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046.
    
    Reason: The links are meant to be consumed in the api and not on GitHub.

M	actionpack/README.rdoc

commit 8e00a6c	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-04-04 11:16:13 +0200

    update ActionPack README links

M	actionpack/README.rdoc

commit ddb9875	refs/heads/master
Author: Jonathan Mazin 
Date:   2012-04-04 15:19:27 -0400

    Update activemodel rdoc links

M	activemodel/README.rdoc

commit 56d9945	refs/tags/v3.2.5
Merge: 6663dd0 1124ac0
Author: Santiago Pastorino 
Date:   2012-04-04 12:16:07 -0700

    Merge pull request #5737 from rafaelfranca/3-2-stable
    
    Fix tests of benchmark with silence equals to true

commit 1124ac0	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-04-04 16:14:13 -0300

    Fix tests of benchmark with silence equals to true

M	activerecord/test/cases/base_test.rb

commit a9398a7	refs/heads/master
Merge: c6bd8a9 2d8396f
Author: Santiago Pastorino 
Date:   2012-04-04 10:43:24 -0700

    Merge pull request #5716 from jurriaan/tr-gsub-cleanup
    
    Updated/changed unneeded tr/gsubs

commit 6663dd0	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-04-04 10:38:55 -0700

    Merge pull request #5188 from jlxw/patch-1
    
    logger.silence is deprecated

M	activesupport/lib/active_support/benchmarkable.rb

commit c6bd8a9	refs/heads/master
Merge: f7a76aa b16eb56
Author: Santiago Pastorino 
Date:   2012-04-04 10:38:55 -0700

    Merge pull request #5188 from jlxw/patch-1
    
    logger.silence is deprecated

commit 316cb1f	refs/heads/master
Author: Ethan Mick 
Date:   2012-04-04 11:07:33 -0400

    Updated migrations.textile to change :integer on line 807 to :boolean, as it was earlier in the example. :flag is a boolean, not an integer. (defaults to false)

M	guides/source/migrations.textile

commit f7a76aa	refs/heads/master
Merge: 02b9c22 db86b2a
Author: Santiago Pastorino 
Date:   2012-04-04 07:53:13 -0700

    Merge pull request #5733 from oscardelben/patch-5
    
    No need to extend ActiveSupport::Extend here

commit bbe31cc	refs/heads/master
Author: Hendy Tanata 
Date:   2012-04-04 22:33:09 +0800

    Improve config.assets.initialize_on_precompile guide.

M	guides/source/asset_pipeline.textile

commit e6cfd76	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-04 14:52:44 +0200

    Add better errors reporting for ActiveModel::Configuration

M	activemodel/lib/active_model/configuration.rb

commit db86b2a	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-04 15:28:13 +0300

    No need to extend ActiveSupport::Extend here

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 88f0c20	refs/heads/master
Merge: f7a1c64 30ff259
Author: Hrvoje Šimić 
Date:   2012-04-04 12:09:31 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit f7a1c64	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-04-04 12:09:10 +0200

    removed deprecated methods and middlewares

M	guides/source/rails_on_rack.textile

commit 30ff259	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-04 15:23:15 +0530

    Revert "update ActionPack README links"
    
    This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046.
    
    Reason: The links are meant to be consumed in the api and not on GitHub.

M	actionpack/README.rdoc

commit d4fa512	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-04-04 11:31:09 +0200

    added example, removed blank lines

M	railties/lib/rails/generators/actions.rb
M	railties/lib/rails/generators/base.rb

commit aeb228c	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-04-04 11:16:13 +0200

    update ActionPack README links

M	actionpack/README.rdoc

commit 02b9c22	refs/heads/master
Merge: e25eeed f89f748
Author: Vijay Dev 
Date:   2012-04-04 12:42:22 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	guides/source/engines.textile

commit f89f748	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-04 12:19:29 +0530

    Revert "rails 4 will support ruby version 1.9.4 or higher"
    
    This reverts commit 0a35acb8b89603a3135852742f206af82ed61b57.
    
    Reason: Let's cross the bridge when we reach there.

M	guides/source/upgrading_ruby_on_rails.textile

commit a3315ef	refs/heads/master
Author: Oscar Del Ben 
Date:   2012-04-04 08:45:58 +0200

    Use the more idiomatic tap method

M	activemodel/lib/active_model/attribute_methods.rb

commit e39b9b0	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-04 12:40:39 +0600

    Fix AC responder example

M	actionpack/lib/action_controller/metal/responder.rb

commit c4d3102	refs/tags/v3.2.5
Merge: 8e315b0 d46ad34
Author: Aaron Patterson 
Date:   2012-04-03 20:12:30 -0700

    Merge pull request #5727 from hone/ar_database_url_logging
    
    ActiveRecord configuration logging

commit d46ad34	refs/tags/v3.2.5
Author: Terence Lee 
Date:   2012-04-03 21:59:24 -0500

    log which config format AR uses to connect with

M	activerecord/lib/active_record/railtie.rb
M	railties/test/application/initializers/active_record_test.rb

commit 93f25ac	refs/tags/v3.2.5
Author: Terence Lee 
Date:   2012-04-03 21:50:18 -0500

    test initializer logic for DATABASE_URL env var

A	railties/test/application/initializers/active_record_test.rb

commit 6f19262	refs/tags/v3.2.5
Author: Kevin Moore 
Date:   2012-04-03 15:48:01 -0700

    Remove unused 'cast_code' variable

M	activerecord/lib/active_record/attribute_methods/read.rb

commit e25eeed	refs/heads/master
Author: Xavier Noria 
Date:   2012-04-03 16:17:45 -0700

    the file update checker now also detects removed files

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/test/file_update_checker_test.rb

commit 8e315b0	refs/tags/v3.2.5
Author: Tim Pope 
Date:   2012-04-03 12:23:32 -0400

    DATABASE_URL allows omission of database.yml

M	activerecord/lib/active_record/railtie.rb

commit a499448	refs/heads/master
Author: Tim Pope 
Date:   2012-04-03 12:23:32 -0400

    DATABASE_URL allows omission of database.yml

M	activerecord/lib/active_record/railtie.rb

commit 3b378a7	refs/heads/master
Author: Aaron Patterson 
Date:   2012-04-03 15:56:40 -0700

    use File.binread to pull in the schema cache

M	activerecord/lib/active_record/railtie.rb
M	railties/lib/rails/application/configuration.rb

commit ecb4a64	refs/heads/master
Author: Sandip Ransing 
Date:   2012-04-04 02:38:37 +0530

    typo mistake fixed
    
    correction to server stop statement added

M	guides/source/getting_started.textile

commit 0a35acb	refs/heads/master
Author: Sandip Ransing 
Date:   2012-04-04 02:10:31 +0530

    rails 4 will support ruby version 1.9.4 or higher

M	guides/source/upgrading_ruby_on_rails.textile

commit 402576b	refs/heads/master
Author: Benedikt Deicke 
Date:   2012-04-03 21:13:24 +0200

    Adds test to check that circular preloading does not modify Model.unscoped (as described in #5667)

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/comment.rb

commit 428149c	refs/heads/master
Author: Fernando Briano 
Date:   2012-04-03 15:42:18 -0300

    Fixed small typo

M	guides/source/migrations.textile

commit 3352e3b	refs/heads/master
Merge: 0cc6c5f f181d7e
Author: José Valim 
Date:   2012-04-03 11:28:14 -0700

    Merge pull request #5723 from tiegz/minor_fixes
    
    minor elsif/else typo fix

commit f181d7e	refs/heads/master
Author: Tieg Zaharia 
Date:   2012-04-03 13:45:19 -0400

    minor elsif/else typo fix

M	actionpack/lib/action_view/base.rb

commit 1827bc9	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-04-04 00:46:43 +0800

    also  replaced by 

M	guides/source/engines.textile

commit bfb9b71	refs/heads/master
Author: kennyj 
Date:   2012-04-04 01:21:35 +0900

    Get a properly aliased_table_name, when we use a polymorphic association.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 68677ff	refs/heads/master
Author: Benedikt Deicke 
Date:   2012-04-03 16:51:36 +0200

    Removes caching from ActiveRecord::Core::ClassMethods#relation
    
    The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.
    
    The four places with calls to relations are:
    
    activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
    activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
    activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
    activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"

M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/relations_test.rb

commit d586b07	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-04-03 22:34:46 +0800

    Changed engines guide not to use a css tag.  will do just fine.
    https://github.com/lifo/docrails/commit/bb23d6fb005edaf25f5b294f9215429fb44b3f3d

M	guides/source/engines.textile

commit 2d8396f	refs/heads/master
Author: Jurriaan Pruis 
Date:   2012-04-03 15:16:09 +0200

    Updated/changed useless tr/gsubs

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/lib/rails/generators/mailer/templates/mailer.rb
M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/lib/action_view/helpers/number_helper.rb
M	activemodel/lib/active_model/errors.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	guides/w3c_validator.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/resource_helpers.rb
M	railties/lib/rails/railtie.rb
M	railties/test/rails_info_test.rb

commit 0cc6c5f	refs/heads/master
Merge: a3dc8ba 5f62e88
Author: Xavier Noria 
Date:   2012-04-03 03:28:01 -0700

    Merge pull request #5713 from bolshakov/master
    
    Fix typo in "dasherize" description

commit 5f62e88	refs/heads/master
Author: Artyom Bolshakov 
Date:   2012-04-03 14:20:32 +0400

    Fix typo

M	activesupport/lib/active_support/inflector/methods.rb

commit 8c3ca29	refs/tags/v3.1.6
Merge: 5cbb20d c409d06
Author: José Valim 
Date:   2012-04-03 02:42:58 -0700

    Merge pull request #5686 from arunagw/issue_4083
    
    Issue 4083

commit e527347	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-03 12:43:13 +0600

    Remove non-obligatory params in AC respond_to examples

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit a17874e	refs/heads/master
Author: Waseem Ahmad 
Date:   2012-04-03 05:41:07 +0530

    Remove unnecessary articles.

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit a3dc8ba	refs/heads/master
Merge: 87b30fb d9e4dd1
Author: Aaron Patterson 
Date:   2012-04-02 16:18:25 -0700

    Merge pull request #5708 from romanvbabenko/refactor/add_gem_filters
    
    Unnecessary uniqueness & force mapping has been removed at BacktraceClea...

commit d9e4dd1	refs/heads/master
Author: Roman V. Babenko 
Date:   2012-04-03 01:58:40 +0300

    Unnecessary uniqueness & force mapping has been removed at BacktraceCleaner#add_gem_filters

M	railties/lib/rails/backtrace_cleaner.rb

commit f58ff61	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2012-04-02 23:43:47 +0200

    removed unnecessary block when using fetch

M	actionpack/lib/action_view/helpers/atom_feed_helper.rb

commit 87b30fb	refs/heads/master
Merge: 0b67751 e3d1585
Author: Piotr Sarnacki 
Date:   2012-04-02 13:25:57 -0700

    Merge pull request #5695 from lest/patch-1
    
    add type option to atom feed entry builder

commit 7b1abe8	refs/heads/master
Merge: 4b1ed1d bb23d6f
Author: Hrvoje Šimić 
Date:   2012-04-02 20:31:54 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 4b1ed1d	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-04-02 20:31:38 +0200

    update purpose of middleware

M	guides/source/rails_on_rack.textile

commit 0b67751	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-02 23:41:22 +0530

    fix formatting in engines guide; also removed a couple of non-existent images [ci skip]

M	guides/source/engines.textile

commit bb23d6f	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-02 23:34:47 +0530

    Revert "parse  block as code (used in engines guide) "
    
    This reverts commit c46374a9d949004761d71570a4d703838c694e74.
    
    Reason: Changed engines guide not to use a css tag.  will do
    just fine.

M	guides/rails_guides/textile_extensions.rb

commit e94437e	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-04-03 01:11:44 +0800

    wrong link to getting started guide

M	guides/source/engines.textile

commit b95aa05	refs/heads/master
Author: Hrvoje Šimić 
Date:   2012-04-02 18:31:20 +0200

    update to current rack middleware stack

M	guides/source/rails_on_rack.textile

commit c46374a	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-04-02 22:16:48 +0800

    parse  block as code (used in engines guide)

M	guides/rails_guides/textile_extensions.rb

commit 1423cf9	refs/heads/master
Author: Cezary Baginski 
Date:   2012-04-02 01:04:40 +0200

    Correct invalid route example [ci skip]

M	railties/lib/rails/generators/actions.rb

commit 515e1d3	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-04-01 01:12:49 +0200

    Usage file in generators shouldn't be fetched only based on source_root
    
    In case `source_roout` is not set, `default_source_root` is used,
    which includes also `templates` directory. If there is no `templates`
    directory, `default_source_root` is not available and USAGE will not
    be displayed. USAGE should be also checked based on default
    directory excluding `templates`.

M	railties/lib/rails/generators/base.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/migration_generator_test.rb

commit 3a0d081	refs/heads/master
Author: Doug Cole 
Date:   2012-04-01 15:23:06 -0700

    pick better names and add a little documentation

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

commit fff3e75	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-04-01 01:12:49 +0200

    Usage file in generators shouldn't be fetched only based on source_root
    
    In case `source_roout` is not set, `default_source_root` is used,
    which includes also `templates` directory. If there is no `templates`
    directory, `default_source_root` is not available and USAGE will not
    be displayed. USAGE should be also checked based on default
    directory excluding `templates`.

M	railties/lib/rails/generators/base.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/migration_generator_test.rb

commit e3d1585	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-04-01 20:07:34 +0300

    add type option to atom feed entry builder
    
    closes #5672

M	actionpack/lib/action_view/helpers/atom_feed_helper.rb
M	actionpack/test/template/atom_feed_helper_test.rb

commit fa1645a	refs/heads/master
Merge: 4850f2e d578bd4
Author: Santiago Pastorino 
Date:   2012-04-01 08:44:03 -0700

    Merge pull request #5694 from hardipe/master
    
    Tidy up cookies.rb a bit

commit 4850f2e	refs/heads/master
Merge: cf18298 dab9638
Author: Vijay Dev 
Date:   2012-04-01 07:58:59 -0700

    Merge pull request #5684 from arunagw/warning_removed_railties
    
    warning removed: `&' interpreted as argument prefix

commit cf18298	refs/heads/master
Merge: eb154c5 a5a9fc9
Author: Vijay Dev 
Date:   2012-04-01 19:53:29 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit a5a9fc9	refs/heads/master
Author: Vijay Dev 
Date:   2012-04-01 16:12:43 +0530

    copy editing [ci skip]

M	guides/source/routing.textile

commit 6e814ce	refs/heads/master
Author: Erich Menge 
Date:   2012-04-01 08:39:57 -0500

    :success includes the whole 200 range, not just 200.
    
      # File lib/rack/response.rb, line 114
    114:       def successful?;    @status >= 200 && @status < 300;       end

M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	guides/source/testing.textile

commit eb154c5	refs/heads/master
Merge: 9228aa6 806f4d8
Author: José Valim 
Date:   2012-04-01 04:45:10 -0700

    Merge pull request #5691 from avakhov/form-label-block
    
    Block version of label should wrapped in field_with_errors in case of error

commit 9228aa6	refs/heads/master
Merge: e357d5b ee235b3
Author: José Valim 
Date:   2012-04-01 04:44:25 -0700

    Merge pull request #5690 from nertzy/remove_naming_deprecation_include
    
    Don't include deprecation in ActiveModel::Naming anymore

commit e357d5b	refs/heads/master
Merge: 0244c0d 7f6bb2d
Author: José Valim 
Date:   2012-04-01 04:43:22 -0700

    Merge pull request #5692 from avakhov/force-ssl-if-test
    
    Tests :if option of force_ssl method

commit d578bd4	refs/heads/master
Author: hardi 
Date:   2012-04-01 13:08:18 +0300

    Useless/Confusing method definition removed

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 806f4d8	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-01 10:30:31 +0400

    Small #label method refactoring, thanks @rafaelfranca

M	actionpack/lib/action_view/helpers/tags/label.rb

commit 7f6bb2d	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-01 09:44:49 +0400

    Tests :if option of force_ssl method

M	actionpack/test/controller/force_ssl_test.rb

commit 889bb4b	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-04-01 00:52:48 +0400

    Block version of label should wrapped in field_with_errors in case of error

M	actionpack/lib/action_view/helpers/tags/label.rb
M	actionpack/test/template/form_helper_test.rb

commit 945c53e	refs/heads/master
Author: Doug Cole 
Date:   2012-03-31 18:41:24 -0700

    improve test coverage

M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

commit ee235b3	refs/heads/master
Author: Grant Hutchins 
Date:   2012-03-31 21:36:47 -0400

    Don't include deprecation in AM::Naming anymore

M	activemodel/lib/active_model/naming.rb

commit 20615e7	refs/heads/master
Author: Doug Cole 
Date:   2012-03-31 18:13:55 -0700

    refactor

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 3475051	refs/heads/master
Author: Doug Cole 
Date:   2012-03-31 18:13:40 -0700

    update mysql for new exec_insert signature

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 0244c0d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-31 17:21:49 -0700

    use undef_method to avoid NameError exceptions all the time

M	activesupport/lib/active_support/core_ext/module/remove_method.rb

commit f09bb33	refs/heads/master
Author: Doug Cole 
Date:   2012-03-31 13:38:11 -0700

    add use_returning as a postgresql connection config

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/schema/postgresql_specific_schema.rb

commit c409d06	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-04-01 00:21:48 +0530

    CHANGELOG entry added

M	actionpack/CHANGELOG.md

commit 54d3645	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-04-01 00:08:15 +0530

    :subdomain can now be specified with a value of false in url_for,
    
    
    allowing for subdomain(s) removal from the host during link generation.
    
    Closes #4083
    
    cherry-picked from
    
    de942e5534a26942e261a7699adc28597c5ad1bc
    96aa3bd0eae0afa98a1a16d87f5e0b6fa0005dab

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/controller/url_for_test.rb
M	actionpack/test/dispatch/request_test.rb

commit 67b000e	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-31 15:13:35 -0300

    Remove not needed requires

M	actionpack/lib/action_dispatch/testing/test_request.rb
M	railties/lib/rails/application.rb

commit dab9638	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-31 23:40:27 +0530

    warning removed: `&' interpreted as argument prefix

M	railties/lib/rails/paths.rb

commit c81f85d	refs/heads/master
Merge: 267d617 27a8e69
Author: Santiago Pastorino 
Date:   2012-03-31 10:48:05 -0700

    Merge pull request #5683 from arunagw/buffered_logger_test
    
    No more BufferedLogger so it can be LoggerTest

commit 27a8e69	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-31 23:00:13 +0530

    no more deprecation required.

M	activesupport/test/logger_test.rb

commit 6a24082	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-31 22:40:01 +0530

    No more BufferedLogger so it can be LoggerTest

D	activesupport/test/buffered_logger_test.rb
A	activesupport/test/logger_test.rb

commit 267d617	refs/heads/master
Merge: 3e75acb 40c38d9
Author: Vijay Dev 
Date:   2012-03-31 10:04:41 -0700

    Merge pull request #5679 from arunagw/warning_removed_master
    
    warning removed: (...) interpreted as grouped expression

commit 3e75acb	refs/heads/master
Merge: fde48f7 f4d2695
Author: Piotr Sarnacki 
Date:   2012-03-31 09:30:10 -0700

    Merge pull request #5664 from lest/patch-1
    
    use `symbolize_keys` instead of `dup.symbolize_keys!`

commit 27fc6ec	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-31 12:49:57 -0300

    Fix the redirect when it receive blocks with arity of 1.
    
    Closes #5677

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit bf8c3eb	refs/heads/master
Author: Rafaël Blais Masson 
Date:   2012-03-31 10:31:43 -0400

    Reorder bits in the Layouts and Rendering guide

M	guides/source/layouts_and_rendering.textile

commit fde48f7	refs/heads/master
Merge: 25f1d5d 891392a
Author: Santiago Pastorino 
Date:   2012-03-31 05:07:31 -0700

    Merge pull request #5674 from avakhov/ac-exception-remove-obsolete-member
    
    Remove obsolete reader from AC::MethodNotAllowed exception class

commit 40c38d9	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-31 16:31:07 +0530

    warning removed: (...) interpreted as grouped expression

M	activesupport/test/caching_test.rb

commit cf833b9	refs/heads/master
Author: Troy Kruthoff 
Date:   2012-03-30 20:39:49 -0700

    Remove sort on attributes.keys

M	activemodel/lib/active_model/serialization.rb

commit 25f1d5d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-30 20:13:46 -0700

    use tsort_each to avoid intermediary array

M	railties/lib/rails/initializable.rb

commit ad95a61	refs/heads/master
Merge: c3d482f c33334f
Author: Aaron Patterson 
Date:   2012-03-30 17:43:55 -0700

    Merge pull request #4911 from Floppy/master
    
    Reduce FILENAME_MAX_SIZE in ActiveSupport::Cache::FileStore

commit 9894d16	refs/tags/v3.2.5
Merge: 69465d9 6896cd4
Author: Aaron Patterson 
Date:   2012-03-30 16:45:24 -0700

    Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_select
    
    Fixing Identity Map when using find select in rails 3.2

commit 69465d9	refs/tags/v3.2.5
Merge: dffbb52 45d6cd9
Author: Santiago Pastorino 
Date:   2012-03-30 19:34:33 -0300

    Merge branch '3-2-3' into 3-2-stable

commit 45d6cd9	refs/tags/v3.2.3 (tag: v3.2.3)
Author: Santiago Pastorino 
Date:   2012-03-30 19:22:28 -0300

    Bump up to 3.2.3

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 891392a	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-31 00:44:27 +0400

    Remove obsolete reader from AC::MethodNotAllowed exception class

M	actionpack/lib/action_controller/metal/exceptions.rb

commit c3d482f	refs/heads/master
Merge: 86aefdb 0d2a400
Author: Piotr Sarnacki 
Date:   2012-03-30 13:41:01 -0700

    Merge pull request #5673 from avakhov/ac-render-exception
    
    Remove AC::RenderError class second declaration

commit 0d2a400	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-31 00:30:53 +0400

    Remove AC::RenderError class second declaration

M	actionpack/lib/action_controller/metal/exceptions.rb

commit dffbb52	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-03-30 16:18:39 +0100

    Fix #5667. Preloading should ignore scoping.
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 86aefdb	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 16:18:39 +0100

    Fix #5667. Preloading should ignore scoping.

M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 5c7bb86	refs/tags/v3.2.3
Author: Santiago Pastorino 
Date:   2012-03-30 11:39:18 -0300

    Remove the leading \n added by textarea on assert_select

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/controller/assert_select_test.rb

commit 13fe190	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-03-30 11:39:18 -0300

    Remove the leading \n added by textarea on assert_select

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/controller/assert_select_test.rb

commit 1141f71	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-30 11:39:18 -0300

    Remove the leading \n added by textarea on assert_select

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/controller/assert_select_test.rb

commit 1ce7545	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 14:39:55 +0100

    clear up duplication between Persistence#destroy and Locking#destroy

M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/persistence.rb

commit 43f9622	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 14:37:37 +0100

    fix test

M	activerecord/test/cases/locking_test.rb

commit bd40e5c	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 14:36:33 +0100

    whitespace :scissors:

M	activerecord/test/cases/locking_test.rb
M	activerecord/test/schema/schema.rb

commit 2eb1118	refs/heads/master
Merge: 34320cd 2931f41
Author: Jon Leighton 
Date:   2012-03-30 06:08:05 -0700

    Merge pull request #5334 from courtland/master
    
    Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled.

commit 34320cd	refs/heads/master
Merge: b69298e 96b951c
Author: José Valim 
Date:   2012-03-30 06:04:01 -0700

    Merge pull request #5668 from plashchynski/validate_attribute_name_in_class_and_module_attribute_accessors
    
    validate attribute names in class and module attribute accessors

commit b69298e	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 13:58:51 +0100

    fix typo. thanks @nertzy

M	guides/source/active_record_querying.textile

commit 96b951c	refs/heads/master
Author: Dmitry Plashchynski 
Date:   2012-03-30 15:35:35 +0300

    validate attribute names in class and module attribute accessors

M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
M	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
M	activesupport/test/core_ext/class/attribute_accessor_test.rb
M	activesupport/test/core_ext/module/attribute_accessor_test.rb

commit 84338aa	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 13:15:47 +0100

    Update guides to reflect 0a12a5f8169685915cbb7bf4d0a7bb482f7f2fd2

M	guides/source/active_record_querying.textile

commit 96b8192	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 13:07:00 +0100

    remove irrelevant references to ARel

M	guides/source/active_record_querying.textile

commit 13b3c77	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 12:44:45 +0100

    Add Relation#find_by and Relation#find_by!

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/relations_test.rb
M	guides/source/active_record_querying.textile

commit 3a8c543	refs/heads/master
Merge: 7dd7d76 135d704
Author: Jon Leighton 
Date:   2012-03-30 03:25:30 -0700

    Merge pull request #2945 from Casecommons/nested_attributes_module
    
    Nested attribute setters can be overridden.

commit 7dd7d76	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-30 11:09:27 +0100

    recurse in read_attribute we get caching / don't duplicate code

M	activerecord/lib/active_record/attribute_methods/read.rb

commit f4d2695	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-30 08:35:50 +0300

    use `symbolize_keys` instead of `dup.symbolize_keys!`

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit 6896cd4	refs/tags/v3.2.5
Author: Arturo Pie 
Date:   2012-03-26 22:51:53 -0400

    refactor instantiate method in base, so we remove nesting if's which make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
    
    Conflicts:
    
    	activerecord/lib/active_record/base.rb

M	activerecord/lib/active_record/identity_map.rb
M	activerecord/lib/active_record/inheritance.rb

commit 03c051e	refs/heads/master
Author: Levi McCallum 
Date:   2012-03-29 16:32:22 -1000

    Introduce minor spelling corrections and fix broken markup tag.

M	guides/source/engines.textile

commit 714a2c8	refs/tags/v3.2.5
Author: Arturo Pie 
Date:   2012-03-26 22:45:48 -0400

    refactor the checking of the attributes of the record in IdentityMap#add, so it's more readable

M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map_test.rb

commit 2c8f84d	refs/tags/v3.2.5
Author: Arturo Pie 
Date:   2012-03-25 23:38:10 -0400

    Do not add record to identity map if the record doesn't have values for all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.

M	activerecord/lib/active_record/identity_map.rb

commit b29e868	refs/tags/v3.2.5
Author: Arturo Pie 
Date:   2012-03-25 23:30:34 -0400

    Adds a test that breaks IM when using #select

M	activerecord/test/cases/identity_map_test.rb

commit 130064d	refs/heads/master
Merge: 648248b f50c160
Author: Aaron Patterson 
Date:   2012-03-29 19:19:08 -0700

    Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast
    
    Typecast 'id' attribute in read_attribute when using custom pks

commit f50c160	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-29 21:12:23 -0300

    Deprecate Column#type_cast_code

M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/test/cases/attribute_methods/read_test.rb

commit 77a0fc1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-29 21:23:34 -0300

    Properly typecast id attribute when using custom primary key

M	activerecord/lib/active_record/attribute_methods/read.rb

commit f47a303	refs/tags/v3.0.14
Merge: 72dc7ae d44ffb2
Author: Jeremy Kemper 
Date:   2012-03-29 16:34:36 -0700

    Merge pull request #5659 from carlosantoniodasilva/fix-build-3-0
    
    Fix build for branch 3-0-stable - ARes and ordered hash keys

commit 648248b	refs/heads/master
Merge: 1555023 bb2e2d8
Author: Jeremy Kemper 
Date:   2012-03-29 16:25:50 -0700

    Merge pull request #5345 from guilleiguaran/ar-slice
    
    post.slice(:title, :content) # => { title: "Hello", content: "World" }

commit bb2e2d8	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-29 16:36:04 -0500

    CHANGELOG entry for AR#slice

M	activerecord/CHANGELOG.md

commit d44ffb2	refs/tags/v3.0.14
Author: Carlos Antonio da Silva 
Date:   2012-03-29 19:43:51 -0300

    Fix failing ARes test due to hash keys ordering

M	activeresource/test/cases/base/schema_test.rb

commit 01ede9a	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-10 19:39:13 -0500

    Add ActiveRecord::Base#slice to slice method calls

M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/base_test.rb

commit 1555023	refs/heads/master
Merge: e51322a cec170b
Author: Aaron Patterson 
Date:   2012-03-29 14:54:03 -0700

    Merge pull request #5617 from Empact/paths
    
    Spring cleaning in Rails::Paths

commit 5cbb20d	refs/tags/v3.1.6
Merge: eae9a07 53db676
Author: Santiago Pastorino 
Date:   2012-03-29 13:11:53 -0700

    Merge pull request #5658 from yahonda/address_ora_00918_with_oracle_for_3_1
    
    Address an error for test_has_many_through_polymorphic_has_one with Oracle

commit 72dc7ae	refs/tags/v3.0.14
Merge: 29320dc 60272ae
Author: Santiago Pastorino 
Date:   2012-03-29 13:11:10 -0700

    Merge pull request #5655 from yahonda/address_ora_00918_with_oracle_for_3_0
    
    Address an error for test_has_many_through_polymorphic_has_one with Oracle

commit eae9a07	refs/tags/v3.1.6
Merge: bef0b35 14af116
Author: Aaron Patterson 
Date:   2012-03-29 12:34:40 -0700

    Merge pull request #5647 from arturopie/fixing_IM_when_using_find_select
    
    Fixing Identity Map when using find select

commit 53db676	refs/tags/v3.1.6
Author: Yasuo Honda 
Date:   2012-03-29 13:09:51 -0400

    Address an error for test_has_many_through_polymorphic_has_one
    with Oracle for the 3-1-stable branch

M	activerecord/test/cases/associations/join_model_test.rb

commit 5284e65	refs/tags/v3.2.3.rc2 (tag: v3.2.3.rc2)
Author: Santiago Pastorino 
Date:   2012-03-29 13:12:44 -0300

    Bumping to 3.2.3.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit b395ca1	refs/tags/v3.2.3.rc2
Author: Santiago Pastorino 
Date:   2012-03-29 11:19:26 -0300

    Add missing CHANGELOG entry

M	actionpack/CHANGELOG.md

commit dd69076	refs/tags/v3.2.3.rc2
Author: Santiago Pastorino 
Date:   2012-03-29 10:55:47 -0300

    Add missing CHANGELOG entry

M	actionpack/CHANGELOG.md

commit e8c0597	refs/tags/v2.3.15
Merge: 8fff8f0 2229a7e
Author: Xavier Noria 
Date:   2012-03-29 06:26:32 -0700

    Merge pull request #5653 from eee-c/patch-1
    
    Doc fixes in 2.3: validates_length_of

commit 2229a7e	refs/tags/v2.3.15
Author: Chris Strom 
Date:   2012-03-29 09:27:23 -0300

    Better minimum validates_length_of examples (adapted from master).

M	activerecord/lib/active_record/validations.rb

commit 921c404	refs/tags/v3.2.3.rc2
Author: Vijay Dev 
Date:   2012-03-29 17:40:42 +0530

    fix incorrect url in the deprecation message for vendor/plugins [ci skip]

M	railties/lib/rails/plugin.rb

commit fe1e039	refs/heads/master
Author: Rafaël Blais Masson 
Date:   2012-03-29 08:15:17 -0400

    Make body background white for Lion scrollbar to be dark

M	guides/assets/stylesheets/main.css

commit 1d753ab	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-03-29 17:40:42 +0530

    fix incorrect url in the deprecation message for vendor/plugins [ci skip]

M	railties/lib/rails/plugin.rb

commit 60272ae	refs/tags/v3.0.14
Author: Yasuo Honda 
Date:   2012-03-29 07:38:44 -0400

    Address an error for test_has_many_through_polymorphic_has_one
    with Oracle for the 3-0-stable branch

M	activerecord/test/cases/associations/join_model_test.rb

commit cec170b	refs/heads/master
Author: Ben Woosley 
Date:   2012-03-29 01:58:11 -0700

    Define Paths::Root#[]= in terms of #add.

M	railties/lib/rails/paths.rb

commit f7a39c8	refs/heads/master
Author: Ben Woosley 
Date:   2012-03-29 01:36:26 -0700

    Drop Paths::Root initializer check of #path as it isn't checked in the #path= or anywhere else

M	railties/lib/rails/paths.rb
M	railties/test/paths_test.rb

commit 4977e14	refs/heads/master
Author: Ben Woosley 
Date:   2012-03-27 02:54:22 -0700

    Drop unnecessary require in Rails::Paths

M	railties/lib/rails/paths.rb

commit 0f2555f	refs/heads/master
Author: Alexander Zubkov 
Date:   2012-03-29 12:20:55 +0400

    Change the example for habtm association to use proc according to changelog

M	activerecord/lib/active_record/associations.rb

commit e51322a	refs/heads/master
Merge: e83e76e 18d275a
Author: José Valim 
Date:   2012-03-28 23:51:34 -0700

    Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_namespace
    
    Add config option to turn off prefixing partial path with controller namespace

commit e83e76e	refs/heads/master
Merge: c4d90e4 5e70522
Author: José Valim 
Date:   2012-03-28 23:47:12 -0700

    Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_helper
    
    Changing active model dirty module helper method to more appropriate met...

commit c4d90e4	refs/heads/master
Merge: bbd2cae 7708819
Author: Santiago Pastorino 
Date:   2012-03-28 20:32:09 -0700

    Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable
    
    Missed commits from 3-2-stable

commit 2b2a760	refs/tags/v3.2.5
Merge: 5747e53 a157d59
Author: Santiago Pastorino 
Date:   2012-03-28 20:11:27 -0700

    Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2
    
    Changed the config.assets.manifest to nil

commit 2ac6735	refs/heads/master
Author: ayaya 
Date:   2012-01-13 14:17:19 +0800

    prevent the cache sweeper ignores NoMethodError

M	actionpack/lib/action_controller/caching/sweeping.rb
M	actionpack/test/controller/filters_test.rb

commit 14af116	refs/tags/v3.1.6
Author: Arturo Pie 
Date:   2012-03-26 22:51:53 -0400

    refactor instantiate method in base, so we remove nesting if's which make the code harder to read. Minor changes to contain_all_columns in IdentityMap.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/identity_map.rb

commit 18d275a	refs/heads/master
Author: Grant Hutchins 
Date:   2012-03-28 20:05:26 -0400

    Make controller namespace partial prefix optional
    
    config.action_view.prefix_partial_path_with_controller_namespace
    
    This allows you to choose to render @post using
    /posts/_post.erb instead of /admin/posts/_post.erb
    inside Admin::PostsController.

M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/activerecord/render_partial_with_record_identification_test.rb
M	actionpack/test/fixtures/fun/games/_game.erb
M	actionpack/test/fixtures/fun/serious/games/_game.erb
A	actionpack/test/fixtures/games/_game.erb
M	guides/source/configuring.textile

commit a157d59	refs/tags/v3.2.5
Author: Anuj Dutta 
Date:   2012-03-28 23:45:41 +0000

    Changed the config.assets.manifest to nil in the comments in the production config template.

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit a0e83d5	refs/heads/master
Author: Grant Hutchins 
Date:   2012-03-27 21:05:42 -0400

    Test that render gets correct exact template name

M	actionpack/test/activerecord/render_partial_with_record_identification_test.rb

commit 135d704	refs/heads/master
Author: Jonathan Mukai & Peter Jaros 
Date:   2011-09-08 15:39:44 -0400

    Nested attribute setters can be overridden.
    
    Overriding implementation can call super.

M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/schema/schema.rb

commit bbd2cae	refs/heads/master
Merge: ddaeb4b 602e038
Author: Xavier Noria 
Date:   2012-03-28 16:01:05 -0700

    Merge pull request #4843 from seamusabshere/patch-1
    
    Possibly clearer way of getting rid of ` and "

commit ddaeb4b	refs/heads/master
Merge: f0268d5 170956c
Author: Santiago Pastorino 
Date:   2012-03-28 15:13:29 -0700

    Merge pull request #5643 from rafaelfranca/remove-duplication
    
    Remove code duplication in InclusionValidator and ExclusionValidator.

commit 170956c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-28 17:52:52 -0300

    Remove code duplication in InclusionValidator and ExclusionValidator.
    
    Orginal code by @jamescook
    
    Closes #1352
    
    [Rafael Mendonça França + James Cook]

A	activemodel/lib/active_model/validations/clusivity.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb

commit 87825a6	refs/tags/v3.2.3.rc2
Author: Santiago Pastorino 
Date:   2012-03-28 18:52:56 -0300

    Set proper rendered_format when doing render :inline
    
    Closes #5632

M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/controller/render_test.rb

commit 5747e53	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-03-28 18:52:56 -0300

    Set proper rendered_format when doing render :inline
    
    Closes #5632

M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/controller/render_test.rb

commit f0268d5	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-28 18:52:56 -0300

    Set proper rendered_format when doing render :inline
    
    Closes #5632

M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/controller/render_test.rb

commit e810843	refs/heads/master
Author: Tony Primerano 
Date:   2012-03-28 16:35:06 -0400

    CSRF messages are no longer controlled by 422.html because InvalidAuthenticityToken is not raised

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 4a26b22	refs/heads/master
Author: Henrik N 
Date:   2012-03-28 21:05:46 +0200

    Routing guide: document lambda constraints and request argument.

M	guides/source/routing.textile

commit 7708819	refs/heads/master
Author: Michael de Silva 
Date:   2012-01-31 09:54:12 +0300

    clarification to prevent confusing newbies; Passenger/Unicorn are app servers, Apache/Nginx are the web servers along with thin a la Heroku etc.

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit b9cbadf	refs/heads/master
Author: Joe Van Dyk 
Date:   2012-01-24 10:30:46 -0800

    datetime_select should work with -/+ infinity dates

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit dd0275e	refs/heads/master
Author: José Valim 
Date:   2011-12-20 14:56:18 +0100

    Add a test case for layout nil.

M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/test/abstract/layouts_test.rb

commit 6410d21	refs/heads/master
Author: Anderson Dias 
Date:   2012-03-28 15:35:32 -0300

    Fix quotes at select_tag examples

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit f369f77	refs/tags/v3.2.5
Merge: d5980b5 ef3f809
Author: Santiago Pastorino 
Date:   2012-03-28 11:19:50 -0700

    Merge pull request #5640 from yahonda/address_ora_00918_with_oracle
    
    Address an error for test_has_many_through_polymorphic_has_one with Oracle

commit ef3f809	refs/tags/v3.2.5
Author: Yasuo Honda 
Date:   2012-03-28 13:41:47 -0400

    Change the order argument from ('id') to ('taggings.id')
    to address ORA-00918 error

M	activerecord/test/cases/associations/join_model_test.rb

commit c82fd8f	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-28 18:25:06 +0200

    Allow ActiveModel::Name to duck type

M	activemodel/lib/active_model/lint.rb

commit db2c135	refs/tags/v3.2.3.rc2
Author: Piotr Sarnacki 
Date:   2012-03-28 17:58:15 +0200

    Cover one more case in auth_token and remote forms
    
    If embedding auth_token in remote forms is off and we
    pass a value for auth_token it should respect it.

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit d5980b5	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-28 17:58:15 +0200

    Cover one more case in auth_token and remote forms
    
    If embedding auth_token in remote forms is off and we
    pass a value for auth_token it should respect it.

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit 5a5ca14	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-28 17:58:15 +0200

    Cover one more case in auth_token and remote forms
    
    If embedding auth_token in remote forms is off and we
    pass a value for auth_token it should respect it.

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit 128cfbd	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-28 17:54:06 +0200

    config.action_view.embed_authenticity_token_in_remote_forms is true by default
    
    Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms`
    to `false`. This change breaks remote forms that need to work also without javascript,
    so if you need such behavior, you can either set it to `true` or explicitly pass
    `:authenticity_token => true` in form options

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/railtie.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	guides/source/configuring.textile

commit 805b15f	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-28 04:03:50 +0200

    Added config.action_view.embed_authenticity_token_in_remote_forms
    
    There is a regression introduced in 16ee611fa, which breaks
    remote forms that should also work without javascript. This commit
    introduces config option that allows to configure this behavior
    defaulting to the old behavior (ie. include authenticity token
    in remote forms by default)
    
    Conflicts:
    
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/railtie.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	guides/source/configuring.textile

commit 6cff090	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-28 16:38:05 +0100

    much code can be deleted thanks to @tenderlove's refactoring

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb

commit 1b9fd79	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-03-28 16:09:01 +0100

    Fix #5549.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb

commit 9897b9a	refs/heads/master
Merge: 0c525f6 77fedae
Author: Santiago Pastorino 
Date:   2012-03-28 07:45:39 -0700

    Merge pull request #5630 from andhapp/fix-config-asset-manifest
    
    Changed the config.assets.manifest to nil

commit 4c44ca5	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-27 11:27:51 -0700

    Test for #5549.
    
    Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796.
    
    Conflicts:
    
    	activerecord/lib/active_record/attribute_methods/read.rb

M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit 84ca8c8	refs/tags/v3.2.3.rc2
Author: Santiago Pastorino 
Date:   2012-03-28 06:58:17 -0700

    Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms
    
    Embed auth token in remote forms

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/railtie.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	railties/guides/source/configuring.textile

commit 0d052c0	refs/tags/v3.2.5
Merge: 2d5b60e d646d9d
Author: Santiago Pastorino 
Date:   2012-03-28 06:58:17 -0700

    Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms
    
    Embed auth token in remote forms

commit d646d9d	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-28 04:03:50 +0200

    Added config.action_view.embed_authenticity_token_in_remote_forms
    
    There is a regression introduced in 16ee611fa, which breaks
    remote forms that should also work without javascript. This commit
    introduces config option that allows to configure this behavior
    defaulting to the old behavior (ie. include authenticity token
    in remote forms by default)

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/railtie.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	railties/guides/source/configuring.textile

commit 0c525f6	refs/heads/master
Author: Aaron Suggs 
Date:   2012-03-25 21:16:29 -0400

    Add test for default_url_options[:port]

M	actionpack/test/controller/url_for_test.rb

commit 0560ce0	refs/heads/master
Merge: 647ccdc 4882271
Author: José Valim 
Date:   2012-03-28 01:19:30 -0700

    Merge pull request #2528 from cesario/fix_2507
    
    Rails.initialized? can be called at any time without raising an exception [Closes #2507]

commit 647ccdc	refs/heads/master
Merge: a3e5b7b ba9537c
Author: José Valim 
Date:   2012-03-28 01:18:09 -0700

    Merge pull request #5623 from Houdini/master
    
    Remove redundant variable from core_ext/hash/deep_dup.rb

commit 77fedae	refs/heads/master
Author: Anuj Dutta 
Date:   2012-03-28 06:48:54 +0000

    Changed the config.assets.manifest to nil in the comments in the production config template.

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 47320e9	refs/heads/master
Author: Anuj Dutta 
Date:   2012-03-28 06:12:54 +0000

    Improved the comment for config.assets.manifest in the asset_pipeline guides.

M	guides/source/asset_pipeline.textile

commit e798000	refs/heads/master
Author: Anuj Dutta 
Date:   2012-03-28 05:38:11 +0000

    Changed the config.assets.manifest path in the comments to nil.

M	guides/code/getting_started/config/environments/production.rb
M	guides/source/asset_pipeline.textile

commit 2d5b60e	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-03-27 20:09:37 -0700

    Merge pull request #5616 from cbartlett/migration-indent
    
    Fix indenting in migration generator

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb

commit a3e5b7b	refs/heads/master
Merge: da5f656 e5156c9
Author: Santiago Pastorino 
Date:   2012-03-27 20:09:37 -0700

    Merge pull request #5616 from cbartlett/migration-indent
    
    Fix indenting in migration generator

commit f8b4ef1	refs/tags/v3.2.5
Merge: 460d2c7 79c8def
Author: Michael Koziarski 
Date:   2012-03-27 20:01:17 -0700

    Merge pull request #5624 from rafaelfranca/fix-build
    
    Fix build

commit 15a2e0d	refs/tags/v3.1.6
Author: Arturo Pie 
Date:   2012-03-26 22:45:48 -0400

    refactor the checking of the attributes of the record in IdentityMap#add, so it's more readable

M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map_test.rb

commit a00a42d	refs/tags/v3.1.6
Author: Arturo Pie 
Date:   2012-03-25 23:38:10 -0400

    Do not add record to identity map if the record doesn't have values for all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.

M	activerecord/lib/active_record/identity_map.rb

commit 488ea89	refs/tags/v3.1.6
Author: Arturo Pie 
Date:   2012-03-25 23:30:34 -0400

    Adds a test that breaks IM when using #select

M	activerecord/test/cases/identity_map_test.rb

commit 79c8def	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-27 20:56:01 -0300

    Add arel branch to the tests

M	railties/test/generators/shared_generator_tests.rb

commit 29320dc	refs/tags/v3.0.14
Merge: e0362f7 4c9dec4
Author: Aaron Patterson 
Date:   2012-03-27 16:23:00 -0700

    Merge pull request #5613 from carlosantoniodasilva/fix-build-3-0-193
    
    Fix build for branch 3-0-stable - Ruby 1.9.3

commit 460d2c7	refs/tags/v3.2.5
Merge: d82e4c80 6968bc1
Author: Jeremy Kemper 
Date:   2012-03-27 16:15:21 -0700

    Merge pull request #5622 from rafaelfranca/fix-2492-3-2
    
    [3-2-stable] Fix label_tag to merge the options hash with the object hash

commit da5f656	refs/heads/master
Merge: 33164c8 32763a8
Author: Jeremy Kemper 
Date:   2012-03-27 16:15:11 -0700

    Merge pull request #5621 from rafaelfranca/fix-2492-master
    
    Fix label_tag to merge the options hash with the object hash

commit ba9537c	refs/heads/master
Author: Dmitrii Golub 
Date:   2012-03-28 03:09:40 +0400

    remove redundant variable

M	activesupport/lib/active_support/core_ext/hash/deep_dup.rb

commit 6968bc1	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-27 20:01:59 -0300

    Check if the options hash already exists and merge it with the another
    hash.
    
    Closes #2492 and #5614

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 32763a8	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-27 19:45:51 -0300

    Check if the options hash already exists and merge it with the another
    hash.
    
    Closes #2492 and #5615

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags/label.rb
M	actionpack/test/template/form_helper_test.rb

commit 4882271	refs/heads/master
Author: Franck Verrot 
Date:   2011-08-15 10:11:11 +0200

    Rails.initialized? can be called at any time without raising an exception [Closes #2507]
    
    Changes:
    
    * `Rails.initialized=` has been removed
    * `Rails.initialized?` and `Rails.application.initialized?` are now
    * delegating to `MyApp::Application.initialized?`

M	railties/lib/rails.rb
M	railties/lib/rails/application.rb
M	railties/test/application/loading_test.rb

commit 4f66586	refs/tags/v3.2.3.rc2
Author: Santiago Pastorino 
Date:   2012-03-27 14:16:15 -0700

    Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml
    
    Textarea newline fix breaks haml (3-2-stable)

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit d82e4c80	refs/tags/v3.2.5
Merge: 24208d9 a7a422e
Author: Santiago Pastorino 
Date:   2012-03-27 14:16:15 -0700

    Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml
    
    Textarea newline fix breaks haml (3-2-stable)

commit 33164c8	refs/heads/master
Merge: 2fa7ccf 1438e0e
Author: Santiago Pastorino 
Date:   2012-03-27 14:16:04 -0700

    Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master
    
    Don't break Haml with textarea newline fix. (master)

commit 2fa7ccf	refs/heads/master
Author: Juanjo Bazán 
Date:   2012-03-27 12:49:43 +0200

    Remove Arel::Relation constant from PredicateBuilder.

M	activerecord/lib/active_record/relation/predicate_builder.rb

commit 24208d9	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-27 14:11:51 -0700

    adding a branch to arel

M	railties/lib/rails/generators/app_base.rb

commit 1438e0e	refs/heads/master
Author: James Coleman 
Date:   2012-03-27 16:17:53 -0400

    Don't break Haml with textarea newline fix.
    
    See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)
    
    Also fix 6 more tests that didn't yet have the newline expectation.

M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/lib/action_view/helpers/tags/text_area.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit a7a422e	refs/tags/v3.2.5
Author: James Coleman 
Date:   2012-03-27 16:08:16 -0400

    Don't break Haml with textarea newline fix.
    
    See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)
    
    Also fix 6 more tests that didn't yet have the newline expectation.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 96b72ef	refs/heads/master
Author: Jens Fahnenbruck 
Date:   2011-08-23 21:10:01 +0200

    adds delegetion for eof? to AD::Http::UploadedFile
    
    if you want to read the file you may need to ask if there is something
    to read from

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit c4048b3	refs/tags/v3.2.5
Merge: 5f37260 fdcfc75
Author: Piotr Sarnacki 
Date:   2012-03-27 13:10:43 -0700

    Merge pull request #5618 from lest/patch-1
    
    force datetime attributes to be changed

commit fdcfc75	refs/tags/v3.2.5
Author: Sergey Nartimov 
Date:   2012-03-27 22:55:50 +0300

    force datetime attributes to be changed
    
    backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit e96d04a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-27 11:27:51 -0700

    attributes are cached by string keys, so to_s to support symbols. fixes #5549

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit e0362f7	refs/tags/v3.0.14
Author: José Valim 
Date:   2012-02-23 12:49:18 +0100

    Avoid inspecting the whole route set, closes #1525

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit bef0b35	refs/tags/v3.1.6
Author: José Valim 
Date:   2012-02-23 12:49:18 +0100

    Avoid inspecting the whole route set, closes #1525

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 5f37260	refs/tags/v3.2.3.rc1 (tag: v3.2.3.rc1)
Author: Santiago Pastorino 
Date:   2012-03-27 14:07:36 -0300

    Bumping to 3.2.3.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit b42fbd3	refs/heads/master
Merge: 888fcca ae040ed
Author: Vijay Dev 
Date:   2012-03-27 21:26:37 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit ae040ed	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-27 21:24:21 +0530

    minor edits in testing guide [ci skip]

M	guides/source/testing.textile

commit e01beb5	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-27 21:19:56 +0530

    add missing do [ci skip]

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit e5156c9	refs/heads/master
Author: Colin Bartlett 
Date:   2012-03-27 11:41:31 -0400

    Fix indenting in migration generator
    
        $ rails generate migration remove_foo_from_bars foo:string
    
    This currently generates:
    
          def up
            remove_column :bars, :foo
              end
    
    Fix it:
    
          def up
            remove_column :bars, :foo
          end

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb

commit 286259f	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-27 21:08:08 +0530

    Revert "[ci skip] updated bin/rails code in Rails Initialization Process guide"
    
    This reverts commit 7feec40b89ada892ca6f107ada27ceedde505d83.
    
    Reason: The guide had the contents of railties/bin/rails and I don't see
    any reason to change it.

M	guides/source/initialization.textile

commit 888fcca	refs/heads/master
Merge: 67b2404 4cd0b4e
Author: Santiago Pastorino 
Date:   2012-03-27 08:01:53 -0700

    Merge pull request #5499 from arunagw/remove_unused_code
    
    removed unused variables

commit 6ce0a6d	refs/heads/master
Author: Andrey Samsonov 
Date:   2012-03-27 17:12:07 +0400

    Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn't call for label.
    
    objectify_options method should be applied to the proper options arg.
    
    See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 7111133	refs/tags/v3.2.5
Author: Andrey Samsonov 
Date:   2012-03-27 16:30:08 +0400

    Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.
    
    objectify_options method should be applied to the proper options arg.
    
    See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 4c9dec4	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-12-10 19:42:09 +0530

    Fix broken encoding test

M	actionpack/test/template/template_test.rb

commit 289fe76	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-12-08 15:11:23 -0800

    load the encoding converter to work around [ruby-core:41556] when switching encodings

D	actionpack/lib/action_view/data/encoding_conversions.txt
M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit caebe85	refs/tags/v3.0.14
Author: Emilio Tagua 
Date:   2010-09-28 18:16:26 -0300

    Use helper method here.

M	actionpack/test/template/template_test.rb

commit 923ba31	refs/tags/v3.0.14
Author: Emilio Tagua 
Date:   2010-09-28 18:11:57 -0300

    Silence warnings here, only setting Encoding.default_external for testing.

M	actionpack/test/template/template_test.rb

commit 67b2404	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-26 22:37:36 +0200

    If partial is rendered in controller, grab format from template
    
    Previously `rendered_format` was set only based on mime types
    passed in Accept header, which was wrong if first type from
    Accept was different than rendered partial. The fix is to simply
    move setting rendered_format to the place where template
    is available and grab format from the template. If it fails
    we can fallback to formats passed by Accept header.

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/_partial_html_erb.html.erb

commit 19901c6	refs/heads/master
Merge: ded74df 7051a23
Author: José Valim 
Date:   2012-03-27 03:05:11 -0700

    Merge pull request #5609 from tjmcewan/master
    
    prevent returning a negative zero from number_with_precision

commit 4cd0b4e	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-18 23:07:16 +0530

    removed unused variables

M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 7051a23	refs/heads/master
Author: Tim McEwan 
Date:   2012-03-27 19:44:06 +1100

    change number_with_precision to not return negative zeros

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit 5790269	refs/tags/v3.0.14
Merge: 3627cfa 9698312
Author: José Valim 
Date:   2012-03-27 00:58:09 -0700

    Merge pull request #5600 from carlosantoniodasilva/fix-build-3-0
    
    Fix build for branch 3-0-stable - failing in ruby 1.8.8-p358

commit fbccdf9	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-27 11:54:45 +0400

    Proc objects for caches_page no need controller object

M	actionpack/lib/action_controller/caching/pages.rb

commit e31ec47	refs/tags/v3.2.3.rc1
Merge: 3eb5be6 449a4fc
Author: José Valim 
Date:   2012-03-27 00:38:31 -0700

    Merge pull request #5603 from drogus/fix-rendered-format-for-render-partial
    
    Fix rendered format for render partial

commit 449a4fc	refs/tags/v3.2.3.rc1
Author: Piotr Sarnacki 
Date:   2012-03-26 22:37:36 +0200

    If partial is rendered in controller, grab format from template
    
    Previously `rendered_format` was set only based on mime types
    passed in Accept header, which was wrong if first type from
    Accept was different than rendered partial. The fix is to simply
    move setting rendered_format to the place where template
    is available and grab format from the template. If it fails
    we can fallback to formats passed by Accept header.

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/_partial_html_erb.html.erb

commit ded74df	refs/heads/master
Merge: bca7770 ef64c6b
Author: Xavier Noria 
Date:   2012-03-26 18:14:48 -0700

    Merge pull request #5582 from chendo/master
    
    Remove "needless boolean casting"

commit bca7770	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 17:56:16 -0700

    favor composition over inheritance

M	railties/lib/rails/paths.rb

commit 3627cfa	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-03-26 17:24:48 -0700

    Merge pull request #2621 from icco/master
    
    Issue with schema dump

M	activerecord/lib/active_record/schema_dumper.rb

commit e95f8e8	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-03-26 17:24:48 -0700

    Merge pull request #2621 from icco/master
    
    Issue with schema dump

M	activerecord/lib/active_record/schema_dumper.rb

commit 37c84ed	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-27 02:07:09 +0200

    Don't ignore non Enumerable values passed to sanitize (closes #5585)
    
    When someone accidentally passes a string to sanitize like:
    
    sanitize("foo", :tags => "b")
    
    there is no indication that it's the wrong way and span
    will not be removed.

M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
M	actionpack/test/template/html-scanner/sanitizer_test.rb

commit 3eb5be6	refs/tags/v3.2.3.rc1
Author: Aaron Patterson 
Date:   2012-03-26 17:24:48 -0700

    Merge pull request #2621 from icco/master
    
    Issue with schema dump

M	activerecord/lib/active_record/schema_dumper.rb

commit 4946107	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 17:25:44 -0700

    favor composition over inheritance

M	railties/lib/rails/paths.rb
M	railties/test/paths_test.rb

commit 41dfc46	refs/heads/master
Merge: b36f240 a58fcd9
Author: Aaron Patterson 
Date:   2012-03-26 17:24:48 -0700

    Merge pull request #2621 from icco/master
    
    Issue with schema dump

commit b36f240	refs/heads/master
Merge: 281b31b 2ceb3fc
Author: Aaron Patterson 
Date:   2012-03-26 16:24:42 -0700

    Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hash
    
    Cookie store session hash

commit 2ceb3fc	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-26 20:16:12 -0300

    Remove warning added by my own commit :fire:
    
    Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4

M	actionpack/test/template/form_helper_test.rb

commit 281b31b	refs/heads/master
Merge: a2a861f 82a62b8
Author: Aaron Patterson 
Date:   2012-03-26 16:12:40 -0700

    Merge pull request #5331 from castlerock/remove_unused_require
    
    remove unused require from AS/core_ext/class/delegating_att.rb

commit a2a861f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 16:08:33 -0700

    still need to ensure the path is a directory

M	railties/lib/rails/paths.rb

commit 33da24a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 16:07:28 -0700

    eliminating a branch we do not need. thanks @jeremy

M	railties/lib/rails/paths.rb

commit 5ad9a8e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-24 11:20:43 -0300

    Return the same session data object when setting session id

M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb

commit 47db156	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 15:58:03 -0700

    stop using *args in order to simplify our constructor

M	railties/lib/rails/paths.rb

commit a2126ab	refs/heads/master
Merge: de9c0ef 633ee64
Author: Piotr Sarnacki 
Date:   2012-03-26 15:58:01 -0700

    Merge pull request #5592 from nashby/fix-issue-5584
    
    String#titleize works properly with smart quotes

commit 9698312	refs/tags/v3.0.14
Author: Carlos Antonio da Silva 
Date:   2012-03-24 14:58:54 -0300

    Fix AV::FixtureResolver and rjs tests with random order errors
    
    Due to the hash ordering changes on Ruby 1.8.7-p358.

M	actionpack/lib/action_view/testing/resolvers.rb
M	actionpack/test/controller/new_base/render_rjs_test.rb

commit 4590e99	refs/tags/v3.1.6
Merge: dafded2 a16aa8c
Author: Aaron Patterson 
Date:   2012-03-26 15:37:16 -0700

    Merge pull request #5599 from carlosantoniodasilva/fix-build-3-1
    
    Fix build for branch 3-1-stable - return the same session hash object

commit de9c0ef	refs/heads/master
Merge: 045197f 7a0cf2f
Author: Aaron Patterson 
Date:   2012-03-26 15:34:22 -0700

    Merge pull request #5561 from carlosantoniodasilva/form-builder-block-arg
    
    Properly deprecate the block argument in AV FormBuilder

commit 0c5ca07	refs/heads/master
Author: Lukasz Sarnacki 
Date:   2012-03-27 00:15:58 +0200

    added shallow_prefix option description in documantation
    
    It is in response for confusion in issue #5301

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 0e916ae	refs/tags/v3.2.3.rc1
Merge: 3f1b8c6 907bcce
Author: José Valim 
Date:   2012-03-26 14:11:55 -0700

    Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2
    
    Fix build for branch 3-2-stable - return the same session hash object

commit fc25feb	refs/heads/master
Author: Juanjo Bazán 
Date:   2012-03-27 00:08:31 +0300

    Missing generated query for pluck method.
    (and changed the use of true for a more database agnostic example).

M	activerecord/lib/active_record/relation/calculations.rb

commit 045197f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 13:50:50 -0700

    Don't depend on ivars. Thanks @fesplugas

M	railties/lib/rails/paths.rb

commit 3f1b8c6	refs/tags/v3.2.5
Merge: ed7567c bd8a970
Author: Piotr Sarnacki 
Date:   2012-03-26 13:18:35 -0700

    Merge pull request #5596 from lest/patch-3
    
    apply form_for namespace option to date_select

commit ea0789f	refs/heads/master
Merge: 9637de6 65434a2
Author: Piotr Sarnacki 
Date:   2012-03-26 13:10:05 -0700

    Merge pull request #5594 from lest/patch-1
    
    apply form_for namespace option to date_select

commit 9637de6	refs/heads/master
Author: Guten 
Date:   2011-08-29 23:29:11 +0800

    ActiveRecord::Coders::YAMLColumn#dump should raise an error
    
    closes #2737
    
    Conflicts:
    
    	activerecord/lib/active_record/coders/yaml_column.rb

M	activerecord/lib/active_record/coders/yaml_column.rb
M	activerecord/test/cases/coders/yaml_column_test.rb

commit a16aa8c	refs/tags/v3.1.6
Author: Carlos Antonio da Silva 
Date:   2012-03-24 11:20:43 -0300

    Return the same session data object when setting session id
    
    Make sure to return the same hash object instead of returning a new one.
    Returning a new one causes failures on cookie store tests, where it
    tests for the 'Set-Cookie' header with the session signature.
    
    This is due to the hash ordering changes on Ruby 1.8.7-p358.

M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb

commit 2e8129e	refs/heads/master
Merge: 65f4d80 dd74da7
Author: Aaron Patterson 
Date:   2012-03-26 12:03:37 -0700

    Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0
    
    sprockets-rails 1.0.0 was released, remove git dependency from Gemfile

commit bd8a970	refs/tags/v3.2.5
Author: Sergey Nartimov 
Date:   2012-03-26 21:46:30 +0300

    apply form_for namespace option to date_select

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit dd74da7	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-26 13:49:52 -0500

    sprockets-rails 1.0.0 was released, remove git dependency from Gemfile

M	Gemfile

commit 65434a2	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-26 21:46:30 +0300

    apply form_for namespace option to date_select

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 65f4d80	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 11:34:01 -0700

    no need to freeze things all the time

M	activemodel/lib/active_model/naming.rb

commit 6289f45	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-26 11:32:21 -0700

    test against ruby features in order to fix tests on Ruby 2.0

M	activemodel/test/cases/attribute_methods_test.rb

commit e8b5c8e	refs/heads/master
Merge: 1d59caa 72cbccb
Author: Aaron Patterson 
Date:   2012-03-26 11:28:28 -0700

    Merge pull request #5593 from lukesarnacki/activemodel_name_composition_over_inheritance
    
    ActiveModel::Name does not inherit from string

commit 633ee64	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-03-26 21:17:25 +0300

    String#titleize works properly with smart quotes, closes #5584

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test_cases.rb

commit 72cbccb	refs/heads/master
Author: Lukasz Sarnacki 
Date:   2012-03-26 20:14:53 +0200

    ActiveModel::Name does not inherit from string

M	activemodel/lib/active_model/lint.rb
M	activemodel/lib/active_model/naming.rb

commit ed7567c	refs/tags/v3.2.5
Author: Abe Voelker 
Date:   2012-03-09 15:15:01 -0600

    Fix 'Security#Mass Assignment' URL typo

M	railties/guides/source/security.textile

commit ddab3df	refs/heads/master
Author: Dimitri De Frenne 
Date:   2012-03-26 11:28:55 +0200

    Made it a bit more clear where to run rails/server

M	guides/source/engines.textile

commit 492e91c	refs/heads/master
Author: Dimitri De Frenne 
Date:   2012-03-26 11:28:12 +0200

    Fixed typo in path

M	guides/source/engines.textile

commit 1d59caa	refs/heads/master
Merge: adb802e f7714ec
Author: José Valim 
Date:   2012-03-26 02:14:34 -0700

    Merge pull request #5183 from lest/patch-1
    
    use content_tag in button_to helper

commit adb802e	refs/heads/master
Merge: 8954ee6 3e67e45
Author: José Valim 
Date:   2012-03-26 00:50:46 -0700

    Merge pull request #5581 from jamie/custom_param_field
    
    Allow a defining custom member field on resources

commit ef64c6b	refs/heads/master
Author: Jack Chen (chendo) 
Date:   2012-03-26 15:55:16 +1100

    Remove 'needless boolean casting'.
    "Predicates in Rails rely on standard Ruby semantics for boolean values
    and guarantee no singletons whatsoever." - @fxn

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 3e67e45	refs/heads/master
Author: Jamie Macey 
Date:   2012-03-25 21:36:30 -0700

    Allow a defining custom member field on resources
    
    By default, resources routes are created with :resource/:id. A model
    defining to_param can make prettier urls by using something more
    readable than an integer ID, but since the route picks it up as :id you
    wind up with awkward User.find_by_username(params[:id]) calls.
    
    By overriding the key to be used in @request.params you can be more
    obvious in your intent.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 8954ee6	refs/heads/master
Merge: 7cc797f 68926dd
Author: Xavier Noria 
Date:   2012-03-25 18:26:25 -0700

    Merge pull request #5575 from phiggins/remove_conditional_from_statistics_task
    
    Remove useless conditional.

commit 68926dd	refs/heads/master
Author: Pete Higgins 
Date:   2012-03-25 18:20:40 -0700

    Remove useless conditional.

M	railties/lib/rails/code_statistics.rb

commit 7cc797f	refs/heads/master
Author: Xavier Noria 
Date:   2012-03-25 20:26:35 +0200

    restores example depicting the use of true or false in regular font
    
    There was an example here that mentioned reload_plugins?
    but it was deleted. This commit puts another example back.

M	guides/source/api_documentation_guidelines.textile

commit a4bf304	refs/heads/master
Merge: 64ccb59 2ee28b2
Author: Piotr Sarnacki 
Date:   2012-03-25 04:16:53 -0700

    Merge pull request #5566 from lest/patch-3
    
    fix HashWithIndifferentAccess.[] method

commit 64ccb59	refs/heads/master
Merge: 3756a3f 6880489
Author: Jeremy Kemper 
Date:   2012-03-24 23:49:43 -0700

    Merge pull request #5570 from avakhov/ac-caching-split
    
    ActionController caching small String#split optimization

commit 3756a3f	refs/heads/master
Author: Xavier Noria 
Date:   2012-03-25 00:17:16 +0100

    Revert "Return an actual boolean from xml_http_request?"
    
    Reason: This commit changes code that was committed some year
    and a half ago. The original code is an ordinary predicate
    that delegates straight to a boolean operator with no further
    unnecessaru adorments, as clearly explained in #5329.
    
    This change also may confuse users who may now believe they can
    rely now on singletons, while predicates in Rails rely on
    standard Ruby semantics for boolean values and guarantee no
    singletons whatsover.
    
    This reverts commit 6349791d5aaf652631b29f1371701fc2985fda83.

M	actionpack/lib/action_dispatch/http/request.rb

commit 2314490	refs/heads/master
Author: schneems 
Date:   2012-03-24 17:17:21 -0500

    document `-e` argument for rails console
    
    this adds documentation for -e flag which sets the environment of the rails console like the `rails server` command.

M	guides/source/command_line.textile

commit c12b886	refs/heads/master
Author: Panayotis Matsinopoulos 
Date:   2012-03-24 23:33:41 +0200

    Testing layout gotcha when view renders partial

M	guides/source/testing.textile

commit 5b35664	refs/heads/master
Author: Panayotis Matsinopoulos 
Date:   2012-03-24 23:16:55 +0200

    Small layout correction

M	guides/source/testing.textile

commit 214b0dd	refs/heads/master
Author: Panayotis Matsinopoulos 
Date:   2012-03-24 23:12:39 +0200

    Testing Template and Layout Example

M	guides/source/testing.textile

commit 03becb1	refs/heads/master
Author: Jarkko Laine 
Date:   2012-03-23 11:10:14 +0200

    [#5559] Do not black out the system timezone DST jump hour if Time.zone differs from that.
    
    The system timezone DST jump hour should not be blacked out by Time.zone.parse if current Time.zone does not do the jump at that time.
    
    Fixes #5559.

M	activesupport/lib/active_support/values/time_zone.rb
M	activesupport/test/time_zone_test.rb

commit 9ff2e92	refs/heads/master
Author: Waseem Ahmad 
Date:   2012-03-24 20:26:44 +0530

    Use one 'be'.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 00726ea	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2012-03-19 12:30:39 +0530

    Build fix for form_options_helper_test.rb ruby-1.8.7

M	actionpack/test/template/form_options_helper_test.rb

commit 907bcce	refs/tags/v3.2.3.rc1
Author: Carlos Antonio da Silva 
Date:   2012-03-24 11:20:43 -0300

    Return the same session data object when setting session id
    
    Make sure to return the same hash object instead of returning a new one.
    Returning a new one causes failures on cookie store tests, where it
    tests for the 'Set-Cookie' header with the session signature.
    
    This is due to the hash ordering changes on Ruby 1.8.7-p358.

M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb

commit 23b3ea5	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-24 17:22:24 +0400

    Fix AC actions caching comment

M	actionpack/lib/action_controller/caching/actions.rb

commit 6880489	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-24 15:14:37 +0400

    ActionController caching small String#split optimization

M	actionpack/lib/action_controller/caching/actions.rb

commit 7feec40	refs/heads/master
Author: Senthil A 
Date:   2012-03-24 06:06:50 -0700

    [ci skip] updated bin/rails code in Rails Initialization Process guide

M	guides/source/initialization.textile

commit 014498e	refs/heads/master
Merge: 780ab58 2fab826
Author: Vijay Dev 
Date:   2012-03-24 17:15:10 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	guides/source/ruby_on_rails_guides_guidelines.textile

commit 780ab58	refs/heads/master
Merge: beb51b4 ef864c3
Author: Vijay Dev 
Date:   2012-03-24 04:25:52 -0700

    Merge pull request #5569 from arunagw/warning_remove_master
    
    removed warning: shadowing outer local variable - exception

commit 2fab826	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-24 14:23:06 +0530

    spacing fix in guide [ci skip]

M	guides/source/api_documentation_guidelines.textile

commit ef864c3	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-24 10:35:36 +0530

    removed warning: shadowing outer local variable - exception

M	activesupport/lib/active_support/rescuable.rb

commit beb51b4	refs/heads/master
Merge: ea482d3 6349791
Author: Aaron Patterson 
Date:   2012-03-23 17:27:14 -0700

    Merge pull request #5567 from tpope/xhr-boolean
    
    Return an actual boolean from xml_http_request?

commit 6349791	refs/heads/master
Author: Tim Pope 
Date:   2012-03-23 20:19:38 -0400

    Return an actual boolean from xml_http_request?

M	actionpack/lib/action_dispatch/http/request.rb

commit b99d95d	refs/heads/master
Author: Fabián Rodríguez 
Date:   2012-03-22 23:47:45 -0300

    [getting started][ci skip] fix link to the code

M	guides/source/getting_started.textile

commit 2ee28b2	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-23 23:08:36 +0300

    fix HashWithIndifferentAccess.[] method

M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit eb0d8ee	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-23 11:46:57 -0700

    chdir before globbing so that we don't need to escape directory names.
    
    fixes #5521

M	railties/lib/rails/paths.rb

commit ea482d3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-23 11:47:27 -0700

    oops, forgot to commit the tests! :bomb:

A	activesupport/test/notifications/evented_notification_test.rb

commit 7422f44	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-23 11:46:57 -0700

    chdir before globbing so that we don't need to escape directory names.
    
    fixes #5521

M	railties/lib/rails/paths.rb

commit 728a65d	refs/tags/v3.0.14
Merge: 8645745 f748d36
Author: José Valim 
Date:   2012-03-23 11:29:03 -0700

    Merge pull request #5565 from carlosantoniodasilva/fix-build-3-0
    
    Fix build for branch 3-0-stable

commit dafded2	refs/tags/v3.1.6
Merge: fea82eb c8d5680
Author: José Valim 
Date:   2012-03-23 11:28:42 -0700

    Merge pull request #5564 from carlosantoniodasilva/fix-build-3-1
    
    Fix build for branch 3-1-stable

commit 0382e44	refs/tags/v3.2.5
Merge: ef48cea 565bfb9
Author: Aaron Patterson 
Date:   2012-03-23 10:50:16 -0700

    Merge pull request #5537 from kennyj/fix_4399-32
    
    [3-2-stable] migrate(:down) method with table_name_prefix

commit c8d5680	refs/tags/v3.1.6
Author: Carlos Antonio da Silva 
Date:   2012-03-23 02:14:42 -0300

    Fix identity map tests

M	activerecord/test/cases/identity_map_test.rb

commit 51bb1c1	refs/tags/v3.1.6
Author: Carlos Antonio da Silva 
Date:   2012-03-22 11:08:04 -0300

    Add order to tests that rely on db ordering, to fix failing tests on pg
    
    Also skip persistente tests related to UPDATE + ORDER BY for postgresql
    
    PostgreSQL does not support updates with order by, and these tests are
    failing randomly depending on the fixture loading order now.

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/clone_test.rb
M	activerecord/test/cases/dup_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb
M	activerecord/test/models/company.rb

commit e944b29	refs/heads/master
Merge: 86cd1b1 7529283
Author: Aaron Patterson 
Date:   2012-03-23 10:36:16 -0700

    Merge pull request #5550 from schneems/schneems/server_env
    
    Fix environment support for rails server, and match interface of rails console

commit 86cd1b1	refs/heads/master
Merge: 9a26c90 a26dcb6
Author: José Valim 
Date:   2012-03-23 09:35:31 -0700

    Merge pull request #5518 from rafaelfranca/minor-refactor
    
    Remove code duplication

commit 9a26c90	refs/heads/master
Merge: 35e8de6 ab287c5
Author: Piotr Sarnacki 
Date:   2012-03-23 06:48:42 -0700

    Merge pull request #5556 from rafaelfranca/remove-warning
    
    use the new scope syntax on the tests to avoid DEPRECATION WARNINGS.

commit ef48cea	refs/tags/v3.2.5
Merge: ea4e021 0879ebd
Author: Piotr Sarnacki 
Date:   2012-03-23 06:42:48 -0700

    Merge pull request #5558 from carlosantoniodasilva/fix-build-3-2
    
    Fix build for branch 3-2-stable - Part 2

commit ab287c5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-22 21:45:56 -0300

    Use the new scope syntax

M	actionpack/test/fixtures/reply.rb

commit 35e8de6	refs/heads/master
Merge: d1887d3 bf8d757
Author: José Valim 
Date:   2012-03-23 05:57:35 -0700

    Merge pull request #5374 from nertzy/remove_deprecated_partial_path_from_active_model_naming
    
    Remove ActiveModel::Naming#partial_path

commit 7a0cf2f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-23 09:10:52 -0300

    Properly deprecate the block argument in AV FormBuilder
    
    Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward
    incompatible change by changing the method signature of the FormBuilder.
    This brings back the same method signature warning in case someone gives
    a block to the builder.
    
    More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit d1887d3	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-23 11:49:25 +0100

    Fix tests, when creating rescue handler, we need to check for arity now
    
    Before it was handled by Proc.bind, but since Proc.bind has been
    deprecated, this is no longer the case and returned handler
    needs to match rescuer.

M	activesupport/lib/active_support/rescuable.rb

commit 44ef59f	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-03-23 18:30:16 +0800

    :foreign_key option should be on has_many side of association

M	guides/source/association_basics.textile

commit 39961f8	refs/heads/master
Merge: b4115fd c5f4b20
Author: Piotr Sarnacki 
Date:   2012-03-23 03:06:42 -0700

    Merge pull request #5546 from mptre/master
    
    Fixed missing space bug introduces in rails/rails@9299bfd

commit 0879ebd	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-03-23 02:14:42 -0300

    Fix identity map tests

M	activerecord/test/cases/identity_map_test.rb

commit ea4e021	refs/tags/v3.2.5
Merge: b714140 b332891
Author: Aaron Patterson 
Date:   2012-03-22 21:04:32 -0700

    Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2
    
    Fix build for branch 3-2-stable

commit f748d36	refs/tags/v3.0.14
Author: Carlos Antonio da Silva 
Date:   2012-03-22 23:47:22 -0300

    Fix more failing tests related to ruby 1.8.7 p358 version change

M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/relations_test.rb

commit a9fdefd	refs/tags/v3.0.14
Author: Carlos Antonio da Silva 
Date:   2012-03-22 11:08:04 -0300

    Add order to tests that rely on db ordering, to fix failing tests on pg
    
    Also skip persistente tests related to UPDATE + ORDER BY for postgresql
    
    PostgreSQL does not support updates with order by, and these tests are
    failing randomly depending on the fixture loading order now.
    
    Conflicts:
    
    	activerecord/test/cases/associations/join_model_test.rb
    	activerecord/test/cases/associations/nested_through_associations_test.rb
    	activerecord/test/cases/clone_test.rb
    	activerecord/test/cases/dup_test.rb
    	activerecord/test/cases/relations_test.rb
    	activerecord/test/cases/yaml_serialization_test.rb

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb
M	activerecord/test/models/company.rb

commit b332891	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-03-22 11:08:04 -0300

    Add order to tests that rely on db ordering, to fix failing tests on pg
    
    Also skip persistente tests related to UPDATE + ORDER BY for postgresql
    
    PostgreSQL does not support updates with order by, and these tests are
    failing randomly depending on the fixture loading order now.

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/clone_test.rb
M	activerecord/test/cases/dup_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb
M	activerecord/test/models/company.rb

commit b4115fd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-22 16:25:48 -0700

    properly namespace the fixture exception

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit fad83d8	refs/heads/master
Merge: 6424922 9c857db
Author: Aaron Patterson 
Date:   2012-03-22 15:31:45 -0700

    Merge pull request #5552 from lest/patch-3
    
    deprecate Proc#bind that can cause symbol memory leak

commit 9c857db	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-22 22:25:55 +0300

    deprecate Proc#bind that can cause symbol memory leak

M	activesupport/lib/active_support/core_ext/proc.rb
M	activesupport/lib/active_support/rescuable.rb
M	activesupport/test/core_ext/proc_test.rb

commit 7529283	refs/heads/master
Author: schneems 
Date:   2012-03-22 13:13:12 -0400

    match rails console environment support, to server
    
    rails server takes `-e` as an argument to specify RAILS_ENV, rails console currently does not have the same interface. This commit fixes this disparity so developers can manually specify `RAILS_ENV` or can pass in an environment with a `-e`.

M	railties/lib/rails/commands/console.rb
M	railties/test/commands/console_test.rb

commit 65a3020	refs/heads/master
Author: Joe Goggins 
Date:   2012-03-22 10:02:08 -0500

    Adding documentation for ActiveRecord::Base.abstract_class to clarify a particular usecase for this feature (to allow you to use inheritance in ActiveRecord without using the STI table name

M	activerecord/lib/active_record/inheritance.rb

commit c5f4b20	refs/heads/master
Author: Anton Lindqvist 
Date:   2012-03-22 12:25:10 +0100

    Fixed missing space bug introduces in rails/rails@9299bfdcd387253d83b645c205b8df477f2d0940.

M	railties/lib/rails/source_annotation_extractor.rb
M	railties/test/application/rake/notes_test.rb

commit d3223b5	refs/heads/master
Author: adman65 
Date:   2012-03-22 12:10:52 +0100

    Update config.assets.initialize_on_precompile warning to include engine side affects

M	guides/source/asset_pipeline.textile

commit 5fdcda8	refs/heads/master
Author: adman65 
Date:   2012-03-22 12:05:28 +0100

    [engines] [ci-skip] Add example of precompiling engine assets

M	guides/source/engines.textile

commit 152798f	refs/heads/master
Author: kucaahbe 
Date:   2012-03-22 11:39:46 +0200

    improvements in "caching_with_rails" guide

M	guides/source/caching_with_rails.textile

commit b714140	refs/tags/v3.2.5
Merge: 89f8866 8c262f7
Author: José Valim 
Date:   2012-03-22 01:40:54 -0700

    Merge pull request #5525 from kennyj/fix_5411
    
    Fix GH #5411. When precompiling, params method is undefined.

commit 8c262f7	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-03-21 02:12:00 +0900

    Fix GH #5411. When precompiling, params method is undefined.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	railties/test/application/assets_test.rb

commit 89f8866	refs/tags/v3.2.5
Merge: f829515 35bf748
Author: Piotr Sarnacki 
Date:   2012-03-21 18:23:19 -0700

    Merge pull request #5542 from mhfs/port_5522_to_32stable
    
    Port of #5522 'Fix adding/removing field's index when generating migration'

commit 6424922	refs/heads/master
Merge: b6c128d 86d1dfb
Author: Piotr Sarnacki 
Date:   2012-03-21 18:03:17 -0700

    Merge pull request #5540 from mhfs/another_blank_line_fix
    
    Avoid another blank line in generated migration and remove assertion as per @spastorino request

commit b6c128d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-21 16:42:28 -0700

    remove duplicate requires. thanks @atambo

M	activesupport/lib/active_support/notifications.rb

commit c7847f1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-21 15:04:22 -0700

    evented listeners can subscribe to any message

M	activesupport/lib/active_support/notifications/fanout.rb

commit 6989db9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-21 13:41:43 -0700

    evented subscribers work

M	activesupport/lib/active_support/notifications/fanout.rb

commit f08f875	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-21 13:06:56 -0700

    start / finish events are sent by the instrumenter

M	activesupport/lib/active_support/notifications/fanout.rb
M	activesupport/lib/active_support/notifications/instrumenter.rb

commit 60736fe	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-21 11:33:23 -0700

    push the autoloads up to requires

M	activesupport/lib/active_support/notifications.rb

commit 35bf748	refs/tags/v3.2.5
Author: Marcelo Silveira 
Date:   2012-03-21 19:43:41 -0300

    [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating migration'

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	railties/test/generators/migration_generator_test.rb

commit 86d1dfb	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-03-21 19:28:34 -0300

    Avoid another blank line in generated migration and remove assertion as per @spastorino request

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	railties/test/generators/migration_generator_test.rb

commit 0a12a5f	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-21 22:18:18 +0000

    Deprecate eager-evaluated scopes.
    
    Don't use this:
    
        scope :red, where(color: 'red')
        default_scope where(color: 'red')
    
    Use this:
    
        scope :red, -> { where(color: 'red') }
        default_scope { where(color: 'red') }
    
    The former has numerous issues. It is a common newbie gotcha to do
    the following:
    
        scope :recent, where(published_at: Time.now - 2.weeks)
    
    Or a more subtle variant:
    
        scope :recent, -> { where(published_at: Time.now - 2.weeks) }
        scope :recent_red, recent.where(color: 'red')
    
    Eager scopes are also very complex to implement within Active
    Record, and there are still bugs. For example, the following does
    not do what you expect:
    
        scope :remove_conditions, except(:where)
        where(...).remove_conditions # => still has conditions

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/scoping/default.rb
M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/bulb.rb
M	activerecord/test/models/car.rb
M	activerecord/test/models/categorization.rb
M	activerecord/test/models/category.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/models/developer.rb
M	activerecord/test/models/organization.rb
M	activerecord/test/models/person.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/project.rb
M	activerecord/test/models/reference.rb
M	activerecord/test/models/reply.rb
M	activerecord/test/models/topic.rb
M	activerecord/test/models/toy.rb
M	activerecord/test/models/without_table.rb

commit fd68bd2	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-21 20:37:14 +0000

    Avoid obscure &Proc.new thing

M	activerecord/lib/active_record/scoping/named.rb

commit f6db31e	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-21 20:30:48 +0000

    Remove valid_scope_name? check - use ruby
    
    scope is syntactic sugar for defining a class method. Ruby allows
    redefining methods but emits a warning when run with -w. So let's
    not implement our own logic for this. Users should run with -w if they
    want to be warned about redefined methods.

M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/named_scope_test.rb

commit 884e5b7	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-21 20:25:51 +0000

    no need for cast

M	activerecord/lib/active_record/scoping/named.rb

commit 7c1275a	refs/heads/master
Author: Jon Leighton 
Date:   2012-03-21 20:23:46 +0000

    no need for lvar

M	activerecord/lib/active_record/scoping/named.rb

commit d99c790	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-21 11:12:46 -0700

    split subscribers based on pattern type

M	activesupport/lib/active_support/notifications/fanout.rb

commit c8792c7	refs/heads/master
Author: Mark McSpadden 
Date:   2012-03-21 04:34:32 -0400

    Allow manual rollbacks in after_save to reset object correctly

M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/transaction_callbacks_test.rb

commit 14b2cf6	refs/heads/master
Merge: 2884567 c63306b
Author: José Valim 
Date:   2012-03-21 00:34:38 -0700

    Merge pull request #5532 from mhfs/migration_blank_line
    
    Remove blank line from generated migration

commit f829515	refs/tags/v3.2.5
Merge: 275ee0d 57c6b4c
Author: José Valim 
Date:   2012-03-21 00:28:38 -0700

    Merge pull request #5533 from mhfs/migration_blank_line_3_2
    
    [3-2-stable] Remove blank line from generated migration

commit 2884567	refs/heads/master
Merge: b49a7dd b2a5938
Author: José Valim 
Date:   2012-03-21 00:25:02 -0700

    Merge pull request #5522 from travisjeffery/fix_migration_generator_adding_removing_index
    
    Fix adding/removing field's index when generating migration

commit 565bfb9	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-01-10 22:49:44 +0900

    migrate(:down) method with table_name_prefix

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/invertible_migration_test.rb

commit b2a5938	refs/heads/master
Author: Travis Jeffery 
Date:   2012-03-21 01:20:35 +0000

    Generate Migration Thats Adds Removed Index
    
    When generating a migration that removes a field with an index, the down
    will add both the field and its index.

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	railties/test/generators/migration_generator_test.rb

commit 57c6b4c	refs/tags/v3.2.5
Author: Marcelo Silveira 
Date:   2012-03-20 22:06:42 -0300

    [3-2-stable] Remove blank line from generated migration

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	railties/test/generators/migration_generator_test.rb

commit 0a555dd	refs/heads/master
Author: schneems 
Date:   2012-03-20 19:28:30 -0400

    fix rails server support of RAILS_ENV variable
    
    When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server.
    
    When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment.
    
    This fixes both of those cases

M	railties/lib/rails/commands/server.rb
A	railties/test/commands/server_test.rb

commit c63306b	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-03-20 21:44:45 -0300

    Remove blank line from generated migration

M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	railties/test/generators/migration_generator_test.rb

commit 5c1109a	refs/heads/master
Author: Ivan Vanderbyl 
Date:   2011-08-23 20:10:37 +1000

    Added a generator option to remove the public/index.html file when generating a new Rails application
    
    The option is:
    -i, [--skip-index-html]        # Skip public/index.html file

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/app_generator_test.rb

commit 50fc5a2	refs/heads/master
Author: Juanjo Bazán 
Date:   2012-03-20 22:57:06 +0100

    Fixed-width font fix for instance variable

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit b49a7dd	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-03-20 22:16:44 +0100

    We dont need to merge in the parameters as thats all being reset by the rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)

M	actionpack/lib/action_controller/test_case.rb

commit 275ee0d	refs/tags/v3.2.5
Author: David Heinemeier Hansson 
Date:   2012-03-20 22:16:44 +0100

    We dont need to merge in the parameters as thats all being reset by the rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)

M	actionpack/lib/action_controller/test_case.rb

commit bdf7624	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-20 10:38:43 -0700

    probably should require the objects we monkey patch.

M	activesupport/lib/active_support/core_ext/object/duplicable.rb

commit 4a1a018	refs/heads/master
Author: Mark D. Blackwell 
Date:   2012-03-20 13:01:01 -0400

    [ci skip] Make guides more readable & consistent

M	guides/source/api_documentation_guidelines.textile
M	guides/source/contributing_to_ruby_on_rails.textile
M	guides/source/ruby_on_rails_guides_guidelines.textile

commit c317c5b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-20 09:58:42 -0700

    search private and protected methods for convert_key

M	activesupport/lib/active_support/core_ext/hash/slice.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit 440559f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-20 09:51:22 -0700

    bigdecimal can be duped on Ruby 2.0

M	activesupport/lib/active_support/core_ext/object/duplicable.rb
M	activesupport/test/core_ext/duplicable_test.rb

commit ae88ec4	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-20 20:24:59 +0530

    guides location has changed [ci skip]

M	guides/source/ruby_on_rails_guides_guidelines.textile

commit 5c1f389	refs/heads/master
Merge: ae97715 c5b3cbc
Author: Xavier Noria 
Date:   2012-03-20 07:16:26 -0700

    Merge pull request #5524 from kennyj/add_missing_require
    
    Add missing require

commit c5b3cbc	refs/heads/master
Author: kennyj 
Date:   2012-03-20 23:11:27 +0900

    Add missing require

M	activesupport/test/ordered_options_test.rb

commit a4b1423	refs/heads/master
Author: Dave Burt 
Date:   2012-03-20 16:13:19 +1100

    Correct description of ['migrated_at > ?', 1.week.ago] from "more than a week ago" to "more recently than a week ago."

M	activerecord/lib/active_record/relation.rb

commit 884cb24	refs/heads/master
Merge: c291195 b3d4799
Author: Charles Brian Quinn 
Date:   2012-03-19 21:01:22 -0400

    Merge branch 'master' of github.com:lifo/docrails

commit c291195	refs/heads/master
Author: Charles Brian Quinn 
Date:   2012-03-19 20:59:31 -0400

    Updates ActionMailer Base summary and fixes space in code example.

M	actionmailer/lib/action_mailer/base.rb

commit a26dcb6	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-19 19:32:34 -0300

    Remove code duplication

M	actionpack/lib/action_view/helpers/date_helper.rb

commit b3d4799	refs/heads/master
Author: Jesse Brown 
Date:   2012-03-19 15:34:26 -0700

    Adding comma to correct syntax in comment.

M	railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb

commit ae97715	refs/heads/master
Merge: 09d884c 6e04a78
Author: José Valim 
Date:   2012-03-19 12:40:41 -0700

    Merge pull request #5515 from rafaelfranca/remove-exclude
    
    Remove exclude option from ActionDispatch::SSL and fix secure cookies

commit 6e04a78	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-19 16:28:15 -0300

    Fix secure cookies when there are more than one space before the secure
    keyword

M	actionpack/lib/action_dispatch/middleware/ssl.rb
M	actionpack/test/dispatch/ssl_test.rb

commit 139bf55	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-19 16:26:52 -0300

    Remove exclude option from ActionDispatch::SSL

M	actionpack/lib/action_dispatch/middleware/ssl.rb
M	actionpack/test/dispatch/ssl_test.rb

commit 09d884c	refs/heads/master
Merge: 9c748f3 d2d2fc0
Author: Andrew White 
Date:   2012-03-19 10:01:54 -0700

    Merge pull request #5503 from jeyb/leap_day_time_date_time_selector
    
    Fixes issue #5222: DateTimeSelector builds invalid dates on leap days

commit 9c748f3	refs/heads/master
Merge: 50b3113 426840c
Author: Vijay Dev 
Date:   2012-03-19 18:28:10 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 426840c	refs/heads/master
Author: Sandeep 
Date:   2012-03-19 17:53:27 +0530

    -h also shows help options.

M	README.rdoc

commit 50b3113	refs/heads/master
Merge: 98dc67c 70a19b7
Author: Xavier Noria 
Date:   2012-03-19 03:25:01 -0700

    Merge pull request #5507 from sandeepravi/warning_fixes
    
    changed all.map to pluck

commit 98dc67c	refs/heads/master
Merge: 24d244c e0ee14e
Author: José Valim 
Date:   2012-03-19 03:10:47 -0700

    Merge pull request #5508 from FND/tagged_logger_shortcut
    
    Provide access to logger instance within TaggedLogging blocks

commit e0ee14e	refs/heads/master
Author: FND 
Date:   2012-03-19 10:44:20 +0100

    Provide access to logger instance within TaggedLogging blocks
    
    this improves encapsulation, simplifying occurrences like the following:
    
        Rails.logger.tagged("DEBUG") { Rails.logger.debug(msg) }
    
    ... by removing the need to rely on (i.e. repeat) outer variables:
    
        Rails.logger.tagged("DEBUG") { |logger| logger.debug(msg) }

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit 70a19b7	refs/heads/master
Author: Sandeep 
Date:   2012-03-19 15:16:49 +0530

    changed all.map to pluck

M	activerecord/test/cases/base_test.rb

commit fea82eb	refs/tags/v3.1.6
Merge: 594d6b2 c1c62e8
Author: José Valim 
Date:   2012-03-19 00:17:56 -0700

    Merge pull request #5506 from arunagw/build_fix_1.8.7-3-1-stable
    
    Build fix 1.8.7 3 1 stable

commit c1c62e8	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-03-19 12:30:39 +0530

    Build fix for form_options_helper_test.rb ruby-1.8.7

M	actionpack/test/template/form_options_helper_test.rb

commit 358333f	refs/tags/v3.2.5
Merge: 74b7829 fcc8743
Author: José Valim 
Date:   2012-03-18 23:50:51 -0700

    Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable
    
    Build fix 1.8.7 3 2 stable

commit 594d6b2	refs/tags/v3.1.6
Merge: f12d76b eeee6f2
Author: José Valim 
Date:   2012-03-18 23:50:41 -0700

    Merge pull request #5504 from arunagw/build_fix_1-8-7
    
    Build fix 1 8 7

commit fcc8743	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-03-19 11:55:50 +0530

    Build fix for ruby1.8.7-358

M	actionpack/test/controller/request_forgery_protection_test.rb
M	actionpack/test/template/form_options_helper_test.rb

commit eeee6f2	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-03-19 11:32:56 +0530

    fix test failing in 1.8.7

M	activerecord/test/cases/nested_attributes_test.rb

commit d2d2fc0	refs/heads/master
Author: Jey Balachandran 
Date:   2012-03-18 20:44:46 -0700

    Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when discarding both day and month.

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/active_model_helper_test.rb
M	actionpack/test/template/date_helper_test.rb

commit 24d244c	refs/heads/master
Author: Mikel Lindsaar 
Date:   2012-03-19 14:43:07 +1100

    Increase minimum version of mail.
    
      Second security vulnerability found in mail file delivery method
      patched in version 2.4.4.

M	actionmailer/actionmailer.gemspec

commit 74b7829	refs/tags/v3.2.5
Author: Mikel Lindsaar 
Date:   2012-03-19 14:43:07 +1100

    Increase minimum version of mail.
    
      Second security vulnerability found in mail file delivery method
      patched in version 2.4.4.

M	actionmailer/actionmailer.gemspec

commit f12d76b	refs/tags/v3.1.6
Author: Mikel Lindsaar 
Date:   2012-03-19 14:40:34 +1100

    Increase minimum version of mail.
    
      Second security vulnerability found in mail file delivery method
      patched in version 2.3.3.

M	actionmailer/actionmailer.gemspec

commit 0f8f99b	refs/heads/master
Author: Pan Thomakos 
Date:   2012-03-18 11:24:04 -0700

    Removed ActiveSupport#load_all!
    
    This is no longer used and actually raises an error when trying to load
    `ActiveSupport::Dependencies`. I removed the related code and added the
    `Dependencies` module to the autoload list.

M	activesupport/lib/active_support.rb
M	activesupport/lib/active_support/time.rb

commit c8fbd48	refs/tags/v3.2.5
Merge: d9355be 9451201
Author: José Valim 
Date:   2012-03-18 09:27:21 -0700

    Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-2-stable
    
    Build fix app generator test 3 2 stable

commit 9451201	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-03-18 10:24:18 +0530

    Build fix for app_generator_test.rb

M	railties/test/generators/app_generator_test.rb

commit d3bbb23	refs/heads/master
Merge: d802a6c 62e0337
Author: Piotr Sarnacki 
Date:   2012-03-18 04:58:41 -0700

    Merge pull request #5492 from arunagw/build_fix_app_generator_test
    
    Build fix for app_generator_test.rb

commit d802a6c	refs/heads/master
Merge: 0c18faf f1903d8d
Author: José Valim 
Date:   2012-03-18 04:13:28 -0700

    Merge pull request #3329 from armstrjare/autosave_collection_new_record_bug
    
    Autosave association doesn't save all records on a new record for a collection association if there are records marked for destruction

commit 0c18faf	refs/heads/master
Merge: 2b5cb1c 0540644
Author: José Valim 
Date:   2012-03-18 04:10:15 -0700

    Merge pull request #5496 from atd/master
    
    time_tag support for blocks

commit 0540644	refs/heads/master
Author: Antonio Tapiador del Dujo 
Date:   2012-03-18 11:58:08 +0100

    time_tag support for blocks

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit d25d3fb	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-18 05:48:32 -0500

    respond_with description: changed 'response' to 'format'

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit 9e98d2d	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-18 05:31:33 -0500

    Revised comments for respond_with

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit d9355be	refs/tags/v3.2.5
Merge: 41815f5 f4f9ec1
Author: Piotr Sarnacki 
Date:   2012-03-18 02:33:33 -0700

    Merge pull request #5493 from kennyj/fix_5435-32
    
    [3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.

commit f1903d8d	refs/heads/master
Author: Jared Armstrong 
Date:   2011-10-15 00:49:55 +1300

    Fix bug with autosave collection association on new record with a marked for destroy record in autosave collection.

M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/test/cases/autosave_association_test.rb

commit f4f9ec1	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-03-18 14:19:30 +0900

    Fix GH #5435. db:structure:dump should be re-enable.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake_test.rb

commit 62e0337	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-18 10:24:18 +0530

    Build fix for app_generator_test.rb

M	railties/test/generators/app_generator_test.rb

commit 2b5cb1c	refs/heads/master
Merge: c513ae3 0360b3e
Author: Aaron Patterson 
Date:   2012-03-17 21:50:37 -0700

    Merge pull request #5486 from kennyj/fix_5435
    
    Fix GH #5435. db:structure:dump should be re-enable.

commit a188a1d	refs/heads/master
Merge: f2bc404 ef0821b
Author: Mark Thomson 
Date:   2012-03-17 22:40:11 -0500

    Merge remote-tracking branch 'origin/master'

commit f2bc404	refs/heads/master
Merge: 98b4ef7 6ce54d4
Author: Mark Thomson 
Date:   2012-03-17 22:29:46 -0500

    Merge remote-tracking branch 'origin/master'

commit 98b4ef7	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-17 22:29:17 -0500

    Revised description for responds_with

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit ef0821b	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-17 20:41:32 -0600

    [getting started] Explain what the create action is accomplishing after params are output
    
    [ci skip]

M	guides/source/getting_started.textile

commit b30cc24	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-17 20:41:06 -0600

    [getting started] [ci skip] Explain in better terms what we are doing with render and params[:post] inspection upon first use

M	guides/source/getting_started.textile

commit 62d3693	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-17 20:40:29 -0600

    [getting started] [ci skip] Just want to get post params

M	guides/source/getting_started.textile

commit edad287	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-17 20:40:05 -0600

    [getting started] Add images

A	guides/assets/images/getting_started/new_post.png
A	guides/assets/images/getting_started/routing_error_no_controller.png
A	guides/assets/images/getting_started/routing_error_no_route_matches.png
A	guides/assets/images/getting_started/template_is_missing_posts_new.png
A	guides/assets/images/getting_started/unknown_action_create_for_posts.png
A	guides/assets/images/getting_started/unknown_action_new_for_posts.png

commit c513ae3	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-17 23:30:28 +0100

    Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only

M	railties/lib/rails/generators/app_base.rb

commit 41815f5	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-17 23:30:28 +0100

    Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only

M	railties/lib/rails/generators/app_base.rb

commit c0a5b85	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-03-06 22:04:53 +0100

    Ensure load hooks can be called more than once with different contexts.

M	activesupport/lib/active_support/lazy_load_hooks.rb
M	activesupport/test/lazy_load_hooks_test.rb

commit 0061496	refs/heads/master
Merge: adadd86 9679d40
Author: José Valim 
Date:   2012-03-17 10:27:21 -0700

    Merge pull request #5489 from rdavila/fix_typo_activerecord_test
    
    Fix typo in ActiveRecord::Relation#blank? test

commit adadd86	refs/heads/master
Merge: 6ce54d4 da5a47e
Author: José Valim 
Date:   2012-03-17 10:25:26 -0700

    Merge pull request #5488 from rafaelfranca/ad-ssl
    
    Remove Rack::SSL in favour of ActionDispatch::SSL

commit 9679d40	refs/heads/master
Author: Ruben Davila 
Date:   2012-03-17 12:22:54 -0500

    Fix typo in ActiveRecord::Relation#blank? test

M	activerecord/test/cases/relations_test.rb

commit da5a47e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-17 13:36:24 -0300

    Update the guides and CHANGELOG

M	actionpack/CHANGELOG.md
M	guides/source/configuring.textile
M	railties/CHANGELOG.md

commit 919afca	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-16 23:23:00 -0300

    Whitespaces :scissors:

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb

commit 041f4ee	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-16 23:36:46 -0300

    Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.x

M	actionpack/lib/action_dispatch/middleware/ssl.rb
M	actionpack/test/dispatch/ssl_test.rb

commit 9ec63eb	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-16 23:22:25 -0300

    Rack::SSL -> ActionDispatch::SSL

M	actionpack/lib/action_dispatch.rb
A	actionpack/lib/action_dispatch/middleware/ssl.rb
A	actionpack/test/dispatch/ssl_test.rb
M	railties/lib/rails/application.rb
M	railties/railties.gemspec
M	railties/test/application/middleware_test.rb

commit 6ce54d4	refs/heads/master
Merge: f987220 9e09e8f
Author: Vijay Dev 
Date:   2012-03-17 21:15:36 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit f987220	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-17 12:42:29 -0300

    Add missing require

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit d266c2e	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-17 12:34:09 -0300

    Remove unused require

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 6d87cd0	refs/heads/master
Author: Xavier Noria 
Date:   2012-03-17 08:32:49 -0700

    moves the guides up to the root directory

M	.gitignore
A	guides/Rakefile
A	guides/assets/images/belongs_to.png
A	guides/assets/images/book_icon.gif
A	guides/assets/images/bullet.gif
A	guides/assets/images/challenge.png
A	guides/assets/images/chapters_icon.gif
A	guides/assets/images/check_bullet.gif
A	guides/assets/images/credits_pic_blank.gif
A	guides/assets/images/csrf.png
A	guides/assets/images/customized_error_messages.png
A	guides/assets/images/edge_badge.png
A	guides/assets/images/error_messages.png
A	guides/assets/images/feature_tile.gif
A	guides/assets/images/footer_tile.gif
A	guides/assets/images/fxn.png
A	guides/assets/images/grey_bullet.gif
A	guides/assets/images/habtm.png
A	guides/assets/images/has_many.png
A	guides/assets/images/has_many_through.png
A	guides/assets/images/has_one.png
A	guides/assets/images/has_one_through.png
A	guides/assets/images/header_backdrop.png
A	guides/assets/images/header_tile.gif
A	guides/assets/images/i18n/demo_html_safe.png
A	guides/assets/images/i18n/demo_localized_pirate.png
A	guides/assets/images/i18n/demo_translated_en.png
A	guides/assets/images/i18n/demo_translated_pirate.png
A	guides/assets/images/i18n/demo_translation_missing.png
A	guides/assets/images/i18n/demo_untranslated.png
A	guides/assets/images/icons/README
A	guides/assets/images/icons/callouts/1.png
A	guides/assets/images/icons/callouts/10.png
A	guides/assets/images/icons/callouts/11.png
A	guides/assets/images/icons/callouts/12.png
A	guides/assets/images/icons/callouts/13.png
A	guides/assets/images/icons/callouts/14.png
A	guides/assets/images/icons/callouts/15.png
A	guides/assets/images/icons/callouts/2.png
A	guides/assets/images/icons/callouts/3.png
A	guides/assets/images/icons/callouts/4.png
A	guides/assets/images/icons/callouts/5.png
A	guides/assets/images/icons/callouts/6.png
A	guides/assets/images/icons/callouts/7.png
A	guides/assets/images/icons/callouts/8.png
A	guides/assets/images/icons/callouts/9.png
A	guides/assets/images/icons/caution.png
A	guides/assets/images/icons/example.png
A	guides/assets/images/icons/home.png
A	guides/assets/images/icons/important.png
A	guides/assets/images/icons/next.png
A	guides/assets/images/icons/note.png
A	guides/assets/images/icons/prev.png
A	guides/assets/images/icons/tip.png
A	guides/assets/images/icons/up.png
A	guides/assets/images/icons/warning.png
A	guides/assets/images/jaimeiniesta.jpg
A	guides/assets/images/nav_arrow.gif
A	guides/assets/images/polymorphic.png
A	guides/assets/images/posts_index.png
A	guides/assets/images/radar.png
A	guides/assets/images/rails_guides_kindle_cover.jpg
A	guides/assets/images/rails_guides_logo.gif
A	guides/assets/images/rails_logo_remix.gif
A	guides/assets/images/rails_welcome.png
A	guides/assets/images/session_fixation.png
A	guides/assets/images/tab_grey.gif
A	guides/assets/images/tab_info.gif
A	guides/assets/images/tab_note.gif
A	guides/assets/images/tab_red.gif
A	guides/assets/images/tab_yellow.gif
A	guides/assets/images/tab_yellow.png
A	guides/assets/images/validation_error_messages.png
A	guides/assets/images/vijaydev.jpg
A	guides/assets/javascripts/guides.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
A	guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
A	guides/assets/javascripts/syntaxhighlighter/shCore.js
A	guides/assets/stylesheets/fixes.css
A	guides/assets/stylesheets/kindle.css
A	guides/assets/stylesheets/main.css
A	guides/assets/stylesheets/print.css
A	guides/assets/stylesheets/reset.css
A	guides/assets/stylesheets/style.css
A	guides/assets/stylesheets/syntaxhighlighter/shCore.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
A	guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
A	guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
A	guides/code/getting_started/Gemfile
A	guides/code/getting_started/README.rdoc
A	guides/code/getting_started/Rakefile
A	guides/code/getting_started/app/assets/images/rails.png
A	guides/code/getting_started/app/assets/javascripts/application.js
A	guides/code/getting_started/app/assets/javascripts/comments.js.coffee
A	guides/code/getting_started/app/assets/javascripts/home.js.coffee
A	guides/code/getting_started/app/assets/javascripts/posts.js.coffee
A	guides/code/getting_started/app/assets/stylesheets/application.css
A	guides/code/getting_started/app/assets/stylesheets/comments.css.scss
A	guides/code/getting_started/app/assets/stylesheets/home.css.scss
A	guides/code/getting_started/app/assets/stylesheets/posts.css.scss
A	guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
A	guides/code/getting_started/app/controllers/application_controller.rb
A	guides/code/getting_started/app/controllers/comments_controller.rb
A	guides/code/getting_started/app/controllers/home_controller.rb
A	guides/code/getting_started/app/controllers/posts_controller.rb
A	guides/code/getting_started/app/helpers/application_helper.rb
A	guides/code/getting_started/app/helpers/comments_helper.rb
A	guides/code/getting_started/app/helpers/home_helper.rb
A	guides/code/getting_started/app/helpers/posts_helper.rb
A	guides/code/getting_started/app/mailers/.gitkeep
A	guides/code/getting_started/app/models/.gitkeep
A	guides/code/getting_started/app/models/comment.rb
A	guides/code/getting_started/app/models/post.rb
A	guides/code/getting_started/app/models/tag.rb
A	guides/code/getting_started/app/views/comments/_comment.html.erb
A	guides/code/getting_started/app/views/comments/_form.html.erb
A	guides/code/getting_started/app/views/home/index.html.erb
A	guides/code/getting_started/app/views/layouts/application.html.erb
A	guides/code/getting_started/app/views/posts/_form.html.erb
A	guides/code/getting_started/app/views/posts/edit.html.erb
A	guides/code/getting_started/app/views/posts/index.html.erb
A	guides/code/getting_started/app/views/posts/new.html.erb
A	guides/code/getting_started/app/views/posts/show.html.erb
A	guides/code/getting_started/app/views/tags/_form.html.erb
A	guides/code/getting_started/config.ru
A	guides/code/getting_started/config/application.rb
A	guides/code/getting_started/config/boot.rb
A	guides/code/getting_started/config/database.yml
A	guides/code/getting_started/config/environment.rb
A	guides/code/getting_started/config/environments/development.rb
A	guides/code/getting_started/config/environments/production.rb
A	guides/code/getting_started/config/environments/test.rb
A	guides/code/getting_started/config/initializers/backtrace_silencers.rb
A	guides/code/getting_started/config/initializers/inflections.rb
A	guides/code/getting_started/config/initializers/mime_types.rb
A	guides/code/getting_started/config/initializers/secret_token.rb
A	guides/code/getting_started/config/initializers/session_store.rb
A	guides/code/getting_started/config/initializers/wrap_parameters.rb
A	guides/code/getting_started/config/locales/en.yml
A	guides/code/getting_started/config/routes.rb
A	guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
A	guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
A	guides/code/getting_started/db/migrate/20110901013701_create_tags.rb
A	guides/code/getting_started/db/schema.rb
A	guides/code/getting_started/db/seeds.rb
A	guides/code/getting_started/doc/README_FOR_APP
A	guides/code/getting_started/lib/assets/.gitkeep
A	guides/code/getting_started/lib/tasks/.gitkeep
A	guides/code/getting_started/public/404.html
A	guides/code/getting_started/public/422.html
A	guides/code/getting_started/public/500.html
A	guides/code/getting_started/public/favicon.ico
A	guides/code/getting_started/public/robots.txt
A	guides/code/getting_started/script/rails
A	guides/code/getting_started/test/fixtures/.gitkeep
A	guides/code/getting_started/test/fixtures/comments.yml
A	guides/code/getting_started/test/fixtures/posts.yml
A	guides/code/getting_started/test/fixtures/tags.yml
A	guides/code/getting_started/test/functional/.gitkeep
A	guides/code/getting_started/test/functional/comments_controller_test.rb
A	guides/code/getting_started/test/functional/home_controller_test.rb
A	guides/code/getting_started/test/functional/posts_controller_test.rb
A	guides/code/getting_started/test/integration/.gitkeep
A	guides/code/getting_started/test/performance/browsing_test.rb
A	guides/code/getting_started/test/test_helper.rb
A	guides/code/getting_started/test/unit/.gitkeep
A	guides/code/getting_started/test/unit/comment_test.rb
A	guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
A	guides/code/getting_started/test/unit/helpers/home_helper_test.rb
A	guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
A	guides/code/getting_started/test/unit/post_test.rb
A	guides/code/getting_started/test/unit/tag_test.rb
A	guides/code/getting_started/vendor/assets/stylesheets/.gitkeep
A	guides/code/getting_started/vendor/plugins/.gitkeep
A	guides/rails_guides.rb
A	guides/rails_guides/generator.rb
A	guides/rails_guides/helpers.rb
A	guides/rails_guides/indexer.rb
A	guides/rails_guides/levenshtein.rb
A	guides/rails_guides/textile_extensions.rb
A	guides/source/2_2_release_notes.textile
A	guides/source/2_3_release_notes.textile
A	guides/source/3_0_release_notes.textile
A	guides/source/3_1_release_notes.textile
A	guides/source/3_2_release_notes.textile
A	guides/source/_license.html.erb
A	guides/source/_welcome.html.erb
A	guides/source/action_controller_overview.textile
A	guides/source/action_mailer_basics.textile
A	guides/source/action_view_overview.textile
A	guides/source/active_model_basics.textile
A	guides/source/active_record_basics.textile
A	guides/source/active_record_querying.textile
A	guides/source/active_record_validations_callbacks.textile
A	guides/source/active_support_core_extensions.textile
A	guides/source/active_support_instrumentation.textile
A	guides/source/ajax_on_rails.textile
A	guides/source/api_documentation_guidelines.textile
A	guides/source/asset_pipeline.textile
A	guides/source/association_basics.textile
A	guides/source/caching_with_rails.textile
A	guides/source/command_line.textile
A	guides/source/configuring.textile
A	guides/source/contributing_to_ruby_on_rails.textile
A	guides/source/credits.html.erb
A	guides/source/debugging_rails_applications.textile
A	guides/source/documents.yaml
A	guides/source/engines.textile
A	guides/source/form_helpers.textile
A	guides/source/generators.textile
A	guides/source/getting_started.textile
A	guides/source/i18n.textile
A	guides/source/index.html.erb
A	guides/source/initialization.textile
A	guides/source/kindle/KINDLE.md
A	guides/source/kindle/copyright.html.erb
A	guides/source/kindle/layout.html.erb
A	guides/source/kindle/rails_guides.opf.erb
A	guides/source/kindle/toc.html.erb
A	guides/source/kindle/toc.ncx.erb
A	guides/source/kindle/welcome.html.erb
A	guides/source/layout.html.erb
A	guides/source/layouts_and_rendering.textile
A	guides/source/migrations.textile
A	guides/source/nested_model_forms.textile
A	guides/source/performance_testing.textile
A	guides/source/plugins.textile
A	guides/source/rails_application_templates.textile
A	guides/source/rails_on_rack.textile
A	guides/source/routing.textile
A	guides/source/ruby_on_rails_guides_guidelines.textile
A	guides/source/security.textile
A	guides/source/testing.textile
A	guides/source/upgrading_ruby_on_rails.textile
A	guides/w3c_validator.rb
M	rails.gemspec
M	railties/Rakefile
D	railties/guides/assets/images/belongs_to.png
D	railties/guides/assets/images/book_icon.gif
D	railties/guides/assets/images/bullet.gif
D	railties/guides/assets/images/challenge.png
D	railties/guides/assets/images/chapters_icon.gif
D	railties/guides/assets/images/check_bullet.gif
D	railties/guides/assets/images/credits_pic_blank.gif
D	railties/guides/assets/images/csrf.png
D	railties/guides/assets/images/customized_error_messages.png
D	railties/guides/assets/images/edge_badge.png
D	railties/guides/assets/images/error_messages.png
D	railties/guides/assets/images/feature_tile.gif
D	railties/guides/assets/images/footer_tile.gif
D	railties/guides/assets/images/fxn.png
D	railties/guides/assets/images/grey_bullet.gif
D	railties/guides/assets/images/habtm.png
D	railties/guides/assets/images/has_many.png
D	railties/guides/assets/images/has_many_through.png
D	railties/guides/assets/images/has_one.png
D	railties/guides/assets/images/has_one_through.png
D	railties/guides/assets/images/header_backdrop.png
D	railties/guides/assets/images/header_tile.gif
D	railties/guides/assets/images/i18n/demo_html_safe.png
D	railties/guides/assets/images/i18n/demo_localized_pirate.png
D	railties/guides/assets/images/i18n/demo_translated_en.png
D	railties/guides/assets/images/i18n/demo_translated_pirate.png
D	railties/guides/assets/images/i18n/demo_translation_missing.png
D	railties/guides/assets/images/i18n/demo_untranslated.png
D	railties/guides/assets/images/icons/README
D	railties/guides/assets/images/icons/callouts/1.png
D	railties/guides/assets/images/icons/callouts/10.png
D	railties/guides/assets/images/icons/callouts/11.png
D	railties/guides/assets/images/icons/callouts/12.png
D	railties/guides/assets/images/icons/callouts/13.png
D	railties/guides/assets/images/icons/callouts/14.png
D	railties/guides/assets/images/icons/callouts/15.png
D	railties/guides/assets/images/icons/callouts/2.png
D	railties/guides/assets/images/icons/callouts/3.png
D	railties/guides/assets/images/icons/callouts/4.png
D	railties/guides/assets/images/icons/callouts/5.png
D	railties/guides/assets/images/icons/callouts/6.png
D	railties/guides/assets/images/icons/callouts/7.png
D	railties/guides/assets/images/icons/callouts/8.png
D	railties/guides/assets/images/icons/callouts/9.png
D	railties/guides/assets/images/icons/caution.png
D	railties/guides/assets/images/icons/example.png
D	railties/guides/assets/images/icons/home.png
D	railties/guides/assets/images/icons/important.png
D	railties/guides/assets/images/icons/next.png
D	railties/guides/assets/images/icons/note.png
D	railties/guides/assets/images/icons/prev.png
D	railties/guides/assets/images/icons/tip.png
D	railties/guides/assets/images/icons/up.png
D	railties/guides/assets/images/icons/warning.png
D	railties/guides/assets/images/jaimeiniesta.jpg
D	railties/guides/assets/images/nav_arrow.gif
D	railties/guides/assets/images/polymorphic.png
D	railties/guides/assets/images/posts_index.png
D	railties/guides/assets/images/radar.png
D	railties/guides/assets/images/rails_guides_kindle_cover.jpg
D	railties/guides/assets/images/rails_guides_logo.gif
D	railties/guides/assets/images/rails_logo_remix.gif
D	railties/guides/assets/images/rails_welcome.png
D	railties/guides/assets/images/session_fixation.png
D	railties/guides/assets/images/tab_grey.gif
D	railties/guides/assets/images/tab_info.gif
D	railties/guides/assets/images/tab_note.gif
D	railties/guides/assets/images/tab_red.gif
D	railties/guides/assets/images/tab_yellow.gif
D	railties/guides/assets/images/tab_yellow.png
D	railties/guides/assets/images/validation_error_messages.png
D	railties/guides/assets/images/vijaydev.jpg
D	railties/guides/assets/javascripts/guides.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
D	railties/guides/assets/javascripts/syntaxhighlighter/shCore.js
D	railties/guides/assets/stylesheets/fixes.css
D	railties/guides/assets/stylesheets/kindle.css
D	railties/guides/assets/stylesheets/main.css
D	railties/guides/assets/stylesheets/print.css
D	railties/guides/assets/stylesheets/reset.css
D	railties/guides/assets/stylesheets/style.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCore.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
D	railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
D	railties/guides/code/getting_started/Gemfile
D	railties/guides/code/getting_started/README.rdoc
D	railties/guides/code/getting_started/Rakefile
D	railties/guides/code/getting_started/app/assets/images/rails.png
D	railties/guides/code/getting_started/app/assets/javascripts/application.js
D	railties/guides/code/getting_started/app/assets/javascripts/comments.js.coffee
D	railties/guides/code/getting_started/app/assets/javascripts/home.js.coffee
D	railties/guides/code/getting_started/app/assets/javascripts/posts.js.coffee
D	railties/guides/code/getting_started/app/assets/stylesheets/application.css
D	railties/guides/code/getting_started/app/assets/stylesheets/comments.css.scss
D	railties/guides/code/getting_started/app/assets/stylesheets/home.css.scss
D	railties/guides/code/getting_started/app/assets/stylesheets/posts.css.scss
D	railties/guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
D	railties/guides/code/getting_started/app/controllers/application_controller.rb
D	railties/guides/code/getting_started/app/controllers/comments_controller.rb
D	railties/guides/code/getting_started/app/controllers/home_controller.rb
D	railties/guides/code/getting_started/app/controllers/posts_controller.rb
D	railties/guides/code/getting_started/app/helpers/application_helper.rb
D	railties/guides/code/getting_started/app/helpers/comments_helper.rb
D	railties/guides/code/getting_started/app/helpers/home_helper.rb
D	railties/guides/code/getting_started/app/helpers/posts_helper.rb
D	railties/guides/code/getting_started/app/mailers/.gitkeep
D	railties/guides/code/getting_started/app/models/.gitkeep
D	railties/guides/code/getting_started/app/models/comment.rb
D	railties/guides/code/getting_started/app/models/post.rb
D	railties/guides/code/getting_started/app/models/tag.rb
D	railties/guides/code/getting_started/app/views/comments/_comment.html.erb
D	railties/guides/code/getting_started/app/views/comments/_form.html.erb
D	railties/guides/code/getting_started/app/views/home/index.html.erb
D	railties/guides/code/getting_started/app/views/layouts/application.html.erb
D	railties/guides/code/getting_started/app/views/posts/_form.html.erb
D	railties/guides/code/getting_started/app/views/posts/edit.html.erb
D	railties/guides/code/getting_started/app/views/posts/index.html.erb
D	railties/guides/code/getting_started/app/views/posts/new.html.erb
D	railties/guides/code/getting_started/app/views/posts/show.html.erb
D	railties/guides/code/getting_started/app/views/tags/_form.html.erb
D	railties/guides/code/getting_started/config.ru
D	railties/guides/code/getting_started/config/application.rb
D	railties/guides/code/getting_started/config/boot.rb
D	railties/guides/code/getting_started/config/database.yml
D	railties/guides/code/getting_started/config/environment.rb
D	railties/guides/code/getting_started/config/environments/development.rb
D	railties/guides/code/getting_started/config/environments/production.rb
D	railties/guides/code/getting_started/config/environments/test.rb
D	railties/guides/code/getting_started/config/initializers/backtrace_silencers.rb
D	railties/guides/code/getting_started/config/initializers/inflections.rb
D	railties/guides/code/getting_started/config/initializers/mime_types.rb
D	railties/guides/code/getting_started/config/initializers/secret_token.rb
D	railties/guides/code/getting_started/config/initializers/session_store.rb
D	railties/guides/code/getting_started/config/initializers/wrap_parameters.rb
D	railties/guides/code/getting_started/config/locales/en.yml
D	railties/guides/code/getting_started/config/routes.rb
D	railties/guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
D	railties/guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
D	railties/guides/code/getting_started/db/migrate/20110901013701_create_tags.rb
D	railties/guides/code/getting_started/db/schema.rb
D	railties/guides/code/getting_started/db/seeds.rb
D	railties/guides/code/getting_started/doc/README_FOR_APP
D	railties/guides/code/getting_started/lib/assets/.gitkeep
D	railties/guides/code/getting_started/lib/tasks/.gitkeep
D	railties/guides/code/getting_started/public/404.html
D	railties/guides/code/getting_started/public/422.html
D	railties/guides/code/getting_started/public/500.html
D	railties/guides/code/getting_started/public/favicon.ico
D	railties/guides/code/getting_started/public/robots.txt
D	railties/guides/code/getting_started/script/rails
D	railties/guides/code/getting_started/test/fixtures/.gitkeep
D	railties/guides/code/getting_started/test/fixtures/comments.yml
D	railties/guides/code/getting_started/test/fixtures/posts.yml
D	railties/guides/code/getting_started/test/fixtures/tags.yml
D	railties/guides/code/getting_started/test/functional/.gitkeep
D	railties/guides/code/getting_started/test/functional/comments_controller_test.rb
D	railties/guides/code/getting_started/test/functional/home_controller_test.rb
D	railties/guides/code/getting_started/test/functional/posts_controller_test.rb
D	railties/guides/code/getting_started/test/integration/.gitkeep
D	railties/guides/code/getting_started/test/performance/browsing_test.rb
D	railties/guides/code/getting_started/test/test_helper.rb
D	railties/guides/code/getting_started/test/unit/.gitkeep
D	railties/guides/code/getting_started/test/unit/comment_test.rb
D	railties/guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
D	railties/guides/code/getting_started/test/unit/helpers/home_helper_test.rb
D	railties/guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
D	railties/guides/code/getting_started/test/unit/post_test.rb
D	railties/guides/code/getting_started/test/unit/tag_test.rb
D	railties/guides/code/getting_started/vendor/assets/stylesheets/.gitkeep
D	railties/guides/code/getting_started/vendor/plugins/.gitkeep
D	railties/guides/rails_guides.rb
D	railties/guides/rails_guides/generator.rb
D	railties/guides/rails_guides/helpers.rb
D	railties/guides/rails_guides/indexer.rb
D	railties/guides/rails_guides/levenshtein.rb
D	railties/guides/rails_guides/textile_extensions.rb
D	railties/guides/source/2_2_release_notes.textile
D	railties/guides/source/2_3_release_notes.textile
D	railties/guides/source/3_0_release_notes.textile
D	railties/guides/source/3_1_release_notes.textile
D	railties/guides/source/3_2_release_notes.textile
D	railties/guides/source/_license.html.erb
D	railties/guides/source/_welcome.html.erb
D	railties/guides/source/action_controller_overview.textile
D	railties/guides/source/action_mailer_basics.textile
D	railties/guides/source/action_view_overview.textile
D	railties/guides/source/active_model_basics.textile
D	railties/guides/source/active_record_basics.textile
D	railties/guides/source/active_record_querying.textile
D	railties/guides/source/active_record_validations_callbacks.textile
D	railties/guides/source/active_support_core_extensions.textile
D	railties/guides/source/active_support_instrumentation.textile
D	railties/guides/source/ajax_on_rails.textile
D	railties/guides/source/api_documentation_guidelines.textile
D	railties/guides/source/asset_pipeline.textile
D	railties/guides/source/association_basics.textile
D	railties/guides/source/caching_with_rails.textile
D	railties/guides/source/command_line.textile
D	railties/guides/source/configuring.textile
D	railties/guides/source/contributing_to_ruby_on_rails.textile
D	railties/guides/source/credits.html.erb
D	railties/guides/source/debugging_rails_applications.textile
D	railties/guides/source/documents.yaml
D	railties/guides/source/engines.textile
D	railties/guides/source/form_helpers.textile
D	railties/guides/source/generators.textile
D	railties/guides/source/getting_started.textile
D	railties/guides/source/i18n.textile
D	railties/guides/source/index.html.erb
D	railties/guides/source/initialization.textile
D	railties/guides/source/kindle/KINDLE.md
D	railties/guides/source/kindle/copyright.html.erb
D	railties/guides/source/kindle/layout.html.erb
D	railties/guides/source/kindle/rails_guides.opf.erb
D	railties/guides/source/kindle/toc.html.erb
D	railties/guides/source/kindle/toc.ncx.erb
D	railties/guides/source/kindle/welcome.html.erb
D	railties/guides/source/layout.html.erb
D	railties/guides/source/layouts_and_rendering.textile
D	railties/guides/source/migrations.textile
D	railties/guides/source/nested_model_forms.textile
D	railties/guides/source/performance_testing.textile
D	railties/guides/source/plugins.textile
D	railties/guides/source/rails_application_templates.textile
D	railties/guides/source/rails_on_rack.textile
D	railties/guides/source/routing.textile
D	railties/guides/source/ruby_on_rails_guides_guidelines.textile
D	railties/guides/source/security.textile
D	railties/guides/source/testing.textile
D	railties/guides/source/upgrading_ruby_on_rails.textile
D	railties/guides/w3c_validator.rb
M	railties/railties.gemspec

commit 9e09e8f	refs/heads/master
Author: Jonathan R. Wallace 
Date:   2012-03-17 11:23:39 -0400

    Updates 'modyfing' typo to 'modifying'

M	activerecord/lib/active_record/autosave_association.rb

commit 9d06b49	refs/heads/master
Merge: 39514af bf94f1c
Author: Vijay Dev 
Date:   2012-03-17 20:30:08 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	railties/guides/source/getting_started.textile

commit 39514af	refs/heads/master
Author: José Valim 
Date:   2012-03-17 07:08:49 -0700

    Merge pull request #5480 from drogus/rendering-issues
    
    Fix for #5440

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/layouts/with_html_partial.html.erb
A	actionpack/test/fixtures/test/_partial_only_html.html
A	actionpack/test/fixtures/test/with_html_partial.html.erb
A	actionpack/test/fixtures/test/with_partial.html.erb
A	actionpack/test/fixtures/test/with_partial.text.erb
A	actionpack/test/fixtures/test/with_xml_template.html.erb

commit 4711298	refs/heads/master
Merge: 21e5300 4b6daef
Author: José Valim 
Date:   2012-03-17 07:13:58 -0700

    Merge pull request #5321 from pfeiffer/uniqueness_validator_conditions
    
    Add :conditions option to uniqueness validator

commit e5b46cf	refs/tags/v3.2.5
Merge: e135ff1 7130f91
Author: José Valim 
Date:   2012-03-17 07:08:49 -0700

    Merge pull request #5480 from drogus/rendering-issues
    
    Fix for #5440

commit 7130f91	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-15 23:39:25 +0100

    Add missing test for #5308

M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/layouts/with_html_partial.html.erb
A	actionpack/test/fixtures/test/with_xml_template.html.erb

commit 1eb6189	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-15 03:21:10 +0100

    Fix #5440 - multiple render_to_string breaks partials formats
    
    This fixes situation where rendering template to string
    sets `rendered_format` to the format rendered there.
    This is ok to have consistent formats rendered in partials,
    but it breaks on next renders if format is explicitly set
    or on last render where default format does not necessarily
    need to be the format of first rendered template.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/_partial_only_html.html
A	actionpack/test/fixtures/test/with_html_partial.html.erb
A	actionpack/test/fixtures/test/with_partial.html.erb
A	actionpack/test/fixtures/test/with_partial.text.erb

commit 21e5300	refs/heads/master
Merge: cb0585e 131083b
Author: José Valim 
Date:   2012-03-17 05:13:37 -0700

    Merge pull request #5487 from kennyj/should_use_argument
    
    Should use an argument in http_digest_authentication_test.rb

commit 131083b	refs/heads/master
Author: kennyj 
Date:   2012-03-17 20:23:28 +0900

    Should use an argument in http_digest_authentication_test.rb

M	actionpack/test/controller/http_digest_authentication_test.rb

commit cb0585e	refs/heads/master
Merge: ab9f1b6 5ae53d5
Author: José Valim 
Date:   2012-03-17 00:18:39 -0700

    Merge pull request #5470 from sandeepravi/warning_fixes
    
    fixed - warning: instance variable @controller not initialized

commit ab9f1b6	refs/heads/master
Merge: 9256372 d80fcc9
Author: José Valim 
Date:   2012-03-17 00:17:31 -0700

    Merge pull request #5483 from luke-gru/gemfile_change
    
    switch rack-test in Gemfile to using git protocol

commit bf94f1c	refs/heads/master
Author: Egor Homakov 
Date:   2012-03-17 07:05:38 +0100

    using pluck

M	railties/guides/source/action_mailer_basics.textile

commit 0360b3e	refs/heads/master
Author: kennyj 
Date:   2012-03-17 13:57:10 +0900

    Fix GH #5435. db:structure:dump should be reenable.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake_test.rb

commit 9256372	refs/heads/master
Merge: facf1e5 08c4d8e
Author: Xavier Noria 
Date:   2012-03-16 19:02:02 -0700

    Merge pull request #5484 from luke-gru/consistent_module_naming
    
    use consistent explicit module inclusion

commit 08c4d8e	refs/heads/master
Author: Luke Gruber 
Date:   2012-03-16 21:54:25 -0400

    use consistent explicit module inclusion
    
    aid ease of understanding and readability for tests

M	actionpack/test/abstract/abstract_controller_test.rb
M	actionpack/test/abstract/collector_test.rb
M	actionpack/test/abstract/helper_test.rb

commit d80fcc9	refs/heads/master
Author: Luke Gruber 
Date:   2012-03-16 21:48:25 -0400

    switch rack-test in Gemfile to using git protocol
    
    can't run tests if git not compiled with libcurl

M	Gemfile

commit facf1e5	refs/heads/master
Merge: 090156a 404d785
Author: Piotr Sarnacki 
Date:   2012-03-16 13:34:11 -0700

    Merge pull request #5475 from rafaelfranca/fix-build
    
    Fix ActiveRecord::Relation#blank? tests

commit 404d785	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-16 17:05:35 -0300

    Fix ActiveRecord::Relation#blank? tests

M	activerecord/test/cases/relations_test.rb

commit f820098	refs/heads/master
Author: Mike Mulvaney 
Date:   2012-03-16 15:53:16 -0400

    Moved squawk method into LocalInstanceMethods module, so it would
    not be added to every ActiveRecord::Base object.  Changed acts_as_yaffle
    so it will include the LocalInstanceMethods module.  Now only
    models that call acts_as_yaffle will get the squawk method, instead
    of pushing them into every ActiveRecord::Base.

M	railties/guides/source/plugins.textile

commit 2dd486c	refs/heads/master
Author: Mike Mulvaney 
Date:   2012-03-16 15:50:53 -0400

    Changed unit tests so they refer to yaffle_test_field as symbol.
    acts_as_yaffle expects a symbol, so the string was causing the tests
    to always fail.

M	railties/guides/source/plugins.textile

commit 090156a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-16 12:15:31 -0700

    use empty? on the hash to avoid another method call

M	activesupport/lib/active_support/values/time_zone.rb

commit 4c8a5a0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-16 11:50:15 -0700

    removed unnecessary calls to "freeze"

M	activesupport/lib/active_support/values/time_zone.rb

commit 273054d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-16 11:24:52 -0700

    remove some mocha stubs

M	activesupport/test/time_zone_test.rb

commit 0ae5807	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-16 10:36:18 -0700

    make stubbing Time.now easier

M	activesupport/lib/active_support/values/time_zone.rb

commit 9dba310	refs/heads/master
Author: Mark Larimer 
Date:   2012-03-16 11:54:44 -0500

    Revert "Fix typo in AR Callbacks."
    
    This reverts commit 55df1df937f096bbdae29f8af965f204f08943b8.

M	activerecord/lib/active_record/callbacks.rb

commit 8d87d5c	refs/heads/master
Merge: 5245eb3 964ed6e
Author: José Valim 
Date:   2012-03-16 07:37:13 -0700

    Merge pull request #5469 from yakko/master
    
    tests for Relation .present? .blank?

commit 964ed6e	refs/heads/master
Author: Thiago Almeida 
Date:   2012-03-16 11:30:24 -0300

    test relation presence fix

M	activerecord/test/cases/relations_test.rb

commit 5ae53d5	refs/heads/master
Author: Sandeep 
Date:   2012-03-16 19:41:15 +0530

    fixed - warning: instance variable @controller not initialized

M	actionpack/lib/action_controller/caching/sweeping.rb

commit 4498f93	refs/heads/master
Author: Thiago Almeida 
Date:   2012-03-16 11:04:24 -0300

    tests for Relation .present? and .blank? are check cases and shouldn't force sql-count

M	activerecord/test/cases/relations_test.rb

commit 5245eb3	refs/heads/master
Merge: 034ccf4 e7f8d50
Author: Santiago Pastorino 
Date:   2012-03-16 06:48:00 -0700

    Merge pull request #5468 from sandeepravi/warning_fixes
    
    fixed - warning: ambiguous first argument; put parentheses or even spaces

commit e7f8d50	refs/heads/master
Author: Sandeep 
Date:   2012-03-16 19:06:57 +0530

    fixed - warning: ambiguous first argument; put parentheses or even spaces

M	actionpack/test/controller/request_forgery_protection_test.rb

commit 034ccf4	refs/heads/master
Author: José Valim 
Date:   2012-03-16 13:40:42 +0100

    Speed up mass assignment by avoiding extra loops.

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb

commit 6d0047a	refs/heads/master
Merge: f5b9dd3 791251b
Author: José Valim 
Date:   2012-03-16 05:34:16 -0700

    Merge pull request #5467 from bogdan/initialize_callbacks
    
    ActiveRecord::Core#initialize: improve performance

commit f5b9dd3	refs/heads/master
Merge: 2afe12f c045eeb
Author: José Valim 
Date:   2012-03-16 05:14:47 -0700

    Merge pull request #5466 from carlosantoniodasilva/as-review
    
    Remove deprecation from AS::Deprecation behavior, some minor cleanups

commit c045eeb	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-16 00:54:39 -0300

    Remove deprecation from AS::Deprecation behavior, some minor cleanups
    
    * Refactor log subscriber, use select! to avoid a new object
    * Remove deprecation messages related to AS::Deprecation behavior
      This was added about 2 years ago for Rails 3:
      https://github.com/rails/rails/commit/d4c7d3fd94e5a885a6366eaeb3b908bb58ffd4db
    * Remove some not used requires
    * Refactor delegate to avoid string conversions and if statements inside each block

M	activesupport/lib/active_support/basic_object.rb
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/log_subscriber.rb
M	activesupport/lib/active_support/notifications/fanout.rb
M	activesupport/lib/active_support/notifications/instrumenter.rb
M	activesupport/lib/active_support/railtie.rb
M	activesupport/test/file_update_checker_test.rb

commit 2afe12f	refs/heads/master
Merge: fc6b961 15404fd
Author: José Valim 
Date:   2012-03-16 04:54:54 -0700

    Merge pull request #5465 from sandeepravi/warning_fixes
    
    fixed - warning: assigned but unused variable - checker

commit 15404fd	refs/heads/master
Author: Sandeep 
Date:   2012-03-16 17:14:54 +0530

    fixed - warning: assigned but unused variable - checker

M	activesupport/test/file_update_checker_test.rb

commit fc6b961	refs/heads/master
Merge: fa7a3aa c16f4f1
Author: Piotr Sarnacki 
Date:   2012-03-16 03:25:09 -0700

    Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs
    
    Fix exceptions messages in AC layouts

commit fa7a3aa	refs/heads/master
Merge: e61e0c0 9d52b45
Author: José Valim 
Date:   2012-03-16 00:22:19 -0700

    Merge pull request #5461 from yakko/master
    
    relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)

commit 9d52b45	refs/heads/master
Author: Thiago Almeida 
Date:   2012-03-16 01:14:24 -0300

    relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)

M	activerecord/lib/active_record/relation.rb

commit e61e0c0	refs/heads/master
Merge: e2b6751 cdfcbc4
Author: Aaron Patterson 
Date:   2012-03-15 18:31:20 -0700

    Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_column
    
    Don't reset inheritance_column when setting explicitly.

commit e2b6751	refs/heads/master
Merge: b9c21aa aca6937
Author: Piotr Sarnacki 
Date:   2012-03-15 16:07:06 -0700

    Merge pull request #5454 from luke-gru/luke-dev
    
    allow zero-arity proc for AbstrController::layout

commit 8645745	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-03-15 15:22:13 -0700

    Merge pull request #5457 from brianmario/typo-fix
    
    Fix typo in redirect test

M	actionpack/test/controller/redirect_test.rb

commit 66b8ef1	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-03-15 15:22:13 -0700

    Merge pull request #5457 from brianmario/typo-fix
    
    Fix typo in redirect test

M	actionpack/test/controller/redirect_test.rb

commit e135ff1	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-15 15:22:13 -0700

    Merge pull request #5457 from brianmario/typo-fix
    
    Fix typo in redirect test

M	actionpack/test/controller/redirect_test.rb

commit b9c21aa	refs/heads/master
Merge: a7dee1a 6ce21af
Author: Aaron Patterson 
Date:   2012-03-15 15:22:13 -0700

    Merge pull request #5457 from brianmario/typo-fix
    
    Fix typo in redirect test

commit 6ce21af	refs/heads/master
Author: Brian Lopez 
Date:   2012-03-15 15:15:10 -0700

    fix typo in redirect test

M	actionpack/test/controller/redirect_test.rb

commit d14319c	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-03-15 14:56:50 -0700

    Merge pull request #5456 from brianmario/redirect-sanitization
    
    Strip null bytes from Location header
    Conflicts:
    
    	actionpack/test/controller/redirect_test.rb

M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/test/controller/redirect_test.rb

commit 47147a0	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-03-15 14:56:50 -0700

    Merge pull request #5456 from brianmario/redirect-sanitization
    
    Strip null bytes from Location header

M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/test/controller/redirect_test.rb

commit f52ad6c	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-15 14:56:50 -0700

    Merge pull request #5456 from brianmario/redirect-sanitization
    
    Strip null bytes from Location header

M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/test/controller/redirect_test.rb

commit a7dee1a	refs/heads/master
Merge: e6c95fe cfcdd33
Author: Aaron Patterson 
Date:   2012-03-15 14:56:50 -0700

    Merge pull request #5456 from brianmario/redirect-sanitization
    
    Strip null bytes from Location header

commit cfcdd33	refs/heads/master
Author: Brian Lopez 
Date:   2012-03-15 14:42:57 -0700

    strip null bytes from Location header as well
    
    add tests for stripping \r\n chars since that's already happening

M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/test/controller/redirect_test.rb

commit aca6937	refs/heads/master
Author: Luke Gruber 
Date:   2012-03-15 16:40:23 -0400

    allow zero-arity proc for AbstrController::layout
    
    proc without parameters can now be given to
    AbstractController::layout

M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/test/abstract/layouts_test.rb

commit f31670d	refs/heads/master
Author: Jon Rowe 
Date:   2012-03-15 18:27:43 +0000

    when using a preloaded array and the uniq flag is set then return the size of the uniq array

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb

commit e6c95fe	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-15 12:11:12 -0700

    errors should probably be logged as errors

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit 94a20d9	refs/heads/master
Merge: eb8f0dd 0ecba95
Author: Aaron Patterson 
Date:   2012-03-15 11:28:25 -0700

    Merge pull request #5451 from yahonda/address_hstores_failue
    
    Address the dump file format for hstore

commit 0ecba95	refs/heads/master
Author: Yasuo Honda 
Date:   2012-03-15 13:48:16 -0400

    Address the dump file format for hstore

M	activerecord/test/cases/schema_dumper_test.rb

commit bd3e1ed	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-15 10:25:38 -0700

    Merge pull request #5437 from kennyj/fix_5430
    
    Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/explain_test.rb

commit eb8f0dd	refs/heads/master
Author: José Valim 
Date:   2012-03-15 18:41:25 +0100

    Revert "AM::MassAssingmentSecurity: improve performance"
    
    It introduces backwards incompatible changes in the API.
    
    This reverts commit 7d1379ffdbbaf01e99833dc06611b7e4f3799522.

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security_test.rb

commit f961ec4	refs/heads/master
Merge: 8f5f92c 2d787f8
Author: Aaron Patterson 
Date:   2012-03-15 10:25:38 -0700

    Merge pull request #5437 from kennyj/fix_5430
    
    Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.

commit f918137	refs/tags/v3.2.5
Merge: 9dfb41f 55cac81
Author: Aaron Patterson 
Date:   2012-03-15 10:14:13 -0700

    Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence
    
    3 2 static invalid byte sequence

commit 8f5f92c	refs/heads/master
Merge: ee8e567 7d5fbf8
Author: Aaron Patterson 
Date:   2012-03-15 10:14:01 -0700

    Merge pull request #5337 from mreinsch/static_invalid_byte_sequence
    
    fix ArgumentError being raised in case of invalid byte sequences

commit ee8e567	refs/heads/master
Merge: fbc9d0f 4073505
Author: José Valim 
Date:   2012-03-15 05:44:46 -0700

    Merge pull request #5448 from JonRowe/patch_file_update_on_master
    
    Commas in directory names causes hang in ActiveSupport::FileUpdateChecker

commit a1c77e7	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-15 09:41:28 -0300

    Add missing quotes on AS::Notifications examples

M	railties/guides/source/active_support_instrumentation.textile

commit 4073505	refs/heads/master
Author: Jon Rowe 
Date:   2012-03-15 12:21:20 +0000

    escape commas in paths before globbing to avoid infinite hang in Dir[]

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/test/file_update_checker_test.rb

commit 55df1df	refs/heads/master
Author: Waseem Ahmad 
Date:   2012-03-15 16:07:53 +0530

    Fix typo in AR Callbacks.

M	activerecord/lib/active_record/callbacks.rb

commit 18e1b5b	refs/heads/master
Author: adman65 
Date:   2012-03-15 10:27:04 +0100

    [ci skip] Add examples of subscribing & creating ActiveSupport::Notifications

M	railties/guides/source/active_support_instrumentation.textile

commit 2784e64	refs/heads/master
Author: adman65 
Date:   2012-03-15 10:08:16 +0100

    [ci skip] Add examples to instrumentation guide

M	railties/guides/source/active_support_instrumentation.textile

commit 791251b	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-03-15 10:24:13 +0200

    ActiveRecord::Core#initialize: improve performance

M	activerecord/lib/active_record/core.rb

commit fbc9d0f	refs/heads/master
Author: José Valim 
Date:   2012-03-15 08:48:38 +0100

    Simplify helpers handling. Ensure Metal can run AC hooks.

M	actionpack/lib/action_controller/metal/helpers.rb
M	actionpack/lib/action_controller/railtie.rb
A	actionpack/lib/action_controller/railties/helpers.rb
D	actionpack/lib/action_controller/railties/paths.rb
M	railties/lib/rails/engine.rb
M	railties/test/application/loading_test.rb

commit b5e2518	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 23:47:39 -0700

    [getting started] [ci skip] Fix incongruant use of 'we' and 'you'. Expand upon creating posts section

M	railties/guides/source/getting_started.textile

commit 9dfb41f	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-13 21:28:34 +0100

    Check for existence of exactly the called `fixture_path=` method

M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb

commit ccf4ff0	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-15 04:09:52 +0100

    Remove ActionController::TestCase#rescue_action_in_public!
    
    This method has no effect since exception handling was
    moved to middlewares and ActionController tests do not
    use any middlewares.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/base_test.rb

commit 5b94e73	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-15 04:09:52 +0100

    Remove ActionController::TestCase#rescue_action_in_public!
    
    This method has no effect since exception handling was
    moved to middlewares and ActionController tests do not
    use any middlewares.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/base_test.rb

commit 9c3d002	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 19:32:13 -0700

    [getting started] Round out 'Laying down the ground work' section

M	railties/guides/source/getting_started.textile

commit 7ea1755	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 19:31:38 -0700

    [getting started] rename initial 'meat' section of guide to 'Laying down the ground work'
    
    This section involves a medium amount of setup and explanation (for the end user's own good!). It's not really about creating a post... that's for the *next* section

M	railties/guides/source/getting_started.textile

commit 507dba6	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 19:30:57 -0700

    [getting started] correct typo in welcome/index.html.erb template path

M	railties/guides/source/getting_started.textile

commit 75aa3dc	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 18:51:42 -0700

    [getting started] Improve explanation around initial controller generator usage

M	railties/guides/source/getting_started.textile

commit 605f426	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 18:49:52 -0700

    [getting started] remove indentation for get 'posts/new'

M	railties/guides/source/getting_started.textile

commit e884f4b	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-03-14 19:28:36 -0400

    Allow you to force the authenticity_token to be rendered even on remote forms if you pass true

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit e50abba	refs/tags/v3.2.5
Author: David Heinemeier Hansson 
Date:   2012-03-14 19:28:36 -0400

    Allow you to force the authenticity_token to be rendered even on remote forms if you pass true

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit a4c120f	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-03-14 19:03:39 -0400

    Do not include the authenticity token in forms where remote: true as ajax forms use the meta-tag value

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit 16ee611	refs/tags/v3.2.5
Author: David Heinemeier Hansson 
Date:   2012-03-14 19:03:39 -0400

    Do not include the authenticity token in forms where remote: true as ajax forms use the meta-tag value

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit e1824c5	refs/heads/master
Author: José Valim 
Date:   2012-03-14 22:58:32 +0100

    Remove remaining http_only? calls.

M	railties/lib/rails/application.rb
M	railties/lib/rails/configuration.rb

commit 7dabf57	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 14:34:50 -0700

    [getting started] Reworking beginnings of the 'meat' of the guide
    
    This guide will now create the new action first, then the create action and so on and so forth until the controller has all seven RESTful actions.
    
    We are doing this to demonstrate to a user how to *properly* build a controller. We do not mention scaffold *ON PURPOSE*. Scaffold is evil. We want to show the users the different facets of creating a resource, and this is how we're going to do it.

M	railties/guides/source/getting_started.textile

commit 35e0cb5	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 14:33:16 -0700

    [getting started] Default root route in config/routes.rb is for a welcome controller. Let's make it easy by creating a WelcomeController, not a HomeController, in the guide

M	railties/guides/source/getting_started.textile

commit 66e5e71	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 14:32:31 -0700

    [getting started] add warning that guide is being worked on (just for edge)

M	railties/guides/source/getting_started.textile

commit 6db930c	refs/heads/master
Author: José Valim 
Date:   2012-03-14 22:30:01 +0100

    Remove --http.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller.rb
D	actionpack/lib/action_controller/http.rb
M	actionpack/test/abstract_unit.rb
D	actionpack/test/controller/http/action_methods_test.rb
D	actionpack/test/controller/http/conditional_get_test.rb
D	actionpack/test/controller/http/data_streaming_test.rb
D	actionpack/test/controller/http/force_ssl_test.rb
D	actionpack/test/controller/http/redirect_to_test.rb
D	actionpack/test/controller/http/renderers_test.rb
D	actionpack/test/controller/http/url_for_test.rb
D	railties/guides/source/api_app.textile
M	railties/lib/rails/configuration.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/resource/resource_generator.rb
M	railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
D	railties/lib/rails/generators/rails/scaffold_controller/templates/http_controller.rb
M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
D	railties/lib/rails/generators/test_unit/scaffold/templates/http_functional_test.rb
M	railties/test/application/generators_test.rb
M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/middleware_test.rb
M	railties/test/application/rake_test.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/resource_generator_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators_test.rb

commit 1efeb07	refs/heads/master
Merge: 25861e2 b4b0fdd
Author: Piotr Sarnacki 
Date:   2012-03-14 12:53:19 -0700

    Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored
    
    Don't ignore call to undefined method in Sweeper

commit 25861e2	refs/heads/master
Merge: 35262b7 2963ee6
Author: José Valim 
Date:   2012-03-14 12:42:08 -0700

    Merge pull request #5439 from carlosantoniodasilva/rake-test-scaffold
    
    Fix scaffold controller template and ensure rake test for scaffold works

commit c71b961	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 12:02:52 -0700

    [getting started] Link to Bundler website when explaining Gemfile[.lock]

M	railties/guides/source/getting_started.textile

commit 4c1861f	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 12:00:54 -0700

    [getting started] Improve prose for initial routing section

M	railties/guides/source/getting_started.textile

commit f7a3771	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 12:00:32 -0700

    [getting started] mention generators early on, when rails new is mentioned.
    
    This is to show one of the 'wins' of Rails nice and early. More are demonstrated as we flow through the guide.

M	railties/guides/source/getting_started.textile

commit 329db6f	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 11:51:29 -0700

    [getting started] briefly explain what a controller and view are

M	railties/guides/source/getting_started.textile

commit 7b2bd23	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 11:37:56 -0700

    [getting started] more line lengthening

M	railties/guides/source/getting_started.textile

commit 58bf4c4	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 11:34:15 -0700

    [getting started] fix lines that are too short.
    
    This should be a configuration setting on your text editor, rather than hard-coded into the guide

M	railties/guides/source/getting_started.textile

commit 5013f51	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 11:33:43 -0700

    [getting started] update Rails version to 3.2.2

M	railties/guides/source/getting_started.textile

commit 5cbdd0f	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 11:32:50 -0700

    [getting started] *THE* way to install Rails is by running +gem install+. You should not run this as the root user.

M	railties/guides/source/getting_started.textile

commit 2f06c94	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 11:32:21 -0700

    [getting started] Remove super-early mention of REST from Getting Started guide.
    
    We will mention this as we introduce the routing components for Rails later on in the guide.

M	railties/guides/source/getting_started.textile

commit dcfb990	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-14 11:31:38 -0700

    Move database configuration section from Getting Started Guide into Configuration guide
    
    This is because newbies don't need to know immediately all the different ways of configuring a database on Rails. The default is SQLite3 which'll work on most operating systems by default. The only reason for it to *not* work is due to missing packages on the operating system, which should be taken care of in some sort of 'Installing Rails for  guide.

M	railties/guides/source/configuring.textile
M	railties/guides/source/getting_started.textile

commit 2963ee6	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-14 14:36:15 -0300

    Fix scaffold controller template, ensure rake scaffold test pass by default

M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/test/application/rake_test.rb
M	railties/test/isolation/abstract_unit.rb

commit 2d787f8	refs/heads/master
Author: kennyj 
Date:   2012-03-15 02:07:01 +0900

    Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/explain_test.rb

commit f7714ec	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-26 19:39:33 +0300

    use content_tag in button_to helper

M	actionpack/lib/action_view/helpers/url_helper.rb

commit f2aea24	refs/tags/v3.2.5
Merge: 596ecf7 41563b4
Author: Aaron Patterson 
Date:   2012-03-14 09:21:36 -0700

    Merge pull request #5423 from jrochkind/checkout_account_for_monitor_model
    
    ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables

commit 35262b7	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-14 12:58:25 -0300

    Add API apps CHANGELOG entry

M	actionpack/CHANGELOG.md

commit da07433	refs/heads/master
Author: José Valim 
Date:   2012-03-14 16:53:43 +0100

    Update railties/guides/source/api_app.textile

M	railties/guides/source/api_app.textile

commit 96aea58	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-14 11:03:31 -0300

    Do not generate app/views and sprockets entries on http app
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/app_generator_test.rb

commit 570cc89	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-13 10:03:59 -0300

    Generate special controller and functional test templates for http apps
    
    The main goal is to not generate the format.html block in scaffold
    controller, and to generate a different functional test as we don't rely
    on redirects anymore, we should test for http responses.
    
    In addition to that, the :edit action is removed from the http
    controller and the edit route is not generated by default, as they
    usually do not make sense in this scenario.
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/configuration.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/resource/resource_generator.rb
M	railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
A	railties/lib/rails/generators/rails/scaffold_controller/templates/http_controller.rb
M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
A	railties/lib/rails/generators/test_unit/scaffold/templates/http_functional_test.rb
M	railties/test/generators/resource_generator_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators_test.rb

commit 3e138df	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-12 09:17:08 -0300

    Rename http-only app generator option to http
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit 2c0f6b0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 18:37:00 -0300

    Move http only option to AppGenerator
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 7f3847c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 18:32:24 -0300

    Add test to ensure setting config.generators.http_only actually disables the generator options
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/test/application/generators_test.rb
M	railties/test/application/middleware_test.rb

commit ff8e9e0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 18:19:01 -0300

    Allow generator configs from http_only! to be overriden by app
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/generators.rb
M	railties/test/application/generators_test.rb

commit 2b35575	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 17:51:31 -0300

    Remove duplicated tests from shared generator
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit 858a30e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 17:48:54 -0300

    Refactor http_only, remove reader method
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/configuration.rb

commit 219ff43	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 17:24:36 -0300

    Disable template, helper and assets options when using http_only!
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/generators.rb
M	railties/test/generators_test.rb

commit c825e9a	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 16:36:17 -0300

    Create generators http_only! setup and hide some common namespaces for now
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/configuration.rb
M	railties/lib/rails/generators.rb
M	railties/test/generators_test.rb

commit 124838b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 11:44:42 -0300

    Generate middleware http_only! config when running http only app generator
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit 5c8c7ca	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-10 11:02:27 -0300

    Add http-only option to Rails app generator
    
    Change application controller template accordingly, to inherit from
    ActionController::HTTP and not generate protect_from_forgery call.
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/lib/rails/generators/app_base.rb
D	railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
A	railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt
M	railties/test/generators/app_generator_test.rb

commit 4c16791	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-13 16:21:41 -0300

    Add ActionController::HTTP
    
    More info http://edgeguides.rubyonrails.org/api_app.html
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
A	actionpack/lib/action_controller/http.rb
M	actionpack/lib/action_controller/metal/force_ssl.rb
M	actionpack/lib/action_controller/railtie.rb
M	actionpack/lib/action_controller/railties/paths.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/abstract_unit.rb
A	actionpack/test/controller/http/action_methods_test.rb
A	actionpack/test/controller/http/conditional_get_test.rb
A	actionpack/test/controller/http/data_streaming_test.rb
A	actionpack/test/controller/http/force_ssl_test.rb
A	actionpack/test/controller/http/redirect_to_test.rb
A	actionpack/test/controller/http/renderers_test.rb
A	actionpack/test/controller/http/url_for_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
M	railties/test/application/initializers/frameworks_test.rb

commit cc1c4ac	refs/heads/master
Merge: ab1b352 7d1379f
Author: José Valim 
Date:   2012-03-14 06:06:06 -0700

    Merge pull request #5431 from bogdan/mas_performance
    
    AM::MassAssingmentSecurity: improve performance

commit ab1b352	refs/heads/master
Merge: 29094c0 9e8a938
Author: Vijay Dev 
Date:   2012-03-14 05:32:32 -0700

    Merge pull request #5421 from parndt/master
    
    Added missing 'end' to documentation example

commit 7d1379f	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-03-14 14:11:52 +0200

    AM::MassAssingmentSecurity: improve performance

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security_test.rb

commit 29094c0	refs/heads/master
Merge: ec22a2b 1ced5ca
Author: José Valim 
Date:   2012-03-14 01:12:50 -0700

    Merge pull request #5425 from rafaelfranca/remove_key_value
    
    Remove key_value helper now that master is 1.9 only and we always use the 1.9 hash syntax in the generators.

commit 1ced5ca	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-13 23:10:32 -0300

    Remove key_value helper now that master is 1.9 only and we always use
    the 1.9 hash syntax in the generators.

M	actionmailer/lib/rails/generators/mailer/templates/mailer.rb
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
M	railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
M	railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb

commit 7fd790e	refs/heads/master
Author: Matthew Daubert 
Date:   2012-03-13 20:50:39 -0400

    Minor clarification in documentation language and spelling

M	actionpack/lib/action_view/template/resolver.rb

commit ec22a2b	refs/heads/master
Author: José Valim 
Date:   2012-03-14 00:20:59 +0100

    Update API guide with latest decisions.

M	railties/guides/source/api_app.textile

commit 5520e36	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-14 00:25:06 +0100

    [engines guide] Add information about running and reverting specified migrations [skip ci]

M	railties/guides/source/engines.textile

commit 7950622	refs/heads/master
Merge: c1f397f dde3058
Author: José Valim 
Date:   2012-03-13 16:19:41 -0700

    Merge pull request #5261 from carlosantoniodasilva/identity-map-removal
    
    Remove IdentityMap

commit dde3058	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-04 16:10:48 -0300

    Expand changelog and upgrading rails guide with IdentityMap info

M	activerecord/CHANGELOG.md
M	railties/guides/source/upgrading_ruby_on_rails.textile

commit a8dd21d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-02 00:10:06 -0300

    Remove IdentityMap

M	activerecord/CHANGELOG.md
M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/lib/active_record/fixtures.rb
D	activerecord/lib/active_record/identity_map.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/railtie.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/test_case.rb
M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/eager_test.rb
D	activerecord/test/cases/associations/identity_map_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/helper.rb
D	activerecord/test/cases/identity_map/middleware_test.rb
D	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/support/connection.rb
M	ci/travis.rb
M	railties/guides/source/configuring.textile
M	railties/lib/rails/test_help.rb
M	railties/test/application/middleware_test.rb

commit c1f397f	refs/heads/master
Merge: adafefb e823c8b
Author: José Valim 
Date:   2012-03-13 16:08:13 -0700

    Merge pull request #5409 from rails/sprockets-rails
    
    Remove sprockets integration from actionpack

commit e823c8b	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-13 17:22:28 -0500

    Add sprockets-rails to generated Gemfile. This should be reverted after sprockets-rails release on rubygems

M	railties/lib/rails/generators/app_base.rb

commit 4b33381	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-13 17:18:22 -0500

    Depend on sprockets-rails v1.0

M	rails.gemspec

commit e8296a0	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-13 13:38:58 -0500

    The sprockets railtie was moved to sprockets/rails/railtie

M	railties/lib/rails/all.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
M	railties/test/generators/app_generator_test.rb

commit adafefb	refs/heads/master
Author: José Valim 
Date:   2012-03-14 00:00:34 +0100

    Remove ARes from the list.

M	.travis.yml

commit 272d3d7	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-12 14:26:01 -0500

    Remove remaining sprockets tests

D	actionpack/test/template/compressors_test.rb

commit b1a36a7	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-12 14:18:24 -0500

    Remove sprockets dependency on actionpack

M	actionpack/actionpack.gemspec

commit 78eed21	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-12 14:14:11 -0500

    Add sprockets-rails to rails project Gemfile

M	Gemfile

commit 7ea2c94	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-12 13:55:35 -0500

    Remove tests and fixtures for Sprockets on ActionPack

D	actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css
D	actionpack/test/fixtures/sprockets/app/fonts/dir/font.ttf
D	actionpack/test/fixtures/sprockets/app/fonts/font.ttf
D	actionpack/test/fixtures/sprockets/app/images/logo.png
D	actionpack/test/fixtures/sprockets/app/javascripts/application.js
D	actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js
D	actionpack/test/fixtures/sprockets/app/javascripts/extra.js
D	actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js
D	actionpack/test/fixtures/sprockets/app/stylesheets/application.css
D	actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css
D	actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
D	actionpack/test/fixtures/sprockets/app/stylesheets/style.css
D	actionpack/test/template/sprockets_helper_test.rb
D	actionpack/test/template/sprockets_helper_with_routes_test.rb

commit a2fc3a0	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-12 13:52:37 -0500

    Remove sprockets integration on ActionPack

D	actionpack/lib/sprockets/assets.rake
D	actionpack/lib/sprockets/bootstrap.rb
D	actionpack/lib/sprockets/compressors.rb
D	actionpack/lib/sprockets/helpers.rb
D	actionpack/lib/sprockets/helpers/isolated_helper.rb
D	actionpack/lib/sprockets/helpers/rails_helper.rb
D	actionpack/lib/sprockets/railtie.rb
D	actionpack/lib/sprockets/static_compiler.rb

commit 41563b4	refs/tags/v3.2.5
Author: Jonathan Rochkind 
Date:   2012-03-13 18:00:55 -0400

    ConnectionPool.checkout takes account of ruby using 'non-blocking condition variables' in mutex ConditionVariables

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 2d3550c	refs/heads/master
Merge: ae67a63 7c00cde
Author: José Valim 
Date:   2012-03-13 14:20:43 -0700

    Merge pull request #5415 from rafaelfranca/refactor
    
    Refactor the test_unit scaffold generator to use the key_value method

commit 9e8a938	refs/heads/master
Author: Philip Arndt 
Date:   2012-03-14 10:11:55 +1300

    Added missing end to example

M	actionpack/lib/abstract_controller/layouts.rb

commit ae67a63	refs/heads/master
Merge: 663b66f f1637bf
Author: José Valim 
Date:   2012-03-13 14:04:03 -0700

    Merge pull request #572 from sikachu/remove_activeresource
    
    Remove Active Resource source files from the repository.

commit 663b66f	refs/heads/master
Merge: 919db1b 9fbb176
Author: Piotr Sarnacki 
Date:   2012-03-13 13:36:59 -0700

    Merge pull request #5420 from lest/patch-2
    
    add include_hidden option to checkbox tag

commit 919db1b	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-13 21:28:34 +0100

    Check for existence of exactly the called `fixture_path=` method

M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb

commit 9fbb176	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-13 23:17:49 +0300

    add include_hidden option to checkbox tag

M	actionpack/lib/action_view/helpers/tags/check_box.rb
M	actionpack/test/template/form_helper_test.rb

commit 52bfb48	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-13 20:27:36 +0100

    Environment in engines tests is required on boot_rails, no need to require explicitly

M	railties/test/railties/engine_test.rb

commit 5e754a0	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-13 20:26:05 +0100

    Don't need to share engine's tests anymore, plugins are gone

M	railties/test/railties/engine_test.rb
D	railties/test/railties/shared_tests.rb

commit 24e00e1	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-13 20:04:41 +0100

    Ensure that engine can be mounted at root (#4314)
    
    It's already fixed and the fix was actually in journey library,
    but with #4314 it reappeared second time, so probably this
    kind of integration test will be good to have to not allow it to
    sneak in after changes in journey or rails itself.

M	railties/test/railties/engine_test.rb

commit 596ecf7	refs/tags/v3.2.5
Merge: a782fea 21d9c0f
Author: Aaron Patterson 
Date:   2012-03-13 12:59:34 -0700

    Merge pull request #5417 from kennyj/fix_5399-32
    
    [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.

commit f1637bf	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-15 15:34:36 -0400

    Remove Active Resource source files from the repository
    
    Dear Active Resource,
    
    It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository.
    
    I will miss you,
    
    @sikachu.

M	Rakefile
M	actionpack/lib/action_controller/record_identifier.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	activemodel/activemodel.gemspec
D	activeresource/CHANGELOG.md
D	activeresource/MIT-LICENSE
D	activeresource/README.rdoc
D	activeresource/Rakefile
D	activeresource/activeresource.gemspec
D	activeresource/examples/performance.rb
D	activeresource/lib/active_resource.rb
D	activeresource/lib/active_resource/base.rb
D	activeresource/lib/active_resource/connection.rb
D	activeresource/lib/active_resource/custom_methods.rb
D	activeresource/lib/active_resource/exceptions.rb
D	activeresource/lib/active_resource/formats.rb
D	activeresource/lib/active_resource/formats/json_format.rb
D	activeresource/lib/active_resource/formats/xml_format.rb
D	activeresource/lib/active_resource/http_mock.rb
D	activeresource/lib/active_resource/log_subscriber.rb
D	activeresource/lib/active_resource/observing.rb
D	activeresource/lib/active_resource/railtie.rb
D	activeresource/lib/active_resource/schema.rb
D	activeresource/lib/active_resource/validations.rb
D	activeresource/lib/active_resource/version.rb
D	activeresource/test/abstract_unit.rb
D	activeresource/test/cases/authorization_test.rb
D	activeresource/test/cases/base/custom_methods_test.rb
D	activeresource/test/cases/base/equality_test.rb
D	activeresource/test/cases/base/load_test.rb
D	activeresource/test/cases/base/schema_test.rb
D	activeresource/test/cases/base_errors_test.rb
D	activeresource/test/cases/base_test.rb
D	activeresource/test/cases/connection_test.rb
D	activeresource/test/cases/finder_test.rb
D	activeresource/test/cases/format_test.rb
D	activeresource/test/cases/http_mock_test.rb
D	activeresource/test/cases/log_subscriber_test.rb
D	activeresource/test/cases/observing_test.rb
D	activeresource/test/cases/validations_test.rb
D	activeresource/test/fixtures/address.rb
D	activeresource/test/fixtures/beast.rb
D	activeresource/test/fixtures/customer.rb
D	activeresource/test/fixtures/person.rb
D	activeresource/test/fixtures/project.rb
D	activeresource/test/fixtures/proxy.rb
D	activeresource/test/fixtures/sound.rb
D	activeresource/test/fixtures/street_address.rb
D	activeresource/test/fixtures/subscription_plan.rb
D	activeresource/test/setter_trap.rb
M	ci/travis.rb
M	install.rb
M	rails.gemspec
M	railties/CHANGELOG.md
D	railties/guides/source/active_resource_basics.textile
M	railties/guides/source/command_line.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/initialization.textile
M	railties/lib/rails/all.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
M	railties/lib/rails/info.rb
M	railties/lib/rails/railtie.rb
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/isolation/abstract_unit.rb
M	tasks/release.rb
M	tools/profile

commit a85714a	refs/heads/master
Merge: 800c70a 2731ffa
Author: José Valim 
Date:   2012-03-13 11:29:21 -0700

    Merge pull request #5419 from nashby/patch-1
    
    fix typo in AP CHANGELOG [ci skip]

commit 2731ffa	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-03-13 21:24:41 +0300

    fix typo in AP CHANGELOG [ci skip]

M	actionpack/CHANGELOG.md

commit a782fea	refs/tags/v3.2.5
Author: João Britto 
Date:   2012-03-08 15:22:06 -0300

    Close string quotes

M	railties/guides/source/association_basics.textile

commit 5f28145	refs/tags/v3.2.5
Author: Alexey Vakhov 
Date:   2012-03-10 09:45:13 +0400

    Fix layout method doc formatting

M	actionpack/lib/abstract_controller/layouts.rb

commit 800c70a	refs/heads/master
Merge: cb7d19b a9f6886
Author: Vijay Dev 
Date:   2012-03-13 23:29:30 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit a9f6886	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-13 21:55:42 +0400

    Fix AM Guide
    
    Use proc as default argument to recaculate recipients array every time

M	railties/guides/source/action_mailer_basics.textile

commit 6d0cc77	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-13 23:24:11 +0530

    mark engines guide as wip [ci skip]

M	railties/guides/source/documents.yaml

commit cb7d19b	refs/heads/master
Merge: dbdbe96 54a75e1
Author: Piotr Sarnacki 
Date:   2012-03-13 10:51:46 -0700

    Merge pull request #5414 from nashby/select-hidden-input
    
    add 'include_hidden' option to select tag, closes #5402

commit 97b40e1	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-13 23:21:46 +0530

    Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password""
    
    This reverts commit ddbea9474e20a40e80110944c1e3493ba0efe572.
    
    Reason: Includes non-doc changes.

M	activemodel/lib/active_model/locale/en.yml
M	activemodel/lib/active_model/secure_password.rb

commit 25cbe00	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-13 23:21:41 +0530

    copy-edit contributing guide [ci skip]

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 21d9c0f	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-03-14 02:34:12 +0900

    [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/multiple_db_test.rb

commit dbdbe96	refs/heads/master
Merge: 21b69b2 fdb8805
Author: Aaron Patterson 
Date:   2012-03-13 10:27:47 -0700

    Merge pull request #5416 from kennyj/fix_5399
    
    Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.

commit 7c00cde	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-13 14:19:03 -0300

    Refactor the test_unit scaffold generator to use the key_value method

M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit fdb8805	refs/heads/master
Author: kennyj 
Date:   2012-03-14 02:11:40 +0900

    Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.

M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/multiple_db_test.rb

commit 54a75e1	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-03-13 19:59:04 +0300

    add 'include_hidden' option to select tag, closes #5402

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_options_helper_test.rb

commit dfbbf31	refs/tags/v3.2.5
Merge: d2ac18a c1610eb
Author: José Valim 
Date:   2012-03-13 08:10:27 -0700

    Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2
    
    [3-2-stable] Do not use the attributes hash in the scaffold functional tests

commit c1610eb	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-13 11:57:28 -0300

    Use Ruby 1.8 hash syntax

M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 21b69b2	refs/heads/master
Merge: e7d55f7 08db3d5
Author: José Valim 
Date:   2012-03-13 07:38:23 -0700

    Merge pull request #5397 from rafaelfranca/fix-scaffold
    
    Do not use the attributes hash in the scaffold functional tests

commit ac8469d	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-12 20:10:40 -0300

    Use the attributes hash explicitly

M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
M	railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 5bed0e5	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-12 19:41:17 -0300

    Do not use the attributes hash in the scaffold functional tests

M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
M	railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 08db3d5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-12 20:10:40 -0300

    Use the attributes hash explicitly

M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
M	railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit e7d55f7	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-03-13 10:00:15 -0400

    Actually commit the change!

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 4631315	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-03-13 09:57:51 -0400

    Undo unwarranted change to coding conventions. I am not a fan of the aesthetics of private/public at the root but more importantly, we should not be changing coding conventions with almost a decades worth of history at a whim. The conventions are there to have a consistent coding style, that is their primary purpose. When there is so much existing code with the existing style, any change will have to lift an enormous burden of proof as to why its overwhelmingly superior. That is not the case here, so this is being reverted.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit fc3e9b3	refs/heads/master
Merge: 0e502e0 f0ee9e6
Author: José Valim 
Date:   2012-03-13 05:24:03 -0700

    Merge pull request #5406 from parndt/fix_issue_5193_in_master
    
    Fix issue #5193 in master

commit 0e502e0	refs/heads/master
Merge: ce72c0c 829e379
Author: Santiago Pastorino 
Date:   2012-03-13 05:09:04 -0700

    Merge pull request #5407 from homakov/patch-1
    
    'module' is reserved word. Sample of code with error - not cool.

commit 829e379	refs/heads/master
Author: Egor Homakov 
Date:   2012-03-13 15:13:05 +0400

    'module' is reserved word. Sample of code with error - not cool.

M	actionpack/lib/action_controller/base.rb

commit f0ee9e6	refs/heads/master
Author: Philip Arndt 
Date:   2012-03-13 23:28:42 +1300

    Fixed problem when fixture_path is not always defined (incidentally, only when ActiveRecord is according to test_help.rb).

M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb

commit 5088f8c	refs/heads/master
Author: Philip Arndt 
Date:   2012-03-13 23:27:50 +1300

    Fixes issue #5193 using the instructions provided in the issue.

M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb

commit d2ac18a	refs/tags/v3.2.5
Merge: a9320f7 5ef8069
Author: José Valim 
Date:   2012-03-13 01:57:11 -0700

    Merge pull request #5398 from parndt/fix_issue_5193
    
    Fix issue 5193

commit a9320f7	refs/tags/v3.2.5
Merge: 5f26ce6 f67944e
Author: José Valim 
Date:   2012-03-13 01:48:08 -0700

    Merge pull request #5400 from arunagw/issue_4409
    
    Issue 4409

commit cfab216	refs/tags/v3.1.6
Merge: bccffc9 b1fe2c6
Author: José Valim 
Date:   2012-03-13 01:47:57 -0700

    Merge pull request #5401 from arunagw/issue_4409_3-1-stable
    
    Issue 4409 3 1 stable

commit ce72c0c	refs/heads/master
Merge: 10e1ce4 fb094ac
Author: José Valim 
Date:   2012-03-13 01:42:51 -0700

    Merge pull request #5404 from MarkMT/master
    
    Updated description of #retrieve_collector_from_mimes

commit bc8b55c	refs/heads/master
Merge: 4cb71ea 30b2dd4
Author: Mark Thomson 
Date:   2012-03-13 02:37:53 -0500

    Merge remote-tracking branch 'origin/master'

commit 4cb71ea	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-13 02:36:59 -0500

    Added documentation for the ActionController::MimeResponds::Collector class.

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit fb094ac	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-13 02:16:38 -0500

    Updated description of #retrieve_collector_from_mimes

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit b1fe2c6	refs/tags/v3.1.6
Author: Denis Jean 
Date:   2012-01-11 12:45:55 +0100

    fix activerecord query_method regression with offset into Fixnum
    
    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/finder_test.rb

commit f67944e	refs/tags/v3.2.5
Author: Denis Jean 
Date:   2012-01-11 12:45:55 +0100

    fix activerecord query_method regression with offset into Fixnum
    
    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 5ef8069	refs/tags/v3.2.5
Author: Philip Arndt 
Date:   2012-03-13 14:49:49 +1300

    Fixed problem when fixture_path is not always defined (incidentally, only when ActiveRecord is according to test_help.rb).

M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb

commit f665e20	refs/tags/v3.2.5
Author: Philip Arndt 
Date:   2012-03-10 23:55:36 +1300

    Fixes issue #5193 using the instructions provided in the issue.

M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb

commit 30b2dd4	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-12 16:01:38 -0700

    [config guide] Add mass_assignment_sanitizer to Active Record config options

M	railties/guides/source/configuring.textile

commit 7ad4c7c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-12 19:41:17 -0300

    Do not use the attributes hash in the scaffold functional tests

M	railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
M	railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 10e1ce4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-12 14:27:28 -0700

    use AS::Logger so we are consistent

M	railties/lib/rails/application/bootstrap.rb

commit 51aeae9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-12 14:25:25 -0700

    allow people to specify custom formatters, use the default formatter in production so that PID and timestamp are logged. fixes #5388

M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/commands/server.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 6c93fbc	refs/heads/master
Author: Filipe Moreira 
Date:   2012-03-12 21:19:58 +0100

    Advise to keep secret token private

M	railties/guides/code/getting_started/config/initializers/secret_token.rb

commit 0b36ad7	refs/heads/master
Author: Filipe Moreira 
Date:   2012-03-12 21:13:17 +0100

    Advise to keep secret token private

M	railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt

commit 2ad34f4	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-12 16:09:22 -0300

    Remove unused method

M	actionpack/test/controller/send_file_test.rb

commit 0bb6fcb	refs/heads/master
Merge: 0210c44 a02d237
Author: Aaron Patterson 
Date:   2012-03-12 12:02:52 -0700

    Merge pull request #5294 from robinroestenburg/master
    
    Refactoring of `arel_attributes_values` method

commit 5f26ce6	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-12 11:51:28 -0700

    make sure connections returned after close are marked as in_use

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit 0210c44	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-12 11:51:28 -0700

    make sure connections returned after close are marked as in_use

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit 7f40b9c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-12 11:34:02 -0700

    make the tagged formatter extend the existing formatter

M	activesupport/lib/active_support/tagged_logging.rb

commit bccffc9	refs/tags/v3.1.6
Merge: 7455627 7cdfd91
Author: Aaron Patterson 
Date:   2012-03-12 11:00:48 -0700

    Merge pull request #5312 from kennyj/fix_3927-31
    
    [3-1-stable] Use 1.9 native XML escaping to speed up html_escape and shush regexp warnings

commit 0f5b32c	refs/heads/master
Merge: fd22471 be62367
Author: Aaron Patterson 
Date:   2012-03-12 10:33:50 -0700

    Merge pull request #5394 from erichmenge/master
    
    retrieve_cache_key should work on objects that act like arrays.

commit be62367	refs/heads/master
Author: Erich Menge 
Date:   2012-03-11 23:21:37 -0500

    Allow retrieve_cache_key to work on collections such as ActiveRecord::Relation.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit fd22471	refs/heads/master
Merge: dea486d b142bd8
Author: Aaron Patterson 
Date:   2012-03-12 10:13:16 -0700

    Merge pull request #5375 from nertzy/assert_template_with_regexp
    
    assert_template matches against Regexp

commit dea486d	refs/heads/master
Merge: 2b05585 c8168a7
Author: Aaron Patterson 
Date:   2012-03-12 10:09:34 -0700

    Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator
    
    ensure u2029 is escaped in escape_javascript helper

commit da0595d	refs/tags/v3.2.5
Merge: a01f0ab bb8f4c2
Author: Aaron Patterson 
Date:   2012-03-12 09:47:19 -0700

    Merge pull request #5391 from jrochkind/connection_pool_doc
    
    ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0

commit 2b05585	refs/heads/master
Merge: ca99beb 27ebb3d
Author: Aaron Patterson 
Date:   2012-03-12 09:45:33 -0700

    Merge pull request #5393 from jrochkind/clear_to_reap
    
    deprecated clear_stale_active_connections! can call #reap

commit 27ebb3d	refs/heads/master
Author: Jonathan Rochkind 
Date:   2012-03-12 11:14:22 -0400

    deprecated clear_stale_active_connections! can call #reap instead of no-op'ing, #reap does the same thing

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit bb8f4c2	refs/tags/v3.2.5
Author: Jonathan Rochkind 
Date:   2012-03-12 11:07:40 -0400

    inline docs for clear_active_connections! no longer says it cleans dead threads, it doesn't since 3.2.0

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit a01f0ab	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-03-12 15:02:18 +0000

    Add documentation for find_or_create_by_{attribute}! method.

M	activerecord/lib/active_record/base.rb
M	railties/guides/source/active_record_querying.textile

commit ca99beb	refs/heads/master
Author: Andrew White 
Date:   2012-03-12 15:02:18 +0000

    Add documentation for find_or_create_by_{attribute}! method.

M	activerecord/lib/active_record/base.rb
M	railties/guides/source/active_record_querying.textile

commit eee32af	refs/heads/master
Author: Andrew White 
Date:   2012-03-12 11:39:19 +0000

    Add dynamic find_or_create_by_{attribute}! method.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/dynamic_finder_match.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/relations_test.rb

commit 90d9635	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-03-12 11:39:19 +0000

    Add dynamic find_or_create_by_{attribute}! method.
    (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/dynamic_finder_match.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/dynamic_finder_match.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/relations_test.rb

commit 1e2de2c	refs/heads/master
Merge: 0533ee4 a2c2f40
Author: José Valim 
Date:   2012-03-12 05:16:19 -0700

    Merge pull request #5390 from arunagw/picked_commits
    
    fix activerecord query_method regression with offset into Fixnum

commit a2c2f40	refs/heads/master
Author: Denis Jean 
Date:   2012-01-11 12:45:55 +0100

    fix activerecord query_method regression with offset into Fixnum
    
    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 78954ac	refs/heads/master
Merge: 8de49fe 36bd5c9
Author: Avi Tzurel 
Date:   2012-03-12 12:03:57 +0200

    Merge remote-tracking branch 'original_repo/master'

commit 0533ee4	refs/heads/master
Merge: 6c0d5a1 6b480d2
Author: José Valim 
Date:   2012-03-12 01:16:19 -0700

    Merge pull request #5387 from panthomakos/autoload
    
    Improved ActiveSupport::Autoload Performance

commit 6b480d2	refs/heads/master
Author: Pan Thomakos 
Date:   2012-03-11 23:18:03 -0700

    Improved ActiveSupport::Autoload performance.
    
    `ActiveSupport::Autoload#autoload` performance is improved in the default
    case where a path is present. Since the full path name is not generated, it
    isn't necessary to determine the full constant name either. This results in a
    3x performance gain and reduces the number of Ruby objects generated. For a full
    benchmark check [this gist](https://gist.github.com/2020228).

M	activesupport/lib/active_support/dependencies/autoload.rb

commit 36bd5c9	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-11 16:20:11 -0700

    Add engines guide to documents.yaml

M	railties/guides/source/documents.yaml

commit 507df09	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-11 16:18:48 -0700

    [instrumentation] Add further action placeholders

M	railties/guides/source/active_support_instrumentation.textile

commit a42eedb	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-07 07:39:20 -0800

    [instrumentation guide] Cover deliver.action_mailer event

M	railties/guides/source/active_support_instrumentation.textile

commit 4daef74	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-07 07:36:08 -0800

    [instrumentation guide] Cover receive.action_mailer event

M	railties/guides/source/active_support_instrumentation.textile

commit 6c0d5a1	refs/heads/master
Merge: d6ec3f0 f12f071
Author: José Valim 
Date:   2012-03-11 15:04:23 -0700

    Merge pull request #5366 from parndt/fix_issue_5324
    
    Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.

commit d6ec3f0	refs/heads/master
Merge: 4d2d0d9 4f28c4f
Author: José Valim 
Date:   2012-03-11 14:59:06 -0700

    Merge pull request #5372 from jsl/add_before_send_to_actionmailer
    
    Add ability to define callbacks in ActionMailer

commit f12f071	refs/heads/master
Author: Philip Arndt 
Date:   2012-03-12 10:39:45 +1300

    Documented the removal of size from text_field based helpers and cols, rows from text_area helper.

M	actionpack/CHANGELOG.md

commit 8b5198a	refs/heads/master
Author: Philip Arndt 
Date:   2012-03-12 10:33:47 +1300

    Fix unintended removal of 'cols' from a text_area example.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit ddbea94	refs/heads/master
Author: Michael de Silva 
Date:   2012-03-11 23:31:11 +0300

    Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password"

M	activemodel/lib/active_model/locale/en.yml
M	activemodel/lib/active_model/secure_password.rb

commit 4f28c4f	refs/heads/master
Author: Justin S. Leitgeb 
Date:   2012-03-10 15:37:04 -0500

    Add ability to define callbacks in ActionMailer using AbstractController::Callbacks.
    
    Prior to this commit, there isn't a good way of adding things like
    default inline attachments to an email.  This Stack Overflow thread
    shows people using hooks like the 'default' method in ActionMailer::Base
    to call a Proc for message configuration:
    
    http://stackoverflow.com/questions/5113121/rails-use-same-attachment-for-all-emails-using-layout
    
    This has the unintended side effect of setting a message header, so it's not a good solution.
    
    This pull request adds support for message modifications by including AbstractController:Callbacks
    in ActionMailer::Base. It includes tests and documentation for the functionality
    provided by including this module.

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/test/base_test.rb

commit c8168a7	refs/heads/master
Author: benmmurphy 
Date:   2012-02-22 16:11:03 +0000

    ensure u2029 is escaped in escape_javascript helper

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 625cb12	refs/heads/master
Author: Andrew France 
Date:   2012-03-11 13:28:25 +0000

    attr_accessor_with_default was deprecated and removed.
    
    Deprecated in 673372152032a886ba9196c69348386834590eab and removed in 9cafc28874a681082f9f7e1e445db91f195a25ae.

M	railties/guides/source/active_support_core_extensions.textile

commit 8de49fe	refs/heads/master
Author: Avi Tzurel 
Date:   2012-03-11 12:34:31 +0200

    Squash commits into a single commit

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 4d2d0d9	refs/heads/master
Merge: 411a826 e78c5ee
Author: José Valim 
Date:   2012-03-11 01:17:08 -0800

    Merge pull request #5373 from nertzy/fix_comments_about_to_partial_path
    
    Fix comments about to_partial_path

commit 64cd57a	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-11 03:15:38 -0500

    Revised explanation of fields_for usage.
    
    Minor tweak to previous comments on form_for and form_helper.rb preamble

M	actionpack/lib/action_view/helpers/form_helper.rb

commit ce8df43	refs/heads/master
Author: Michael de Silva 
Date:   2012-03-11 06:30:06 +0300

    added clarification stating the counter_cache attribute needs to be created on the associate class via a migration

M	activerecord/lib/active_record/associations.rb

commit b142bd8	refs/heads/master
Author: Grant Hutchins 
Date:   2012-03-10 19:25:12 -0500

    assert_template matches against Regexp
    
    This allows for more strict template assertions,
    while maintaining backward compatibility.
    
    For example, if you use assert_template("foo/bar")
    and "foo/bar/baz" was rendered, the test passes.
    
    But if you use assert_template(%r{\Afoo/bar\Z}),
    you will catch that a different template was
    rendered.
    
    Also, if you passed an unsupported argument to
    assert_template() in the past, it would silently
    succeed. Now it raises an ArgumentError.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/template/test_case_test.rb

commit 411a826	refs/heads/master
Merge: d5d241c 2459411
Author: Michael Koziarski 
Date:   2012-03-10 16:16:35 -0800

    Merge pull request #5326 from lest/patch-2
    
    configure how unverified request will be handled

commit bf8d757	refs/heads/master
Author: Grant Hutchins 
Date:   2012-03-10 17:50:03 -0500

    Remove ActiveModel::Naming#partial_path
    
    It was deprecated in 3.2

M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/naming_test.rb

commit e78c5ee	refs/heads/master
Author: Grant Hutchins 
Date:   2012-03-10 17:40:27 -0500

    Fix comments about to_partial_path

M	activemodel/lib/active_model/conversion.rb
M	activemodel/test/cases/conversion_test.rb

commit d5d241c	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-10 19:27:03 -0200

    @controller already includes url_helpers in with_routing method

M	actionpack/test/controller/base_test.rb

commit 687db9f	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-10 19:14:30 -0200

    Add missing require

M	actionpack/test/abstract/abstract_controller_test.rb

commit 147c20b	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-10 19:13:12 -0200

    Fix broken tests

M	actionmailer/test/base_test.rb
M	railties/test/application/initializers/frameworks_test.rb

commit f5e5a5b	refs/heads/master
Merge: 4751a69 da1a920
Author: José Valim 
Date:   2012-03-10 13:06:54 -0800

    Merge pull request #5371 from jsl/fix_actionmailer_tests
    
    Fix actionmailer tests broken by #4751a69

commit da1a920	refs/heads/master
Author: Justin S. Leitgeb 
Date:   2012-03-10 15:48:55 -0500

    Fix actionmailer tests broken by #4751a69

M	actionmailer/test/base_test.rb

commit 4751a69	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-10 18:36:00 -0200

    AbstractController.action_methods should return a Set

M	actionpack/lib/abstract_controller/base.rb
M	actionpack/test/abstract/abstract_controller_test.rb

commit 52bbff4	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-10 14:27:36 -0600

    Added clarification to description of how initial form values are derived.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 7d2bbb6	refs/heads/master
Author: Anuj Dutta 
Date:   2012-03-02 10:40:57 +0000

    Removed max-stale from the tests since it's a request cache-control directive, just for clarity sake.

M	actionpack/test/controller/render_test.rb

commit b0a93d6	refs/heads/master
Merge: 3e77649 ec40f6c
Author: Santiago Pastorino 
Date:   2012-03-10 06:42:58 -0800

    Merge pull request #5367 from carlosantoniodasilva/middleware-api
    
    Change api_only to http_only and add MiddlewareStackProxy docs

commit ec40f6c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-06 22:20:53 -0300

    Change api_only to http_only
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/guides/source/api_app.textile
M	railties/guides/source/configuring.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/configuration.rb
M	railties/test/application/middleware_test.rb

commit 6b28c94	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-06 08:26:09 -0300

    Add some docs for MiddlewareStackProxy methods and api_only!
    
    [Carlos Antonio da Silva & Santiago Pastorino]

M	railties/guides/source/api_app.textile
M	railties/guides/source/configuring.textile
M	railties/lib/rails/configuration.rb

commit 82a62b8	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-03-08 00:07:22 +0530

    remove unused require from AS/core_ext/class/delegating_att.rb

M	activesupport/lib/active_support/core_ext/class/delegating_attributes.rb

commit 3384ee2	refs/heads/master
Author: Philip Arndt 
Date:   2012-03-10 23:30:39 +1300

    Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/lib/action_view/helpers/tags/text_area.rb
M	actionpack/lib/action_view/helpers/tags/text_field.rb
M	actionpack/test/template/active_model_helper_test.rb
M	actionpack/test/template/form_helper_test.rb
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/nested_model_forms.textile

commit 3e77649	refs/heads/master
Merge: a39ee47 3508da5
Author: José Valim 
Date:   2012-03-10 01:06:30 -0800

    Merge pull request #5364 from carlosantoniodasilva/active-model-serialization-include
    
    Active model serialization :include returning string keys

commit 23a0011	refs/heads/master
Merge: 5dee391 69142aa
Author: Mark Thomson 
Date:   2012-03-10 02:30:49 -0600

    Merge branch '3.9.12'

commit 5dee391	refs/heads/master
Merge: 129ba87 23c4efb
Author: Grant McLean 
Date:   2012-03-10 20:59:01 +1300

    Merge branch 'master' of github.com:lifo/docrails

commit 129ba87	refs/heads/master
Author: Grant McLean 
Date:   2012-03-10 20:58:40 +1300

    fix fragment portion of some links

M	railties/guides/source/2_2_release_notes.textile
M	railties/guides/source/form_helpers.textile

commit 69142aa	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-10 01:51:13 -0600

    Revised explanation of form_for usage

M	actionpack/lib/action_view/helpers/form_helper.rb

commit c16f4f1	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-10 09:57:50 +0400

    Fix exceptions messages in AC layouts

M	actionpack/lib/abstract_controller/layouts.rb

commit 23c4efb	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-10 09:45:13 +0400

    Fix layout method doc formatting

M	actionpack/lib/abstract_controller/layouts.rb

commit 3508da5	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-09 21:58:56 -0300

    Rename variable to avoid using name "include"
    
    Better syntax highlight :)

M	activemodel/lib/active_model/serialization.rb

commit 3d04d72	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-09 21:56:05 -0300

    Remove Array#wrap usage in AMo serialization

M	activemodel/lib/active_model/serialization.rb

commit 10c3304	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-09 21:51:12 -0300

    Make sure serializable hash with :include always returns string keys

M	activemodel/lib/active_model/serialization.rb
M	activemodel/test/cases/serialization_test.rb

commit 12c44fe	refs/heads/master
Author: Ryan Oblak 
Date:   2012-03-09 16:33:40 -0800

    Fixed bug in Quoting that caused classes to be quoted incorrectly

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
A	activerecord/test/cases/connection_adapters/quoting_test.rb

commit a39ee47	refs/heads/master
Author: José Valim 
Date:   2012-03-09 22:19:55 +0100

    Install latest bundler on Travis.

M	.travis.yml

commit 35a0521	refs/heads/master
Author: Abe Voelker 
Date:   2012-03-09 15:15:01 -0600

    Fix 'Security#Mass Assignment' URL typo

M	railties/guides/source/security.textile

commit 3742152	refs/heads/master
Author: José Valim 
Date:   2012-03-09 22:10:43 +0100

    Bump bundler dependency.

M	rails.gemspec

commit 2459411	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-09 19:33:06 +0300

    configure how unverified request will be handled
    
    can be configured using `:with` option in `protect_from_forgery` method
    or `request_forgery_protection_method` config option
    
    possible values:
    - :reset_session (default)
    - :exception
    
    new applications are generated with:
    
        protect_from_forgery :with => :exception

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
M	railties/test/application/configuration_test.rb

commit 2562404	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-09 19:28:38 +0400

    Fix comment about layout folders lookup

M	actionpack/lib/abstract_controller/layouts.rb

commit 3288107	refs/heads/master
Author: João Britto 
Date:   2012-03-09 12:12:58 -0300

    Document validations and callbacks Array support for :if and :unless options

M	railties/guides/source/active_record_validations_callbacks.textile

commit 8761824	refs/heads/master
Author: João Britto 
Date:   2012-03-08 15:22:06 -0300

    Close string quotes

M	railties/guides/source/association_basics.textile

commit ee0879f	refs/heads/master
Merge: 74d5d9a 73e8e70
Author: José Valim 
Date:   2012-03-09 06:25:34 -0800

    Merge pull request #5356 from carlosantoniodasilva/rake-test-system
    
    Use one system call whenever possible, group rake and Dir.chdir calls

commit 74d5d9a	refs/heads/master
Merge: 225eff9 48a7df9
Author: José Valim 
Date:   2012-03-09 03:35:15 -0800

    Merge pull request #5352 from avakhov/ar_finder_sql_uniq_ids
    
    In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] correct

commit 48a7df9	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-03-09 15:18:16 +0400

    In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] correct

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 2b9041b	refs/tags/v3.2.5
Merge: 9814420 f18c054
Author: José Valim 
Date:   2012-03-08 23:28:10 -0800

    Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2
    
    [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict

commit 225eff9	refs/heads/master
Merge: ba35527 2b97b8f
Author: José Valim 
Date:   2012-03-08 23:26:48 -0800

    Merge pull request #5351 from shanna/master
    
    Missing active_model/naming.rb dependency.

commit ba35527	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-09 12:29:29 +0530

    Minor changelog fixes [ci skip]

M	actionpack/CHANGELOG.md

commit 9814420	refs/tags/v3.2.5
Merge: 94b2c8c db743ff
Author: Vijay Dev 
Date:   2012-03-08 22:48:13 -0800

    Merge pull request #5350 from rafaelfranca/changelog-fix-3-2
    
    Changelog fix 3 2

commit acc7e50	refs/heads/master
Merge: 2741f2c d804790
Author: Vijay Dev 
Date:   2012-03-08 22:29:55 -0800

    Merge pull request #5349 from rafaelfranca/changelog-fix
    
    Fix my name in the CHANGELOG to follow the convention

commit 2741f2c	refs/heads/master
Merge: 657095d 9f69f01
Author: Vijay Dev 
Date:   2012-03-08 22:29:00 -0800

    Merge pull request #5348 from rafaelfranca/fix-warning
    
    Remove warning of unused variable

commit 2b97b8f	refs/heads/master
Author: Shane Hanna 
Date:   2012-03-09 15:46:24 +1100

    Added missing ActiveModel::Naming dependency.
    
    ActiveModel::Name constructor expects to be able to call #blank? on a
    String but the core Object#blank? extension is never required.

M	activemodel/lib/active_model/naming.rb

commit d804790	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-09 00:01:34 -0300

    Fix my name in the CHANGELOG to follow the convention
    
    Also add missing entries and use the formating convention

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit db743ff	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-09 00:08:45 -0300

    Fix my name in the CHANGELOG to follow the convention
    
    Also add missing entries and use the formating convention

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 9f69f01	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-03-08 23:58:05 -0300

    Remove warning of unused variable

M	activesupport/test/core_ext/hash_ext_test.rb

commit f18c054	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-05 17:00:48 -0300

    Not need to pass join attributes to association build

M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/reader.rb
D	activerecord/test/models/secure_reader.rb

commit 7cd4063	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-05 00:45:17 -0300

    Add test case to has_many through association when mass_assignment_sanitizer is
    :strict
    
    Conflicts:
    
    	activerecord/test/models/person.rb

M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/person.rb
M	activerecord/test/models/post.rb
A	activerecord/test/models/secure_reader.rb

commit 05801ff	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-08 19:04:25 -0600

    Additional preamble comments in form_helper.rb.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 94b2c8c	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-08 16:12:49 -0800

    ensure that released connections move between threads

M	activerecord/test/cases/connection_pool_test.rb

commit 657095d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-08 16:12:49 -0800

    ensure that released connections move between threads

M	activerecord/test/cases/connection_pool_test.rb

commit cff19cf	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-08 15:40:23 -0800

    make active_connection? return true only if there is an open connection in use for the current thread. fixes #5330

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit d523504	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-08 15:40:23 -0800

    make active_connection? return true only if there is an open connection in use for the current thread. fixes #5330

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit 73e8e70	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-08 19:32:41 -0300

    Use one system call whenever possible, group rake and Dir.chdir calls

M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/rake/migrations_test.rb
M	railties/test/application/rake/notes_test.rb
M	railties/test/application/rake_test.rb

commit 263d842	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-03-09 03:17:15 +0530

    update changelogs for gems without changes too [ci skip]

M	actionmailer/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 1777348	refs/heads/master
Author: Mark Thomson 
Date:   2012-03-08 15:46:08 -0600

    Small correction to the description of the role of the form builder.
    (endpoints are generated by form_for without reference to the form builder)

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 8a714c4	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-09 02:30:44 +0530

    fix incorrect changelog headings [ci skip].
    
    Last commit message should not have said 'Rails 4' either

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit db65421	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-09 02:22:17 +0530

    changelog updates for Rails 4 [ci skip]

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit 3bfd651	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-03-09 02:07:34 +0530

    changelog updates [ci skip]

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md

commit c1a01c7	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-03-09 00:27:57 +0530

    In a nested resource route, the parent resource param is _id
    
    This fix was made by @coreyhaines on docrails and merged in master.
    Cleanly cherry picking into 3-2-stable wasn't possible.

M	railties/guides/source/routing.textile

commit df755d4	refs/tags/v3.2.5
Author: coreyhaines 
Date:   2012-03-06 20:46:47 -0600

    Left off a : when specifying the :namespace option for a :controller
    path segment

M	railties/guides/source/routing.textile

commit 22a8433	refs/tags/v3.2.5
Author: Caius Durling 
Date:   2012-03-06 12:03:36 +0000

    Fix typo in isolated engine docs

M	railties/lib/rails/engine.rb

commit 061f8ae	refs/tags/v3.2.5
Author: Matthew Conway 
Date:   2012-03-05 16:07:52 -0500

    Fix typo in asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 357e288	refs/tags/v3.2.5
Author: Braden Schaeffer 
Date:   2012-03-05 11:35:20 -0600

    Fix doc examples for has_and_belongs_to_many association

M	activerecord/lib/active_record/associations.rb

commit 30feb8c	refs/tags/v3.2.5
Author: Swanand Pagnis 
Date:   2012-03-05 18:54:34 +0530

    Fixed a slightly misleading equivalent SQL code on the 3.2 query interface.

M	railties/guides/source/active_record_querying.textile

commit 1f2224d	refs/tags/v3.2.5
Author: Mikhail Dieterle 
Date:   2012-03-04 14:37:25 +0800

    typo

M	railties/guides/source/configuring.textile

commit e63f04c	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-03-06 09:12:29 -0300

    Improve docs for attr_accessible|protected related to Hash#except|slice

M	activemodel/lib/active_model/mass_assignment_security.rb

commit 188d1d2	refs/heads/master
Merge: 085cb3b 97e7d43
Author: Vijay Dev 
Date:   2012-03-09 00:07:59 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 97e7d43	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-08 23:36:46 +0530

    Revert "Add rails glossary of common terms & concepts"
    
    This reverts commit fd584a63deb8d2f1e8969d8527e7a9dbd9d68848.
    
    Reason: This is not suitable for a Rails guide in my opinion.

M	railties/guides/source/credits.html.erb
D	railties/guides/source/glossary.textile

commit 085cb3b	refs/remotes/origin/async
Merge: 58a5559 74cb4b6
Author: Aaron Patterson 
Date:   2012-03-08 09:54:34 -0800

    Merge pull request #5287 from nashby/hash-slice-extract
    
    refactor Hash#slice and Hash#extract!

commit 58a5559	refs/remotes/origin/async
Merge: efc0d03 37802dd
Author: José Valim 
Date:   2012-03-08 04:00:02 -0800

    Merge pull request #5306 from kennyj/fix_69c7f02
    
    Change the message string to use in  test case.

commit 55cac81	refs/tags/v3.2.5
Author: Michael Reinsch 
Date:   2012-03-08 20:26:10 +0900

    fix ArgumentError being raised in case of invalid byte sequences

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb

commit 7d5fbf8	refs/heads/master
Author: Michael Reinsch 
Date:   2012-03-08 20:26:10 +0900

    fix ArgumentError being raised in case of invalid byte sequences

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb

commit efc0d03	refs/remotes/origin/async
Merge: 104eebb aa9b647
Author: Xavier Noria 
Date:   2012-03-08 03:17:16 -0800

    Merge pull request #5336 from kennyj/fix_wrong_extension
    
    Update CHANGELOG to fix wrong extension.

commit aa9b647	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-08 20:07:44 +0900

    Update CHANGELOG to fix wrong extension.

M	activerecord/CHANGELOG.md

commit 104eebb	refs/remotes/origin/async
Merge: 447ecb0 c9c7ee7
Author: Jon Leighton 
Date:   2012-03-08 00:13:08 -0800

    Merge pull request #5289 from rafaelfranca/fix-through-associations
    
    Fix has_many through associations when mass_assignment_sanitizer is strict

commit 2931f41	refs/heads/master
Author: Nick Rogers 
Date:   2012-03-07 23:56:23 -0500

    Tests for removing a HABTM association when optimistic locking is enabled.

M	activerecord/test/cases/locking_test.rb
A	activerecord/test/fixtures/peoples_treasures.yml
M	activerecord/test/models/person.rb
M	activerecord/test/schema/schema.rb

commit 447ecb0	refs/remotes/origin/async
Merge: b700153 46c1217
Author: Aaron Patterson 
Date:   2012-03-07 16:44:50 -0800

    Merge pull request #5162 from kennyj/schema_cache_dump
    
    [Proposal] Schema cache dump

commit c9c7ee7	refs/remotes/origin/async
Author: Rafael Mendonça França 
Date:   2012-03-05 17:00:48 -0300

    Not need to pass join attributes to association build

M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/reader.rb
D	activerecord/test/models/secure_reader.rb

commit 0388882	refs/heads/master
Author: Nick Rogers 
Date:   2012-03-07 17:16:21 -0500

    Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. Issue #5332.

M	activerecord/lib/active_record/locking/optimistic.rb

commit b700153	refs/remotes/origin/async
Author: Xavier Noria 
Date:   2012-03-07 22:46:59 +0100

    Revert "let the connection pool of new applications have size 1 rather than 5"
    
    Reason: Temporarily reverting this because it has uncovered an issue that
    prevents Sam's test suite from passing.
    
    This reverts commit 9b2c38b7bd582d9712c3779294a9bccde7bbd548.

M	railties/guides/code/getting_started/config/database.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml

commit 73324fd	refs/remotes/origin/async
Author: Xavier Noria 
Date:   2012-03-07 22:46:06 +0100

    Revert "updates the new default pool size in some additional places"
    
    Reason: We are about to temporarily revert the change to the default.
    
    This reverts commit 5c0aba238c37a71fce08f949bc2c6bdd9aab4f7b.

M	railties/guides/source/command_line.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/getting_started.textile

commit 9bcd662	refs/tags/v3.2.5
Author: kuahyeow 
Date:   2012-03-07 22:54:46 +1300

    Add tests to test that through associations are not readonly, and we can update the records we retrive from the association

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit a149612	refs/remotes/origin/async
Author: kuahyeow 
Date:   2012-03-07 22:54:46 +1300

    Add tests to test that through associations are not readonly, and we can update the records we retrive from the association

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 7455627	refs/tags/v3.1.6
Merge: 54621f7 d024ce1
Author: Santiago Pastorino 
Date:   2012-03-07 11:43:27 -0800

    Merge pull request #5322 from arunagw/test_fix_1.8.7-3-1-stable
    
    Test fix 1.8.7 3 1 stable

commit 61335d6	refs/tags/v3.0.14
Merge: f1c6037 f8f873a
Author: Santiago Pastorino 
Date:   2012-03-07 11:42:17 -0800

    Merge pull request #5319 from arunagw/fix_test_ree
    
    Fix test ree 3-0-stable

commit 89cef07	refs/remotes/origin/async
Merge: 3da31b9 8dc1a62
Author: Aaron Patterson 
Date:   2012-03-07 10:58:55 -0800

    Merge pull request #5315 from travisjeffery/enhance_postgresql_adapter_schema_support
    
    Enhance PostgreSQL Adapter schema support

commit 8dc1a62	refs/remotes/origin/async
Author: Travis Jeffery 
Date:   2012-03-07 05:14:35 +0000

    Adds #create/drop_schema on the PostgreSQL Adapter.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 4b6daef	refs/heads/master
Author: Mattias Pfeiffer 
Date:   2012-03-07 16:36:03 +0100

    Correct grammar in documentation

M	activerecord/lib/active_record/validations/uniqueness.rb

commit 524e8a1	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-03-07 07:03:59 -0800

    Merge pull request #5316 from Jacobkg/master
    
    Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 3da31b9	refs/heads/master
Merge: 7638004 04aca25
Author: José Valim 
Date:   2012-03-07 07:03:59 -0800

    Merge pull request #5316 from Jacobkg/master
    
    Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings

commit 35922c0	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-07 20:32:25 +0530

    copy edits [ci skip]

M	actionpack/lib/action_controller/base.rb

commit cdfcbc4	refs/heads/master
Author: kennyj 
Date:   2012-03-08 00:00:58 +0900

    Don't reset inheritance_column when setting explicitly.

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit 3d85926	refs/heads/master
Author: Mattias Pfeiffer 
Date:   2012-03-07 15:59:28 +0100

    Change syntax to accept an AR::Relation instead of old conditions hash/array.

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 6588560	refs/heads/master
Merge: e64dbb5 9ab7620
Author: Vijay Dev 
Date:   2012-03-07 06:51:33 -0800

    Merge pull request #88 from kevingriffin/master
    
    Correct "its" usage for "AJAX on Rails" page

commit 37802dd	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-07 03:17:14 +0900

    Change the string to use in  test case.

M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 3775058	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-03-07 15:26:56 +0100

    Remove usage of deprecated module.

M	actionpack/lib/action_controller/base.rb

commit b35fd40	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-03-07 09:31:27 -0300

    Add test case for #5307

M	actionpack/test/controller/mime_responds_test.rb

commit e7560bc	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-03-07 15:02:58 +0100

    Set the rendered_format on respond_to.

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit 7638004	refs/heads/master
Author: José Valim 
Date:   2012-03-07 15:02:58 +0100

    Set the rendered_format on respond_to.

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit bbdb54a	refs/heads/master
Author: José Valim 
Date:   2012-03-07 14:55:06 +0100

    Just change the formats on first render, closes #5307, closes #5308.

M	actionpack/lib/action_view/renderer/template_renderer.rb

commit bcea8cd	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-03-07 14:55:06 +0100

    Just change the formats on first render, closes #5307, closes #5308.

M	actionpack/lib/action_view/renderer/template_renderer.rb

commit d024ce1	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-03-07 18:27:58 +0530

    Test fix failing in 1.8.7-p358

M	actionpack/test/controller/mime_responds_test.rb

commit 6185c49	refs/heads/master
Author: Mattias Pfeiffer 
Date:   2012-03-07 12:51:43 +0100

    Add :conditions option to uniqueness validator

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit e6e591d	refs/heads/master
Merge: 87a8f95 7876177
Author: Santiago Pastorino 
Date:   2012-03-07 04:37:46 -0800

    Merge pull request #5320 from carlosantoniodasilva/test-render-js-no-layout
    
    Add test case for #5307

commit 7876177	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-07 09:31:27 -0300

    Add test case for #5307

M	actionpack/test/controller/mime_responds_test.rb

commit 87a8f95	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-07 17:43:50 +0530

    fixes #4506 [ci skip]
    
    odd and even keys are not scoped by activerecord.

M	railties/guides/source/i18n.textile

commit 5e4102e	refs/heads/master
Merge: d87ec9d 3c81045
Author: Vijay Dev 
Date:   2012-03-07 04:02:08 -0800

    Merge pull request #5305 from arunagw/warning_fix
    
    warning fix : mismatched indentations at 'end' with 'case'

commit f8f873a	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2012-03-07 17:04:37 +0530

    fixed test when running with latest 1.8.7-p357 and ree

M	actionpack/test/controller/integration_test.rb

commit 04aca25	refs/heads/master
Author: Jacob Green 
Date:   2012-03-06 22:32:29 -0800

    attribute_present? should return false for empty strings

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 577971f	refs/remotes/origin/async
Author: Travis Jeffery 
Date:   2012-03-07 04:22:07 +0000

    Add #schema_names to PostgreSQL Adapter.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 7cdfd91	refs/tags/v3.1.6
Author: Jeremy Kemper 
Date:   2011-12-11 15:30:05 -0700

    Use 1.9 native XML escaping to speed up html_escape and shush regexp warnings
    
            length      user     system      total        real
    before  6      0.010000   0.000000   0.010000 (  0.012378)
    after   6      0.010000   0.000000   0.010000 (  0.012866)
    before  60     0.040000   0.000000   0.040000 (  0.046273)
    after   60     0.040000   0.000000   0.040000 (  0.036421)
    before  600    0.390000   0.000000   0.390000 (  0.390670)
    after   600    0.210000   0.000000   0.210000 (  0.209094)
    before  6000   3.750000   0.000000   3.750000 (  3.751008)
    after   6000   1.860000   0.000000   1.860000 (  1.857901)

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit e64dbb5	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-06 09:12:29 -0300

    Improve docs for attr_accessible|protected related to Hash#except|slice

M	activemodel/lib/active_model/mass_assignment_security.rb

commit 945ee35	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-06 09:04:06 -0300

    Add some docs for ActionController::Base.without_modules

M	actionpack/lib/action_controller/base.rb

commit f434fa8	refs/heads/master
Author: coreyhaines 
Date:   2012-03-06 20:46:47 -0600

    Left off a : when specifying the :namespace option for a :controller
    path segment

M	railties/guides/source/routing.textile

commit 4b89b90	refs/heads/master
Author: coreyhaines 
Date:   2012-03-06 20:43:48 -0600

    In a nested resource route, the parent resource param is _id

M	railties/guides/source/routing.textile

commit d87ec9d	refs/heads/master
Merge: d467351 6e0a763
Author: José Valim 
Date:   2012-03-06 15:11:28 -0800

    Merge pull request #5310 from Serabe/layout_for_partials_with_collections
    
    Adds :layout option to render :partial when a collection is given.

commit 6e0a763	refs/heads/master
Author: Sergio Arbeo 
Date:   2012-03-07 00:06:42 +0100

    Adds line to change log and update documentation.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit a02d237	refs/heads/master
Author: Robin Roestenburg 
Date:   2012-03-06 23:54:38 +0100

    Removed flag attributes.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/persistence.rb

commit d467351	refs/heads/master
Merge: d1a4faf 8d5c742
Author: Aaron Patterson 
Date:   2012-03-06 14:05:27 -0800

    Merge pull request #5309 from carlosantoniodasilva/ad-uploaded-file
    
    Refactor ActionDispatch::UploadedFile

commit 9ab7620	refs/heads/master
Author: Kevin Griffin 
Date:   2012-03-06 16:02:53 -0600

    Correct it's/its usage.

M	railties/guides/source/ajax_on_rails.textile

commit 8d5c742	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-06 18:34:20 -0300

    Refactor AD::UploadedFile, and raise sooner if tempfile is not present

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit d1a4faf	refs/heads/master
Author: José Valim 
Date:   2012-03-06 22:04:53 +0100

    Ensure load hooks can be called more than once with different contexts.

M	activesupport/lib/active_support/lazy_load_hooks.rb
M	activesupport/test/lazy_load_hooks_test.rb

commit 74fe7e1	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-03-06 18:13:30 -0200

    Deprecate ActionController::SessionManagement

M	actionpack/lib/action_controller/metal/session_management.rb

commit bc5ac77	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-06 17:57:12 -0200

    Remove unused ActionController::SessionManagement

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
D	actionpack/lib/action_controller/metal/session_management.rb
M	railties/guides/source/api_app.textile

commit b90d24b	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-06 17:52:54 -0200

    Avoid ImplicitRender just call render directly

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit 7c90d91	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-07 01:04:14 +0530

    Clean up module docs [ci skip]
    
    Removed some useless docstrings and no-doc'ed some.

M	actionpack/lib/abstract_controller/url_for.rb
M	actionpack/lib/action_controller/metal/url_for.rb
M	activerecord/lib/active_record/railties/jdbcmysql_error.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/lib/active_support/lazy_load_hooks.rb
M	activesupport/lib/active_support/values/time_zone.rb
M	activesupport/lib/active_support/xml_mini/jdom.rb
M	activesupport/lib/active_support/xml_mini/libxml.rb
M	activesupport/lib/active_support/xml_mini/libxmlsax.rb
M	activesupport/lib/active_support/xml_mini/nokogiri.rb
M	activesupport/lib/active_support/xml_mini/nokogirisax.rb
M	activesupport/lib/active_support/xml_mini/rexml.rb

commit f3a3203	refs/heads/master
Merge: f0ad853 f2b0485
Author: Aaron Patterson 
Date:   2012-03-06 11:25:24 -0800

    Merge pull request #5304 from kennyj/fix_connection_dependency
    
    Revert table_name= needs connection now, so just stub table_name

commit 3c81045	refs/heads/master
Author: Arun Agrawal 
Date:   2012-03-06 23:18:07 +0530

    warning fix : mismatched indentations at 'end' with 'case'

M	activerecord/lib/active_record/railties/databases.rake

commit f2b0485	refs/heads/master
Author: kennyj 
Date:   2012-03-07 02:37:40 +0900

    Revert table_name= needs connection now, so just stub table_name

M	activerecord/lib/active_record/model_schema.rb
M	railties/test/generators/session_migration_generator_test.rb

commit b4b0fdd	refs/heads/master
Author: Levente Bagi 
Date:   2012-03-06 16:24:04 +0000

    Don't ignore call to undefined method in Sweeper

M	actionpack/lib/action_controller/caching/sweeping.rb
A	actionpack/test/controller/sweeper_test.rb

commit e4e1388	refs/heads/master
Author: Sergio Arbeo 
Date:   2012-03-06 16:20:56 +0100

    Adds :layout option to render :partial when a collection is given.

M	actionpack/lib/action_view/renderer/partial_renderer.rb
A	actionpack/test/fixtures/test/_b_layout_for_partial.html.erb
M	actionpack/test/template/render_test.rb

commit cf1d975	refs/heads/master
Merge: 45b4ebc a75afbd
Author: Vijay Dev 
Date:   2012-03-06 06:32:31 -0800

    Merge pull request #86 from bschaeffer/ar-doc-fix
    
    Fix doc examples for has_and_belongs_to_many association

commit 45b4ebc	refs/heads/master
Author: Caius Durling 
Date:   2012-03-06 12:03:36 +0000

    Fix typo in isolated engine docs

M	railties/lib/rails/engine.rb

commit 54621f7	refs/tags/v3.1.6
Author: José Valim 
Date:   2012-03-06 10:14:07 +0100

    Use latest rack-cache.

M	actionpack/actionpack.gemspec

commit 9c56401	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-03-06 10:13:44 +0100

    Use latest rack-cache.

M	actionpack/actionpack.gemspec

commit f0ad853	refs/heads/master
Author: José Valim 
Date:   2012-03-06 10:12:59 +0100

    Use latest rack-cache.

M	actionpack/actionpack.gemspec

commit 5aa4f52	refs/tags/v3.1.6
Author: Mikel Lindsaar 
Date:   2012-03-06 20:03:27 +1100

    Increasing minimum version of mail due to security vulnerability found in Mail 2.3.0 for sendmail or exim

M	actionmailer/actionmailer.gemspec

commit 98b0d3e	refs/heads/master
Author: Mikel Lindsaar 
Date:   2012-03-06 19:58:48 +1100

    Increasing minimum version of mail due to security vulnerability found in Mail 2.4.1 for sendmail or exim

M	actionmailer/actionmailer.gemspec

commit 0d2798e	refs/tags/v3.2.5
Author: Mikel Lindsaar 
Date:   2012-03-06 19:58:48 +1100

    Increasing minimum version of mail due to security vulnerability found in Mail 2.4.1 for sendmail or exim

M	actionmailer/actionmailer.gemspec

commit 688e4f0	refs/tags/v3.2.5
Merge: e1a882a 82a8698
Author: José Valim 
Date:   2012-03-06 00:50:00 -0800

    Merge pull request #5299 from sikachu/3-2-stable-fix-responder
    
    Always passing a respond block from to responder

commit f97e3ed	refs/heads/master
Merge: 9beb0b6 284041c
Author: José Valim 
Date:   2012-03-06 00:49:47 -0800

    Merge pull request #5298 from sikachu/master-fix-responder
    
    Always passing a respond block from to responder

commit 9beb0b6	refs/heads/master
Merge: dc80715 8e26d29
Author: José Valim 
Date:   2012-03-06 00:48:23 -0800

    Merge pull request #5296 from dlitz/relative_url_root_from_script_name
    
    Compute asset paths from the request if RAILS_RELATIVE_URL_ROOT not set

commit 74cb4b6	refs/remotes/origin/async
Author: Vasiliy Ermolovich 
Date:   2012-03-05 21:35:57 +0300

    refactor Hash#slice and Hash#extract!

M	activesupport/lib/active_support/core_ext/hash/slice.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 82a8698	refs/tags/v3.2.5
Author: Prem Sichanugrist 
Date:   2012-03-05 21:06:02 -0500

    Always passing a respond block from to responder
    
    We should let the responder to decide what to do with the given
    overridden response block, and not short circuit it.
    
    Fixes #5280

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/responder.rb

commit 5b73a3a	refs/tags/v3.2.5
Author: Mario Visic 
Date:   2012-03-05 22:26:45 +0800

    Failing test for mime responder respond_with using a block.

M	actionpack/test/controller/mime_responds_test.rb

commit 284041c	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-03-05 21:06:02 -0500

    Always passing a respond block from to responder
    
    We should let the responder to decide what to do with the given
    overridden response block, and not short circuit it.
    
    Fixes #5280

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/responder.rb

commit 4c31ba9	refs/heads/master
Author: Mario Visic 
Date:   2012-03-05 22:26:45 +0800

    Failing test for mime responder respond_with using a block.

M	actionpack/test/controller/mime_responds_test.rb

commit 8e26d29	refs/heads/master
Author: Dwayne Litzenberger 
Date:   2012-03-05 19:46:01 -0500

    Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is not set.
    
    This should fix the following issue:
    
    "Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)"
    https://github.com/rails/rails/issues/910

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 6024d53	refs/heads/master
Author: Robin Roestenburg 
Date:   2012-03-06 00:14:41 +0100

    Refactored method arel_attributes_values.

M	activerecord/lib/active_record/attribute_methods.rb

commit 4bfc8b1	refs/heads/master
Author: Ryan Bigg 
Date:   2012-03-05 15:08:15 -0800

    [instrumentation guide] Add introduction + basic outline

A	railties/guides/source/active_support_instrumentation.textile

commit 7dfa8c0	refs/heads/master
Merge: fd584a6 3a0433b
Author: adman65 
Date:   2012-03-05 23:33:41 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit fd584a6	refs/heads/master
Author: adman65 
Date:   2012-03-05 23:08:35 +0200

    Add rails glossary of common terms & concepts

M	railties/guides/source/credits.html.erb
A	railties/guides/source/glossary.textile

commit 3a0433b	refs/heads/master
Author: Matthew Conway 
Date:   2012-03-05 16:07:52 -0500

    Fix typo in asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit dc80715	refs/heads/master
Merge: c84d327 8c4b3a4
Author: José Valim 
Date:   2012-03-05 12:17:30 -0800

    Merge pull request #5290 from steveklabnik/master
    
    Added parsing of arbitrary media type parameters.

commit 8c4b3a4	refs/heads/master
Author: Steve Klabnik 
Date:   2012-03-05 15:10:23 -0500

    Added parsing of arbitrary media type parameters.
    
    Based on #4918.
    
    Related to #4127.

M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/test/dispatch/mime_type_test.rb

commit e9bf0e3	refs/remotes/origin/async
Author: Rafael Mendonça França 
Date:   2012-03-05 00:45:17 -0300

    Add test case to has_many through association when mass_assignment_sanitizer is
    :strict

M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/person.rb
M	activerecord/test/models/post.rb
A	activerecord/test/models/secure_reader.rb

commit c84d327	refs/heads/master
Author: Carlos Antonio da Silva and Santiago Pastorino 
Date:   2012-03-05 16:36:27 -0200

    Add config.middleware.api_only!

M	railties/lib/rails/application.rb
M	railties/lib/rails/configuration.rb
M	railties/test/application/middleware_test.rb

commit 9cd9276	refs/heads/master
Merge: c97a166 1e0387e
Author: José Valim 
Date:   2012-03-05 11:27:14 -0800

    Merge pull request #5288 from lest/patch-2
    
    force response body to be read in assert_template

commit 1e0387e	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-05 22:21:04 +0300

    force response body to be read in assert_template

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/layout_test.rb

commit e1a882a	refs/tags/v3.2.5
Author: Jean Boussier 
Date:   2012-03-04 14:20:13 +0100

    Fix #5069 - Protect foreign key from mass assignment throught association builder

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit c97a166	refs/remotes/origin/async
Author: Jean Boussier 
Date:   2012-03-04 14:20:13 +0100

    Fix #5069 - Protect foreign key from mass assignment throught association builder

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit c5a47b3	refs/remotes/origin/async
Merge: f02fa16 922c9e2
Author: José Valim 
Date:   2012-03-05 09:45:09 -0800

    Merge pull request #5274 from tigrish/master
    
    Update I18n defaults for activerecord.errors.messages.record_invalid

commit a75afbd	refs/heads/master
Author: Braden Schaeffer 
Date:   2012-03-05 11:35:20 -0600

    Fix doc examples for has_and_belongs_to_many association

M	activerecord/lib/active_record/associations.rb

commit 922c9e2	refs/remotes/origin/async
Author: Christopher Dell 
Date:   2012-03-05 18:29:03 +0100

    Tweak activerecord/test/cases/validations/i18n_generate_message_validation_test.rb

M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb

commit f02fa16	refs/remotes/origin/async
Merge: c0a7999 e204858
Author: Vijay Dev 
Date:   2012-03-05 09:18:41 -0800

    Merge pull request #5281 from filipeamoreira/patch-1
    
    Small typo fix

commit c0a7999	refs/remotes/origin/async
Author: Vijay Dev 
Date:   2012-03-05 22:46:44 +0530

    minor corrections in AMo::Model docs [ci skip]

M	activemodel/README.rdoc
M	activemodel/lib/active_model/model.rb

commit cf75417	refs/remotes/origin/async
Author: Vijay Dev 
Date:   2012-03-05 22:41:13 +0530

    document the shortcut to the root route helper [ci skip]
    
    This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5

M	actionpack/CHANGELOG.md
M	railties/guides/source/routing.textile

commit 0eada11	refs/remotes/origin/async
Author: Christopher Dell 
Date:   2012-03-05 18:06:37 +0100

    Test that RecordInvalid exception's translation falls back to the :errors namespace

M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb

commit e204858	refs/remotes/origin/async
Author: Filipe Moreira 
Date:   2012-03-05 16:28:11 +0100

    Small typo fix

M	railties/guides/source/api_app.textile

commit 64d8d24	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-05 13:15:20 -0200

    Fix typo

M	railties/guides/source/api_app.textile

commit 9f78042	refs/heads/master
Author: Swanand Pagnis 
Date:   2012-03-05 18:54:34 +0530

    Fixed a slightly misleading equivalent SQL code on the 3.2 query interface.

M	railties/guides/source/active_record_querying.textile

commit efd557a	refs/remotes/origin/async
Author: Jose and Yehuda 
Date:   2012-03-04 18:57:56 -0800

    Add a new guide for API-only applications
    
    This guide reflects features that have not yet
    been implemented.

A	railties/guides/source/api_app.textile

commit ebc5a19	refs/tags/v3.2.5
Merge: 06a3a8a 2a6b7e5
Author: Michael Koziarski 
Date:   2012-03-04 18:04:47 -0800

    Merge pull request #5278 from rafaelfranca/fix-build-3-2
    
    [3-2-stable] Fix build

commit 2a6b7e5	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-04 22:13:56 -0300

    Now all the models need to explicitly declare the accessible attributes

M	railties/test/application/loading_test.rb

commit f604a63	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-03-04 20:53:59 -0300

    Only add the whitelist_attributes option if ActiveRecord is present
    
    Conflicts:
    
    	railties/test/generators/app_generator_test.rb
    	railties/test/isolation/abstract_unit.rb

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/isolation/abstract_unit.rb

commit c37f745	refs/remotes/origin/async
Merge: db3d5f0 6dd6816
Author: Michael Koziarski 
Date:   2012-03-04 17:22:46 -0800

    Merge pull request #5277 from rafaelfranca/fix-build
    
    Now all the models need to explicitly declare the accessible attributes

commit 6dd6816	refs/remotes/origin/async
Author: Rafael Mendonça França 
Date:   2012-03-04 22:13:56 -0300

    Now all the models need to explicitly declare the accessible attributes

M	railties/test/application/loading_test.rb

commit db3d5f0	refs/remotes/origin/async
Merge: 641a4f6 5afb2f7
Author: Jon Leighton 
Date:   2012-03-04 16:13:54 -0800

    Merge pull request #5275 from rafaelfranca/master
    
    Only add the whitelist_attributes option if ActiveRecord is present

commit 5afb2f7	refs/remotes/origin/async
Author: Rafael Mendonça França 
Date:   2012-03-04 20:53:59 -0300

    Only add the whitelist_attributes option if ActiveRecord is present

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/isolation/abstract_unit.rb

commit 4da6e1c	refs/remotes/origin/async
Author: Christopher Dell 
Date:   2012-03-05 00:17:47 +0100

    Allow translations of activerecord.errors.messages.record_invalid to be looked up in errors.messages.record_invalid

M	activerecord/lib/active_record/validations.rb

commit 641a4f6	refs/remotes/origin/async
Author: Michael Koziarski 
Date:   2012-03-05 11:12:01 +1300

    Whitelist all attribute assignment by default.
    
    Change the default for newly generated applications to whitelist all attribute assignment.  Also update the generated model classes so users are reminded of the importance of attr_accessible.

M	activerecord/lib/rails/generators/active_record/model/model_generator.rb
M	activerecord/lib/rails/generators/active_record/model/templates/model.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/model_generator_test.rb

commit 06a3a8a	refs/tags/v3.2.5
Author: Michael Koziarski 
Date:   2012-03-05 11:12:01 +1300

    Whitelist all attribute assignment by default.
    
    Change the default for newly generated applications to whitelist all attribute assignment.  Also update the generated model classes so users are reminded of the importance of attr_accessible.

M	activerecord/lib/rails/generators/active_record/model/model_generator.rb
M	activerecord/lib/rails/generators/active_record/model/templates/model.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/model_generator_test.rb

commit c8f6025	refs/remotes/origin/async
Author: Piotr Sarnacki 
Date:   2012-03-04 22:59:40 +0100

    Fix tests, table_name= needs connection now, so just stub table_name

M	railties/test/generators/session_migration_generator_test.rb

commit 69786d1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-04 16:45:10 -0300

    Bump "latest version" from 3.2.1 to 3.2.2 in upgrading rails guide

M	railties/guides/source/upgrading_ruby_on_rails.textile

commit 393c2dd	refs/remotes/origin/async
Merge: f8f66a3 357f1c6
Author: José Valim 
Date:   2012-03-04 11:43:54 -0800

    Merge pull request #5271 from carlosantoniodasilva/ar-fix-build
    
    Fix message assertions for quoting database name in "show tables" for mysql

commit 357f1c6	refs/remotes/origin/async
Author: Carlos Antonio da Silva 
Date:   2012-03-04 16:35:36 -0300

    Fix message assertions for quoting database name in "show tables" for mysql

M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit f8f66a3	refs/remotes/origin/async
Merge: 2b74968 9b9357b
Author: Jon Leighton 
Date:   2012-03-04 10:34:34 -0800

    Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warning
    
    Fix ActiveRecord warning in tests with Marshal

commit 2b74968	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-03-04 18:12:25 +0000

    remove troll

D	hacked

commit 851fd8f	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-03-04 18:11:15 +0000

    tidy up formatting

M	activerecord/lib/active_record/model_schema.rb

commit 2fdb521	refs/remotes/origin/async
Merge: b839657 200d994
Author: Jon Leighton 
Date:   2012-03-04 10:03:34 -0800

    Merge pull request #5267 from kennyj/fix_4674
    
    Fix GH #4674. Reset column information and sequence name when setting table_name.

commit b839657	refs/remotes/origin/async
Author: homa 
Date:   2012-03-04 17:49:11 +0100

    wow how come I commit in master? O_o

A	hacked

commit 4d391a4	refs/remotes/origin/async
Merge: e09fd97 1380d32
Author: Piotr Sarnacki 
Date:   2012-03-04 08:35:16 -0800

    Merge pull request #5269 from castlerock/remove_unwanted_require_karnel_reporting
    
    AS/kernel/reporting no where used in ts_isolated

commit e09fd97	refs/remotes/origin/async
Merge: 44e7967 2ee4dd8
Author: Piotr Sarnacki 
Date:   2012-03-04 08:34:41 -0800

    Merge pull request #5266 from bcardarella/root_with_string_options
    
    Route root helper shortcut

commit 44e7967	refs/remotes/origin/async
Merge: 223549f 69c7f02
Author: Piotr Sarnacki 
Date:   2012-03-04 08:33:21 -0800

    Merge pull request #5270 from kennyj/fix_3163
    
    Fix GH #3163. Should quote database on mysql/mysql2.

commit 1380d32	refs/remotes/origin/async
Author: Vishnu Atrai 
Date:   2012-03-04 21:30:36 +0530

    AS/kernel/reporting no where used in ts_isolated

M	actionpack/test/ts_isolated.rb

commit 24e074f	refs/tags/v3.1.6
Author: Carlos Antonio da Silva 
Date:   2012-03-03 00:03:05 -0300

    Only run binary type cast test with encode! on Ruby 1.9

M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb

commit 864d755	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-03-03 00:03:05 -0300

    Only run binary type cast test with encode! on Ruby 1.9

M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb

commit f6d478a	refs/tags/v3.2.5
Author: Lars Kanis 
Date:   2011-11-22 10:43:03 +0100

    fix associations when using per class databases
    
    would get ConnectionNotEstablished error because it always tried to use
    ActiveRecord::Base's connection, even though it should be using the connection
    of the model whose context we're operating in

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency.rb

commit 69c7f02	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-03 22:25:15 +0900

    Fix GH #3163. Should quote database on mysql/mysql2.

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 9b9357b	refs/remotes/origin/async
Author: Carlos Antonio da Silva 
Date:   2012-03-04 11:43:16 -0300

    Initialize @stale_state to nil in association
    
    This apparently fix the warning related to @new_record variable not
    being initialized in AR's test suit, when an association is built and
    the object is marshalled/loaded.
    
    See these tests in AR's base_test.rb:
    
    test_marshalling_with_associations
    test_marshalling_new_record_round_trip_with_associations
    
    Closes #3720.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/base_test.rb

commit 9a2e164	refs/remotes/origin/async
Author: kennyj 
Date:   2011-11-22 23:48:39 +0900

    Added test case for new_record round trip with associations problem

M	activerecord/test/cases/base_test.rb

commit 200d994	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-04 22:18:57 +0900

    Don't clear sequence name when we explicitly assign it.

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit 640f6c2	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-03 20:32:46 +0900

    Fix GH #4674. Reset column information and sequence name when setting table_name.

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit 223549f	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-03-04 12:15:11 +0000

    Fix rake test_sqlite3_mem

M	activerecord/test/cases/multiple_db_test.rb

commit 7ba0fe2	refs/remotes/origin/async
Author: Jon Leighton 
Date:   2012-03-04 11:23:39 +0000

    Remove unusused variables

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model_schema.rb

commit 78b40bb	refs/heads/master
Author: Mikhail Dieterle 
Date:   2012-03-04 14:37:25 +0800

    typo

M	railties/guides/source/configuring.textile

commit 2ee4dd8	refs/remotes/origin/async
Author: Brian Cardarella 
Date:   2012-03-03 22:17:34 -0500

    Route root helper shortcut
    
    Allow the root route helper to accept just a string

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/routing_test.rb

commit b4ac72c	refs/remotes/origin/async
Author: Piotr Sarnacki 
Date:   2012-03-03 21:50:08 +0100

    [engines guide] Add more concrete example of conflicts when not using isolate_namespace

M	railties/guides/source/engines.textile

commit 55dd060	refs/remotes/origin/async
Author: Piotr Sarnacki 
Date:   2012-03-03 20:05:45 +0100

    Handle files from ActionDispatch::Static with Rack::Sendfile (fixes #5225)
    
    This makes rails behave properly when you serve static assets
    and you have X-Sendfile headers enabled. Nevertheless in most
    cases you should not rely on that and serve static assets with
    a webserver like Apache or Nginx (as you already have it in
    place anyway if you use X-Sendfile)

M	railties/lib/rails/application.rb
M	railties/test/application/middleware/sendfile_test.rb
M	railties/test/application/middleware_test.rb

commit 4443b36	refs/remotes/origin/async
Merge: ecf4db1 50725ce
Author: Piotr Sarnacki 
Date:   2012-03-03 11:10:17 -0800

    Merge pull request #5255 from carlosantoniodasilva/active-record-review
    
    Refactor and cleanup in some ActiveRecord modules

commit ecf4db1	refs/remotes/origin/async
Merge: 833181f 4e8fbc0
Author: José Valim 
Date:   2012-03-03 11:07:49 -0800

    Merge pull request #5246 from lest/patch-2
    
    simplify namespace assignment in fields_for

commit 833181f	refs/remotes/origin/async
Merge: 2aec357 d8996d3
Author: Santiago Pastorino 
Date:   2012-03-03 10:53:37 -0800

    Merge pull request #5260 from castlerock/remove_ordered_hash_usages
    
    remove usage of AS::OrderedHash from other places

commit 23ca13a	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-02-15 02:33:10 +0530

    CSS fix for guides. Closing #5028 [ci skip]
    
    In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
    visible. Increasing the line height slightly seems to fix this. This
    problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
    any other OS-browser combo :)

M	railties/guides/assets/stylesheets/fixes.css

commit d8996d3	refs/remotes/origin/async
Author: Vishnu Atrai 
Date:   2012-03-03 23:48:29 +0530

    remove usages of AS::OrderedHash

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	activesupport/test/core_ext/object/to_query_test.rb
M	railties/lib/rails/application/route_inspector.rb

commit 2aec357	refs/remotes/origin/async
Merge: f9e2694 fa46468
Author: Vijay Dev 
Date:   2012-03-03 09:05:23 -0800

    Merge pull request #4984 from raghunadhd/change_orderhash
    
    Refactored code

commit f9e2694	refs/heads/master
Merge: 9975d53 f097f5a
Author: Vijay Dev 
Date:   2012-03-03 22:08:24 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit f097f5a	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-03 22:07:33 +0530

    copy edits [ci skip]

M	railties/guides/source/asset_pipeline.textile

commit 9975d53	refs/heads/master
Merge: aacd41d 247706e
Author: Jon Leighton 
Date:   2012-03-03 07:40:15 -0800

    Merge pull request #5258 from guilleiguaran/amo-model
    
    Use public_send instead of send in ActiveModel::Model initialize

commit 247706e	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-03 10:36:03 -0500

    Use public_send instead of send in ActiveModel::Model initialize

M	activemodel/lib/active_model/model.rb

commit aacd41d	refs/heads/master
Merge: eafa58b cb9d03f
Author: José Valim 
Date:   2012-03-03 07:12:13 -0800

    Merge pull request #5256 from carlosantoniodasilva/active-model-model
    
    Add docs with usage examples for ActiveModel::Model

commit cb9d03f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-03 04:19:39 -0300

    Add docs with usage examples for ActiveModel::Model
    
    Also add test to ensure basic model does not explode when
    initialized with nil.

M	activemodel/README.rdoc
M	activemodel/lib/active_model/model.rb
M	activemodel/test/cases/model_test.rb

commit 50725ce	refs/remotes/origin/async
Author: Carlos Antonio da Silva 
Date:   2012-03-03 02:10:39 -0300

    Refactor and cleanup in some ActiveRecord modules
    
    * Avoid double hash lookups in AR::Reflection when reflecting associations/aggregations
    * Minor cleanups: use elsif, do..end, if..else instead of unless..else
    * Simplify DynamicMatchers#respond_to?
    * Use "where" instead of scoped with conditions hash
    * Extract `scoped_by` method pattern regexp to constant
    * Extract noisy class_eval from method_missing in dynamic matchers
    * Extract readonly check, avoid calling column#to_s twice in persistence
    * Refactor predicate builder, remove some variables

M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/lib/active_record/dynamic_scope_match.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/lib/active_record/sanitization.rb

commit eafa58b	refs/heads/master
Merge: 14f06dd 3b822e9
Author: Jeremy Kemper 
Date:   2012-03-02 22:38:30 -0800

    Merge pull request #5253 from guilleiguaran/amo-model
    
    Add ActiveModel::Model, a mixin to make plain Ruby objects work with AP out of box

commit 3b822e9	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-03-02 23:20:17 -0500

    Add ActiveModel::Model, a mixin to make Ruby objects to work with AP inmediatly

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model.rb
A	activemodel/lib/active_model/model.rb
A	activemodel/test/cases/model_test.rb

commit 520571a	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-03-03 00:15:06 -0200

    Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that info
    
    Closes #5245

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/railtie.rb

commit 14f06dd	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-03-03 00:15:06 -0200

    Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that info
    
    Closes #5245

M	actionpack/lib/action_dispatch/railtie.rb

commit 217a8b0	refs/heads/master
Author: James Coleman 
Date:   2012-03-02 15:37:48 -0500

    Unset association when existing record is destroyed.
    
    To avoid foreign key errors (and invalid data) in the database, when a belongs_to association is destroyed, it should also be nil'd out on the parent object.

M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit 4e8fbc0	refs/remotes/origin/async
Author: Sergey Nartimov 
Date:   2012-03-02 22:44:53 +0300

    simplify namespace assignment in fields_for

M	actionpack/lib/action_view/helpers/form_helper.rb

commit b1358c8	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-03-02 10:25:00 -0800

    only log an error if there is a logger. fixes #5226
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb

commit af02291	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-03-02 10:25:00 -0800

    only log an error if there is a logger. fixes #5226
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb

commit b5c939d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-03-02 10:25:00 -0800

    only log an error if there is a logger. fixes #5226

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb

commit f1c6037	refs/tags/v3.0.14
Author: Carlos Antonio da Silva 
Date:   2012-03-02 10:54:16 -0300

    Stop SafeBuffer#clone_empty from issuing warnings
    
    Logic in clone_empty method was dealing with old @dirty variable, which
    has changed by @html_safe in this commit:
    https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1
    
    This was issuing a "not initialized variable" warning - related to:
    https://github.com/rails/rails/pull/5237
    
    The logic applied by this method is already handled by the [] override,
    so there is no need to reset the variable here.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 0e94208	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-02 18:47:15 +0100

    Can't cache url_options on a controller level
    
    It fails if routes from to railties are called in one context,
    for example: blog.posts_path and main_app.users_path

M	actionpack/lib/action_controller/metal/url_for.rb

commit a2bf014	refs/heads/master
Author: Fotos Georgiadis 
Date:   2012-03-02 19:12:11 +0200

    Maximum wait_timeout on Windows is 2147483

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit d08a7c1	refs/heads/master
Merge: 1a046ab 0e6b588
Author: José Valim 
Date:   2012-03-02 08:35:32 -0800

    Merge pull request #5243 from lest/patch-2
    
    don't pass unnecessary argument

commit 8674823	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-03-02 14:34:23 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit cf65057	refs/heads/master
Author: Guy Bolton King 
Date:   2012-03-02 16:02:09 +0000

    Made documentation of config.assets.precompile slightly more explicit.
    
    Having read the previous version of the documentation, I was surprised
    when a wildcarded CSS pattern in precompile picked up a whole load of
    SCSS files!  I've amended lines 426 onwards to document the behaviour.

M	railties/guides/source/asset_pipeline.textile

commit 0e6b588	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-03-02 19:01:53 +0300

    don't pass unnecessary argument

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 66c6c7f	refs/tags/v3.1.6
Author: Carlos Antonio da Silva 
Date:   2012-03-02 10:54:16 -0300

    Stop SafeBuffer#clone_empty from issuing warnings
    
    Logic in clone_empty method was dealing with old @dirty variable, which
    has changed by @html_safe in this commit:
    https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1
    
    This was issuing a "not initialized variable" warning - related to:
    https://github.com/rails/rails/pull/5237
    
    The logic applied by this method is already handled by the [] override,
    so there is no need to reset the variable here.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 5fd3601	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-03-02 10:54:16 -0300

    Stop SafeBuffer#clone_empty from issuing warnings
    
    Logic in clone_empty method was dealing with old @dirty variable, which
    has changed by @html_safe in this commit:
    https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1
    
    This was issuing a "not initialized variable" warning - related to:
    https://github.com/rails/rails/pull/5237
    
    The logic applied by this method is already handled by the [] override,
    so there is no need to reset the variable here.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 1a046ab	refs/heads/master
Merge: aeeebe1 cd5daba
Author: José Valim 
Date:   2012-03-02 06:56:40 -0800

    Merge pull request #5242 from rails/opt_routes
    
    Optimize routes generation in simple cases.
    
    If you pass to the route helper the same amount of arguments
    as the required segments, route generation will be optimized
    as a string interpolation. After this commit, `post_path(post)`
    is about 6.5 times faster, `post_url(post)` is about 5 times.

commit 1a71e84	refs/tags/v3.2.5
Author: Piotr Sarnacki 
Date:   2012-03-02 12:46:24 -0200

    Fix #5238, rendered_format is not set when template is not rendered

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/controller/render_test.rb

commit aeeebe1	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-03-02 12:46:24 -0200

    Fix #5238, rendered_format is not set when template is not rendered

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/controller/render_test.rb

commit 974a9db	refs/heads/master
Merge: 9078dba 681d89f
Author: José Valim 
Date:   2012-03-02 06:45:27 -0800

    Merge pull request #5241 from carlosantoniodasilva/output-safety
    
    Stop SafeBuffer#clone_empty from issuing warnings

commit 681d89f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-03-02 10:54:16 -0300

    Stop SafeBuffer#clone_empty from issuing warnings
    
    Logic in clone_empty method was dealing with old @dirty variable, which
    has changed by @html_safe in this commit:
    https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1
    
    This was issuing a "not initialized variable" warning - related to:
    https://github.com/rails/rails/pull/5237
    
    The logic applied by this method is already handled by the [] override,
    so there is no need to reset the variable here.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit cd5daba	refs/remotes/origin/opt_routes (origin/opt_routes)
Author: Sergey Nartimov + José Valim 
Date:   2012-03-02 15:01:20 +0100

    Optimize url helpers.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/template/sprockets_helper_with_routes_test.rb

commit 9078dba	refs/heads/master
Merge: fcef728 81d3493
Author: Piotr Sarnacki 
Date:   2012-03-02 02:30:47 -0800

    Merge pull request #5234 from benpickles/allow-empty-fieldsets
    
    Allow empty fieldsets  to be created without a block.

commit 1adad44	refs/heads/master
Author: Anuj Dutta 
Date:   2012-03-02 07:22:16 +0000

    Removed max-stale from the setting the cache-headers in the response as max-stale is a cache request header.

M	actionpack/lib/action_controller/metal/conditional_get.rb

commit d7014bc	refs/remotes/origin/opt_routes
Author: José Valim 
Date:   2012-03-02 01:32:08 +0100

    Optimize path helpers.

M	actionpack/lib/action_controller/metal/url_for.rb
M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb

commit bbe7dac	refs/tags/v3.2.5
Author: Xavier Noria 
Date:   2012-03-01 16:15:00 -0800

    revert setting NOT NULL constraints in add_timestamps
    
    Commit 3dbedd2 added NOT NULL constraints both to table
    creation and modification. For creation the new default
    makes sense, but the generic situation for changing a
    table is that there exist records. Those records have
    no creation or modification timestamps, and in the
    general case you don't even know them, so when updating
    a table these constraints are not going to work. See
    a bug report for this use case in #3334.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit fcef728	refs/heads/master
Author: Xavier Noria 
Date:   2012-03-01 16:15:00 -0800

    revert setting NOT NULL constraints in add_timestamps
    
    Commit 3dbedd2 added NOT NULL constraints both to table
    creation and modification. For creation the new default
    makes sense, but the generic situation for changing a
    table is that there exist records. Those records have
    no creation or modification timestamps, and in the
    general case you don't even know them, so when updating
    a table these constraints are not going to work. See
    a bug report for this use case in #3334.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 92887ca	refs/heads/master
Author: Waseem Ahmad 
Date:   2012-03-02 01:28:30 +0530

    Add documentation for IndexDefinition.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit 81d3493	refs/heads/master
Author: Ben Pickles 
Date:   2012-03-01 19:07:28 +0000

    Allow fieldsets to be created without a block.

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 447d87c	refs/heads/master
Merge: 139963c 05c6caf
Author: Vijay Dev 
Date:   2012-03-01 11:47:31 -0800

    Merge pull request #5232 from claudiob/add_release_date_to_docs
    
    Add release dates to documentation

commit 05c6caf	refs/heads/master
Author: claudiob 
Date:   2012-03-01 11:20:03 -0800

    Add release dates to documentation
    
    Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12

M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 139963c	refs/heads/master
Merge: ceb66b6 8ccaa34
Author: Aaron Patterson 
Date:   2012-03-01 09:56:04 -0800

    Merge branch 'master-security'
    
    * master-security:
      Ensure [] respects the status of the buffer.
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
    
    Conflicts:
    	actionpack/lib/action_view/helpers/tags/base.rb

commit c289790	refs/tags/v3.2.5
Merge: 5bb5780 01b470f
Author: Aaron Patterson 
Date:   2012-03-01 09:51:51 -0800

    Merge branch '3-2-2' into 3-2-stable
    
    * 3-2-2:
      bumping to 3.2.2
      Ensure [] respects the status of the buffer.
      Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
      Merge pull request #5084 from johndouthat/patch-1
      updating RAILS_VERSION
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options

commit 11881ad	refs/tags/v3.1.6
Merge: 4c8679e 1aabea6
Author: Aaron Patterson 
Date:   2012-03-01 09:51:21 -0800

    Merge branch '3-1-4' into 3-1-stable
    
    * 3-1-4:
      bumping to 3.1.4
      Ensure [] respects the status of the buffer.
      updating RAILS_VERSION
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options

commit eeb715a	refs/tags/v3.0.14
Merge: c4f9264 9d6377e
Author: Aaron Patterson 
Date:   2012-03-01 09:50:37 -0800

    Merge branch '3-0-12' into 3-0-stable
    
    * 3-0-12:
      bumping to 3.0.12
      Ensure [] respects the status of the buffer.
      updating RAILS_VERSION
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options

commit 9d6377e	refs/tags/v3.0.12 (tag: v3.0.12)
Author: Aaron Patterson 
Date:   2012-03-01 09:22:25 -0800

    bumping to 3.0.12

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 9435f5a	refs/tags/v3.0.12
Merge: 2935435 917fd1a
Author: Aaron Patterson 
Date:   2012-03-01 09:21:05 -0800

    Merge branch '3-0-stable-security' into 3-0-12
    
    * 3-0-stable-security:
      Ensure [] respects the status of the buffer.
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options

commit 1aabea6	refs/tags/v3.1.4 (tag: v3.1.4)
Author: Aaron Patterson 
Date:   2012-03-01 09:20:24 -0800

    bumping to 3.1.4

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit d1fc35f	refs/tags/v3.1.4
Merge: 8c677e9 3d86727
Author: Aaron Patterson 
Date:   2012-03-01 09:17:48 -0800

    Merge branch '3-1-stable-security' into 3-1-4
    
    * 3-1-stable-security:
      Ensure [] respects the status of the buffer.
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options

commit 01b470f	refs/tags/v3.2.2 (tag: v3.2.2)
Author: Aaron Patterson 
Date:   2012-03-01 09:16:28 -0800

    bumping to 3.2.2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit c60c1c0	refs/tags/v3.2.2
Merge: ecff25c 55ac1b9
Author: Aaron Patterson 
Date:   2012-03-01 09:05:34 -0800

    Merge branch '3-2-stable-security' into 3-2-2
    
    * 3-2-stable-security:
      Ensure [] respects the status of the buffer.
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options

commit 4c8679e	refs/tags/v3.1.6
Merge: 0d7a507 63069ec
Author: José Valim 
Date:   2012-03-01 07:10:11 -0800

    Merge pull request #5227 from arunagw/build_fix_3-1-stable
    
    Build fix 3 1 stable

commit 63069ec	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-03-01 14:48:58 +0530

    call binmode on the tempfile for Ruby 1.8 compatibility

M	activesupport/lib/active_support/core_ext/file/atomic.rb

commit ceb66b6	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-02-29 18:43:49 -0700

    Tap, tap goes the middleware

M	actionpack/lib/action_dispatch/middleware/request_id.rb

commit 917fd1a	refs/tags/v3.0.12
Author: José Valim 
Date:   2012-02-29 22:30:51 +0100

    Ensure [] respects the status of the buffer.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 3d86727	refs/tags/v3.1.4
Author: José Valim 
Date:   2012-02-29 22:30:51 +0100

    Ensure [] respects the status of the buffer.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 55ac1b9	refs/tags/v3.2.2
Author: José Valim 
Date:   2012-02-29 22:30:51 +0100

    Ensure [] respects the status of the buffer.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 8ccaa34	refs/heads/master
Author: José Valim 
Date:   2012-02-29 22:30:51 +0100

    Ensure [] respects the status of the buffer.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit f9995ce	refs/heads/master
Merge: 1d21528 b27c29e
Author: Aaron Patterson 
Date:   2012-02-29 12:03:15 -0800

    Merge pull request #5203 from avakhov/anonymous-controller-layout
    
    Fix layout lookup for anonymous controller

commit 1d21528	refs/heads/master
Merge: 4244a09 d7bf930
Author: Aaron Patterson 
Date:   2012-02-29 11:57:02 -0800

    Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-constraint-for-testing
    
    Fix for #2781

commit 0d7a507	refs/tags/v3.1.6
Merge: 47c3cf1 42592b4
Author: Aaron Patterson 
Date:   2012-02-29 11:53:41 -0800

    Merge pull request #5207 from kennyj/fix_5173-31
    
    [3-1-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931

commit 5bb5780	refs/tags/v3.2.5
Merge: 72ae0b4 f1f2e8c
Author: Aaron Patterson 
Date:   2012-02-29 11:53:32 -0800

    Merge pull request #5206 from kennyj/fix_5173-32
    
    [3-2-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931

commit 4244a09	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-01 01:22:20 +0530

    fix api doc [ci skip]

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 3abf1f5	refs/heads/master
Author: Vijay Dev 
Date:   2012-03-01 00:14:45 +0530

    adds a nodoc [ci skip]
    
    We have an empty api doc page otherwise :)

M	actionpack/lib/action_controller/railtie.rb

commit f9b698f	refs/heads/master
Merge: 8cecb47 adf3cb5
Author: Jeremy Kemper 
Date:   2012-02-29 10:25:45 -0800

    Merge pull request #5221 from kennyj/fix_warning_20120301
    
    Fix warning: assigned but unused variable

commit adf3cb5	refs/heads/master
Author: kennyj 
Date:   2012-03-01 03:04:03 +0900

    Fix warning: assigned but unused variable

M	activerecord/test/cases/attribute_methods_test.rb

commit 46c1217	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-01 01:22:42 +0900

    Add entry for schema cache dump to CHANGELOG.md.

M	activerecord/CHANGELOG.md

commit 5cbba30	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-01 01:19:27 +0900

    Support judgement expired schema cache dump.

M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/lib/active_record/railtie.rb
M	railties/test/application/initializers/frameworks_test.rb

commit 0da12df	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-01 01:13:14 +0900

    Load db/schema_cache.dump duaring boot time.

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/lib/active_record/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/initializers/frameworks_test.rb

commit 0150a21	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-01 01:01:12 +0900

    Add db:schema:cache:dump and db:schema:cache:clear tasks.

M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake_test.rb

commit 5ca4fc9	refs/remotes/origin/async
Author: kennyj 
Date:   2012-03-01 00:52:04 +0900

    Add support schema cache dump and load.

M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/test/cases/connection_adapters/schema_cache_test.rb

commit 5f92bf1	refs/heads/master
Author: Joost Baaij 
Date:   2012-02-29 09:45:23 +0100

    Improve header hierarchy.

M	railties/guides/source/asset_pipeline.textile

commit c567718	refs/heads/master
Author: Joost Baaij 
Date:   2012-02-29 09:41:17 +0100

    Include a comment as to why ETag header should be removed from the response.

M	railties/guides/source/asset_pipeline.textile

commit cfc939b	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2012-02-29 08:20:59 +0530

    Changed asset_host config to more specific

M	railties/guides/source/action_view_overview.textile

commit 72fa9d6	refs/heads/master
Author: Mike Gunderloy 
Date:   2012-02-28 20:31:52 -0600

    Some cleanup on the upgrading guide

M	railties/guides/source/upgrading_ruby_on_rails.textile

commit 8cecb47	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-28 17:43:03 -0800

    reduced localhost check to two method calls

M	actionpack/lib/action_dispatch/http/request.rb

commit c512730	refs/heads/master
Merge: 7d29d7a 3fbc8f3
Author: Jeremy Kemper 
Date:   2012-02-28 17:15:21 -0800

    Merge pull request #5214 from bdurand/fix_session_cache_store_require
    
    remove unnecessary memcache require in ActionDispatch CacheStore

commit 3fbc8f3	refs/heads/master
Author: Brian Durand 
Date:   2012-02-28 18:14:47 -0600

    remove unnecessary memcache equire in ActionDispatch::Session::CacheStore

M	actionpack/lib/action_dispatch/middleware/session/cache_store.rb

commit 7d29d7a	refs/heads/master
Merge: f07a957 27da612
Author: Xavier Noria 
Date:   2012-02-28 14:33:19 -0800

    Merge pull request #5212 from MarkMT/master
    
    update_only documentation for accepts_nested_attributes_for

commit 27da612	refs/heads/master
Author: Mark 
Date:   2012-02-28 14:28:44 -0600

    Modified comments explaining what the update_only option does.

M	activerecord/lib/active_record/nested_attributes.rb

commit f07a957	refs/heads/master
Merge: 5bbd2d3 ef79b84
Author: Aaron Patterson 
Date:   2012-02-28 12:19:07 -0800

    Merge pull request #5208 from ysoslow/ef79b8400f064361b2dbe1ee89f42d2adc103a3c
    
    Inject in constantize

commit d44e2d7	refs/heads/master
Merge: f597122 b121b09
Author: Vijay Dev 
Date:   2012-02-28 10:58:50 -0800

    Merge pull request #85 from whilefalse/rails_32_engine_upgrade
    
    Added guide to updating engines built in previous versions of Rails

commit 5bbd2d3	refs/heads/master
Merge: 25aa4c7 ddb5d2f
Author: José Valim 
Date:   2012-02-28 10:09:40 -0800

    Merge pull request #5196 from lest/patch-3
    
    force datetime attributes to be changed, fix GH #3965

commit ef79b84	refs/heads/master
Author: homa 
Date:   2012-02-28 18:34:19 +0100

    Inflector/constantize - inject method lets us to avoid using another variable

M	activesupport/lib/active_support/inflector/methods.rb

commit 42592b4	refs/tags/v3.1.6
Author: kennyj 
Date:   2012-02-29 01:51:29 +0900

    Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/schema/mysql2_specific_schema.rb
M	activerecord/test/schema/mysql_specific_schema.rb

commit f1f2e8c	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-02-26 00:35:58 +0900

    Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/schema/mysql2_specific_schema.rb
M	activerecord/test/schema/mysql_specific_schema.rb

commit 25aa4c7	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-28 19:19:47 +0530

    minor edits [ci skip]

M	railties/guides/source/routing.textile

commit f597122	refs/heads/master
Merge: 699ba8a 547e695
Author: Vijay Dev 
Date:   2012-02-28 19:07:44 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 547e695	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-28 18:58:59 +0530

    move the strict validations to an appropriate section and some edits [ci skip]

M	railties/guides/source/active_record_validations_callbacks.textile

commit 1d802f1	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-28 18:58:30 +0530

    copy edits [ci skip]

M	railties/guides/source/layouts_and_rendering.textile

commit b27c29e	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-28 10:57:28 +0400

    Fix layout lookup for anonymous controller

M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/test/abstract/layouts_test.rb

commit 699ba8a	refs/heads/master
Merge: 43faccf d636662
Author: Xavier Noria 
Date:   2012-02-28 01:37:19 -0800

    Merge pull request #4284 from mattdbridges/time_calculation_aliases
    
    Added aliases for prev_year, prev_month, and prev_week in Time and Date calculations

commit 43faccf	refs/heads/master
Merge: d17e44e e87f1aa
Author: Xavier Noria 
Date:   2012-02-28 01:09:31 -0800

    Merge pull request #5199 from gabehollombe/master
    
    The language for describing how to configure ActionController::Base.asset_host could be clearer

commit d17e44e	refs/heads/master
Merge: acf7e86 cb400b0
Author: José Valim 
Date:   2012-02-27 22:50:24 -0800

    Merge pull request #5197 from lest/patch-4
    
    remove unnecessary code

commit e87f1aa	refs/heads/master
Author: Gabe Hollombe 
Date:   2012-02-28 08:41:38 +0700

    Change asset_host config language to be more helpful and accurate

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit acf7e86	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-27 16:48:34 -0800

    Revert "only mutate the scope object in the `bind` method"
    
    This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966.

M	activerecord/lib/active_record/associations/association_scope.rb

commit cb400b0	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-28 01:26:39 +0300

    remove unnecessary code
    
    it was added in 36129f21b86db4bd69e932e586129e246c2a5ca8
    but isn't useful anymore as corresponding tests pass without it

M	activerecord/lib/active_record/attribute_methods/dirty.rb

commit 593a09d	refs/heads/master
Author: Oliver Legg 
Date:   2012-02-27 22:15:01 +0000

    Add brief summary of strict validations added in 3.2.

M	railties/guides/source/active_record_validations_callbacks.textile

commit ddb5d2f	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-28 00:29:01 +0300

    force datetime attributes to be changed, fix GH #3965

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 03a6119	refs/heads/master
Author: Toby Matejovsky 
Date:   2012-02-27 16:25:25 -0500

    Correct NullStore cache store name in caching guide

M	railties/guides/source/caching_with_rails.textile

commit 72ae0b4	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-27 11:57:04 -0800

    call binmode on the tempfile for Ruby 1.8 compatibility

M	activesupport/lib/active_support/core_ext/file/atomic.rb

commit f42c963	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-27 11:57:04 -0800

    call binmode on the tempfile for Ruby 1.8 compatibility

M	activesupport/lib/active_support/core_ext/file/atomic.rb

commit 1b9e19c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-27 11:34:41 -0800

    only mutate the scope object in the `bind` method

M	activerecord/lib/active_record/associations/association_scope.rb

commit 4f82553	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-27 11:29:16 -0800

    bind value creation refactoring

M	activerecord/lib/active_record/associations/association_scope.rb

commit 2adf78d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-27 11:09:58 -0800

    removing dead code

M	activerecord/lib/active_record/associations/association_scope.rb

commit 4bc2ae0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-27 10:57:40 -0800

    use bind values for join columns

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb

commit 210c33f	refs/tags/v3.2.5
Merge: b543f8f 2b4e7a7
Author: Aaron Patterson 
Date:   2012-02-27 11:12:59 -0800

    Merge pull request #5190 from rafaelfranca/fix-393-3-2-stable
    
    [3-2-stable] Add a new line after the textarea opening tag.

commit a4e4d28	refs/heads/master
Merge: 699e460 a6074c3
Author: Aaron Patterson 
Date:   2012-02-27 11:06:21 -0800

    Merge pull request #5191 from rafaelfranca/fix-393
    
    Add a new line after the textarea opening tag.

commit 699e460	refs/heads/master
Merge: a19dd29 404b73b
Author: Aaron Patterson 
Date:   2012-02-27 10:27:08 -0800

    Merge pull request #5168 from kennyj/fix_5152
    
    [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152

commit a19dd29	refs/heads/master
Merge: 9ad7767 fe7cacb
Author: Aaron Patterson 
Date:   2012-02-27 10:21:18 -0800

    Merge pull request #5173 from kennyj/fix_3931-2
    
    Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again).

commit 47c3cf1	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-27 10:10:34 -0800

    Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
    
    Binary mode window bug

M	activesupport/lib/active_support/core_ext/file/atomic.rb

commit 9ad7767	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-27 10:10:34 -0800

    Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
    
    Binary mode window bug

M	activesupport/lib/active_support/core_ext/file/atomic.rb

commit b543f8f	refs/tags/v3.2.5
Merge: 663904f 06dc8ed
Author: Aaron Patterson 
Date:   2012-02-27 10:10:34 -0800

    Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
    
    Binary mode window bug

commit 2b4e7a7	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-02-27 09:54:06 -0300

    Add a new line after the textarea opening tag.
    
    Closes #393

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/active_model_helper_test.rb
M	actionpack/test/template/form_helper_test.rb

commit a6074c3	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-27 09:44:58 -0300

    Add a new line after the textarea opening tag.
    
    Closes #393

M	actionpack/lib/action_view/helpers/tags/text_area.rb
M	actionpack/test/template/active_model_helper_test.rb
M	actionpack/test/template/form_helper_test.rb

commit 4a631df	refs/heads/master
Merge: 551566d 20ca766
Author: José Valim 
Date:   2012-02-27 06:01:03 -0800

    Merge pull request #5192 from amatsuda/rdoc_task_19
    
    no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9

commit 20ca766	refs/heads/master
Author: Akira Matsuda 
Date:   2012-02-27 22:09:58 +0900

    ruby19: no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9

M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake

commit 551566d	refs/heads/master
Merge: 5c0aba2 2ff884c
Author: José Valim 
Date:   2012-02-26 22:31:54 -0800

    Merge pull request #5185 from rafaelfranca/fix-collection_helpers
    
    Fix collection helpers

commit b16eb56	refs/heads/master
Author: jlxw 
Date:   2012-02-27 13:51:02 +0800

    logger.silence is deprecated

M	activesupport/lib/active_support/benchmarkable.rb

commit f2f556d	refs/heads/master
Author: Florent Guilleux 
Date:   2012-02-26 19:07:16 -0500

    document how to create non show paths from an array of parameters

M	railties/guides/source/routing.textile

commit 2ff884c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-26 19:02:46 -0300

    Fix collection_check_boxes and collection_radio_buttons when using local
    variables in the form builder

M	actionpack/lib/action_view/helpers/tags/collection_helpers.rb
M	actionpack/test/template/form_helper_test.rb

commit 80680e9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-26 18:59:56 -0300

    Add documentation to object method of CollectionHelpers::Builder

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 5979ad3	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-26 18:47:08 -0300

    Move all the helpers to protected section

M	actionpack/test/template/form_helper_test.rb

commit 5c0aba2	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-26 12:51:13 -0800

    updates the new default pool size in some additional places

M	railties/guides/source/command_line.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/getting_started.textile

commit 9b2c38b	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-26 12:22:31 -0800

    let the connection pool of new applications have size 1 rather than 5
    
    The majority of Rails applications are multiprocess, people
    may wonder why rails new generates a default pool of 5, does
    my application need a connection pool of 5? By generating
    a default of 1 database.yml is much more clear, and with
    the comment people know what is the connection pool for,
    and they know it has to be bigger for multithread apps.

M	railties/guides/code/getting_started/config/database.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml

commit 663904f	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-02-15 18:20:56 -0200

    Revert "No need to pass options which is never used"
    
    Options is needed for some Rails extensions to determine when
    referential integrity should be disabled
    
    This reverts commit bcb466c543451dce69403aaae047295758589d8e.
    
    Fixes #5052

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 25ad2e9	refs/heads/master
Author: Tima Maslyuchenko 
Date:   2012-02-26 20:58:12 +0200

    reverted regular expression fix

M	railties/guides/source/routing.textile

commit d4b3593	refs/heads/master
Merge: a3a73c4 3689b57
Author: Tima Maslyuchenko 
Date:   2012-02-26 19:32:24 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 3689b57	refs/heads/master
Author: Rajinder Yadav 
Date:   2012-02-26 12:30:18 -0500

    layout affects views not methods

M	railties/guides/source/layouts_and_rendering.textile

commit a3a73c4	refs/heads/master
Author: Tima Maslyuchenko 
Date:   2012-02-26 19:27:57 +0200

    fixed regular expression in Specifying Constraints section

M	railties/guides/source/routing.textile

commit a37c474	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-02-26 18:11:49 +0530

    content_tag used instead string for option

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 74bc920	refs/heads/master
Author: Andrew White 
Date:   2012-02-26 00:33:15 +0000

    Adding tests for non-optional glob parameters

M	actionpack/test/controller/routing_test.rb

commit 5c18b99	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-02-26 00:13:55 +0000

    Detect optional glob params when adding non-greedy regexp - closes #4817.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/routing_test.rb

commit b8c4f2d	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-02-26 00:21:08 +0000

    Adding tests for non-optional glob parameters

M	actionpack/test/controller/routing_test.rb

commit 06dc8ed	refs/tags/v3.2.5
Author: Ralph Shnelvar 
Date:   2012-02-25 15:35:29 -0700

    Fixing Windows asset tag helper test failure
    
    In asset_tag_helper_test.rb there is an assert on the number of bytes in a
    concatenated file.  This test failed because Windows converts \n to \r\n as
    the default for "w".  This is different than in *nix systems where there is
    no conversion done.
    
    THe test that failed was test_caching_stylesheet_link_tag_when_caching_on
    
    Using bin mode fixes this behavior on windows and makes no change on the
    *nix systems.

M	activesupport/lib/active_support/core_ext/file/atomic.rb

commit 16e7f2f	refs/heads/master
Author: Wes Morgan 
Date:   2012-02-25 14:14:38 -0700

    fix inflector bug where -ice gets pluralized into -ouse
    
    This should happen for mouse or louse, but not slice or pumice.

M	activesupport/lib/active_support/inflections.rb
M	activesupport/test/inflector_test_cases.rb

commit cbe74cf	refs/heads/master
Merge: eecb086 2bc879a
Author: José Valim 
Date:   2012-02-25 10:23:05 -0800

    Merge pull request #5174 from nashby/safe-concat
    
    use content_tag instead of strings

commit 2bc879a	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-02-25 21:05:33 +0300

    use content_tag instead strings

M	actionpack/lib/action_view/helpers/tags/base.rb

commit eecb086	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-25 22:31:32 +0530

    A guide for upgrading Rails [ci skip]

M	railties/guides/source/documents.yaml
A	railties/guides/source/upgrading_ruby_on_rails.textile

commit c4f9264	refs/tags/v3.0.14
Author: Noah Hendrix 
Date:   2012-02-24 13:55:24 -0600

    Fixed typo in composed_of example with Money#<=>, was comparing amount itself instead of other_money.amount

M	activerecord/lib/active_record/aggregations.rb

commit b5418e7	refs/tags/v3.1.6
Author: Noah Hendrix 
Date:   2012-02-24 13:55:24 -0600

    Fixed typo in composed_of example with Money#<=>, was comparing amount itself instead of other_money.amount

M	activerecord/lib/active_record/aggregations.rb

commit e6fca55	refs/tags/v3.1.6
Author: Justin Woodbridge 
Date:   2012-02-23 17:31:56 -0500

    Fix typo in match :to docs

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit b229bc7	refs/tags/v3.2.5
Author: Justin Woodbridge 
Date:   2012-02-23 17:31:56 -0500

    Fix typo in match :to docs

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit e1f799a	refs/tags/v3.2.5
Author: Noah Hendrix 
Date:   2012-02-24 13:55:24 -0600

    Fixed typo in composed_of example with Money#<=>, was comparing amount itself instead of other_money.amount

M	activerecord/lib/active_record/aggregations.rb

commit 1e25d62	refs/heads/master
Merge: 29054ba 7940976
Author: Vijay Dev 
Date:   2012-02-25 21:52:59 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	actionmailer/CHANGELOG.md

commit 7940976	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-25 21:48:38 +0530

    copy-edits [ci skip]

M	railties/guides/source/configuring.textile

commit d693bd2	refs/tags/v3.1.6
Merge: 30a528a 6e49b3d
Author: Santiago Pastorino 
Date:   2012-02-25 07:51:31 -0800

    Merge pull request #5171 from arunagw/3-1-stable
    
    assert => assert_equal 3-1-stable

commit 0a1357b	refs/tags/v3.2.5
Merge: 8125304 a9b1397
Author: Santiago Pastorino 
Date:   2012-02-25 07:45:45 -0800

    Merge pull request #5170 from arunagw/3-2-stable
    
    assert => assert_equal

commit 6e49b3d	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-02-25 21:13:53 +0530

    assert => assert_equal

M	actionpack/test/controller/integration_test.rb

commit a9b1397	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-02-25 21:11:01 +0530

    assert => assert_equal

M	actionpack/test/controller/integration_test.rb

commit fe7cacb	refs/heads/master
Author: kennyj 
Date:   2012-02-26 00:35:58 +0900

    Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/schema/mysql2_specific_schema.rb
M	activerecord/test/schema/mysql_specific_schema.rb

commit 29054ba	refs/heads/master
Merge: 5196c07 50cf5f7
Author: José Valim 
Date:   2012-02-25 06:05:23 -0800

    Merge pull request #5117 from nashby/form-option-refactor
    
    FormOptionsHelper refactor

commit 404b73b	refs/heads/master
Author: kennyj 
Date:   2012-02-25 23:01:43 +0900

    Remove NULLS FIRST/LAST. closes #5152

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

commit 5196c07	refs/heads/master
Merge: 862e27f 152a393
Author: Xavier Noria 
Date:   2012-02-25 05:02:44 -0800

    Merge pull request #4023 from pacoguzman/update-changelogs
    
    Update changelogs with rails 3.0-stable branch info

commit 152a393	refs/heads/master
Author: Paco Guzman 
Date:   2011-12-18 22:42:36 +0100

    Update changelogs with rails 3.0-stable branch info

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 8125304	refs/tags/v3.2.5
Merge: 5661dab 0bfcd4f
Author: Xavier Noria 
Date:   2012-02-25 04:42:22 -0800

    Merge pull request #5166 from arunagw/3-2-stable
    
    3 2 stable

commit 0bfcd4f	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-02-25 17:58:19 +0530

    Checking headers in a better way. as doing here
    
    406ece4729e8fd81f156bcb3fce16e938522466e

M	actionpack/test/controller/integration_test.rb

commit 30a528a	refs/tags/v3.1.6
Merge: 967b300 406ece4
Author: Xavier Noria 
Date:   2012-02-25 04:26:53 -0800

    Merge pull request #5165 from arunagw/build_fix_ruby187-p358-3-1-stable
    
    Build fix ruby187 p358 3 1 stable

commit 406ece4	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-02-25 17:09:43 +0530

    fixed build for ruby187-p358

M	actionpack/test/controller/integration_test.rb
M	actionpack/test/template/html-scanner/tag_node_test.rb

commit 5661dab	refs/tags/v3.2.5
Merge: 6dbf6f3 99fa8e5
Author: Xavier Noria 
Date:   2012-02-25 03:43:38 -0800

    Merge pull request #5164 from arunagw/build_fix_ruby187-p358
    
    Build fix ruby187 p358

commit 99fa8e5	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-02-25 17:02:48 +0530

    Build fix for ruby187-p358

M	actionpack/test/controller/integration_test.rb

commit 862e27f	refs/heads/master
Merge: 97df6f3 fd5a298
Author: José Valim 
Date:   2012-02-25 03:26:25 -0800

    Merge pull request #5163 from kennyj/fix_5119
    
    Remove wrong and redundant code.

commit fd5a298	refs/heads/master
Author: kennyj 
Date:   2012-02-25 20:14:14 +0900

    Remove wrong and redundant code.

M	actionpack/test/dispatch/routing_test.rb

commit 97df6f3	refs/heads/master
Merge: 84cd58f d03076f
Author: José Valim 
Date:   2012-02-24 21:49:53 -0800

    Merge pull request #5161 from arunagw/put_patch_build_fix
    
    build fixed -- put and patch both are allowed for update

commit d03076f	refs/heads/master
Author: Arun Agrawal 
Date:   2012-02-25 09:37:58 +0530

    put and patch both are allowed for update

M	railties/test/application/configuration_test.rb

commit 84cd58f	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-24 17:17:06 -0800

    fixes a test: rake routes now includes PATCH for resources

M	railties/test/application/route_inspect_test.rb

commit 9ef701d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-24 16:55:11 -0800

    use regular ruby for fewer method calls. we do not need :gift:s!

M	activerecord/lib/active_record/relation/spawn_methods.rb

commit 3008188	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-24 16:35:48 -0800

    consistently mention first patch, then put
    
    There was a mix, sometimes patch first, sometimes put first.
    Use always patch first, since this is going to be the
    primary verb for updates.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	activeresource/lib/active_resource/custom_methods.rb
M	activeresource/lib/active_resource/http_mock.rb
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/routing.textile
M	railties/lib/rails/generators/active_model.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

commit b7a0945	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-24 16:25:41 -0800

    uses PATCH for the forms of persisted records, and routes PATCH and PUT to the update action of resources

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/railtie.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/railtie.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/template/form_helper_test.rb
M	railties/CHANGELOG.md
M	railties/guides/source/configuring.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/routing.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/application/configuration_test.rb
M	railties/test/generators/app_generator_test.rb

commit 31ceb5e	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-24 15:06:17 -0800

    decouples the implementation of the inflector from its test suite
    
    Trying alternative implementations of the inflections
    is hard because the suite is coupled with the current
    one, setting ivars by hand etc. This commit relies on
    initialize_dup, as long as you maintain that one you
    can tweak the implementation.

M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/test/inflector_test.rb

commit 004326e	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-24 20:59:14 +0100

    removes the reconnect key from the database.yml generated for MySQL
    
    The reconnect flag does not play nicely with transactions and so
    it is of little use in Rails applications. Thus, albeit supported
    by mysql2, it does not deserve such a prominent place in the
    generated database.yml, which should be a representative config
    example. Note that the flag is false by default.
    
    Advanced users know from mysql2 docs that the flag is available.

M	railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml

commit 0519567	refs/heads/master
Author: Noah Hendrix 
Date:   2012-02-24 13:55:24 -0600

    Fixed typo in composed_of example with Money#<=>, was comparing amount itself instead of other_money.amount

M	activerecord/lib/active_record/aggregations.rb

commit 5d70791	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-24 18:49:26 +0100

    explains why reconnect is false by default in the database.yml generated for MySQL

M	railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml

commit 9d1f1b1	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-24 09:05:47 -0800

    removes verify_active_connections!
    
    The method verify_active_connections! was used in
    the old days (up to 2.1 I think) by the dispatcher
    to verify the connections, but nowadays we do that
    in a different way and this method is obsolete.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_handling.rb

commit e04fa0e	refs/heads/master
Merge: 335fac5 f0a5d32
Author: Aaron Patterson 
Date:   2012-02-24 08:42:52 -0800

    Merge pull request #5144 from nashby/input-name-nil
    
    correct fetching :name option in form fields

commit d7bf930	refs/heads/master
Author: Matt Fawcett 
Date:   2012-02-24 13:16:31 +0000

    Fix the assert_recognizes test method so that it works when there are
    constraints on the querystring. Issue #2781

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
M	actionpack/test/dispatch/routing_assertions_test.rb

commit b121b09	refs/heads/master
Author: Steven Anderson 
Date:   2012-02-24 10:50:48 +0000

    Added guide to updating engines built in previous versions of Rails

M	railties/guides/source/3_2_release_notes.textile

commit 62b1f1a	refs/heads/master
Author: Justin Woodbridge 
Date:   2012-02-23 17:31:56 -0500

    Fix typo in match :to docs

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 335fac5	refs/heads/master
Merge: af988ef 6c384a6
Author: Vijay Dev 
Date:   2012-02-23 11:59:27 -0800

    Merge pull request #5143 from mguterl/update_running_unit_tests_doc
    
    Update with new task names for building mysql and postgresql databases

commit f0a5d32	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-02-23 22:04:09 +0300

    correct fetching :name option in form fields

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_helper_test.rb

commit ecff25c	refs/tags/v3.2.2
Author: Aaron Patterson 
Date:   2012-02-13 11:01:02 -0800

    Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
    
    Fix usage of psql in db:test:prepare

M	activerecord/lib/active_record/railties/databases.rake

commit 6dbf6f3	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-13 11:01:02 -0800

    Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
    
    Fix usage of psql in db:test:prepare

M	activerecord/lib/active_record/railties/databases.rake

commit 6c384a6	refs/heads/master
Author: Michael Guterl 
Date:   2012-02-23 09:49:48 -0500

    Update with new task names for building mysql and postgresql databases

M	activerecord/RUNNING_UNIT_TESTS

commit af988ef	refs/heads/master
Merge: 5093915 846a9bc
Author: José Valim 
Date:   2012-02-23 05:47:16 -0800

    Merge pull request #5139 from mhfs/remove_next_migration_number
    
    Remove unused implementation of next_migration_number

commit 5093915	refs/heads/master
Author: Andrew White 
Date:   2012-02-23 13:34:44 +0000

    Document the :host option for force_ssl

M	actionpack/lib/action_controller/metal/force_ssl.rb

commit 68a977e	refs/heads/master
Merge: c04a084 fb9a919
Author: Santiago Pastorino 
Date:   2012-02-23 05:30:33 -0800

    Merge pull request #5140 from fbuenemann/fix/autoflush-wrong-template
    
    Move config.autoflush_log to correct template

commit c04a084	refs/heads/master
Author: Andrew White 
Date:   2012-02-23 12:57:36 +0000

    Update documentation for force_ssl - closes #5023.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/force_ssl.rb

commit ab83890	refs/heads/master
Author: Pat Allan 
Date:   2012-02-13 21:37:07 +1300

    SSL should not be disabled by default in any environment.

M	actionpack/lib/action_controller/metal/force_ssl.rb
M	actionpack/test/controller/force_ssl_test.rb

commit fb9a919	refs/heads/master
Author: Felix Bünemann 
Date:   2012-02-23 13:39:27 +0100

    Use consistent whitespace for commented options.

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 7549a78	refs/heads/master
Author: Felix Bünemann 
Date:   2012-02-23 13:32:57 +0100

    Move config.autoflush_log to correct template.
    
    This accidentally ended up in the development template
    instead of the production template, where it makes
    most sense.

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 846a9bc	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-02-23 09:55:44 -0200

    Remove unused implementation of next_migration_number

M	activerecord/lib/rails/generators/active_record.rb
D	activerecord/lib/rails/generators/active_record/migration.rb

commit 419040f	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-23 12:49:18 +0100

    Avoid inspecting the whole route set, closes #1525

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit ed988ee	refs/heads/master
Author: José Valim 
Date:   2012-02-23 12:49:18 +0100

    Avoid inspecting the whole route set, closes #1525

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 06d2d4c	refs/heads/master
Merge: 541dbf4 2b1c853
Author: José Valim 
Date:   2012-02-23 00:38:06 -0800

    Merge pull request #5138 from avakhov/remove-unused-global-var
    
    Remove unused global variable in controller filters test

commit 541dbf4	refs/heads/master
Merge: 3f8dc55 9e1b2d8
Author: José Valim 
Date:   2012-02-23 00:36:26 -0800

    Merge pull request #5137 from avakhov/remove-skip-filter-block-param
    
    Remove skip_filter block param

commit 2b1c853	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-23 11:36:20 +0400

    Remove unused global variable in controller filters test

M	actionpack/test/controller/filters_test.rb

commit 9e1b2d8	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-23 11:25:31 +0400

    Remove skip_filter block param

M	actionpack/lib/abstract_controller/callbacks.rb

commit f75f5d2	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-23 10:52:19 +0400

    Cosmetic fixes in AM changelog

M	actionmailer/CHANGELOG.md

commit c5c3274	refs/tags/v3.2.5
Merge: fadad9f 64fa7f7
Author: Aaron Patterson 
Date:   2012-02-22 15:59:23 -0800

    Merge pull request #5087 from pwnall/no_view_logger
    
    Remove reference to config.action_view.logger from Rails configuration guide

commit 93f1667	refs/tags/v3.2.2
Author: Aaron Patterson 
Date:   2012-02-22 15:57:15 -0800

    Merge pull request #5084 from johndouthat/patch-1
    
    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit fadad9f	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-22 15:57:15 -0800

    Merge pull request #5084 from johndouthat/patch-1
    
    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 3f8dc55	refs/heads/master
Merge: abf3f67 4250cca
Author: Aaron Patterson 
Date:   2012-02-22 15:57:15 -0800

    Merge pull request #5084 from johndouthat/patch-1
    
    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...

commit abf3f67	refs/heads/master
Merge: 5497432 4a98a30
Author: Aaron Patterson 
Date:   2012-02-22 15:56:43 -0800

    Merge pull request #4998 from fbuenemann/feature/configurable-log-flushing
    
    Make automatic log flushing configurable

commit 4a98a30	refs/heads/master
Author: Felix Bünemann 
Date:   2012-02-23 00:38:34 +0100

    Always default to flushing enabled

M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit 681a574	refs/heads/master
Author: Felix Bünemann 
Date:   2012-02-10 22:53:14 +0100

    Advertise autoflush option in production template

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit 0f3d426	refs/heads/master
Author: Felix Bünemann 
Date:   2012-02-10 21:59:58 +0100

    Make log autoflushing configurable

M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/application/configuration.rb

commit 2935435	refs/tags/v3.0.12.rc1 (tag: v3.0.12.rc1)
Author: Aaron Patterson 
Date:   2012-02-22 13:31:26 -0800

    updating RAILS_VERSION

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 7ee7f14	refs/heads/master
Author: Dimitar Dimitrov 
Date:   2012-02-22 22:25:44 +0200

    Revert "Remove meaningless code from the examples" of AutosaveAssociation
    
    Reverts a part of 91148936f770dc8bbbb33d46a09528f1a32d8a71. Should probably be squashed with it when merging back in rails/rails.

M	activerecord/lib/active_record/autosave_association.rb

commit 67b6847	refs/tags/v3.0.14
Merge: c67ff97e 66a4beb
Author: Jon Leighton 
Date:   2012-02-22 20:20:29 +0000

    Merge commit 'v3.0.11' into 3-0-stable

commit 9114893	refs/heads/master
Author: Dimitar Dimitrov 
Date:   2012-02-22 22:19:42 +0200

    Minor fixes to ActiveRecord::AutosaveAssociation's docs
    
    * Fix typos
    * Remove meaningless code from the examples

M	activerecord/lib/active_record/autosave_association.rb

commit 5497432	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-22 21:09:35 +0100

    updates CHANGELOGs to register changes in 002713c

M	actionpack/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	railties/CHANGELOG.md

commit 8c677e9	refs/tags/v3.1.4.rc1 (tag: v3.1.4.rc1)
Author: Aaron Patterson 
Date:   2012-02-22 12:06:09 -0800

    updating RAILS_VERSION

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 4bcd437	refs/tags/v3.2.2.rc1 (tag: v3.2.2.rc1)
Author: Aaron Patterson 
Date:   2012-02-22 12:03:13 -0800

    updating RAILS_VERSION

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 967b300	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-22 11:43:12 -0800

    fixing bad merge: adding bind substitution visitor

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit a328f2f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-22 10:59:47 -0800

    add some tests, yay!

A	actionpack/test/routing/helper_test.rb

commit 36d9fd73	refs/heads/master
Merge: cdc1885 60585d2
Author: Aaron Patterson 
Date:   2012-02-22 10:56:17 -0800

    Merge pull request #5133 from rafaelfranca/fix-build
    
    Only set ActionView configuration inside the on_load block

commit 60585d2	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-22 16:54:26 -0200

    Only set ActionView configuration inside the on_load block

M	actionpack/lib/action_view/railtie.rb

commit f290d6f	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-21 15:08:54 -0800

    prepared statements can be disabled

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/finder_methods.rb

commit cdc1885	refs/heads/master
Merge: ef5670e a870d06
Author: Aaron Patterson 
Date:   2012-02-22 10:05:40 -0800

    Merge pull request #5132 from rafaelfranca/fix-build
    
    Fix routes inspection order

commit a870d06	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-22 16:03:24 -0200

    Fix routes inspection order

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit ef5670e	refs/heads/master
Merge: 7f2548e f5e69fc
Author: Aaron Patterson 
Date:   2012-02-22 09:55:26 -0800

    Merge pull request #5119 from kennyj/fix_5114
    
    Testcase for GH #5114.

commit 7f2548e	refs/heads/master
Merge: f28d9f1 002713c
Author: Xavier Noria 
Date:   2012-02-22 09:00:53 -0800

    Merge pull request #5130 from dlee/revised_patch_verb
    
    Add config.default_method_for_update to support PATCH

commit 002713c	refs/heads/master
Author: David Lee 
Date:   2011-05-06 14:03:55 -0700

    Add config.default_method_for_update to support PATCH
    
    PATCH is the correct HTML verb to map to the #update action. The
    semantics for PATCH allows for partial updates, whereas PUT requires a
    complete replacement.
    
    Changes:
    * adds config.default_method_for_update you can set to :patch
    * optionally use PATCH instead of PUT in resource routes and forms
    * adds the #patch verb to routes to detect PATCH requests
    * adds #patch? to Request
    * changes documentation and comments to indicate support for PATCH
    
    This change maintains complete backwards compatibility by keeping :put
    as the default for config.default_method_for_update.

M	Gemfile
M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	actionpack/lib/action_dispatch/routing.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/lib/action_view/railtie.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/controller/integration_test.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/dispatch/request_test.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	activemodel/lib/active_model/lint.rb
M	activeresource/lib/active_resource/connection.rb
M	activeresource/lib/active_resource/custom_methods.rb
M	activeresource/lib/active_resource/http_mock.rb
M	activeresource/test/cases/format_test.rb
M	activeresource/test/cases/http_mock_test.rb
M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/routing.textile
M	railties/guides/source/testing.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/active_model.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/test/application/configuration_test.rb
M	railties/test/generators/app_generator_test.rb

commit f28d9f1	refs/heads/master
Merge: 157ea76 10bac29
Author: José Valim 
Date:   2012-02-22 07:55:54 -0800

    Merge pull request #5128 from bogdan/deprecate_rescuable
    
    AS::Callbacks: deprecate rescuable option

commit 10bac29	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-22 17:43:13 +0200

    AS::Callbacks: deprecate rescuable option

M	actionpack/lib/action_dispatch/middleware/callbacks.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callbacks_test.rb

commit 82d6ded	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-22 12:30:35 -0200

    Fix CHANGELOG

M	actionpack/CHANGELOG.md

commit 110b43c	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-22 12:25:38 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit 19433ce	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-21 23:55:56 -0200

    format lookup for partials is derived from the format in which the template is being rendered
    
    Closes #5025 part 2

M	actionmailer/lib/action_mailer/collector.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/rendering.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
A	actionpack/test/fixtures/test/one.html.erb
M	actionpack/test/template/lookup_context_test.rb
M	actionpack/test/template/render_test.rb

commit 157ea76	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-02-21 23:55:56 -0200

    format lookup for partials is derived from the format in which the template is being rendered
    
    Closes #5025 part 2

M	actionmailer/lib/action_mailer/collector.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/rendering.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
A	actionpack/test/fixtures/test/one.html.erb
M	actionpack/test/template/lookup_context_test.rb
M	actionpack/test/template/render_test.rb

commit b52c66f	refs/heads/master
Author: Winston 
Date:   2012-02-22 19:19:05 +0800

    #read_entry in ActiveSupport::Cache::FileStore should log details of the exception when an exception is thrown.

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit a95f730	refs/heads/master
Merge: 66b7eb1 5742f12
Author: José Valim 
Date:   2012-02-22 01:27:20 -0800

    Merge pull request #5124 from bquorning/prefer-||-over-'or'-for-boolean-operations
    
    Prefer || over 'or' for boolean operations

commit 5742f12	refs/heads/master
Author: Benjamin Quorning 
Date:   2012-02-22 10:13:27 +0100

    Prefer || over 'or' for boolean operations

M	activemodel/lib/active_model/validations/length.rb

commit 66b7eb1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-21 16:13:56 -0800

    bumping up arel

M	activerecord/activerecord.gemspec

commit fd39847	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-21 15:08:54 -0800

    prepared statements can be disabled

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/finder_methods.rb

commit 35626fe	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-21 16:13:56 -0800

    bumping up arel

M	activerecord/activerecord.gemspec

commit 995d792	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-21 16:13:30 -0800

    bumping up arel

M	activerecord/activerecord.gemspec

commit 83e42d5	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-21 15:08:54 -0800

    prepared statements can be disabled

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/finder_methods.rb

commit 79f0a9b	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-20 18:16:56 -0800

    tag bind params with a bind param object

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit a566ee5	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-20 18:16:56 -0800

    tag bind params with a bind param object

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 349d5a6	refs/heads/master
Merge: 19c7124 cd641fa
Author: Santiago Pastorino 
Date:   2012-02-21 15:23:07 -0800

    Merge pull request #5118 from castlerock/ordered_options_from_hash
    
    ordered_options will work if inherited from Hash, remove OrderedHash usage

commit d636662	refs/heads/master
Author: Matt Bridges 
Date:   2012-01-03 19:53:13 -0600

    Adding :last_week, :last_month, and :last_year aliases to Time and Date
    core extensions

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 36c8521	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-21 11:38:36 -0800

    more ruby 2.0 respond_to? changes

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit c73f883	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-21 11:37:00 -0800

    more ruby 2.0 respond_to? changes

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

commit 19c7124	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-21 11:37:00 -0800

    more ruby 2.0 respond_to? changes

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

commit 5d0c181	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-21 10:29:44 -0800

    ruby 2.0 makes protected methods return false for respond_to, so pass true as the second param

M	activemodel/lib/active_model/attribute_methods.rb

commit 0052d90	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-21 10:29:44 -0800

    ruby 2.0 makes protected methods return false for respond_to, so pass true as the second param

M	activemodel/lib/active_model/attribute_methods.rb

commit 0032772	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-21 10:29:44 -0800

    ruby 2.0 makes protected methods return false for respond_to, so pass true as the second param

M	activemodel/lib/active_model/attribute_methods.rb

commit cc848d6	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-02-21 23:46:53 +0530

    fix bad docs from f373f296 [ci skip]

M	actionpack/lib/action_view/lookup_context.rb

commit a295544	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-21 23:46:53 +0530

    fix bad docs from f373f296 [ci skip]

M	actionpack/lib/action_view/lookup_context.rb

commit f92c812	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-21 15:57:24 -0200

    Don't wrap the raise with ensure

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit d37a7e6	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-02-21 15:57:24 -0200

    Don't wrap the raise with ensure

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit f468d6e	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-20 08:54:18 -0800

    Merge pull request #5096 from lawso017/master
    
    Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
    	activerecord/test/cases/adapters/postgresql/schema_test.rb

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit cd641fa	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-02-21 23:08:36 +0530

    ordered_options will work if inherited from Hash, remove OrderedHash usage

M	activesupport/lib/active_support/ordered_options.rb

commit 50cf5f7	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-02-21 20:32:20 +0300

    refactor option_text_and_value and option_value_selected? methods

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit f5e69fc	refs/heads/master
Author: kennyj 
Date:   2012-02-22 02:24:22 +0900

    Testcase for GH #5114.

M	actionpack/test/dispatch/routing_test.rb

commit d70ed10	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-20 08:54:18 -0800

    Merge pull request #5096 from lawso017/master
    
    Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 12e2405	refs/heads/master
Merge: fd74cd7 0b1ce07
Author: Aaron Patterson 
Date:   2012-02-21 09:14:19 -0800

    Merge pull request #5108 from mirakui/patch-1
    
    Bug: cache_key.size doesn't return length of filename but size of file

commit fd74cd7	refs/heads/master
Merge: 92a7296 c0ec40c
Author: Aaron Patterson 
Date:   2012-02-21 09:06:40 -0800

    Merge pull request #5116 from rubenfonseca/delete_with_block_refactor
    
    Refactored two methods to use delete with a block

commit c0ec40c	refs/heads/master
Author: Ruben Fonseca 
Date:   2012-02-21 17:03:42 +0000

    Refactored two methods to use delete with a block

M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 4eff6bc	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-21 14:55:34 -0200

    Restore lookup formats to the previous value after searching for the failing view

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/render_test.rb

commit 92a7296	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-02-21 14:55:34 -0200

    Restore lookup formats to the previous value after searching for the failing view

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/render_test.rb

commit 9dd64f2	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-02-21 19:46:49 +0300

    refactor time_zone_options_for_select
    
    BTW, select works quite faster then find_all:
    require 'benchmark'
    
    n = [1]*100_000_000
    Benchmark.bm do |x|
      x.report { n.select { |a| a > 1 } }
      x.report { n.find_all { |a| a > 1 } }
    end
    
        user     system      total        real
    7.590000   0.010000   7.600000 (  7.927171)
    9.650000   0.010000   9.660000 (  9.634406)

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit b122968	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-21 13:23:47 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit 67a5157	refs/heads/master
Merge: e7c6cd3 f0baa1c
Author: Santiago Pastorino 
Date:   2012-02-21 03:44:06 -0800

    Merge pull request #5112 from nupurjain/activesupport_cache_refactor
    
    suggested changes.

commit f0baa1c	refs/heads/master
Author: Nupur Jain 
Date:   2012-02-21 16:50:35 +0530

    suggested changes.

M	activesupport/lib/active_support/cache.rb

commit c426591	refs/tags/v3.2.5
Merge: b80d8f7 39d4617
Author: Santiago Pastorino 
Date:   2012-02-21 03:17:41 -0800

    Merge pull request #5106 from kennyj/fix_warnings_20120210
    
    [3-2-stable] Fix some warnings

commit 0b1ce07	refs/heads/master
Author: Issei Naruta 
Date:   2012-02-21 18:35:31 +0900

    Bug: cache_path.size doesn't return length of filename but size of file if cache_path is Pathname.

M	activesupport/lib/active_support/cache/file_store.rb

commit b2bfb07	refs/heads/master
Merge: eb26af6 28860d8
Author: pawel2105 
Date:   2012-02-21 01:13:47 -0800

    Merge pull request #84 from pawel2105/master
    
    Database pooling configuration

commit 28860d8	refs/heads/master
Author: Cynical Grinch 
Date:   2012-02-21 11:11:09 +0200

    Added database pooling sub-section to the 'configuring' guide

M	railties/guides/source/configuring.textile

commit e7c6cd3	refs/heads/master
Merge: c5bf538 0360a38
Author: Jon Leighton 
Date:   2012-02-21 00:38:21 -0800

    Merge pull request #5107 from rubenfonseca/stylesheet_link_tag_refactor
    
    use Hash#delete on styelsheet_link_tag

commit 0360a38	refs/heads/master
Author: Ruben Fonseca 
Date:   2012-02-21 08:22:05 +0000

    use Hash#delete on styelsheet_link_tag

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit c5bf538	refs/heads/master
Merge: f48a33b a93cbbd
Author: Jeremy Kemper 
Date:   2012-02-20 21:15:11 -0800

    Merge pull request #5033 from markmcspadden/inherited_headers
    
    Allow ActiveResource subclasses to inherit headers from parent

commit 39d4617	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-02-10 20:55:10 +0900

    Fix some warnings on 3-2-stable

M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/content_type_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/template/record_tag_helper_test.rb
M	activerecord/lib/active_record/counter_cache.rb
M	activesupport/test/core_ext/range_ext_test.rb

commit f48a33b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-20 18:16:56 -0800

    tag bind params with a bind param object

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 6adc417	refs/tags/v3.0.12
Author: Akira Matsuda 
Date:   2012-02-13 17:57:05 +0900

    use AS::SafeBuffer#clone_empty for flushing the output_buffer

M	actionpack/lib/action_view/helpers/capture_helper.rb

commit e50ee96	refs/tags/v3.0.12
Author: Akira Matsuda 
Date:   2012-02-13 17:54:58 +0900

    add AS::SafeBuffer#clone_empty

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 2d4cdb0	refs/tags/v3.1.4
Author: Akira Matsuda 
Date:   2012-02-13 17:57:05 +0900

    use AS::SafeBuffer#clone_empty for flushing the output_buffer

M	actionpack/lib/action_view/helpers/capture_helper.rb

commit baf6903	refs/tags/v3.1.4
Author: Akira Matsuda 
Date:   2012-02-13 17:54:58 +0900

    add AS::SafeBuffer#clone_empty

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit dfa33fa	refs/tags/v3.2.2
Author: Akira Matsuda 
Date:   2012-02-13 17:58:01 +0900

    delete vulnerable AS::SafeBuffer#[]

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 42fabd2	refs/tags/v3.2.2
Author: Akira Matsuda 
Date:   2012-02-13 17:57:05 +0900

    use AS::SafeBuffer#clone_empty for flushing the output_buffer

M	actionpack/lib/action_view/helpers/capture_helper.rb

commit 621d219	refs/tags/v3.2.2
Author: Akira Matsuda 
Date:   2012-02-13 17:54:58 +0900

    add AS::SafeBuffer#clone_empty

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 71d8c77	refs/heads/master
Author: Akira Matsuda 
Date:   2012-02-13 17:58:01 +0900

    delete vulnerable AS::SafeBuffer#[]

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit dcf0964	refs/heads/master
Author: Akira Matsuda 
Date:   2012-02-13 17:57:05 +0900

    use AS::SafeBuffer#clone_empty for flushing the output_buffer

M	actionpack/lib/action_view/helpers/capture_helper.rb

commit 71b95bd	refs/heads/master
Author: Akira Matsuda 
Date:   2012-02-13 17:54:58 +0900

    add AS::SafeBuffer#clone_empty

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 5b4082f	refs/tags/v3.0.12
Author: Sergey Nartimov 
Date:   2012-02-20 15:41:17 -0800

    fix output safety issue with select options

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 1be2bbe	refs/tags/v3.1.4
Author: Sergey Nartimov 
Date:   2012-02-20 15:41:17 -0800

    fix output safety issue with select options

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 7b73913	refs/tags/v3.2.2
Author: Sergey Nartimov 
Date:   2012-02-20 15:41:17 -0800

    fix output safety issue with select options

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 08b029c	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-20 15:19:28 -0800

    fix output safety issue with select options

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 563df87	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-20 14:47:56 -0800

    use Hash#delete with a default block

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 4b45fcf	refs/heads/master
Merge: 4e3c215 decff3f
Author: José Valim 
Date:   2012-02-20 12:19:42 -0800

    Merge pull request #5102 from nashby/form-option-refactor
    
    form option refactor

commit decff3f	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-02-20 22:55:46 +0300

    refactor options_for_select

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 421025f	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-02-20 22:51:05 +0300

    refactor grouped_options_for_select

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit b80d8f7	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-20 18:10:07 -0200

    Fix a failing test

M	actionpack/test/template/template_test.rb

commit 4e3c215	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-02-20 18:10:07 -0200

    Fix a failing test

M	actionpack/test/template/template_test.rb

commit 8b86259	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-20 16:48:43 -0200

    Use the right format when a partial is missing.
    
    Closes #5025

M	actionpack/lib/action_view/template.rb
A	actionpack/test/fixtures/with_format.json.erb
M	actionpack/test/template/render_test.rb

commit 70fd692	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-02-20 16:48:43 -0200

    Use the right format when a partial is missing.
    
    Closes #5025

M	actionpack/lib/action_view/template.rb
A	actionpack/test/fixtures/with_format.json.erb
M	actionpack/test/template/render_test.rb

commit 5e3b54d	refs/heads/master
Author: José Valim 
Date:   2012-02-20 11:48:14 -0800

    Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset
    
    Reset memoized hash keys when new ActionView::Template handler is registered
    Conflicts:
    
    	actionpack/lib/action_view/template/handlers.rb

M	actionpack/lib/action_view/template/handlers.rb
M	actionpack/test/template/render_test.rb

commit 8c870f1	refs/tags/v3.2.5
Merge: 3b824d6 68d3a46
Author: José Valim 
Date:   2012-02-20 11:48:14 -0800

    Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset
    
    Reset memoized hash keys when new ActionView::Template handler is registered

commit 68d3a46	refs/tags/v3.2.5
Author: Chris Kelly 
Date:   2012-02-20 14:35:30 -0500

    Reset memoized hash keys when new entry added

M	actionpack/lib/action_view/template/handlers.rb
M	actionpack/test/template/render_test.rb

commit da7d0a2	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-02-20 11:02:47 -0800

    search private / protected methods in trunk ruby

M	actionpack/lib/action_controller/metal/responder.rb

commit 3b824d6	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-20 11:02:47 -0800

    search private / protected methods in trunk ruby

M	actionpack/lib/action_controller/metal/responder.rb

commit 07dc909	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-20 11:02:47 -0800

    search private / protected methods in trunk ruby

M	actionpack/lib/action_controller/metal/responder.rb

commit 0c0f278	refs/tags/v3.2.5
Author: Sokolov Yura 
Date:   2012-02-14 15:05:45 +0400

    sync __run_callbacks with ruby-trunk
    
    https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
    In this revision behavior of respond_to? had changed: now to ask about
    protected method one should pass second argument `true`

M	activesupport/lib/active_support/callbacks.rb

commit eff507f	refs/heads/master
Merge: 977183a 185c3db
Author: Aaron Patterson 
Date:   2012-02-20 09:05:56 -0800

    Merge pull request #5082 from willbryant/assigns_should_not_stringify_values_master
    
    assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash

commit 977183a	refs/heads/master
Merge: b62f5a9 1649a86
Author: Aaron Patterson 
Date:   2012-02-20 08:54:18 -0800

    Merge pull request #5096 from lawso017/master
    
    Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys

commit b62f5a9	refs/heads/master
Merge: e1c3816 ac2e801
Author: José Valim 
Date:   2012-02-20 04:20:59 -0800

    Merge pull request #5083 from nashby/grouped-select-options
    
    add selected and disabled options to grouped select

commit 1649a86	refs/heads/master
Author: William Lawson 
Date:   2012-02-20 07:14:51 -0500

    removed commented line. 3434 tests, 10531 assertions, 0 failures, 0 errors, 31 skips

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 977f4bd	refs/heads/master
Author: William Lawson 
Date:   2012-02-20 07:10:46 -0500

    Restored ability to identify ID and Sequence from tables relying on a nonmatching sequence default value for PK.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit e1c3816	refs/heads/master
Merge: 1ef12fd 534dc4c
Author: José Valim 
Date:   2012-02-20 01:25:28 -0800

    Merge pull request #5075 from bogdan/json_full_messages
    
    AM::Errors: allow :full_messages parameter for #to_json

commit 534dc4c	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-17 12:12:10 +0200

    AM::Errors: allow :full_messages parameter for #as_json

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit a786236	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-02-20 04:46:45 +0000

    Remove fixture files with Windows incompatible filenames
    
    Windows doesn't allow `\ / : * ? " < > |` in filenames so create
    the fixture files at runtime and ignore the incompatible ones when
    running on Windows.

M	actionpack/test/dispatch/static_test.rb
D	actionpack/test/fixtures/public/foo/foo!bar.html
D	actionpack/test/fixtures/public/foo/foo$bar.html
D	actionpack/test/fixtures/public/foo/foo&bar.html
D	actionpack/test/fixtures/public/foo/foo'bar.html
D	actionpack/test/fixtures/public/foo/foo(bar).html
D	actionpack/test/fixtures/public/foo/foo*bar.html
D	actionpack/test/fixtures/public/foo/foo+bar.html
D	actionpack/test/fixtures/public/foo/foo,bar.html
D	actionpack/test/fixtures/public/foo/foo:bar.html
D	actionpack/test/fixtures/public/foo/foo;bar.html
D	actionpack/test/fixtures/public/foo/foo=bar.html
D	actionpack/test/fixtures/public/foo/foo@bar.html

commit 41c182c	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-02-20 04:46:45 +0000

    Remove fixture files with Windows incompatible filenames
    
    Windows doesn't allow `\ / : * ? " < > |` in filenames so create
    the fixture files at runtime and ignore the incompatible ones when
    running on Windows.

M	actionpack/test/dispatch/static_test.rb
D	actionpack/test/fixtures/public/foo/foo!bar.html
D	actionpack/test/fixtures/public/foo/foo$bar.html
D	actionpack/test/fixtures/public/foo/foo&bar.html
D	actionpack/test/fixtures/public/foo/foo'bar.html
D	actionpack/test/fixtures/public/foo/foo(bar).html
D	actionpack/test/fixtures/public/foo/foo*bar.html
D	actionpack/test/fixtures/public/foo/foo+bar.html
D	actionpack/test/fixtures/public/foo/foo,bar.html
D	actionpack/test/fixtures/public/foo/foo:bar.html
D	actionpack/test/fixtures/public/foo/foo;bar.html
D	actionpack/test/fixtures/public/foo/foo=bar.html
D	actionpack/test/fixtures/public/foo/foo@bar.html

commit 1ef12fd	refs/heads/master
Author: Andrew White 
Date:   2012-02-20 04:46:45 +0000

    Remove fixture files with Windows incompatible filenames
    
    Windows doesn't allow `\ / : * ? " < > |` in filenames so create
    the fixture files at runtime and ignore the incompatible ones when
    running on Windows.

M	actionpack/test/dispatch/static_test.rb
D	actionpack/test/fixtures/public/foo/foo!bar.html
D	actionpack/test/fixtures/public/foo/foo$bar.html
D	actionpack/test/fixtures/public/foo/foo&bar.html
D	actionpack/test/fixtures/public/foo/foo'bar.html
D	actionpack/test/fixtures/public/foo/foo(bar).html
D	actionpack/test/fixtures/public/foo/foo*bar.html
D	actionpack/test/fixtures/public/foo/foo+bar.html
D	actionpack/test/fixtures/public/foo/foo,bar.html
D	actionpack/test/fixtures/public/foo/foo:bar.html
D	actionpack/test/fixtures/public/foo/foo;bar.html
D	actionpack/test/fixtures/public/foo/foo=bar.html
D	actionpack/test/fixtures/public/foo/foo@bar.html

commit ad46884	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-02-19 19:31:35 -0700

    Integration tests support the OPTIONS http method

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit 64fa7f7	refs/tags/v3.2.5
Author: Victor Costan 
Date:   2012-02-19 03:58:52 -0500

    Removed (outdated?) config.action_view.logger from configuration guide.

M	railties/guides/source/configuring.textile

commit eb26af6	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-19 11:47:39 +0400

    Fix AbstractController#controller_path doc

M	actionpack/lib/abstract_controller/base.rb

commit 6219beb	refs/heads/master
Merge: 2cb86cd b4b2f5d
Author: Vijay Dev 
Date:   2012-02-18 09:44:42 -0800

    Merge pull request #5085 from simi/patch-1
    
    Update activerecord/CHANGELOG.md

commit b2e9bbd	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-02-18 23:00:32 +0530

    fix a typo [ci skip]

M	railties/guides/source/association_basics.textile

commit b4b2f5d	refs/heads/master
Author: Josef Šimánek 
Date:   2012-02-18 18:29:48 +0100

    Update activerecord/CHANGELOG.md

M	activerecord/CHANGELOG.md

commit 44849b1	refs/tags/v3.2.5
Author: Mike Gunderloy 
Date:   2012-02-18 05:58:52 -0600

    Documenting the :inverse_of option for associations

M	railties/guides/source/association_basics.textile

commit ed3a15d	refs/tags/v3.2.5
Author: Sergey Nartimov 
Date:   2012-02-12 22:00:09 +0300

    fix spacer template example

M	railties/guides/source/layouts_and_rendering.textile

commit ea54d2c	refs/tags/v3.2.5
Author: Eric Oestrich 
Date:   2012-02-17 11:02:27 -0500

    Update Time#change docs to reflect the options it uses
    
    [ci skip]

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 168e653	refs/tags/v3.2.5
Author: Alexey Vakhov 
Date:   2012-02-18 12:02:59 +0400

    Fix actionpack readme weblog example

M	actionpack/README.rdoc

commit 2cb86cd	refs/heads/master
Merge: 2f689d4 709f33d
Author: Vijay Dev 
Date:   2012-02-18 22:02:34 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 709f33d	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-18 21:58:33 +0530

    fix some typos [ci skip]

M	railties/guides/source/association_basics.textile

commit 4250cca	refs/heads/master
Author: johndouthat 
Date:   2012-02-18 08:57:24 -0600

    Remove reference to rails_legacy_mapper, which isn't compatible with 3.2 #5022

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 3b61efc	refs/tags/v3.2.5
Merge: 1b4e6ca 742b615
Author: Xavier Noria 
Date:   2012-02-18 04:52:31 -0800

    Merge pull request #5081 from arunagw/fix_ar_test
    
    Fix ar test

commit 1cb6417	refs/heads/master
Author: Mike Gunderloy 
Date:   2012-02-18 05:58:52 -0600

    Documenting the :inverse_of option for associations

M	railties/guides/source/association_basics.textile

commit ac2e801	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-02-18 14:35:28 +0300

    add selected and disabled option to grouped select

M	actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 185c3db	refs/heads/master
Author: Will Bryant 
Date:   2011-10-15 22:38:28 +1300

    assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash

M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/test/controller/test_case_test.rb

commit 742b615	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-02-18 15:47:24 +0530

    fix test with ruby 187-p358

M	activerecord/test/cases/nested_attributes_test.rb

commit 03db636	refs/tags/v3.1.6
Merge: bea34a7 7782a70
Author: José Valim 
Date:   2012-02-18 01:42:58 -0800

    Merge pull request #5079 from arunagw/fix_assets_test
    
    Fix assets test

commit 7782a70	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-02-18 15:10:11 +0530

    fixed assets test

M	railties/test/application/assets_test.rb

commit 2f689d4	refs/heads/master
Merge: 663c9f3 2a7230a
Author: José Valim 
Date:   2012-02-18 00:28:23 -0800

    Merge pull request #3479 from arvida/ensure-date-header-on-expires-in
    
    Ensure Date header on expires_in

commit 6bd8b66	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-18 12:02:59 +0400

    Fix actionpack readme weblog example

M	actionpack/README.rdoc

commit 774e2c4	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-18 11:58:53 +0400

    Fix AbstractController::Base#hidden_actions comment

M	actionpack/lib/abstract_controller/base.rb

commit f49ec92	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-02-18 11:58:43 +0530

    Do get it right this time. Fixing the documentation around :dependent => :restrict option

M	railties/guides/source/association_basics.textile

commit abcaa9b	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-02-18 11:45:52 +0530

    Add note about Rails 4.0 changes

M	railties/guides/source/association_basics.textile

commit 910f7aa	refs/heads/master
Author: Aditya Sanghi 
Date:   2012-02-18 11:38:30 +0530

    Add a note about :dependent => :restrict on has_one and has_many's options

M	railties/guides/source/association_basics.textile

commit 663c9f3	refs/heads/master
Merge: b9ad097 910c59f
Author: Aaron Patterson 
Date:   2012-02-17 10:05:28 -0800

    Merge pull request #5076 from petmit/migrate_status_without_timestamps
    
    Correctly print names of non-timestamped migrations with db:migrate:status

commit 3720d5e	refs/heads/master
Author: Eric Oestrich 
Date:   2012-02-17 11:02:27 -0500

    Update Time#change docs to reflect the options it uses
    
    [ci skip]

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 910c59f	refs/heads/master
Author: Peter Mitchell 
Date:   2012-02-17 16:56:57 +0100

    Correctly print names of non-timestamped migrations with db:migrate:status

M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake/migrations_test.rb

commit 1b4e6ca	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-02-17 14:44:28 +0000

    Simplify regexp

M	actionpack/lib/action_dispatch/middleware/static.rb

commit bea34a7	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-02-17 14:44:28 +0000

    Simplify regexp

M	actionpack/lib/action_dispatch/middleware/static.rb

commit b9ad097	refs/heads/master
Author: Andrew White 
Date:   2012-02-17 14:44:28 +0000

    Simplify regexp

M	actionpack/lib/action_dispatch/middleware/static.rb

commit 5fcbb94	refs/tags/v3.1.6
Author: Andrew White 
Date:   2012-02-17 14:16:45 +0000

    Fix ActionDispatch::Static to serve files with unencoded PCHAR
    
    RFC 3986[1] allows sub-delim characters in path segments unencoded,
    however Rack::File requires them to be encoded so we use URI's
    unescape method to leave them alone and then escape them again.
    
    Also since the path gets passed to Dir[] we need to escape any glob
    characters in the path.
    
    [1]: http://www.ietf.org/rfc/rfc3986.txt

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb
A	actionpack/test/fixtures/public/foo/foo!bar.html
A	actionpack/test/fixtures/public/foo/foo$bar.html
A	actionpack/test/fixtures/public/foo/foo&bar.html
A	actionpack/test/fixtures/public/foo/foo'bar.html
A	actionpack/test/fixtures/public/foo/foo(bar).html
A	actionpack/test/fixtures/public/foo/foo*bar.html
A	actionpack/test/fixtures/public/foo/foo+bar.html
A	actionpack/test/fixtures/public/foo/foo,bar.html
A	actionpack/test/fixtures/public/foo/foo:bar.html
A	actionpack/test/fixtures/public/foo/foo;bar.html
A	actionpack/test/fixtures/public/foo/foo=bar.html
A	actionpack/test/fixtures/public/foo/foo@bar.html

commit 86d3bc3	refs/tags/v3.2.5
Author: Andrew White 
Date:   2012-02-17 14:06:38 +0000

    Fix ActionDispatch::Static to serve files with unencoded PCHAR
    
    RFC 3986[1] allows sub-delim characters in path segments unencoded,
    however Rack::File requires them to be encoded so we use URI's
    unescape method to leave them alone and then escape them again.
    
    Also since the path gets passed to Dir[] we need to escape any glob
    characters in the path.
    
    [1]: http://www.ietf.org/rfc/rfc3986.txt

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb
A	actionpack/test/fixtures/public/foo/foo!bar.html
A	actionpack/test/fixtures/public/foo/foo$bar.html
A	actionpack/test/fixtures/public/foo/foo&bar.html
A	actionpack/test/fixtures/public/foo/foo'bar.html
A	actionpack/test/fixtures/public/foo/foo(bar).html
A	actionpack/test/fixtures/public/foo/foo*bar.html
A	actionpack/test/fixtures/public/foo/foo+bar.html
A	actionpack/test/fixtures/public/foo/foo,bar.html
A	actionpack/test/fixtures/public/foo/foo:bar.html
A	actionpack/test/fixtures/public/foo/foo;bar.html
A	actionpack/test/fixtures/public/foo/foo=bar.html
A	actionpack/test/fixtures/public/foo/foo@bar.html

commit ceb288b	refs/heads/master
Author: Andrew White 
Date:   2012-02-17 13:33:44 +0000

    Fix ActionDispatch::Static to serve files with unencoded PCHAR
    
    RFC 3986[1] allows sub-delim characters in path segments unencoded,
    however Rack::File requires them to be encoded so we use URI's
    unescape method to leave them alone and then escape them again.
    
    Also since the path gets passed to Dir[] we need to escape any glob
    characters in the path.
    
    [1]: http://www.ietf.org/rfc/rfc3986.txt

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb
A	actionpack/test/fixtures/public/foo/foo!bar.html
A	actionpack/test/fixtures/public/foo/foo$bar.html
A	actionpack/test/fixtures/public/foo/foo&bar.html
A	actionpack/test/fixtures/public/foo/foo'bar.html
A	actionpack/test/fixtures/public/foo/foo(bar).html
A	actionpack/test/fixtures/public/foo/foo*bar.html
M	actionpack/test/fixtures/public/foo/foo+bar.html
A	actionpack/test/fixtures/public/foo/foo,bar.html
A	actionpack/test/fixtures/public/foo/foo:bar.html
A	actionpack/test/fixtures/public/foo/foo;bar.html
A	actionpack/test/fixtures/public/foo/foo=bar.html
A	actionpack/test/fixtures/public/foo/foo@bar.html

commit ce51edb	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-17 05:16:58 -0800

    let expires_in accept a must_revalidate flag

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/conditional_get.rb
M	actionpack/test/controller/render_test.rb

commit fd2b275	refs/tags/v3.1.6
Merge: 27357a6 0bf4dc8
Author: Santiago Pastorino 
Date:   2012-02-17 03:54:47 -0800

    Merge pull request #5072 from arunagw/fix_failing_test_ruby187_p358_31stable
    
    Fix failing test ruby187 p358 31stable

commit 1a0bc2a	refs/tags/v3.2.5
Merge: 45503ec c17608f
Author: Santiago Pastorino 
Date:   2012-02-17 03:54:34 -0800

    Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358
    
    Fix failing test ruby187 p358

commit 45503ec	refs/tags/v3.2.5
Merge: a1b9acb dffd85a
Author: José Valim 
Date:   2012-02-17 01:52:55 -0800

    Merge pull request #5073 from asanghi/4918_backport
    
    Backporting #4918 with one added test for googlebot accept header as I saw it

commit 4bb6ed7	refs/heads/master
Merge: decafdd d07b2f3
Author: José Valim 
Date:   2012-02-17 01:42:06 -0800

    Merge pull request #5066 from lest/patch-1
    
    escape static file path to prevent double unescaping

commit dffd85a	refs/tags/v3.2.5
Author: Aditya Sanghi 
Date:   2012-02-17 15:10:52 +0530

    backporting #4918 to 3.2 stable; adding extra test for accept header given by googlebot

M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/test/dispatch/mime_type_test.rb

commit 0bf4dc8	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2012-02-17 14:47:25 +0530

    fixed failing test in ruby-1.8.7-p358

M	activesupport/test/core_ext/hash_ext_test.rb

commit c17608f	refs/tags/v3.2.5
Author: Arun Agrawal 
Date:   2012-02-17 14:43:01 +0530

    Fixes failing test with ruby 1.8.7-p358
    
    Same as 91a9b2441783de118a2f9ec11b0aa3ae80133d91

M	activesupport/test/core_ext/hash_ext_test.rb

commit decafdd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-16 14:49:21 -0800

    use Process.pid rather than $$

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit aaff1a4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-16 14:33:12 -0800

    database connections are automatically established after forking.
    Connection pools are 1:1 with pids.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/connection_management_test.rb

commit c84e4b5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-02-16 21:26:01 +0100

    Fix tests, Rails.env may be different on CI

M	railties/test/commands/console_test.rb

commit dd655d8	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-02-01 13:36:47 +0100

    Refactor Rails::Console to make it easier to test and add tests for it

M	railties/lib/rails/commands/console.rb
A	railties/test/commands/console_test.rb

commit 951b582	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-02-01 08:59:21 +0100

    Allow to set custom console type with Rails.application.config.console=
    
    This patch adds ability to set custom console if you want to use
    something other than IRB. Previously the hack that people used
    was:
    
        silence_warnings do
          require 'pry'
          IRB = Pry
        end
    
    which is not the best way to customize things.

M	railties/CHANGELOG.md
M	railties/guides/source/configuring.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/commands/console.rb

commit e09ac70	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-02-01 08:41:52 +0100

    Remove console --irb deprecation notice

M	railties/lib/rails/commands/console.rb

commit d07b2f3	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-16 21:50:07 +0300

    escape static file path to prevent double unescaping

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb
A	actionpack/test/fixtures/public/foo/foo+bar.html

commit 079e2f4	refs/heads/master
Merge: eeae4da ec4759d
Author: Jeremy Kemper 
Date:   2012-02-16 10:24:05 -0800

    Merge pull request #5064 from lest/patch-1
    
    move id_before_type_cast to PrimaryKey module

commit ec4759d	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-16 19:49:38 +0300

    move id_before_type_cast to PrimaryKey module

M	activerecord/lib/active_record/attribute_methods/before_type_cast.rb
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit eeae4da	refs/heads/master
Merge: c53f6ca 9aad20f
Author: Xavier Noria 
Date:   2012-02-16 08:43:30 -0800

    Merge pull request #5059 from waseem/autoload_effectively
    
    Autoload various constants effectively in abstract connection adapter.

commit c53f6ca	refs/heads/master
Merge: a5874dd f1a3e7b
Author: José Valim 
Date:   2012-02-16 06:42:35 -0800

    Merge pull request #5062 from bogdan/test2
    
    ActionDispatch: add missing test for callbacks

commit f1a3e7b	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-16 15:58:58 +0200

    ActionDispatch: add missing test for callbacks

M	actionpack/test/dispatch/callbacks_test.rb

commit 9ee71e2	refs/heads/master
Author: Ryan Bigg 
Date:   2012-02-14 11:59:39 +1300

    [engines guide] basic revision/review work

M	railties/guides/source/engines.textile

commit 3b3433f	refs/heads/master
Author: Ryan Bigg 
Date:   2012-02-13 17:15:59 +1300

    [engines guide] Clean up explanation for routing methods

M	railties/guides/source/engines.textile

commit 7bdfc47	refs/heads/master
Author: Ryan Bigg 
Date:   2012-02-13 17:08:15 +1300

    [engines guide] Elaborate on isolate_namespace functionality

M	railties/guides/source/engines.textile

commit 6a2cf4c	refs/heads/master
Author: Ryan Bigg 
Date:   2012-02-13 15:57:09 +1300

    update engines guide to explicitly reference relative-to-engine-root-path for db/seeds.rb

M	railties/lib/rails/engine.rb

commit 4435959	refs/heads/master
Author: Ryan Bigg 
Date:   2012-02-13 15:56:11 +1300

    [engines guide] Revise draft of guide, add testing, assets and dependencies sections

M	railties/guides/source/engines.textile

commit 46b4a26	refs/heads/master
Author: Ryan Bigg 
Date:   2012-02-13 15:54:21 +1300

    Rails::Engine docs should use helper method, not helpers

M	railties/lib/rails/engine.rb

commit 9aad20f	refs/heads/master
Author: Waseem Ahmad 
Date:   2012-02-16 17:35:20 +0530

    Autoload various constants effectively in abstract connection adapter.

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit 389d1c5	refs/tags/v3.0.14
Author: Andy Pliszka 
Date:   2012-02-16 00:46:23 -0500

    Test for circular reference while saving has_one relationship

M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/models/face.rb

commit a5874dd	refs/heads/master
Merge: a03e9c6 f174e84
Author: Jeremy Kemper 
Date:   2012-02-15 13:16:35 -0800

    Merge pull request #5055 from rafaelfranca/fix-drop-table
    
    Revert "No need to pass options which is never used"

commit f174e84	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-15 18:20:56 -0200

    Revert "No need to pass options which is never used"
    
    Options is needed for some Rails extensions to determine when
    referential integrity should be disabled
    
    This reverts commit bcb466c543451dce69403aaae047295758589d8e.
    
    Fixes #5052

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit a03e9c6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-15 11:47:01 -0800

    fixing AP tests

M	actionpack/test/dispatch/routing_test.rb

commit a1b9acb	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-15 05:21:20 -0800

    Merge pull request #5049 from fabioyamate/master
    
    Fix sanitize_for_mass_assigment when role is nil

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/test/cases/mass_assignment_security_test.rb

commit 1c22c6f	refs/heads/master
Merge: 2f9e477 d204918
Author: José Valim 
Date:   2012-02-15 05:21:20 -0800

    Merge pull request #5049 from fabioyamate/master
    
    Fix sanitize_for_mass_assigment when role is nil

commit d204918	refs/heads/master
Author: Fabio Yamate 
Date:   2012-02-14 16:27:19 -0200

    Fix sanitize_for_mass_assigment when role is nil
    
    There is an example in Rails documentation that suggests implementing
    assign_attributes method for ActiveModel interface, that by default
    sends option role with nil. Since mass_assignment_authorizer never
    is called without args, we can move the default value internally.

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/test/cases/mass_assignment_security_test.rb

commit 2f9e477	refs/heads/master
Merge: 1c75b9a 7f33a44
Author: José Valim 
Date:   2012-02-15 00:20:12 -0800

    Merge pull request #5045 from avakhov/am-format-paragraph-fix
    
    Fix AM format_paragraph helper method if a first word is long

commit 7f33a44	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-15 10:04:27 +0400

    Fix AM format_paragraph helper method if a first word is long

M	actionmailer/lib/action_mailer/mail_helper.rb
M	actionmailer/test/mail_helper_test.rb

commit 1c75b9a	refs/heads/master
Merge: 5cc47e4 393d4ec
Author: José Valim 
Date:   2012-02-14 23:24:09 -0800

    Merge pull request #5046 from avakhov/am-block-format-fit
    
    Cosmetic fixes in block_format AM helper method + test

commit 393d4ec	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-15 10:31:23 +0400

    Cosmetic fixes in block_format AM helper method + test

M	actionmailer/lib/action_mailer/mail_helper.rb
M	actionmailer/test/mail_helper_test.rb

commit dadace4	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-15 10:09:58 +0400

    Fix AM block_format helper method description

M	actionmailer/lib/action_mailer/mail_helper.rb

commit a97cf75	refs/tags/v3.0.14
Author: Andy Pliszka 
Date:   2012-02-15 00:52:59 -0500

    Bugfix circular reference while saving has_one relationship

M	activerecord/lib/active_record/autosave_association.rb

commit 201e67e	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-14 16:51:22 -0800

    adding tests to document behavior for #4817

M	actionpack/test/controller/routing_test.rb

commit 5cc47e4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-14 16:51:22 -0800

    adding tests to document behavior for #4817

M	actionpack/test/controller/routing_test.rb

commit 7c79996	refs/tags/v3.2.5
Author: Santiago Pastorino 
Date:   2012-02-14 21:51:18 -0200

    Rack body respond to each and not to join
    
    This fixes undef `to_str' for Rack::Chunked::Body when using
    caches_action + streaming on an action
    
    Closes #5027

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 5843069	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-02-14 21:51:18 -0200

    Rack body respond to each and not to join
    
    This fixes undef `to_str' for Rack::Chunked::Body when using
    caches_action + streaming on an action
    
    Closes #5027

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 4baaf0a	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-15 02:33:10 +0530

    CSS fix for guides. Closing #5028 [ci skip]
    
    In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
    visible. Increasing the line height slightly seems to fix this. This
    problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
    any other OS-browser combo :)

M	railties/guides/assets/stylesheets/fixes.css

commit 4f6d310	refs/heads/master
Merge: 848c3d4 8b88a20
Author: Vijay Dev 
Date:   2012-02-14 12:41:18 -0800

    Merge pull request #5042 from parndt/patch-2
    
    "Or" was not meaningful anymore, per dad7fdc5734a3813246f238ac5760b2076932216

commit 8b88a20	refs/heads/master
Author: Philip Arndt 
Date:   2012-02-15 09:21:21 +1300

    "Or" was not meaningful anymore, per dad7fdc5734a3813246f238ac5760b2076932216

M	railties/guides/source/plugins.textile

commit a93cbbd	refs/heads/master
Author: Mark McSpadden 
Date:   2012-02-14 10:53:34 -0600

    Remove double test for header inheritance leaks

M	activeresource/test/cases/base_test.rb

commit 848c3d4	refs/heads/master
Merge: abdff44 bdb6c4e
Author: Aaron Patterson 
Date:   2012-02-14 08:47:42 -0800

    Merge pull request #3544 from amatsuda/_field_changed
    
    Rename field_changed? to _field_changed? so that users can create a field named field

commit 602e038	refs/heads/master
Author: Seamus Abshere 
Date:   2012-02-14 09:34:11 -0600

    thanks to @jurriaan

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

commit 5f9a5a5	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-14 03:10:22 -0800

    Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo
    
    Always reenable _dump task in AR databases rake. Closes #5030

M	activerecord/lib/active_record/railties/databases.rake

commit abdff44	refs/heads/master
Merge: fa04a73 4b44c20
Author: José Valim 
Date:   2012-02-14 03:10:22 -0800

    Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo
    
    Always reenable _dump task in AR databases rake. Closes #5030

commit fa04a73	refs/heads/master
Merge: 7f6ee93 1076c88
Author: José Valim 
Date:   2012-02-14 03:09:55 -0800

    Merge pull request #5039 from funny-falcon/fix_callback
    
    sync __run_callbacks with ruby-trunk

commit 1076c88	refs/heads/master
Author: Sokolov Yura 
Date:   2012-02-14 15:05:45 +0400

    sync __run_callbacks with ruby-trunk
    
    https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
    In this revision behavior of respond_to? had changed: now to ask about
    protected method one should pass second argument `true`

M	activesupport/lib/active_support/callbacks.rb

commit 4b44c20	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-14 09:00:18 -0200

    Always reenable _dump task in AR databases rake. Closes #5030
    
    This allows the internal :_dump task to be called as many times as
    required. For instance, `rake db:migrate:redo` calls two tasks that
    internally call :_dump, and without reenabling it to be reinvoked,
    the database was left in incorrect state.

M	activerecord/lib/active_record/railties/databases.rake

commit 7f6ee93	refs/heads/master
Merge: 65ffcec5 bb46124
Author: José Valim 
Date:   2012-02-14 02:24:18 -0800

    Merge pull request #5036 from carlosantoniodasilva/form-button
    
    Remove not used button translation from av locale

commit bb46124	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-14 08:00:42 -0200

    Remove not used button translation from av locale

M	actionpack/lib/action_view/locale/en.yml

commit 06599ff	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-14 07:46:24 -0200

    Update f.button docs to reflect real label implementation

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 65ffcec5	refs/heads/master
Merge: c5b90a6 a10ed70
Author: José Valim 
Date:   2012-02-14 01:28:22 -0800

    Merge pull request #5032 from carlosantoniodasilva/collection-helpers-object
    
    Allow collection helpers with block to access current object in the collection

commit bdb6c4e	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-08 10:32:49 +0900

    A test case for GH #3544 to ensure that a field named field works fine

M	activerecord/test/cases/dirty_test.rb

commit 0bd44f9	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-07 15:17:51 +0900

    Rename field_changed? to _field_changed? so that users can create a field named field

M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/lib/active_record/core.rb

commit c5b90a6	refs/heads/master
Merge: bd90f9e b5f5e27
Author: José Valim 
Date:   2012-02-13 23:21:02 -0800

    Merge pull request #5035 from lest/patch-1
    
    remove unnecessary require core_ext/string/encoding

commit b5f5e27	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-14 10:09:21 +0300

    remove unnecessary require core_ext/string/encoding

M	activemodel/lib/active_model/validations/length.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/lib/active_support/core_ext/string.rb
M	activesupport/lib/active_support/gzip.rb
M	activesupport/lib/active_support/ruby/shim.rb
M	railties/lib/rails/application/configuration.rb

commit bd90f9e	refs/heads/master
Merge: 11d1bdc 7ce85e2
Author: Jeremy Kemper 
Date:   2012-02-13 21:04:01 -0800

    Merge pull request #3305 from cjolly/request_filtered_env
    
    Exclude rack.request.form_vars from request.filtered_env

commit 0101d27	refs/heads/master
Author: Mark McSpadden 
Date:   2012-02-13 22:22:46 -0600

    Allow ActiveResource subclasses to inherit headers from parent

M	activeresource/lib/active_resource/base.rb
M	activeresource/test/cases/base_test.rb

commit a10ed70	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-13 22:48:47 -0200

    Allow collection helpers with block to access current object in the collection
    
    This gives a lot more flexibility to the user, for instance to generate
    a collection of check boxes and labels, allowing to add custom classes
    or data-* attributes to the label/check_box using another object
    attribute.
    
    This basically mimics options_for_select functionality that accepts a
    third option for each item to generate html attributes for each option.

M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/lib/action_view/helpers/tags/collection_helpers.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
M	actionpack/test/template/form_collections_helper_test.rb

commit 11d1bdc	refs/heads/master
Merge: 10cf66c 6960e48
Author: Jeremy Kemper 
Date:   2012-02-13 15:32:47 -0800

    Merge pull request #5031 from carlosantoniodasilva/sprockets-compressors-refactor
    
    Sprockets compressors refactor

commit 6960e48	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-13 20:29:32 -0200

    Use Hash#fetch instead of testing for #key?

M	actionpack/lib/sprockets/railtie.rb
M	actionpack/lib/sprockets/static_compiler.rb

commit 9b9838e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-13 20:16:08 -0200

    Refactor sprockets compressors module

M	actionpack/lib/sprockets/compressors.rb

commit 10cf66c	refs/heads/master
Merge: 957da55 a9e18df
Author: Santiago Pastorino 
Date:   2012-02-13 14:18:31 -0800

    Merge pull request #5026 from castlerock/remove_require_for_string_encoding
    
    remove unused require for string encoding

commit 957da55	refs/heads/master
Merge: 04c0aea 745fbd1
Author: Aaron Patterson 
Date:   2012-02-13 11:01:02 -0800

    Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
    
    Fix usage of psql in db:test:prepare

commit a9e18df	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-02-13 23:24:30 +0530

    remove unwanted require for string encoding

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 04c0aea	refs/heads/master
Merge: 3a5a01f 9f8b4d1
Author: Aaron Patterson 
Date:   2012-02-13 09:11:33 -0800

    Merge pull request #5000 from flavorpill/master-with-multidb-association-fix
    
    Fix associations with per-class/multiple database connections

commit 3a5a01f	refs/heads/master
Merge: 9bcfb1a caa21e4
Author: Aaron Patterson 
Date:   2012-02-13 09:05:29 -0800

    Merge pull request #5012 from waseem/alias-reconnect-mysql2
    
    Alias reconnect! to reset! for Mysql2 adapter since they have same behavior.

commit 9bcfb1a	refs/heads/master
Merge: 804135b a3a1a6f
Author: Aaron Patterson 
Date:   2012-02-13 09:00:59 -0800

    Merge pull request #5018 from hammerdr/issue-4659-docs
    
    Adding documentation to clarify usage of attributes hash.

commit 305d5d5	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-13 15:29:26 +0100

    Fix deprecation warning in AS::Concern.

M	activesupport/lib/active_support/concern.rb

commit 804135b	refs/heads/master
Merge: 400bcae ad9f968
Author: José Valim 
Date:   2012-02-13 05:43:36 -0800

    Merge pull request #5024 from carlosantoniodasilva/amo-serializable-hash-string-keys
    
    Fix ActiveModel serializable hash to return string keys with :methods

commit ad9f968	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-13 11:22:59 -0200

    Make sure serializable hash with :methods option returns always string keys

M	activemodel/lib/active_model/serialization.rb
M	activemodel/test/cases/serialization_test.rb

commit 5bcb4e3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-13 11:19:44 -0200

    Cleanup extra spaces

M	activemodel/test/cases/serialization_test.rb

commit 400bcae	refs/heads/master
Merge: 97f7f30 d6b26a6
Author: José Valim 
Date:   2012-02-12 22:47:43 -0800

    Merge pull request #5016 from exviva/form_helper_date_fields
    
    Add HTML5 input[type="date"] helper

commit 97f7f30	refs/heads/master
Merge: 6bd7023 c6e6598
Author: José Valim 
Date:   2012-02-12 22:44:35 -0800

    Merge pull request #5021 from tchandy/clean_controller_tests
    
    Removing old Controller test

commit 6bd7023	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-12 16:59:51 -0800

    prefer tr to gsub for replacing characters

M	activesupport/lib/active_support/inflector/methods.rb

commit 5cff94f	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-12 16:57:47 -0800

    inflection regexp are meant to be applied once

M	activesupport/lib/active_support/inflector/methods.rb

commit dc03a2f	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-12 16:45:14 -0800

    removes redundant argument

M	activesupport/lib/active_support/inflector/methods.rb

commit d3071db	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-12 15:49:44 -0800

    boosts inflections
    
    The impact of this change has been measured pluralizing
    the entire /usr/share/dict/words, showing a 6x speedup

M	activesupport/lib/active_support/inflector/methods.rb

commit c6e6598	refs/heads/master
Author: Thiago Pradi 
Date:   2012-02-12 21:05:30 -0200

    Removing old Controller test

D	actionpack/test/controller/addresses_render_test.rb
D	actionpack/test/fixtures/addresses/list.erb
M	actionpack/test/lib/controller/fake_controllers.rb

commit 2aaa9da	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-12 22:00:09 +0300

    fix spacer template example

M	railties/guides/source/layouts_and_rendering.textile

commit d6b26a6	refs/heads/master
Author: Olek Janiszewski 
Date:   2012-02-12 13:32:53 +0100

    Add HTML5 input[type="date"] helper

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
M	actionpack/lib/action_view/helpers/tags/base.rb
A	actionpack/lib/action_view/helpers/tags/date_field.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	railties/guides/source/form_helpers.textile

commit a3a1a6f	refs/heads/master
Author: Derek Hammer 
Date:   2012-02-12 08:17:18 -0600

    Missed a code example. Fixing the docs to be consistant.

M	activemodel/lib/active_model/serialization.rb

commit a469ec7	refs/heads/master
Author: Derek Hammer 
Date:   2012-02-12 01:58:21 -0600

    Adding documentation to clarify usage of attributes hash.
    
    Serialization uses only the attributes hash's keys and calls
    methods that are of the same name as the keys on the serialized
    object.

M	activemodel/lib/active_model/serialization.rb

commit 815e445	refs/heads/master
Merge: 8671802 33e37b8
Author: José Valim 
Date:   2012-02-12 03:20:24 -0800

    Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_run
    
    TO make build green Revert PR#5001 "removed unuseful require for reply as we are not using require model"

commit 33e37b8	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-02-12 16:03:08 +0530

    Revert PR#5001 "removed unuseful require for reply as we are not using require model"
    
    This reverts commit 7381596ea32aff47222af89e4bc66000f4597acb.

M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit 8671802	refs/heads/master
Merge: 730d8a5 ed8fc19
Author: Xavier Noria 
Date:   2012-02-12 02:02:24 -0800

    Merge pull request #5014 from castlerock/fix_build_PR_5001
    
    fix build #5001, model reply is required in cases/primary_keys_test too! for isolated test

commit ed8fc19	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-02-12 14:02:24 +0530

    fix build 5001, model reply is required in cases/primary_keys_test too!

M	activerecord/test/cases/primary_keys_test.rb

commit 730d8a5	refs/heads/master
Merge: d822a65 a62088a
Author: José Valim 
Date:   2012-02-12 00:10:26 -0800

    Merge pull request #5013 from castlerock/fix_build_pull_5001
    
    fix build #5001, reply model required in relations_test

commit a62088a	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-02-12 13:35:50 +0530

    fix build #5001 reply model required in relations_test

M	activerecord/test/cases/relations_test.rb

commit 8934bda	refs/heads/master
Author: Alexey Vakhov 
Date:   2012-02-12 10:52:12 +0400

    Cosmetic fix in AM readme

M	actionmailer/README.rdoc

commit caa21e4	refs/heads/master
Author: Waseem Ahmad 
Date:   2012-02-12 12:05:39 +0530

    Alias reconnect! to reset! for Mysql2 adapter since they have same
    behavior.

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit d822a65	refs/heads/master
Merge: 5138a8f c0a1a86
Author: José Valim 
Date:   2012-02-11 22:30:51 -0800

    Merge pull request #5010 from tchandy/clean_routing_tests
    
    Cleaning Route generation tests

commit c0a1a86	refs/heads/master
Author: Thiago Pradi 
Date:   2012-02-12 03:09:03 -0200

    Cleaning Route generation tests

M	actionpack/test/controller/routing_test.rb
M	actionpack/test/lib/controller/fake_controllers.rb

commit 5138a8f	refs/heads/master
Merge: 347e0a6 d7942d4
Author: Xavier Noria 
Date:   2012-02-11 11:14:00 -0800

    Merge pull request #5006 from lest/patch-1
    
    handle id attribute in PrimaryKey module

commit d7942d4	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-11 22:03:07 +0300

    handle id attribute in PrimaryKey module

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/primary_key.rb

commit 347e0a6	refs/heads/master
Merge: 495dcd6 7f14508
Author: Santiago Pastorino 
Date:   2012-02-11 06:44:56 -0800

    Merge pull request #5003 from kennyj/fix_warning_20120211
    
    Fix warning: The method name is a duplicate and wrong.

commit 7f14508	refs/heads/master
Author: kennyj 
Date:   2012-02-11 23:27:14 +0900

    Fix warning: The method name is a duplicate and wrong.

M	activerecord/test/cases/schema_dumper_test.rb

commit 495dcd6	refs/heads/master
Merge: 5f548eb 7381596
Author: Xavier Noria 
Date:   2012-02-11 05:51:22 -0800

    Merge pull request #5001 from Karunakar/no_reply_requires
    
    removed unuseful require for reply as we are not using require model

commit 7381596	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-02-10 23:08:25 +0530

    removed unuseful require for reply as we are not using require model

M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/relations_test.rb

commit 5f548eb	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-11 04:58:40 -0800

    say unshift when you mean unshift (modulus prepend)

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activesupport/lib/active_support/inflector/inflections.rb

commit 69147ee	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-10 22:56:26 -0800

    say goodbye to #with_test_routes :axe:

M	actionpack/test/dispatch/routing_test.rb

commit fd5d9b3	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-10 22:17:30 -0800

    fixes a regression introduced by 532cd4, and a bogus test in AP the regression uncovered

M	actionpack/test/dispatch/routing_test.rb
M	activesupport/lib/active_support/inflections.rb
M	activesupport/test/inflector_test_cases.rb

commit d94e427	refs/heads/master
Merge: c50cb4a 6728191
Author: Aaron Patterson 
Date:   2012-02-10 16:06:53 -0800

    Merge branch 'master' into instance_reader
    
    * master:
      Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases

commit c50cb4a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-10 16:06:39 -0800

    PG column consults oid types when typecasting

M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/column_definition_test.rb

commit fa6cda5	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-10 14:52:27 -0800

    dynamically populate casting objects via the pg_type table

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 9f8b4d1	refs/heads/master
Author: Lars Kanis 
Date:   2011-11-22 10:43:03 +0100

    fix associations when using per class databases
    
    would get ConnectionNotEstablished error because it always tried to use
    ActiveRecord::Base's connection, even though it should be using the connection
    of the model whose context we're operating in

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency.rb

commit 30b6d4f	refs/heads/master
Author: Rick Martinez 
Date:   2012-02-10 17:35:22 -0500

    added test for #3732

M	activerecord/test/cases/multiple_db_test.rb
A	activerecord/test/fixtures/colleges.yml
M	activerecord/test/fixtures/courses.yml
A	activerecord/test/models/arunit2_model.rb
A	activerecord/test/models/college.rb
M	activerecord/test/models/course.rb
M	activerecord/test/schema/schema.rb
M	activerecord/test/support/connection.rb

commit 6728191	refs/heads/master
Merge: 3092324 532cd49
Author: Xavier Noria 
Date:   2012-02-10 11:14:10 -0800

    Merge pull request #4719 from markmcspadden/singularize_words_that_end_in_ss
    
    Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases

commit f7b915b	refs/heads/master
Merge: 522b72f 2dd0178
Author: Aaron Patterson 
Date:   2012-02-10 10:55:34 -0800

    Merge branch 'joelhoffman-postgres_schema_builder' into instance_reader
    
    * joelhoffman-postgres_schema_builder:
      Also support writing the hstore back to the database
      Hstore values are all strings
      string_to_hstore / hstore_to_string, serializing
      don't test schema where hstore not installed
      schema dumper tests for hstore
      Additional hstore tests, supporting null values, better compliance with postgres docs
      add hstore to postgres native types and defaults
    
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 522b72f	refs/heads/master
Merge: a9a1270 3092324
Author: Aaron Patterson 
Date:   2012-02-10 10:41:24 -0800

    Merge branch 'master' into instance_reader
    
    * master:
      Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
      make Range#overlaps? accept Range of Time
      improved test case for partial indices
      Made schema dumper recognize partial indices' where statements
      Added where option to add_index to support postgresql partial indices

commit 92acd5d	refs/tags/v3.2.5
Author: Jeremy Kemper 
Date:   2012-02-07 10:40:07 -0700

    Fix that failed tests should exit with a nonzero error code.
    
    Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4.
    
    Hat tip to @tenderlove for paring down the TestTask!

M	railties/lib/rails/test_unit/sub_test_task.rb
M	railties/lib/rails/test_unit/testing.rake

commit 3092324	refs/heads/master
Merge: fc3fad8 aaffc2a
Author: Aaron Patterson 
Date:   2012-02-10 10:23:42 -0800

    Merge pull request #4956 from mhfs/pg_partial_indices
    
    Add support for partial indices to PostgreSQL adapter

commit fc3fad8	refs/heads/master
Merge: 415424f 6f68e63
Author: Aaron Patterson 
Date:   2012-02-10 10:11:09 -0800

    Merge pull request #4985 from shigeya/range_overlaps_to_use_cover
    
    make Range#overlaps? accept Range of Time

commit 73fcbaa	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-10 10:00:20 -0800

    Merge pull request #4988 from kennyj/fix_4720-3
    
    Fix GH #4720. Routing problem with nested namespace and already camelized controller option.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 415424f	refs/heads/master
Merge: e6c98b8 203b88f
Author: Aaron Patterson 
Date:   2012-02-10 10:00:20 -0800

    Merge pull request #4988 from kennyj/fix_4720-3
    
    Fix GH #4720. Routing problem with nested namespace and already camelized controller option.

commit 203b88f	refs/heads/master
Author: kennyj 
Date:   2012-02-10 21:20:55 +0900

    Fix GH #4720. Routing problem with nested namespace and already camelized controller option.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 6f68e63	refs/heads/master
Author: Shigeya Suzuki 
Date:   2012-02-09 22:08:28 -0800

    make Range#overlaps? accept Range of Time

M	activesupport/lib/active_support/core_ext/range/overlaps.rb
M	activesupport/test/core_ext/range_ext_test.rb

commit fa46468	refs/remotes/origin/async
Author: Raghunadh 
Date:   2012-02-09 19:03:58 +0530

    Refactored code

M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit a9a1270	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-09 15:16:51 -0800

    fixing indentation, moving class methods together

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 3f5b984	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-09 14:45:46 -0800

    removing dead code

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb

commit e0eef11	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-09 14:42:39 -0800

    typecast columns based on the returned types

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 294fb94	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-09 20:21:27 -0200

    Change AR validation guide to remove ordered hash mention related to AMo::Errors

M	railties/guides/source/active_record_validations_callbacks.textile

commit e0cba3a	refs/heads/master
Merge: 6c50c07 e6c98b8
Author: Aaron Patterson 
Date:   2012-02-09 13:50:08 -0800

    Merge branch 'master' into instance_reader
    
    * master: (30 commits)
      Bump tzinfo. 0.3.31 was released on November 6, 2011.
      Fix GH #4909. Dependency on TZInfo move from AR to AS.
      moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one
      Refactored the OrderedHash related stuff
      Replaced OrderedHash usage with Ruby 1.9 Hash
      Replaced OrderedHash with Hash for ruby 1.9 series
      removed unnecessary code
      replacing the orderhash with hash for ruby-1.9
      Clean up some wording.
      Fix typo.
      test title changed corresponding to the test
      replaced active support ordered hash to ruby hash on active resource
      PostgreSQL does not work in the same way of the other adapters
      AR::Relation#pluck: improve to work with joins
      Fix match docs
      Fix attribute_before_type_cast for serialized attributes. Fixes #4837.
      Fix failing request test
      Fixes in AMo README
      Update README to mention lint.
      Trim down Active Model API by removing valid? and errors.full_messages
      ...

commit 6c50c07	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-09 13:49:24 -0800

    fixing the list of cached columns

M	activerecord/test/cases/attribute_methods_test.rb

commit ec6ff1b	refs/heads/master
Author: Jeff Dickey 
Date:   2012-02-09 13:10:49 -0800

    Fixed styles when browser is narrower than 69em.

M	railties/guides/assets/stylesheets/main.css

commit aaffc2a	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-02-09 19:04:07 -0200

    improved test case for partial indices

M	activerecord/test/cases/migration/index_test.rb

commit f26fcc0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-09 12:08:07 -0800

    only exclude serialized columns from cacheable columns

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 6050d01	refs/heads/master
Author: Kelley Reynolds 
Date:   2012-02-09 13:51:40 -0500

    Fix eagerly loading associations without primary keys

M	activerecord/lib/active_record/associations/join_dependency/join_part.rb
M	activerecord/test/cases/associations/eager_test.rb

commit e6c98b8	refs/heads/master
Merge: a8c150e b0a39d9
Author: Vijay Dev 
Date:   2012-02-09 23:44:17 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	activerecord/lib/active_record/relation/query_methods.rb

commit a8c150e	refs/heads/master
Merge: b02c87e e43b025
Author: Aaron Patterson 
Date:   2012-02-09 09:34:34 -0800

    Merge pull request #4975 from kennyj/bump_tzinfo
    
    Bump tzinfo. 0.3.31 was released on November 6, 2011.

commit e43b025	refs/heads/master
Author: kennyj 
Date:   2012-02-10 02:32:28 +0900

    Bump tzinfo. 0.3.31 was released on November 6, 2011.

M	activesupport/activesupport.gemspec

commit b02c87e	refs/heads/master
Merge: b171db8 63dc9b4
Author: Aaron Patterson 
Date:   2012-02-09 09:05:59 -0800

    Merge pull request #4973 from kennyj/fix_4909
    
    Fix GH #4909. Dependency on TZInfo move from AR to AS.

commit 63dc9b4	refs/heads/master
Author: kennyj 
Date:   2012-02-07 02:17:50 +0900

    Fix GH #4909. Dependency on TZInfo move from AR to AS.

M	activerecord/activerecord.gemspec
M	activesupport/activesupport.gemspec

commit b171db8	refs/heads/master
Merge: d36a884 53f442b
Author: Santiago Pastorino 
Date:   2012-02-09 07:24:22 -0800

    Merge pull request #4963 from ram123naresh/update_rails_2_use1_9
    
    Replaced OrderedHash usage with Ruby 1.9 Hash

commit d36a884	refs/heads/master
Merge: 31aa822 2ee85c3
Author: Xavier Noria 
Date:   2012-02-09 05:07:15 -0800

    Merge pull request #4965 from raghunadhd/fix_hash
    
    Refactored the OrderedHash related stuff

commit 31aa822	refs/heads/master
Merge: 39a3058 fcbe18d
Author: Xavier Noria 
Date:   2012-02-09 05:06:40 -0800

    Merge pull request #4966 from Karunakar/moving_ordered_hash_to_hash
    
    moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ord...

commit fcbe18d	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-02-09 18:26:52 +0530

    moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one

M	activerecord/test/cases/migration_test.rb

commit 2ee85c3	refs/heads/master
Author: Raghunadh 
Date:   2012-02-09 18:27:11 +0530

    Refactored the OrderedHash related stuff

M	activerecord/lib/active_record/fixtures.rb

commit 53f442b	refs/heads/master
Author: Uddhava 
Date:   2012-02-09 17:35:22 +0530

    Replaced OrderedHash usage with Ruby 1.9 Hash

M	activesupport/lib/active_support/json/encoding.rb

commit 39a3058	refs/heads/master
Merge: a8e9f29 da91a89
Author: Vijay Dev 
Date:   2012-02-09 03:43:28 -0800

    Merge pull request #4959 from ram123naresh/removed_ordered_hash
    
    Replaced OrderedHash with Hash for ruby 1.9 series

commit da91a89	refs/heads/master
Author: Uddhava 
Date:   2012-02-09 16:17:34 +0530

    Replaced OrderedHash with Hash for ruby 1.9 series

M	railties/guides/rails_guides/indexer.rb

commit a8e9f29	refs/heads/master
Merge: 6f099af b314524
Author: Xavier Noria 
Date:   2012-02-09 02:47:19 -0800

    Merge pull request #4957 from ganeshkumar/order_hash_change
    
    replacing the orderhash with hash for ruby-1.9

commit 6f099af	refs/heads/master
Merge: d1abb8b 970f54a
Author: Xavier Noria 
Date:   2012-02-09 02:46:26 -0800

    Merge pull request #4958 from ganeshkumar/order_hash_require
    
    removed unnecessary code

commit 970f54a	refs/heads/master
Author: ganesh 
Date:   2012-02-09 16:06:51 +0530

    removed unnecessary code

M	actionpack/test/template/url_helper_test.rb

commit b314524	refs/heads/master
Author: ganesh 
Date:   2012-02-09 15:53:06 +0530

    replacing the orderhash with hash for ruby-1.9

M	actionpack/test/controller/test_case_test.rb

commit 2dd0178	refs/heads/master
Author: Joel 
Date:   2012-02-08 14:21:10 -0800

    Also support writing the hstore back to the database

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 5b318a8	refs/heads/master
Author: Joel 
Date:   2012-02-06 13:22:15 -0800

    Hstore values are all strings

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit b04880c	refs/heads/master
Author: Joel 
Date:   2012-02-05 20:36:22 -0800

    string_to_hstore / hstore_to_string, serializing

M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 2967aec	refs/heads/master
Author: Joel 
Date:   2012-02-05 11:58:14 -0800

    don't test schema where hstore not installed

M	activerecord/test/schema/postgresql_specific_schema.rb

commit 102ef98	refs/heads/master
Author: Joel 
Date:   2012-02-05 11:52:50 -0800

    schema dumper tests for hstore

M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/schema/postgresql_specific_schema.rb

commit cf57211	refs/heads/master
Author: Joel 
Date:   2012-02-04 23:51:03 -0800

    Additional hstore tests, supporting null values, better compliance with postgres docs

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit a110789	refs/heads/master
Author: Joel 
Date:   2012-02-04 17:22:32 -0800

    add hstore to postgres native types and defaults

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 7ef22fc	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-02-09 03:28:11 -0200

    Made schema dumper recognize partial indices' where statements

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/migration/index_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/schema/schema.rb

commit d70e023	refs/heads/master
Author: Marcelo Silveira 
Date:   2012-02-09 01:20:52 -0200

    Added where option to add_index to support postgresql partial indices
    
    The `add_index` method now supports a `where` option that receives a
    string with the partial index criteria.
    
        add_index(:accounts, :code, :where => "active")
    
        Generates
    
        CREATE INDEX index_accounts_on_code ON accounts(code) WHERE active

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb

commit b0a39d9	refs/heads/master
Author: Ben Orenstein 
Date:   2012-02-08 20:37:23 -0500

    Clean up some wording.

M	railties/guides/source/layouts_and_rendering.textile

commit 061fd22	refs/heads/master
Author: Ben Orenstein 
Date:   2012-02-08 20:12:01 -0500

    Fix typo.

M	railties/guides/source/layouts_and_rendering.textile

commit f86b198	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-08 15:27:43 -0800

    removed unnecessary translator object

M	activerecord/lib/active_record/attribute_methods/read.rb
D	activerecord/lib/active_record/attributes/translator.rb

commit 857bd73	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-08 15:16:07 -0800

    use the key name yielded to the fetch block

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 69e84e1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-08 14:59:48 -0800

    return early if the cast attribute has been cached

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 3f97a97	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-08 14:42:20 -0800

    always call `read_attribute` from the reader method

M	activerecord/lib/active_record/attribute_methods/read.rb

commit d1abb8b	refs/heads/master
Merge: 6bb04c1 848ee29
Author: Vijay Dev 
Date:   2012-02-08 13:03:25 -0800

    Merge pull request #4950 from ask4prasath/text_changes
    
    Test title changed corresponding to the test

commit 848ee29	refs/heads/master
Author: prasath 
Date:   2012-02-09 02:11:36 +0530

    test title changed corresponding to the test

M	activemodel/test/cases/errors_test.rb

commit 6bb04c1	refs/heads/master
Merge: 828d29c 7c44491
Author: Xavier Noria 
Date:   2012-02-08 12:25:03 -0800

    Merge pull request #4949 from ask4prasath/ordered_hash_replacement_activeresource
    
    replaced active support ordered hash to ruby hash on active resource

commit 7c44491	refs/heads/master
Author: prasath 
Date:   2012-02-09 01:36:31 +0530

    replaced active support ordered hash to ruby hash on active resource

M	activeresource/test/cases/base_test.rb

commit e54d5cc	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-08 11:31:55 -0800

    use the pg column to cast values

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb

commit 828d29c	refs/heads/master
Merge: 06b9c90 78a6b6a
Author: Aaron Patterson 
Date:   2012-02-08 10:40:06 -0800

    Merge pull request #4947 from rafaelfranca/fix-build
    
    PostgreSQL does not work in the same way of the other adapters

commit 78a6b6a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-08 16:34:29 -0200

    PostgreSQL does not work in the same way of the other adapters

M	activerecord/test/cases/calculations_test.rb

commit 06b9c90	refs/heads/master
Merge: e7627d2 47628ec
Author: Aaron Patterson 
Date:   2012-02-08 08:59:00 -0800

    Merge pull request #4930 from ask4prasath/ordered_hash_replaced
    
    Replacing ordered hash to ruby hash on active model

commit 6d17b36	refs/tags/v3.2.5
Merge: d3d807a 7c167dd
Author: José Valim 
Date:   2012-02-08 06:42:32 -0800

    Merge pull request #4941 from rafaelfranca/fix-build
    
    Use real table and columns for index test

commit e7627d2	refs/heads/master
Merge: 17497e5 a379cb2
Author: José Valim 
Date:   2012-02-08 06:41:54 -0800

    Merge pull request #4942 from bogdan/pluck_joins
    
    AR::Relation#pluck: improve to work with joins

commit a379cb2	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-08 16:37:27 +0200

    AR::Relation#pluck: improve to work with joins

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 7c167dd	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-02-08 11:53:32 -0200

    Use real table and columns for index test

M	activerecord/test/cases/migration_test.rb

commit d3d807a	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-08 14:06:44 +0100

    Push proper test changes for previous commit conflicts.

M	activerecord/test/cases/migration_test.rb

commit 0a75336	refs/tags/v3.2.5
Author: Paul Sadauskas 
Date:   2012-01-24 14:22:24 -0700

    Handle nil in add_index :length option in MySQL
    
    Our schema.rb is being generated with an `add_index` line similar to this:
    
        add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}
    
    This is the same as it was on Rails 3.1.3, however, now when that
    schema.rb is evaluated, its generating bad SQL in MySQL:
    
        Mysql::Error: You have an error in your SQL syntax; check the manual
        that corresponds to your MySQL server version for the right syntax
        to use near '))' at line 1: CREATE UNIQUE INDEX
        `xxx` ON `foo` (`foo`(8), `bar`())
    
    This commit adds a check for nil on the length attribute to prevent the
    empty parens from being output.
    
    Conflicts:
    
    	activerecord/test/cases/migration/index_test.rb
    
    Signed-off-by: José Valim 

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/migration_test.rb

commit 17497e5	refs/heads/master
Merge: 75ffd87 b12cfd5
Author: Santiago Pastorino 
Date:   2012-02-08 03:47:31 -0800

    Merge pull request #4934 from rafaelfranca/fix-doc
    
    Fix match docs

commit b12cfd5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-07 22:18:57 -0200

    Fix match docs

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 77b4edc	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-02-07 23:23:18 +0000

    Fix attribute_before_type_cast for serialized attributes. Fixes #4837.
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 75ffd87	refs/heads/master
Author: Jon Leighton 
Date:   2012-02-07 23:23:18 +0000

    Fix attribute_before_type_cast for serialized attributes. Fixes #4837.

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/base_test.rb

commit 4b8fe59	refs/heads/master
Merge: 91bb008 4e7d94e
Author: José Valim 
Date:   2012-02-07 14:57:27 -0800

    Merge pull request #4932 from carlosantoniodasilva/fix-request-test
    
    Fix failing request test

commit 4e7d94e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-07 20:45:59 -0200

    Fix failing request test
    
    Latest changes in remote ip handling conflicted with each other in
    tests. Related:
    
    dd09811fa6214a130fdc2de1d4c00b4337cb15f9
    6a720226aad2adffcbd2422d40db772719579e2f

M	actionpack/test/dispatch/request_test.rb

commit 0f1b759	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-07 14:37:19 -0800

    cache attribute if it is supposed to be cached

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 9296996	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-07 20:29:02 -0200

    Fixes in AMo README

M	activemodel/README.rdoc

commit 91bb008	refs/heads/master
Author: José Valim 
Date:   2012-02-07 23:17:24 +0100

    Update README to mention lint.

M	activemodel/README.rdoc

commit 2927007	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-06 17:10:44 -0800

    only unescape bytea after it has been read from the database

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 41f21fa	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-03 17:17:41 -0800

    pgcolumn knows how to typecast binary columns

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 5396fca	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-03 15:14:00 -0800

    give each PG type a `type` method and decortate tz attributes

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/model_schema.rb

commit 9821175	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-03 11:23:21 -0800

    hstores can be typecast

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb

commit a92af3f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-03 11:23:09 -0800

    columns are lazily typecast, so no more calls to `result_as_array`

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 3efbd7f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-03 11:11:19 -0800

    taking column width in to account when fetching decimal fields

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 20440fd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-02 14:40:58 -0800

    return early from typecasting if the value is nil

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb

commit 9454076	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-02 13:48:34 -0800

    mapping more oids

M	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb

commit 15b0dcd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-02 13:41:25 -0800

    postgresql correctly typecasts back to Ruby, so change assertions

M	activerecord/test/cases/base_test.rb

commit 9fd3bde	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-02 11:23:58 -0800

    many of the OIDs mapped and implemented

A	activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit a17d047	refs/heads/master
Author: José Valim 
Date:   2012-02-07 23:10:14 +0100

    Trim down Active Model API by removing valid? and errors.full_messages

M	actionpack/lib/action_view/helpers/active_model_helper.rb
M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/lint.rb
M	activemodel/test/cases/lint_test.rb

commit 827b520	refs/heads/master
Merge: 55cc16f a470d79
Author: Xavier Noria 
Date:   2012-02-07 14:08:02 -0800

    Merge pull request #4878 from vijaydev/ordinal-2072
    
    PR #2072 with docs

commit 00b62ab	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-07 11:51:30 -0800

    moving column types to an ivar on the result

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/result.rb

commit ab6ebcc	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-06 17:10:44 -0800

    copy over columns hash on reload

M	activerecord/lib/active_record/persistence.rb

commit d592ea3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-03 14:34:53 -0800

    wrap and cache columns for typecasting

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/model_schema.rb

commit dd1eb78	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-31 17:49:53 -0800

    column_types hash is used for doing typecasting

M	activerecord/test/cases/base_test.rb

commit 9bcb9cd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-31 17:25:45 -0800

    column types are passed from the result set to the instantiated AR object

M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/result.rb
M	activerecord/test/cases/base_test.rb

commit 9c07e38	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-31 15:17:31 -0800

    moved attribute translation to an object

M	activerecord/lib/active_record/attribute_methods/read.rb
A	activerecord/lib/active_record/attributes/translator.rb

commit ee161d1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-25 17:30:29 -0800

    moved most of the evald code in to regular ruby code

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

commit 422cc57	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-25 16:52:56 -0800

    copy the columns hash to the active record instances, typecast using columns looked up on the instance

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/core.rb

commit b332877	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-07 13:49:43 -0800

    always flush all logs. fixes #4277

M	railties/lib/rails/application/bootstrap.rb

commit 55cc16f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-07 13:49:43 -0800

    always flush all logs. fixes #4277

M	railties/lib/rails/application/bootstrap.rb

commit dafc3c7	refs/tags/v3.2.5
Author: Xavier Noria 
Date:   2012-02-07 21:20:35 +0100

    no need to check for this constant

M	activerecord/lib/active_record/serializers/xml_serializer.rb

commit d3f0f92	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-07 21:20:35 +0100

    no need to check for this constant

M	activerecord/lib/active_record/serializers/xml_serializer.rb

commit 47628ec	refs/heads/master
Author: prasath 
Date:   2012-02-08 00:23:03 +0530

    replacing ordered hash to ruby hash

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/validations.rb
M	activemodel/test/cases/errors_test.rb
M	activemodel/test/cases/serializers/json_serialization_test.rb
M	activemodel/test/cases/validations_test.rb

commit 12c3b3d	refs/heads/master
Merge: 275c3a1 30e5503
Author: José Valim 
Date:   2012-02-07 10:34:38 -0800

    Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_params_master
    
    Fix force_ssl redirect with params

commit 30e5503	refs/heads/master
Author: Ryan McGeary 
Date:   2012-02-07 11:56:26 -0500

    Added unit test to cover changes to RouteSet.url_for
    
    ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
    ActionDispatch::Http::Url.url_for
    
    Conflicts:
    
    	actionpack/test/controller/base_test.rb

M	actionpack/test/controller/base_test.rb

commit 6efb849	refs/heads/master
Author: Ryan McGeary 
Date:   2012-02-06 17:47:17 -0500

    Fixed force_ssl redirects to include original query params
    
    `ActionController.force_ssl` redirects http URLs to their https equivalent;
    however, when a URL contains a query string, the resulting redirect lacked the
    original query string.
    
    Conflicts:
    
    	actionpack/lib/action_controller/metal/force_ssl.rb

M	actionpack/lib/action_controller/metal/force_ssl.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/force_ssl_test.rb

commit 275c3a1	refs/heads/master
Merge: abe4a8d 6a72022
Author: José Valim 
Date:   2012-02-07 09:54:51 -0800

    Merge pull request #2490 from gsterndale/x_forwarded_for_order
    
    The first IP address in the X-Forwarded-For header is the originating IP

commit abe4a8d	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-02-07 10:40:07 -0700

    Fix that failed tests should exit with a nonzero error code.
    
    Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4.
    
    Hat tip to @tenderlove for paring down the TestTask!

M	railties/lib/rails/test_unit/sub_test_task.rb
M	railties/lib/rails/test_unit/testing.rake

commit 6a72022	refs/heads/master
Author: Greg Sterndale 
Date:   2011-08-11 00:07:04 -0400

    The first IP address in the X-Forwarded-For header is the originating IP

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb
M	actionpack/test/dispatch/request_test.rb

commit f3595b5	refs/tags/v3.2.5
Merge: 8c7378a 0e482b3
Author: José Valim 
Date:   2012-02-07 09:05:07 -0800

    Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params
    
    Fixed force_ssl redirects to include original query params

commit 0e482b3	refs/tags/v3.2.5
Author: Ryan McGeary 
Date:   2012-02-07 11:56:26 -0500

    Added unit test to cover changes to RouteSet.url_for
    
    ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
    ActionDispatch::Http::Url.url_for

M	actionpack/test/controller/base_test.rb

commit 641359e	refs/heads/master
Merge: c3a371a dd09811
Author: José Valim 
Date:   2012-02-07 08:45:29 -0800

    Merge pull request #2632 from gsterndale/replace_trusted_proxies
    
    Trusted proxies are configurable

commit 8c7378a	refs/tags/v3.2.5
Author: Markus Fenske 
Date:   2012-02-07 17:25:35 +0100

    Fixed the documenation for 'to_xml'

M	activerecord/lib/active_record/serializers/xml_serializer.rb

commit c3a371a	refs/heads/master
Merge: dd9b428 51c95e8
Author: Xavier Noria 
Date:   2012-02-07 08:30:30 -0800

    Merge pull request #4926 from iblue/master
    
    Fixed documenation

commit dd9b428	refs/heads/master
Merge: ed9aeec 3b203f7
Author: José Valim 
Date:   2012-02-07 08:28:06 -0800

    Merge pull request #4918 from scottwb/fix-single-accept-with-q
    
    Fix MIME::Type.parse handling of single media with a q value

commit 51c95e8	refs/heads/master
Author: Markus Fenske 
Date:   2012-02-07 17:25:35 +0100

    Fixed the documenation for 'to_xml'

M	activerecord/lib/active_record/serializers/xml_serializer.rb

commit dd09811	refs/heads/master
Author: Greg Sterndale 
Date:   2011-08-22 10:20:35 -0400

    Trusted proxies is replaced with a Regexp or appended to with a String

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb
M	actionpack/test/dispatch/request_test.rb

commit bc85fcb	refs/tags/v3.2.5
Merge: ee6e3c1 5bfee55
Author: José Valim 
Date:   2012-02-07 05:31:20 -0800

    Merge pull request #4920 from guilleiguaran/revert-gemfile-edge
    
    In Rails 3.2.x --edge generate apps with rails 3-2-stable

commit 5bfee55	refs/tags/v3.2.5
Author: Guillermo Iguaran 
Date:   2012-02-07 00:15:20 -0500

    --edge option should generate app with rails 3-2-stable

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit ed9aeec	refs/heads/master
Merge: 3e0ecde e41425a
Author: José Valim 
Date:   2012-02-07 04:56:19 -0800

    Merge pull request #4924 from rafaelfranca/fix-asset_tag
    
    Fix audio_tag and video_tag helpers

commit e41425a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-07 10:50:23 -0200

    Always use content_tag for audio/video tag
    
    Closes #4919

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit e3e7e05	refs/heads/master
Merge: 80d3a0e 89f2c94
Author: Josef Šimánek 
Date:   2012-02-06 21:11:03 -0800

    Merge pull request #82 from simi/encode_with
    
    Correcting ActiveRecord::Core#encode_with docs

commit 89f2c94	refs/heads/master
Author: Josef Šimánek 
Date:   2012-02-07 06:09:08 +0100

    Correcting ActiveRecord::Core#encode_with docs

M	activerecord/lib/active_record/core.rb

commit 80d3a0e	refs/heads/master
Author: Rohit Arondekar 
Date:   2012-02-07 10:09:51 +0530

    use appropriate words for docs of Model.none

M	activerecord/lib/active_record/relation/query_methods.rb

commit 3b203f7	refs/heads/master
Author: Scott W. Bradley 
Date:   2012-02-06 18:01:42 -0800

    Correctly handle single media with q value. Fixes #736.

M	actionpack/lib/action_dispatch/http/mime_type.rb

commit 339c99b	refs/heads/master
Author: Scott W. Bradley 
Date:   2012-02-06 17:46:14 -0800

    Failing test case that shows issue #736 should still be open.

M	actionpack/test/dispatch/mime_type_test.rb

commit 3e0ecde	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-06 15:52:16 -0800

    adding a comment for myself

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/write.rb

commit 5dec3dd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-06 15:51:39 -0800

    delegate attribute typecasting to the column

M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/connection_adapters/column.rb

commit 321b4c8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-03 11:36:56 -0800

    pg supports real booleans, so handle the case when `true` is returned

M	activerecord/lib/active_record/attribute_methods/query.rb

commit 391e6a4	refs/tags/v3.2.5
Author: Ryan McGeary 
Date:   2012-02-06 17:47:17 -0500

    Fixed force_ssl redirects to include original query params
    
    `ActionController.force_ssl` redirects http URLs to their https equivalent;
    however, when a URL contains a query string, the resulting redirect lacked the
    original query string.

M	actionpack/lib/action_controller/metal/force_ssl.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/force_ssl_test.rb

commit dd54137	refs/tags/v3.2.5
Merge: ab44418 995c076
Author: Aaron Patterson 
Date:   2012-02-06 10:39:13 -0800

    Merge pull request #4912 from guilleiguaran/fix-edge-gemfile
    
    Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)

commit 995c076	refs/tags/v3.2.5
Author: Guillermo Iguaran 
Date:   2012-02-06 13:32:42 -0500

    Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge options (3.2.x)

M	railties/lib/rails/generators/app_base.rb

commit c33334f	refs/heads/master
Author: James Smith 
Date:   2012-02-06 17:03:26 +0000

    Change FILENAME_MAX_SIZE in FileStore to 228.
    
    In order that temp filenames generated from it will fit in 255 chars. See https://github.com/rails/rails/issues/4907

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit ab44418	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-06 08:01:07 -0800

    Merge pull request #4908 from kennyj/fix_3864
    
    Fix url_for method's behavior. GH #3684.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 5e70522	refs/heads/master
Author: Prasath Venkatraman 
Date:   2012-02-06 16:13:38 +0530

    Changing active model dirty module helper method to more appropriate method with helper #4903
    
    Changing active model dirty module helper method to more appropriate method with helper with Active Support Helper #4903
    
    Changing active model dirty module helper method to more appropriate method with helper with Active Support Helper typo fixed #4903

M	activemodel/lib/active_model/dirty.rb

commit 2f97eae	refs/heads/master
Author: Rohit Arondekar 
Date:   2012-02-06 17:20:30 +0530

    minor tidy up of none relation query method

M	activerecord/lib/active_record/relation/query_methods.rb

commit af7daff	refs/heads/master
Merge: 007c411 e3b3a25
Author: José Valim 
Date:   2012-02-05 22:53:41 -0800

    Merge pull request #4900 from lest/patch-1
    
    allow mass-assign version attribute in AR::SchemaMigration

commit e3b3a25	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-02-06 09:33:02 +0300

    allow mass-assign version attribute in AR::SchemaMigration

M	activerecord/lib/active_record/schema_migration.rb

commit 007c411	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-02-05 23:26:39 -0700

    Note the ways #match may be called

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit b8f2a43	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-02-05 23:22:49 -0700

    Revert "Deprecated multi args to http route methods"
    
    Too painful to lose the compact shorthand form!
    
    This reverts commit e848c52535fa0f9488cdbdb3f1cedc7c7c02d643.
    
    Conflicts:
    
    	actionpack/lib/action_dispatch/routing/mapper.rb

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 33514a1	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-02-05 23:09:09 -0700

    Get ActiveRecord::TestCase back on its feet, despite deprecation. It requires SQLCounter which was moved to AR internal tests only.

M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/cases/test_case.rb

commit 956fb81	refs/heads/master
Merge: 681faad e4915e1
Author: José Valim 
Date:   2012-02-05 09:13:34 -0800

    Merge pull request #4893 from bcardarella/mark_for_highlight
    
    Highlight defaults to HTML5 `mark` element

commit e4915e1	refs/heads/master
Author: Brian Cardarella 
Date:   2012-02-05 12:08:21 -0500

    Highlight defaults to HTML5 `mark` element

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 681faad	refs/heads/master
Merge: d36cfe2 0285974
Author: Jeremy Kemper 
Date:   2012-02-05 08:32:02 -0800

    Merge pull request #4881 from al2o3cr/compatible_json_errors
    
    Make ActiveResource error parsing interoperate with ActionController. Closes #4881.

commit d36cfe2	refs/heads/master
Merge: 09804fb dd8c6f0
Author: José Valim 
Date:   2012-02-05 08:02:35 -0800

    Merge pull request #4892 from bkzl/master
    
    Display annotations from .coffee files in `rake notes`

commit dd8c6f0	refs/heads/master
Author: Bartlomiej Kozal 
Date:   2012-02-05 16:29:24 +0100

    Display annotations from .coffee files in `rake notes`

M	railties/lib/rails/source_annotation_extractor.rb
M	railties/test/application/rake/notes_test.rb

commit 09804fb	refs/heads/master
Merge: b0d05f4 9abdabf
Author: Santiago Pastorino 
Date:   2012-02-05 07:25:50 -0800

    Merge pull request #4891 from kennyj/fix_4883
    
    [master] Optional start_day argument for Time#all_week.

commit 9abdabf	refs/heads/master
Author: kennyj 
Date:   2012-02-05 20:31:02 +0900

    Optional start_day argument for Time#all_week.
    Closes #4883

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 7f8f05f	refs/heads/master
Author: Tom Stuart 
Date:   2012-02-05 15:16:03 +0000

    Stop referring to Atom as "ATOM"
    
    $ curl -s http://www.ietf.org/rfc/rfc4287 | grep -io ATOM | sort | uniq -c
        582 atom
        175 Atom

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/layouts_and_rendering.textile

commit 93f5361	refs/tags/v3.2.5
Merge: 2bf2055 b037401
Author: Santiago Pastorino 
Date:   2012-02-05 07:14:47 -0800

    Merge pull request #4890 from kennyj/improvement_4883
    
    GH #4883. Optional start_day argument for Time#all_week

commit 71abd4f	refs/heads/master
Author: Tom Stuart 
Date:   2012-02-05 14:49:30 +0000

    Remove assert_select_feed from assert_select_encoded documentation
    
    This documentation came from the assert_select plugin, but the
    assert_select_feed method was omitted when the plugin was merged
    into Rails in 3142502964f94d6144312ae2c368b4c4589fa25a.

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb

commit 255d9c3	refs/heads/master
Author: Amro Mousa 
Date:   2012-02-05 09:54:32 -0500

    Update fixtures testing help

M	railties/guides/source/testing.textile

commit b037401	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-02-05 20:31:02 +0900

    GH #4883. Optional start_day argument for Time#all_week

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit b0d05f4	refs/heads/master
Merge: bb4de3a 1ec5c26
Author: José Valim 
Date:   2012-02-05 06:27:01 -0800

    Merge pull request #4888 from kennyj/fix_2982
    
    Add a testcase for non english filename. Related to #2982.

commit 1ec5c26	refs/heads/master
Author: kennyj 
Date:   2012-02-05 22:34:29 +0900

    Add testcase for non english filename. Related to #2982.

M	actionpack/test/dispatch/static_test.rb
A	"actionpack/test/fixtures/public/foo/\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257.html"

commit bb4de3a	refs/heads/master
Merge: a9bebae 24b75fc
Author: José Valim 
Date:   2012-02-05 04:45:59 -0800

    Merge pull request #4886 from bogdan/callbacks_cleanup
    
    AS::Callbacks: remove unused code

commit 24b75fc	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-05 12:58:44 +0200

    AS::Callbacks: remove unused code

M	activesupport/lib/active_support/callbacks.rb

commit a9bebae	refs/heads/master
Merge: 20bc3d4 bcd3b87
Author: José Valim 
Date:   2012-02-05 00:46:07 -0800

    Merge pull request #4875 from sikachu/master-asset-url
    
    Add *_url helpers to get the full assets URL

commit bcd3b87	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-02-03 18:10:37 -0500

    Add *_url helpers to get the full assets URL
    
    Adds `image_url`, `javascript_url`, `stylesheet_url`, `audio_url`,
    `video_url`, and `font_url` to assets tag helper. These URL helpers will
    return the full path to your assets. This is useful when you are going
    to reference this asset from external host.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	railties/guides/source/action_view_overview.textile

commit 0285974	refs/heads/master
Author: Matt Jones 
Date:   2012-02-04 16:02:52 -0600

    add handling for backwards-compatibility and update documentation

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/validations.rb
M	activeresource/test/cases/base_errors_test.rb

commit 7c307c2	refs/heads/master
Merge: d709b12 b09b2a8
Author: Matt Jones 
Date:   2012-02-04 13:41:12 -0600

    Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into compatible_json_errors

commit 2bf2055	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-04 16:00:02 +0100

    Clean up a bit default_response handling and cache format negotiation.

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/responder.rb

commit 44b9992	refs/tags/v3.2.5
Merge: 9cb0e12 567ac65
Author: José Valim 
Date:   2012-02-04 07:00:49 -0800

    Merge pull request #4870 from sikachu/3-2-stable-responder-fix
    
    Fix override API response bug in respond_with

commit 20bc3d4	refs/heads/master
Author: José Valim 
Date:   2012-02-04 16:00:02 +0100

    Clean up a bit default_response handling and cache format negotiation.

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/responder.rb

commit 776a373	refs/heads/master
Merge: b1faa35 3def1c8
Author: José Valim 
Date:   2012-02-04 06:49:26 -0800

    Merge pull request #4869 from sikachu/master-responder-fix
    
    Fix override API response bug in respond_with

commit 9cb0e12	refs/tags/v3.2.5
Author: José Valim 
Date:   2012-02-04 06:31:59 -0800

    Merge pull request #4879 from kennyj/fix_4873
    
    Fix GH #4873. Allow swapping same class middleware.

M	actionpack/lib/action_dispatch/middleware/stack.rb
M	actionpack/test/dispatch/middleware_stack_test.rb

commit b1faa35	refs/heads/master
Merge: 7a72fdc e7ec969
Author: José Valim 
Date:   2012-02-04 06:31:59 -0800

    Merge pull request #4879 from kennyj/fix_4873
    
    Fix GH #4873. Allow swapping same class middleware.

commit e7ec969	refs/heads/master
Author: kennyj 
Date:   2012-02-04 12:08:39 +0900

    Fix GH #4873. Allow swapping middleware of same class

M	actionpack/lib/action_dispatch/middleware/stack.rb
M	actionpack/test/dispatch/middleware_stack_test.rb

commit a470d79	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-04 18:38:26 +0530

    Document Integer#ordinal available in PR #2072.
    
    Also remove an unasserted line in the tests.

M	activesupport/CHANGELOG.md
M	activesupport/test/core_ext/integer_ext_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 6fa0190	refs/heads/master
Author: Tim Gildea 
Date:   2011-07-14 11:16:28 -0400

    Add ActiveSupport::Inflector.ordinal and Integer#ordinal

M	activesupport/lib/active_support/core_ext/integer/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/core_ext/integer_ext_test.rb
M	activesupport/test/inflector_test.rb

commit 7a72fdc	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-04 18:24:16 +0530

    remove unasserted line in test

M	activesupport/test/core_ext/integer_ext_test.rb

commit 71dfce6	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-04 17:55:24 +0530

    make the ONLY env variable used in guides generation work with kindle guides

M	railties/guides/rails_guides/generator.rb

commit ef32b59	refs/heads/master
Merge: 42e3b63 4f53091
Author: José Valim 
Date:   2012-02-04 03:55:53 -0800

    Merge pull request #4877 from bogdan/drop_per_key
    
    AS::Callbacks: rip out per_key option.

commit 42e3b63	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-04 17:04:27 +0530

    mention how to generate guides for the Kindle [ci skip]

M	railties/guides/source/ruby_on_rails_guides_guidelines.textile

commit 4f53091	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-04 13:31:00 +0200

    AS::Callbacks: rip out per_key option.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callback_inheritance_test.rb
M	activesupport/test/callbacks_test.rb

commit 4c5dc4a	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-04 16:49:34 +0530

    document config.active_record.dependent_restrict_raises in the configuring guide [ci skip]

M	railties/guides/source/configuring.textile

commit b41ef0a	refs/heads/master
Merge: d709b12 7661955
Author: José Valim 
Date:   2012-02-04 02:53:47 -0800

    Merge pull request #4866 from bogdan/terminate_after_callbacks
    
    AS::Callbacks#define_callbacks: add :terminate_after_callbacks option

commit ee6e3c1	refs/tags/v3.2.5
Author: Xavier Noria 
Date:   2012-02-03 16:06:50 -0800

    let automatic EXPLAIN ignore CACHE notifications

M	activerecord/lib/active_record/explain_subscriber.rb
A	activerecord/test/cases/explain_subscriber_test.rb

commit 1e5cdbd	refs/heads/master
Author: Xavier Noria 
Date:   2012-02-03 16:06:50 -0800

    let automatic EXPLAIN ignore CACHE notifications

M	activerecord/lib/active_record/explain_subscriber.rb
A	activerecord/test/cases/explain_subscriber_test.rb

commit 393f797	refs/heads/master
Merge: 6342cdd 60dad82
Author: Aaron Patterson 
Date:   2012-02-06 10:17:32 -0800

    Merge pull request #4905 from herimedia/to-infinity-and-beyond
    
    Infinity should be a valid validates_length_of maximum

commit 6342cdd	refs/heads/master
Merge: 6e054b1 9ed5a1c
Author: Aaron Patterson 
Date:   2012-02-06 10:13:57 -0800

    Merge pull request #4910 from sskirby/fixes_regression_in_postgres_template_support
    
    prevents the database.yml template option from being passed to PGConn

commit 9ed5a1c	refs/heads/master
Author: Sean Kirby 
Date:   2012-02-06 11:19:13 -0500

    prevents the database.yml template option from being passed to PGConn

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 6e054b1	refs/heads/master
Merge: af7daff 837231a
Author: José Valim 
Date:   2012-02-06 08:01:07 -0800

    Merge pull request #4908 from kennyj/fix_3864
    
    Fix url_for method's behavior. GH #3684.

commit 837231a	refs/heads/master
Author: kennyj 
Date:   2012-02-06 01:07:49 +0900

    Fix url_for method's behavior when it is called with :controller option which starts with "/" from multiple nested controller.
    
    Closes #3864

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 60dad82	refs/heads/master
Author: Niels Ganser 
Date:   2012-02-06 12:56:38 +0100

    To infinity… and beyond!
    
    Allow infinite values for validates_length_of. Particularly useful
    for prettily defining an open ended range such as
    
    validates_length_of :human_stupidity, :within => 0..Float::INFINITY

M	activemodel/lib/active_model/validations/length.rb
M	activemodel/test/cases/validations/length_validation_test.rb

commit 567ac65	refs/tags/v3.2.5
Author: Prem Sichanugrist 
Date:   2012-02-03 11:47:47 -0500

    Fix override API response bug in respond_with
    
    Default responder was only using the given respond block when user
    requested for HTML format, or JSON/XML format with valid resource. This
    fix the responder so that it will use the given block regardless of the
    validity of the resource. Note that in this case you'll have to check
    for object's validity by yourself in the controller.
    
    Fixes #4796

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/lib/controller/fake_models.rb

commit 3def1c8	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-02-03 11:47:47 -0500

    Fix override API response bug in respond_with
    
    Default responder was only using the given respond block when user
    requested for HTML format, or JSON/XML format with valid resource. This
    fix the responder so that it will use the given block regardless of the
    validity of the resource. Note that in this case you'll have to check
    for object's validity by yourself in the controller.
    
    Fixes #4796

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/lib/controller/fake_models.rb

commit 9aa4c6d	refs/tags/v3.2.5
Merge: 4ca633e daa2665
Author: Aaron Patterson 
Date:   2012-02-03 09:10:59 -0800

    Merge pull request #4868 from skult/3-2-stable
    
    Fix Issue #4819

commit 7661955	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-03 17:57:53 +0200

    AS::Callbacks: :skip_after_callbacks_if_terminated option

M	actionpack/lib/abstract_controller/callbacks.rb
M	activemodel/lib/active_model/callbacks.rb
M	activemodel/lib/active_model/validations/callbacks.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/callbacks.rb

commit daa2665	refs/tags/v3.2.5
Author: densya203 
Date:   2012-02-04 00:51:08 +0900

    Fix Issue #4819
    'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'
    
    Just a typo of 'ActiveSupport::...'

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit d709b12	refs/heads/master
Merge: 5325adc 1c61f7e
Author: José Valim 
Date:   2012-02-03 06:23:00 -0800

    Merge pull request #4865 from bogdan/deprecate_per_key
    
    AC::Callbacks: remove usage of :per_key option from filters

commit 5325adc	refs/heads/master
Merge: e22c506 27bf1b1
Author: Vijay Dev 
Date:   2012-02-03 05:23:53 -0800

    Merge pull request #4863 from norman/unicode
    
    Added note about new Unicode version.

commit 27bf1b1	refs/heads/master
Author: Norman Clarke 
Date:   2012-02-03 10:20:25 -0300

    Added note about new Unicode version.

M	activesupport/CHANGELOG.md

commit e22c506	refs/heads/master
Merge: 3395709 66c0443
Author: José Valim 
Date:   2012-02-03 05:13:07 -0800

    Merge pull request #4862 from norman/unicode
    
    Update Unicode database to recently-released 6.1.

commit 66c0443	refs/heads/master
Author: Norman Clarke 
Date:   2012-02-03 10:09:26 -0300

    Update Unicode database to recently-released 6.1.
    
    http://www.geek.com/articles/geek-pick/unicode-6-1-released-complete-with-emoji-characters-and-a-pile-of-poo-2012022/

M	activesupport/bin/generate_tables
M	activesupport/lib/active_support/multibyte/unicode.rb
M	activesupport/lib/active_support/values/unicode_tables.dat

commit 3395709	refs/heads/master
Merge: c551294 bfb84cf
Author: José Valim 
Date:   2012-02-03 05:08:46 -0800

    Merge pull request #4861 from arunagw/verbose_test_output
    
    Verbose output for tests.

commit bfb84cf	refs/heads/master
Author: Arun Agrawal 
Date:   2012-02-03 08:01:24 -0500

    Verbose output for tests.
    
    See #3892

M	actionmailer/Rakefile
M	actionpack/Rakefile
M	activemodel/Rakefile
M	activerecord/Rakefile
M	activeresource/Rakefile
M	activesupport/Rakefile

commit c551294	refs/heads/master
Merge: 2abaa19 c6ef45d
Author: José Valim 
Date:   2012-02-03 04:32:17 -0800

    Merge pull request #4860 from carlosantoniodasilva/generators-hide-namespace
    
    Add convenience method to hide a generator from the available ones

commit 1c61f7e	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-02-03 14:27:15 +0200

    AC::Callbacks: remove usage of :per_key option from filters

M	actionpack/lib/abstract_controller/callbacks.rb
M	activesupport/lib/active_support/callbacks.rb

commit c6ef45d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-03 09:17:59 -0200

    Add convenience method to hide a generator from the available ones
    
    It is usually useful to be able to hide a generator when running rails
    generate command. Such generators might be used only to dry up
    generators code and shouldn't be available to end users.

M	railties/CHANGELOG.md
M	railties/lib/rails/generators/base.rb
M	railties/test/generators/named_base_test.rb
M	railties/test/generators_test.rb

commit 2abaa19	refs/heads/master
Merge: 203962d 58d10e2
Author: Aaron Patterson 
Date:   2012-02-02 12:07:28 -0800

    Merge pull request #4856 from ihid/store_null_bug
    
    Allow store to be a not null column.

commit 58d10e2	refs/heads/master
Author: Jeremy Walker 
Date:   2012-02-02 18:57:15 +0000

    Allow store to be a not null column.

M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb
M	activerecord/test/models/admin/user.rb
M	activerecord/test/schema/schema.rb

commit 203962d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-02 10:18:05 -0800

    *args is already an array. :'(

M	activerecord/lib/active_record/store.rb

commit cd3bdb3	refs/heads/master
Merge: 55686ae 37ce852
Author: Aaron Patterson 
Date:   2012-02-02 10:11:00 -0800

    Merge pull request #4853 from rafaelfranca/fix-build-again
    
    columns method doesn't have name argument

commit 37ce852	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-02 16:08:31 -0200

    columns method doesn't have name argument

M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/test/cases/migration/rename_column_test.rb

commit 55686ae	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-02 09:34:31 -0800

    removed whitespace errors :yellow_heart::blue_heart::purple_heart::heart::green_heart:

M	activerecord/lib/active_record/store.rb

commit eb18260	refs/heads/master
Merge: 215a390 5d8191a
Author: José Valim 
Date:   2012-02-02 09:33:09 -0800

    Merge pull request #4851 from carlosantoniodasilva/collection-helpers
    
    Collection radio buttons / check boxes helpers

commit 215a390	refs/heads/master
Merge: 3ccbc61 dcd74eb
Author: Aaron Patterson 
Date:   2012-02-02 09:18:40 -0800

    Merge pull request #4850 from smartinez87/useless_arg
    
    Remove useless argument in #columns.

commit 4ca633e	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-02-01 10:38:26 -0800

    Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption
    
    Fix for SQLite binary data corrupter (to master branch)

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
A	activerecord/test/assets/test.txt
M	activerecord/test/cases/binary_test.rb

commit 5d8191a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-01 20:12:52 -0200

    Remove default class to collection_check_boxes and
    collection_radio_buttons
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
M	actionpack/test/template/form_collections_helper_test.rb
M	railties/guides/source/action_view_overview.textile

commit 0f23426	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 19:46:48 -0200

    Allow collection radio_buttons/check_boxes to access current text/value
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags/collection_helpers.rb
M	actionpack/test/template/form_collections_helper_test.rb

commit f506c80	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 19:16:58 -0200

    Add changelog, docs and guides entries
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_collections_helper_test.rb
M	railties/guides/source/action_view_overview.textile

commit 9035324	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 17:43:44 -0200

    Allow proc for value/text method in collection_select
    
    And options_from_collection_for_select as well.
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags/collection_helpers.rb
M	actionpack/test/template/form_options_helper_test.rb

commit dcd74eb	refs/heads/master
Author: Sebastian Martinez 
Date:   2012-02-02 10:34:17 -0200

    Remove useless argument in #columns.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/active_record/connection_adapters/fake_adapter.rb

commit b161956	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 17:28:50 -0200

    Move collection radio buttons / check boxes back to FormOptionsHelper
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers.rb
D	actionpack/lib/action_view/helpers/form_collections_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags/collection_helpers.rb

commit 36cb715	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 16:44:35 -0200

    Extract common collection helpers to a module to avoid too much inheritance
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
A	actionpack/lib/action_view/helpers/tags/collection_helpers.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb

commit 17d214a	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 16:14:24 -0200

    Create a Builder factory class to use with collection helpers + block
    
    This will make it easy for the user to handle how check box/radio and
    labels should be generated, abstracting any text/value/default html
    options required to make it work.
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
M	actionpack/test/template/form_collections_helper_test.rb

commit c988aaf	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 10:59:12 -0200

    Refactor collection helpers to extract radio/checkbox/label calls
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb

commit b17be29	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 01:18:06 -0200

    Remove collection_wrapper* and item_wrapper* options
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_collections_helper.rb
M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
M	actionpack/test/template/form_collections_helper_test.rb

commit 471b855	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 00:57:21 -0200

    Refactor value sanitization logic
    
    * Extract value sanitization from default name and id method and new
      collection helpers;
    * No need to sanitize value in default name and id always;
    * Improve value_before_type_cast to avoid concating the same method name
      string twice.
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb

commit 4a18cbb	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-31 18:58:31 -0200

    Cleanup options helper methods a bit
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 595271c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-31 18:38:46 -0200

    Refactor option groups to use content_tag
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit d9fc3dc	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 18:59:28 -0200

    Add basic documentation to collection_check_boxes and
    collection_radio_buttons
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_collections_helper.rb

commit e39f8a2	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-31 18:00:42 -0200

    Use @output_buffer variable instead of concat in tests
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/test/template/form_collections_helper_test.rb

commit 6028c15	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 17:53:43 -0200

    Implement skipped test
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/test/template/form_collections_helper_test.rb

commit 21eba34	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 17:46:31 -0200

    Add collection_radio_buttons and collection_check_boxes to FormBuilder
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_collections_helper.rb
M	actionpack/test/template/form_collections_helper_test.rb

commit 1520688	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 17:26:52 -0200

    Refactor the methods to use instance variables
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb

commit 3312cdb	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 17:25:42 -0200

    Change Tag class to Category since there is another Tag class
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/test/template/form_collections_helper_test.rb

commit 1e632a7	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 16:55:44 -0200

    Refactor render_collection method
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb

commit 5c49726	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 16:51:20 -0200

    Move collection_check_boxes and collection_radio_buttons to they our
    module
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers.rb
A	actionpack/lib/action_view/helpers/form_collections_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 7af0ec7	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-31 16:31:17 -0200

    Add collection_check_boxes helper
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
M	actionpack/test/template/form_collections_helper_test.rb

commit 9323fb6	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-31 15:45:59 -0200

    Create collection_radio_buttons helper
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
A	actionpack/test/template/form_collections_helper_test.rb

commit 3ccbc61	refs/heads/master
Merge: 593fe43 3d10955
Author: José Valim 
Date:   2012-02-02 03:38:13 -0800

    Merge pull request #4849 from carlosantoniodasilva/checkbox-hidden-form
    
    Replicate :form html5 attribute to hidden field for check_box

commit 3d10955	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-02 09:23:07 -0200

    Replicate :form html5 attribute to hidden field for check_box
    
    When the new html5 attribute :form is given to the check_box helper, it
    should be replicated to the hidden field as well. Closes #4848

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/tags/check_box.rb
M	actionpack/test/template/form_helper_test.rb

commit 593fe43	refs/heads/master
Merge: 7666502 1d3bc50
Author: José Valim 
Date:   2012-02-02 02:42:28 -0800

    Merge pull request #3892 from arunagw/verbose_rake_test
    
    No Verbose the output for test.

commit 7666502	refs/heads/master
Merge: 00e192e 03ae795
Author: José Valim 
Date:   2012-02-01 20:38:16 -0800

    Merge pull request #4842 from jamesarosen/master
    
    Update documentation for register_template_handler

commit 00e192e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-02-01 17:48:16 -0800

    use the class method to (un)escape binary values

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit bbef7b0	refs/heads/master
Author: Seamus Abshere 
Date:   2012-02-01 18:58:00 -0600

    Possibly clearer way of getting rid of ` and "
    
    Incidentally it's also faster...
    >> a = 'hello "id` world'; Benchmark.realtime { 500_000.times { a.tr('`"', "") } }
    => 0.7388770580291748
    >> a = 'hello "id` world'; Benchmark.realtime { 500_000.times { a.gsub(/[`"]/, "") } }
    => 1.7843739986419678

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

commit 03ae795	refs/heads/master
Author: James A. Rosen 
Date:   2012-02-01 16:49:21 -0800

    updating documentation for register_template_handler

M	actionpack/lib/action_view/template/handlers.rb

commit 42dab64	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-02-01 15:15:29 -0800

    Merge pull request #4543 from jdelStrother/find_or_init
    
    Don't instantiate two objects in collection proxy / find_or_instantiate_by

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 66fc1d6	refs/heads/master
Merge: 56ba210 ee2ae37
Author: Jon Leighton 
Date:   2012-02-01 15:15:29 -0800

    Merge pull request #4543 from jdelStrother/find_or_init
    
    Don't instantiate two objects in collection proxy / find_or_instantiate_by

commit 1596878	refs/heads/master
Author: Paco Guzman 
Date:   2012-02-01 21:47:33 +0100

    Refactor define_restrict_dependency_method using reflection

M	activerecord/lib/active_record/associations/builder/association.rb

commit 745fbd1	refs/heads/master
Author: Sean Kirby 
Date:   2012-01-31 18:45:54 -0500

    fixes rake db:test:prepare when using postgresql with sql db structure file and specifying a template in database.yml

M	activerecord/lib/active_record/railties/databases.rake

commit 56ba210	refs/heads/master
Merge: ab58c5e e476500
Author: José Valim 
Date:   2012-02-01 12:37:27 -0800

    Merge pull request #4832 from guilleiguaran/https-gemfile
    
    Use https://rubygems.org source for default Gemfile

commit e476500	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-31 23:49:02 -0500

    Use https://rubygems.org source for default Gemfile
    
    See https://github.com/rails/rails/pull/4684#commitcomment-920313

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit ab58c5e	refs/heads/master
Merge: 33d8b62 9b1d54e
Author: Aaron Patterson 
Date:   2012-02-01 11:17:35 -0800

    Merge pull request #4830 from rafaelfranca/restrict-fix
    
    Fix typo

commit 9b1d54e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-01 17:14:00 -0200

    Fix typo

M	activerecord/lib/active_record/locale/en.yml
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 33d8b62	refs/heads/master
Merge: 403cce7 e778e22
Author: Aaron Patterson 
Date:   2012-02-01 11:07:05 -0800

    Merge pull request #4829 from rafaelfranca/restrict-fix
    
    Use human attribute name to show the dependent destroy message

commit e778e22	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-01 16:56:30 -0200

    Remove the dependent_restrict_raises configuration if activerecord is
    not preset

M	railties/test/application/paths_test.rb
M	railties/test/isolation/abstract_unit.rb

commit a73662f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-02-01 15:45:11 -0200

    Use human attribute name to show the dependent destroy message

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/locale/en.yml
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 403cce7	refs/heads/master
Merge: 6da8ec1 907d193
Author: José Valim 
Date:   2012-02-01 10:43:40 -0800

    Merge pull request #4828 from railsaholic/fix_error_message
    
    fix has_one, has_many restrict error message

commit 6da8ec1	refs/heads/master
Merge: 78d5d6f 39cb1be
Author: Aaron Patterson 
Date:   2012-02-01 10:39:03 -0800

    Merge pull request #4806 from KL-7/do-not-serialize-nil
    
    Do not serialize nil in serialized attribute.

commit 78d5d6f	refs/heads/master
Merge: 7bfdbea 6614668
Author: Aaron Patterson 
Date:   2012-02-01 10:38:26 -0800

    Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption
    
    Fix for SQLite binary data corrupter (to master branch)

commit 7bfdbea	refs/heads/master
Merge: 049dc50 46fc0f2
Author: Aaron Patterson 
Date:   2012-02-01 10:31:51 -0800

    Merge pull request #4784 from semaperepelitsa/constantize
    
    A little constantize update

commit 907d193	refs/heads/master
Author: Manoj 
Date:   2012-02-01 23:55:01 +0530

    fix has_one, has_many restrict error message

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/locale/en.yml
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 780bf52	refs/tags/v3.2.5
Merge: 0696a51 b673ca6
Author: José Valim 
Date:   2012-02-01 10:11:51 -0800

    Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new
    
    Fix plugin_new test failure from c8c84397

commit 049dc50	refs/heads/master
Merge: d7a85c5 ceb1ea6
Author: José Valim 
Date:   2012-02-01 10:10:53 -0800

    Merge pull request #4804 from rafaelfranca/check_box-fix
    
    check_box with nil as unchecked value should be HTML safe

commit b673ca6	refs/tags/v3.2.5
Author: Prem Sichanugrist 
Date:   2012-02-01 13:09:33 -0500

    Fix plugin_new test failure from c8c84397
    
    `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
    you can't check for that.

M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit d7a85c5	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-01 23:20:24 +0530

    revise docs [ci skip]

M	activemodel/lib/active_model/validations/validates.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 479f3b4	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-01 23:19:38 +0530

    document the AR none method [ci skip]

M	activerecord/lib/active_record/relation/query_methods.rb
M	railties/guides/source/active_record_querying.textile

commit 5850ea0	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-01 23:07:59 +0530

    fix a typo [ci skip]

M	activerecord/test/cases/helper.rb

commit 8b80b4b	refs/heads/master
Merge: 6b22889 b578254
Author: José Valim 
Date:   2012-02-01 09:51:24 -0800

    Merge pull request #4825 from sikachu/master-fix-plugin-new
    
    Fix broken test introduced from #4814

commit 6b22889	refs/heads/master
Merge: d2c6400 8afa8b0
Author: José Valim 
Date:   2012-02-01 09:49:41 -0800

    Merge pull request #4826 from kennyj/fix_4737-2
    
    Fix GH #4737. Missing helper file (LoadError) in mountable plugin.

commit 9dccf00	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 15:35:07 -0200

    Fix code example in ActiveRecord::Relation#none

M	activerecord/lib/active_record/relation/query_methods.rb

commit 8afa8b0	refs/heads/master
Author: kennyj 
Date:   2012-01-30 22:47:05 +0900

    Fix GH #4737. Missing helper file (LoadError) in mountable plugin.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit b578254	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-02-01 12:23:20 -0500

    Fix broken test introduced from #4814
    
    * ruby_debugger_gemfile_entry was removed from the generator. Please
      make sure to run `grep` or `ack` to make sure it was removed in every
      places.

M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile

commit d2c6400	refs/heads/master
Merge: de0043d e1dbcdc
Author: Vijay Dev 
Date:   2012-02-01 22:25:52 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit e1dbcdc	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-01 22:22:51 +0530

    fixes the plus sign properly [ci skip]

M	railties/guides/source/security.textile

commit d566fa7	refs/heads/master
Author: Vijay Dev 
Date:   2012-02-01 22:18:36 +0530

    Revert "fixing text to match what is being displayed"
    
    This reverts commit 5be94cedce3f80923661a2f1fee02c9bfc2e95b2.
    
    Reason: This commit is incorrect.

M	railties/guides/source/layouts_and_rendering.textile

commit c6d880f	refs/heads/master
Author: daniely 
Date:   2012-02-01 23:14:28 +0800

    escape plus sign in "Rails 2.3+" to fix markup

M	railties/guides/source/security.textile

commit 0696a51	refs/tags/v3.2.5
Merge: 21735d2 91f8cf2
Author: José Valim 
Date:   2012-02-01 06:05:02 -0800

    Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2
    
    Generate strict validation error messages with attribute name (3-2-stable)

commit 21735d2	refs/tags/v3.2.5
Merge: 1444ec6 c8c8439
Author: Santiago Pastorino 
Date:   2012-02-01 06:03:21 -0800

    Merge pull request #4815 from kennyj/fix_4749
    
    Fix GH #4749. Remove branch options, because edge is not 3-2-stable.

commit de0043d	refs/heads/master
Merge: 3287a6e b3278cd
Author: Santiago Pastorino 
Date:   2012-02-01 06:01:10 -0800

    Merge pull request #4814 from guilleiguaran/remove-ruby-debugger-method
    
    Remove ruby_debugger_gemfile_entry from app_base

commit 91f8cf2	refs/tags/v3.2.5
Author: Carlos Antonio da Silva 
Date:   2012-02-01 11:28:31 -0200

    Generate strict validation error messages with attribute name
    
    Backported from master.

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/test/cases/validations_test.rb

commit 3287a6e	refs/heads/master
Merge: 0b5edb3 26861e9
Author: José Valim 
Date:   2012-02-01 05:50:37 -0800

    Merge pull request #4821 from carlosantoniodasilva/strict-validation
    
    Generate strict validation error messages with attribute name

commit 26861e9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-02-01 11:28:31 -0200

    Generate strict validation error messages with attribute name

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/test/cases/validations_test.rb

commit 1d3bc50	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-07 20:02:19 +0530

    No verbose the output for tests.

M	actionpack/Rakefile
M	activerecord/Rakefile
M	activesupport/Rakefile

commit 0b5edb3	refs/heads/master
Merge: 9906492 74a191d
Author: José Valim 
Date:   2012-02-01 03:55:32 -0800

    Merge pull request #4818 from arunagw/build_fix_isolated
    
    Build fix when running isolated test

commit 74a191d	refs/heads/master
Author: Arun Agrawal 
Date:   2012-02-01 06:49:00 -0500

    Build fix when running isolated test

M	activesupport/lib/active_support/multibyte/chars.rb

commit 9906492	refs/heads/master
Merge: 0eb4673 9d25af6
Author: José Valim 
Date:   2012-02-01 03:10:26 -0800

    Merge pull request #4433 from carlosantoniodasilva/html-escape-once
    
    Html escape once

commit 9d25af6	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 21:07:15 -0200

    Move escaping regexps to constants

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 608eddc	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 21:04:02 -0200

    Move escape_once logic to ERB::Util, where it belongs to
    
    All the logic is based on the HTML_ESCAPE constant available in
    ERB::Util, so it seems more logic to have the entire method there and
    just delegate the helper to use it.

M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/erb_util_test.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 0eb4673	refs/heads/master
Merge: 7179fad 8a6a3e6
Author: José Valim 
Date:   2012-02-01 02:50:33 -0800

    Merge pull request #4672 from carlosantoniodasilva/av-url-helper
    
    Improvements on some url helper methods and tests

commit 7179fad	refs/heads/master
Merge: d613d60 705a1d5
Author: José Valim 
Date:   2012-01-31 22:37:25 -0800

    Merge pull request #4808 from route/mb_chars_as_json
    
    Added as_json method for multibyte strings

commit c8c8439	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-02-01 02:44:06 +0900

    Fix GH #4749. Remove branch options, because edge is not 3-2-stable.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/shared_generator_tests.rb

commit b3278cd	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-02-01 00:14:42 -0500

    Remove ruby_debugger_gemfile_entry from app_base, we can just put ruby-debug19 commented directly in Gemfile

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 1444ec6	refs/tags/v3.2.5
Merge: e1de540 f532cd1
Author: Santiago Pastorino 
Date:   2012-01-31 17:54:26 -0800

    Merge pull request #4811 from rafaelfranca/3-2-stable-fix
    
    Fix broken build in 3-2-stable branch

commit f532cd1	refs/tags/v3.2.5
Author: Rafael Mendonça França 
Date:   2012-01-31 23:39:29 -0200

    Fix broken tests added by 85c724d59

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/company.rb

commit d613d60	refs/heads/master
Merge: c4469e6 ae3b015
Author: Aaron Patterson 
Date:   2012-01-31 17:36:23 -0800

    Merge pull request #4799 from arunagw/warning_fixed_for_indentations
    
    warning removed: mismatched indentations

commit 705a1d5	refs/heads/master
Author: Dmitriy Vorotilin 
Date:   2012-02-01 02:01:00 +0400

    Added as_json method for multibyte strings

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/test/multibyte_chars_test.rb

commit e1de540	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-01-31 20:26:16 +0000

    Improve deprecation message

M	activerecord/lib/active_record/attribute_methods.rb

commit 6614668	refs/heads/master
Author: Chris Feist 
Date:   2012-01-31 00:07:40 -0600

    Fixed issue with SQLite adapter corrupting binary data

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 96359d5	refs/heads/master
Author: Chris Feist 
Date:   2012-01-30 23:26:41 -0600

    Added test to illustrate bad binary blobs.

A	activerecord/test/assets/test.txt
M	activerecord/test/cases/binary_test.rb

commit c4469e6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-31 11:29:52 -0800

    Revert "Merge pull request #4746 from jenslukowski/issue4718"
    
    This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing
    changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/identity_map_test.rb

commit 75de1ce	refs/heads/master
Merge: d6e41f3 8270e4a
Author: Jon Leighton 
Date:   2012-01-31 11:17:02 -0800

    Merge pull request #4805 from xuanxu/none_and_null_object_pattern
    
    Added `none` query method to return zero records.

commit 39cb1be	refs/heads/master
Author: Kirill Lashuk 
Date:   2012-01-28 05:10:13 +0300

    Do not serialize nil in serialized attribute.

M	activerecord/lib/active_record/coders/yaml_column.rb
M	activerecord/test/cases/base_test.rb

commit 81f14a5	refs/tags/v3.2.5
Author: Aaron Patterson 
Date:   2012-01-31 10:57:24 -0800

    Merge pull request #4735 from arton/master
    
    Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows

M	actionpack/lib/sprockets/assets.rake

commit d6e41f3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-26 16:51:54 -0800

    QueryCache will just dup an AR::Result, AR::Result can deep copy

M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/lib/active_record/result.rb

commit c091ab0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-26 16:21:45 -0800

    always return the result set from select_all

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/querying.rb

commit 40ce682	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-26 15:16:12 -0800

    made the result set object act more like an array

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/result.rb

commit 77c6706	refs/heads/master
Merge: d9c4862 c11e78c
Author: Aaron Patterson 
Date:   2012-01-31 10:57:24 -0800

    Merge pull request #4735 from arton/master
    
    Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows

commit d9c4862	refs/heads/master
Merge: 5cad7a0 7be0b7e
Author: Aaron Patterson 
Date:   2012-01-31 10:55:00 -0800

    Merge pull request #4742 from petervandenabeele/master
    
    Set the timezone correctly for a test in activerecord/../base_test.rb

commit 5cad7a0	refs/heads/master
Merge: bb842e8 e2cea6c
Author: Aaron Patterson 
Date:   2012-01-31 10:53:16 -0800

    Merge pull request #4746 from jenslukowski/issue4718
    
    Test and fix for issue 4718

commit 8270e4a	refs/heads/master
Author: Juanjo Bazán 
Date:   2012-01-30 21:36:47 +0100

    Added `none` query method to return zero records.
    And added NullRelation class implementing the null object pattern for the `Relation` class.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record.rb
A	activerecord/lib/active_record/null_relation.rb
M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 60cb7d6	refs/tags/v3.2.5
Merge: bd93ba5 93306be
Author: Aaron Patterson 
Date:   2012-01-31 10:36:22 -0800

    Merge pull request #4779 from bsodmike/bsodmike-3-2-stable
    
    Update comment in Gemfile re Unicorn (minor clarification)

commit ceb1ea6	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 16:29:11 -0200

    check_box with nil as unchecked value should be HTML safe
    
    [Carlos Antonio da Silva + Rafael Mendonça França]

M	actionpack/lib/action_view/helpers/tags/check_box.rb
M	actionpack/test/template/form_helper_test.rb

commit bb842e8	refs/heads/master
Merge: 40c287c a5976cc
Author: Aaron Patterson 
Date:   2012-01-31 10:17:17 -0800

    Merge pull request #4803 from lucascaton/master
    
    Remove slash from favicon_link_tag method attribute

commit 27357a6	refs/tags/v3.1.6
Merge: 423241c daa8686
Author: Jon Leighton 
Date:   2012-01-31 09:56:12 -0800

    Merge pull request #4787 from kennyj/fix_4754-2
    
    [Backport][3-1-stable] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES

commit a5976cc	refs/heads/master
Author: Lucas Caton 
Date:   2012-01-31 15:46:02 -0200

    Remove slash from favicon_link_tag method attribute

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 40c287c	refs/heads/master
Merge: 3bf859d 4af62c0
Author: José Valim 
Date:   2012-01-31 08:59:48 -0800

    Merge pull request #4802 from carlosantoniodasilva/collection-helpers-refactor
    
    Refactor select helper and remove eval

commit 4af62c0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-25 20:12:01 -0200

    Remove eval calls, use send.. eval is evil

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 6a5408b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-25 20:06:46 -0200

    Refactor select tag form helpers

M	actionpack/lib/action_view/helpers/tags/collection_select.rb
M	actionpack/lib/action_view/helpers/tags/select.rb

commit 3bf859d	refs/heads/master
Merge: 245ee01 b00a5e6
Author: José Valim 
Date:   2012-01-31 08:45:01 -0800

    Merge pull request #4791 from gregolsen/reflection_test_fixed
    
    reflection test fixed

commit 245ee01	refs/heads/master
Merge: cf63e30 f944d52
Author: José Valim 
Date:   2012-01-31 08:43:07 -0800

    Merge pull request #4800 from rafaelfranca/remove-warnings
    
    Remove deprecation warnings from tests

commit cf63e30	refs/heads/master
Merge: 10c50c6 0c0e58c
Author: José Valim 
Date:   2012-01-31 08:42:39 -0800

    Merge pull request #4797 from kennyj/fix_4774
    
    Fix GH #4744. Don't run bundle install when executing `rails new app` with --pretend option

commit 10c50c6	refs/heads/master
Merge: 40b2189 858efc9
Author: José Valim 
Date:   2012-01-31 08:31:57 -0800

    Merge pull request #4798 from ihower/fix_routing_typo
    
    Fix typo in routing documentation

commit f944d52	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 14:22:58 -0200

    Remove deprecation warnings from tests

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/helper.rb

commit 62c955d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 14:22:10 -0200

    Put spaces between the words at deprecation warning

M	activerecord/lib/active_record/associations/builder/association.rb

commit ae3b015	refs/heads/master
Author: Arun Agrawal 
Date:   2012-01-31 11:18:55 -0500

    warning removed: mismatched indentations

M	activerecord/lib/active_record/associations/builder/association.rb

commit b00a5e6	refs/heads/master
Author: gregolsen 
Date:   2012-01-31 18:16:48 +0200

    test_get_ids_for_ordered_association fixed

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/company.rb

commit 0c0e58c	refs/heads/master
Author: kennyj 
Date:   2012-01-31 20:10:22 +0900

    Don't run bundle install when passed with --pretend option

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 858efc9	refs/heads/master
Author: Wen-Tien Chang 
Date:   2012-02-01 00:09:26 +0800

    Fix typo in routing documentation

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 40b2189	refs/heads/master
Merge: bc194cf 25a69e2
Author: José Valim 
Date:   2012-01-31 07:58:33 -0800

    Merge pull request #4792 from rafaelfranca/build-fix
    
    Only add ActiveRecord configuration if it is present

commit bd93ba5	refs/tags/v3.2.5
Merge: 85c724d 91700bf
Author: José Valim 
Date:   2012-01-31 07:09:56 -0800

    Merge pull request #4793 from kennyj/fix_4760
    
    [3-2-stable] Fix GH #4760. A Block was not evaluated.

commit bc194cf	refs/heads/master
Author: José Valim 
Date:   2012-01-31 16:08:11 +0100

    to_proper_path -> to_partial_path

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 25a69e2	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-31 12:34:34 -0200

    Only add ActiveRecord configuration if it is present

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit 9a76e1f	refs/heads/master
Author: José Valim 
Date:   2012-01-31 15:34:02 +0100

    Update actionpack/lib/action_view/renderer/partial_renderer.rb

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 31fce01	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-31 12:09:08 -0200

    Improve readonly examples and optimistic locking docs
    
    * Relation#order can receive order attributes as different arguments,
      add example;
    * Readonly does not handle deletion of records, only modification;
    * locking_version column does not need to default to 0, Rails handles
      nil values;
    * Change references from "set_locking_column" to "self.locking_column".

M	activerecord/lib/active_record/locking/optimistic.rb
M	railties/guides/source/active_record_querying.textile

commit 58cd008	refs/heads/master
Author: gregolsen 
Date:   2012-01-31 15:57:39 +0200

    reflection test fixed

M	activerecord/test/cases/reflection_test.rb

commit 85c724d	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-01-31 05:47:41 -0800

    Merge pull request #4783 from gregolsen/ids_reader_fix
    
    ids_reader method fixed, test added to has_many association (for PostgreSQL)

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/company.rb

commit 98e1735	refs/heads/master
Merge: 30a2328 f13a1dd
Author: Jon Leighton 
Date:   2012-01-31 05:47:41 -0800

    Merge pull request #4783 from gregolsen/ids_reader_fix
    
    ids_reader method fixed, test added to has_many association (for PostgreSQL)

commit 30a2328	refs/heads/master
Merge: 9a17240 23074c8
Author: Jon Leighton 
Date:   2012-01-31 05:45:04 -0800

    Merge pull request #4727 from railsaholic/dependent_restrict_should_add_error
    
    has_many/has_one, :dependent => :restrict, deprecation added

commit 7beb5a7	refs/tags/v3.2.5
Merge: 175cdd1 2380a2d
Author: José Valim 
Date:   2012-01-31 05:29:11 -0800

    Merge pull request #4790 from marten/fix-require-deprecation-in-activesupport
    
    Fix Deprecation usage in ActiveSupport when requiring only parts of AS

commit 2380a2d	refs/tags/v3.2.5
Author: Marten Veldthuis 
Date:   2012-01-31 14:04:00 +0100

    Fix use of Deprecation without requiring active_support/deprecation in whiny nil

M	activesupport/lib/active_support/whiny_nil.rb

commit f3e1b21	refs/tags/v3.2.5
Author: Marten Veldthuis 
Date:   2012-01-31 14:03:51 +0100

    Fix use of Deprecation without requiring active_support/deprecation in message verifier

M	activesupport/lib/active_support/message_verifier.rb

commit 563be40	refs/tags/v3.2.5
Author: Marten Veldthuis 
Date:   2012-01-31 13:41:08 +0100

    Fix use of Deprecation without requiring active_support/deprecation in ActiveSupport::Concern in Base64

M	activesupport/lib/active_support/base64.rb

commit cb46423	refs/tags/v3.2.5
Author: Marten Veldthuis 
Date:   2012-01-31 13:40:11 +0100

    Fix use of Deprecation without requiring active_support/deprecation in ActiveSupport::Concern

M	activesupport/lib/active_support/concern.rb

commit 91700bf	refs/tags/v3.2.5
Author: kennyj 
Date:   2012-01-31 21:26:17 +0900

    Fix GH #4760. A Block was not evaluated.

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit 9a17240	refs/heads/master
Merge: 81f6bcb ae0b472
Author: Santiago Pastorino 
Date:   2012-01-31 04:22:04 -0800

    Merge pull request #4788 from arunagw/warning_remove_shadowing_var
    
    warning removed: shadowing outer local variable - klass

commit ae0b472	refs/heads/master
Author: Arun Agrawal 
Date:   2012-01-31 07:03:44 -0500

    warning removed: shadowing outer local variable - klass

M	activerecord/lib/active_record/dynamic_finder_match.rb

commit daa8686	refs/tags/v3.1.6
Author: kennyj 
Date:   2012-01-31 20:53:03 +0900

    Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 0d5f7da	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-31 09:40:38 -0200

    Improve ar associations habtm docs a bit

M	railties/guides/source/association_basics.textile

commit 175cdd1	refs/tags/v3.2.5
Merge: b2955ed cfea673
Author: José Valim 
Date:   2012-01-31 03:35:21 -0800

    Merge pull request #4786 from lest/patch-2
    
    fix assets test in 3-2-stable

commit cfea673	refs/tags/v3.2.5
Author: Sergey Nartimov 
Date:   2012-01-31 11:52:39 +0300

    fix assets test

M	railties/test/application/assets_test.rb

commit 46fc0f2	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2012-01-31 18:44:34 +0800

    Dont do underscore and camelize, only camelize is fine

M	actionpack/lib/action_controller/test_case.rb

commit d0706c3	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2012-01-31 18:09:11 +0800

    There is an "inherit" option on const_get too, why not use it?

M	activesupport/lib/active_support/inflector/methods.rb

commit f13a1dd	refs/heads/master
Author: gregolsen 
Date:   2012-01-31 11:48:26 +0200

    ids_reader method fixed, test added to has_many association

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/company.rb

commit 81f6bcb	refs/heads/master
Merge: 920030b 223e5b9
Author: José Valim 
Date:   2012-01-31 01:07:28 -0800

    Merge pull request #4782 from lest/patch-1
    
    fix assets test

commit 223e5b9	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-31 11:52:39 +0300

    fix assets test

M	railties/test/application/assets_test.rb

commit b2955ed	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-01-31 08:50:36 +0000

    Allow writing unknown attributes, but with a deprecation warning. Closes #4583.

M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 0bfc504	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-01-31 08:41:51 +0000

    Add workaround and deprecation if the inherited hook is not executed. Closes #4757.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 23074c8	refs/heads/master
Author: Manoj 
Date:   2012-01-31 13:46:07 +0530

    suggested fixes for :dependent => :restrict deprecation.

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/locale/en.yml
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 3053f52	refs/heads/master
Author: Paco Guzman 
Date:   2012-01-29 15:24:03 +0100

    Same method for has_many and has_one associations

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb

commit 38ffca5	refs/heads/master
Author: Paco Guzman 
Date:   2012-01-29 12:31:37 +0100

    Easy dependent_restrict error message

M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb

commit c472843	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-01-31 00:20:05 -0800

    Merge pull request #4763 from kennyj/fix_4754
    
    [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 920030b	refs/heads/master
Merge: 49e6923 1a1d9e6
Author: Jon Leighton 
Date:   2012-01-31 00:20:05 -0800

    Merge pull request #4763 from kennyj/fix_4754
    
    [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES

commit 49e6923	refs/heads/master
Merge: c99eb23 b08bf99
Author: Jon Leighton 
Date:   2012-01-30 23:37:09 -0800

    Merge pull request #4732 from pwim/refactor-dynamic-match
    
    Refactor dynamic match

commit 93306be	refs/tags/v3.2.5
Author: Michael de Silva 
Date:   2012-01-31 09:54:12 +0300

    clarification to prevent confusing newbies; Passenger/Unicorn are app servers, Apache/Nginx are the web servers along with thin a la Heroku etc.

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit b08bf99	refs/heads/master
Author: Paul McMahon 
Date:   2012-01-31 09:32:42 +0900

    Use conditional instead of try

M	activerecord/lib/active_record/dynamic_finder_match.rb

commit f457f87	refs/heads/master
Merge: 5be94ce 39ace13
Author: Patrick Davey 
Date:   2012-01-31 13:26:49 +1300

    Merge branch 'master' of github.com:lifo/docrails

commit 5be94ce	refs/heads/master
Author: Patrick Davey 
Date:   2012-01-31 13:25:34 +1300

    fixing text to match what is being displayed

M	railties/guides/source/layouts_and_rendering.textile

commit 39ace13	refs/heads/master
Author: Ying Tsen Hong 
Date:   2012-01-30 16:50:17 -0700

    Fixed typo. "from" should be "form".

M	railties/guides/source/form_helpers.textile

commit c99eb23	refs/heads/master
Merge: de16100 b04bce2
Author: Xavier Noria 
Date:   2012-01-30 13:59:42 -0800

    Merge pull request #4769 from sikachu/failing-test
    
    Fix failing test from [7619bcf2]

commit b04bce2	refs/heads/master
Author: Prem Sichanugrist 
Date:   2012-01-30 16:54:33 -0500

    Fix failing test from [7619bcf2]

M	railties/lib/rails/generators/generated_attribute.rb

commit 4137905	refs/tags/v3.2.5
Author: Xavier Noria 
Date:   2012-01-30 13:47:42 -0800

    query cache instrumentation should included the bindings in the payload [closes #4750]

M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb

commit de16100	refs/heads/master
Author: Xavier Noria 
Date:   2012-01-30 13:47:42 -0800

    query cache instrumentation should included the bindings in the payload [closes #4750]

M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb

commit 7619bcf	refs/heads/master
Author: Xavier Noria 
Date:   2012-01-30 13:13:04 -0800

    rewrites a couple of alternations in regexps as character classes
    
    Character classes are the specific regexp construct
    to express alternation of individual characters.

M	activerecord/lib/active_record/relation/calculations.rb
M	railties/lib/rails/generators/generated_attribute.rb

commit 211174a	refs/heads/master
Merge: 7cdb122 94cd8d7
Author: José Valim 
Date:   2012-01-30 11:37:24 -0800

    Merge pull request #4767 from lest/patch-2
    
    merge MRI performance methods into one file

commit 94cd8d7	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-30 22:35:22 +0300

    merge MRI performance methods into one file

M	activesupport/lib/active_support/testing/performance/ruby.rb
D	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 7cdb122	refs/heads/master
Merge: a0ff270 cc88fcf
Author: Santiago Pastorino 
Date:   2012-01-30 10:48:26 -0800

    Merge pull request #4765 from vijaydev/fix_4764
    
    Fixes #4764 - remove generated new line in routes.rb on scaffold generation

commit cc88fcf	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-31 00:07:51 +0530

    Fixes #4764 - remove generated new line in routes.rb on scaffold generation
    
    As explained in #4764, when destroying a scaffold, routes.rb loses a
    new line. This seems to happen because a new line is added
    while generating the route and the destroy generator removes it.
    However, this causes a problem if the routes file is manually edited
    to remove such new lines. This commit just removes that extra new line
    from added in the first place.

M	railties/lib/rails/generators/actions.rb

commit 766e12a	refs/tags/v3.2.5
Author: Vijay Dev 
Date:   2012-01-30 23:45:55 +0530

    fix typo [ci skip]

M	activesupport/lib/active_support/base64.rb

commit 1a1d9e6	refs/heads/master
Author: kennyj 
Date:   2012-01-31 01:32:49 +0900

    Fix GH #4754. Remove double-quote when using ANSI_QUOTES

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/primary_keys_test.rb

commit a0ff270	refs/heads/master
Merge: 30327a0 6831ab1
Author: Santiago Pastorino 
Date:   2012-01-30 04:05:37 -0800

    Merge pull request #4753 from rahul100885/rahul100885_work
    
    Used block to make sure file get auto closed after use

commit 6831ab1	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2012-01-30 14:41:22 +0530

    Used block to make sure file get auto closed after use

M	railties/lib/rails/code_statistics.rb

commit 30327a0	refs/heads/master
Merge: dfa0c36 44bd971
Author: José Valim 
Date:   2012-01-29 22:49:45 -0800

    Merge pull request #4745 from lest/patch-1
    
    remove ruby 1.8 support code

commit bc2e062	refs/heads/master
Author: Carol Nichols 
Date:   2012-01-29 22:28:46 -0500

    Fixing some double quotes that should be single quotes

M	actionpack/lib/action_dispatch/routing.rb

commit 7ed0f6b	refs/heads/master
Author: ben 
Date:   2012-01-30 10:47:57 +0800

    Update .travis.yml

M	.travis.yml

commit 9d02e06	refs/heads/master
Author: ben 
Date:   2012-01-30 10:47:12 +0800

    https://github.com/lifo/docrails/blob/master/.travis.yml

M	.travis.yml

commit 200d760	refs/heads/master
Author: Meck 
Date:   2012-01-30 10:38:39 +0800

    Sorry for editing this file.

M	README.rdoc

commit 7c86c22	refs/heads/master
Author: Meck 
Date:   2012-01-30 10:30:00 +0800

    Update README.rdoc

M	README.rdoc

commit e2cea6c	refs/heads/master
Author: Jens Lukowski 
Date:   2012-01-29 21:53:35 +0100

    fix for Issue 4718

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 44bd971	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-29 23:00:02 +0300

    remove ruby 1.8 support code

M	railties/lib/rails/generators/base.rb

commit dfa0c36	refs/heads/master
Merge: 677e06c bf928bc
Author: Santiago Pastorino 
Date:   2012-01-29 11:30:37 -0800

    Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerables
    
    Replaced all 'for' loops with Enumerable#each

commit bf928bc	refs/heads/master
Author: Nathan Broadbent 
Date:   2012-01-30 01:27:43 +0800

    Use block form of 'File.open' so that File object is auto closed at end

M	actionpack/Rakefile
M	activerecord/Rakefile

commit b31eac5	refs/heads/master
Author: Nathan Broadbent 
Date:   2012-01-30 00:54:17 +0800

    Replaced all 'for' loops with Enumerable#each

M	actionpack/Rakefile
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/fixtures/developers.yml
M	activerecord/Rakefile
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/fixtures/developers.yml
M	activeresource/Rakefile
M	activeresource/test/cases/format_test.rb
M	activesupport/lib/active_support/xml_mini/jdom.rb
M	railties/lib/rails/rubyprof_ext.rb

commit 677e06c	refs/heads/master
Merge: ec4440f 5dd80db
Author: José Valim 
Date:   2012-01-29 08:57:37 -0800

    Merge pull request #4743 from atd/patch-1
    
    Add 'image/pjpeg' format used by IE

commit 5dd80db	refs/heads/master
Author: Antonio Tapiador 
Date:   2012-01-29 17:36:10 +0100

    Add 'image/pjpeg' format used by IE
    
    http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace

M	actionpack/lib/action_dispatch/http/mime_types.rb

commit ec4440f	refs/heads/master
Merge: 786a019 735c56d
Author: Santiago Pastorino 
Date:   2012-01-29 08:00:40 -0800

    Merge pull request #4739 from nashby/refactor-date-helper
    
    tiny refactoring of date_helper

commit 7be0b7e	refs/heads/master
Author: Peter Vandenabeele 
Date:   2012-01-29 16:31:23 +0100

    Set default_timezone explicitly for a test in activerecord/../base_test.rb

M	activerecord/test/cases/base_test.rb

commit 735c56d	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-01-29 01:17:57 +0300

    tiny refactoring
    
    use :default option with translate method instead of condition
    simplify separator method

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_i18n_test.rb

commit 786a019	refs/heads/master
Merge: d5ddc6c 2a8f34a
Author: Santiago Pastorino 
Date:   2012-01-29 07:24:39 -0800

    Merge pull request #4741 from pacoguzman/initialize_variable_not_needed
    
    Remove initialize variable columnn, not needed

commit 2a8f34a	refs/heads/master
Author: Paco Guzman 
Date:   2012-01-29 15:31:38 +0100

    Remove initialize variable columnn, not needed

M	activerecord/lib/active_record/validations/uniqueness.rb

commit d5ddc6c	refs/heads/master
Merge: fd3211e 95a9356
Author: José Valim 
Date:   2012-01-29 03:35:00 -0800

    Merge pull request #4740 from castlerock/remove_autoload_UrlWriter
    
    remove autoload UrlWriter, no longer exists

commit 95a9356	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-29 17:00:37 +0530

    remove autoload UrlWriter, no longer exists

M	actionpack/lib/action_controller.rb

commit 336ff8a	refs/heads/master
Author: Manoj 
Date:   2012-01-28 00:18:59 +0530

    has_many/has_one, :dependent => :restrict, deprecation added.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/locale/en.yml
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit 2352b50	refs/heads/master
Author: Paul McMahon 
Date:   2012-01-29 13:27:47 +0900

    Decouple finding matching class from instantiation

M	activerecord/lib/active_record/dynamic_finder_match.rb

commit 4b96dd7	refs/heads/master
Author: Jens Lukowski 
Date:   2012-01-28 22:54:55 +0100

    failing test case for Issue 4718

M	activerecord/test/cases/identity_map_test.rb

commit 695ec8e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-28 18:21:22 -0200

    Improve active record associations guide a bit
    
    * Use right example for has_many :find method;
    * Reword has_many :counter_sql doc notes.

M	railties/guides/source/association_basics.textile

commit c11e78c	refs/heads/master
Author: arton 
Date:   2012-01-29 05:06:14 +0900

    run direcly $0 if rake invoked by Windows batch file.

M	actionpack/lib/sprockets/assets.rake

commit 856f13a	refs/heads/master
Author: Brook Riggio 
Date:   2012-01-27 23:24:23 -0800

    Whitespace only: Use single newline at end of file.
    
    Bring these files into accordance with the prevailing convention.

M	README.rdoc
M	install.rb
M	load_paths.rb

commit fe12497	refs/heads/master
Author: Paul McMahon 
Date:   2012-01-28 10:42:44 +0900

    Move argument validation into match

M	activerecord/lib/active_record/dynamic_finder_match.rb
M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/lib/active_record/dynamic_scope_match.rb

commit 1be248e	refs/heads/master
Author: Paul McMahon 
Date:   2012-01-28 10:32:33 +0900

    Extract different DynamicFinderMatch subclasses

M	activerecord/lib/active_record/dynamic_finder_match.rb

commit fd3211e	refs/heads/master
Merge: c0dafb6 2d62334
Author: Santiago Pastorino 
Date:   2012-01-27 17:15:46 -0800

    Merge pull request #4731 from ndbroadbent/revert_build_original_fullpath
    
    Reverted build_original_fullpath method refactor

commit 2d62334	refs/heads/master
Author: Nathan Broadbent 
Date:   2012-01-28 09:12:18 +0800

    Reverted build_original_fullpath method, as per discussion at https://github.com/rails/rails/pull/4470/files#r393461

M	railties/lib/rails/application.rb

commit c0dafb6	refs/heads/master
Merge: b495a8d b09aca6
Author: Santiago Pastorino 
Date:   2012-01-27 17:02:13 -0800

    Merge pull request #4730 from carlosantoniodasilva/patch-1
    
    Remove not used env[] call in routing_test.

commit b09aca6	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-27 19:48:53 -0200

    Remove not used env[] call in routing_test.
    
    The commit 4c321c6d42b6e35f9ead12eb1dccdead03c5abf4 removes the path_params variable assignment, actually the entire line is not used at all.

M	actionpack/test/dispatch/routing_test.rb

commit b495a8d	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-01-27 20:43:49 +0100

    Inline the prefix assignment so it doesnt look so daft

M	activesupport/lib/active_support/cache.rb

commit 83dbef6	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2012-01-27 20:41:37 +0100

    Revert "Fix expanding cache key for single element arrays"
    
    This reverts commit abe915f23777efe10f17d611bf5718ca855a0704.
    
    This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit f78cb55	refs/tags/v3.2.5
Author: David Heinemeier Hansson 
Date:   2012-01-27 20:43:49 +0100

    Inline the prefix assignment so it doesnt look so daft

M	activesupport/lib/active_support/cache.rb

commit 66b445c	refs/tags/v3.2.5
Author: David Heinemeier Hansson 
Date:   2012-01-27 20:41:37 +0100

    Revert "Fix expanding cache key for single element arrays"
    
    This reverts commit abe915f23777efe10f17d611bf5718ca855a0704.
    
    This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 69816a8	refs/heads/master
Merge: a8da5d8 080bd83
Author: Aaron Patterson 
Date:   2012-01-27 10:16:14 -0800

    Merge pull request #4726 from rafaelfranca/create_join_table
    
    Add create_join_table migration helper to create HABTM join tables

commit a8da5d8	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-27 23:32:33 +0530

    fix a small typo [ci skip]

M	railties/test/application/configuration_test.rb

commit 080bd83	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-27 14:57:43 -0200

    Add `create_join_table` migration helper to create HABTM join tables

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/migration/command_recorder.rb
A	activerecord/lib/active_record/migration/join_table.rb
M	activerecord/test/cases/migration/change_schema_test.rb
M	activerecord/test/cases/migration/command_recorder_test.rb
A	activerecord/test/cases/migration/create_join_table_test.rb
M	railties/guides/source/migrations.textile

commit 2fd9816	refs/heads/master
Merge: 578c94a f4d9ba0
Author: Aaron Patterson 
Date:   2012-01-27 09:09:33 -0800

    Merge pull request #4709 from ask4prasath/refactor_validation_test
    
    Removed unwanted intializer and replaced with ruby default collect method

commit 578c94a	refs/heads/master
Merge: 25d5c94 2e7d6ff
Author: Aaron Patterson 
Date:   2012-01-27 08:51:41 -0800

    Merge pull request #4722 from kennyj/fix_4708
    
    Remove redundant instance variables (@colorize_logging)

commit 25d5c94	refs/heads/master
Merge: 0341ca1 4c321c6
Author: Aaron Patterson 
Date:   2012-01-27 08:46:36 -0800

    Merge pull request #4724 from kennyj/fix_warning_20120128
    
    Fix warning. assigned but unused variable - path_params

commit 4c321c6	refs/heads/master
Author: kennyj 
Date:   2012-01-28 01:16:32 +0900

    Fix warning. assigned but unused variable - path_params

M	actionpack/test/dispatch/routing_test.rb

commit 0341ca1	refs/heads/master
Merge: f22a0e2 9d119c5
Author: José Valim 
Date:   2012-01-27 06:16:06 -0800

    Merge pull request #4721 from ab9/fix_has_secure_password_doc
    
    Fix documentation for has_secure_password

commit 2e7d6ff	refs/heads/master
Author: kennyj 
Date:   2012-01-27 23:01:14 +0900

    Remove redundant instance_variables (@colorize_logging)

M	railties/lib/rails/application/configuration.rb
M	railties/test/application/configuration_test.rb

commit 9d119c5	refs/heads/master
Author: Aaron Beckerman 
Date:   2012-01-28 00:53:02 +1100

    fix example code in documentation for has_secure_password

M	activemodel/lib/active_model/secure_password.rb

commit 2e5ec3b	refs/tags/v3.2.5
Merge: 1c5bd8a defb751
Author: José Valim 
Date:   2012-01-27 13:14:37 +0100

    Merge check box fixes from remote-tracking branch 'cantonio/checkbox-hidden-backport' into 3-2-stable

commit defb751	refs/tags/v3.2.5
Author: Damien Mathieu <42@dmathieu.com>
Date:   2012-01-06 17:14:49 +0100

    don't set the hidden checkbox value if it's nil

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 19be5ea	refs/tags/v3.2.5
Author: Tadas Tamošauskas 
Date:   2012-01-05 22:35:10 +0000

    check_box helper with :disabled => true generates disabled hidden field. fixes #1953

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 1c5bd8a	refs/tags/v3.2.5
Author: Jon Leighton 
Date:   2012-01-27 01:28:54 -0800

    Merge pull request #4715 from pwim/find-create-multi-args
    
    Fix regression from Rails 3.1

M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/test/cases/finder_test.rb

commit f22a0e2	refs/heads/master
Merge: faaf694 7b9baee
Author: Jon Leighton 
Date:   2012-01-27 01:28:54 -0800

    Merge pull request #4715 from pwim/find-create-multi-args
    
    Fix regression from Rails 3.1

commit 532cd49	refs/heads/master
Author: Mark McSpadden 
Date:   2012-01-27 02:20:13 -0600

    Add Inflection test (and fixes) to ensure singularizing a singular actually give you the correct singular in more cases

M	activesupport/lib/active_support/inflections.rb
M	activesupport/test/inflector_test.rb

commit faaf694	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-26 20:23:10 -0700

    Disagree with @spastorino, @jonleighton, @tenderlove on 51ccb7f59c83120bf6869f1febfebaec44bcface
    
    Same-level method visibility disappears into the syntax. Indent (and
    outdent) emphasize the state change that accompanies the declaration.
    All methods following 'private' are private: that's a natural
    hierarchy worthy of visual reinforcement.
    
    Outdent, represent!  :trollface:

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 7b9baee	refs/heads/master
Author: Paul McMahon 
Date:   2012-01-25 17:27:42 +0900

    Fix regression from Rails 3.1
    
    Under Rails 3.1, you were allowed to pass a hash to a find_or_create
    method with multiple attribute names, but this was broken as the
    arguments were being improperly validated.

M	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/test/cases/finder_test.rb

commit f1baf8f	refs/heads/master
Merge: e634efc b03e55d
Author: Piotr Sarnacki 
Date:   2012-01-26 16:12:20 -0800

    Merge pull request #4713 from carlosantoniodasilva/form-label-for
    
    Do not generate label for attribute when giving nil

commit 8e6ef37	refs/tags/v3.2.5
Author: Xavier Noria 
Date:   2012-01-26 15:46:47 -0800

    fixes whitespace in CHANGELOG entries

M	actionmailer/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activeresource/CHANGELOG.md

commit b03e55d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-26 20:46:43 -0200

    Do not generate label for attribute when giving nil

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/tags/label.rb
M	actionpack/test/template/form_helper_test.rb

commit 69aeecd	refs/heads/master
Author: dev 
Date:   2012-01-26 18:16:10 -0500

    Updates documentaton to indicate that :expires_in can be used with all cache stores.

M	actionpack/lib/action_controller/caching/actions.rb

commit 67b8fbc	refs/tags/v3.2.1 (tag: v3.2.1)
Author: Xavier Noria 
Date:   2012-01-26 14:54:02 -0800

    updating RAILS_VERSION

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 97e8d1d	refs/tags/v3.2.1
Author: Xavier Noria 
Date:   2012-01-26 14:28:48 -0800

    CHANGELOG revision for v3.2.1

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit c134f24	refs/tags/v3.2.1
Author: José Valim 
Date:   2012-01-26 20:48:09 +0100

    Revert usage of safe constantize
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/test_case.rb

commit 6c367a0	refs/tags/v3.2.1
Author: Alex Tambellini 
Date:   2012-01-26 14:19:49 -0500

    safe_constantize should handle wrong constant name NameErrors Fixes #4710
    
    Signed-off-by: José Valim 

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/constantize_test_cases.rb

commit e634efc	refs/heads/master
Author: José Valim 
Date:   2012-01-26 20:48:09 +0100

    Revert usage of safe constantize

M	actionpack/lib/action_view/test_case.rb

commit 5dab9bd	refs/heads/master
Merge: 82ba5c4 7598284
Author: José Valim 
Date:   2012-01-26 11:41:58 -0800

    Merge pull request #4711 from atambo/master
    
    3.2 safe_constantize should handle wrong constant name NameErrors Fixes #4710

commit 7598284	refs/heads/master
Author: Alex Tambellini 
Date:   2012-01-26 14:19:49 -0500

    safe_constantize should handle wrong constant name NameErrors Fixes #4710

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/constantize_test_cases.rb

commit f4d9ba0	refs/heads/master
Author: prasath 
Date:   2012-01-27 00:13:46 +0530

    Removed unwanted intializer and replaced with ruby default collect method

M	activemodel/test/cases/validations_test.rb

commit 70cbb1c	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-26 10:23:36 -0800

    bumping journey to 1.0.1

M	actionpack/actionpack.gemspec

commit 82ba5c4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-26 10:23:36 -0800

    bumping journey to 1.0.1

M	actionpack/actionpack.gemspec

commit 33fda1c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-26 09:41:04 -0800

    Merge pull request #4696 from rafaelfranca/issue-4653
    
    Remove extra attributes from HABTM join tables in AR tests

M	activerecord/test/schema/schema.rb

commit 5ac5acd	refs/tags/v3.2.1
Merge: 7ba3ecc 06dcd9c
Author: Aaron Patterson 
Date:   2012-01-26 09:41:04 -0800

    Merge pull request #4696 from rafaelfranca/issue-4653
    
    Remove extra attributes from HABTM join tables in AR tests

commit 7ba3ecc	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-26 09:24:14 -0800

    global variables may not be set depending on the match. fixes #4703

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/safe_buffer_test.rb

commit ef7fc6e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-26 09:24:14 -0800

    global variables may not be set depending on the match. fixes #4703

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/safe_buffer_test.rb

commit ad1b2aa	refs/heads/master
Merge: 9725c0c abb1423
Author: Vijay Dev 
Date:   2012-01-26 08:32:07 -0800

    Merge pull request #4699 from mattdbridges/typo_fix
    
    Fixed small typo in ActveRecord/CHANGELOG.md

commit abb1423	refs/heads/master
Author: Matt Bridges 
Date:   2012-01-26 08:51:41 -0600

    Fixed small typo in ActveRecord/CHANGELOG.md

M	activerecord/CHANGELOG.md

commit 06dcd9c	refs/tags/v3.2.1
Author: Rafael Mendonça França 
Date:   2012-01-26 10:32:10 -0200

    Remove extra attributes from HABTM join tables in AR tests
    
    HABTM Join tables should not have extra attributes
    
    When extra attributes is needed in HABTM join tables is better to use
    `has_many :through` association.
    
    Fix #4653

M	activerecord/test/schema/schema.rb

commit 9725c0c	refs/heads/master
Author: Xavier Noria 
Date:   2012-01-26 13:12:04 +0100

    syncs 3-2-stable CHANGELOGs in master

M	activerecord/CHANGELOG.md

commit 2809375	refs/tags/v3.2.1
Author: Xavier Noria 
Date:   2012-01-26 13:04:40 +0100

    registers 2483460 in the CHANGELOG

M	activerecord/CHANGELOG.md

commit 8fab395	refs/heads/master
Author: José Valim 
Date:   2012-01-26 12:12:54 +0100

    Revert "Merge pull request #4690 from jdutil/filter_password_confirmation"
    
    This reverts commit eafa1c429835e099897a0da90bc39d9dbbb7ed4e, reversing
    changes made to f251437415f7b803f7a84118fcc970a111ace266.

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit eafa1c4	refs/heads/master
Merge: f251437 521fedc
Author: José Valim 
Date:   2012-01-26 02:56:29 -0800

    Merge pull request #4690 from jdutil/filter_password_confirmation
    
    Add :password_confirmation as a filtered param by default.

commit 2483460	refs/tags/v3.2.1
Author: Xavier Noria 
Date:   2012-01-26 02:50:46 -0800

    disable automatic explain if there is no logger [closes #4671]

M	activerecord/lib/active_record/explain.rb
M	activerecord/test/cases/explain_test.rb
M	railties/guides/source/active_record_querying.textile

commit f251437	refs/heads/master
Author: Xavier Noria 
Date:   2012-01-26 02:50:46 -0800

    disable automatic explain if there is no logger [closes #4671]

M	activerecord/lib/active_record/explain.rb
M	activerecord/test/cases/explain_test.rb
M	railties/guides/source/active_record_querying.textile

commit 521fedc	refs/heads/master
Author: Jeff Dutil 
Date:   2012-01-26 05:37:23 -0500

    Add :password_confirmation as a filtered param by default.

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit d11347d	refs/heads/master
Merge: c00d77f 6d426b1
Author: Xavier Noria 
Date:   2012-01-26 02:00:24 -0800

    Merge pull request #4689 from claudiob/add_rails32_release_date
    
    Add release date of Rails 3.2.0 to documentation

commit 3a087b8	refs/tags/v3.2.1
Author: brainopia 
Date:   2012-01-26 10:04:57 +0400

    Fix contributing guide to reflect preferred position on indentation
    
    Fix incorrect recommendation from indenting after private/protected to not.
    
    Based on opinions of @spastorino, @jonleighton, @tenderlove
    
    https://github.com/rails/rails/pull/1838#issuecomment-1440281
    https://en.twitter.com/#!/spastorino/status/142054749351575552
    https://en.twitter.com/#!/tenderlove/status/142014046445641728
    https://en.twitter.com/#!/jonleighton/status/142021813415841794

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 6d426b1	refs/heads/master
Author: claudiob 
Date:   2012-01-26 01:53:38 -0800

    Add release date of Rails 3.2.0 to documentation

M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit c00d77f	refs/heads/master
Merge: c6efa0d 6e46b3b
Author: José Valim 
Date:   2012-01-26 00:37:57 -0800

    Merge pull request #4687 from lest/patch-2
    
    fix fixtures test as table_name is a string now

commit 6e46b3b	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-26 11:10:52 +0300

    fix fixtures test as table_name is a string now

M	activerecord/test/cases/fixtures_test.rb

commit c6efa0d	refs/heads/master
Merge: 70b0598 1873adf
Author: Xavier Noria 
Date:   2012-01-25 23:53:06 -0800

    Merge pull request #4684 from rossmeissl/patch-1
    
    Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit URL

commit 70b0598	refs/heads/master
Merge: 6a7d378 51ccb7f
Author: Xavier Noria 
Date:   2012-01-25 23:50:52 -0800

    Merge pull request #4685 from brainopia/fix_contribute_guide
    
    Fix contributing guide to reflect preferred position on indentation

commit 36d7af3	refs/tags/v3.2.1
Author: Sergey Nartimov 
Date:   2012-01-26 10:12:12 +0300

    call to_s on value passed to table_name=
    
    Signed-off-by: José Valim 

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit 6a7d378	refs/heads/master
Merge: ba5a334 db48ee3
Author: José Valim 
Date:   2012-01-25 23:19:13 -0800

    Merge pull request #4686 from lest/patch-2
    
    call to_s on value passed to table_name=

commit db48ee3	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-26 10:12:12 +0300

    call to_s on value passed to table_name=

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit ba5a334	refs/heads/master
Author: José Valim 
Date:   2012-01-26 08:06:37 +0100

    Use content_tag_for with array by default on scaffold.

M	railties/CHANGELOG.md
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb

commit 345ac29	refs/heads/master
Merge: 522c0fd 858f464
Author: José Valim 
Date:   2012-01-25 22:39:26 -0800

    Merge pull request #4679 from lest/patch-1
    
    AssetTagHelper improvements

commit 51ccb7f	refs/heads/master
Author: brainopia 
Date:   2012-01-26 10:04:57 +0400

    Fix contributing guide to reflect preferred position on indentation
    
    Fix incorrect recommendation from indenting after private/protected to not.
    
    Based on opinions of @spastorino, @jonleighton, @tenderlove
    
    https://github.com/rails/rails/pull/1838#issuecomment-1440281
    https://en.twitter.com/#!/spastorino/status/142054749351575552
    https://en.twitter.com/#!/tenderlove/status/142014046445641728
    https://en.twitter.com/#!/jonleighton/status/142021813415841794

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 1873adf	refs/heads/master
Author: Andy Rossmeissl 
Date:   2012-01-25 23:36:06 -0500

    Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit URL.
    
    Theoretically this would future-proof Gemfiles against possible (albeit unlikely) change in the rubygems URL.

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit d222211	refs/heads/master
Author: Daniel Fone 
Date:   2012-01-26 15:09:04 +1300

    [ci skip] More docs for ActiveSupport::MessageEncryptor

M	activesupport/lib/active_support/message_encryptor.rb

commit 522c0fd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-25 14:42:08 -0800

    The primary key is always initialized in the @attributes hash to nil (unless
    another value has been specified).

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/serialization_test.rb

commit 858f464	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-26 01:13:00 +0300

    reuse common video/audio tags code and do not modify options

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit fc54787	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-26 01:11:24 +0300

    do not modify options in image_tag

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 0920065	refs/heads/master
Merge: 73c53cd 08e5104
Author: José Valim 
Date:   2012-01-25 11:28:22 -0800

    Merge pull request #4676 from lest/patch-1
    
    allow to pass multiple sources to audio/video tags without using array

commit 08e5104	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-25 22:21:53 +0300

    allow to pass multiple sources to audio/video tags without using array

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 73c53cd	refs/heads/master
Merge: e2edfe1 bedb66e
Author: Vijay Dev 
Date:   2012-01-25 11:18:48 -0800

    Merge pull request #4529 from ask4prasath/refactor
    
    Refactored class methods on address render test

commit 1a93eaa	refs/tags/v3.2.1
Merge: b023921 c9cd0eb
Author: Aaron Patterson 
Date:   2012-01-25 11:13:13 -0800

    Merge pull request #4675 from lunks/3-2-stable
    
    Duping log handler on buffered logger silencer.

commit b023921	refs/tags/v3.2.1
Merge: a267090 2d73f70
Author: Vijay Dev 
Date:   2012-01-25 11:09:59 -0800

    Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2
    
    Validation guides update 3 2

commit e2edfe1	refs/heads/master
Merge: 203771d b258bec
Author: Aaron Patterson 
Date:   2012-01-25 11:07:22 -0800

    Merge pull request #4645 from brainopia/deprecate_datetime_local_offset
    
    Deprecate DateTime.local_offset

commit b258bec	refs/heads/master
Author: brainopia 
Date:   2012-01-25 00:07:58 +0400

    Deprecate DateTime.local_offset

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/date_time/conversions.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit c9cd0eb	refs/tags/v3.2.1
Author: Pedro Nascimento 
Date:   2012-01-25 16:53:51 -0200

    Duping log handler. fixes #4668

M	activesupport/lib/active_support/buffered_logger.rb

commit 2d73f70	refs/tags/v3.2.1
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:57:46 -0200

    Fix callbacks order for destroying an object in validations guide
    
    Also add around save to creating/updating callbacks order, and fix save
    example with no validation

M	railties/guides/source/active_record_validations_callbacks.textile

commit 79a0488	refs/tags/v3.2.1
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:49:10 -0200

    Improve field error proc example in validations guide

M	railties/guides/source/active_record_validations_callbacks.textile

commit eb171fa	refs/tags/v3.2.1
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:31:00 -0200

    Change ActiveRecord::Errors to ActiveModel::Errors in guides
    
    Use ActiveModel::Errors in inflection example docs as well.
    
    Also fixes wrong information and link to locale file related to
    Errors#full_messages in I18n guide.

M	activeresource/lib/active_resource/validations.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_resource_basics.textile
M	railties/guides/source/i18n.textile

commit 6a85c45	refs/tags/v3.2.1
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:10:35 -0200

    Fix custom validation methods section in AR validations and callbacks guide
    
    The methods validate_on_create and validate_on_update are not available
    anymore in Rails, this removes them from the guide and adds an example
    on how to use validate with the :on option.

M	railties/guides/source/active_record_validations_callbacks.textile

commit a267090	refs/tags/v3.2.1
Author: Rohit Arondekar 
Date:   2012-01-25 10:35:51 +0530

    remove extra 'the'

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit fd9d394	refs/tags/v3.2.1
Author: Damian Le Nouaille 
Date:   2012-01-23 01:15:51 +0100

    example bracket error

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 203771d	refs/heads/master
Merge: c421870 368f0fe
Author: Vijay Dev 
Date:   2012-01-26 00:00:40 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 8a6a3e6	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-21 19:44:03 -0200

    Refactor button_to to avoid calling method#to_s twice
    
    Reorganize button_to implementation a bit.
    Also small refactor on current_page? method.

M	actionpack/lib/action_view/helpers/url_helper.rb

commit f7746e9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-21 19:26:17 -0200

    Change OrderedHash with array options to simple hash usage

M	actionpack/test/template/url_helper_test.rb

commit 368f0fe	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-25 23:57:44 +0530

    Revert "Added Apache configuration for dynamic gzip content"
    
    This reverts commit fce92fd8a7e407b034d189a652af81a06ac98730.
    
    Reason: We want any config that goes into the guides to be 100% right
    and I'm not entirely sure that this one is it. We already had a similar
    config that was removed in
    https://github.com/rails/rails/commit/b1c20e37eccdfab7bb94d34f249c5e49256b9980

M	railties/guides/source/asset_pipeline.textile

commit b32ebf0	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-25 23:57:33 +0530

    minor text change [ci skip]

M	railties/guides/source/getting_started.textile

commit c421870	refs/heads/master
Merge: eee5a6c bf31d7b
Author: Aaron Patterson 
Date:   2012-01-25 09:40:45 -0800

    Merge pull request #4644 from ask4prasath/refactor_test
    
    Replaced unwanted method and added to accessor for getter history

commit eee5a6c	refs/heads/master
Merge: aa8ebea 9cb00a4
Author: Aaron Patterson 
Date:   2012-01-25 09:31:29 -0800

    Merge pull request #4646 from lest/patch-1
    
    no need in separate MiniTest modules

commit aa8ebea	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-25 09:22:19 -0800

    Merge pull request #4658 from pwim/unicode-paths
    
    Test for unicode path support

M	actionpack/test/dispatch/routing_test.rb

commit 0581c1a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-24 17:56:17 -0800

    use fetch rather than both Hash#key? and Hash#[]

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 11e88a4	refs/tags/v3.2.1
Merge: 9e9e17a 22980e0
Author: Aaron Patterson 
Date:   2012-01-25 09:22:19 -0800

    Merge pull request #4658 from pwim/unicode-paths
    
    Test for unicode path support

commit 73e71c2	refs/heads/master
Author: Jonathan del Strother 
Date:   2012-01-25 15:02:20 +0000

    Fix translate_error reference for Error#add documentation

M	activemodel/lib/active_model/errors.rb

commit 148f849	refs/heads/master
Merge: a3b3643 f54b846
Author: José Valim 
Date:   2012-01-25 06:59:09 -0800

    Merge pull request #4524 from nashby/datetime-18-code
    
    remove ruby 1.8 related code

commit a3b3643	refs/heads/master
Merge: a6aea14 74fabdf
Author: José Valim 
Date:   2012-01-25 05:15:09 -0800

    Merge pull request #4667 from carlosantoniodasilva/av-number-helper
    
    Action View number helpers improvements

commit 74fabdf	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-25 10:30:32 -0200

    Do not mutate given options hash in number helpers

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit c753e3a	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-21 10:36:37 -0200

    Refactor percentage helper

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 1e78fed	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-21 10:34:06 -0200

    Refactor float number parsing

M	actionpack/lib/action_view/helpers/number_helper.rb

commit fb22f93	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-21 10:21:32 -0200

    Improve getting translations for number helpers

M	actionpack/lib/action_view/helpers/number_helper.rb

commit b844bf6	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:57:46 -0200

    Fix callbacks order for destroying an object in validations guide
    
    Also add around save to creating/updating callbacks order, and fix save
    example with no validation

M	railties/guides/source/active_record_validations_callbacks.textile

commit 0186c5d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:49:10 -0200

    Improve field error proc example in validations guide

M	railties/guides/source/active_record_validations_callbacks.textile

commit 84bd203	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:31:00 -0200

    Change ActiveRecord::Errors to ActiveModel::Errors in guides
    
    Use ActiveModel::Errors in inflection example docs as well.
    
    Also fixes wrong information and link to locale file related to
    Errors#full_messages in I18n guide.

M	activeresource/lib/active_resource/validations.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_resource_basics.textile
M	railties/guides/source/i18n.textile

commit a6aea14	refs/heads/master
Merge: 40295aa 7d93e81
Author: José Valim 
Date:   2012-01-25 03:12:13 -0800

    Merge pull request #4661 from janko-m/master
    
    Modify video_tag a bit and make audio_tag able to accept multiple sources

commit cd9a3b0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-25 09:10:35 -0200

    Fix custom validation methods section in AR validations and callbacks guide
    
    The methods validate_on_create and validate_on_update are not available
    anymore in Rails, this removes them from the guide and adds an example
    on how to use validate with the :on option.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 7d93e81	refs/heads/master
Author: Janko Marohnić 
Date:   2012-01-25 11:52:49 +0100

    Make audio_tag able to receive multiple sources

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 3339293	refs/heads/master
Author: Janko Marohnić 
Date:   2012-01-25 11:52:34 +0100

    Make path_to_video in video_tag apply to each source

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 40295aa	refs/heads/master
Merge: b1f8ba1 6cde635
Author: José Valim 
Date:   2012-01-25 00:34:09 -0800

    Merge pull request #4651 from paul/mysql-add-index-bug
    
    Handle nil in add_index :length option in MySQL

commit 22980e0	refs/tags/v3.2.1
Author: Paul McMahon 
Date:   2012-01-25 15:27:33 +0900

    Test for unicode path support
    
    This is currently broken due to a bug in journey.

M	actionpack/test/dispatch/routing_test.rb

commit 8728575	refs/heads/master
Author: Rohit Arondekar 
Date:   2012-01-25 10:35:51 +0530

    remove extra 'the'

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 9e9e17a	refs/tags/v3.2.1
Merge: 1d67f1a 75d58fe
Author: José Valim 
Date:   2012-01-24 19:52:45 -0800

    Merge pull request #4654 from pwim/explicit-deprecation-require
    
    Explicit deprecation require

commit 75d58fe	refs/tags/v3.2.1
Author: Paul McMahon 
Date:   2012-01-25 11:14:01 +0900

    allow requiring of 'active_model/naming'
    
    Requiring 'active_model/naming' will raise an uninitialized constant
    ActiveSupport::Deprecation exception because the module core extension
    doesn't require 'active_support/deprecation'. This require cannot be
    added to the core extension because of circular dependency issues.

M	activemodel/lib/active_model/naming.rb

commit 1d67f1a	refs/tags/v3.2.1
Merge: dc81d00 59a408e
Author: Aaron Patterson 
Date:   2012-01-24 15:06:27 -0800

    Merge pull request #4639 from joevandyk/datetime-infinity-select-fix
    
    datetime_select fix for dates of -infinity and +infinity

commit 6cde635	refs/heads/master
Author: Paul Sadauskas 
Date:   2012-01-24 14:22:24 -0700

    Handle nil in add_index :length option in MySQL
    
    Our schema.rb is being generated with an `add_index` line similar to this:
    
        add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}
    
    This is the same as it was on Rails 3.1.3, however, now when that
    schema.rb is evaluated, its generating bad SQL in MySQL:
    
        Mysql::Error: You have an error in your SQL syntax; check the manual
        that corresponds to your MySQL server version for the right syntax
        to use near '))' at line 1: CREATE UNIQUE INDEX
        `xxx` ON `foo` (`foo`(8), `bar`())
    
    This commit adds a check for nil on the length attribute to prevent the
    empty parens from being output.

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/migration/index_test.rb

commit b1f8ba1	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-24 18:06:41 -0200

    Remove unused variables to avoid warnings
    
    Signed-off-by: José Valim 

M	actionpack/test/template/date_helper_test.rb

commit dc81d00	refs/tags/v3.2.1
Merge: 5a66d33 3cd28e2
Author: José Valim 
Date:   2012-01-24 12:38:02 -0800

    Merge pull request #4643 from rafaelfranca/3-2-stable
    
    Remove unused variables to avoid warnings

commit 9cb00a4	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-24 23:25:51 +0300

    no need in separate MiniTest modules

M	activesupport/lib/active_support/testing/isolation.rb
M	activesupport/lib/active_support/testing/performance.rb

commit 6a88302	refs/heads/master
Merge: 6fe02f9 d579df9
Author: Aaron Patterson 
Date:   2012-01-24 12:07:56 -0800

    Merge pull request #4606 from lest/patch-1
    
    remove unnecessary AS::Concern usage

commit 3cd28e2	refs/tags/v3.2.1
Author: Rafael Mendonça França 
Date:   2012-01-24 18:06:41 -0200

    Remove unused variables to avoid warnings

M	actionpack/test/template/date_helper_test.rb

commit bf31d7b	refs/heads/master
Author: prasath 
Date:   2012-01-25 01:34:04 +0530

    Removing unwanted method and adding to accessor for getter history

M	activemodel/test/cases/validations/callbacks_test.rb

commit 6fe02f9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-24 12:01:35 -0800

    deprecated AR::TestCase in favor of AS::TestCase

M	activerecord/lib/active_record/test_case.rb

commit dcf0558	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-24 11:45:04 -0800

    Moving AR::TestCase in to the AR tests directory

M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/helper.rb
A	activerecord/test/cases/test_case.rb

commit c973fc7	refs/heads/master
Author: José Valim 
Date:   2012-01-24 11:35:11 -0800

    Merge pull request #4641 from rafaelfranca/date_select-fix-3-2
    
    date_select fixes [3-2-stable]

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 5a66d33	refs/tags/v3.2.1
Merge: e0fe62b c4b7ca0
Author: José Valim 
Date:   2012-01-24 11:35:11 -0800

    Merge pull request #4641 from rafaelfranca/date_select-fix-3-2
    
    date_select fixes [3-2-stable]

commit c67ff97e	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2012-01-24 11:16:39 -0800

    Merge pull request #4514 from brainopia/update_timezone_offets
    
    Update time zone offset information

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb

commit 423241c	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2012-01-24 11:16:39 -0800

    Merge pull request #4514 from brainopia/update_timezone_offets
    
    Update time zone offset information

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb

commit e0fe62b	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-24 11:16:39 -0800

    Merge pull request #4514 from brainopia/update_timezone_offets
    
    Update time zone offset information

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb

commit 8478b0c	refs/heads/master
Merge: ad6f689 e58a2df
Author: Aaron Patterson 
Date:   2012-01-24 11:16:39 -0800

    Merge pull request #4514 from brainopia/update_timezone_offets
    
    Update time zone offset information

commit c4b7ca0	refs/tags/v3.2.1
Author: Rafael Mendonça França 
Date:   2012-01-24 16:37:39 -0200

    Fix date_select with discard_month and discard_year options
    
    Closes #4553 and #4633

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit ad6f689	refs/heads/master
Merge: d26a166 9b654d4
Author: Aaron Patterson 
Date:   2012-01-24 10:34:09 -0800

    Merge pull request #3775 from karevn/master
    
    Please pull my changes - they fix a rare problem with tests framework

commit 59a408e	refs/tags/v3.2.1
Author: Joe Van Dyk 
Date:   2012-01-24 10:30:46 -0800

    datetime_select should work with -/+ infinity dates

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit d26a166	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-24 23:53:56 +0530

    fix some examples - method names can't start with a number

M	railties/guides/source/active_record_querying.textile

commit d92b5fe	refs/tags/v3.2.1
Author: Indrek Juhkam 
Date:   2012-01-20 18:42:04 +0200

    Fix date_select nil and blank and order case

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit d4cfc4c	refs/tags/v3.2.1
Author: Indrek Juhkam 
Date:   2012-01-20 14:13:21 +0200

    Add failing test for date_select
    
    date_select does not work when day is discarded, include blank option is
    enabled and struct date itself is nil.

M	actionpack/test/template/date_helper_test.rb

commit 82e2f19	refs/heads/master
Merge: 29aa20d 3fbc042
Author: Aaron Patterson 
Date:   2012-01-24 09:59:59 -0800

    Merge pull request #4630 from lest/patch-2
    
    Use instance_eval instead of Proc#bind

commit 29aa20d	refs/heads/master
Merge: 2580696 204aabc
Author: Aaron Patterson 
Date:   2012-01-24 09:53:10 -0800

    Merge pull request #4637 from railsaholic/error_message_fix
    
    quote fix ` to ' in the ArgumentError message

commit 204aabc	refs/heads/master
Author: Manoj 
Date:   2012-01-23 22:58:23 +0530

    quote fix ` to ' in the ArgumentError message
    
    message quote fix

M	activemodel/lib/active_model/observing.rb

commit 2580696	refs/heads/master
Merge: 3521598 4e79def
Author: Xavier Noria 
Date:   2012-01-24 07:55:13 -0800

    Merge pull request #4636 from sachin87/code_improved
    
    code improved with better condition

commit 4e79def	refs/heads/master
Author: Sachin87 
Date:   2012-01-24 21:18:37 +0530

    code improved

M	activeresource/lib/active_resource/http_mock.rb

commit 3521598	refs/heads/master
Merge: e23dbec b5636e4
Author: José Valim 
Date:   2012-01-24 04:40:41 -0800

    Merge pull request #4628 from rafaelfranca/fix-build
    
    Fix broken build

commit dc826f9	refs/tags/v3.2.1
Author: kennyj 
Date:   2012-01-22 03:23:40 +0900

    Fix GH #4344. A defined callback in extended module is called too.
    
    Conflicts:
    
    	activesupport/test/callbacks_test.rb

M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callbacks_test.rb

commit e23dbec	refs/heads/master
Merge: dea2523 5e59d75
Author: José Valim 
Date:   2012-01-24 00:51:44 -0800

    Merge pull request #4596 from kennyj/fix_4344
    
    Fix GH #4344. Callback defined in a module is not triggered when the module extends an object under Rails 3.2rc2

commit 5e59d75	refs/heads/master
Author: kennyj 
Date:   2012-01-22 03:23:40 +0900

    Fix GH #4344. A defined callback in extended module is called too.

M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callbacks_test.rb

commit 1a56a76	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-23 17:23:13 -0800

    work against 1-0-stable until a new journey is released

M	Gemfile

commit 3913b51	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-23 17:14:30 -0800

    Added custom regexps to ASTs that have literal nodes on either side of
    symbol nodes.  Fixes #4585

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb

commit dea2523	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-23 17:14:47 -0800

    initialized the @segment_keys instance variable

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 8d26f87	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-23 17:14:30 -0800

    Added custom regexps to ASTs that have literal nodes on either side of
    symbol nodes.  Fixes #4585

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb

commit 5da6b6e	refs/tags/v3.1.6
Author: Paweł Kondzior 
Date:   2012-01-16 23:52:55 -0800

    Fix ActiveModel::Errors#dup
    
    Since ActiveModel::Errors instance keeps all error messages as hash
    we should duplicate this object as well.
    
    Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash,
    which results in different behavior on dup, this may result in regression for
    people relying on it.
    
    Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this
    regression we need to backport #initialize_dup.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit f34e5a7	refs/tags/v3.1.6
Author: Piotr Sarnacki 
Date:   2012-01-16 17:22:44 +0100

    Add ActiveModel::Errors#delete, which was not available after move to use delegation

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 3fbc042	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-23 23:04:43 +0300

    Use instance_eval instead of Proc#bind
    
    Proc#bind is not useful when called immediately and previous check for #call method is not correct

M	actionmailer/lib/action_mailer/base.rb

commit fce92fd	refs/heads/master
Author: leprasmurf 
Date:   2012-01-23 14:13:33 -0500

    Added Apache configuration for dynamic gzip content

M	railties/guides/source/asset_pipeline.textile

commit b5636e4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-23 17:03:36 -0200

    Only show the type if column is present

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb

commit bce3b5c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-23 10:18:36 -0800

    moved the `get` testing method to a module

M	actionpack/test/abstract_unit.rb
M	actionpack/test/controller/routing_test.rb

commit 5e81021	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 15:13:01 -0800

    updated the warning signature

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit e848c52	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 15:12:30 -0800

    Deprecated multi args to http route methods

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 01176a7	refs/heads/master
Merge: 47addcc 920070e
Author: Aaron Patterson 
Date:   2012-01-23 09:47:20 -0800

    Merge pull request #4558 from stephencelis/type-cast-unknown-should-fail
    
    Don't type-cast unknown types to YAML.

commit 47addcc	refs/heads/master
Merge: e6c9902 1c49b61
Author: Aaron Patterson 
Date:   2012-01-23 09:45:05 -0800

    Merge pull request #4563 from amatsuda/ar_relation_pp
    
    let AR::Relation pretty_printed like an Array

commit e6c9902	refs/heads/master
Merge: a0ed45c 461834b
Author: Aaron Patterson 
Date:   2012-01-23 09:29:16 -0800

    Merge pull request #4576 from guilleiguaran/bump-required-rubygems-version
    
    Bump rubygems required version to 1.8.11 (default version in 1.9.3-p0)

commit a0ed45c	refs/heads/master
Merge: e407eb3 9d40c09
Author: Aaron Patterson 
Date:   2012-01-23 09:24:29 -0800

    Merge pull request #4581 from kennyj/remove_unused_argument
    
    Remove unused argument.

commit e407eb3	refs/heads/master
Merge: e3f26f0 4fc4966
Author: Aaron Patterson 
Date:   2012-01-23 09:08:01 -0800

    Merge pull request #4620 from carlosantoniodasilva/counter-cache-old-code
    
    Remove not used if..else clause

commit 4fc4966	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-23 15:04:25 -0200

    Remove not used if..else clause
    
    Related to #4614.

M	activerecord/lib/active_record/counter_cache.rb

commit b840461	refs/tags/v3.2.1
Merge: 912f144 d246da1
Author: José Valim 
Date:   2012-01-23 08:18:48 -0800

    Merge pull request #4601 from carlosantoniodasilva/patch-1
    
    Add missing require to Array#wrap in generators action methods

commit e3f26f0	refs/heads/master
Merge: 6785001 c976d2c
Author: José Valim 
Date:   2012-01-23 07:53:48 -0800

    Merge pull request #4617 from sachin87/remove_repetition
    
    alias_method added

commit c976d2c	refs/heads/master
Author: Sachin87 
Date:   2012-01-22 18:42:26 +0530

    alias_method added

M	actionpack/lib/action_view/flows.rb

commit 6785001	refs/heads/master
Merge: adb7568 88eede2
Author: José Valim 
Date:   2012-01-23 07:05:01 -0800

    Merge pull request #4614 from arunagw/unused_var_remove
    
    Unused var removed

commit 88eede2	refs/heads/master
Author: Arun Agrawal 
Date:   2012-01-23 10:02:41 -0500

    Unused var removed

M	activerecord/lib/active_record/counter_cache.rb

commit adb7568	refs/heads/master
Merge: ec65f14 5169543
Author: José Valim 
Date:   2012-01-23 06:18:38 -0800

    Merge pull request #4613 from pda/cookie_jar_deleted_predicate
    
    CookieJar#deleted? predicate method

commit 5169543	refs/heads/master
Author: Paul Annesley 
Date:   2012-01-24 00:10:43 +1100

    ActionDispatch::Cookies::CookieJar#deleted? predicate method.
    
    Necessary in controller tests to determine if the CookieJar will delete
    the given cookie.

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 912f144	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-23 16:17:56 +0530

    test base64 encode and decode

M	activesupport/test/core_ext/base64_ext_test.rb

commit 70d81b3	refs/tags/v3.2.1
Merge: ede01ce 44319ef
Author: Vijay Dev 
Date:   2012-01-23 02:42:17 -0800

    Merge pull request #4611 from jviney/3-2-stable
    
    Fix ActiveSupport::Base64.decode64

commit ec65f14	refs/heads/master
Merge: d4248fa 930245e
Author: José Valim 
Date:   2012-01-23 02:14:13 -0800

    Merge pull request #4612 from rafaelfranca/av-refactor
    
    Some improvements on ActionView::Helpers::Tags

commit 930245e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-23 07:57:30 -0200

    Raise a better error if anyone wants to create your own ActionView::Helpers::Tags::Base child and do not implement the render method

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/test/template/form_helper_test.rb

commit fcfe1fa	refs/heads/master
Author: Akira Matsuda 
Date:   2012-01-18 17:40:50 +0900

    properly memoize {field_type,select_type} as class variable

M	actionpack/lib/action_view/helpers/tags/date_select.rb
M	actionpack/lib/action_view/helpers/tags/text_field.rb

commit bf5f483	refs/heads/master
Author: Akira Matsuda 
Date:   2012-01-18 17:39:53 +0900

    no need to module_eval here anymore

M	actionpack/lib/action_view/helpers/active_model_helper.rb

commit b184fab	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-23 07:32:12 -0200

    Use ActiveSupport::Autoload to autoload the tags

M	actionpack/lib/action_view/helpers/tags.rb

commit 2bcfdec	refs/heads/master
Author: ciastek 
Date:   2012-01-23 09:48:34 +0100

    use CamelCase convention for "tag" model name

M	railties/guides/source/getting_started.textile

commit 44319ef	refs/tags/v3.2.1
Author: Jonathan Viney 
Date:   2012-01-23 21:37:10 +1300

    The deprecated ActiveSupport::Base64.decode64 method should call ::Base64.decode64 not ::Base64.encode64

M	activesupport/lib/active_support/base64.rb

commit d4248fa	refs/heads/master
Merge: 2b74a13 c075ca4
Author: José Valim 
Date:   2012-01-22 23:26:26 -0800

    Merge pull request #4610 from lest/patch-2
    
    use rack 1.4.1

commit c075ca4	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-23 10:23:02 +0300

    use rack 1.4.1

M	Gemfile
M	actionpack/actionpack.gemspec
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 2b74a13	refs/heads/master
Merge: 14e8ca6 88ec722
Author: José Valim 
Date:   2012-01-22 23:11:08 -0800

    Merge pull request #4608 from indrekj/translated_date_order
    
    Raise exception when date.order includes invalid elements

commit 14e8ca6	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-22 17:51:32 -0700

    Clean up http config

M	activeresource/lib/active_resource/connection.rb
M	activeresource/test/cases/connection_test.rb

commit 5d9105e	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-22 17:34:28 -0700

    Clean up SSL client cert example

M	activeresource/lib/active_resource/base.rb

commit 259c9ce	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-22 17:27:22 -0700

    Prefer to document with https:// example URLs and no port numbers

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/custom_methods.rb
M	activeresource/test/fixtures/street_address.rb

commit 60615a4	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-22 17:22:40 -0700

    Describe Basic and Digest authentication. Document how to set auth_type to :digest.

M	activeresource/lib/active_resource/base.rb

commit 21e5210	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-21 16:44:25 -0700

    One space separates sentences, not two

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/custom_methods.rb
M	activeresource/lib/active_resource/http_mock.rb

commit 342f84a	refs/heads/master
Author: Damian Le Nouaille 
Date:   2012-01-23 01:15:51 +0100

    example bracket error

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit b59e7b9	refs/heads/master
Author: ciastek 
Date:   2012-01-23 00:58:40 +0100

    "will be used throughout all the views for posts." could suggest, that code's modification is somehow related to posts, while it's application-wide

M	railties/guides/source/getting_started.textile

commit 88ec722	refs/heads/master
Author: Indrek Juhkam 
Date:   2012-01-22 23:47:36 +0200

    Raise exception when date.order includes invalid elements

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_i18n_test.rb

commit d579df9	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-22 22:19:29 +0300

    remove unnecessary AS::Concern usage

M	actionmailer/lib/action_mailer/test_helper.rb

commit 4e6050b	refs/heads/master
Merge: 1f9d6a0 c0a4456
Author: José Valim 
Date:   2012-01-22 09:58:49 -0800

    Merge pull request #4605 from lest/patch-1
    
    remove obsolete code as old actionmailer api was removed

commit c0a4456	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-22 20:21:39 +0300

    remove obsolete code as old actionmailer api was removed

M	actionmailer/lib/action_mailer/base.rb

commit 82f6453	refs/heads/master
Author: Lennart Fridén 
Date:   2012-01-22 16:28:44 +0100

    Documented the :use_two_digit_numbers option

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 1f9d6a0	refs/heads/master
Author: José Valim 
Date:   2012-01-22 15:45:18 +0100

    Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with bash, zsh, etc, closes #4602
    
    Conflicts:
    
    	railties/test/generators/migration_generator_test.rb

M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/migration_generator_test.rb

commit ede01ce	refs/tags/v3.2.1
Author: José Valim 
Date:   2012-01-22 15:45:18 +0100

    Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with bash, zsh, etc, closes #4602

M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/migration_generator_test.rb

commit 334e5ca	refs/tags/v3.2.1
Merge: 9ab2904 c6dcc35
Author: José Valim 
Date:   2012-01-22 06:09:35 -0800

    Merge pull request #4604 from ihid/3-2-stable
    
    3-2-stable: Fixed regression - unable to use a range as choices for form.select.

commit c6dcc35	refs/tags/v3.2.1
Author: Jeremy Walker 
Date:   2012-01-22 13:39:15 +0000

    Allow form.select to accept ranges.

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit d246da1	refs/tags/v3.2.1
Author: Carlos Antonio da Silva 
Date:   2012-01-22 10:08:58 -0200

    Add missing require to Array#wrap in generators action methods

M	railties/lib/rails/generators/actions.rb

commit 9ab2904	refs/tags/v3.2.1
Author: Jonathan Viney 
Date:   2012-01-22 12:20:45 +1300

    Fix `$rails_rake_task` global variable warning without replacing the value of $rails_rake_task if it is already set.
    
    Fixes #4591.
    
    Signed-off-by: José Valim 

M	railties/lib/rails/application/finisher.rb

commit c3aaaca	refs/heads/master
Merge: df15eb0 2ee8c6a
Author: José Valim 
Date:   2012-01-21 23:38:49 -0800

    Merge pull request #4574 from ihid/master
    
    Fixed regression - unable to use a range as choices for form.select.

commit df15eb0	refs/heads/master
Merge: cd32d40 1e41680
Author: José Valim 
Date:   2012-01-21 23:36:39 -0800

    Merge pull request #4599 from jarijokinen/patch-1
    
    Fix typo

commit cd32d40	refs/heads/master
Merge: 310c43c 1d9357d
Author: José Valim 
Date:   2012-01-21 23:36:14 -0800

    Merge pull request #4592 from jviney/master
    
    Fix setting $rails_rake_task variable.

commit 310c43c	refs/heads/master
Merge: 787cac1 c176397
Author: José Valim 
Date:   2012-01-21 23:32:42 -0800

    Merge pull request #4598 from sachin87/action_mailer
    
    some modifications in action_mailer/base.rb

commit 1e41680	refs/heads/master
Author: Jari Jokinen 
Date:   2012-01-22 09:00:08 +0200

    Fix typo

M	activerecord/test/cases/base_test.rb

commit c176397	refs/heads/master
Author: Sachin87 
Date:   2012-01-22 03:09:17 +0530

    some modifications in action_mailer/base.rb

M	actionmailer/lib/action_mailer/base.rb

commit 787cac1	refs/heads/master
Author: Xavier Noria 
Date:   2012-01-22 00:48:47 +0100

    uniformizes the punctuation of comments in some files generated for new apps
    
    Some end with a full stop, some don't. Let's have attention to detail
    and make them uniform. I have chosen to add full stops according to
    our documentation guidelines related to RDoc.

M	railties/guides/code/getting_started/config/application.rb
M	railties/guides/code/getting_started/config/environments/development.rb
M	railties/guides/code/getting_started/config/environments/production.rb
M	railties/guides/code/getting_started/config/environments/test.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 1d9357d	refs/heads/master
Author: Jonathan Viney 
Date:   2012-01-22 12:20:45 +1300

    Fix `$rails_rake_task` global variable warning without replacing the value of $rails_rake_task if it is already set.
    
    Fixes #4591.

M	railties/lib/rails/application/finisher.rb

commit 21cfe43	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-21 16:14:10 -0700

    Split Basic and Digest authorization tests

M	activeresource/test/cases/authorization_test.rb

commit 15a9b2c	refs/heads/master
Merge: 1620df7 9cecb2d
Author: José Valim 
Date:   2012-01-21 13:00:42 -0800

    Merge pull request #4588 from carlosantoniodasilva/remove-require-csrf
    
    Remove not used requires from csrf helper file and test

commit 9cecb2d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-21 18:47:05 -0200

    Remove not used requires from csrf helper file and test
    
    These requires were added in a87b92d and the implementation changed in
    2cdc1f0, removing the need for them.

M	actionpack/lib/action_view/helpers/csrf_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit 1620df7	refs/heads/master
Merge: 2d00032 c8504b1
Author: José Valim 
Date:   2012-01-21 12:24:55 -0800

    Merge pull request #4575 from carlosantoniodasilva/remove-test-pending
    
    Remove ActiveSupport::TestCase#pending, use `skip` instead

commit d5dde37	refs/tags/v3.2.1
Merge: a720e34 892c670
Author: José Valim 
Date:   2012-01-21 12:23:46 -0800

    Merge pull request #4586 from waseem/assert_with_no_deprecation_warnings
    
    Assert with no deprecation warnings activesupport tests.

commit 892c670	refs/tags/v3.2.1
Author: Waseem Ahmad 
Date:   2012-01-22 01:45:32 +0530

    Remove deprecation warning from console output when running
    activesupport tests.

M	activesupport/test/tagged_logging_test.rb

commit a720e34	refs/tags/v3.2.1
Merge: c701358 caf7856
Author: José Valim 
Date:   2012-01-21 12:03:32 -0800

    Merge pull request #4582 from kennyj/fix_4580
    
    Fix  GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR

commit caf7856	refs/tags/v3.2.1
Author: kennyj 
Date:   2012-01-22 04:40:09 +0900

    Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit 9d40c09	refs/heads/master
Author: kennyj 
Date:   2012-01-22 04:10:53 +0900

    Remove unused argument.

M	activesupport/lib/active_support/callbacks.rb

commit db9b1a7	refs/tags/v3.1.6
Merge: f407ec5 bd5392c
Author: Vijay Dev 
Date:   2012-01-21 10:45:44 -0800

    Merge pull request #4579 from guilleiguaran/add-js-runtime-to-gemfile
    
    Add therubyracer gem commented in default Gemfile (3.1.x)

commit 021a101	refs/heads/master
Author: Aleksey Gureiev 
Date:   2012-01-21 20:23:14 +0200

    Fixed typo in 'cast'.

M	railties/guides/source/3_2_release_notes.textile

commit bd5392c	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2012-01-21 12:58:30 -0500

    Add therubyracer gem commented in default Gemfile (3.1.x)

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 461834b	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-21 11:56:35 -0500

    Bump rubygems required version to 1.8.11 (default version in 1.9.3-p0)

M	rails.gemspec

commit c8504b1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-21 14:32:27 -0200

    Remove ActiveSupport::TestCase#pending, use `skip` instead

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/test_case.rb
D	activesupport/lib/active_support/testing/pending.rb

commit 2ee8c6a	refs/heads/master
Author: Jeremy Walker 
Date:   2012-01-21 16:13:47 +0000

    Fix inconsistent ability to use a range as choices for select_tag.

M	actionpack/lib/action_view/helpers/tags/select.rb
M	actionpack/test/template/form_options_helper_test.rb

commit c701358	refs/tags/v3.2.1
Author: Jonathan Roes 
Date:   2012-01-20 10:12:05 -0500

    document `:raise` option support for several helpers [ci skip]

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 2d00032	refs/heads/master
Merge: a50382c 76fecac
Author: Vijay Dev 
Date:   2012-01-21 21:26:10 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 76fecac	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-21 21:24:48 +0530

    Revert "Fixed typo in 'cast'."
    
    This reverts commit ecac7c96451ee8d85ca602c9ce3416a5e7ef6a03.
    
    Reason: Changelogs are not meant to be changed from docrails.

M	activerecord/CHANGELOG.md
M	railties/guides/source/3_2_release_notes.textile

commit a50382c	refs/heads/master
Merge: c05f3b0 bd60339
Author: José Valim 
Date:   2012-01-21 04:22:59 -0800

    Merge pull request #4573 from amatsuda/ar_default_timezone_utc
    
    change AR default_timezone to :utc since it's the default for AR::Railtie

commit c05f3b0	refs/heads/master
Merge: 2e13850 bb1813c
Author: José Valim 
Date:   2012-01-21 03:08:19 -0800

    Merge pull request #4572 from semaperepelitsa/noregexp
    
    Replace regexp matching with a simple string manipulation.

commit bd60339	refs/heads/master
Author: Akira Matsuda 
Date:   2012-01-21 20:07:12 +0900

    change AR default_timezone to :utc since it's the default for AR::Railtie

M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/base_test.rb

commit bb1813c	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2012-01-21 18:15:08 +0800

    Replace regexp matching with a simple string manipulation.
    
    Using regexp looks like overkill here and is also 2x slower.
    
                 user     system      total        real
    string   0.020000   0.000000   0.020000 (  0.016256)
    regexp   0.030000   0.000000   0.030000 (  0.035360)
    
    require "benchmark"
    
    names = ("a".."z").map { |c| c + "a" * rand(5..10) + "=" * rand(0..1) }.map(&:to_sym)
    puts names
    
    n = 1000
    Benchmark.bmbm do |x|
      x.report "string" do
        n.times do
          names.each do |name|
            string_name = name.to_s
            string_name.chomp!('=')
            string_name
          end
        end
      end
    
      x.report "regexp" do
        n.times do
          names.each do |name|
            name.to_s =~ /(.*)=$/
            $1
          end
        end
      end
    end

M	activesupport/lib/active_support/ordered_options.rb

commit 1729720	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2012-01-21 17:44:05 +0800

    Why do we even need a constant here? A variable is fine.

M	activesupport/lib/active_support/tagged_logging.rb

commit b7bf3c1	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2012-01-21 17:37:42 +0800

    TaggedLogging wraps an object, not a class.

M	activesupport/lib/active_support/tagged_logging.rb

commit 7175107	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2012-01-21 17:34:04 +0800

    Do not use the same Logger constant for class (from stdlib) and for instance (from the example)

M	activesupport/lib/active_support/tagged_logging.rb

commit 2e13850	refs/heads/master
Merge: 90410b4 977f6b4
Author: José Valim 
Date:   2012-01-20 23:45:00 -0800

    Merge pull request #4560 from rafaelfranca/av-number_helper-refactor
    
    Refactor NumberHelpers

commit 90410b4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 14:39:55 -0800

    stop splatting so much. We don't need :star:args everywhere

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit cb6ccad	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 14:19:21 -0800

    broadcasting to the console and remove file tailing middleware

M	railties/lib/rails/commands/server.rb

commit a0da46e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 14:18:29 -0800

    pushed broadcasting down to a module

M	activerecord/lib/active_record/railtie.rb
M	activesupport/lib/active_support/logger.rb
M	activesupport/test/broadcast_logger_test.rb

commit 1c49b61	refs/heads/master
Author: Akira Matsuda 
Date:   2012-01-21 06:45:55 +0900

    let AR::Relation pretty_printed like an Array

M	activerecord/lib/active_record/relation.rb

commit f02cec3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 13:36:18 -0800

    defined the actual logger signature

M	activesupport/lib/active_support/log_subscriber.rb

commit 983bf6d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 11:56:38 -0800

    restored logging to the log file and display on the console

M	activerecord/lib/active_record/railtie.rb

commit 14d1029	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 11:53:47 -0800

    fixed test for more informative message

M	activesupport/test/log_subscriber_test.rb

commit e7e1890	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 11:52:21 -0800

    made the broadcast logger quack more like a logger

M	activesupport/lib/active_support/logger.rb
M	activesupport/test/broadcast_logger_test.rb

commit 04241f3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 11:46:12 -0800

    added the backtrace so errors can be found

M	activesupport/lib/active_support/log_subscriber.rb

commit d42b3d4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 11:45:29 -0800

    add a broadcasting logger so we can split logs

M	activesupport/lib/active_support/logger.rb
A	activesupport/test/broadcast_logger_test.rb

commit ecac7c9	refs/heads/master
Author: Aleksey Gureiev 
Date:   2012-01-20 21:42:34 +0200

    Fixed typo in 'cast'.

M	activerecord/CHANGELOG.md
M	railties/guides/source/3_2_release_notes.textile

commit 977f6b4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-20 16:37:48 -0300

    Refactor translations retrieval

M	actionpack/lib/action_view/helpers/number_helper.rb

commit f170453	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-20 16:26:45 -0300

    Remove code duplication

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 920070e	refs/heads/master
Author: Stephen Celis 
Date:   2012-01-19 11:12:21 -0800

    Don't type-cast unknown types to YAML.

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/base_test.rb

commit 30b0e58	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-20 18:17:36 +0000

    Fix another race condition.
    
    From 2c667f69aa2daac5ee6c29ca9679616e2a71532a.
    
    Thanks @pwnall for the heads-up.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/attribute_methods/read_test.rb

commit fab664a	refs/tags/v3.2.1
Author: Jon Leighton 
Date:   2012-01-20 18:17:36 +0000

    Fix another race condition.
    
    From 2c667f69aa2daac5ee6c29ca9679616e2a71532a.
    
    Thanks @pwnall for the heads-up.
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/attribute_methods/read_test.rb

commit de41f5a	refs/heads/master
Merge: 8c2dc4c cf1f563
Author: Aaron Patterson 
Date:   2012-01-20 10:23:46 -0800

    Merge pull request #4528 from j-manu/log-tailer-fix
    
    Fix for log tailer when the log file doesn't exist.

commit 8c2dc4c	refs/heads/master
Merge: 712b0b9 73709f7
Author: Aaron Patterson 
Date:   2012-01-20 10:06:45 -0800

    Merge pull request #4556 from brainopia/remove_old_cruft
    
    Removed unused assigns from ActionView::Template::Error

commit 712b0b9	refs/heads/master
Merge: 79f7bbb 01b4a7c
Author: José Valim 
Date:   2012-01-20 09:38:46 -0800

    Merge pull request #4557 from rafaelfranca/av-number_helper-refactor
    
    No need to check html_safe? twice at number_to_percentage

commit 79f7bbb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-20 09:33:58 -0800

    Revert "just use an alias.  The target method is public, so make this one public"
    
    This reverts commit be7d2248e9505983d1aacf0b33c657e6e3ddd9db.

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 01b4a7c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-20 14:27:18 -0300

    No need to check html_safe? twice

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/number_helper.rb

commit 253ef4f	refs/heads/master
Merge: 83e891c 018e4bf
Author: Benjamin Manns 
Date:   2012-01-20 09:11:20 -0800

    Merge pull request #78 from trotter/fix-rails-engine-docs
    
    Fix documentation bug in Rails::Engine

commit f36dcaf	refs/tags/v3.2.0 (tag: v3.2.0)
Author: David Heinemeier Hansson 
Date:   2012-01-20 17:44:32 +0100

    Preparing for 3.2.0 release

M	RAILS_VERSION
M	actionmailer/CHANGELOG.md
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/CHANGELOG.md
M	actionpack/lib/action_pack/version.rb
M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/version.rb
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/version.rb
M	activeresource/CHANGELOG.md
M	activeresource/lib/active_resource/version.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/version.rb
M	railties/CHANGELOG.md
M	railties/lib/rails/version.rb
M	version.rb

commit 73709f7	refs/heads/master
Author: brainopia 
Date:   2012-01-20 20:13:29 +0400

    Removed unused assigns from ActionView::Template::Error
    
    They existed since initial rails commit by DHH but lost use a long time
    ago

M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/error.rb
M	actionpack/test/controller/rescue_test.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	actionpack/test/template/template_error_test.rb

commit 83e891c	refs/heads/master
Author: Jonathan Roes 
Date:   2012-01-20 10:12:05 -0500

    document `:raise` option support for several helpers [ci skip]

M	actionpack/lib/action_view/helpers/number_helper.rb

commit a2d0b99	refs/heads/master
Merge: c08ea0a 52287f9
Author: José Valim 
Date:   2012-01-20 06:29:12 -0800

    Merge pull request #4555 from kennyj/mail_bump
    
    Bump mail 2.4.1

commit 52287f9	refs/heads/master
Author: kennyj 
Date:   2012-01-20 23:12:59 +0900

    Bump mail

M	actionmailer/actionmailer.gemspec

commit c08ea0a	refs/heads/master
Merge: 3e6e57e c0a3fe3
Author: José Valim 
Date:   2012-01-20 05:59:10 -0800

    Merge pull request #4554 from rodrigoflores/master
    
    Added the :format option to number_to_percentage

commit 3e6e57e	refs/heads/master
Merge: eb1b729 7b03120
Author: Vijay Dev 
Date:   2012-01-20 05:28:19 -0800

    Merge pull request #4545 from trotter/fix-documentation-bug
    
    Fix documentation bug in Rails::Engine

commit c0a3fe3	refs/heads/master
Author: Rodrigo Flores 
Date:   2012-01-19 23:15:54 -0200

    Added format to percentage

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/locale/en.yml
M	actionpack/test/template/number_helper_test.rb

commit 616c5ae	refs/heads/master
Merge: 2c7ded3 665322e
Author: Xavier Noria 
Date:   2012-01-20 01:17:13 -0800

    Merge pull request #79 from doriath/master
    
    Fix indentation in comment of Delegation module

commit 665322e	refs/heads/master
Author: Tomasz Zurkowski 
Date:   2012-01-20 10:01:22 +0100

    Fix indentation in code example of Delegation

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit eb1b729	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-19 18:32:58 -0800

    push ivar initialization down to a common method

M	activerecord/lib/active_record/core.rb

commit 17064ac	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-19 18:25:14 -0800

    adding tests for previous_changes hash

M	activerecord/test/cases/base_test.rb

commit be7d224	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-19 17:35:18 -0800

    just use an alias.  The target method is public, so make this one public
    too.

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 0c35610	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-19 17:08:53 -0800

    remove unused captures

M	activemodel/lib/active_model/attribute_methods.rb

commit 642752c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-19 14:39:13 -0800

    avoid useless is_a checks

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 8129a09	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-19 13:43:27 -0800

    move tagged logging to a module, stop proxying every method call

M	activesupport/lib/active_support/tagged_logging.rb

commit 018e4bf	refs/heads/master
Author: Trotter Cashion 
Date:   2012-01-19 13:09:16 -0800

    Fix documentation bug in Rails::Engine

M	railties/lib/rails/engine.rb

commit 16bd0cb	refs/heads/master
Merge: 0a3f57e 1b4edd1
Author: José Valim 
Date:   2012-01-19 12:55:31 -0800

    Merge pull request #4546 from carlosantoniodasilva/response-body-performed
    
    Use performed? instead of checking for response_body

commit 1b4edd1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-19 18:25:52 -0200

    Use performed? instead of checking for response_body
    
    * Check for performed? instead of response_body
    * Change performed? to return a boolean
    * Refactor AC::Metal#response_body= to reuse variable

M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_controller/metal/implicit_render.rb
M	actionpack/test/controller/force_ssl_test.rb

commit 7b03120	refs/heads/master
Author: Trotter Cashion 
Date:   2012-01-19 12:14:32 -0800

    Fix documentation bug in Rails::Engine

M	railties/lib/rails/engine.rb

commit 0a3f57e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-19 11:31:05 -0800

    do not do reverse lookups on incoming requests for webrick. fixes #4542

M	railties/lib/rails/commands/server.rb

commit 6c65676	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-20 00:46:37 +0530

    update release notes [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit c5ebbfa	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-20 00:46:37 +0530

    update release notes [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit cf1f563	refs/heads/master
Author: Manu J 
Date:   2012-01-19 01:42:37 +0530

    Fix for log tailer when the log file doesn't exist.

M	railties/lib/rails/rack/log_tailer.rb

commit e2cc653	refs/heads/master
Author: José Valim 
Date:   2012-01-19 19:52:10 +0100

    Do not deprecate performed.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal.rb
M	actionpack/test/controller/base_test.rb

commit 5b90635	refs/tags/v3.2.0
Author: José Valim 
Date:   2012-01-19 19:49:13 +0100

    Update CHANGELOG

M	actionpack/CHANGELOG.md

commit 08d6eb6	refs/tags/v3.2.0
Author: José Valim 
Date:   2012-01-19 19:45:22 +0100

    Do not deprecate performed?

M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/controller/base_test.rb

commit ff813dc	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-19 23:30:04 +0530

    add uglifier version info in the 'what to update' section

M	railties/guides/source/3_2_release_notes.textile

commit b259bf9	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-19 23:28:18 +0530

    fix duplicate ids for the headers [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit c4b8fd3	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 23:30:04 +0530

    add uglifier version info in the 'what to update' section

M	railties/guides/source/3_2_release_notes.textile

commit 9798ed7	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 23:28:18 +0530

    fix duplicate ids for the headers [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit a0e439f	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-19 23:21:28 +0530

    document AR::Base#with_lock in release notes [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit 1944cbb	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 23:21:28 +0530

    document AR::Base#with_lock in release notes [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit 01d041a	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 23:12:05 +0530

    update the getting_started guide code [ci skip]

M	railties/guides/code/getting_started/Gemfile
M	railties/guides/code/getting_started/app/assets/javascripts/application.js
M	railties/guides/code/getting_started/app/assets/stylesheets/application.css
M	railties/guides/code/getting_started/app/views/layouts/application.html.erb
M	railties/guides/code/getting_started/config/application.rb
M	railties/guides/code/getting_started/config/environments/test.rb
M	railties/guides/code/getting_started/config/initializers/inflections.rb
M	railties/guides/code/getting_started/config/routes.rb
M	railties/guides/code/getting_started/public/500.html

commit 6e311b9	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-19 23:12:05 +0530

    update the getting_started guide code [ci skip]

M	railties/guides/code/getting_started/Gemfile
M	railties/guides/code/getting_started/app/assets/javascripts/application.js
M	railties/guides/code/getting_started/app/assets/stylesheets/application.css
M	railties/guides/code/getting_started/app/views/layouts/application.html.erb
M	railties/guides/code/getting_started/config/application.rb
M	railties/guides/code/getting_started/config/environments/test.rb
M	railties/guides/code/getting_started/config/initializers/inflections.rb
M	railties/guides/code/getting_started/config/routes.rb
M	railties/guides/code/getting_started/public/500.html

commit 4c5b73f	refs/tags/v3.2.0
Author: Aaron Patterson 
Date:   2012-01-19 09:38:37 -0800

    Merge pull request #4531 from exviva/pessimistic_with_lock
    
    Add ActiveRecord::Base#with_lock

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/locking/pessimistic.rb
M	activerecord/test/cases/locking_test.rb
M	railties/guides/source/active_record_querying.textile

commit 0056a75	refs/heads/master
Merge: 01cde0b 7afbc89
Author: Aaron Patterson 
Date:   2012-01-19 09:38:37 -0800

    Merge pull request #4531 from exviva/pessimistic_with_lock
    
    Add ActiveRecord::Base#with_lock

commit 01cde0b	refs/heads/master
Merge: 2c7ded3 d8b06dc
Author: Aaron Patterson 
Date:   2012-01-19 09:30:08 -0800

    Merge pull request #4538 from kennyj/should_use_uri_parse
    
    Convert URI.parser.parse to URI.parse, and remove ruby 1.8.x code.

commit ee2ae37	refs/heads/master
Author: Jonathan del Strother 
Date:   2012-01-19 16:06:31 +0000

    Don't instantiate two objects in collection proxy / find_or_instantiator_by

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 0055456	refs/tags/v3.2.0
Author: Simon Baird 
Date:   2012-01-19 17:33:29 +1000

    Fix small typo in mail_to docs in url_helper.rb

M	actionpack/lib/action_view/helpers/url_helper.rb

commit c450833	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-19 22:10:40 +0530

    revising release notes [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit ead04ee	refs/tags/v3.2.0
Author: Fujimura Daisuke 
Date:   2012-01-19 12:09:46 +0900

    update release note: timestamps is non-null as default

M	railties/guides/source/3_2_release_notes.textile

commit 2c7ded3	refs/heads/master
Merge: e95e932 ad3a129
Author: Vijay Dev 
Date:   2012-01-19 22:11:17 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit ad3a129	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 22:10:40 +0530

    revising release notes [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit c8b584f	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-19 21:58:17 +0530

    select doesn't take multiple arguments - fixes #4539 [ci skip]
    
    Didn't cherry pick the master commit because this one already had some
    of the fixes made in master.

M	activerecord/lib/active_record/relation/query_methods.rb

commit e95e932	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 21:41:50 +0530

    select doesn't take multiple arguments - fixes #4539 [ci skip]
    
    Also, fixed the bit about returning AM::MissingAttributeError. This
    seems to be fixed earlier in 3-2-stable only.

M	activerecord/lib/active_record/relation/query_methods.rb

commit 5caf1bd	refs/heads/master
Merge: b513460 71597f9
Author: José Valim 
Date:   2012-01-19 05:54:35 -0800

    Merge pull request #4532 from rafaelfranca/av-button_to-refactor
    
    Refactor button_to helper to use token_tag method

commit 71597f9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-18 20:53:32 -0300

    Extract method_tag

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb

commit 0470979	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-18 19:30:04 -0300

    Refactor button_to helper to use token_tag method

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/html-scanner/sanitizer_test.rb
M	actionpack/test/template/url_helper_test.rb

commit d8b06dc	refs/heads/master
Author: kennyj 
Date:   2012-01-19 19:38:23 +0900

    Convert URI.parser.parse to URI.parse, and remove ruby 1.8.x code.

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/connection.rb
M	activesupport/lib/active_support/core_ext/uri.rb
M	activesupport/test/core_ext/uri_ext_test.rb

commit faec7ac	refs/heads/master
Author: Simon Baird 
Date:   2012-01-19 17:33:29 +1000

    Fix small typo in mail_to docs in url_helper.rb

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 5ef4618	refs/heads/master
Author: Fujimura Daisuke 
Date:   2012-01-19 12:09:46 +0900

    update release note: timestamps is non-null as default

M	railties/guides/source/3_2_release_notes.textile

commit b513460	refs/heads/master
Merge: d843a94 04d6ebb
Author: Piotr Sarnacki 
Date:   2012-01-18 17:05:18 -0800

    Merge pull request #4534 from lest/patch-1
    
    refactor RAILS_CACHE deprecation

commit 04d6ebb	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-19 02:20:32 +0300

    refactor RAILS_CACHE deprecation
    
    that was introduced in 6f8159c4217dc8433a2027ced0c61e7ce94551d3

M	railties/lib/rails/deprecation.rb

commit 7afbc89	refs/heads/master
Author: Olek Janiszewski 
Date:   2012-01-18 23:03:55 +0100

    Add ActiveRecord::Base#with_lock
    
    Add a `with_lock` method to ActiveRecord objects, which starts
    a transaction, locks the object (pessimistically) and yields to the block.
    The method takes one (optional) parameter and passes it to `lock!`.
    
    Before:
    
        class Order < ActiveRecord::Base
          def cancel!
            transaction do
              lock!
              # ... cancelling logic
            end
          end
        end
    
    After:
    
        class Order < ActiveRecord::Base
          def cancel!
            with_lock do
              # ... cancelling logic
            end
          end
        end

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/locking/pessimistic.rb
M	activerecord/test/cases/locking_test.rb
M	railties/guides/source/active_record_querying.textile

commit 2e6ca53	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-19 02:50:37 +0530

    revise wording [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit 3bfbc45	refs/tags/v3.2.0
Author: Guillermo Iguaran 
Date:   2012-01-18 14:43:59 -0500

    Adding Action Mailer section to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit 6838549	refs/tags/v3.2.0
Author: Guillermo Iguaran 
Date:   2012-01-18 14:33:51 -0500

    Update Release Notes: sprockets-rails section should be inside of ActionPack section

M	railties/guides/source/3_2_release_notes.textile

commit d843a94	refs/heads/master
Merge: 423b262 68d389a
Author: Vijay Dev 
Date:   2012-01-19 02:50:59 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 68d389a	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 02:50:37 +0530

    revise wording [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit bedb66e	refs/heads/master
Author: prasath 
Date:   2012-01-19 02:34:50 +0530

    Refactored class methods on address render test

M	actionpack/test/controller/addresses_render_test.rb

commit 9365f89	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-18 14:43:59 -0500

    Adding Action Mailer section to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit fa52740	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-18 14:33:51 -0500

    Update Release Notes: sprockets-rails section should be inside of ActionPack section

M	railties/guides/source/3_2_release_notes.textile

commit 423b262	refs/heads/master
Merge: 660cc40 e89a7f5
Author: José Valim 
Date:   2012-01-18 11:04:41 -0800

    Merge pull request #4527 from rafaelfranca/av-logger
    
    Remove delegation to ActionController::Base

commit f2af2ac	refs/tags/v3.2.0
Merge: 619731f 939a84a
Author: Vijay Dev 
Date:   2012-01-18 10:54:01 -0800

    Merge pull request #4525 from guilleiguaran/am-changelog-3-2-stable
    
    Update AM CHANGELOG

commit 619731f	refs/tags/v3.2.0
Author: Makoto Inoue 
Date:   2012-01-16 09:51:19 +0000

    ActionController::UrlEncodedPairParser is deprecated. Replaced the url parsing example with Rack::Utils.parse_query
    
    - https://webrat.lighthouseapp.com/projects/10503/tickets/161-urlencodedpairparser-removed-in-edge-rails

M	railties/guides/source/form_helpers.textile

commit e89a7f5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-18 15:42:44 -0300

    Test::Unit::Collector::ObjectSpace is not present anymore

M	activesupport/lib/active_support/testing/isolation.rb

commit 7ce85e2	refs/heads/master
Author: Chad Jolly 
Date:   2011-09-14 15:50:56 -0600

    Exclude rack.request.form_vars from request.filtered_env

M	actionpack/lib/action_dispatch/http/filter_parameters.rb
M	actionpack/test/controller/integration_test.rb

commit 64a937a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-18 15:42:08 -0300

    Remove delegation to ActionController::Base

M	actionpack/lib/action_view/base.rb

commit 660cc40	refs/heads/master
Merge: fa92bb4 de2e28d
Author: Vijay Dev 
Date:   2012-01-19 00:11:20 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 939a84a	refs/tags/v3.2.0
Author: Guillermo Iguaran 
Date:   2012-01-18 13:41:11 -0500

    Update AM CHANGELOG

M	actionmailer/CHANGELOG.md

commit de2e28d	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-19 00:01:47 +0530

    Revert "Remove redundant mention of escape_javascript alias."
    
    This reverts commit d7f7f5ee560fafa7e9819786e41bf0ea6df7919b.
    
    Reason: That isn't redundant IMO.

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit fa92bb4	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-18 23:51:23 +0530

    updates to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit 0960eb9	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-18 23:51:23 +0530

    updates to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit f54b846	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-01-18 20:57:24 +0300

    remove ruby 1.8 related code

M	activesupport/lib/active_support/core_ext/date_time/conversions.rb

commit b70236c	refs/heads/master
Merge: e154089 5a6ea53
Author: Aaron Patterson 
Date:   2012-01-18 09:53:14 -0800

    Merge pull request #4523 from rafaelfranca/av-logger
    
    Add ActionView own logger

commit 5a6ea53	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-18 14:05:36 -0300

    ActionView now has its own logger

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/log_subscriber.rb
M	actionpack/lib/action_view/railtie.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/log_subscriber_test.rb
M	railties/guides/source/configuring.textile

commit e154089	refs/heads/master
Merge: 1430ed2 38204eb
Author: José Valim 
Date:   2012-01-18 08:45:33 -0800

    Merge pull request #4522 from kennyj/fix_warning_20120119
    
    Fix warning: assigned but unused variable - result

commit 38204eb	refs/heads/master
Author: kennyj 
Date:   2012-01-19 01:43:59 +0900

    Fix warning: assigned but unused variable - result

M	actionpack/test/template/record_tag_helper_test.rb

commit 1ad4a30	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-18 11:26:18 -0200

    Update docs for config.assets.logger

M	railties/guides/source/configuring.textile

commit f74afd9	refs/tags/v3.2.0
Merge: 2f52bd3 ae7037e
Author: José Valim 
Date:   2012-01-18 05:20:20 -0800

    Merge pull request #4518 from guilleiguaran/silent-sprockets-logger-3-2-stable
    
    Silent Sprockets logger when config.assets.logger is set to false (3-2-stable)

commit ae7037e	refs/tags/v3.2.0
Author: Guillermo Iguaran 
Date:   2012-01-18 08:06:48 -0500

    Update CHANGELOG and docs for config.assets.logger

M	actionpack/CHANGELOG.md
M	railties/guides/source/configuring.textile

commit 02e4d7f	refs/tags/v3.2.0
Author: Guillermo Iguaran 
Date:   2012-01-17 22:05:56 -0500

    Silent Sprockets logger when config.assets.logger is set to false

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb

commit 1430ed2	refs/heads/master
Merge: d4a9ce8 56089ca
Author: José Valim 
Date:   2012-01-18 04:27:18 -0800

    Merge pull request #4517 from carlosantoniodasilva/form-builder-block
    
    Refactor FormBuilder arguments and default config

commit 56089ca	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-18 08:55:30 -0200

    Refactor FormBuilder arguments and default config
    
    * Do not reopen AV::Base to define default form builder
      Inside the load hook we are already in AV::Base context.
    
    * Do not pass the given block to the form builder
      The block is evaluated in fields_for context using capture, with the
      builder as argument. This means we do not need to give the block to the
      FormBuilder itself.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/controller/render_test.rb

commit e58a2df	refs/heads/master
Author: brainopia 
Date:   2012-01-18 12:29:29 +0400

    Update time zone offset information

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb

commit d4a9ce8	refs/heads/master
Merge: 2de2ea8 c65f79d
Author: José Valim 
Date:   2012-01-17 23:33:02 -0800

    Merge pull request #4509 from rafaelfranca/form_tag-refactor
    
    Refactor form_for and form_tag

commit 2de2ea8	refs/heads/master
Merge: 5b9a506 8470fc9
Author: José Valim 
Date:   2012-01-17 23:31:43 -0800

    Merge pull request #4510 from carlosantoniodasilva/av-content-tag-for
    
    ActionView content_tag_for refactoring and improvements

commit 5b9a506	refs/heads/master
Merge: 5065d17 226783d
Author: José Valim 
Date:   2012-01-17 23:28:55 -0800

    Merge pull request #4512 from guilleiguaran/silent-sprockets-logger
    
    Silent Sprockets logger when config.assets.logger is set to false

commit 5065d17	refs/heads/master
Merge: 57aaaa6 ffb0c51
Author: José Valim 
Date:   2012-01-17 23:25:53 -0800

    Merge pull request #4508 from lest/patch-1
    
    Refactor TaggedLogging

commit 226783d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-17 22:05:56 -0500

    Silent Sprockets logger when config.assets.logger is set to false

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb

commit 8470fc9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-18 00:26:17 -0200

    Fix errors when running entire suite due to class name collision
    
    The Post class is created everywhere in the test suite, and due to that
    when applying the Array() logic to refactor content_tag_for, some other
    change to the Post class was breaking record tag tests.
    
    The solution is to rename the class to not collide with others
    already defined in the test suite.

M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	actionpack/test/template/record_tag_helper_test.rb

commit b64b7d0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 23:24:17 -0200

    Cleanup Post model, no need to require fake_models

M	actionpack/test/template/record_tag_helper_test.rb

commit dcad385	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 23:11:55 -0200

    Refactor content tag to not detect options Hash always
    
    Only check for options and prefix arguments order once when running
    content_tag_for with a collection.

M	actionpack/lib/action_view/helpers/record_tag_helper.rb

commit ba77ff3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 23:05:18 -0200

    Do not mutate options hash

M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	actionpack/test/template/record_tag_helper_test.rb

commit 22ffc3d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 23:04:18 -0200

    Cleanup persisted setup for model

M	actionpack/test/template/record_tag_helper_test.rb

commit 53381be	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 22:51:27 -0200

    Mimic AR models yielding when building new records, avoid using tap

M	actionpack/test/template/record_tag_helper_test.rb

commit 5c997cc	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 22:49:00 -0200

    No need for concat as well

M	actionpack/test/template/record_tag_helper_test.rb

commit 69512e1	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 22:47:28 -0200

    Add test for content tag with prefix and extra html options

M	actionpack/test/template/record_tag_helper_test.rb

commit f4551ca	refs/heads/master
Author: Tim Cooper 
Date:   2012-01-07 16:45:22 +1000

    Remove capture.

M	actionpack/lib/action_view/helpers/record_tag_helper.rb

commit 67681cb	refs/heads/master
Author: Tim Cooper 
Date:   2012-01-06 14:32:25 +1000

    Always treat the object passed to content_tag_for as an array.

M	actionpack/lib/action_view/helpers/record_tag_helper.rb

commit c65f79d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 23:34:17 -0300

    No need to call html_safe since concat two SaffeBuffers always results in a SafeBuffer

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 014da68	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 23:01:48 -0300

    Use block syntax to avoid code duplication

M	actionpack/lib/action_view/helpers/form_helper.rb

commit ffb0c51	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-18 05:02:04 +0300

    simplify some TaggedLogging methods

M	activesupport/lib/active_support/tagged_logging.rb

commit cead2dd	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-18 05:01:09 +0300

    remove unused requires

M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/lib/active_support/configurable.rb

commit 336f973	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 22:54:20 -0300

    No need to create a SafeBuffer since form_tag_html always rerturn a SafeBuffer

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 57aaaa6	refs/heads/master
Merge: ba154bd 6f1bf52
Author: Xavier Noria 
Date:   2012-01-17 14:08:09 -0800

    Merge pull request #4488 from rafaelfranca/av-refactor
    
    ActionView::Helpers::FormHelper refactoring

commit 6f1bf52	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 18:52:48 -0300

    Extract input_checked? to a module

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/lib/action_view/helpers/tags/check_box.rb
A	actionpack/lib/action_view/helpers/tags/checkable.rb
M	actionpack/lib/action_view/helpers/tags/radio_button.rb

commit 2f52bd3	refs/tags/v3.2.0
Merge: 57f73a6 ed0f0ad
Author: José Valim 
Date:   2012-01-17 12:10:39 -0800

    Merge pull request #4498 from carlosantoniodasilva/action-controller-refactor-3-2
    
    Action controller refactor - deprecate Compatibility module

commit ed0f0ad	refs/tags/v3.2.0
Author: Carlos Antonio da Silva 
Date:   2012-01-17 11:06:10 -0200

    Update changelog

M	actionpack/CHANGELOG.md

commit 786a0b7	refs/tags/v3.2.0
Author: Carlos Antonio da Silva 
Date:   2012-01-17 10:02:14 -0200

    Remove duplicated constant definition
    
    ActionController::ActionControllerError is already defined in
    action_controller/metal/exceptions.

M	actionpack/lib/action_controller/metal/compatibility.rb

commit e5e8704	refs/tags/v3.2.0
Author: Carlos Antonio da Silva 
Date:   2012-01-17 09:58:52 -0200

    Deprecate AC::UnknownError and AC::DoubleRenderError
    
    Use the constants AbstractController::ActionNotFound and
    AbstractController::DoubleRenderError respectively instead.

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit 9d4fd61	refs/tags/v3.2.0
Author: Carlos Antonio da Silva 
Date:   2012-01-17 08:56:50 -0200

    Add default charset config to ActionDispatch

M	actionpack/lib/action_dispatch/railtie.rb
M	railties/test/application/configuration_test.rb

commit 57be2cf	refs/tags/v3.2.0
Author: Carlos Antonio da Silva 
Date:   2012-01-17 09:29:00 -0200

    Deprecate default_charset= at controller level

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/controller/content_type_test.rb

commit 20baeec	refs/tags/v3.2.0
Author: Carlos Antonio da Silva 
Date:   2012-01-15 23:21:08 -0200

    Add some deprecations for logic being removed in 4.0

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/controller/view_paths_test.rb

commit ba154bd	refs/heads/master
Merge: 422958f 96a817f
Author: José Valim 
Date:   2012-01-17 12:00:05 -0800

    Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor
    
    Action controller refactor - remove Compatibility module

commit 422958f	refs/heads/master
Merge: 5f07953 a21b577
Author: José Valim 
Date:   2012-01-17 10:45:48 -0800

    Merge pull request #4493 from bogdan/callbacks_per_key
    
    AS::Callbacks: Refactor :per_key option

commit 57f73a6	refs/tags/v3.2.0
Author: Aaron Patterson 
Date:   2012-01-17 10:23:13 -0800

    Merge pull request #4487 from sarenji/fix-reset-counters
    
    Fix bug where reset_counters resets the wrong counter cache.

M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/test/cases/counter_cache_test.rb
A	activerecord/test/fixtures/dog_lovers.yml
A	activerecord/test/fixtures/dogs.yml
A	activerecord/test/models/dog.rb
A	activerecord/test/models/dog_lover.rb
M	activerecord/test/schema/schema.rb

commit 5f07953	refs/heads/master
Merge: 18a62ac ee013a50
Author: Aaron Patterson 
Date:   2012-01-17 10:23:13 -0800

    Merge pull request #4487 from sarenji/fix-reset-counters
    
    Fix bug where reset_counters resets the wrong counter cache.

commit 8b4c74f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 15:07:05 -0300

    Do not need of ActionView::Helpers scope since we are inside
    ActionView::Helpers

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 5812c35	refs/tags/v3.2.0
Merge: ed35f37 c4c6beb
Author: José Valim 
Date:   2012-01-17 09:40:06 -0800

    Merge pull request #4501 from rafaelfranca/assets-logger-3-2
    
    Add option to configure Sprockets logger [3-2-stable]

commit c4c6beb	refs/tags/v3.2.0
Author: Rafael Mendonça França 
Date:   2012-01-17 13:25:45 -0300

    Add option to configure Sprockets logger

M	actionpack/CHANGELOG.md
M	actionpack/lib/sprockets/railtie.rb
M	railties/guides/source/configuring.textile

commit 18a62ac	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-17 09:18:40 -0800

    disable transactions for this test

M	activerecord/test/cases/migration/logger_test.rb

commit 16c5f48	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 15:06:57 -0200

    Add documentation to config.assets.logger

M	railties/guides/source/configuring.textile

commit ee190b8	refs/heads/master
Merge: 98081cb 6f8159c
Author: Aaron Patterson 
Date:   2012-01-17 09:04:21 -0800

    Merge pull request #4500 from kennyj/should_deprecate_rails_cache
    
    [Proposal] We should deprecate the RAILS_CACHE constant.

commit 6f8159c	refs/heads/master
Author: kennyj 
Date:   2012-01-18 01:53:09 +0900

    Deprecate RAILS_CACHE constant.

M	actionpack/lib/action_controller/railtie.rb
M	actionpack/lib/action_dispatch/http/rack_cache.rb
M	railties/guides/source/configuring.textile
M	railties/lib/rails.rb
M	railties/lib/rails/application/bootstrap.rb
A	railties/lib/rails/deprecation.rb
M	railties/test/application/middleware_test.rb

commit 98081cb	refs/heads/master
Merge: 4280b20 e275817
Author: José Valim 
Date:   2012-01-17 08:33:54 -0800

    Merge pull request #4499 from rafaelfranca/patch-1
    
    Add option to configure Sprockets logger

commit e275817	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 13:25:45 -0300

    Add option to configure Sprockets logger

M	actionpack/lib/sprockets/railtie.rb

commit 96a817f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 11:06:10 -0200

    Update changelog

M	actionpack/CHANGELOG.md

commit 06ea1ba	refs/heads/master
Author: Matt Williams 
Date:   2012-01-17 13:54:09 +0100

    race_condition_ttl should be an integer

M	activesupport/lib/active_support/cache.rb

commit e5e9a4c	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 09:14:17 -0200

    Bring back rendering templates that start with / in nested structures

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/test/controller/new_base/render_template_test.rb

commit 0b7548f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 08:59:42 -0200

    Move protected instance variables definition, kill compatibility module

M	actionpack/lib/action_controller/base.rb
D	actionpack/lib/action_controller/metal/compatibility.rb

commit cb650a5	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-17 08:56:50 -0200

    Remove deprecated default_charset= from AC::Base
    
    This should be set globally as a configuration, using
    `config.action_dispatch.default_charset` instead

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	actionpack/test/controller/content_type_test.rb
M	railties/test/application/configuration_test.rb

commit 67c96ab	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 22:07:20 -0200

    Move render_to_body logic to return a spaced string to AC::Rendering
    
    This seems to be required only when calling render :partial with an
    empty collection from a controller. This call happens to return no
    content, letting the response body empty, which means to Rails that it
    should go on and try to find a template to render based on the current
    action name, thus failing hard.
    
    Although tests keep all green, we need to check a better way to fix
    this.

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/lib/action_controller/metal/rendering.rb
M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/controller/filters_test.rb

commit a977b25	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 15:47:45 -0200

    Remove method missing handling when action is not found, use action missing instead
    
    Do not create a method_missing method to handle not found actions, use
    the action_missing method provided by Rails instead.

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/controller/base_test.rb

commit 53596d0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 15:37:27 -0200

    Refactor render nothing/text => nil logic, and move to right place
    
    Options :nothing and :text => nil should be handled by
    ActionController::Rendering instead.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/metal/rendering.rb

commit 6244d16	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 15:34:50 -0200

    Move render :nothing and :text => nil options to AC::Rendering

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/metal/compatibility.rb

commit 562a12d	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 15:04:55 -0200

    Rename test class and fix tests to keep consistency
    
    Based on 50d23bc2bd3653b3c66e480c22ae97c5f7fd7f62.

M	actionpack/test/controller/test_case_test.rb

commit bb33e88	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 13:45:31 -0200

    Remove deprecated logic to render templates starting with /
    
      render :template => "/foo/bar"

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/controller/new_base/render_template_test.rb

commit 4970048	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 09:48:17 -0200

    Remove relative url root setting from ENV var
    
    This is already being set by Rails configuration.

M	actionpack/lib/action_controller/metal/compatibility.rb

commit 71566c3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-14 18:28:09 -0200

    Remove rescue_action from compatibility module and tests

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/activerecord/active_record_store_test.rb
M	actionpack/test/controller/assert_select_test.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/controller/capture_test.rb
M	actionpack/test/controller/content_type_test.rb
M	actionpack/test/controller/filters_test.rb
M	actionpack/test/controller/flash_test.rb
M	actionpack/test/controller/helper_test.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/redirect_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/controller/test_case_test.rb
M	actionpack/test/controller/view_paths_test.rb
M	actionpack/test/controller/webservice_test.rb
M	actionpack/test/dispatch/session/cache_store_test.rb
M	actionpack/test/dispatch/session/cookie_store_test.rb
M	actionpack/test/dispatch/session/mem_cache_store_test.rb
M	actionpack/test/template/atom_feed_helper_test.rb
M	actionpack/test/template/url_helper_test.rb

commit 1ae9e60	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-14 18:25:11 -0200

    Remove other old compatibility constants

M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/lib/action_controller/metal/exceptions.rb
M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit 6f8b1e3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-14 18:18:29 -0200

    Remove constant already defined in exceptions module

M	actionpack/lib/action_controller/metal/compatibility.rb

commit bc50cb3	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-14 18:11:38 -0200

    Remove old compatibility methods not being used

M	actionpack/lib/action_controller/base.rb
M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/controller/view_paths_test.rb

commit 4280b20	refs/heads/master
Merge: 5f8274e 7c3a5ec
Author: José Valim 
Date:   2012-01-17 03:01:54 -0800

    Merge pull request #4494 from Dreamfa11/patch-0
    
    Validates method should not change options argument

commit 7c3a5ec	refs/heads/master
Author: dreamfall 
Date:   2012-01-17 13:19:30 +0300

    whitespaces

M	activemodel/lib/active_model/validations/validates.rb

commit e84998c	refs/heads/master
Author: dreamfall 
Date:   2012-01-17 13:18:58 +0300

    validates method should not change options argument

M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/test/cases/validations_test.rb

commit a21b577	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-01-17 11:43:45 +0200

    AS::Callbacks: Refactor :per_key option

M	activesupport/lib/active_support/callbacks.rb

commit ed35f37	refs/tags/v3.2.0
Merge: f9275e5 7021184
Author: Piotr Sarnacki 
Date:   2012-01-17 00:45:24 -0800

    Merge pull request #4492 from pkondzior/3-2-stable
    
    Wrong behavior of ActiveModel::Errors#dup is causing regressions on applications using Rails 3-2-stable

commit 5f8274e	refs/heads/master
Merge: 81e837e 9b15e01
Author: José Valim 
Date:   2012-01-17 00:27:39 -0800

    Merge pull request #4490 from EmmanuelOga/master
    
    when validating a record, if a validation context is used, use the same context when validating related records

commit 81e837e	refs/heads/master
Merge: a200446 6e76f8f
Author: José Valim 
Date:   2012-01-17 00:24:08 -0800

    Merge pull request #4484 from lest/patch-1
    
    use thread variable in TaggedLogging

commit 7021184	refs/tags/v3.2.0
Author: Paweł Kondzior 
Date:   2012-01-16 23:52:55 -0800

    Fix ActiveModel::Errors#dup
    
    Since ActiveModel::Errors instance keeps all error messages as hash
    we should duplicate this object as well.
    
    Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash,
    which results in different behavior on dup, this may result in regression for
    people relying on it.
    
    Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this
    regression we need to backport #initialize_dup.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit a200446	refs/heads/master
Merge: 21afd9b 6174d3b
Author: Piotr Sarnacki 
Date:   2012-01-16 23:30:18 -0800

    Merge pull request #4491 from pkondzior/master
    
    Wrong behavior of ActiveModel::Errors#dup is causing regressions on Rails master

commit 6174d3b	refs/heads/master
Author: Paweł Kondzior 
Date:   2012-01-16 23:24:14 -0800

    Remove redundant #to_sym

M	activemodel/lib/active_model/errors.rb

commit 5313eab	refs/heads/master
Author: Paweł Kondzior 
Date:   2012-01-16 23:07:15 -0800

    Fix ActiveModel::Errors#dup
    
    Since ActiveModel::Errors instance keeps all error messages as hash
    we should duplicate this object as well.
    
    Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash,
    which results in different behavior on `dup`, this may result in regression for
    people relying on it.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit d7f7f5e	refs/heads/master
Author: Hendy Tanata 
Date:   2012-01-16 21:33:19 -0800

    Remove redundant mention of escape_javascript alias.
    
    The doc already shows the alias.

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit 9b15e01	refs/heads/master
Author: Emmanuel Oga 
Date:   2012-01-17 01:40:17 -0300

    validate related records in the same validation context as parent.
    
    E.G.:
    
    ```ruby
    class Parent < ActiveRecord::Base
      has_one :child
      validates_presence_of :name, :on => "custom_context"
      validates_associated :child
    end
    
    class Child < ActiveRecord::Base
      belongs_to :parent
      validates_presence_of :name, :on => "custom_context"
    end
    
    p = Parent.new(:name => "Montoto", :child => Child.new)
    p.valid?(:custom_context) # => Returns true, even though the child is not valid under the same context.
    ```

M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/validations/associated.rb
M	activerecord/test/cases/validations/association_validation_test.rb

commit ee013a50	refs/heads/master
Author: David Peter 
Date:   2012-01-16 18:06:14 -0800

    Fix bug where reset_counters resets the wrong counter cache.
    
    If a model belongs_to two associations with the same class, then reset_counters
    will reset the wrong counter cache.
    
    Finding the right reflection should use the foreign_key instead, which should
    be unique.

M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/test/cases/counter_cache_test.rb
A	activerecord/test/fixtures/dog_lovers.yml
A	activerecord/test/fixtures/dogs.yml
A	activerecord/test/models/dog.rb
A	activerecord/test/models/dog_lover.rb
M	activerecord/test/schema/schema.rb

commit ad44ece	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 00:02:08 -0300

    Remove unused code

M	actionpack/lib/action_view/helpers/form_helper.rb

commit c048f0b	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 00:01:25 -0300

    Do not need each here anymore

M	actionpack/lib/action_view/helpers/active_model_helper.rb

commit f6fc352	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-17 00:00:42 -0300

    Extract DatetimeSelect

M	actionpack/lib/action_view/helpers/active_model_helper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/datetime_select.rb

commit b69e449	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 23:55:48 -0300

    Extract TimeSelect

M	actionpack/lib/action_view/helpers/active_model_helper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
M	actionpack/lib/action_view/helpers/tags/date_select.rb
A	actionpack/lib/action_view/helpers/tags/time_select.rb

commit e70f68f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 23:47:49 -0300

    Extract DateSelect

M	actionpack/lib/action_view/helpers/active_model_helper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/date_select.rb

commit 2a86c14	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 23:31:37 -0300

    Cleanup

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 8461ad9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 23:20:27 -0300

    Extract TimeZoneSelect

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/time_zone_select.rb

commit 7d2846b	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 23:15:07 -0300

    Extract GroupedCollectionSelect

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb

commit 9eb6cd6	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 23:06:25 -0300

    Extract CollectionSelect

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
M	actionpack/lib/action_view/helpers/tags/base.rb
A	actionpack/lib/action_view/helpers/tags/collection_select.rb
M	actionpack/lib/action_view/helpers/tags/select.rb

commit 18f181d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 22:54:55 -0300

    Extract Select

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/select.rb

commit 39dc7fc	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 22:14:45 -0300

    Remove unused code

M	actionpack/lib/action_view/helpers/form_helper.rb

commit f0041d4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:54:44 -0300

    Extract RangeField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/range_field.rb

commit 0f49caa	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:49:55 -0300

    Extract NumberField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/number_field.rb

commit 647aff9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:43:06 -0300

    Extract EmailField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/email_field.rb

commit 864d757	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:42:54 -0300

    Extract UrlField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/url_field.rb

commit 4cfdd23	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:37:31 -0300

    Extract TelField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/tel_field.rb

commit 4874716	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:25:32 -0300

    Extract SearchField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/search_field.rb

commit 675fb8d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:17:33 -0300

    Remove code duplication between CheckBox ans RadioButton

M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/lib/action_view/helpers/tags/check_box.rb
M	actionpack/lib/action_view/helpers/tags/radio_button.rb

commit d6b9eb9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 21:06:13 -0300

    Extract RadioButton

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
M	actionpack/lib/action_view/helpers/tags/base.rb
M	actionpack/lib/action_view/helpers/tags/check_box.rb
A	actionpack/lib/action_view/helpers/tags/radio_button.rb

commit f42e1db	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 20:48:32 -0300

    Extract CheckBox

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/check_box.rb

commit 8e8c6c3	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 20:29:01 -0300

    Extract TextArea

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/text_area.rb

commit 68b870f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 20:14:56 -0300

    Extract FileField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/file_field.rb
M	actionpack/lib/action_view/helpers/tags/text_field.rb

commit 6aeb799	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 20:02:39 -0300

    Extract HiddenField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/hidden_field.rb

commit 7cc373e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 19:22:31 -0300

    Adding one test case for label with block

M	actionpack/test/template/form_helper_test.rb

commit 0ac47bd	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 19:07:52 -0300

    Extract PasswordField

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/password_field.rb
M	actionpack/lib/action_view/helpers/tags/text_field.rb

commit 514308a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 18:38:13 -0300

    Rename classes

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/base.rb
D	actionpack/lib/action_view/helpers/tags/base_tag.rb
A	actionpack/lib/action_view/helpers/tags/label.rb
D	actionpack/lib/action_view/helpers/tags/label_tag.rb
A	actionpack/lib/action_view/helpers/tags/text_field.rb
D	actionpack/lib/action_view/helpers/tags/text_field_tag.rb

commit 801dcb0	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 17:49:39 -0300

    Extract duplicated code to a class

M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/base_tag.rb
M	actionpack/lib/action_view/helpers/tags/label_tag.rb
M	actionpack/lib/action_view/helpers/tags/text_field_tag.rb

commit 520fe7d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 17:41:24 -0300

    Extract TextFieldTag

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/text_field_tag.rb

commit e749fb5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-16 17:19:07 -0300

    Extract LabelTag

M	actionpack/lib/action_view/helpers/form_helper.rb
A	actionpack/lib/action_view/helpers/tags.rb
A	actionpack/lib/action_view/helpers/tags/label_tag.rb

commit 21afd9b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 15:24:27 -0800

    stop more ddl changes

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 86a73cd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 15:23:16 -0800

    stop ddl modifications for another test

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit b731593	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 15:19:34 -0800

    use one based indexes for the mock migrations

M	activerecord/test/cases/migrator_test.rb

commit 867f504	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 15:05:55 -0800

    stop making ddl changes for migrator tests

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 6e76f8f	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-17 01:40:01 +0300

    use thread variable in TaggedLogging
    
    previous solution can cause race conditions under GIL-free ruby implementations

M	activesupport/lib/active_support/tagged_logging.rb

commit ccbd201	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 13:58:58 -0800

    actually use the variable I created. :bomb: thanks @exviva

M	activerecord/test/cases/migrator_test.rb

commit 15daa14	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 13:58:32 -0800

    move another migrator to use sensors

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 8c0c083	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-16 21:35:21 +0000

    Make it more explicit that the feature is deprecated, not removed.

M	activerecord/CHANGELOG.md

commit a2dab46	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-16 21:14:34 +0000

    Deprecate inferred JOINs with includes + SQL snippets.
    
    See the CHANGELOG for details.
    
    Fixes #950.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/person.rb

commit 46ea444	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-14 21:28:57 +0000

    infer references from Relation#order

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit a84a20e	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-14 21:14:21 +0000

    store references as a string

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb

commit f6cc665	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-14 20:29:28 +0000

    Avoid sanitize_sql when we can use Relation#where instead

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/associations/join_helper.rb
M	activerecord/lib/active_record/associations/preloader/association.rb

commit ee7f666	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-14 17:53:52 +0000

    automatically add references when we can

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 4429f16	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-14 00:17:39 +0000

    Make referencing an included item trigger eager loading

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 4c4760a	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-13 23:56:07 +0000

    Add ActiveRecord::Relation#references (#950)

M	activerecord/lib/active_record/querying.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_test.rb

commit d13627d	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-13 23:42:07 +0000

    Revert "Deprecate implicit eager loading. Closes #950."
    
    This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/lib/active_record/associations/preloader/through_association.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/category.rb
M	activerecord/test/models/person.rb

commit 247d274	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 11:28:00 -0800

    moving verbosity tests to the migrator test, removing ddl changes

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 5364338	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 11:21:20 -0800

    silencing migrator tests, refactoring the migration test helper

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration/helper.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 7312b83	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 11:01:58 -0800

    fix tests on sqlite3

M	activerecord/test/cases/migration_test.rb

commit 8037c51	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 10:57:31 -0800

    prefer method sensors over actual ddl changes

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 8739a42	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 10:33:39 -0800

    testing the current version method

M	activerecord/test/cases/migrator_test.rb

commit 5b833f5	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 10:14:09 -0800

    test that migrations have connections, and method missing delegates

M	activerecord/test/cases/migration_test.rb

commit 0691866	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-16 10:03:33 -0800

    making sure the temp connection and the real connection are different after dup

M	activerecord/test/cases/migration_test.rb

commit f9275e5	refs/tags/v3.2.0
Author: Aaron Patterson 
Date:   2012-01-16 09:16:03 -0800

    Merge pull request #4462 from spohlenz/fix-routing-tests
    
    Stub ip method of alternative request class in router tests

M	actionpack/test/dispatch/routing_test.rb

commit 90aae07	refs/tags/v3.2.0
Author: Piotr Sarnacki 
Date:   2012-01-16 18:26:56 +0100

    Apparently asssert_empty is not available in 1.8.7

M	activemodel/test/cases/errors_test.rb

commit f84478f	refs/heads/master
Merge: 56d980b 3141da0
Author: Aaron Patterson 
Date:   2012-01-16 09:16:03 -0800

    Merge pull request #4462 from spohlenz/fix-routing-tests
    
    Stub ip method of alternative request class in router tests

commit 81ce77d	refs/heads/master
Merge: 56d980b 0e033ac
Author: Vijay Dev 
Date:   2012-01-16 08:48:16 -0800

    Merge pull request #76 from makoto/master
    
    UrlEncodedPairParser is deprecated, but still used as an example

commit f407ec5	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2012-01-13 20:05:42 -0500

    Mention how use config.assets.prefix to avoid conflicting with an existing "/assets" route

M	railties/guides/source/3_1_release_notes.textile

commit 48f9835	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-16 22:04:25 +0530

    minor edits in getting started guide

M	railties/guides/source/getting_started.textile

commit 39d4878	refs/tags/v3.2.0
Author: Vijay Dev 
Date:   2012-01-16 22:03:59 +0530

    copy editing asset pipeline changes

M	railties/guides/source/asset_pipeline.textile

commit 96e5d10	refs/tags/v3.2.0
Author: Richard Hulse 
Date:   2012-01-16 11:15:30 +1300

    [docs] Update pipeline asset organization section.
    
    * Calified how assets are included.
    * Added information about using index manifests.

M	railties/guides/source/asset_pipeline.textile

commit 951d70d	refs/tags/v3.2.0
Author: Dan Pickett 
Date:   2012-01-15 15:08:01 -0500

    change class to id per scaffold change
    
    #4472

M	railties/guides/source/getting_started.textile

commit 7b8e6d5	refs/tags/v3.2.0
Author: Carlos Antonio da Silva 
Date:   2012-01-15 14:30:23 -0200

    Improve description of :allow_destroy option for nested attributes in getting started guide

M	railties/guides/source/getting_started.textile

commit 30782e4	refs/tags/v3.2.0
Author: Guillermo Iguaran 
Date:   2012-01-13 10:51:53 -0500

    Getting Started Guide: Update reference about JavaScript runtimes

M	railties/guides/source/getting_started.textile

commit 56d980b	refs/heads/master
Merge: 8e8982c 7af8ee7
Author: Vijay Dev 
Date:   2012-01-16 22:05:12 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 7af8ee7	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-16 22:04:25 +0530

    minor edits in getting started guide

M	railties/guides/source/getting_started.textile

commit ddc63fb	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-16 22:03:59 +0530

    copy editing asset pipeline changes

M	railties/guides/source/asset_pipeline.textile

commit 3430647	refs/tags/v3.2.0
Author: Piotr Sarnacki 
Date:   2012-01-16 17:22:44 +0100

    Add ActiveModel::Errors#delete, which was not available after move to use delegation

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 8e8982c	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-16 17:22:44 +0100

    Add ActiveModel::Errors#delete, which was not available after move to use delegation

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 3100b99	refs/heads/master
Merge: b5243fc 23cb3d2
Author: José Valim 
Date:   2012-01-16 08:05:31 -0800

    Merge pull request #4480 from lest/use-rack-body-proxy
    
    Use Rack::BodyProxy

commit 23cb3d2	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-16 14:42:23 +0300

    use rack from master branch
    
    it's needed until new rack release with Rack::BodyProxy fixes
    https://github.com/rack/rack/commit/b06ef82876416fe69429f7d3ee6e51bf26aec75f

M	Gemfile
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 2b81240	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-16 14:36:41 +0300

    use Rack::BodyProxy in activerecord middlewares

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/identity_map.rb
M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/identity_map/middleware_test.rb
M	activerecord/test/cases/query_cache_test.rb

commit 3ded9b3	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-16 14:35:44 +0300

    use Rack::BodyProxy in AD::Reloader

D	actionpack/lib/action_dispatch/middleware/body_proxy.rb
M	actionpack/lib/action_dispatch/middleware/reloader.rb

commit 0e033ac	refs/heads/master
Author: Makoto Inoue 
Date:   2012-01-16 09:51:19 +0000

    ActionController::UrlEncodedPairParser is deprecated. Replaced the url parsing example with Rack::Utils.parse_query
    
    - https://webrat.lighthouseapp.com/projects/10503/tickets/161-urlencodedpairparser-removed-in-edge-rails

M	railties/guides/source/form_helpers.textile

commit b5243fc	refs/heads/master
Merge: ee24800 2c72f2a
Author: José Valim 
Date:   2012-01-16 00:30:13 -0800

    Merge pull request #4478 from amatsuda/rake_stats_mailer
    
    show stats for app/mailers

commit 2c72f2a	refs/heads/master
Author: Akira Matsuda 
Date:   2012-01-16 14:53:23 +0900

    show stats for app/mailers

M	railties/lib/rails/tasks/statistics.rake

commit ee24800	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-16 04:25:55 +0100

    Try to create schema migrations table in schema dumper test

M	activerecord/test/cases/schema_dumper_test.rb

commit 66cabfc	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-16 04:06:14 +0100

    Fix ActiveRecord mysql tests
    
    TL;DR: MySQL sucks.
    
    Since it does not support transactions for schema changes,
    when you run `create_table` in setup block, it will commit
    current transaction. Now tests want to run `RELEASE SAVEPOINT`
    after finishing tests which fails since there is no transaction.

M	activerecord/test/cases/migration/logger_test.rb

commit e5df4f9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 20:54:40 -0200

    Fix test class name that should read Without

M	activemodel/test/cases/attribute_methods_test.rb

commit 1d170e3	refs/heads/master
Author: Richard Hulse 
Date:   2012-01-16 11:15:30 +1300

    [docs] Update pipeline asset organization section.
    
    * Calified how assets are included.
    * Added information about using index manifests.

M	railties/guides/source/asset_pipeline.textile

commit 3cf22c8	refs/heads/master
Author: Dan Pickett 
Date:   2012-01-15 15:08:01 -0500

    change class to id per scaffold change
    
    #4472

M	railties/guides/source/getting_started.textile

commit 2d76d1f	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-15 14:30:23 -0200

    Improve description of :allow_destroy option for nested attributes in getting started guide

M	railties/guides/source/getting_started.textile

commit 4215935	refs/tags/v3.2.1
Merge: dee595c 666f931
Author: José Valim 
Date:   2012-01-15 08:04:09 -0800

    Merge pull request #4474 from guilleiguaran/fix-route-inspector-3-2-stable
    
    Don't hardcode assets route skipped in route inspector (3-2-stable)

commit 666f931	refs/tags/v3.2.1
Author: Guillermo Iguaran 
Date:   2012-01-14 16:33:21 -0500

    Don't hardcode assets route skipped in route inspector
    
    Conflicts:
    
    	railties/lib/rails/application/route_inspector.rb

M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit f9f0f03	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-15 16:37:46 +0100

    Fix railties tests
    
    SchemaMigration model is loaded on rails initialization,
    which means that it will not be cleaned on each request.

M	railties/test/application/loading_test.rb

commit dee595c	refs/tags/v3.2.1
Author: Piotr Sarnacki 
Date:   2012-01-15 12:06:50 +0100

    Fix stack level too deep when model does not have attributes method.
    
    Without that patch when using ActiveModel::AttributeMethods
    in a class that does not respond to `attributes` method,
    stack level too deep error will be raised on non existing
    method. While documentation is clear that you need to define
    `attributes` method in order to use AttributeMethods module,
    `stack level too deep` is rather obscure and hard to debug,
    therefore we should try to not break `method_missing` if
    someone forgets about defining `attributes`.

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit b164e81	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-15 12:06:50 +0100

    Fix stack level too deep when model does not have attributes method.
    
    Without that patch when using ActiveModel::AttributeMethods
    in a class that does not respond to `attributes` method,
    stack level too deep error will be raised on non existing
    method. While documentation is clear that you need to define
    `attributes` method in order to use AttributeMethods module,
    `stack level too deep` is rather obscure and hard to debug,
    therefore we should try to not break `method_missing` if
    someone forgets about defining `attributes`.

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 85629c8	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-15 18:19:31 +0530

    fix a broken test
    
    The commit 2f632f53919d2b44dbb2cfaadabed2310319f005 extracted the
    options into constants and while doing so, there was a minor error of
    using a wrong constant name.

M	railties/lib/rails/generators/generated_attribute.rb

commit b435ea9	refs/heads/master
Merge: 0bf4eaa 34ad69a
Author: Vijay Dev 
Date:   2012-01-15 03:48:20 -0800

    Merge pull request #4467 from castlerock/changelog_for_deprecated
    
    changelog entry for deprecated ActionController::Integration, ActionCont...

commit 95027d2	refs/tags/v3.2.1
Author: Mikel Lindsaar 
Date:   2012-01-15 22:15:15 +1030

    Upgrade mail dependency to 2.4.0

M	actionmailer/actionmailer.gemspec

commit 0bf4eaa	refs/heads/master
Author: Mikel Lindsaar 
Date:   2012-01-15 22:15:15 +1030

    Upgrade mail dependency to 2.4.0

M	actionmailer/actionmailer.gemspec

commit ff722f9	refs/heads/master
Merge: cff0849 0802dc7
Author: José Valim 
Date:   2012-01-15 01:30:17 -0800

    Merge pull request #4469 from guilleiguaran/fix-skipping-assets-in-route-inspector
    
    Don't hardcode assets route skipped in route inspector

commit cff0849	refs/heads/master
Merge: 09c4f0a 3cdbebd
Author: José Valim 
Date:   2012-01-15 01:29:43 -0800

    Merge pull request #4468 from guilleiguaran/bump-sprockets-2-2
    
    Bump Sprockets to 2.2.0 in master

commit 09c4f0a	refs/heads/master
Merge: 3d25fa0 516f102
Author: José Valim 
Date:   2012-01-15 01:28:38 -0800

    Merge pull request #4470 from ndbroadbent/small_refactoring
    
    Refactored watchable_args and build_original_fullpath methods in Rails::Application

commit fce3afa	refs/tags/v3.2.1
Merge: 78ef738 d696f8d
Author: Aaron Patterson 
Date:   2012-01-14 20:42:52 -0800

    Merge pull request #4471 from semaperepelitsa/enum_sum
    
    Pass a symbol instead of a block in Enumerable#sum

commit d696f8d	refs/tags/v3.2.1
Author: Semyon Perepelitsa 
Date:   2012-01-15 11:42:31 +0800

    Pass a symbol instead of a block. This is faster and more concise.
    
    At least Ruby 1.8.7 is required which is ok since 3.2.
    
    Benchmark:
    
    ```ruby
    require "benchmark"
    
    enum = 1..10_000
    N = 100
    Benchmark.bm do |x|
      x.report "inject block" do
        N.times do
          enum.inject { |sum, n| sum + n }
        end
      end
    
      x.report "inject symbol" do
        N.times do
          enum.inject(:+)
        end
      end
    end
    ```
    
    Result:
    
    ```
           user     system      total        real
    inject block   0.160000   0.000000   0.160000 (  0.179723)
    inject symbol  0.090000   0.000000   0.090000 (  0.095667)
    ```

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit 516f102	refs/heads/master
Author: Nathan Broadbent 
Date:   2012-01-15 10:34:51 +0800

    Refactored watchable_args and build_original_fullpath methods in railties/lib/rails/application.rb

M	railties/lib/rails/application.rb

commit 3cdbebd	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-14 16:35:20 -0500

    Bump Sprockets to 2.2.0

M	actionpack/actionpack.gemspec

commit 0802dc7	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-14 16:33:21 -0500

    Don't hardcode assets route skipped in route inspector

M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit 3d25fa0	refs/heads/master
Merge: f4b1dcd 11cde2b
Author: José Valim 
Date:   2012-01-14 12:41:14 -0800

    Merge pull request #4466 from carlosantoniodasilva/generated-attributes-refactor
    
    Generated attributes refactor

commit 34ad69a	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-15 01:33:18 +0530

    changelog entry for deprecated ActionController::Integration, ActionController::IntegrationTest, ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse others

M	actionpack/CHANGELOG.md

commit 11cde2b	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-14 17:34:21 -0200

    Delegate clear_active_connections to handler as well

M	activerecord/lib/active_record/connection_handling.rb

commit 2f632f5	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-14 11:35:57 -0200

    Extract index and uniq index options to constants

M	railties/lib/rails/generators/generated_attribute.rb

commit f4b1dcd	refs/heads/master
Merge: 1919a30 12d60a2
Author: José Valim 
Date:   2012-01-14 10:54:12 -0800

    Merge pull request #4398 from castlerock/remove_deprecated
    
    deprecated action_controller integration test and performance test

commit 12d60a2	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-10 18:00:54 +0530

    Deprecate ActionController::Integration, ActionController::IntegrationTest, ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse, ActionController::Response and ActionController::Routing

M	actionpack/lib/action_controller/deprecated.rb
M	actionpack/lib/action_controller/deprecated/integration_test.rb
M	actionpack/lib/action_controller/deprecated/performance_test.rb

commit 1919a30	refs/heads/master
Merge: 591fcba 6f3420c
Author: José Valim 
Date:   2012-01-14 04:45:10 -0800

    Merge pull request #4463 from nashby/refactor-response_body
    
    refactor response_body= method

commit 6f3420c	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2012-01-14 14:31:53 +0300

    refactor response_body= method
    
    response_to?(:each) returns false for strings in ruby 1.9, so there is no need for these checks

M	actionpack/lib/action_controller/metal.rb

commit 591fcba	refs/heads/master
Author: José Valim 
Date:   2012-01-14 09:19:42 +0100

    Add begin/ensure block since we are returning.

M	actionpack/lib/action_dispatch/middleware/body_proxy.rb

commit 78ef738	refs/tags/v3.2.1
Author: José Valim 
Date:   2012-01-14 09:18:57 +0100

    Add begin/ensure block since we are returning.

M	actionpack/lib/action_dispatch/middleware/body_proxy.rb

commit 04a05e5	refs/heads/master
Author: Jason Noble 
Date:   2012-01-13 23:14:10 -0700

    Fix styling of example layout.  Fixes #4461

M	railties/guides/source/getting_started.textile

commit 3141da0	refs/heads/master
Author: Sam Pohlenz 
Date:   2012-01-14 13:50:57 +1030

    Stub ip method of alternative request class

M	actionpack/test/dispatch/routing_test.rb

commit 4871433	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-13 20:05:42 -0500

    Mention how use config.assets.prefix to avoid conflicting with an existing "/assets" route

M	railties/guides/source/3_1_release_notes.textile

commit b1e5551	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 16:09:47 -0800

    make sure the migration table is alive and empty

M	activerecord/lib/active_record/schema_migration.rb
M	activerecord/test/cases/migration/logger_test.rb

commit e0f0afb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 15:52:19 -0800

    refactor schema migration table creation to the schema migration model

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/schema_migration.rb
M	activerecord/test/cases/migrator_test.rb

commit 70b762d	refs/tags/v3.2.1
Author: Jon Leighton 
Date:   2012-01-13 22:57:21 +0000

    Fix race condition :bomb:

M	activerecord/lib/active_record/attribute_methods.rb

commit 2c667f6	refs/heads/master
Author: Jon Leighton 
Date:   2012-01-13 22:57:21 +0000

    Fix race condition :bomb:

M	activerecord/lib/active_record/attribute_methods.rb

commit 8a3dcd7	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 14:13:31 -0800

    stop depending on the filesystem for interleaved migration tests

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb
D	activerecord/test/migrations/interleaved/pass_1/3_interleaved_innocent_jointable.rb
D	activerecord/test/migrations/interleaved/pass_2/1_interleaved_people_have_last_names.rb
D	activerecord/test/migrations/interleaved/pass_2/3_interleaved_innocent_jointable.rb
D	activerecord/test/migrations/interleaved/pass_3/1_interleaved_people_have_last_names.rb
D	activerecord/test/migrations/interleaved/pass_3/2_interleaved_i_raise_on_down.rb
D	activerecord/test/migrations/interleaved/pass_3/3_interleaved_innocent_jointable.rb

commit b932310	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 13:34:54 -0800

    convert the migration list to a Set, remove duplicate code

M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/schema_migration.rb

commit 5e61637	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 11:44:56 -0800

    deprecate the block argument to Migrator#migrate

M	activerecord/lib/active_record/migration.rb

commit 280e4cb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 11:34:12 -0800

    refactor the migrate method to filter migrations before running them

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb

commit 0f743bc	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 11:04:13 -0800

    move schema dumper tests to the correct class

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit d0bb43d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 10:47:28 -0800

    use the schema migration model to dump schema info

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/schema_migration.rb

commit ff5c385	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 10:30:52 -0800

    move another migrator test, use schema migration model

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 85e5fac	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-13 10:23:09 -0800

    use the model to delete records

M	activerecord/lib/active_record/migration.rb

commit ad2af42	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 15:53:47 -0800

    move another migrator test to the correct class

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit f3f8f0e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 15:53:32 -0800

    use the schema migration model to create a new record

M	activerecord/lib/active_record/migration.rb

commit 6c7b66f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 15:46:04 -0800

    moving more migrator tests to the right test case

M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/migrator_test.rb

commit 6e7ba44	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 15:43:41 -0800

    test code that finds migrations

M	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/migration_test.rb

commit dea59f0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 15:37:06 -0800

    removing migration files as they are no longer needed

M	activerecord/test/cases/migration/logger_test.rb
D	activerecord/test/migrations/duplicate/1_people_have_last_names.rb
D	activerecord/test/migrations/duplicate/2_we_need_reminders.rb
D	activerecord/test/migrations/duplicate/3_foo.rb
D	activerecord/test/migrations/duplicate/3_innocent_jointable.rb
D	activerecord/test/migrations/duplicate_names/20080507052938_chunky.rb
D	activerecord/test/migrations/duplicate_names/20080507053028_chunky.rb

commit 01f86cd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 15:29:16 -0800

    moving migrator tests to a migrator test class

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb
A	activerecord/test/cases/migrator_test.rb

commit 5baa66c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 14:47:36 -0800

    fixing test class name

M	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/migration/rename_table_test.rb

commit 145ad7b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 14:16:47 -0800

    adding a test class for table renaming

M	activerecord/test/cases/migration/helper.rb
A	activerecord/test/cases/migration/rename_table_test.rb
M	activerecord/test/cases/migration_test.rb

commit 977df64	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 13:35:09 -0800

    moving more column renaming tests

M	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/migration_test.rb

commit e6f7960	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 13:14:58 -0800

    moving more renaming tests to the proper test case

M	activerecord/test/cases/migration/helper.rb
M	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/migration_test.rb

commit cd930c8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 11:33:07 -0800

    moving rename column tests to their own class

M	activerecord/test/cases/migration/column_attributes_test.rb
A	activerecord/test/cases/migration/helper.rb
A	activerecord/test/cases/migration/rename_column_test.rb
M	activerecord/test/cases/migration_test.rb

commit 28bb02a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 10:01:01 -0800

    moving column attributes tests to their own class

A	activerecord/test/cases/migration/column_attributes_test.rb
M	activerecord/test/cases/migration_test.rb

commit 3c2e7a8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 17:47:51 -0800

    remove unused code

M	activerecord/test/cases/migration_test.rb

commit 66fe507	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 17:19:23 -0800

    use ruby rather than mocha

M	activerecord/test/cases/migration_test.rb

commit 706d8ea	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 17:16:16 -0800

    move another index related test case

M	activerecord/test/cases/migration/change_schema_test.rb
M	activerecord/test/cases/migration/index_test.rb

commit a394985	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 17:14:44 -0800

    move tests regarding index modification to their own class

M	activerecord/test/cases/migration/change_schema_test.rb
A	activerecord/test/cases/migration/index_test.rb
M	activerecord/test/cases/migration_test.rb

commit 5c8da16	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 17:04:24 -0800

    decoupling more tests from AR::Base

M	activerecord/test/cases/migration/change_schema_test.rb
M	activerecord/test/cases/migration_test.rb

commit ee4e242	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 15:58:58 -0800

    use skip rather than conditionally define tests

M	activerecord/test/cases/migration_test.rb

commit c0c7ba9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 15:46:52 -0800

    skip openbase test

M	activerecord/test/cases/migration_test.rb

commit 06b8dc0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 15:43:12 -0800

    move more schema modification tests

M	activerecord/test/cases/migration/change_schema_test.rb
M	activerecord/test/cases/migration_test.rb

commit 67fba0c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 15:24:15 -0800

    add a migration schema model

M	activerecord/lib/active_record/migration.rb
A	activerecord/lib/active_record/schema_migration.rb

commit a85625d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 14:53:37 -0800

    instantiate our own broken migration rather than relying on the filesystem

M	activerecord/test/cases/migration_test.rb
D	activerecord/test/migrations/broken/100_migration_that_raises_exception.rb

commit 452195a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 13:49:10 -0800

    use skip so we know what tests are being skipped

M	activerecord/test/cases/migration_test.rb

commit cc88ffe	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 12:01:04 -0800

    remove dependency on the filesystem

M	activerecord/test/cases/migration/logger_test.rb

commit 974a640	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 11:48:14 -0800

    moving logger test to its own file

A	activerecord/test/cases/migration/logger_test.rb
M	activerecord/test/cases/migration_test.rb

commit bc276fb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-11 11:41:27 -0800

    construct a migrator with a list of migrations rather than a list of paths

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb

commit 29fdd8c	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-13 18:40:34 -0200

    Use a BodyProxy instead of including a Module that responds to close.
    
    Closes #4441 if Active Record is disabled assets are delivered correctly

M	actionpack/CHANGELOG.md
A	actionpack/lib/action_dispatch/middleware/body_proxy.rb
M	actionpack/lib/action_dispatch/middleware/reloader.rb
M	actionpack/test/dispatch/reloader_test.rb
M	railties/guides/source/3_2_release_notes.textile

commit c159b01	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-13 18:40:34 -0200

    Use a BodyProxy instead of including a Module that responds to close.
    
    Closes #4441 if Active Record is disabled assets are delivered correctly

M	actionpack/CHANGELOG.md
A	actionpack/lib/action_dispatch/middleware/body_proxy.rb
M	actionpack/lib/action_dispatch/middleware/reloader.rb
M	actionpack/test/dispatch/reloader_test.rb
M	railties/guides/source/3_2_release_notes.textile

commit 98ac00c	refs/tags/v3.1.6
Author: José Valim 
Date:   2012-01-13 20:57:51 +0100

    No AS::TestCase here.

M	railties/test/application/middleware/session_test.rb

commit 4ca3592	refs/tags/v3.2.1
Author: José Valim 
Date:   2012-01-13 20:57:51 +0100

    No AS::TestCase here.

M	railties/test/application/middleware/session_test.rb

commit 161c857	refs/heads/master
Merge: d6933a1 47998c6
Author: Vijay Dev 
Date:   2012-01-13 11:03:55 -0800

    Merge pull request #4459 from Karunakar/small_test_fix
    
    removed unnecessary test_pass test from form_tag_helper_test.rb

commit d209325	refs/tags/v3.1.6
Author: José Valim 
Date:   2012-01-12 20:46:54 +0100

    config.force_ssl should mark the session as secure.

M	railties/CHANGELOG.md
M	railties/lib/rails/application.rb
A	railties/test/application/middleware/session_test.rb

commit b745fe1	refs/tags/v3.2.1
Author: José Valim 
Date:   2012-01-12 20:46:54 +0100

    config.force_ssl should mark the session as secure.

M	railties/lib/rails/application.rb
A	railties/test/application/middleware/session_test.rb

commit d6933a1	refs/heads/master
Author: José Valim 
Date:   2012-01-12 20:46:54 +0100

    config.force_ssl should mark the session as secure.

M	railties/lib/rails/application.rb
A	railties/test/application/middleware/session_test.rb

commit 47998c6	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-13 22:40:48 +0530

    removed unnecessary test_pass test from form_tag_helper_test.rb

M	actionpack/test/template/form_tag_helper_test.rb

commit d393e46	refs/heads/master
Merge: 1e69181 6248a20
Author: José Valim 
Date:   2012-01-13 09:34:57 -0800

    Merge pull request #4457 from j-manu/remove-mri-18-gems
    
    Remove MRI 1.8 specific gems

commit 6248a20	refs/heads/master
Author: Manu J 
Date:   2012-01-13 22:43:31 +0530

    Remove MRI 1.8 specific gems

M	Gemfile

commit 3979812	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-13 10:51:53 -0500

    Getting Started Guide: Update reference about JavaScript runtimes

M	railties/guides/source/getting_started.textile

commit e5425c8	refs/heads/master
Author: Marcos Tapajos 
Date:   2012-01-13 00:14:11 -0200

    Cache (FileStore) clear should keep .gitkeep

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit 70631e7	refs/tags/v3.2.1
Author: José Valim 
Date:   2012-01-13 06:25:43 -0800

    Merge pull request #4451 from guilleiguaran/add-therubyracer-commented

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 1e69181	refs/heads/master
Merge: daf59a7 94bcdd6
Author: José Valim 
Date:   2012-01-13 06:25:43 -0800

    Merge pull request #4451 from guilleiguaran/add-therubyracer-commented
    
    Add therubyracer gem commented in default Gemfile

commit daf59a7	refs/heads/master
Merge: 8fd8f99 22cbc1a
Author: Santiago Pastorino 
Date:   2012-01-13 05:46:28 -0800

    Merge pull request #4448 from lest/patch-1
    
    cleanup AV::Helpers::UrlHelper

commit 22cbc1a	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-13 13:49:50 +0300

    remove unused private methods

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 41c3d4a	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-13 13:49:16 +0300

    use Rack::Utils.escape_path

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 8fd8f99	refs/heads/master
Merge: eea2865 95545bf
Author: José Valim 
Date:   2012-01-13 01:47:39 -0800

    Merge pull request #4434 from carlosantoniodasilva/action-view-refactor
    
    Action view refactor

commit eea2865	refs/heads/master
Merge: 3f70c10 ad70d9d
Author: José Valim 
Date:   2012-01-13 01:46:14 -0800

    Merge pull request #4439 from rafaelfranca/av-refactor
    
    Do not check if record is an Array twice

commit 05367e6	refs/tags/v3.2.1
Author: Guillermo Iguaran 
Date:   2012-01-12 22:42:55 -0500

    Update Railties section of 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit 3f70c10	refs/heads/master
Merge: 16c18f0 7b05422
Author: Vijay Dev 
Date:   2012-01-13 12:40:04 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 16c18f0	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 12:37:27 +0530

    revise wording [ci skip]

M	railties/guides/source/active_support_core_extensions.textile

commit 78c38c9	refs/heads/master
Merge: 31472ba 012b253
Author: Vijay Dev 
Date:   2012-01-12 22:43:05 -0800

    Merge pull request #4443 from guilleiguaran/changelog-3-2-stable
    
    Update railties 3.2.0 changelog

commit a677701	refs/tags/v3.1.6
Merge: 18d67f5 28b0050
Author: Vijay Dev 
Date:   2012-01-12 22:39:10 -0800

    Merge pull request #4442 from guilleiguaran/3-1-changelogs
    
    Update actionpack changelog in 3-1-stable

commit 012b253	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-12 22:43:55 -0500

    Update railties 3.2.0 changelog

M	railties/CHANGELOG.md

commit 7b05422	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-12 22:42:55 -0500

    Update Railties section of 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit 28b0050	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2012-01-12 22:18:31 -0500

    Update actionpack Changelog in 3-1-stable

M	actionpack/CHANGELOG.md

commit 94bcdd6	refs/heads/master
Author: Guillermo Iguaran 
Date:   2012-01-12 21:58:25 -0500

    Add therubyracer gem commented in default Gemfile

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit ad70d9d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-12 23:01:55 -0300

    Do not check if record is an Array twice

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 95545bf	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 20:41:03 -0200

    Refactor url_for helper to check for nil in the case statement only

M	actionpack/lib/action_view/helpers/url_helper.rb

commit cfee068	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 20:15:02 -0200

    Delegate data tag option to tag option for escaping

M	actionpack/lib/action_view/helpers/tag_helper.rb

commit c4c1c25	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 20:11:31 -0200

    Remove value argument from boolean option

M	actionpack/lib/action_view/helpers/tag_helper.rb

commit b01fd08	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 20:10:59 -0200

    Return faster when no option is given

M	actionpack/lib/action_view/helpers/tag_helper.rb

commit 8bc065e	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 20:09:16 -0200

    Refactor and improve readability

M	actionpack/lib/action_view/helpers/tag_helper.rb

commit 31472ba	refs/heads/master
Merge: a59269d b8e1efd
Author: Santiago Pastorino 
Date:   2012-01-12 15:32:40 -0800

    Merge pull request #4432 from lest/patch-1
    
    to_date, to_time, and to_datetime Time methods present in ruby 1.9

commit a59269d	refs/heads/master
Author: Xavier Noria 
Date:   2012-01-12 14:57:58 -0800

    warns against using temporary subscribers

M	activesupport/lib/active_support/notifications.rb

commit 01c1127	refs/tags/v3.2.1
Author: Xavier Noria 
Date:   2012-01-12 14:57:58 -0800

    warns against using temporary subscribers

M	activesupport/lib/active_support/notifications.rb

commit 4be6544	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 20:06:34 -0200

    Split tag options helper in smaller methods

M	actionpack/lib/action_view/helpers/tag_helper.rb

commit b8e1efd	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-13 01:05:44 +0300

    to_date, to_time, and to_datetime Time methods present in ruby 1.9

M	activesupport/lib/active_support/core_ext/time/conversions.rb

commit 4e33fbe	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 19:53:52 -0200

    Remove deprecated and not used method

M	actionpack/lib/action_view/base.rb

commit 8fdc052	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 19:51:54 -0200

    Extract asset paths uri regexp to a constant
    
    Avoid compiling the regexp all the time.

M	actionpack/lib/action_view/asset_paths.rb

commit 700f778	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-13 01:51:19 +0530

    fix rails binary path when using --dev [ci skip]

M	railties/guides/source/3_1_release_notes.textile
M	railties/guides/source/3_2_release_notes.textile

commit 9c993cb	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 01:51:19 +0530

    fix rails binary path when using --dev [ci skip]

M	railties/guides/source/3_1_release_notes.textile
M	railties/guides/source/3_2_release_notes.textile

commit a6dce45	refs/tags/v3.2.1
Author: Piotr Sarnacki 
Date:   2012-01-12 21:16:15 +0100

    Added note about [ci skip] tag to contributing guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 223ea19	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-12 21:16:15 +0100

    Added note about [ci skip] tag to contributing guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 04df7bb	refs/heads/master
Author: Xavier Noria 
Date:   2012-01-12 12:17:24 -0800

    deprecates Module#local_constant_names

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/module/introspection.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/core_ext/module_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit e4c7ebe	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-13 01:29:23 +0530

    add info about kindle guides in the release guide [ci skip]

M	railties/guides/source/3_2_release_notes.textile

commit 3c64548	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 01:29:23 +0530

    add info about kindle guides in the release guide

M	railties/guides/source/3_2_release_notes.textile

commit 0d1df72	refs/tags/v3.2.1
Author: Piotr Sarnacki 
Date:   2012-01-12 20:32:11 +0100

    Fix table_name in ActiveRecord with more than one abstract ancestors
    
    When subclassing abstract_class table_name should be always computed
    based on class name, no matter if superclass is subclassing base
    or another abstract_class. So:
    
    class FirstAbstract < ActiveRecord::Base
      self.abstract_class = true
    end
    class SecondAbstract < FirstAbstract
      self.abstract_class = true
    end
    
    class Post < SecondAbstract
      self.table_name #=> 'posts' (not 'second_abstracts')
    end

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit ac153fe	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-13 01:17:20 +0530

    prepare for 3.2 guides release :)

M	railties/guides/source/_welcome.html.erb

commit ddfd2cf	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-13 01:15:53 +0530

    remove hidden link in guides layout

M	railties/guides/source/layout.html.erb

commit 12cfcd2	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 01:17:20 +0530

    prepare for 3.2 guides release :)

M	railties/guides/source/_welcome.html.erb

commit 1232fe3	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 01:15:53 +0530

    remove hidden link in guides layout

M	railties/guides/source/layout.html.erb

commit ef1dfb6	refs/heads/master
Merge: 488c9ef 321dae5
Author: José Valim 
Date:   2012-01-12 11:47:59 -0800

    Merge pull request #4429 from marcinbunsch/1923-force-ssl-redirect-keep-flash
    
    When force redirecting to SSL, make sure that the session is kept

commit 488c9ef	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 11:39:24 -0800

    moving to arel 3.0.0

M	activerecord/activerecord.gemspec

commit e3f7d0d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-12 11:33:58 -0800

    depend on journey 1.0.0

M	actionpack/actionpack.gemspec

commit ac483a2	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-10 14:53:04 -0800

    moving the table and index test to it's own file

A	activerecord/test/cases/migration/table_and_index_test.rb
M	activerecord/test/cases/migration_test.rb

commit 1d74af6	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-12 11:39:24 -0800

    moving to arel 3.0.0

M	activerecord/activerecord.gemspec

commit 6951014	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-12 20:32:11 +0100

    Fix table_name in ActiveRecord with more than one abstract ancestors
    
    When subclassing abstract_class table_name should be always computed
    based on class name, no matter if superclass is subclassing base
    or another abstract_class. So:
    
    class FirstAbstract < ActiveRecord::Base
      self.abstract_class = true
    end
    class SecondAbstract < FirstAbstract
      self.abstract_class = true
    end
    
    class Post < SecondAbstract
      self.table_name #=> 'posts' (not 'second_abstracts')
    end

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb

commit 6dac17f	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-12 11:33:58 -0800

    depend on journey 1.0.0

M	actionpack/actionpack.gemspec

commit 321dae5	refs/heads/master
Author: Marcin Bunsch and Przemek Dąbek 
Date:   2012-01-12 20:31:23 +0100

    When force redirecting to SSL, make sure that the session is kept. As we're moving from a non-secure to secure environment, it's safe

M	actionpack/lib/action_controller/metal/force_ssl.rb
M	actionpack/test/controller/force_ssl_test.rb

commit 84d633a	refs/heads/master
Merge: ab8071f e634d25
Author: Vijay Dev 
Date:   2012-01-12 11:23:51 -0800

    Merge pull request #4387 from Karunakar/releasenotes
    
    Added the release dates for rails 3.1.1, rails 3.1.2, rails 3.1.3

commit ab8071f	refs/heads/master
Merge: 57c1945 509af8f
Author: Vijay Dev 
Date:   2012-01-13 00:49:48 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 040c9e4	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-13 00:39:05 +0530

    add 3.2 release notes to the guides index

M	railties/guides/source/documents.yaml

commit 03a7198	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-12 22:44:32 +0530

    minor edits

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit e6b5943	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-11 20:18:37 +0530

    fixes in api docs

M	activerecord/lib/active_record/railties/jdbcmysql_error.rb
M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
M	activesupport/lib/active_support/json/encoding.rb
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/profiler.rb

commit 57c1945	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 00:39:05 +0530

    add 3.2 release notes to the guides index

M	railties/guides/source/documents.yaml

commit fdc29e7	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-12 22:44:32 +0530

    minor edits

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 0119740	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-11 20:18:37 +0530

    fixes in api docs

M	activerecord/lib/active_record/railties/jdbcmysql_error.rb
M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
M	activesupport/lib/active_support/json/encoding.rb
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/profiler.rb

commit 18d67f5	refs/tags/v3.1.6
Author: Vijay Dev 
Date:   2012-01-13 00:18:04 +0530

    First attempt at providing a 'what to update' section for Rails 3.1

M	railties/guides/source/3_1_release_notes.textile

commit 8e06426	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 00:18:04 +0530

    First attempt at providing a 'what to update' section for Rails 3.1

M	railties/guides/source/3_1_release_notes.textile

commit 8ff8ca7	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-13 00:15:41 +0530

    minor revision in 3.2 release guide

M	railties/guides/source/3_2_release_notes.textile

commit 5eb8482	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-13 00:15:41 +0530

    minor revision in 3.2 release guide

M	railties/guides/source/3_2_release_notes.textile

commit e705ac7	refs/heads/master
Merge: 487318e 0e780e9
Author: José Valim 
Date:   2012-01-12 10:19:12 -0800

    Merge pull request #4427 from kennyj/fix_3980
    
    Fix GH #3980. Support assets:cache:clean task.

commit 0e780e9	refs/heads/master
Author: kennyj 
Date:   2012-01-13 02:46:40 +0900

    Fix GH #3980. Support assets:cache:clean method to respect sprockets cache.

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 487318e	refs/heads/master
Merge: aa0f955 76df63e
Author: Aaron Patterson 
Date:   2012-01-12 09:45:13 -0800

    Merge pull request #4414 from ask4prasath/changes
    
    changing self.attribute to @atrribute to follow one kind of value assign...

commit aa0f955	refs/heads/master
Merge: daf435d e7e4dee
Author: Aaron Patterson 
Date:   2012-01-12 09:39:19 -0800

    Merge pull request #4419 from j-manu/4255-handle-spaces-in-protocols
    
    Handle leading spaces in protocol while sanitizing

commit daf435d	refs/heads/master
Merge: e927f06 034bf72
Author: Xavier Noria 
Date:   2012-01-12 09:25:49 -0800

    Merge pull request #4425 from carlosantoniodasilva/url-for-refactor
    
    Url for refactor

commit 509af8f	refs/heads/master
Author: Alejandro Andrés 
Date:   2012-01-12 17:47:54 +0100

    Changed 'proc' to 'Proc.new' in ActionController::Caching::Actions description

M	actionpack/lib/action_controller/caching/actions.rb

commit 034bf72	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 14:47:25 -0200

    Delegate subdomain method to the URL module, removing duplication

M	actionpack/lib/action_dispatch/http/url.rb

commit 47d8fc0	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 14:36:05 -0200

    Simplify named host logic and missing host condition check

M	actionpack/lib/action_dispatch/http/url.rb

commit 6e23c23	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-12 14:35:43 -0200

    Extract ip host regexp to a constant

M	actionpack/lib/action_dispatch/http/url.rb

commit 16f9511	refs/tags/v3.1.6
Merge: efa215a f707cda
Author: Santiago Pastorino 
Date:   2012-01-12 04:57:03 -0800

    Merge pull request #4418 from tomstuart/read-and-write-attribute-aliases-3-1-stable
    
    #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute (3-1-stable)

commit e7e4dee	refs/heads/master
Author: Manu 
Date:   2012-01-12 16:13:26 +0530

    Handle leading spaces in protocol while sanitizing

M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
M	actionpack/test/template/html-scanner/sanitizer_test.rb

commit f707cda	refs/tags/v3.1.6
Author: Tom Stuart 
Date:   2012-01-11 10:00:39 +0000

    Revert "Base#[] and Base#[]= are aliases so implement them as aliases :)"
    
    This reverts commit 21eadc1b3f2eb818a4833381ee0a6cfa205f2955.

M	activerecord/lib/active_record/base.rb

commit cda5094	refs/tags/v3.1.6
Author: Tom Stuart 
Date:   2012-01-11 09:57:21 +0000

    Test that #[] and #[]= keep working when #read_attribute and #write_attribute are overridden

M	activerecord/test/cases/attribute_methods_test.rb

commit f22c36b	refs/tags/v3.1.6
Author: Tom Stuart 
Date:   2012-01-11 09:41:46 +0000

    Test ActiveRecord::Base#[]= as well as #write_attribute

M	activerecord/test/cases/attribute_methods_test.rb

commit e927f06	refs/heads/master
Merge: 838d30f 19357a7
Author: José Valim 
Date:   2012-01-12 00:53:42 -0800

    Merge pull request #4417 from bogdan/remove_runner
    
    AS::Callbacks: remove unused runner

commit 19357a7	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-01-12 10:44:10 +0200

    AS::Callbacks: remove unused runner

M	activerecord/lib/active_record/core.rb
M	activesupport/lib/active_support/callbacks.rb
M	railties/guides/source/active_model_basics.textile

commit 838d30f	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-11 23:52:01 -0200

    Add CHANGELOG entry

M	activerecord/CHANGELOG.md
M	railties/guides/source/3_2_release_notes.textile

commit 3f16f5b	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-11 23:52:01 -0200

    Add CHANGELOG entry

M	activerecord/CHANGELOG.md
M	railties/guides/source/3_2_release_notes.textile

commit 61c5b4a	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-11 23:49:15 -0200

    html_escape already handles nil

M	actionpack/lib/action_view/helpers/output_safety_helper.rb

commit fc74a51	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-11 23:13:54 -0200

    on and ON are type casted to a true boolean column

M	activerecord/lib/active_record/connection_adapters/column.rb
A	activerecord/test/cases/column_test.rb

commit 16c4cb0	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-11 23:13:54 -0200

    on and ON are type casted to a true boolean column

M	activerecord/lib/active_record/connection_adapters/column.rb
A	activerecord/test/cases/column_test.rb

commit 54117b6	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-11 20:08:43 -0200

    Tiny refactor

M	actionpack/lib/action_view/helpers/output_safety_helper.rb

commit 76df63e	refs/heads/master
Author: prasath 
Date:   2012-01-12 01:27:30 +0530

    changing self.attribute to @atrribute to follow one kind of value assignment through out the file

M	railties/lib/rails/application/configuration.rb

commit ffc8e59	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-11 23:21:52 +0530

    add some missing formats in the release guide

M	railties/guides/source/3_2_release_notes.textile

commit 321bf95	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-11 23:21:52 +0530

    add some missing formats in the release guide

M	railties/guides/source/3_2_release_notes.textile

commit efa215a	refs/tags/v3.1.6
Author: Santiago Pastorino 
Date:   2012-01-11 09:05:17 -0800

    Merge pull request #4412 from kennyj/fix_3743
    
    Fix GH #3743. We must specify an encoding in rdoc_option explicitly.

M	activesupport/activesupport.gemspec

commit 9e94e26	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-11 09:05:17 -0800

    Merge pull request #4412 from kennyj/fix_3743
    
    Fix GH #3743. We must specify an encoding in rdoc_option explicitly.

M	activesupport/activesupport.gemspec

commit 0d1587a	refs/heads/master
Merge: eb4b3a4 0b81304
Author: Santiago Pastorino 
Date:   2012-01-11 09:05:17 -0800

    Merge pull request #4412 from kennyj/fix_3743
    
    Fix GH #3743. We must specify an encoding in rdoc_option explicitly.

commit 0b81304	refs/heads/master
Author: kennyj 
Date:   2012-01-04 01:18:05 +0900

    Fix GH #3743. We must specify rdoc option's encoding.

M	activesupport/activesupport.gemspec

commit 2609990	refs/tags/v3.2.1
Author: Vijay Dev 
Date:   2012-01-11 20:46:32 +0530

    Some revisions to the release notes guide
    
    Conflicts:
    
    	railties/guides/source/3_2_release_notes.textile

M	railties/guides/source/3_2_release_notes.textile

commit eb4b3a4	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-11 20:42:23 +0530

    Some revisions to the release notes guide

M	railties/guides/source/3_2_release_notes.textile

commit d0915ac	refs/tags/v3.2.1
Author: Matt Jones 
Date:   2012-01-09 11:20:52 -0500

    add documentation explaining reorder behavior

M	activerecord/lib/active_record/relation/query_methods.rb

commit 96d4da1	refs/tags/v3.2.1
Author: codesnik 
Date:   2012-01-07 02:57:51 +0400

    Made an example a little more realistic

M	actionpack/lib/action_controller/base.rb

commit 7c29246	refs/heads/master
Merge: 3f8f96e ce41a36
Author: Vijay Dev 
Date:   2012-01-11 20:18:55 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit bb78804	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-11 06:10:22 -0800

    Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases
    
    #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 3f8f96e	refs/heads/master
Merge: 1bffd00 dcebe7f
Author: Santiago Pastorino 
Date:   2012-01-11 06:10:22 -0800

    Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases
    
    #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute

commit 1bffd00	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-11 05:44:18 -0800

    Merge pull request #4404 from rizwanreza/edits-to-spastorino-upgrade-notes

M	railties/guides/source/3_2_release_notes.textile

commit 9c88005	refs/tags/v3.2.1
Merge: 77785c7 7be7710
Author: Santiago Pastorino 
Date:   2012-01-11 05:44:18 -0800

    Merge pull request #4404 from rizwanreza/edits-to-spastorino-upgrade-notes
    
    Edits to spastorino's upgrade notes

commit 7be7710	refs/tags/v3.2.1
Author: Rizwan Reza 
Date:   2012-01-11 06:28:58 +0330

    Edits to spastorino's additions in 3.2 Release Notes

M	railties/guides/source/3_2_release_notes.textile

commit dcebe7f	refs/heads/master
Author: Tom Stuart 
Date:   2012-01-11 10:00:39 +0000

    Revert "Base#[] and Base#[]= are aliases so implement them as aliases :)"
    
    This reverts commit 21eadc1b3f2eb818a4833381ee0a6cfa205f2955.

M	activerecord/lib/active_record/attribute_methods.rb

commit 701afab	refs/heads/master
Author: Tom Stuart 
Date:   2012-01-11 09:57:21 +0000

    Test that #[] and #[]= keep working when #read_attribute and #write_attribute are overridden

M	activerecord/test/cases/attribute_methods_test.rb

commit d0acd02	refs/heads/master
Author: Tom Stuart 
Date:   2012-01-11 09:41:46 +0000

    Test ActiveRecord::Base#[]= as well as #write_attribute

M	activerecord/test/cases/attribute_methods_test.rb

commit ce41a36	refs/heads/master
Author: Hendy Tanata 
Date:   2012-01-10 16:05:36 -0800

    Update Active Support Constants guide for 1.9.

M	railties/guides/source/active_support_core_extensions.textile

commit 2158a70	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-10 14:48:51 -0800

    all tested database support migrations, so stop making the tests conditional

M	activerecord/test/cases/migration_test.rb

commit d41e2f1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-10 14:48:31 -0800

    adding missing require

M	activerecord/test/cases/migration/column_positioning_test.rb

commit 4663070	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-10 14:02:21 -0800

    move column ordering tests to it's own class

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration/change_schema_test.rb
A	activerecord/test/cases/migration/column_positioning_test.rb

commit 77785c7	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-10 13:24:15 -0800

    FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb:

M	activerecord/lib/active_record/migration.rb

commit 5e04884	refs/tags/v3.2.1
Author: Aaron Patterson 
Date:   2012-01-10 13:17:35 -0800

    deprecate the subdirectories parameter to `migrations`
    
    Conflicts:
    
    	activerecord/lib/active_record/migration.rb

M	activerecord/lib/active_record/migration.rb

commit 42fd164	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-10 13:17:35 -0800

    deprecate the subdirectories parameter to `migrations`

M	activerecord/lib/active_record/migration.rb

commit 03f6275	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-10 18:20:45 -0200

    Add "What to update in your apps" section to the release notes guide
    
    We should keep this up to date and the current version is probably wrong
    and/or incomplete. HELP!!!

M	railties/guides/source/3_2_release_notes.textile

commit f194ff9	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-10 18:20:45 -0200

    Add "What to update in your apps" section to the release notes guide
    
    We should keep this up to date and the current version is probably wrong
    and/or incomplete. HELP!!!

M	railties/guides/source/3_2_release_notes.textile

commit 7661065	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-10 11:53:20 -0800

    refactoring migration test

A	activerecord/test/cases/migration/change_schema_test.rb
M	activerecord/test/cases/migration_test.rb

commit ae14b71	refs/tags/v3.2.1
Author: José Valim 
Date:   2012-01-10 20:51:45 +0100

    Remove duplicated test line which was causing Ci failures on 1.8.7.

M	railties/test/generators/migration_generator_test.rb

commit f82e244	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-10 10:54:00 -0800

    dropping support for `schema_info`.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit bda0ae7	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-10 16:37:26 -0200

    Remove dead code

M	railties/test/application/assets_test.rb

commit 0e64107	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-10 16:37:26 -0200

    Remove dead code

M	railties/test/application/assets_test.rb

commit ad44952	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-10 16:36:18 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit 6f48fb3	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-10 16:36:18 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit 3375a09	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-10 16:33:26 -0200

    Rails initialization with initialize_on_precompile = false should set assets_dir

M	actionpack/lib/action_controller/railtie.rb
M	railties/test/application/assets_test.rb

commit 2e8dac6	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-10 16:33:26 -0200

    Rails initialization with initialize_on_precompile = false should set assets_dir

M	actionpack/lib/action_controller/railtie.rb
M	railties/test/application/assets_test.rb

commit 5301f6d	refs/heads/master
Merge: a905626 c5ba4896a
Author: Aaron Patterson 
Date:   2012-01-10 09:33:42 -0800

    Merge pull request #4399 from kennyj/problem_when_i_execute_drop_table
    
    migrate(:down) method with table_name_prefix

commit c5ba4896a	refs/heads/master
Author: kennyj 
Date:   2012-01-10 22:49:44 +0900

    migrate(:down) method with table_name_prefix

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/invertible_migration_test.rb

commit 211dcde	refs/heads/master
Author: kennyj 
Date:   2012-01-10 03:09:45 +0900

    Fix GH #4259. We must remove table_name_prefix and table_name_suffix, when we execute schema dumper.

M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit a905626	refs/heads/master
Merge: 2babe0a 3f38d84
Author: José Valim 
Date:   2012-01-09 22:51:03 -0800

    Merge pull request #4395 from rafaelfranca/fix_ac_test_case
    
    Fix ActionController::TestCase::Behavior#head

commit 3f38d84	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-10 01:57:35 -0300

    AC:TestCase::Behavior#head only accepts parameters as second argument

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_case_test.rb

commit f2494b5	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-10 01:47:13 -0300

    Whitespaces :scissors:

M	actionpack/test/controller/test_case_test.rb

commit 30f9af9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-10 01:47:07 -0300

    Fix ActionController::TestCase::Behavior.head

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_case_test.rb

commit 238d80c	refs/tags/v3.1.6
Author: Piotr Sarnacki 
Date:   2011-12-20 21:01:47 +0100

    Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228)

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_digest_authentication_test.rb

commit c2af40b	refs/tags/v3.1.6
Author: Piotr Sarnacki 
Date:   2011-12-20 20:34:04 +0100

    Add original_fullpath and original_url methods to Request

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request_test.rb

commit 4d872d1	refs/tags/v3.1.6
Author: Piotr Sarnacki 
Date:   2011-12-20 20:17:17 +0100

    Add ORIGINAL_FULLPATH to env
    
    This behaves similarly to REQUEST_URI, but
    we need to implement it on our own because
    REQUEST_URI is not reliable.
    
    Note that since PATH_INFO does not contain
    information about trailing question mark,
    this is not 100% accurate, for example
    `/foo?` will result in `/foo` in ORIGINAL_FULLPATH

M	railties/lib/rails/application.rb
A	railties/test/application/build_original_fullpath_test.rb
M	railties/test/application/middleware_test.rb

commit 2746077	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-10 01:45:42 -0200

    Add missing end

M	actionpack/lib/action_controller/test_case.rb

commit d65b766	refs/tags/v3.2.1
Author: Piotr Sarnacki 
Date:   2011-12-20 21:01:47 +0100

    Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228)

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_digest_authentication_test.rb

commit 79b12a0	refs/tags/v3.2.1
Author: Piotr Sarnacki 
Date:   2011-12-20 20:34:04 +0100

    Add original_fullpath and original_url methods to Request

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request_test.rb

commit 63305da	refs/tags/v3.2.1
Author: Piotr Sarnacki 
Date:   2011-12-20 20:17:17 +0100

    Add ORIGINAL_FULLPATH to env
    
    This behaves similarly to REQUEST_URI, but
    we need to implement it on our own because
    REQUEST_URI is not reliable.
    
    Note that since PATH_INFO does not contain
    information about trailing question mark,
    this is not 100% accurate, for example
    `/foo?` will result in `/foo` in ORIGINAL_FULLPATH

M	railties/lib/rails/application.rb
A	railties/test/application/build_original_fullpath_test.rb
M	railties/test/application/middleware_test.rb

commit 2babe0a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-09 14:38:21 -0800

    no need for extra method calls inside the framework

M	activerecord/lib/active_record/reflection.rb

commit e9d44ef	refs/heads/master
Merge: d8516d7 3b5fbaf
Author: Aaron Patterson 
Date:   2012-01-09 09:45:05 -0800

    Merge pull request #4370 from EnlightSolutions/validates_unique_association
    
    Validates unique association

commit d8516d7	refs/heads/master
Merge: 7cfd1bd 22a8c2a
Author: Aaron Patterson 
Date:   2012-01-09 09:34:36 -0800

    Merge pull request #4371 from rafaelfranca/test_unit_cleanup
    
    Test unit cleanup

commit 23f8c63	refs/heads/master
Author: Matt Jones 
Date:   2012-01-09 11:20:52 -0500

    add documentation explaining reorder behavior

M	activerecord/lib/active_record/relation/query_methods.rb

commit d7aff28	refs/heads/master
Author: Jo Liss 
Date:   2012-01-08 20:49:53 +0100

    Substitute "gem" for "plugin" in contributing guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit e634d25	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-08 22:54:11 +0530

    Added the release dates for rails 3.1.1, rails 3.1.2, rails 3.1.3

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	railties/CHANGELOG.md

commit 7cfd1bd	refs/heads/master
Merge: 199dcae c763b03
Author: José Valim 
Date:   2012-01-08 05:00:47 -0800

    Merge pull request #4385 from r-stu31/static_compiler_option_zip_files
    
    Sprockets::StaticCompiler: option ":zip_files"

commit c763b03	refs/heads/master
Author: r-stu31 
Date:   2012-01-08 12:28:33 +0100

    Extend the set of compressible files by some common types.

M	actionpack/lib/sprockets/static_compiler.rb

commit 8e727ec	refs/heads/master
Author: r-stu31 
Date:   2012-01-08 12:27:56 +0100

    Enable to handle over in options the regexp determining which files to gzip.

M	actionpack/lib/sprockets/static_compiler.rb

commit 199dcae	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-07 19:19:10 +0100

    Fix tests, ./ is not needed for relative entries in Gemfile in newest bundler version

M	railties/test/generators/plugin_new_generator_test.rb

commit 3d2c28e	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-07 19:13:14 +0100

    No need to check for 'draw do |map|' anymore

M	railties/lib/rails/generators/actions.rb

commit 8ac53db	refs/heads/master
Author: Piotr Sarnacki 
Date:   2012-01-07 18:53:49 +0100

    Add Gemfile entry when creating a plugin in application's directory
    
    After vendor/plugins were removed from rails, the new method to create
    plugins is to create gem plugins. Most of the time if you create a
    new plugin in rails application's directory, you want to extract
    something from that application and use it immediately, ie. add
    such line to Gemfile:
    
      gem 'foo', :path => './vendor/foo'
    
    This commit makes plugin new generator to add such line automatically.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 089bc76	refs/heads/master
Merge: 0c1846e 5215eed
Author: José Valim 
Date:   2012-01-07 05:33:46 -0800

    Merge pull request #4378 from lest/changes-1-9
    
    ruby 1.9 related refactoring

commit 5215eed	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-07 15:30:36 +0300

    Symbol#[] method presents in Ruby 1.9

M	actionpack/lib/abstract_controller/rendering.rb
M	activesupport/lib/active_support/core_ext/object/instance_variables.rb
M	activesupport/lib/active_support/string_inquirer.rb

commit 8c63e7d	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-07 15:30:05 +0300

    instance_variables method returns symbols in 1.9 ruby

M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/template/test_case_test.rb

commit 0c1846e	refs/heads/master
Merge: ba168e8 7d86235
Author: José Valim 
Date:   2012-01-07 03:51:06 -0800

    Merge pull request #4377 from lest/instance-variables-1-9
    
    get rid of using instance_variable_names method from AS

commit 7d86235	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-07 14:44:47 +0300

    get rid of using instance_variable_names method from AS
    
    - instance_variables return symbols in 1.9
    - there is instance_variable_defined? method

M	actionmailer/lib/action_mailer/base.rb
M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/metal/compatibility.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/filters_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb

commit ba168e8	refs/heads/master
Merge: f082004 f1b05de
Author: Piotr Sarnacki 
Date:   2012-01-07 03:18:46 -0800

    Merge pull request #4369 from lest/remove-warnings
    
    use stub instead of redefining method to suppress warnings

commit f082004	refs/heads/master
Merge: ef023ce c0042b1
Author: Piotr Sarnacki 
Date:   2012-01-07 03:17:10 -0800

    Merge pull request #4373 from castlerock/remove_condition
    
    if turn available then MiniTest::Unit.respond_to?(:use_natural_language_...

commit ef023ce	refs/heads/master
Merge: b5dceaf 30468f5
Author: José Valim 
Date:   2012-01-07 01:22:49 -0800

    Merge pull request #4376 from bogdan/after_initialize_on_dup
    
    Fixed after_initialize callbacks call on AR model #dup

commit b5dceaf	refs/heads/master
Merge: 686f94e 904e544
Author: José Valim 
Date:   2012-01-07 01:18:51 -0800

    Merge pull request #4375 from lest/benchmark-helper
    
    add benchmark helper that works in erb

commit 904e544	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-07 12:07:36 +0300

    add benchmark helper that works in erb

M	actionpack/lib/action_view/helpers.rb
A	actionpack/lib/action_view/helpers/benchmark_helper.rb
A	actionpack/test/template/benchmark_helper_test.rb

commit 30468f5	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-01-07 11:11:04 +0200

    Fixed after_initialize callbacks call on AR model #dup

M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/dup_test.rb
M	activerecord/test/models/topic.rb

commit d4c26c4	refs/tags/v3.0.14
Merge: a048568 91a9b24
Author: José Valim 
Date:   2012-01-06 23:37:31 -0800

    Merge pull request #4372 from arunagw/fixed_failing_test
    
    Fixed failing test

commit c0042b1	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-07 12:22:18 +0530

    if turn available then MiniTest::Unit.respond_to?(:use_natural_language_case_names=) available

M	railties/lib/rails/test_help.rb

commit 91a9b24	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2012-01-07 10:45:03 +0530

    Fixed failing test for ruby-1.8.7-p357
    
    See #4292

M	activesupport/test/core_ext/hash_ext_test.rb

commit 22a8c2a	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 22:52:22 -0300

    Whitespaces :scissors:

M	actionpack/lib/action_controller/test_case.rb

commit 0a5f3de	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 22:52:02 -0300

    Remove unneeded code

M	railties/lib/rails/backtrace_cleaner.rb

commit 5a740b8	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 22:51:45 -0300

    Test constant is not defined anymore

M	actionpack/test/controller/view_paths_test.rb

commit 94248ff	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 22:51:11 -0300

    Use MiniTest::Assertions instead of Test::Unit::Assertions

M	actionpack/lib/action_dispatch/testing/integration.rb

commit 686f94e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 17:39:44 -0800

    remove reference to Test::Unit

M	railties/lib/rails/console/app.rb

commit 4a20351	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 17:28:19 -0800

    spec class names can possibly be nil in mt/s < 2.6.1, so work around that

M	activesupport/lib/active_support/test_case.rb

commit fec6f1b	refs/heads/master
Merge: 1c09c29 185aa82
Author: Aaron Patterson 
Date:   2012-01-06 16:43:18 -0800

    Merge pull request #4360 from rafaelfranca/patch-1
    
    Remove more references to Test::Unit

commit 3b5fbaf	refs/heads/master
Author: Dan Pickett 
Date:   2012-01-06 19:17:36 -0500

    allow association as 1st uniqueness validation arg
    
    #4321

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 5f47278	refs/heads/master
Author: Dan Pickett 
Date:   2012-01-06 18:59:36 -0500

    allow an association as a scope parameter
    
    #4321

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 1c09c29	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 15:50:06 -0800

    register spec subclasses for people who spec

M	actionpack/lib/action_controller/test_case.rb
M	activesupport/lib/active_support/test_case.rb

commit b15d2c0	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 15:18:12 -0800

    require minitest rather than test/unit

M	actionmailer/test/abstract_unit.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/ts_isolated.rb
M	activemodel/test/cases/helper.rb
M	activeresource/test/abstract_unit.rb
M	activesupport/lib/active_support/test_case.rb
M	activesupport/test/abstract_unit.rb
M	activesupport/test/ts_isolated.rb
M	railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
M	railties/lib/rails/test_help.rb
M	railties/test/abstract_unit.rb
M	railties/test/application/route_inspect_test.rb
M	railties/test/isolation/abstract_unit.rb

commit a58fb10	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 14:04:09 -0800

    backport assert_not_same

M	activesupport/lib/active_support/test_case.rb

commit 9342492	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 16:51:37 -0800

    require test/unit and sort test order

M	activerecord/test/cases/helper.rb
M	activesupport/lib/active_support/test_case.rb

commit aa7857b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 15:46:17 -0800

    started converting AS::TestCase to minitest

M	activesupport/lib/active_support/test_case.rb

commit 185aa82	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 16:02:08 -0300

    Whitespaces :scissors:

M	activesupport/lib/active_support/backtrace_cleaner.rb

commit 3d4754f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 16:07:22 -0300

    Use ActiveModel::TestCase instead of Test::Unit:TestCase

M	activemodel/test/cases/naming_test.rb

commit ce84df0	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 15:54:40 -0300

    MiniTest is always defined in this case

M	railties/lib/rails/test_help.rb

commit f9382cd	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 15:54:22 -0300

    Test::Unit::Util::BacktraceFilter is never defined

M	railties/lib/rails/test_help.rb
M	railties/test/backtrace_cleaner_test.rb

commit f1b05de	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-07 02:17:18 +0300

    use stub instead of redefining method to suppress warnings

M	actionpack/test/template/form_helper_test.rb

commit f65559f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 15:16:41 -0800

    make sure the test case name is nil

M	activesupport/test/test_case_test.rb

commit 6e4183f	refs/heads/master
Author: codesnik 
Date:   2012-01-07 02:57:51 +0400

    Made an example a little more realistic

M	actionpack/lib/action_controller/base.rb

commit 056b838	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 14:42:53 -0800

    removing unnecessary requires

M	activesupport/test/callback_inheritance_test.rb
M	activesupport/test/callbacks_test.rb
M	activesupport/test/descendants_tracker_with_autoloading_test.rb
M	activesupport/test/descendants_tracker_without_autoloading_test.rb
M	activesupport/test/file_update_checker_test.rb

commit 579acb4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 15:35:38 -0800

    just mix the run method in for minitest

M	activesupport/lib/active_support/testing/setup_and_teardown.rb

commit 0579f30	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 14:01:02 -0800

    rescue the assertion exception

M	activesupport/test/test_test.rb

commit f8964bd	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 14:59:05 -0800

    add the class name to the assertion message

M	activesupport/test/core_ext/duplicable_test.rb

commit 984ce0c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 13:46:14 -0800

    use a regular expression for the number of passes.  We only care that
    all tests pass, not the number of tests.

M	railties/test/application/rake_test.rb

commit 6708e84	refs/heads/master
Merge: 69fe594 517b8fb
Author: Jeremy Kemper 
Date:   2012-01-06 12:48:13 -0800

    Merge pull request #4349 from lest/change-array-wrap-2
    
    Array.wrap is an overhead as there is already check for class

commit 69fe594	refs/heads/master
Merge: 4d7ed97 4f75809
Author: Santiago Pastorino 
Date:   2012-01-06 12:12:45 -0800

    Merge pull request #4358 from castlerock/remove_plus_minus_support_for_ruby18
    
    revert "fixing some tests on ruby 1.9.3"

commit 4f75809	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-07 00:19:26 +0530

    revert "fixing some tests on ruby 1.9.3 SHA 33f222b"

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb

commit 4d7ed97	refs/heads/master
Merge: 9699eeb ef9d266
Author: Santiago Pastorino 
Date:   2012-01-06 11:54:01 -0800

    Merge pull request #4359 from Karunakar/logger
    
    removed unnecessary require for activesupport/core_ext/array/wrap

commit 9699eeb	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 11:52:26 -0800

    convert build_message to sprintf

M	actionpack/lib/action_controller/test_case.rb

commit 6548fc6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 11:48:32 -0800

    use assert_equal and assert_operator

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb

commit a0dc9ca	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 11:41:08 -0800

    use sprintf rather than build_message

M	actionpack/lib/action_dispatch/testing/assertions/routing.rb

commit a0bab37	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 11:34:11 -0800

    Just use assert_equal

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit d28a15e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 11:24:01 -0800

    refactor assert_response

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 01d1794	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 11:20:26 -0800

    test response assertions

M	actionpack/Rakefile
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
A	actionpack/test/assertions/response_assertions_test.rb

commit 180eb8f	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 10:42:26 -0800

    no need for assert_block

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 48ed7e6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 10:42:02 -0800

    stop using build_message for creating a string

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 6a383f4	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 10:35:06 -0800

    use assert_includes rather than calling includes? specifically

M	actionpack/lib/action_controller/test_case.rb

commit d971a1c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-06 11:10:40 -0800

    just use assert and refute rather than building messages

M	actionpack/lib/action_dispatch/testing/assertions/dom.rb

commit ef9d266	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-07 00:16:55 +0530

    removed unnecessary require for activesupport/core_ext/array/wrap

M	activerecord/lib/active_record/associations.rb

commit 3abacc0	refs/heads/master
Merge: c8fef32 2fc3a30
Author: Aaron Patterson 
Date:   2012-01-06 10:51:39 -0800

    Merge pull request #4357 from rafaelfranca/patch-1
    
    Remove more references to Test::Unit

commit 2fc3a30	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 15:36:06 -0300

    Remove more references to Test::Unit

M	activesupport/lib/active_support/testing/deprecation.rb
M	activesupport/test/deprecation_test.rb

commit c8fef32	refs/heads/master
Merge: cac0bd1 abf55eb
Author: Santiago Pastorino 
Date:   2012-01-06 10:00:33 -0800

    Merge pull request #4356 from Karunakar/logger
    
    removed unnessary require active_support/core_ext/array_wrap

commit cac0bd1	refs/heads/master
Merge: 365a34c 93ec400
Author: Aaron Patterson 
Date:   2012-01-06 09:57:41 -0800

    Merge pull request #4327 from Karunakar/minor
    
    removed warning because logger.warn differentiate the warings

commit abf55eb	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-06 23:21:39 +0530

    removed unnessary require active_support/core_ext/array_wrap

M	activemodel/lib/active_model/errors.rb

commit 365a34c	refs/heads/master
Merge: aec8172 69a6381
Author: José Valim 
Date:   2012-01-06 09:12:11 -0800

    Merge pull request #4353 from dmathieu/hide_nil_unchecked_checkbox
    
    don't set the hidden checkbox value if it's nil

commit 69a6381	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2012-01-06 17:14:49 +0100

    don't set the hidden checkbox value if it's nil

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit aec8172	refs/heads/master
Merge: 0db9394 b2fca95
Author: Aaron Patterson 
Date:   2012-01-06 09:02:54 -0800

    Merge pull request #4354 from rafaelfranca/patch-1
    
    Remove some checks if MiniTest is defined

commit b2fca95	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 13:30:27 -0300

    No need to check if MiniTest::Assertions is defined

M	activesupport/test/test_case_test.rb

commit 3ca7fa9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 13:29:22 -0300

    Remove unneeded tests

M	activesupport/test/deprecation_test.rb
D	activesupport/test/isolation_test.rb

commit a579d4b	refs/tags/v3.2.1
Merge: 6005736 2056744
Author: José Valim 
Date:   2012-01-06 08:12:03 -0800

    Merge pull request #4352 from kennyj/improve_3694-2
    
    [3-2-stable] Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all.

commit 0db9394	refs/heads/master
Author: José Valim 
Date:   2012-01-06 17:04:34 +0100

    We should finalize the routes as soon as possible and not wait for the controller to be loaded.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	railties/lib/rails/application/routes_reloader.rb

commit 2056744	refs/tags/v3.2.1
Author: kennyj 
Date:   2012-01-06 00:32:33 +0900

    Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all. Improve GH #3694.

M	actionpack/lib/sprockets/assets.rake

commit 3853b73	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-06 13:25:48 -0200

    Do not stub id here

M	actionpack/test/template/form_helper_test.rb

commit 26a9bfb	refs/heads/master
Merge: d0cd74c 81f1106
Author: José Valim 
Date:   2012-01-06 07:24:20 -0800

    Merge pull request #4351 from norman/multibyte
    
    Implement #swapcase and #swapcase! for multibyte strings

commit d0cd74c	refs/heads/master
Merge: 5b9c8a5 a342df4
Author: José Valim 
Date:   2012-01-06 07:22:56 -0800

    Merge pull request #4350 from kennyj/improve_3694
    
    Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all.

commit 81f1106	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-06 12:06:50 -0300

    Improve doc consistency

M	activesupport/lib/active_support/multibyte/chars.rb

commit cac1564	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-06 12:06:26 -0300

    Implement Chars#swapcase.

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/lib/active_support/multibyte/unicode.rb
M	activesupport/test/multibyte_chars_test.rb

commit a342df4	refs/heads/master
Author: kennyj 
Date:   2012-01-06 00:32:33 +0900

    Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all. Improve GH #3694.

M	actionpack/lib/sprockets/assets.rake

commit 5b9c8a5	refs/heads/master
Merge: fc95642 dcb818c
Author: José Valim 
Date:   2012-01-06 06:10:22 -0800

    Merge pull request #4348 from lest/change-array-wrap
    
    use Kernel#Array instead of Array.wrap in Rails::Generators::Actions

commit 517b8fb	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-06 17:02:17 +0300

    Array.wrap is an overhead as there is already check for class

M	activerecord/lib/active_record/nested_attributes.rb

commit dcb818c	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-06 16:44:13 +0300

    use Kernel#Array instead of Array.wrap in Rails::Generators::Actions

M	railties/lib/rails/generators/actions.rb

commit fc95642	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-06 10:48:47 -0200

    Revert "Revert "More 1.9 way""
    
    Fixed failing tests
    This reverts commit 8350ce97f2065eed9638c595d3938a573d6fa343.

M	actionpack/test/template/form_helper_test.rb
M	activemodel/lib/active_model/conversion.rb

commit 6e6764b	refs/heads/master
Merge: 432a95d 5a4cdf9
Author: José Valim 
Date:   2012-01-06 03:51:32 -0800

    Merge pull request #4346 from pyromaniac/master
    
    Nil values uniquines validation

commit 5a4cdf9	refs/heads/master
Author: pyromaniac 
Date:   2011-07-28 19:09:12 +0400

    Fixed nil field value uniqueness check

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 432a95d	refs/heads/master
Merge: 705b29b 68367fd
Author: José Valim 
Date:   2012-01-06 03:29:47 -0800

    Merge pull request #4342 from carlosantoniodasilva/fix-routing-test
    
    Fix routing test and remove deprecated method

commit 68367fd	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-06 09:25:40 -0200

    Remove deprecation warning from test related to old process api

M	actionpack/test/controller/action_pack_assertions_test.rb

commit 621eb3b	refs/heads/master
Author: Joost Baaij 
Date:   2012-01-06 11:53:01 +0100

    Expanded rdoc about primary keys being protected from mass assignment.
    
    People need to make sure they are generated internally or added to attr_accessible so they can be mass assigned (for instance, from an import job).

M	activerecord/lib/active_record/attribute_methods/primary_key.rb

commit 3def2d6	refs/heads/master
Author: Suraj N. Kurapati 
Date:   2012-01-06 01:49:06 -0800

    gemspec assumes that user kept all generated files
    
    This commit allows the user be lazy and not update
    their gemspec's `files` directive after deleting
    unwanted files from their generated Rails plugin.

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit 705b29b	refs/heads/master
Author: José Valim 
Date:   2012-01-06 09:03:09 +0100

    Revert "Merge pull request #2325 from pyromaniac/master"
    
    It breaks the build for mysql.
    
    This reverts commit 958d25df4a1b0d41ce5deeeb0739c93b49bbd18d, reversing
    changes made to 8f309e31057e1b26fefedb199ab0526126fb1fe4.

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 291ad63	refs/heads/master
Merge: 75a630e a6a2670
Author: José Valim 
Date:   2012-01-05 23:35:00 -0800

    Merge pull request #4343 from carlosantoniodasilva/activerecord-1.9-compat
    
    Activerecord 1.9 compat

commit 75a630e	refs/heads/master
Merge: e09c3c7 4311fc4
Author: José Valim 
Date:   2012-01-05 23:31:46 -0800

    Merge pull request #4340 from rafaelfranca/patch-1
    
    Remove more Array.wrap calls

commit e09c3c7	refs/heads/master
Merge: 958d25d 74fbad7
Author: José Valim 
Date:   2012-01-05 23:31:16 -0800

    Merge pull request #4339 from rafaelfranca/patch-2
    
    Require ActiveSupport::TestCase form ActiveSupport isolation tests

commit 958d25d	refs/heads/master
Merge: 8f309e3 0fab103
Author: José Valim 
Date:   2012-01-05 23:24:40 -0800

    Merge pull request #2325 from pyromaniac/master
    
    Nil values uniquines validation

commit a6a2670	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-06 04:13:13 -0200

    Revert "Regexp.union seems to have different results in 1.8"
    
    This reverts commit d80e4ee20e690dfc0f4ec31c41b873d607462872.
    
    No need to care about 1.8 anymore, so reverting :)

M	activerecord/test/cases/helper.rb

commit 8c2e7bc	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-06 04:08:42 -0200

    Revert "Add return for 1.8.7"
    
    This reverts commit 665ef116ac9000d514c03fc61b216513f5cb7b25.
    
    There is no need for the return anymore, so reverting.

M	activerecord/test/cases/relation_scoping_test.rb

commit 93df3b2	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2012-01-06 04:08:11 -0200

    Fix routing test to use assert_equal

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb
M	actionpack/test/dispatch/routing_test.rb

commit 0fab103	refs/heads/master
Author: pyromaniac 
Date:   2011-07-28 19:09:12 +0400

    Fixed nil field value uniqueness check

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 74fbad7	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 01:40:30 -0300

    Add test path to LOAD_PATH to fix load error

M	actionpack/test/ts_isolated.rb

commit 61fd7cd	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 01:14:18 -0300

    Require ActiveSupport::TestCase form ActiveSupport isolation tests

M	activesupport/test/ts_isolated.rb

commit 4311fc4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 01:04:09 -0300

    Whitespaces :scissors:

M	activerecord/lib/active_record/validations/uniqueness.rb

commit b33bd07	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 01:03:53 -0300

    Remove Array.wrap calls in ActiveSupport

M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/deprecation/behaviors.rb
M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/lib/active_support/testing/assertions.rb

commit 2958a1e	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-06 00:53:29 -0300

    Remove Array.wrap calls in ActiveRecord

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/callbacks.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/serialization.rb
M	activerecord/lib/active_record/serializers/xml_serializer.rb
M	activerecord/lib/active_record/transactions.rb
M	activerecord/lib/active_record/validations/uniqueness.rb

commit 2a663dc	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 19:52:31 -0300

    Remove Array.wrap call in ActiveModel

M	activemodel/lib/active_model/callbacks.rb
M	activemodel/lib/active_model/observing.rb
M	activemodel/lib/active_model/serialization.rb
M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/callbacks.rb
M	activemodel/lib/active_model/validator.rb

commit 8f309e3	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 17:30:17 -0800

    convert railties to use AS::TestCase

M	railties/test/application/asset_debugging_test.rb
M	railties/test/application/assets_test.rb
M	railties/test/application/build_original_fullpath_test.rb
M	railties/test/application/configuration_test.rb
M	railties/test/application/console_test.rb
M	railties/test/application/generators_test.rb
M	railties/test/application/initializers/boot_test.rb
M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/initializers/hooks_test.rb
M	railties/test/application/initializers/i18n_test.rb
M	railties/test/application/initializers/load_path_test.rb
M	railties/test/application/initializers/notifications_test.rb
M	railties/test/application/loading_test.rb
M	railties/test/application/middleware/best_practices_test.rb
M	railties/test/application/middleware/cache_test.rb
M	railties/test/application/middleware/cookies_test.rb
M	railties/test/application/middleware/exceptions_test.rb
M	railties/test/application/middleware/remote_ip_test.rb
M	railties/test/application/middleware/sendfile_test.rb
M	railties/test/application/middleware_test.rb
M	railties/test/application/paths_test.rb
M	railties/test/application/rack/logger_test.rb
M	railties/test/application/rackup_test.rb
M	railties/test/application/rake/migrations_test.rb
M	railties/test/application/rake/notes_test.rb
M	railties/test/application/rake_test.rb
M	railties/test/application/route_inspect_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/application/runner_test.rb
M	railties/test/application/test_test.rb
M	railties/test/application/url_generation_test.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/mounted_engine_test.rb
M	railties/test/railties/railtie_test.rb

commit b8d8c50	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 17:12:46 -0800

    use AS::TestCase as the base class

M	activesupport/test/buffered_logger_test.rb
M	activesupport/test/callback_inheritance_test.rb
M	activesupport/test/callbacks_test.rb
M	activesupport/test/clean_logger_test.rb
M	activesupport/test/concern_test.rb
M	activesupport/test/core_ext/array_ext_test.rb
M	activesupport/test/core_ext/bigdecimal_test.rb
M	activesupport/test/core_ext/blank_test.rb
M	activesupport/test/core_ext/class/attribute_accessor_test.rb
M	activesupport/test/core_ext/class/delegating_attributes_test.rb
M	activesupport/test/core_ext/class_test.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/duplicable_test.rb
M	activesupport/test/core_ext/enumerable_test.rb
M	activesupport/test/core_ext/file_test.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	activesupport/test/core_ext/integer_ext_test.rb
M	activesupport/test/core_ext/kernel_test.rb
M	activesupport/test/core_ext/load_error_test.rb
M	activesupport/test/core_ext/module/attr_internal_test.rb
M	activesupport/test/core_ext/module/attribute_accessor_test.rb
M	activesupport/test/core_ext/module/attribute_aliasing_test.rb
M	activesupport/test/core_ext/module_test.rb
M	activesupport/test/core_ext/name_error_test.rb
M	activesupport/test/core_ext/numeric_ext_test.rb
M	activesupport/test/core_ext/object/inclusion_test.rb
M	activesupport/test/core_ext/object/to_param_test.rb
M	activesupport/test/core_ext/object/to_query_test.rb
M	activesupport/test/core_ext/object_and_class_ext_test.rb
M	activesupport/test/core_ext/proc_test.rb
M	activesupport/test/core_ext/range_ext_test.rb
M	activesupport/test/core_ext/regexp_ext_test.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb
M	activesupport/test/core_ext/uri_ext_test.rb
M	activesupport/test/dependencies_test.rb
M	activesupport/test/deprecation/proxy_wrappers_test.rb
M	activesupport/test/descendants_tracker_with_autoloading_test.rb
M	activesupport/test/descendants_tracker_without_autoloading_test.rb
M	activesupport/test/file_update_checker_test.rb
M	activesupport/test/gzip_test.rb
M	activesupport/test/i18n_test.rb
M	activesupport/test/inflector_test.rb
M	activesupport/test/json/encoding_test.rb
M	activesupport/test/load_paths_test.rb
M	activesupport/test/multibyte_chars_test.rb
M	activesupport/test/multibyte_conformance.rb
M	activesupport/test/multibyte_unicode_database_test.rb
M	activesupport/test/option_merger_test.rb
M	activesupport/test/ordered_hash_test.rb
M	activesupport/test/ordered_options_test.rb
M	activesupport/test/rescuable_test.rb
M	activesupport/test/string_inquirer_test.rb
M	activesupport/test/time_zone_test.rb
M	activesupport/test/transliterate_test.rb
M	activesupport/test/ts_isolated.rb
M	activesupport/test/xml_mini/jdom_engine_test.rb
M	activesupport/test/xml_mini/libxml_engine_test.rb
M	activesupport/test/xml_mini/libxmlsax_engine_test.rb
M	activesupport/test/xml_mini/nokogiri_engine_test.rb
M	activesupport/test/xml_mini/nokogirisax_engine_test.rb
M	activesupport/test/xml_mini/rexml_engine_test.rb
M	activesupport/test/xml_mini_test.rb

commit a2d68c1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 17:08:07 -0800

    activeresource tests use AS::TestCase

M	activeresource/test/cases/authorization_test.rb
M	activeresource/test/cases/base/custom_methods_test.rb
M	activeresource/test/cases/base/equality_test.rb
M	activeresource/test/cases/base/load_test.rb
M	activeresource/test/cases/base_errors_test.rb
M	activeresource/test/cases/base_test.rb
M	activeresource/test/cases/connection_test.rb
M	activeresource/test/cases/finder_test.rb
M	activeresource/test/cases/format_test.rb
M	activeresource/test/cases/observing_test.rb

commit 8350ce9	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 17:05:21 -0800

    Revert "More 1.9 way"
    
    This reverts commit 675094b2757cf90399dadca4489b1036810ae570.

M	activemodel/lib/active_model/conversion.rb

commit fd918fe	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 17:01:45 -0800

    AP tests should inherit from AS::TestCase

M	actionpack/test/abstract/translation_test.rb
M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/integration_test.rb
M	actionpack/test/controller/record_identifier_test.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/controller/runner_test.rb
M	actionpack/test/controller/selector_test.rb
M	actionpack/test/dispatch/reloader_test.rb
M	actionpack/test/template/compiled_templates_test.rb
M	actionpack/test/template/date_helper_i18n_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/html-scanner/cdata_node_test.rb
M	actionpack/test/template/html-scanner/document_test.rb
M	actionpack/test/template/html-scanner/node_test.rb
M	actionpack/test/template/html-scanner/tag_node_test.rb
M	actionpack/test/template/html-scanner/text_node_test.rb
M	actionpack/test/template/html-scanner/tokenizer_test.rb
M	actionpack/test/ts_isolated.rb

commit 5d09d39	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 16:55:54 -0800

    test cases should inherit from AS::TestCase

M	actionmailer/lib/action_mailer/test_case.rb
M	actionmailer/test/asset_host_test.rb
M	actionmailer/test/mail_layout_test.rb

commit 38a0606	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 16:42:28 -0800

    test a subclass so that the removed method does not imact other tests

M	activerecord/lib/active_record/session_store.rb
M	activerecord/test/cases/session_store/session_test.rb

commit c0d1f5f	refs/heads/master
Author: José Valim 
Date:   2012-01-06 00:01:15 +0100

    Update actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md

commit 37b4ba2	refs/heads/master
Merge: 4d073df 9bd38f3
Author: José Valim 
Date:   2012-01-05 15:00:26 -0800

    Merge pull request #4337 from tadast/master-checkbox_patch
    
    check_box helper with :disabled => true generates disabled hidden field. fixes #1953 (master)

commit 4d073df	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 14:52:49 -0800

    Revert "remove deprecated API"
    
    This reverts commit f53c247d10acbaacb0d61824cfce888c4b0520d2.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/action_pack_assertions_test.rb
M	actionpack/test/controller/test_case_test.rb

commit 9bd38f3	refs/heads/master
Author: Tadas Tamošauskas 
Date:   2012-01-05 22:35:10 +0000

    check_box helper with :disabled => true generates disabled hidden field. fixes #1953

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit f53c247	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 14:46:34 -0800

    remove deprecated API

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/action_pack_assertions_test.rb
M	actionpack/test/controller/test_case_test.rb

commit 4fa1030	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 14:38:36 -0800

    fix some whitespace errors

M	actionpack/lib/action_controller/test_case.rb

commit 675094b	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-05 20:15:52 -0200

    More 1.9 way

M	activemodel/lib/active_model/conversion.rb

commit 0e8dda7	refs/heads/master
Merge: be52f1b 3dc80b7
Author: José Valim 
Date:   2012-01-05 14:05:27 -0800

    Merge pull request #3637 from bogdan/compile_options
    
    AS::Callbacks::Callback refactor

commit be52f1b	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-05 19:59:09 -0200

    Use 1.9 way

M	activerecord/lib/active_record/associations/collection_association.rb

commit 5e1cfb0	refs/heads/master
Merge: 6252ede 63a5821
Author: José Valim 
Date:   2012-01-05 13:58:58 -0800

    Merge pull request #4117 from lest/remove-deprecated
    
    remove status_code from AD::ShowExceptions and useless requires

commit 6252ede	refs/heads/master
Merge: 38b0d6d 9299bfd
Author: José Valim 
Date:   2012-01-05 13:56:50 -0800

    Merge pull request #4192 from mptre/master
    
    Align rake notes

commit 38b0d6d	refs/heads/master
Merge: 7a08685 f04af7c
Author: José Valim 
Date:   2012-01-05 13:55:50 -0800

    Merge pull request #4322 from castlerock/minitest_pending
    
    ActiveSupport::Testing::Pending support for MiniTest only

commit 7a08685	refs/heads/master
Merge: 798b5ef f2378d9
Author: José Valim 
Date:   2012-01-05 13:55:17 -0800

    Merge pull request #4324 from juanpastas/patch-1
    
    Update activerecord/lib/active_record/base.rb

commit 798b5ef	refs/heads/master
Merge: 4751cc2 2e487bc
Author: José Valim 
Date:   2012-01-05 13:54:40 -0800

    Merge pull request #4333 from rafaelfranca/patch-1
    
    Change more Array.wrap calls

commit 4751cc2	refs/heads/master
Merge: 55fbc19 16bee76
Author: José Valim 
Date:   2012-01-05 13:46:39 -0800

    Merge pull request #4332 from norman/multibyte
    
    Putting AS::Multibyte on a Ruby 1.9 diet

commit 55fbc19	refs/heads/master
Merge: b2b2eb3 ad0336e
Author: José Valim 
Date:   2012-01-05 13:43:43 -0800

    Merge pull request #4335 from lest/useless-multibyte-clean
    
    remove use of Multibyte.clean as it's no-op in ruby 1.9

commit b2b2eb3	refs/heads/master
Merge: 39625d1 1c095f2
Author: José Valim 
Date:   2012-01-05 13:43:06 -0800

    Merge pull request #4334 from lest/remove-obsolete-commented-asserts
    
    remove obsolete commented asserts in TextHelper tests

commit ad0336e	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-06 00:24:38 +0300

    remove use of Multibyte.clean as it's no-op in ruby 1.9

M	actionpack/lib/action_view/helpers/tag_helper.rb

commit 1c095f2	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-06 00:11:49 +0300

    remove obsolete commented asserts in TextHelper tests

M	actionpack/test/template/text_helper_test.rb

commit 2e487bc	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 17:59:25 -0300

    Whitespaces :scissors:

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb

commit 1de3f63	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 17:58:54 -0300

    Refactor extract_selected_and_disabled

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 2ed1797	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 17:18:54 -0300

    Change more Array.wrap to Kernel#Array

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_dispatch/http/filter_parameters.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/error.rb
M	actionpack/test/abstract_unit.rb

commit 39625d1	refs/heads/master
Merge: 013d959 803e9ba
Author: Aaron Patterson 
Date:   2012-01-05 12:54:29 -0800

    Merge pull request #4330 from lest/remove-call-mbchars
    
    remove useless call to mb_chars

commit 16bee76	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 17:25:40 -0300

    Use friendlier method name

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/test/multibyte_chars_test.rb

commit db6eb19	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 17:20:15 -0300

    Use friendlier method names for upcasing/downcasing

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit 4ac056c	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 17:16:35 -0300

    Use more descriptive method names

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit a8a8dc4	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 17:15:36 -0300

    Move include to top of class for clarity

M	activesupport/lib/active_support/multibyte/chars.rb

commit d2455bd	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 17:15:21 -0300

    Remove unnecessary requires/encoding comment

M	activesupport/lib/active_support/multibyte.rb

commit 56715c4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 17:13:27 -0300

    Use Kernel#Array in ActionController::Helpers

M	actionpack/lib/action_controller/metal/helpers.rb

commit 3fe7ca1	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 17:08:27 -0300

    Replace Unicode.u_unpack with String#codepoints

M	activesupport/lib/active_support/multibyte.rb
M	activesupport/lib/active_support/multibyte/chars.rb
D	activesupport/lib/active_support/multibyte/exceptions.rb
M	activesupport/lib/active_support/multibyte/unicode.rb
M	activesupport/test/multibyte_chars_test.rb

commit ec28c4f	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 17:08:18 -0300

    Use Kernel#Array instead of Array.wrap in view_paths

M	actionpack/lib/abstract_controller/view_paths.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/lookup_context.rb

commit 693a68f	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-05 23:03:53 +0300

    remove ruby 1.8 example from Array.wrap documentation

M	railties/guides/source/active_support_core_extensions.textile

commit 013d959	refs/heads/master
Merge: 4d08324 0023643
Author: Santiago Pastorino 
Date:   2012-01-05 12:03:10 -0800

    Merge pull request #4303 from Karunakar/logger
    
    Moved the logger methods in activeresource/test/abstract_unit.rb

commit 51648a6	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 17:02:14 -0300

    Remove multibyte utils
    
    This is neither a public API, nor used internally, so let's remove it.

M	activesupport/lib/active_support/multibyte.rb
D	activesupport/lib/active_support/multibyte/utils.rb
D	activesupport/test/multibyte_utils_test.rb

commit 1a163dc	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 16:48:40 -0300

    Array.wrap is no longer needed in AbstractController::Callbacks

M	actionpack/lib/abstract_controller/callbacks.rb

commit 9ea34ad	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 16:43:28 -0300

    Remove "_codepoints" from compose/decompose

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit c973161	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 16:36:21 -0300

    Remove unused code.

M	activesupport/lib/active_support/multibyte/chars.rb

commit 262af66	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 16:36:09 -0300

    Document method definition

M	activesupport/lib/active_support/multibyte/chars.rb

commit 803e9ba	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-05 22:36:04 +0300

    remove useless call to mb_chars

M	actionpack/lib/action_view/helpers/text_helper.rb
M	activerecord/lib/active_record/validations/uniqueness.rb

commit 4d08324	refs/heads/master
Merge: d2a6908 3438f6c
Author: Jeremy Kemper 
Date:   2012-01-05 11:29:37 -0800

    Merge pull request #4329 from rafaelfranca/patch-1
    
    Array.wrap is no longer needed at ActionMailer

commit b81bef5	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 16:26:24 -0300

    Just use Ruby's String#[]=

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/test/multibyte_chars_test.rb

commit 3438f6c	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-05 16:24:48 -0300

    Array.wrap is no longer needed here

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/lib/action_mailer/log_subscriber.rb

commit 4657934	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 16:21:59 -0300

    Assume Encoding support

M	activesupport/lib/active_support/multibyte/chars.rb

commit d2a4acd	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 16:17:12 -0300

    Update to Unicode 6.0

M	activesupport/lib/active_support/multibyte/unicode.rb
M	activesupport/lib/active_support/values/unicode_tables.dat

commit 4b5a3d7	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 16:14:39 -0300

    Remove useless parens

M	activesupport/lib/active_support/multibyte/unicode.rb

commit d2a6908	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 11:10:52 -0800

    do not require a file that is not used

M	activerecord/test/cases/helper.rb
M	railties/lib/rails/test_help.rb

commit 0023643	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-05 00:22:24 +0530

    Moved all the logger methods to active support logger
    
    minor

M	actionpack/README.rdoc
M	actionpack/test/controller/content_type_test.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/controller/render_xml_test.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb
M	actionpack/test/template/template_test.rb
M	activerecord/README.rdoc
M	activerecord/lib/active_record/railtie.rb
M	activeresource/test/abstract_unit.rb
M	activesupport/test/buffered_logger_test.rb
M	activesupport/test/caching_test.rb

commit 60bbdf7	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 15:43:06 -0300

    Just delegate a few methods directly to @wrapped_string

M	activesupport/lib/active_support/multibyte/chars.rb

commit f49febe	refs/heads/master
Merge: c4b522d 7301aa2
Author: Norman Clarke 
Date:   2012-01-05 15:16:03 -0300

    Merge branch 'refactor-multibyte-chars' of https://github.com/lest/rails into multibyte
    
    Conflicts:
    	activesupport/lib/active_support/multibyte/chars.rb

commit 93ec400	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-05 23:42:58 +0530

    removed warning because logger.warn differentiate the warings

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit f63fff6	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-05 09:58:47 -0800

    delete reaping frequency from the db config

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 6005736	refs/tags/v3.2.1
Author: Santiago Pastorino 
Date:   2012-01-05 15:31:17 -0200

    Depend on coffee-rails 3.2.1

M	railties/lib/rails/generators/app_base.rb

commit 07f187b	refs/heads/master
Merge: f4ef09c ca0718c
Author: Aaron Patterson 
Date:   2012-01-05 09:24:47 -0800

    Merge pull request #4301 from Karunakar/refactor_tests
    
    Refactor tests

commit f4ef09c	refs/heads/master
Merge: 351a600 5a75135
Author: Aaron Patterson 
Date:   2012-01-05 09:23:16 -0800

    Merge pull request #4304 from lest/refactor-truncate
    
    refactor String#truncate not to use mb_chars

commit 867a792	refs/tags/v3.2.1
Merge: d268ef2 22f901c
Author: Aaron Patterson 
Date:   2012-01-05 09:18:24 -0800

    Merge pull request #4311 from kuroda/3-2-negative_format
    
    Infer currency negative format from positive one. (3-2-stable)

commit 351a600	refs/heads/master
Merge: 1dbbe7b 92a3c48
Author: Aaron Patterson 
Date:   2012-01-05 09:12:14 -0800

    Merge pull request #4315 from larskanis/allow_setting_of_pgconn_params
    
    PostgreSQL: Allow consistent setting of libpq params in database connection specification

commit 1dbbe7b	refs/heads/master
Merge: 3040940 c766f3e
Author: Aaron Patterson 
Date:   2012-01-05 09:08:30 -0800

    Merge pull request #4316 from wrozka/time_advance_nsec
    
    Time advance nsec bug

commit 3040940	refs/heads/master
Merge: 377a879 46761b8
Author: Santiago Pastorino 
Date:   2012-01-05 08:52:29 -0800

    Merge pull request #4320 from castlerock/include_only_minitest
    
    support only MiniTest run with Isolation test

commit 377a879	refs/heads/master
Merge: dcd317b c776075
Author: Santiago Pastorino 
Date:   2012-01-05 08:52:02 -0800

    Merge pull request #4319 from castlerock/parse_only_minitest_results
    
    parse only minitest results in isolation test

commit dcd317b	refs/heads/master
Merge: 44951c8 dbf78b0
Author: Aaron Patterson 
Date:   2012-01-05 08:50:32 -0800

    Merge pull request #4325 from juanpastas/master
    
    erased duplicated line

commit dbf78b0	refs/heads/master
Author: juan david pastas 
Date:   2012-01-05 11:33:13 -0500

    deleted duplicated line

M	activerecord/lib/active_record/base.rb

commit f2378d9	refs/heads/master
Author: juan david pastas 
Date:   2012-01-05 11:31:16 -0500

    Update activerecord/lib/active_record/base.rb

M	activerecord/lib/active_record/base.rb

commit f04af7c	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-05 21:33:45 +0530

    ActiveSupport::Testing::Pending support for MiniTest only

M	activesupport/lib/active_support/testing/pending.rb

commit 46761b8	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-05 21:19:24 +0530

    support only MiniTest run with Isolation test

M	activesupport/lib/active_support/testing/isolation.rb

commit c776075	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-05 21:05:13 +0530

    parse only minitest results in isolation test

M	activesupport/test/isolation_test.rb

commit 7301aa2	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-05 18:25:27 +0300

    refactor AS::Multibyte::Chars

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/test/multibyte_chars_test.rb

commit c4b522d	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 11:51:10 -0300

    Make return value from bang methods match Ruby docs
    
    The docs for the String class indicate that methods like `rstrip!` and
    others should return nil when they do not have an effect on the string.

M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/test/multibyte_chars_test.rb

commit 44951c8	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-05 12:44:05 -0200

    Revert "active record base class test case should not be public"
    
    People use this!
    This reverts commit 071c8bf62ac7ffdb587268a6789fd825d0dae2a6.

A	activerecord/lib/active_record/test_case.rb
D	activerecord/test/active_record/test_case.rb

commit 4387f97	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 11:40:01 -0300

    Override #slice! to ensure proper return value.
    
    The default pass-through to `method_missing` makes `#slice!` return
    `self` rather than the string that was sliced off.

M	activesupport/lib/active_support/multibyte/chars.rb

commit 5fb5ced	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 11:39:45 -0300

    Remove overidden slice and slice! methods.

M	activesupport/lib/active_support/multibyte/chars.rb

commit 963c360	refs/heads/master
Author: Norman Clarke 
Date:   2012-01-05 10:50:25 -0300

    Fix incorrect behavior specified in test.
    
    This test was actually specifying the opposite of what it should.

M	activesupport/test/multibyte_chars_test.rb

commit c766f3e	refs/heads/master
Author: Pawel Pierzchala 
Date:   2012-01-05 11:02:14 +0100

    Nano seconds fraction of time is copied properly in Time#advance
    
    When day, month or year was passed, advance created a new time
    ignoring previous nsec fraction. Now nsec is passed through
    usec as a Rational number.

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 92a3c48	refs/heads/master
Author: Lars Kanis 
Date:   2012-01-05 12:58:51 +0100

    Postgresql: restore previous behaviour regarding to nil values in connection specification Hash

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 22f901c	refs/tags/v3.2.1
Author: Tsutomu Kuroda 
Date:   2012-01-05 00:23:10 +0900

    Infer currency negative format from positive one.
    
    When a locale file sets the format of the positive
    currency value as '%n %u', the default negative
    currency format should be '-%n %u'.
    
    Cherry-picked from master (6724c8c8)

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_i18n_test.rb

commit f306f9a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 17:11:15 -0800

    call super from setup

M	activerecord/test/active_record/test_case.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit fb8b17c	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 17:10:13 -0800

    just use the list of formatting keys we care about

M	activerecord/lib/active_record/schema_dumper.rb

commit e96b3e8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 16:21:16 -0800

    call super

M	activerecord/test/cases/autosave_association_test.rb

commit 39489d1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 16:18:38 -0800

    clear the sql counter on teardown so the GC can do it's thing

M	activerecord/test/active_record/test_case.rb

commit 1b276d5	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 16:14:41 -0800

    fix some formatting

M	activerecord/lib/active_record/schema_dumper.rb

commit 8e051a1	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 16:11:43 -0800

    use regular expression or statement. loltargetrichenvironment

M	activerecord/lib/active_record/schema_dumper.rb

commit 071c8bf	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 16:07:27 -0800

    active record base class test case should not be public

D	activerecord/lib/active_record/test_case.rb
A	activerecord/test/active_record/test_case.rb

commit da4fef8	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 13:37:47 -0800

    use logger.warn for warnings

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb

commit 6e9bbe3	refs/heads/master
Author: Alan Harper 
Date:   2012-01-05 08:26:34 +1100

    Update ConfirmationValidator docs, correct when the validator runs

M	activemodel/lib/active_model/validations/confirmation.rb

commit 07c192a	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 13:25:33 -0800

    push exception message formatting to the exception class

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb

commit fd2d78d	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 13:15:48 -0800

    push target down to the classes that care about it

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb

commit 54b4e8e	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 13:09:05 -0800

    just implement the delegate method

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb

commit b899b7b	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-04 13:05:43 -0800

    Array.wrap no longer needed

M	activemodel/lib/active_model/mass_assignment_security.rb

commit d268ef2	refs/tags/v3.2.0.rc2 (tag: v3.2.0.rc2)
Author: Santiago Pastorino 
Date:   2012-01-04 18:59:41 -0200

    Bump to rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 0b24dc9	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2012-01-04 21:29:05 +0100

    Revert "AS::Callbacks: remove __define_runner"
    
    Runners are used internally.
    
    This reverts commit 40c8aa706adbb60ff9d289016fb9020d48969fea.

M	activesupport/lib/active_support/callbacks.rb

commit f28fc93	refs/heads/master
Author: José Valim 
Date:   2012-01-04 21:26:50 +0100

    Revert "AS::Callbacks: remove __define_runner"
    
    Runners are used internally.
    
    This reverts commit 40c8aa706adbb60ff9d289016fb9020d48969fea.

M	activesupport/lib/active_support/callbacks.rb

commit 91c1f01	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-04 17:48:14 -0200

    Remove more references to postgres on the release notes

M	RELEASING_RAILS.rdoc

commit 1dfac55	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-04 17:41:34 -0200

    Postgres is on travis right now, don't need an special mention here

M	RELEASING_RAILS.rdoc

commit 5a75135	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-04 22:30:07 +0300

    refactor String#truncate not to use mb_chars

M	activesupport/lib/active_support/core_ext/string/filters.rb

commit 49a1017	refs/tags/v3.2.0.rc2
Author: Jeremy Kemper 
Date:   2012-01-04 12:09:21 -0700

    Add release notes URL to vendor/plugins deprecation warning. Update CHANGELOG.

M	railties/CHANGELOG.md
M	railties/lib/rails/plugin.rb

commit 33386b0	refs/heads/master
Merge: 34551bf ce2c4c9
Author: Xavier Noria 
Date:   2012-01-04 10:59:38 -0800

    Merge pull request #4302 from lest/simplify-descendants
    
    simplify Class#descendants using singleton_class method

commit ce2c4c9	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-04 21:51:39 +0300

    simplify Class#descendants using singleton_class method

M	activesupport/lib/active_support/core_ext/class/subclasses.rb

commit d9e0c4a	refs/tags/v3.2.0.rc2
Author: Jeremy Kemper 
Date:   2012-01-04 11:49:19 -0700

    Clarify vendor/plugins deprecation warning

M	railties/lib/rails/plugin.rb

commit ca0718c	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-05 00:03:30 +0530

    removed unnecessary +1 from assert_difference because default difference is 1

M	activerecord/test/cases/locking_test.rb

commit d22592a	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2012-01-04 10:12:40 -0800

    Merge pull request #4282 from edgecase/order_after_reorder
    
    correctly handle order calls after a reorder

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb

commit 34551bf	refs/heads/master
Merge: 5708648 efbb85c
Author: Aaron Patterson 
Date:   2012-01-04 10:12:40 -0800

    Merge pull request #4282 from edgecase/order_after_reorder
    
    correctly handle order calls after a reorder

commit 5708648	refs/heads/master
Merge: cf32a59 6724c8c
Author: Aaron Patterson 
Date:   2012-01-04 09:39:38 -0800

    Merge pull request #4296 from kuroda/negative_format
    
    Infer currency negative format from positive one.

commit cf32a59	refs/heads/master
Merge: e094b8d 7d26fad
Author: Aaron Patterson 
Date:   2012-01-04 09:35:20 -0800

    Merge pull request #4298 from rafaelfranca/patch-2
    
    Remove rescue block to require psych gem

commit e094b8d	refs/heads/master
Merge: e2e4216 a19f8b5
Author: Aaron Patterson 
Date:   2012-01-04 09:34:19 -0800

    Merge pull request #4299 from Karunakar/logger
    
    using the active support logger

commit 7d26fad	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 14:29:13 -0300

    No need to require psych since require yaml does that.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/fixtures/file.rb
M	activerecord/test/cases/yaml_serialization_test.rb
M	activesupport/test/ordered_hash_test.rb
M	activesupport/test/safe_buffer_test.rb
M	railties/lib/rails/commands/dbconsole.rb

commit bdc49dc	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 14:28:01 -0300

    No need to override to_yaml and yaml_initialize methods in ActiveRecord::Core

M	activerecord/lib/active_record/core.rb

commit b65bdb1	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 14:16:48 -0300

    No need to override to_yaml method in ActiveSupport::TimeWithZone

M	activesupport/lib/active_support/time_with_zone.rb

commit 25c76ec	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 14:15:11 -0300

    No need to override to_yaml method in ActiveSupport::OrderedHash

M	activesupport/lib/active_support/ordered_hash.rb

commit ae7dcb4	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 14:14:16 -0300

    No need to override the to_yaml method in ActiveSupporte::SafeBuffer

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit d8ed247	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 14:10:55 -0300

    No need to override the to_yaml method in BigDecimal

M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb

commit a19f8b5	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-04 22:12:25 +0530

    using the active support logger

M	activesupport/lib/active_support/deprecation/behaviors.rb

commit 761b049	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 13:30:57 -0300

    No need to use rescue block to require psych

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/fixtures/file.rb
M	activerecord/test/cases/yaml_serialization_test.rb
M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
M	activesupport/lib/active_support/ordered_hash.rb
M	activesupport/test/ordered_hash_test.rb
M	activesupport/test/safe_buffer_test.rb
M	railties/lib/rails/commands/dbconsole.rb

commit f8df37b	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2012-01-04 14:25:20 -0200

    Use sass-rails 3.2.3

M	railties/lib/rails/generators/app_base.rb

commit 0bf51e9	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 12:55:11 -0300

    No need to check if YAML::ENGINE is defined since ruby 1.9 does that

M	activerecord/lib/active_record/core.rb
M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/ordered_hash.rb
M	activesupport/lib/active_support/time_with_zone.rb

commit 3fb32cf	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2012-01-04 14:20:27 -0200

    Revert "use pg 0.11.0 under ruby 1.8.7"
    
    There's a new pg release, no need for this anymore
    This reverts commit 0b5cda73e2f5d29420afb41d5ed6908baf624934.

M	Gemfile

commit e2e4216	refs/heads/master
Merge: 40cf126 38b9fbf
Author: Santiago Pastorino 
Date:   2012-01-04 08:08:19 -0800

    Merge pull request #4289 from rafaelfranca/patch-1
    
    No need of html_safe here

commit 38b9fbf	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 12:39:28 -0300

    Whitespaces :scissors:

M	activesupport/test/safe_buffer_test.rb

commit 8752223	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 12:38:58 -0300

    Make sure that check_box helper return a safe buffer

M	actionpack/test/template/form_helper_test.rb

commit 73a0f9d	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 12:37:20 -0300

    Add test to make sure that add two safe buffers always return a safe buffer

M	activesupport/test/safe_buffer_test.rb

commit 6724c8c	refs/heads/master
Author: Tsutomu Kuroda 
Date:   2012-01-05 00:23:10 +0900

    Infer currency negative format from positive one.
    
    When a locale file sets the format of the positive
    currency value as '%n %u', the default negative
    currency format should be '-%n %u'.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_i18n_test.rb

commit 9a5b335	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2012-01-04 20:41:07 +0530

    refactored tests -- assert_diffrence instead of checking directly with count

M	activerecord/test/cases/locking_test.rb

commit 4b2b595	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2012-01-04 20:18:56 +0530

    copy edits

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 00a27c5	refs/tags/v3.2.0.rc2
Author: Pablo Ifran 
Date:   2012-01-02 09:16:26 -0200

    improve doc in number helper options

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 20a4258	refs/tags/v3.2.0.rc2
Author: Mike Gunderloy 
Date:   2011-12-31 23:39:57 -0600

    General editing pass over assets pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 40cf126	refs/heads/master
Merge: 5230301 6fca931
Author: Vijay Dev 
Date:   2012-01-04 20:19:25 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 6fca931	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-04 20:18:56 +0530

    copy edits

M	actionpack/lib/action_view/helpers/number_helper.rb

commit bc36613	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2012-01-04 20:10:16 +0530

    updates to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit 5230301	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-04 20:10:16 +0530

    updates to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit 6bcc1b8	refs/tags/v3.2.0.rc2
Author: Kristian Freeman 
Date:   2011-12-23 13:13:44 -0800

    Final grammar checkup on 3.2 release notes.

M	railties/guides/source/3_2_release_notes.textile

commit 8aaf971	refs/heads/master
Author: Lars Kanis 
Date:   2012-01-03 16:58:54 +0100

    Postgresql: add test case for setting custom libpq connection parameters

M	activerecord/test/cases/adapters/postgresql/connection_test.rb

commit a10f309	refs/tags/v3.2.0.rc2
Merge: 63f7a61 6012970
Author: José Valim 
Date:   2012-01-03 23:43:26 -0800

    Merge pull request #4288 from kennyj/fix_4285-2
    
    (3-2-stable) Fix GH #4285. Remove options when we record calling create_table

commit 63f48b1	refs/heads/master
Author: Rafael Mendonça França 
Date:   2012-01-04 03:01:23 -0300

    No need of html_safe here
    tag helper always return a html safe string and concat two html safe
    strings always return a html safe string

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 6012970	refs/tags/v3.2.0.rc2
Author: kennyj 
Date:   2012-01-04 10:25:15 +0900

    Fix GH #4285. Remove options when we record calling creat_table

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 78372b6	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-03 22:49:10 -0700

    create_fixtures should accept symbol keys for custom table -> class mappings. Fixes an unintended regression.

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 4b81007	refs/heads/master
Merge: 00c5342 28afb01
Author: José Valim 
Date:   2012-01-03 20:50:58 -0800

    Merge pull request #4286 from kennyj/fix_4285
    
    Fix GH #4285. Remove options when we record calling creat_table

commit 28afb01	refs/heads/master
Author: kennyj 
Date:   2012-01-04 10:25:15 +0900

    Fix GH #4285. Remove options when we record calling creat_table

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 00c5342	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-03 14:54:29 -0800

    use File.basename to get the filename minus .yml

M	activerecord/lib/active_record/fixtures.rb

commit 508493c	refs/heads/master
Author: Jeremy Kemper 
Date:   2012-01-03 15:22:03 -0700

    setup_fixture_accessors should accept symbols for table names. Fixes an unintended (and untested) regression.

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 7985f64	refs/heads/master
Merge: d1230a8 5d2bf4d
Author: Aaron Patterson 
Date:   2012-01-03 14:02:47 -0800

    Merge pull request #2955 from dmitry/master
    
    Polymorphic with optimistic lock and counter cache should be destroyed

commit 63f7a61	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2012-01-03 14:00:24 -0800

    When generating routes, the last defined named route wins.  This is in
    contrast to route recognition where the first recognized route wins.
    This behavior will not exist in Rails 4.0.
    
    See:
    
      https://github.com/rails/rails/issues/4245
      https://github.com/rails/rails/issues/4164

M	actionpack/test/controller/base_test.rb

commit e912211	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2012-01-03 13:56:12 -0800

    Revert "Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)"
    
    This reverts commit 71d769e3b58cb56b4b1d5143936c65be8b27c490.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb

commit c4a29de	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2012-01-03 13:10:11 -0800

    Merge pull request #4283 from lest/fix-singleton-checking
    
    use correct variant of checking whether class is a singleton

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit d1230a8	refs/heads/master
Merge: cbe9180 2f8a7ed
Author: Aaron Patterson 
Date:   2012-01-03 13:10:11 -0800

    Merge pull request #4283 from lest/fix-singleton-checking
    
    use correct variant of checking whether class is a singleton

commit 2f8a7ed	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-03 23:44:56 +0300

    use correct variant of checking whether class is a singleton

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit caa6cde	refs/tags/v3.2.0.rc2
Merge: 8c129f1 337ac05
Author: Santiago Pastorino 
Date:   2012-01-03 12:10:59 -0800

    Merge pull request #4281 from lest/3-2-changelog
    
    add CHANGELOG entry for AS::Base64 deprecation

commit 337ac05	refs/tags/v3.2.0.rc2
Author: Sergey Nartimov 
Date:   2012-01-03 23:08:28 +0300

    add CHANGELOG entry for AS::Base64 deprecation

M	activesupport/CHANGELOG.md

commit efbb85c	refs/heads/master
Author: Matt Jones + Scott Walker 
Date:   2012-01-03 14:52:36 -0500

    correctly handle order calls after a reorder

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb

commit b7c7f08	refs/tags/v3.1.6
Author: Santiago Pastorino 
Date:   2012-01-03 17:49:11 -0200

    Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 8c129f1	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2012-01-03 17:49:11 -0200

    Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit cbe9180	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-03 17:49:11 -0200

    Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 6d5a27a	refs/tags/v3.1.6
Author: José Valim 
Date:   2012-01-03 20:26:45 +0100

    Override respond_to? since we are also overriding method_missing.

M	actionpack/lib/action_dispatch/routing/routes_proxy.rb
M	actionpack/test/dispatch/prefix_generation_test.rb

commit 124536e	refs/tags/v3.2.0.rc2
Merge: d38dac8 40c8aa7
Author: José Valim 
Date:   2012-01-03 11:31:00 -0800

    Merge pull request #4280 from lest/3-2-backport-callbacks
    
    backport changes in AS::Callbacks

commit d38dac8	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2012-01-03 20:26:45 +0100

    Override respond_to? since we are also overriding method_missing.

M	actionpack/lib/action_dispatch/routing/routes_proxy.rb
M	actionpack/test/dispatch/prefix_generation_test.rb

commit 180edc8	refs/heads/master
Author: José Valim 
Date:   2012-01-03 20:26:45 +0100

    Override respond_to? since we are also overriding method_missing.

M	actionpack/lib/action_dispatch/routing/routes_proxy.rb
M	actionpack/test/dispatch/prefix_generation_test.rb

commit 40c8aa7	refs/tags/v3.2.0.rc2
Author: Bogdan Gusiev 
Date:   2011-12-30 10:53:46 +0200

    AS::Callbacks: remove __define_runner

M	activesupport/lib/active_support/callbacks.rb

commit 5b8d270	refs/tags/v3.2.0.rc2
Author: Bogdan Gusiev 
Date:   2011-12-28 18:03:18 +0200

    Refactor AS::Callbacks
    
    Extracted `__reset_runner` from `__define_runner`
    And call it in proper places

M	activesupport/lib/active_support/callbacks.rb

commit 4e8286f	refs/tags/v3.2.0.rc2
Author: Bogdan Gusiev 
Date:   2011-12-25 22:23:16 +0200

    AS::Callbacks: improved __define_runner performance

M	activesupport/lib/active_support/callbacks.rb

commit 9f8f4c2	refs/tags/v3.2.0.rc2
Author: Bogdan Gusiev 
Date:   2011-12-25 16:44:19 +0200

    AS::Callbacks: improve __define_runner perfomance

M	activesupport/lib/active_support/callbacks.rb

commit 49b6b49	refs/heads/master
Author: José Valim 
Date:   2012-01-03 20:00:40 +0100

    Clean up routes inclusion and add some comments for the next soul that decides to adventure on this code.

M	actionpack/lib/action_dispatch/routing.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/controller/action_pack_assertions_test.rb

commit 439d340	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-03 17:03:45 -0200

    Add font_path helper method

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/fixtures/sprockets/app/fonts/dir/font.ttf
A	actionpack/test/fixtures/sprockets/app/fonts/font.ttf
M	actionpack/test/template/sprockets_helper_test.rb

commit 41be0fc	refs/heads/master
Author: Aaron Patterson 
Date:   2012-01-03 11:06:27 -0800

    actually disconnect from the database at the end of each test

M	activerecord/test/cases/connection_pool_test.rb

commit 0d7d3a6	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2012-01-03 17:03:45 -0200

    Add font_path helper method

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/fixtures/sprockets/app/fonts/dir/font.ttf
A	actionpack/test/fixtures/sprockets/app/fonts/font.ttf
M	actionpack/test/template/sprockets_helper_test.rb

commit 29f0f25	refs/heads/master
Merge: 632995c 84054a7
Author: Aaron Patterson 
Date:   2012-01-03 09:36:24 -0800

    Merge pull request #4274 from joneslee85/changelog-fix
    
    Fix typos and formats for CHANGELOG

commit eafdf6c	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2012-01-03 09:30:50 -0800

    Merge pull request #4279 from lest/fix-log
    
    do not rewrite log during application bootstrap

M	railties/lib/rails/application/bootstrap.rb

commit 632995c	refs/heads/master
Merge: 36e77fe 7826878
Author: Aaron Patterson 
Date:   2012-01-03 09:30:50 -0800

    Merge pull request #4279 from lest/fix-log
    
    do not rewrite log during application bootstrap

commit 7826878	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-03 20:13:24 +0300

    do not rewrite log during application bootstrap

M	railties/lib/rails/application/bootstrap.rb

commit 8ee6406	refs/heads/master
Author: Lars Kanis 
Date:   2012-01-03 16:57:34 +0100

    Postgresql: Allow setting of any libpq connection parameters

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit ca24ee7	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2012-01-03 08:03:47 -0800

    Merge pull request #4278 from kennyj/fix_rdoc_generating_problem
    
    Use -e option instead of -c option (rake rdoc task).

M	Rakefile

commit 36e77fe	refs/heads/master
Merge: 9f76659 2ddfbbc
Author: Santiago Pastorino 
Date:   2012-01-03 08:03:47 -0800

    Merge pull request #4278 from kennyj/fix_rdoc_generating_problem
    
    Use -e option instead of -c option (rake rdoc task).

commit 2ddfbbc	refs/heads/master
Author: kennyj 
Date:   2012-01-04 00:54:41 +0900

    Use -e option instead of -c option (rake rdoc task).

M	Rakefile

commit 9f76659	refs/heads/master
Merge: dad7fdc 5de4545
Author: Vijay Dev 
Date:   2012-01-03 06:19:52 -0800

    Merge pull request #4265 from laserlemon/patch-1
    
    Fix grammatical error

commit c032ff6	refs/tags/v3.2.0.rc2
Merge: 853de2b 1fc53df
Author: José Valim 
Date:   2012-01-03 05:55:51 -0800

    Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64
    
    deprecate AS::Base64 methods without DeprecatedConstantProxy

commit 1fc53df	refs/tags/v3.2.0.rc2
Author: Sergey Nartimov 
Date:   2012-01-03 16:33:08 +0300

    deprecate AS::Base64 methods without DeprecatedConstantProxy

M	activesupport/lib/active_support/base64.rb

commit 84054a7	refs/heads/master
Author: Trung Lê 
Date:   2012-01-04 00:09:11 +1100

    Fix typos and formats for CHANGELOG

M	actionpack/CHANGELOG.md

commit dad7fdc	refs/heads/master
Author: Santiago Pastorino 
Date:   2012-01-02 18:49:18 -0200

    Rails::Plugin has gone

M	activerecord/lib/active_record/railties/databases.rake
M	railties/CHANGELOG.md
M	railties/guides/code/getting_started/README.rdoc
M	railties/guides/code/getting_started/config/application.rb
M	railties/guides/source/3_2_release_notes.textile
M	railties/guides/source/api_documentation_guidelines.textile
M	railties/guides/source/command_line.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/plugins.textile
M	railties/guides/source/rails_application_templates.textile
M	railties/guides/source/testing.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/railties.rb
M	railties/lib/rails/commands.rb
D	railties/lib/rails/commands/plugin.rb
M	railties/lib/rails/engine/configuration.rb
M	railties/lib/rails/engine/railties.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/actions.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/README
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
D	railties/lib/rails/plugin.rb
M	railties/lib/rails/railtie.rb
M	railties/lib/rails/tasks/documentation.rake
M	railties/lib/rails/test_unit/testing.rake
M	railties/test/application/paths_test.rb
M	railties/test/generators/actions_test.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/engine_test.rb
D	railties/test/railties/plugin_ordering_test.rb
D	railties/test/railties/plugin_test.rb
M	railties/test/railties/shared_tests.rb

commit 853de2b	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2012-01-02 22:04:38 -0200

    Deprecate Rails::Plugin in favor of gems

M	railties/CHANGELOG.md
M	railties/guides/source/3_2_release_notes.textile
M	railties/lib/rails/plugin.rb

commit 2535898	refs/tags/v3.2.0.rc2
Merge: e369c4e 0b5cda7
Author: José Valim 
Date:   2012-01-03 03:51:10 -0800

    Merge pull request #4273 from lest/fix-pg-version
    
    use pg 0.11.0 under ruby 1.8.7

commit 0b5cda7	refs/tags/v3.2.0.rc2
Author: Sergey Nartimov 
Date:   2012-01-03 14:47:31 +0300

    use pg 0.11.0 under ruby 1.8.7

M	Gemfile

commit b627923	refs/heads/master
Merge: e04232e 50d23bc
Author: José Valim 
Date:   2012-01-03 03:23:03 -0800

    Merge pull request #4272 from apotonick/ac-process-rebase
    
    Ac process rebase

commit 50d23bc	refs/heads/master
Author: Nick Sutterer 
Date:   2012-01-03 11:50:03 +0100

    moving test_test.rb to test_case_test.rb for consistency.

A	actionpack/test/controller/test_case_test.rb
D	actionpack/test/controller/test_test.rb

commit 5b97088	refs/heads/master
Author: Nick Sutterer 
Date:   2011-12-28 14:12:21 +0100

    allow sending documents in AC::TestCase#post and friends.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit e369c4e	refs/tags/v3.2.0.rc2
Merge: 7bdfbac 4f440a3
Author: Xavier Noria 
Date:   2012-01-02 14:21:13 -0800

    Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64
    
    fix base64 requires

commit 4f440a3	refs/tags/v3.2.0.rc2
Author: Sergey Nartimov 
Date:   2012-01-03 01:04:03 +0300

    fix base64 requires

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	activeresource/test/cases/authorization_test.rb
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
M	activesupport/lib/active_support/xml_mini.rb

commit 7bdfbac	refs/tags/v3.2.0.rc2
Merge: 6e9cd38 5f09414
Author: Xavier Noria 
Date:   2012-01-02 14:00:32 -0800

    Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64
    
    deprecate ActiveSupport::Base64

commit 5f09414	refs/tags/v3.2.0.rc2
Author: Sergey Nartimov 
Date:   2012-01-03 00:55:42 +0300

    deprecate ActiveSupport::Base64
    
    extend and define ::Base64 if needed

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_basic_authentication_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb
M	activerecord/lib/active_record/session_store.rb
M	activeresource/test/cases/authorization_test.rb
M	activesupport/lib/active_support/base64.rb
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
M	activesupport/lib/active_support/xml_mini.rb
M	activesupport/test/core_ext/base64_ext_test.rb
M	activesupport/test/message_encryptor_test.rb

commit e04232e	refs/heads/master
Merge: 6de1b2a dc05914
Author: Xavier Noria 
Date:   2012-01-02 13:53:52 -0800

    Merge pull request #4250 from lest/range-json
    
    use #to_s to convert Range to json

commit 6de1b2a	refs/heads/master
Merge: 44df252 634c034
Author: José Valim 
Date:   2012-01-02 13:11:37 -0800

    Merge pull request #4266 from lest/deprecate-activesupport-base64
    
    fix base64 require

commit 634c034	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-02 23:16:16 +0300

    fix base64 require

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 44df252	refs/heads/master
Merge: deaa682 0f2f800
Author: José Valim 
Date:   2012-01-02 11:54:00 -0800

    Merge pull request #4252 from lest/deprecate-activesupport-base64
    
    remove ActiveSupport::Base64 in favor of ::Base64

commit 0f2f800	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-01 20:57:55 +0300

    remove ActiveSupport::Base64 in favor of ::Base64

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_basic_authentication_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb
M	activerecord/lib/active_record/session_store.rb
M	activeresource/test/cases/authorization_test.rb
M	activesupport/lib/active_support.rb
D	activesupport/lib/active_support/base64.rb
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
M	activesupport/lib/active_support/xml_mini.rb
D	activesupport/test/core_ext/base64_ext_test.rb
M	activesupport/test/message_encryptor_test.rb

commit 5de4545	refs/heads/master
Author: Steve Richert 
Date:   2012-01-02 14:45:09 -0500

    Fix grammatical error in ActiveModel::MassAssignmentSecurity::PermissionSet#deny? NotImplementedError message

M	activemodel/lib/active_model/mass_assignment_security/permission_set.rb

commit deaa682	refs/heads/master
Merge: 4d844c5 1c0eece
Author: José Valim 
Date:   2012-01-02 11:19:29 -0800

    Merge pull request #4253 from lest/remove-warnings
    
    fix use of FormBuilder.field_helpers

commit 1c0eece	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-01 21:07:17 +0300

    fix use of FormBuilder.field_helpers
    
    it is array of symbols now

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 4d844c5	refs/heads/master
Merge: 6f44fa0 c4ceee8
Author: José Valim 
Date:   2012-01-02 11:01:37 -0800

    Merge pull request #4263 from bogdan/local_gemfile
    
    Fixed path to local gemfile.

commit c4ceee8	refs/heads/master
Author: Bogdan Gusiev 
Date:   2012-01-02 15:08:37 +0200

    Fixed path to local gemfile.

M	Gemfile

commit c8fe025	refs/heads/master
Merge: 24b1fd2 dc64aec
Author: Pablo Ifran 
Date:   2012-01-02 09:16:38 -0200

    Merge branch 'master' of github.com:lifo/docrails

commit 24b1fd2	refs/heads/master
Author: Pablo Ifran 
Date:   2012-01-02 09:16:26 -0200

    improve doc in number helper options

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 6f44fa0	refs/heads/master
Merge: 881ca62 423dd88
Author: José Valim 
Date:   2012-01-01 10:35:28 -0800

    Merge pull request #4251 from castlerock/rename_ruby_debug_to_ruby_debug19
    
    rename ruby-debug to ruby-debug19

commit 6e9cd38	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-31 22:55:25 +0530

    DRY up guides index page
    
    Use the list of guides available in documents.yaml to fill in the
    menu in the index page instead of duplicating the list again. Also,
    remove WIP guides from the menu.

M	railties/guides/rails_guides/helpers.rb
M	railties/guides/source/documents.yaml
M	railties/guides/source/layout.html.erb

commit 881ca62	refs/heads/master
Author: Vijay Dev 
Date:   2012-01-01 23:01:28 +0530

    fix a warning about grouped expressions

M	activesupport/test/core_ext/range_ext_test.rb

commit dc05914	refs/heads/master
Author: Sergey Nartimov 
Date:   2012-01-01 20:16:10 +0300

    use #to_s to convert Range to json

M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/json/encoding_test.rb

commit 423dd88	refs/heads/master
Author: Vishnu Atrai 
Date:   2012-01-01 22:40:23 +0530

    rename ruby-debug to ruby-debug19

M	activesupport/lib/active_support/core_ext/kernel/debugger.rb
M	railties/guides/code/getting_started/README.rdoc
M	railties/lib/rails/generators/rails/app/templates/README
M	railties/lib/rails/rack/debugger.rb

commit dc64aec	refs/heads/master
Author: Mike Gunderloy 
Date:   2011-12-31 23:39:57 -0600

    General editing pass over assets pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit f3e079e	refs/heads/master
Merge: b5927b8 1b41351
Author: Vijay Dev 
Date:   2011-12-31 12:48:19 -0800

    Merge pull request #4248 from andrew/2012
    
    Updated copyright notices for 2012

commit 1b41351	refs/heads/master
Author: Andrew Nesbitt 
Date:   2011-12-31 20:27:47 +0000

    Updated copyright notices for 2012

M	actionmailer/MIT-LICENSE
M	actionmailer/lib/action_mailer.rb
M	actionpack/MIT-LICENSE
M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_pack.rb
M	actionpack/lib/action_view.rb
M	activemodel/MIT-LICENSE
M	activemodel/lib/active_model.rb
M	activerecord/MIT-LICENSE
M	activerecord/lib/active_record.rb
M	activeresource/MIT-LICENSE
M	activeresource/lib/active_resource.rb
M	activesupport/MIT-LICENSE
M	activesupport/lib/active_support.rb
M	railties/MIT-LICENSE

commit b5927b8	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-31 22:55:25 +0530

    DRY up guides index page
    
    Use the list of guides available in documents.yaml to fill in the
    menu in the index page instead of duplicating the list again. Also,
    remove WIP guides from the menu.

M	railties/guides/rails_guides/helpers.rb
M	railties/guides/source/documents.yaml
M	railties/guides/source/layout.html.erb

commit d3a2c0e	refs/heads/master
Merge: 86705b6 c20a74d
Author: Santiago Pastorino 
Date:   2011-12-31 09:13:40 -0800

    Merge pull request #4242 from castlerock/remove_condition_for_MiniTest
    
    MiniTest condition removed

commit 8be9d92	refs/tags/v3.2.0.rc2
Author: Alejandro Andrés 
Date:   2011-12-30 11:00:04 +0100

    Fixed documentation error in code examples from form_tag_helper.rb

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 95a83cc	refs/tags/v3.2.0.rc2
Author: Sam Umbach 
Date:   2011-12-30 17:19:49 -0500

    SCSS processor is provided by the sass gem

M	railties/guides/source/asset_pipeline.textile

commit 003d0ff	refs/tags/v3.2.0.rc2
Author: Sam Umbach 
Date:   2011-12-30 17:23:13 -0500

    Minor readability improvements

M	railties/guides/source/asset_pipeline.textile

commit ba19837	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-30 12:55:38 +0530

    fix a couple of formatting issues

M	railties/guides/source/getting_started.textile

commit 0a048f3	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-30 12:57:50 +0530

    remove wiki link

M	railties/guides/source/getting_started.textile

commit 86705b6	refs/heads/master
Merge: 80be90f cc843ab
Author: Vijay Dev 
Date:   2011-12-31 19:08:46 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit a048568	refs/tags/v3.0.14
Merge: ce650ee 7e03b9d
Author: José Valim 
Date:   2011-12-31 05:09:23 -0800

    Merge pull request #4246 from amatsuda/hashdos_30
    
    bump up rack version to the one that includes the Hash DoS fix

commit 8fff8f0	refs/tags/v2.3.15
Merge: 2eb197e 27a508c
Author: José Valim 
Date:   2011-12-31 05:09:14 -0800

    Merge pull request #4247 from amatsuda/hashdos_23
    
    bump up rack version to the one that includes the Hash DoS fix

commit 27a508c	refs/tags/v2.3.15
Author: Akira Matsuda 
Date:   2011-12-31 21:47:22 +0900

    bump up rack version to the one that includes the Hash DoS fix

M	actionpack/Rakefile
M	actionpack/lib/action_controller.rb

commit 7e03b9d	refs/tags/v3.0.14
Author: Akira Matsuda 
Date:   2011-12-31 21:33:29 +0900

    bump up rack version to the one that includes the Hash DoS fix

M	actionpack/actionpack.gemspec

commit 8efb9e7	refs/tags/v3.1.6
Merge: 939183a 16d4bc7
Author: José Valim 
Date:   2011-12-31 04:02:43 -0800

    Merge pull request #4244 from hsbt/upgrade-rack-dependency
    
    Upgrade rack dependency

commit 16d4bc7	refs/tags/v3.1.6
Author: SHIBATA Hiroshi 
Date:   2011-12-31 18:52:54 +0900

    upgrade rack-1.3.6

M	actionpack/actionpack.gemspec

commit cc843ab	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-30 12:57:50 +0530

    remove wiki link

M	railties/guides/source/getting_started.textile

commit b6aa300	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-30 12:55:38 +0530

    fix a couple of formatting issues

M	railties/guides/source/getting_started.textile

commit 80be90f	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-31 10:37:01 +0100

    removes comment obsoleted by 18ed37b

M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb

commit c20a74d	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-31 13:52:37 +0530

    MiniTest condition removed

M	activesupport/lib/active_support/test_case.rb

commit 226528d	refs/heads/master
Merge: ed17983 8fbb447
Author: José Valim 
Date:   2011-12-30 22:55:43 -0800

    Merge pull request #4241 from castlerock/remove_more_conditions_for_Fiber_ruby19
    
    remove more conditions for Fiber in ruby19

commit 5d2bf4d	refs/heads/master
Author: Dmitry Polushkin 
Date:   2011-12-31 03:56:48 +0000

    Removed metaclass from the has_many dependency destroy method. Fixes #2954

M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb

commit 04bc40f	refs/heads/master
Merge: 84eece0 ed17983
Author: Dmitry Polushkin 
Date:   2011-12-31 01:10:42 +0000

    Merge branch 'master' of git://github.com/rails/rails

commit ed17983	refs/heads/master
Merge: 641b43e 18ed37b
Author: Aaron Patterson 
Date:   2011-12-30 16:49:20 -0800

    Merge pull request #4237 from castlerock/fiber_available_in_ruby19
    
    fiber is available in ruby19 condition removed

commit 641b43e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 16:14:25 -0800

    updating the reaping frequency documentation

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 59f2696	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 16:10:53 -0800

    rename start to run and use Thread.pass rather than sleeping to schedule the watchdog

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/reaper_test.rb

commit 405aeb5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 15:39:39 -0800

    connection pool starts the reaper

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/reaper_test.rb

commit 3af68df	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 15:36:48 -0800

    just dup the spec now that it will deep copy

M	activerecord/test/cases/reaper_test.rb

commit ddde548	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 15:35:21 -0800

    connection specification will deep copy the config

M	activerecord/lib/active_record/connection_adapters/connection_specification.rb
A	activerecord/test/cases/connection_adapters/connection_specification_test.rb

commit 41c24eb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 15:27:41 -0800

    each connection pool has a reaper

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/connection_specification.rb
M	activerecord/test/cases/reaper_test.rb

commit cde7692	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 15:19:07 -0800

    introduce a timer class for reaping connections

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
A	activerecord/test/cases/reaper_test.rb

commit cceabe0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 14:56:26 -0800

    raise a pull full error when the connection pool is full and no connection can be obtained

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit b1ac881	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 14:31:30 -0800

    connections are only removed if they are inactve

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit 86729eb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 14:26:29 -0800

    connections can be reaped via the `reap` method

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit c3224db	refs/heads/master
Author: Sam Umbach 
Date:   2011-12-30 17:23:13 -0500

    Minor readability improvements

M	railties/guides/source/asset_pipeline.textile

commit 8daa9f5	refs/heads/master
Author: Sam Umbach 
Date:   2011-12-30 17:19:49 -0500

    SCSS processor is provided by the sass gem

M	railties/guides/source/asset_pipeline.textile

commit e060cf0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 14:14:13 -0800

    deal with removing connections associated with the current thread

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit 17ff88c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 14:09:39 -0800

    connections can be removed from the pool

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit bf9e6c7	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 13:49:31 -0800

    queue and signal no longer needed

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 5dc7257	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 13:47:10 -0800

    refactor checking out the connection

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 8fbb447	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-31 01:22:40 +0530

    remove more conditions for Fiber available in ruby19

M	actionpack/test/controller/new_base/render_streaming_test.rb
M	actionpack/test/template/streaming_render_test.rb

commit df9de6f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 11:45:34 -0800

    infinite loop is no longer necessary

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 18ed37b	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-31 01:12:53 +0530

    fiber is available in ruby19

M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb

commit 6769293	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-30 11:37:21 -0800

    connections must be checked in at the end of a thread

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit 7c55d69	refs/heads/master
Merge: 50f1743 e734f00
Author: José Valim 
Date:   2011-12-30 10:59:14 -0800

    Merge pull request #4235 from castlerock/remove_ruby_18_BasicObject
    
    ruby 1.8 ActiveSupport BasicObject no longer available

commit 50f1743	refs/heads/master
Merge: 5681f79 7249f94
Author: José Valim 
Date:   2011-12-30 10:58:35 -0800

    Merge pull request #4236 from castlerock/to_time_available_in_ruby19_DateTime
    
    remove condition since to_time always available in ruby19 DateTime

commit 7249f94	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-31 00:15:21 +0530

    remove condition since to_time always available in ruby19 DateTime

M	activesupport/lib/active_support/core_ext/date_time/conversions.rb

commit e734f00	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-30 23:45:57 +0530

    ruby 1.8 ActiveSupport BasicObject no longer available

M	activesupport/lib/active_support/duration.rb

commit f12d904	refs/tags/v3.2.0.rc2
Merge: 0814e74 b815676
Author: Aaron Patterson 
Date:   2011-12-30 10:04:39 -0800

    Merge pull request #4227 from gazay/3-2-stable-marshalling
    
    3 2 stable marshalling

commit 5681f79	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 17:27:10 -0800

    be explicit about where helpers are installed

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/action_pack_assertions_test.rb

commit 116b9ed	refs/heads/master
Merge: 4b99732 b52d9d0
Author: Aaron Patterson 
Date:   2011-12-30 10:02:19 -0800

    Merge pull request #4224 from alexeymuranov/my-fix-for-fixture-tables
    
    Fix #2572 and define fixture table name in the associated model

commit 4b99732	refs/heads/master
Merge: 9fa59ca 2a78886
Author: José Valim 
Date:   2011-12-30 04:43:45 -0800

    Merge pull request #4233 from bogdan/remove_define_runner
    
    AS::Callbacks: remove __define_runner

commit 0814e74	refs/tags/v3.2.0.rc2
Author: Xavier Noria 
Date:   2011-12-30 02:18:07 -0800

    adds a comments that clarifies why Range#include? chooses the comparison operator

M	activesupport/lib/active_support/core_ext/range/include_range.rb

commit 71f59b7	refs/tags/v3.2.0.rc2
Author: Sergey Nartimov 
Date:   2011-12-29 10:50:15 +0300

    refactor Range#include? to handle ranges with floats
    
    Conflicts:
    
    	activesupport/lib/active_support/core_ext/range/include_range.rb

M	activesupport/lib/active_support/core_ext/range/include_range.rb
M	activesupport/test/core_ext/range_ext_test.rb

commit 9fa59ca	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-30 02:18:07 -0800

    adds a comments that clarifies why Range#include? chooses the comparison operator

M	activesupport/lib/active_support/core_ext/range/include_range.rb

commit edfe7d8	refs/heads/master
Merge: e43b2b3 952e9d9
Author: Xavier Noria 
Date:   2011-12-30 02:13:37 -0800

    Merge pull request #4229 from lest/range-include
    
    refactor Range#include? to handle ranges with floats

commit ec2cf24	refs/heads/master
Author: Alejandro Andrés 
Date:   2011-12-30 11:00:04 +0100

    Fixed documentation error in code examples from form_tag_helper.rb

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit b52d9d0	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-29 16:36:00 +0100

    Fixes for TestFixtures::setup_fixture_accessors
    
    Renamed "fixture_name" to "accessor_name" and made fixture names in the form "admin/users" be used as the key for the hashes @fixture_cache and @loaded_fixtures.
    
    Previously the variable "fixture_name" here was getting a value of the form "admin_user", and this value was then used as the hash key.

M	activerecord/lib/active_record/fixtures.rb

commit 7162ea2	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-20 21:58:26 +0100

    Fixture's table name be defined in the model
    
    Made the fixture's table name be taken from its model class whenever this class responds to table_name, instead of inferring it sometimes from the fixture's pass.
    
    The previous behavior seemed buggy because it depended on whether the model class was passed as a constant or as a name string.
    
    Improved Fixtures#initialize.

M	activerecord/lib/active_record/fixtures.rb

commit d3e6e7e	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-20 21:32:39 +0100

    Test case: fixture table name is defined in model

M	activerecord/test/cases/fixtures_test.rb

commit e0ef093	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-20 21:06:30 +0100

    Use foo/bar instead of foo_bar keys for fixtures
    
    This solves an issue with set_fixture_class class method caused by create_fixtures method's overwriting passed to it fixture model classes, when the fixtures are "namespased": foo/bar or admin/users.
    
    The idea is to use "foo/bar" string as the name and identifier of a
    fixture file bar in directory foo.  The model class of the fixture is either set with set_fixture_class method, or otherwise inferred from its name using camelize method.
    
    Also a bug is fixed in lines 487-489 when the table names were guessed by substitution from the fixture file names, ambiguously called  table_names, instead of being taken from fixture attributes.  Now they are taken from attributes.
    
    I plan to submit another fix so that the fixture's table name (for
    example foo_bar) be defined by the fixture's model whenever possible,
    instead of inferring it from the fixture's name ("foo/bar").

M	activerecord/lib/active_record/fixtures.rb

commit 6468ff4	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-19 16:00:24 +0100

    Test fixtures with custom model and table names
    
    Test using fixtures with random names and model names, that is not following naming conventions but using set_fixture_class instead.
    
    It is expected that the table name be defined in the model, but this is not explicitly tested here.  This will need to be fixed.

M	activerecord/test/cases/fixtures_test.rb
A	activerecord/test/fixtures/admin/randomly_named_a9.yml
A	activerecord/test/fixtures/admin/randomly_named_b0.yml
A	activerecord/test/fixtures/randomly_named_a9.yml
A	activerecord/test/models/admin/randomly_named_c1.rb
A	activerecord/test/models/randomly_named_c1.rb
M	activerecord/test/schema/schema.rb

commit 2a78886	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-12-30 10:53:46 +0200

    AS::Callbacks: remove __define_runner

M	activesupport/lib/active_support/callbacks.rb

commit e43b2b3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 16:07:07 -0800

    just add the writer rather than adding both and removing one

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 87dd62a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 14:37:52 -0800

    stop using __send__ and just module eval in the extensions

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit cd97d0b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 11:59:39 -0800

    we know the classes will be a list, so *tell* it to respond to each
    rather than casting

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit fb3e09a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 11:50:35 -0800

    don't need the begin / end

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 72c290c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 11:47:21 -0800

    avoid extra method calls by just defining the delegate

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 5ac0273	refs/heads/master
Merge: 0035c54 8a130ed
Author: José Valim 
Date:   2011-12-29 13:11:11 -0800

    Merge pull request #4226 from grentis/content_for_with_flush
    
    content_for with flush parameter

commit 8a130ed	refs/heads/master
Author: grentis 
Date:   2011-12-29 21:58:55 +0100

    content_for with flush parameter

M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/test/template/capture_helper_test.rb

commit 0035c54	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 10:25:58 -0800

    don't use instance eval, just reference variables so we don't have to
    worry about "inspect" marshalling

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 766eda3	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-29 10:23:17 -0800

    fixing typo. Thanks Vijay!

M	activesupport/lib/active_support/tagged_logging.rb

commit 63c6fee	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-29 22:58:57 +0530

    revise some doc changes

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 2e533e3	refs/tags/v3.2.0.rc2
Author: Kevin Moore 
Date:   2011-12-28 10:59:28 -0800

    Documented about using :path option for resources

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 5f57d2a	refs/tags/v3.2.0.rc2
Author: Alejandro Andrés 
Date:   2011-12-28 15:41:33 +0100

    Fixed formatting of code examples in form_tag_helper.rb

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit d8a43e2	refs/tags/v3.2.0.rc2
Author: Jo Liss 
Date:   2011-12-27 13:18:34 +0100

    Document that index names are made up of all columns, not just the first.
    
    index_name has been using the following expression
    
        "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"
    
    since at least 2006 (bc7f2315), and that's how they come out in my DB.
    
    Please check that this is correct before merging into master, perhaps
    I'm misunderstanding the section I changed.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit bea4f9a	refs/tags/v3.2.0.rc2
Author: Uģis Ozols 
Date:   2011-12-26 21:44:50 +0200

    Remove unnecessary comma.

M	activerecord/lib/active_record/counter_cache.rb

commit 04d308a	refs/heads/master
Merge: 88aeeee 1fc6036
Author: Vijay Dev 
Date:   2011-12-29 23:35:45 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 88aeeee	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 09:52:18 -0800

    removing dead code.

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 1fc6036	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-29 22:58:57 +0530

    revise some doc changes

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit c0904e4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 09:06:34 -0800

    decouple initialize from clear!. Initialize ivars in initialize, clear
    ivars in clear!

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 25b10f4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-29 09:02:54 -0800

    modules don't have any instance methods

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 2eb197e	refs/tags/v2.3.15
Merge: e0774e4 cd2136a
Author: Aaron Patterson 
Date:   2011-12-29 08:10:53 -0800

    Merge pull request #4202 from dasch/request-remote-ip
    
    Fix bug in `ActionController::Request#remote_ip`

commit c99d507	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-29 14:26:38 +0000

    Deprecate implicit eager loading. Closes #950.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/preloader/association.rb
M	activerecord/lib/active_record/associations/preloader/through_association.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/category.rb
M	activerecord/test/models/person.rb

commit 0b8b682	refs/heads/master
Merge: 65ff9a1 6e5ab54
Author: José Valim 
Date:   2011-12-29 06:00:29 -0800

    Merge pull request #4231 from nashby/remove-constantize-ruby-18
    
    remove ruby 1.8 checking in constantize method

commit 6e5ab54	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-29 16:01:10 +0300

    remove ruby 1.8 checking in constantize method

M	activesupport/lib/active_support/inflector/methods.rb

commit 65ff9a1	refs/heads/master
Merge: afd9512 73f0588
Author: José Valim 
Date:   2011-12-29 03:43:17 -0800

    Merge pull request #4230 from alovak/patch-1
    
    Fix rails/generators/base.rb documentation for hook_for

commit 73f0588	refs/heads/master
Author: Pavel Gabriel 
Date:   2011-12-29 13:33:01 +0200

    Fix rails/generators/base.rb documentation for hook_for

M	railties/lib/rails/generators/base.rb

commit 952e9d9	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-29 10:50:15 +0300

    refactor Range#include? to handle ranges with floats

M	activesupport/lib/active_support/core_ext/range/include_range.rb
M	activesupport/test/core_ext/range_ext_test.rb

commit afd9512	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 18:39:39 -0800

    simplify sweep now that discard and flashes are in sync

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit bdfd11e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 18:33:44 -0800

    mutations on the underlying hash should also mutate the discard set

M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/controller/flash_hash_test.rb

commit dea1602	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 18:25:36 -0800

    rename @used to something a bit more meaningful

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit ffad492	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 18:21:35 -0800

    mutations can't be done without the consent of our proxy object.  This
    is one benefit of choosing composition over inheritance.

M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/controller/flash_hash_test.rb

commit b815676	refs/tags/v3.2.0.rc2
Author: Alexey Gaziev 
Date:   2011-12-29 10:13:04 +0800

    Backward compatibility with 3.1 cache storing

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 21df2bf	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 17:39:51 -0800

    again, use Set#subtract

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit ea35967	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 17:35:45 -0800

    Use Set#subtract and Set#merge for keeping track of used / unused keys

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit b88a181	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 17:22:37 -0800

    fix method visibility

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 77df5ba	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-28 17:14:22 -0800

    no need for bang bang :bomb:

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit f423bdc	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-28 17:03:37 -0800

    Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids
    
    allow reorder to affect eager loading correctly

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 780a222	refs/heads/master
Merge: f06074f 18fb2d4
Author: Aaron Patterson 
Date:   2011-12-28 17:03:37 -0800

    Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids
    
    allow reorder to affect eager loading correctly

commit 80f2eeb	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-28 16:55:41 -0800

    Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling"
    
    This reverts commit df3701872d6c97ff49943aea30761b47e60fa9fe, reversing
    changes made to a0fd9fb01730af12d66a27b5665cc010bd3b90b4.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 50af25b	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-28 16:33:40 -0800

    last named route wins. fixes #4164
    
    This differs from route recognition where first recognized route wins.
    This will not be supported in Rails 4.0 so that route recognition and
    generation rules are consistent.

M	actionpack/test/controller/base_test.rb
M	actionpack/test/dispatch/routing_test.rb

commit f06074f	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-28 23:08:10 +0000

    Fix CI

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 7a80ac0	refs/tags/v3.2.0.rc2
Author: Xavier Noria 
Date:   2011-12-28 23:47:10 +0100

    app code in general wants Time.current, not Time.now

M	activerecord/lib/active_record/scoping/named.rb

commit e99987b	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-28 23:47:10 +0100

    app code in general wants Time.current, not Time.now

M	activerecord/lib/active_record/scoping/named.rb

commit 0b61e3f	refs/heads/master
Merge: 2fb5d0a 612d671
Author: Aaron Patterson 
Date:   2011-12-28 11:42:29 -0800

    Merge pull request #4222 from amatsuda/ar_predicate_builder_refactor
    
    refactor AR::PredicateBuilder.build_from_hash

commit a7d3851	refs/heads/master
Author: Kevin Moore 
Date:   2011-12-28 10:59:28 -0800

    Documented about using :path option for resources

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 2fb5d0a	refs/heads/master
Merge: 88d2af5 7626c0b
Author: Jon Leighton 
Date:   2011-12-28 10:47:10 -0800

    Merge pull request #4221 from tonycoco/master
    
    Rails template creation issue

commit bbafe73	refs/tags/v3.2.0.rc2
Author: Jon Leighton 
Date:   2011-12-28 18:45:28 +0000

    Revert "Further simplify singleton_class checking in class_attribute"
    
    This reverts commit 520918aad9b84eee807eb42fcb32f57c152d50e0.
    
    Reason: build failure

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 88d2af5	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-28 18:44:15 +0000

    Delete some stray lines

M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/model.rb

commit 612d671	refs/heads/master
Author: Akira Matsuda 
Date:   2011-12-29 03:27:07 +0900

    refactor AR::PredicateBuilder.build_from_hash

M	activerecord/lib/active_record/relation/predicate_builder.rb

commit 7626c0b	refs/heads/master
Author: Tony Coconate 
Date:   2011-12-28 12:33:28 -0600

    Update railties/lib/rails/generators/actions.rb

M	railties/lib/rails/generators/actions.rb

commit 9bae926	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-28 18:27:25 +0000

    Revert "Merge pull request #4220 from bensie/singleton-class-master"
    
    This reverts commit 90df0d4f687596943bda108ab0b98dd99cacd46b, reversing
    changes made to 5e6fc81d63837559a393c173eade281ddeb687dd.
    
    Reason: build breakage

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 6e5b98e	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-28 18:17:57 +0000

    Avoid deprecation warning

M	activerecord/lib/active_record/railtie.rb

commit dae7b65	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-28 18:07:08 +0000

    Support establishing connection on ActiveRecord::Model.
    
    This is the 'top level' connection, inherited by any models that include
    ActiveRecord::Model or inherit from ActiveRecord::Base.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
D	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
A	activerecord/lib/active_record/connection_adapters/connection_specification.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
A	activerecord/lib/active_record/connection_handling.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
M	activerecord/test/cases/connection_specification/resolver_test.rb
M	activerecord/test/cases/inclusion_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/unconnected_test.rb
M	activerecord/test/models/teapot.rb
M	activerecord/test/schema/schema.rb
M	activerecord/test/support/connection.rb

commit 93c1f11	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-28 15:38:16 +0000

    Support configuration on ActiveRecord::Model.
    
    The problem: We need to be able to specify configuration in a way that
    can be inherited to models that include ActiveRecord::Model. So it is
    no longer sufficient to put 'top level' config on ActiveRecord::Base,
    but we do want configuration specified on ActiveRecord::Base and
    descendants to continue to work.
    
    So we need something like class_attribute that can be defined on a
    module but that is inherited when ActiveRecord::Model is included.
    
    The solution: added ActiveModel::Configuration module which provides a
    config_attribute macro. It's a bit specific hence I am not putting this
    in Active Support or making it a 'public API' at present.

M	activemodel/lib/active_model.rb
M	activemodel/lib/active_model/attribute_methods.rb
A	activemodel/lib/active_model/configuration.rb
M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/validations.rb
A	activemodel/test/cases/configuration_test.rb
M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/attribute_methods/dirty.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/callbacks.rb
D	activerecord/lib/active_record/configuration.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/explain.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/lib/active_record/readonly_attributes.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/scoping/default.rb
M	activerecord/lib/active_record/timestamp.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
D	activerecord/test/cases/configuration_test.rb

commit afe6e05	refs/heads/master
Merge: c8dcc19 a19d0f5
Author: Aaron Patterson 
Date:   2011-12-28 10:22:48 -0800

    Merge pull request #4207 from nashby/deprecate-base64-encode64s
    
    deprecate Base64.encode64s from AS

commit df37018	refs/tags/v3.2.0.rc2
Merge: a0fd9fb f7b1906
Author: Aaron Patterson 
Date:   2011-12-28 10:10:36 -0800

    Merge pull request #4196 from gazay/3-2-stable-marshalling
    
    3.2 stable marshalling

commit c8dcc19	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-12-28 15:55:06 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit a0fd9fb	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2011-12-28 15:55:06 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit 2004a13	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2011-12-28 12:20:51 -0200

    Bump to rack 1.4.0

M	actionpack/actionpack.gemspec

commit 520918a	refs/tags/v3.2.0.rc2
Author: James Miller 
Date:   2011-12-28 09:19:46 -0800

    Further simplify singleton_class checking in class_attribute

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 90df0d4	refs/heads/master
Merge: 5e6fc81 cdf7a60
Author: Aaron Patterson 
Date:   2011-12-28 09:46:48 -0800

    Merge pull request #4220 from bensie/singleton-class-master
    
    Further simplify singleton_class checking in class_attribute

commit cdf7a60	refs/heads/master
Author: James Miller 
Date:   2011-12-28 09:19:46 -0800

    Further simplify singleton_class checking in class_attribute

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 5e6fc81	refs/heads/master
Merge: 1638128 99433e4
Author: José Valim 
Date:   2011-12-28 08:33:08 -0800

    Merge pull request #4218 from bogdan/reset_runner_callbacks
    
    Refactor AS::Callbacks

commit 99433e4	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-12-28 18:03:18 +0200

    Refactor AS::Callbacks
    
    Extracted `__reset_runner` from `__define_runner`
    And call it in proper places

M	activesupport/lib/active_support/callbacks.rb

commit 1638128	refs/heads/master
Merge: 0d01e09 1877cf9
Author: Jon Leighton 
Date:   2011-12-28 07:50:25 -0800

    Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_value
    
    AR#where with an Array of 2 elements including a nil

commit 40cab62	refs/tags/v3.2.0.rc2
Merge: d547761 7767159
Author: Xavier Noria 
Date:   2011-12-28 07:01:21 -0800

    Merge pull request #4217 from tapajos/patch-2
    
    Remove empty line

commit 7767159	refs/tags/v3.2.0.rc2
Author: Marcos Tapajós 
Date:   2011-12-28 12:57:20 -0200

    Remove empty line.

M	activerecord/lib/active_record/relation/query_methods.rb

commit 18fb2d4	refs/heads/master
Author: Matt Jones + Scott Walker 
Date:   2011-12-28 09:53:13 -0500

    allow reorder to affect eager loading correctly

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 4cd7c4e	refs/heads/master
Author: Alejandro Andrés 
Date:   2011-12-28 15:41:33 +0100

    Fixed formatting of code examples in form_tag_helper.rb

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit b92a22e	refs/heads/master
Author: Jo Liss 
Date:   2011-12-28 15:29:36 +0100

    typo

M	activerecord/lib/active_record/relation.rb

commit 0d01e09	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-12-28 12:20:51 -0200

    Bump to rack 1.4.0

M	actionpack/actionpack.gemspec

commit 4af5252	refs/heads/master
Merge: 1a77015 64f106d
Author: Jon Leighton 
Date:   2011-12-28 03:35:12 -0800

    Merge pull request #4153 from alexeymuranov/my_fix_for_prefix_suffix_fixtures_test
    
    Fix a fixtures test case with table prefix/suffix

commit 64f106d	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-27 01:48:06 +0100

    Use the correct table name from fixture
    
    Fixed a bug in fixtures.rb where the table name was incorrectly inferred from the fixture path which was ambiguously called "table_name" but was also used as the fixture name.
    Now, the "correct" table name is taken from an instance variable.

M	activerecord/lib/active_record/fixtures.rb

commit d547761	refs/tags/v3.2.0.rc2
Merge: d7cfb63 b3490d8
Author: José Valim 
Date:   2011-12-28 00:32:36 -0800

    Merge pull request #4210 from tapajos/patch-1
    
    Fix #4208

commit 1877cf9	refs/heads/master
Author: Akira Matsuda 
Date:   2011-12-28 14:27:38 +0900

    where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"
    
    was "WHERE foo IN (1) OR foo IS NULL" before

M	activerecord/lib/active_record/relation/predicate_builder.rb

commit c8711e4	refs/heads/master
Author: Akira Matsuda 
Date:   2011-12-28 14:26:38 +0900

    no need to compact an already compacted Array

M	activerecord/lib/active_record/relation/predicate_builder.rb

commit b3490d8	refs/tags/v3.2.0.rc2
Author: Marcos Tapajós 
Date:   2011-12-27 20:31:29 -0200

    Closes #4208

M	activerecord/lib/active_record/relation/query_methods.rb

commit a19d0f5	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-27 22:46:44 +0300

    deprecate Base64.encode64s from AS. Use Base64.strict_encode64 instead

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	activesupport/lib/active_support/base64.rb
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
M	activesupport/test/core_ext/base64_ext_test.rb
M	activesupport/test/message_encryptor_test.rb

commit cd2136a	refs/tags/v2.3.15
Author: Daniel Schierbeck 
Date:   2011-12-27 13:53:09 +0100

    Make Request#remote_ip return nil when HTTP_X_FORWARDED_FOR is empty
    
    If HTTP_X_FORWARDED_FOR only contains whitespace, don't try to extract a
    list of IP addresses from it.

M	actionpack/lib/action_controller/request.rb
M	actionpack/test/controller/request_test.rb

commit 1a77015	refs/heads/master
Merge: 01cde1d 29b5e5f
Author: Santiago Pastorino 
Date:   2011-12-27 04:41:18 -0800

    Merge pull request #4201 from arunagw/no_worry_about_1.9.2
    
    Revert "This conditions is required to work with database create task.

commit 01cde1d	refs/heads/master
Merge: 2545275 af404ac
Author: Santiago Pastorino 
Date:   2011-12-27 04:39:22 -0800

    Merge pull request #4198 from castlerock/remove_GC_checks_for_ruby19
    
    remove conditions for GC::Profiler in ruby19

commit dd72235	refs/heads/master
Author: Jo Liss 
Date:   2011-12-27 13:18:34 +0100

    Document that index names are made up of all columns, not just the first.
    
    index_name has been using the following expression
    
        "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"
    
    since at least 2006 (bc7f2315), and that's how they come out in my DB.
    
    Please check that this is correct before merging into master, perhaps
    I'm misunderstanding the section I changed.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 29b5e5f	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-27 15:55:45 +0530

    Revert "This conditions is required to work with database create task. 1.9.2 is having a bug with "Calling return within begin still executes else". "
    
    No need to worry about 1.9.2 with master
    This reverts commit fbf4bee6ed3682b361d6fbeca8e185e665e26b81.

M	activerecord/lib/active_record/railties/databases.rake

commit 2545275	refs/heads/master
Merge: 3e4d0da 971d257
Author: José Valim 
Date:   2011-12-26 23:27:51 -0800

    Merge pull request #4199 from cibernox/patch-1
    
    Removed RUBY_ENGINE checks for ruby18

commit 971d257	refs/heads/master
Author: Miguel Camba 
Date:   2011-12-27 07:52:41 +0100

    Removed RUBY_ENGINE checks for ruby18

M	activesupport/lib/active_support/testing/performance.rb

commit af404ac	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-27 00:07:30 +0530

    remove conditions for GC::Profiler in ruby19

M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit f7b1906	refs/tags/v3.2.0.rc2
Author: Alexey Gaziev 
Date:   2011-12-27 10:54:05 +0800

    Safe getting value from cache entry

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit ae8bb11	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-19 16:07:02 +0100

    Fix a fixtures test case with table prefix/suffix
    
    Make sure the table name of a model is reset in a test case after assigning ActiveRecord::Base.table_name_prefix and ActiveRecord::Base.table_name_suffix.

M	activerecord/test/cases/fixtures_test.rb
A	activerecord/test/fixtures/other_topics.yml

commit 3e4d0da	refs/heads/master
Merge: 28b008b 2443b65
Author: Santiago Pastorino 
Date:   2011-12-26 14:03:56 -0800

    Merge pull request #4195 from castlerock/remove_19_condition_for_GC_Profiler
    
    GC::Profiler available in ruby19

commit 28b008b	refs/heads/master
Merge: 160f07f 3f642c9
Author: José Valim 
Date:   2011-12-26 12:23:36 -0800

    Merge pull request #4197 from nashby/refactor-range-include
    
    refactor Range#include? for range value

commit 160f07f	refs/heads/master
Merge: bec7cf2 306c44d
Author: José Valim 
Date:   2011-12-26 12:18:25 -0800

    Merge pull request #4194 from castlerock/remove_18_test_support
    
    remove ForClassicTestUnit support for ruby 1.8 in performance and setup and teardown

commit 3f642c9	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-26 23:07:27 +0300

    refactor Range#include? for range value

M	activesupport/lib/active_support/core_ext/range/include_range.rb

commit acab767	refs/heads/master
Author: Uģis Ozols 
Date:   2011-12-26 21:44:50 +0200

    Remove unnecessary comma.

M	activerecord/lib/active_record/counter_cache.rb

commit 2443b65	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-27 00:00:22 +0530

    GC::Profiler available in ruby19

M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 306c44d	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-26 23:32:56 +0530

    remove ForClassicTestUnit support for ruby 1.8

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/setup_and_teardown.rb

commit bec7cf2	refs/heads/master
Merge: 9fffef5 2ba1f46
Author: José Valim 
Date:   2011-12-26 09:36:50 -0800

    Merge pull request #4193 from nashby/remove-old-rexml-security-fix
    
    remove rexml security fix for rubies 1.8

commit 2ba1f46	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-26 19:26:37 +0300

    remove rexml security fix for rubies 1.8

D	activesupport/lib/active_support/core_ext/rexml.rb
M	activesupport/lib/active_support/ruby/shim.rb

commit 9299bfd	refs/heads/master
Author: Anton Lindqvist 
Date:   2011-12-26 16:58:30 +0100

    Align rake notes.

M	railties/lib/rails/source_annotation_extractor.rb
M	railties/test/application/rake/notes_test.rb

commit 9fffef5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-26 16:16:17 +0100

    Refactor RouteInspector

M	railties/lib/rails/application/route_inspector.rb

commit eeb7736	refs/heads/master
Merge: 719ba0b 131c9ba
Author: Santiago Pastorino 
Date:   2011-12-26 05:20:15 -0800

    Merge pull request #4150 from Karunakar/new_PR
    
     change Log

commit 719ba0b	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-26 13:56:47 +0100

    Revert "Merge pull request #4154 from nashby/include-blank-date-helper"
    
    This reverts commit 76f0fa6066b78cd8f0e139dff4a7b65c96db5778, reversing
    changes made to 28cd098d99c52486aecb72aab39105d8abcd52ad.

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 76f0fa6	refs/heads/master
Merge: 28cd098 f7669cd
Author: Piotr Sarnacki 
Date:   2011-12-26 04:09:35 -0800

    Merge pull request #4154 from nashby/include-blank-date-helper
    
    a prompt string in include_blank option for date helpers

commit d7cfb63	refs/tags/v3.2.0.rc2
Author: Piotr Sarnacki 
Date:   2011-12-26 11:31:22 +0100

    Correctly display rack apps with dynamic constraints in RoutesInspector
    
    If you used dynamic constraint like that:
    
      scope :constraint => MyConstraint.new do
        mount RackApp => "/foo"
      end
    
    routes were not displayed correctly when using `rake routes`.
    This commit fixes it. If you want nice display of dynamic
    constraints in `rake routes` output, please just override
    to_s method in your constraint's class.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit 28cd098	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-26 11:31:22 +0100

    Correctly display rack apps with dynamic constraints in RoutesInspector
    
    If you used dynamic constraint like that:
    
      scope :constraint => MyConstraint.new do
        mount RackApp => "/foo"
      end
    
    routes were not displayed correctly when using `rake routes`.
    This commit fixes it. If you want nice display of dynamic
    constraints in `rake routes` output, please just override
    to_s method in your constraint's class.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit 63e14a7	refs/heads/master
Merge: b417d3d a7ba8e1
Author: Xavier Noria 
Date:   2011-12-26 01:28:12 -0800

    Merge pull request #4118 from nashby/remove-file-to-path
    
    remove File#to_path alias

commit b417d3d	refs/heads/master
Merge: e33c946 a1a5c40
Author: José Valim 
Date:   2011-12-25 12:38:26 -0800

    Merge pull request #4188 from castlerock/remove_1.8_test
    
    Test::Unit::Util::BacktraceFilter not available in ruby19 test/unit

commit e33c946	refs/heads/master
Merge: 748725e 7e75dc5
Author: José Valim 
Date:   2011-12-25 12:37:50 -0800

    Merge pull request #4189 from bogdan/non_keyed_callbacks
    
    AS::Callbacks: improved __define_runner performance

commit 7e75dc5	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-12-25 22:23:16 +0200

    AS::Callbacks: improved __define_runner performance

M	activesupport/lib/active_support/callbacks.rb

commit a1a5c40	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-26 01:51:05 +0530

    Test::Unit::Util::BacktraceFilter not available in ruby19 test/unit

M	railties/test/application/test_test.rb

commit a7ba8e1	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-21 22:28:40 +0300

    remove File#to_path alias

M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/lib/action_controller/metal/streaming.rb
M	activesupport/lib/active_support/core_ext/file.rb
D	activesupport/lib/active_support/core_ext/file/path.rb
M	activesupport/lib/active_support/ruby/shim.rb
M	activesupport/test/core_ext/file_test.rb

commit 748725e	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-25 11:11:23 -0800

    removes the compatibility method Module#method_names

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/module.rb
D	activesupport/lib/active_support/core_ext/module/method_names.rb
M	activesupport/lib/active_support/ruby/shim.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 40bda76	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-25 11:02:42 -0800

    removes the compatibility method Module#instance_method_names

M	actionpack/lib/action_view/helpers/form_helper.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/module/method_names.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 4e1999d	refs/heads/master
Merge: fc4f56a 3f967dc
Author: José Valim 
Date:   2011-12-25 11:08:15 -0800

    Merge pull request #4187 from castlerock/basic_object_in_19
    
    ::BasicObject always defined in ruby 19

commit 3f967dc	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-26 00:34:48 +0530

    ::BasicObject always defined in ruby 19

M	activesupport/lib/active_support/basic_object.rb

commit fc4f56a	refs/heads/master
Merge: 819ea5f 33fb719
Author: Xavier Noria 
Date:   2011-12-25 10:23:52 -0800

    Merge pull request #4186 from lest/remove-1-8-code
    
    ruby 1.9 returns method names as symbols

commit 33fb719	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-25 20:52:05 +0300

    ruby 1.9 returns method names as symbols

M	activesupport/lib/active_support/core_ext/module/method_names.rb

commit 819ea5f	refs/heads/master
Merge: bd91154 9e0f5ac
Author: Xavier Noria 
Date:   2011-12-25 09:42:29 -0800

    Merge pull request #4185 from nashby/module-anonymous
    
    Module#name returns nil for anonymous class in ruby 1.9

commit 9e0f5ac	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-25 20:36:01 +0300

    Module#name returns nil for anonymous class in ruby 1.9

M	activesupport/lib/active_support/core_ext/module/anonymous.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 4cf40d0	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-25 22:11:17 +0530

    add back the version info to the title in guides index page

M	railties/guides/source/_welcome.html.erb

commit bd91154	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-25 22:11:17 +0530

    add back the version info to the title in guides index page

M	railties/guides/source/_welcome.html.erb

commit e3b59c7	refs/heads/master
Merge: b0a4487 8f0d7c8
Author: José Valim 
Date:   2011-12-25 08:06:42 -0800

    Merge pull request #4184 from lest/remove-1-8-code
    
    remove date methods that are present in 1.9 ruby

commit 8f0d7c8	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-25 19:03:24 +0300

    remove date methods that are present in 1.9 ruby

M	activesupport/lib/active_support/core_ext/date/calculations.rb

commit b0a4487	refs/heads/master
Merge: d04428d 434c691
Author: José Valim 
Date:   2011-12-25 07:56:17 -0800

    Merge pull request #4183 from nashby/blockless-step-range
    
    remove useless 1.8 ruby code from Range#step

commit d04428d	refs/heads/master
Merge: 1acdecf 66a587c
Author: José Valim 
Date:   2011-12-25 07:55:24 -0800

    Merge pull request #4182 from bogdan/non_keyed_callbacks
    
    AS::Callbacks: improve __define_runner perfomance for non-keyed callbacks.

commit 434c691	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-25 18:22:54 +0300

    remove useless 1.8 ruby code from Range#step, because Range#step without block always returns enumerator

M	activesupport/lib/active_support/core_ext/range/blockless_step.rb

commit 68564eb	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-25 20:42:20 +0530

    Some fixes in rails guides generation
    
    * Passing edge information to the views fixes the lack of the edge badge
    and sets the appropriate welcome page on edgeguides.rubyonrails.org.
    * Changes in the welcome message to hyper link the rails tree based on
    the version.
    * Mention the Amazon url from where kindlegen can be downloaded.

M	railties/guides/rails_guides/generator.rb
M	railties/guides/source/_welcome.html.erb

commit 1acdecf	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-25 20:42:20 +0530

    Some fixes in rails guides generation
    
    * Passing edge information to the views fixes the lack of the edge badge
    and sets the appropriate welcome page on edgeguides.rubyonrails.org.
    * Changes in the welcome message to hyper link the rails tree based on
    the version.
    * Mention the Amazon url from where kindlegen can be downloaded.

M	railties/guides/rails_guides/generator.rb
M	railties/guides/source/_welcome.html.erb

commit 66a587c	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-12-25 16:44:19 +0200

    AS::Callbacks: improve __define_runner perfomance

M	activesupport/lib/active_support/callbacks.rb

commit 7a3121b	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-25 19:30:06 +0530

    fix kindle apps link in edge guides index

M	railties/guides/source/index.html.erb

commit 51fd3f3	refs/tags/v3.2.0.rc2
Author: Michael Pearson 
Date:   2011-12-26 00:29:37 +1100

    Mip Earson -> Michael Pearson in changelog.

M	railties/CHANGELOG.md

commit 54e522a	refs/heads/master
Merge: ebddca1 2d1cbd0
Author: Vijay Dev 
Date:   2011-12-25 19:33:33 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit ebddca1	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-25 19:30:06 +0530

    fix kindle apps link in edge guides index

M	railties/guides/source/index.html.erb

commit 2d1cbd0	refs/heads/master
Author: Uģis Ozols 
Date:   2011-12-25 15:41:50 +0200

    Clarify what persisted? returns.

M	activerecord/lib/active_record/persistence.rb

commit 34e4a29	refs/heads/master
Merge: 6df5e81 95e10be
Author: Vijay Dev 
Date:   2011-12-25 05:37:22 -0800

    Merge pull request #4181 from mipearson/master
    
    Fix my name in CHANGELOG.md

commit 95e10be	refs/heads/master
Author: Michael Pearson 
Date:   2011-12-26 00:29:37 +1100

    Mip Earson -> Michael Pearson in changelog.

M	railties/CHANGELOG.md

commit e4a1868	refs/heads/master
Author: Uģis Ozols 
Date:   2011-12-25 15:28:25 +0200

    Remove extra 'be'.

M	activerecord/lib/active_record/persistence.rb

commit 6df5e81	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-25 04:19:46 -0800

    fixes credit in changelog entry

M	railties/CHANGELOG.md

commit d4be00c	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-25 04:14:11 -0800

    registers guide generation for the Kindle and Kindle apps in the Changelog

M	railties/CHANGELOG.md

commit 7ec8473	refs/tags/v3.2.0.rc2
Author: Xavier Noria 
Date:   2011-12-25 04:13:28 -0800

    registers guide generation for the Kindle and Kindle apps in the Changelog

M	railties/CHANGELOG.md

commit d6d561e	refs/tags/v3.2.0.rc2
Author: Xavier Noria 
Date:   2011-12-25 04:07:49 -0800

    download guides for the Kindle and Kindle apps from the home page

M	railties/guides/assets/stylesheets/main.css
M	railties/guides/rails_guides/generator.rb
M	railties/guides/source/index.html.erb
M	railties/guides/source/kindle/welcome.html.erb

commit 4ae1cdd	refs/tags/v3.2.0.rc2
Author: Xavier Noria 
Date:   2011-12-25 03:18:18 -0800

    guides generation for the Kindle looking good now [Mip Earson & Xavier Noria]

M	railties/guides/rails_guides/generator.rb

commit 46e2db0	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-25 04:07:49 -0800

    download guides for the Kindle and Kindle apps from the home page

M	railties/guides/assets/stylesheets/main.css
M	railties/guides/rails_guides/generator.rb
M	railties/guides/source/index.html.erb
M	railties/guides/source/kindle/welcome.html.erb

commit 05b8faa	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-25 03:18:18 -0800

    guides generation for the Kindle looking good now [Mip Earson & Xavier Noria]

M	railties/guides/rails_guides/generator.rb

commit 97636d9	refs/heads/master
Merge: 4c1701c 1e9e88f
Author: José Valim 
Date:   2011-12-25 03:40:59 -0800

    Merge pull request #4180 from lest/remove-encoding-related
    
    remove checks for encodings availability

commit 1e9e88f	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-25 14:34:58 +0300

    remove checks for encodings availability

M	actionmailer/test/base_test.rb
M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/controller/send_file_test.rb
M	actionpack/test/controller/test_test.rb
M	actionpack/test/dispatch/request/multipart_params_parsing_test.rb
M	actionpack/test/template/output_buffer_test.rb
M	actionpack/test/template/render_test.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activesupport/lib/active_support/core_ext/string/access.rb
M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/lib/active_support/multibyte/utils.rb
M	activesupport/test/buffered_logger_test.rb
M	activesupport/test/caching_test.rb
M	activesupport/test/json/encoding_test.rb
M	activesupport/test/multibyte_test_helpers.rb
M	railties/test/application/initializers/frameworks_test.rb

commit 4c1701c	refs/heads/master
Merge: 8eb3596 3578372
Author: José Valim 
Date:   2011-12-25 02:07:01 -0800

    Merge pull request #4177 from castlerock/ruby-debug19_with_console
    
    prompt message for gem ruby-debug19 for console error if ruby-debug19 not found

commit 3578372	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-25 15:19:52 +0530

    gem ruby-debug19 for console error if ruby-debug19 not found

M	railties/lib/rails/commands/console.rb

commit 0daf80a	refs/tags/v3.2.0.rc2
Merge: 69cc645 38bc917
Author: Aaron Patterson 
Date:   2011-12-24 20:59:05 -0800

    Merge pull request #4175 from kuroda/3-2-stable
    
    Reconnect to the first database after db:create

commit 38bc917	refs/tags/v3.2.0.rc2
Author: Tsutomu Kuroda 
Date:   2011-12-25 13:15:32 +0900

    Reconnect to the first database after db:create
    
    Otherwise, the schema and seed will be loaded onto the
    test database.

M	activerecord/lib/active_record/railties/databases.rake

commit 69cc645	refs/tags/v3.2.0.rc2
Author: Xavier Noria 
Date:   2011-12-24 17:26:18 -0800

    (draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier Noria]

A	railties/guides/assets/images/rails_guides_kindle_cover.jpg
A	railties/guides/assets/stylesheets/kindle.css
M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/helpers.rb
A	railties/guides/source/_license.html.erb
A	railties/guides/source/_welcome.html.erb
A	railties/guides/source/documents.yaml
M	railties/guides/source/index.html.erb
A	railties/guides/source/kindle/KINDLE.md
A	railties/guides/source/kindle/copyright.html.erb
A	railties/guides/source/kindle/layout.html.erb
A	railties/guides/source/kindle/rails_guides.opf.erb
A	railties/guides/source/kindle/toc.html.erb
A	railties/guides/source/kindle/toc.ncx.erb
A	railties/guides/source/kindle/welcome.html.erb
M	railties/guides/source/layout.html.erb

commit 8eb3596	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-24 17:26:18 -0800

    (draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier Noria]

A	railties/guides/assets/images/rails_guides_kindle_cover.jpg
A	railties/guides/assets/stylesheets/kindle.css
M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/helpers.rb
A	railties/guides/source/_license.html.erb
A	railties/guides/source/_welcome.html.erb
A	railties/guides/source/documents.yaml
M	railties/guides/source/index.html.erb
A	railties/guides/source/kindle/KINDLE.md
A	railties/guides/source/kindle/copyright.html.erb
A	railties/guides/source/kindle/layout.html.erb
A	railties/guides/source/kindle/rails_guides.opf.erb
A	railties/guides/source/kindle/toc.html.erb
A	railties/guides/source/kindle/toc.ncx.erb
A	railties/guides/source/kindle/welcome.html.erb
M	railties/guides/source/layout.html.erb

commit 41e466f	refs/heads/master
Merge: 7c9bcbb daef51e
Author: José Valim 
Date:   2011-12-24 13:12:33 -0800

    Merge pull request #4173 from nashby/remove-time-marshaling-18
    
    remove Time._dump and Time._load patching for ruby 1.8

commit daef51e	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-25 00:09:22 +0300

    remove Time._dump and Time._load patching for ruby 1.8

M	activesupport/lib/active_support/core_ext/time/marshal.rb

commit 7c9bcbb	refs/heads/master
Author: José Valim 
Date:   2011-12-24 22:06:25 +0100

    Use 1.9 hash syntax instead.

M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit bea3524	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-24 21:57:42 +0100

    Last attempt to fix 1.8.7 tests.

M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit b28ed2b	refs/heads/master
Merge: 0d7c375 fdbd677
Author: José Valim 
Date:   2011-12-24 12:48:45 -0800

    Merge pull request #4172 from nashby/refactor-tokenizer
    
    don't call an extra method if options[:tokenizer] is not present

commit fdbd677	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-24 23:40:09 +0300

    don't call an extra method if options[:tokenizer] is not present

M	activemodel/lib/active_model/validations/length.rb

commit 0d7c375	refs/heads/master
Merge: e3daaee 40566dc
Author: José Valim 
Date:   2011-12-24 11:46:41 -0800

    Merge pull request #4170 from lest/remove-deprecated-synchronize
    
    remove deprecated Module#synchronize from ActiveSupport

commit e3daaee	refs/heads/master
Merge: 734ce00 9813c62
Author: Jeremy Kemper 
Date:   2011-12-24 11:46:31 -0800

    Merge pull request #4168 from lest/remove-define-attr-method
    
    remove deprecated define_attr_method from ActiveModel::AttributeMethods

commit 734ce00	refs/heads/master
Merge: cf0fd05 98fb94f
Author: Vijay Dev 
Date:   2011-12-24 11:07:36 -0800

    Merge pull request #4171 from castlerock/remove_deprecated_stuff
    
    remove deprecated whiny nil relates

commit 40566dc	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-24 21:42:43 +0300

    remove deprecated Module#synchronize from ActiveSupport

M	activesupport/lib/active_support/core_ext/module.rb
D	activesupport/lib/active_support/core_ext/module/synchronization.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 98fb94f	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-25 00:09:48 +0530

    remove deprecated whiny nil related code

M	railties/guides/code/getting_started/config/environments/development.rb
M	railties/guides/code/getting_started/config/environments/test.rb

commit 9813c62	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-24 21:26:15 +0300

    remove deprecated define_attr_method from ActiveModel::AttributeMethods

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit a410a9c	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-24 10:43:23 -0700

    avoid deprecation warnings when running AR tests

M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/helper.rb

commit b590fe4	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-24 10:34:54 -0700

    delegating and deprecating logger#silence. fixes #4159

M	activesupport/lib/active_support/core_ext/logger.rb
M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/clean_logger_test.rb

commit cf0fd05	refs/heads/master
Merge: 7a2a661 ee2095e
Author: Jeremy Kemper 
Date:   2011-12-24 08:48:35 -0800

    Merge pull request #4166 from nashby/range-min-max
    
    use Range#min and Range#max to reduce extra statement

commit ee2095e	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-24 19:33:45 +0300

    use Range#min and Range#max to reduce extra statement

M	activemodel/lib/active_model/validations/length.rb

commit 7a2a661	refs/heads/master
Author: José Valim 
Date:   2011-12-24 17:04:32 +0100

    assert_not_match -> assert_no_match.

M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit 0e8cbbe	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-24 17:04:32 +0100

    assert_not_match -> assert_no_match.

M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit 929bfb8	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-24 20:39:10 +0530

    add latest changes to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit bf72297	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-24 20:39:10 +0530

    add latest changes to 3.2 release notes

M	railties/guides/source/3_2_release_notes.textile

commit deb9169	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 14:19:03 +0000

    Intercept sends in Model::DeprecationProxy

M	activerecord/lib/active_record/model.rb
M	activerecord/test/cases/inclusion_test.rb

commit 6696f7e	refs/heads/master
Merge: f5b9aef b340f88
Author: José Valim 
Date:   2011-12-24 05:48:13 -0800

    Merge pull request #4161 from lest/remove-uniq-by-usage
    
    use Array#uniq in AM instead of deprecated Array#uniq_by

commit f5b9aef	refs/heads/master
Merge: a5fa310 5ca86ac
Author: José Valim 
Date:   2011-12-24 05:47:21 -0800

    Merge pull request #4160 from lest/deprecate-encoding-aware
    
    deprecate String#encoding_aware? and remove its usage

commit b340f88	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-24 16:04:41 +0300

    use Array#uniq in AM instead of deprecated Array#uniq_by

M	actionmailer/lib/action_mailer.rb
M	actionmailer/lib/action_mailer/base.rb

commit 5ca86ac	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-24 15:57:54 +0300

    deprecate String#encoding_aware? and remove its usage

M	actionmailer/test/abstract_unit.rb
M	actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
M	actionpack/lib/action_dispatch/http/parameters.rb
M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_view/buffers.rb
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
M	actionpack/test/dispatch/response_test.rb
M	actionpack/test/dispatch/uploaded_file_test.rb
M	actionpack/test/template/javascript_helper_test.rb
M	actionpack/test/template/template_test.rb
M	activemodel/lib/active_model/validations/length.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/lib/active_support/core_ext/string/encoding.rb
M	activesupport/lib/active_support/gzip.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	activesupport/test/gzip_test.rb
M	railties/lib/rails/application/configuration.rb

commit a5fa310	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 12:30:10 +0000

    Fix position of load hook so that Base has been defined and included Model before it runs

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/model.rb

commit 853439c	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-24 17:36:02 +0530

    minor edits in caching guide

M	railties/guides/source/caching_with_rails.textile

commit a8dcc0b	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-24 17:36:02 +0530

    minor edits in caching guide

M	railties/guides/source/caching_with_rails.textile

commit cd2c31a	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-24 15:25:22 +0530

    A few doc changes

M	activesupport/lib/active_support/tagged_logging.rb
M	railties/guides/rails_guides/generator.rb
M	railties/lib/rails/application.rb

commit 8a04bd0	refs/heads/master
Author: José Valim 
Date:   2011-12-24 12:53:27 +0100

    Fix regexp intervals.

M	railties/lib/rails/generators/generated_attribute.rb

commit 1db5f4e	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-24 12:53:27 +0100

    Fix regexp intervals.

M	railties/lib/rails/generators/generated_attribute.rb

commit 00318e9	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 11:28:03 +0000

    Add some doc for ActiveRecord::Model

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/model.rb

commit b236f08	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 11:06:38 +0000

    Add test to ensure AR::Model initialization works correctly

M	activerecord/test/cases/inclusion_test.rb

commit 800f0a6	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 11:02:02 +0000

    Add deprecation for the change to the active_record load hook

M	activerecord/lib/active_record/model.rb
M	activerecord/test/cases/inclusion_test.rb

commit 0e3e34f	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 10:23:19 +0000

    Support nested AR::Models

M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/inclusion_test.rb
M	activerecord/test/models/teapot.rb

commit 15fbf5b	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 00:46:30 +0000

    auto_explain_threshold_in_seconds should be a global config option so it can be shared between AR::Base and AR::Model

M	activerecord/lib/active_record/explain.rb

commit 13945b0	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 00:33:05 +0000

    Don't include anything else if AR::Model has already been included

M	activerecord/lib/active_record/model.rb
M	activerecord/test/cases/inclusion_test.rb

commit 35202aa	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 00:24:49 +0000

    Make PredicateBuilder recognise AR::Model

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/inclusion_test.rb

commit a1ee3ac	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-24 00:15:08 +0000

    Ensure attribute methods are included after all the AR stuff

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/base_test.rb

commit 1029c51	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 23:54:35 +0000

    Fix #exists? for AR::Model

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/inclusion_test.rb

commit 95795bc	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 21:55:05 +0000

    Make generated_feature_methods work with ActiveRecord::Model

M	activerecord/lib/active_record/core.rb
M	activerecord/test/cases/inclusion_test.rb

commit 6498695	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 21:47:58 +0000

    Fixtures support for ActiveRecord::Model

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/inclusion_test.rb
A	activerecord/test/fixtures/teapots.yml
M	activerecord/test/schema/schema.rb

commit ba7ec73	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 21:37:52 +0000

    Deal with global config better between AR::Base and AR::Model

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/base.rb
A	activerecord/lib/active_record/configuration.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
A	activerecord/test/cases/configuration_test.rb
M	activerecord/test/cases/inclusion_test.rb

commit 8c67e70	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 12:52:57 +0000

    Add test for inheritance from a non-AR superclass

M	activerecord/test/cases/inclusion_test.rb
M	activerecord/test/models/teapot.rb

commit 7293cac	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 00:36:54 +0000

    Extract common logic into a method

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb

commit 6af7192	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-18 23:35:25 +0000

    I herd you like modules.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/lib/active_record/core.rb
M	activerecord/lib/active_record/inheritance.rb
M	activerecord/lib/active_record/model.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/connection_specification/resolver_test.rb
A	activerecord/test/cases/inclusion_test.rb
A	activerecord/test/models/teapot.rb
M	activerecord/test/schema/schema.rb

commit b2c9ce3	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-18 21:42:09 +0000

    Start work towards making AR include-able.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/base.rb
A	activerecord/lib/active_record/core.rb
A	activerecord/lib/active_record/model.rb

commit 58f69ba	refs/heads/master
Author: José Valim 
Date:   2011-12-24 11:28:05 +0100

    Remove Rescue middleware that was never used by Rails.

M	actionpack/lib/action_dispatch.rb
D	actionpack/lib/action_dispatch/middleware/rescue.rb
M	actionpack/test/controller/rescue_test.rb

commit f32247c	refs/heads/master
Author: José Valim 
Date:   2011-12-24 10:53:44 +0100

    Update CHANGELOGs

M	actionpack/CHANGELOG.md
M	railties/CHANGELOG.md

commit fc42998	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-24 10:51:47 +0100

    Update CHANGELOGs.

M	actionpack/CHANGELOG.md
M	railties/CHANGELOG.md

commit 557014d	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-24 10:38:19 +0100

    Tidy up migration types.

M	activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	activerecord/lib/rails/generators/active_record/model/model_generator.rb
M	activerecord/lib/rails/generators/active_record/model/templates/migration.rb
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/migration/migration_generator.rb
M	railties/lib/rails/generators/rails/model/model_generator.rb
M	railties/lib/rails/generators/rails/scaffold/USAGE
M	railties/lib/rails/generators/test_case.rb
M	railties/test/generators/generated_attribute_test.rb
M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit 7f5b516	refs/tags/v3.2.0.rc2
Author: Dmitrii Samoilov 
Date:   2011-08-17 12:16:04 +0300

    added ability to specify from cli when generating a model/migration whether particular property should be an index like this 'rails g model person name:string:index profile:string'

M	activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	activerecord/lib/rails/generators/active_record/model/model_generator.rb
M	activerecord/lib/rails/generators/active_record/model/templates/migration.rb
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/migration/migration_generator.rb
M	railties/lib/rails/generators/rails/model/model_generator.rb
M	railties/lib/rails/generators/test_case.rb
M	railties/test/generators/generated_attribute_test.rb
M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit c4ef3d3	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-24 09:59:28 +0100

    Remove unecessary config_accessors.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/caching/pages.rb
M	actionpack/lib/action_controller/metal/helpers.rb

commit ba86892	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-24 09:54:29 +0100

    Provide a class optin for page_cache_compression.

M	actionpack/lib/action_controller/caching/pages.rb
M	actionpack/test/controller/caching_test.rb

commit 754823d	refs/tags/v3.2.0.rc2
Author: Andrey A.I. Sitnik 
Date:   2011-12-23 21:29:49 +0700

    Gzip files on page caching
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/caching/pages.rb
M	actionpack/test/controller/caching_test.rb
M	railties/guides/source/caching_with_rails.textile

commit 0152fe9	refs/heads/master
Merge: 7c42b93 b4e97ea
Author: José Valim 
Date:   2011-12-24 10:40:01 +0100

    Merge branch 'gzip-index' which contains two features:
    
    1) Adding gzip to pages cache, closes #4124
    
    2) Allow scaffold/model/migration generators to accept a "index" and "uniq"
    modifiers, as in: "tracking_id:integer:uniq" in order to generate (unique)
    indexes. Some types also accept custom options, for instance, you can
    specify the precision and scale for decimals as "price:decimal{7,2}".
    This feature closes #2555.

commit b4e97ea	refs/heads/master
Author: José Valim 
Date:   2011-12-24 10:38:19 +0100

    Tidy up migration types.

M	activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	activerecord/lib/rails/generators/active_record/model/model_generator.rb
M	activerecord/lib/rails/generators/active_record/model/templates/migration.rb
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/migration/migration_generator.rb
M	railties/lib/rails/generators/rails/model/model_generator.rb
M	railties/lib/rails/generators/rails/scaffold/USAGE
M	railties/lib/rails/generators/test_case.rb
M	railties/test/generators/generated_attribute_test.rb
M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit d1d3cac	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-24 15:06:31 +0530

    Revert "Changelog release dates fixed according to rubygems.org"
    
    This reverts commit ae60475a41cb0f5b3f7e071b75a0b5c5214c9f85.
    
    Reason: Changelogs are not meant to be edited in docrails.

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	railties/CHANGELOG.md

commit 7a47f36	refs/heads/master
Author: Dmitrii Samoilov 
Date:   2011-08-17 12:16:04 +0300

    added ability to specify from cli when generating a model/migration whether particular property should be an index like this 'rails g model person name:string:index profile:string'

M	activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
M	activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
M	activerecord/lib/rails/generators/active_record/model/model_generator.rb
M	activerecord/lib/rails/generators/active_record/model/templates/migration.rb
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/migration/migration_generator.rb
M	railties/lib/rails/generators/rails/model/model_generator.rb
M	railties/lib/rails/generators/test_case.rb
M	railties/test/generators/generated_attribute_test.rb
M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb

commit e6bfcc2	refs/heads/master
Author: José Valim 
Date:   2011-12-24 09:59:28 +0100

    Remove unecessary config_accessors.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/caching/pages.rb
M	actionpack/lib/action_controller/metal/helpers.rb

commit 39081f1	refs/heads/master
Author: José Valim 
Date:   2011-12-24 09:54:29 +0100

    Provide a class optin for page_cache_compression.

M	actionpack/lib/action_controller/caching/pages.rb
M	actionpack/test/controller/caching_test.rb

commit 7b1ac55	refs/heads/master
Author: Andrey A.I. Sitnik 
Date:   2011-12-23 21:29:49 +0700

    Gzip files on page caching
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/caching/pages.rb
M	actionpack/test/controller/caching_test.rb
M	railties/guides/source/caching_with_rails.textile

commit 7c42b93	refs/heads/master
Merge: 34bbf84 fc57003
Author: José Valim 
Date:   2011-12-24 00:04:43 -0800

    Merge pull request #4149 from castlerock/remove_1.8_stuff
    
    remove ruby 1.8 stuff method skip to support ruby 1.8 series

commit 34bbf84	refs/heads/master
Merge: 9bbe2b8 5f3b9de
Author: José Valim 
Date:   2011-12-24 00:02:05 -0800

    Merge pull request #4147 from lest/remove-app-fallback
    
    remove Rails application fallback from AD::IntegrationTest

commit ae60475	refs/heads/master
Author: Josef Šimánek 
Date:   2011-12-24 02:50:39 +0100

    Changelog release dates fixed according to rubygems.org

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	railties/CHANGELOG.md

commit 9bbe2b8	refs/heads/master
Merge: 547f32f 77ed289
Author: Jeremy Kemper 
Date:   2011-12-23 17:36:13 -0800

    Merge pull request #4156 from nashby/to-sym-ruby-18
    
    remove checking for non-empty string before calling to_sym

commit 547f32f	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-12-23 18:00:01 -0700

    Remove broken #compute_source_path

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 684448b	refs/tags/v3.2.0.rc2
Author: Jeremy Kemper 
Date:   2011-12-23 18:00:01 -0700

    Remove broken #compute_source_path

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit e2b6919	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 23:22:24 +0000

    stop test resetting global state

M	activerecord/test/cases/yaml_serialization_test.rb

commit 77ed289	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-24 01:01:25 +0300

    remove checking for non-empty string before calling to_sym

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit f7669cd	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-24 00:44:23 +0300

    add ability to set a prompt string in include_blank option for date helpers, closes #4143

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 8758156	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-23 13:13:44 -0800

    Final grammar checkup on 3.2 release notes.

M	railties/guides/source/3_2_release_notes.textile

commit 0a2e379	refs/tags/v3.2.0.rc2
Author: Jon Leighton 
Date:   2011-12-23 20:31:24 +0000

    Fix situation where id method didn't get defined causing postgres to fail

M	activerecord/lib/active_record/attribute_methods.rb

commit b87491b	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-23 13:10:52 -0800

    Grammar in 3.2 release notes.

M	railties/guides/source/3_2_release_notes.textile

commit 2315e96	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-23 13:03:21 -0800

    Finished implementation of MIT license linking.

M	README.rdoc
M	actionpack/README.rdoc
M	activemodel/README.rdoc
M	activerecord/README.rdoc
M	activeresource/README.rdoc
M	activesupport/README.rdoc

commit 4d8ee28	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 20:31:24 +0000

    Fix situation where id method didn't get defined causing postgres to fail

M	activerecord/lib/active_record/attribute_methods.rb

commit f8e89b5	refs/heads/master
Author: Brian Browning 
Date:   2011-12-23 21:17:15 +0100

    [docs] make it clear that the methods in a generator are executed sequentially

M	railties/guides/source/generators.textile

commit 5f3b9de	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-23 19:56:49 +0300

    remove Rails application fallback from AD::IntegrationTest
    
    set AD::IntegrationTest.app in railtie initializer

M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	railties/test/application/configuration_test.rb

commit 4a86708	refs/tags/v3.2.0.rc2
Author: Vijay Dev 
Date:   2011-12-24 00:39:56 +0530

    Rails 3.2 Release Notes

A	railties/guides/source/3_2_release_notes.textile

commit 939183a	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2011-12-22 12:30:20 +0530

    [docs] Added missing "}" fixes #4126

M	railties/guides/source/active_record_querying.textile

commit a51c4a3	refs/heads/master
Merge: a805a7f 150217f
Author: Vijay Dev 
Date:   2011-12-24 00:51:27 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	railties/guides/source/active_support_core_extensions.textile

commit a805a7f	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-24 00:39:56 +0530

    Rails 3.2 Release Notes

A	railties/guides/source/3_2_release_notes.textile

commit 131c9ba	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-12-24 00:17:21 +0530

    Moving to logger methods to ActiveSupport Logger

M	actionpack/test/controller/addresses_render_test.rb
M	actionpack/test/controller/base_test.rb
M	actionpack/test/controller/capture_test.rb
M	actionpack/test/controller/render_json_test.rb

commit 8e49eb0	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-12-23 20:44:18 +0530

     change Log

M	railties/CHANGELOG.md

commit 9d9440f	refs/tags/v3.2.0.rc2
Author: Jon Leighton 
Date:   2011-12-23 18:25:22 +0000

    Doh, remove debugging line

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 7677166	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 18:25:22 +0000

    Doh, remove debugging line

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 7bb754e	refs/tags/v3.2.0.rc2
Author: Jon Leighton 
Date:   2011-12-23 18:20:35 +0000

    Fix #4046.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/base_test.rb

commit 6b9ab88	refs/tags/v3.2.0.rc2
Author: Alvaro Bautista 
Date:   2011-12-21 01:10:17 +0100

    serialize fails on subclass

M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/topic.rb
M	activerecord/test/schema/schema.rb

commit fc57003	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-12-23 23:51:01 +0530

    remove ruby 1.8 stuff skip hack from AR

M	activerecord/lib/active_record/test_case.rb

commit f1eb98f	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-23 18:20:35 +0000

    Fix #4046.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/base_test.rb

commit 30ce084	refs/heads/master
Author: Alvaro Bautista 
Date:   2011-12-21 01:10:17 +0100

    serialize fails on subclass

M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/topic.rb
M	activerecord/test/schema/schema.rb

commit 824334c	refs/tags/v3.2.0.rc2
Author: Xavier Noria 
Date:   2011-12-23 09:50:50 +0100

    removes Enumerable#pluck from the AS guide

M	railties/guides/source/active_support_core_extensions.textile

commit a64ab95	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-23 09:42:05 +0100

    removes Enumerable#pluck from the AS guide

M	railties/guides/source/active_support_core_extensions.textile

commit 150217f	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-12-23 10:05:39 +0200

    AM::MAS.attr_protected: rework usage example.

M	activemodel/lib/active_model/mass_assignment_security.rb

commit ac2f68d	refs/heads/master
Merge: 4379c45 014cdb7
Author: Aaron Patterson 
Date:   2011-12-22 23:47:24 -0800

    Merge pull request #4140 from kuroda/databases_rake
    
    Reconnect to the first database after db:create

commit 4379c45	refs/heads/master
Merge: ead2593 1922283
Author: José Valim 
Date:   2011-12-22 23:41:55 -0800

    Merge pull request #4142 from lest/remove-1-8-code
    
    remove Enumerable#each_with_object again

commit 1922283	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-23 10:20:24 +0300

    remove Enumerable#each_with_object again
    
    it come back occasionally in 367741ef

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit 35ded6f	refs/tags/v3.2.0.rc2
Merge: 5f2bfce 96c38ec
Author: José Valim 
Date:   2011-12-22 23:08:19 -0800

    Merge pull request #4141 from arunagw/fix_build
    
    Fix build 3-2-stable

commit 96c38ec	refs/tags/v3.2.0.rc2
Author: Jon Leighton 
Date:   2011-12-22 23:21:38 +0000

    Fix build when IM=true

M	activerecord/lib/active_record/identity_map.rb

commit 014cdb7	refs/heads/master
Author: Tsutomu Kuroda 
Date:   2011-12-23 14:43:47 +0900

    Reconnect to the first database after db:create
    
    Otherwise, the schema and seed will be loaded onto the
    test database.

M	activerecord/lib/active_record/railties/databases.rake

commit 17da024	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-22 21:13:28 -0800

    Added link in MIT license for Action Mailer README. I think this seems appropriate but commentary on this is not a bad idea.

M	actionmailer/README.rdoc

commit 4907f46	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-22 21:12:08 -0800

    Added link to MIT license. Would love commentary on whether this seems appropriate.

M	railties/README.rdoc

commit 2d6d39a	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-22 21:10:01 -0800

    Readability in Action Mailer README.

M	actionmailer/README.rdoc

commit cffb636	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-22 21:03:25 -0800

    Correct grammar on Mailer generator -- passES. Working on enhancing conventional readability in README and USAGE files.

M	actionmailer/lib/rails/generators/mailer/USAGE

commit cc45032	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-23 09:53:21 +0530

    [docs] pluck docs reverted for activesupport
    
    https://github.com/rails/rails/commit/367741ef22d1538b8550cf6e4b2276a0946066c0

M	railties/guides/source/active_support_core_extensions.textile

commit 5f2bfce	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-22 18:52:42 -0700

    adding an integration test for splat regexp substitutions. fixes #4138

M	actionpack/test/controller/routing_test.rb

commit ead2593	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-22 18:52:42 -0700

    adding an integration test for splat regexp substitutions. fixes #4138

M	actionpack/test/controller/routing_test.rb

commit a32d3d0	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-22 18:04:22 -0700

    Adding an integration test.  Fixes #4136

M	actionpack/test/controller/routing_test.rb

commit 4ee537a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-22 18:04:22 -0700

    Adding an integration test.  Fixes #4136

M	actionpack/test/controller/routing_test.rb

commit 967490b	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-22 23:21:38 +0000

    Fix build when IM=true

M	activerecord/lib/active_record/identity_map.rb

commit 13a9efe	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-22 23:04:10 +0000

    Delete unnecessary line that was necessary before I changed the code and it became no longer necessary.

M	activerecord/lib/active_record/relation/calculations.rb

commit f2e65b7	refs/tags/v3.2.0.rc2
Merge: 2bc3f81 6758941
Author: Aaron Patterson 
Date:   2011-12-22 13:11:44 -0700

    Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
    
    * '3-2-stable' of github.com:rails/rails:
      Use sass-rails >= 3.2.2 for new apps
      Make ActiveRecord::Relation#pluck work with serialized attributes
      Make read_attribute code path accessible at the class level

commit d538952	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2011-12-22 13:09:43 -0700

    rack bodies should be a list

M	actionpack/test/controller/routing_test.rb

commit 2bc3f81	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-22 13:09:43 -0700

    rack bodies should be a list

M	actionpack/test/controller/routing_test.rb

commit 3e00e1f	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2011-12-22 12:53:14 -0700

    refactoring routing tests
    
    Conflicts:
    
    	actionpack/test/controller/routing_test.rb

M	actionpack/test/controller/routing_test.rb

commit 6758941	refs/tags/v3.2.0.rc2
Author: Santiago Pastorino 
Date:   2011-12-22 18:05:25 -0200

    Use sass-rails >= 3.2.2 for new apps

M	railties/lib/rails/generators/app_base.rb

commit 585e291	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-22 12:53:14 -0700

    refactoring routing tests

M	actionpack/test/controller/routing_test.rb

commit e46e491	refs/tags/v3.2.0.rc2
Author: Jon Leighton 
Date:   2011-12-22 19:22:59 +0000

    Make ActiveRecord::Relation#pluck work with serialized attributes

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 7edade3	refs/tags/v3.2.0.rc2
Author: Jon Leighton 
Date:   2011-12-22 19:11:11 +0000

    Make read_attribute code path accessible at the class level

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/persistence.rb

commit 89e2647	refs/tags/v3.2.0.rc2
Merge: c0563ce 278a72e
Author: Aaron Patterson 
Date:   2011-12-22 12:21:57 -0700

    Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
    
    * '3-2-stable' of github.com:rails/rails:
      [docs] added missing "}" fixes #4126

commit c0563ce	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-22 12:21:29 -0700

    Revert "Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*"
    
    This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/test/core_ext/enumerable_test.rb

commit 5662ea5	refs/heads/master
Author: Juan M. Cuello 
Date:   2011-12-21 17:00:25 -0300

    Reset postgreSQL search path in db:test:clone_structure.
    
    This patch resets the postgres search path in the structure.sql after
    the structure is dumped in order to find schema_migrations table when
    multiples schemas are used.
    
    Fixes #945

M	activerecord/lib/active_record/railties/databases.rake

commit 278a72e	refs/tags/v3.2.0.rc2
Merge: 1945baf 8dc8926
Author: Piotr Sarnacki 
Date:   2011-12-22 02:03:58 -0800

    Merge pull request #4128 from arunagw/doc_fixes_3_2-stable
    
    Doc fixes 3 2 stable

commit 46ec756	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-12-22 10:57:06 +0200

    Fixed AM::MasAsSec.attr_protected usage example.
    
    Problems with current example:
    
    * DOESN'T WORK
    ** attr_protected :last_login, :as => :admin # doesn't make it accessible for admin
    * Uses ActiveSupport Fixnum extension

M	activemodel/lib/active_model/mass_assignment_security.rb

commit fa5adfb	refs/heads/master
Author: José Valim 
Date:   2011-12-22 09:35:22 +0100

    Update activesupport/lib/active_support.rb

M	activesupport/lib/active_support.rb

commit 24a6609	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-12-22 10:24:20 +0200

    Fix AM::MassAssignementSecurity doc

M	activemodel/lib/active_model/mass_assignment_security.rb

commit 432c366	refs/heads/master
Merge: 667d7aa 4f6af26
Author: José Valim 
Date:   2011-12-21 23:41:18 -0800

    Merge pull request #4121 from lest/remove-whiny-nils
    
    remove AS whiny nil extension and deprecate config.whiny_nils

commit 4f6af26	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-20 22:18:23 +0300

    remove AS whiny nil extension and deprecate config.whiny_nils

M	activesupport/lib/active_support/railtie.rb
D	activesupport/lib/active_support/whiny_nil.rb
D	activesupport/test/whiny_nil_test.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 8dc8926	refs/tags/v3.2.0.rc2
Author: Arun Agrawal 
Date:   2011-12-22 12:36:15 +0530

    [docs] added missing "}" fixes #4126

M	railties/guides/source/active_record_querying.textile

commit 08f3645	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-22 12:30:20 +0530

    [docs] Added missing "}" fixes #4126

M	railties/guides/source/active_record_querying.textile

commit 667d7aa	refs/heads/master
Merge: 401b266 7bfaa97
Author: José Valim 
Date:   2011-12-21 22:10:32 -0800

    Merge pull request #4125 from nashby/remove-process-daemon
    
    remove Proces.daemon from core_ext

commit 7bfaa97	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-22 08:43:42 +0300

    remove Proces.daemon from core_ext

D	activesupport/lib/active_support/core_ext/process.rb
D	activesupport/lib/active_support/core_ext/process/daemon.rb
M	activesupport/lib/active_support/ruby/shim.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 1945baf	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-21 15:03:43 -0700

    just require things once

M	railties/test/application/configuration_test.rb

commit 476dce4	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-21 14:54:39 -0700

    append puts the routes after the default, which causes a 404. instead use prepend

M	railties/test/application/configuration_test.rb

commit 401b266	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 15:03:43 -0700

    just require things once

M	railties/test/application/configuration_test.rb

commit d4a4fcb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 14:54:39 -0700

    append puts the routes after the default, which causes a 404. instead use prepend

M	railties/test/application/configuration_test.rb

commit e68b72d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 14:22:38 -0700

    just use def setup

M	actionpack/test/dispatch/routing_test.rb

commit 3afeb6b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 14:15:13 -0700

    DeprecatedUnderscoreRead does not exist anymore

M	activerecord/lib/active_record.rb

commit 44ff03b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 11:45:41 -0700

    adding integration test for journey #7

M	actionpack/test/controller/routing_test.rb

commit d6d7740	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 11:41:19 -0700

    switch to git journey

M	Gemfile

commit b5bb3f8	refs/tags/v3.2.0.rc2
Author: Lucas Mazza 
Date:   2011-12-21 17:31:53 -0200

    raises an ArgumentError if no valid options are given to TemplateRenderer#determine_template
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/template/render_test.rb

commit 2d07c60	refs/tags/v3.2.0.rc2
Author: Jakub Kuźma 
Date:   2011-12-21 15:28:24 +0100

    added failing tests for has_many, has_one and belongs_to associations with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051
    
    Signed-off-by: José Valim 

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/models/person.rb

commit 1634cfa	refs/heads/master
Merge: 5a4b414 1ad0a53
Author: José Valim 
Date:   2011-12-21 12:16:13 -0800

    Merge pull request #4122 from qoobaa/mass_assignment_with_associated_object
    
    added failing tests for has_many, has_one and belongs_to associations wi...

commit 1ad0a53	refs/heads/master
Author: Jakub Kuźma 
Date:   2011-12-21 15:28:24 +0100

    added failing tests for has_many, has_one and belongs_to associations with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/models/person.rb

commit 108e344	refs/tags/v3.2.0.rc2
Author: Jeremy Kemper 
Date:   2011-12-21 12:43:41 -0700

    Move SubTestTask. Soften up tests.

A	railties/lib/rails/test_unit/sub_test_task.rb
M	railties/lib/rails/test_unit/testing.rake
M	railties/test/application/rake_test.rb

commit 5a4b414	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-12-21 12:43:41 -0700

    Move SubTestTask. Soften up tests.

A	railties/lib/rails/test_unit/sub_test_task.rb
M	railties/lib/rails/test_unit/testing.rake
M	railties/test/application/rake_test.rb

commit a29c681	refs/heads/master
Merge: fccc952 9fbaf9f
Author: José Valim 
Date:   2011-12-21 11:39:39 -0800

    Merge pull request #4119 from lucasmazza/render_without_options
    
    raises an ArgumentError on TemplateRenderer#determine_template

commit 9fbaf9f	refs/heads/master
Author: Lucas Mazza 
Date:   2011-12-21 17:31:53 -0200

    raises an ArgumentError if no valid options are given to TemplateRenderer#determine_template

M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/template/render_test.rb

commit 63a5821	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-21 22:26:45 +0300

    remove status_code from AD::ShowExceptions and useless requires

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/lib/action_view/base.rb

commit fccc952	refs/heads/master
Merge: 1a358e4 f1b4cac
Author: José Valim 
Date:   2011-12-21 11:26:19 -0800

    Merge pull request #4104 from lest/remove-1-8-code
    
    remove Enumerable#each_with_object from core_ext as it is present in ruby 1.9

commit 1a358e4	refs/heads/master
Merge: a03d26e 730209a
Author: José Valim 
Date:   2011-12-21 11:16:42 -0800

    Merge pull request #4109 from Karunakar/test1
    
    Changed the old logger to new active support logger

commit a03d26e	refs/heads/master
Merge: abdb105 9add760
Author: José Valim 
Date:   2011-12-21 11:14:38 -0800

    Merge pull request #4116 from lest/remove-deprecated
    
    remove deprecated set and original methods for table_name, primary_key, etc

commit 9add760	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-21 22:00:55 +0300

    remove deprecated set and original methods for table_name, primary_key, etc

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/locking_test.rb

commit abdb105	refs/heads/master
Merge: fa3b9fa 0fdf029
Author: Aaron Patterson 
Date:   2011-12-21 10:56:43 -0800

    Merge pull request #4115 from Karunakar/action_pack
    
    Action pack logger methods changed to active supoort Logger methods

commit 0fdf029	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-12-22 00:19:25 +0530

    Action pack logger methodschanged to active supoort Logger methods

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/lib/action_dispatch/middleware/params_parser.rb

commit d5ccb5c	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-21 11:45:41 -0700

    adding integration test for journey #7

M	actionpack/test/controller/routing_test.rb

commit 79778ff	refs/tags/v3.2.0.rc2
Author: Aaron Patterson 
Date:   2011-12-21 10:43:54 -0700

    caches should not be global, so no need to clear in the teardown

M	actionpack/test/controller/routing_test.rb

commit fa3b9fa	refs/heads/master
Merge: 52c214f 9f7d3c5
Author: Jon Leighton 
Date:   2011-12-21 10:32:07 -0800

    Merge pull request #4110 from lest/remove-deprecated-underscore-read
    
    remove deprecated underscore versions of attribute methods

commit 9f7d3c5	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-21 20:44:16 +0300

    remove deprecated underscore versions of attribute methods

M	activerecord/lib/active_record/attribute_methods.rb
D	activerecord/lib/active_record/attribute_methods/deprecated_underscore_read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 52c214f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 10:43:54 -0700

    caches should not be global, so no need to clear in the teardown

M	actionpack/test/controller/routing_test.rb

commit 12ce9a2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-21 10:39:23 -0700

    removing deprecated methods

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 78ea731	refs/heads/master
Merge: 4f629ed ba7ef53
Author: Aaron Patterson 
Date:   2011-12-21 09:33:03 -0800

    Merge pull request #4097 from guilleiguaran/safebuffer-html-escape
    
    We don't need a special html_escape for 1.8 anymore

commit 730209a	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-12-21 22:40:20 +0530

    Changed the old logger to new active support logger

M	activerecord/test/support/connection.rb

commit e854848	refs/tags/v3.2.0.rc2
Author: Jeremy Kemper 
Date:   2011-12-21 08:15:36 -0700

    Rails::SubTestTask warns on test failure and moves on. Renamed from TestTaskWithoutDescription.
    
    This makes it easier to add your own tests to the default suite:
    
      namespace :test do
        task run: 'test:acceptance'
    
        Rails::SubTestTask.new acceptance: 'test:prepare' do |t|
          t.libs << 'test'
          t.pattern = 'test/acceptance/**/*_test.rb'
        end
      end
    
    Now `rake` runs unit, functional, integration, and acceptance tests.

M	railties/lib/rails/test_unit/testing.rake

commit 4f629ed	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-12-21 10:10:35 -0700

    Restore `rake TEST=test/unit/foo_test.rb` support.
    
    Add your own test tasks as dependencies on the `test:run` task instead of `test` itself.
    
      namespace :test do
        task run: 'test:acceptance'
    
        Rails::SubTestTask.new acceptance: 'test:prepare' do |t|
          t.libs << 'test'
          t.pattern = 'test/acceptance/**/*_test.rb'
        end
      end

M	railties/lib/rails/test_unit/testing.rake

commit 14c89e7	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-12-21 08:15:36 -0700

    Rails::SubTestTask warns on test failure and moves on. Renamed from TestTaskWithoutDescription.
    
    This makes it easier to add your own tests to the default suite:
    
      task test: 'test:acceptance'
    
      namespace :test do
        Rails::SubTestTask.new acceptance: 'test:prepare' do |t|
          t.libs << 'test'
          t.pattern = 'test/acceptance/**/*_test.rb'
        end
      end
    
    Now `rake` runs unit, functional, integration, and acceptance tests.

M	railties/lib/rails/test_unit/testing.rake

commit efb75f7	refs/tags/v3.2.0.rc2
Author: Hendy Tanata 
Date:   2011-12-21 00:56:49 -0800

    Doc fixes on Rails::Generators::Base.hook_for.

M	railties/lib/rails/generators/base.rb

commit c1b2642	refs/heads/master
Merge: 1989dac fc7e5db
Author: Vijay Dev 
Date:   2011-12-21 22:26:10 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 1989dac	refs/heads/master
Merge: 63c71f8 a3c1dc2
Author: Vijay Dev 
Date:   2011-12-21 08:46:36 -0800

    Merge pull request #4102 from arunagw/warning_removed_actionpack
    
    warning removed

commit 63c71f8	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-21 22:12:25 +0530

    sync AS guide with the Ruby 1.9 related deletions in master

M	railties/guides/source/active_support_core_extensions.textile

commit e52572a	refs/heads/master
Merge: 707eed7 4a57d1b
Author: Piotr Sarnacki 
Date:   2011-12-21 08:24:23 -0800

    Merge pull request #4105 from lest/bad-requires
    
    remove requires of core_ext/array/random_access that no longer exists

commit 4a57d1b	refs/heads/master
Author: lest 
Date:   2011-12-21 19:19:19 +0300

    remove requires of core_ext/array/random_access that no longer exists

M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit f1b4cac	refs/heads/master
Author: lest 
Date:   2011-12-21 19:07:00 +0300

    remove Enumerable#each_with_object from core_ext as it is present in ruby 1.9

M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/ruby/shim.rb
M	activesupport/test/core_ext/enumerable_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 707eed7	refs/heads/master
Merge: 2e9eb0a a57c644
Author: José Valim 
Date:   2011-12-21 07:56:05 -0800

    Merge pull request #4103 from lest/remove-1-8-code
    
    remove Kernel#singleton_class from core_ext as it is present in ruby 1.9

commit a57c644	refs/heads/master
Author: lest 
Date:   2011-12-21 18:53:38 +0300

    remove Kernel#singleton_class from core_ext as it is present in ruby 1.9

M	activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
M	activesupport/test/core_ext/kernel_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit a3c1dc2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 21:21:39 +0530

    removed warning "warning: ambiguous first argument; put parentheses or even spaces"

M	actionpack/test/dispatch/request_id_test.rb

commit 2e9eb0a	refs/heads/master
Merge: 2ba3d13 c52ce1d
Author: José Valim 
Date:   2011-12-21 07:47:49 -0800

    Merge pull request #4101 from nashby/ruby-18-cleaning
    
    remove Array#sample from core_ext

commit 2ba3d13	refs/heads/master
Merge: 987ca2a 127d2c8
Author: José Valim 
Date:   2011-12-21 06:46:01 -0800

    Merge pull request #4094 from lest/remove-1-8-code
    
    remove check for string from request body setter

commit 987ca2a	refs/heads/master
Merge: e56043e ed1b4ea
Author: José Valim 
Date:   2011-12-21 06:36:14 -0800

    Merge pull request #4098 from Karunakar/active_model2
    
    removed  deprecated loggers

commit c52ce1d	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-21 17:31:40 +0300

    remove Array#sample from core_ext

M	activesupport/lib/active_support/core_ext/array.rb
D	activesupport/lib/active_support/core_ext/array/random_access.rb
M	activesupport/test/core_ext/array_ext_test.rb

commit e56043e	refs/heads/master
Merge: 618cb44 9f44e27
Author: José Valim 
Date:   2011-12-21 06:29:19 -0800

    Merge pull request #4100 from simi/master
    
    rails version order in railties changelog

commit 9f44e27	refs/heads/master
Author: Josef Šimánek 
Date:   2011-12-21 15:12:50 +0100

    rails version order fixed and formatted in railties changelog

M	railties/CHANGELOG.md

commit ed1b4ea	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-12-21 19:42:44 +0530

    Changed the require path for logger

M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb

commit f7d3db7	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-12-21 19:30:45 +0530

    removed  deprecated loggers

M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb

commit ba7ef53	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-12-21 08:34:25 -0500

    We don't need a special html_escape for 1.8 anymore

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 618cb44	refs/heads/master
Merge: 1f75a1f 3131a93
Author: José Valim 
Date:   2011-12-21 05:14:26 -0800

    Merge pull request #4079 from drogus/http_digest_issue
    
    Fix http digest authentication when url ends with `/` or `?`

commit 1f75a1f	refs/heads/master
Merge: 893d38d 0f510e9
Author: José Valim 
Date:   2011-12-21 05:12:24 -0800

    Merge pull request #4095 from arunagw/using_uuid
    
    Using uuid which is supported in 1.9

commit 0f510e9	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 17:55:57 +0530

    Using uuid which is supported in 1.9
    
    Orignal commit #ada78066fdbccffb1da092a2470211fa252b3c99

M	actionpack/lib/action_dispatch/middleware/request_id.rb
M	actionpack/test/dispatch/request_id_test.rb

commit 127d2c8	refs/heads/master
Author: lest 
Date:   2011-12-21 15:03:35 +0300

    remove check for string from request body setter
    
    it was required on ruby 1.8

M	actionpack/lib/action_dispatch/http/response.rb

commit 893d38d	refs/heads/master
Merge: 28e869d e3c383c
Author: José Valim 
Date:   2011-12-21 03:21:49 -0800

    Merge pull request #4093 from arunagw/issue_3183
    
    More tests deep including through habtm

commit e3c383c	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 16:16:55 +0530

    More tests deep including through habtm
    
    fixes #3183

M	activerecord/test/cases/associations/eager_test.rb

commit 28e869d	refs/heads/master
Merge: 5591965 7276fc6
Author: José Valim 
Date:   2011-12-21 02:35:22 -0800

    Merge pull request #4090 from arunagw/more_more_more_187_removal
    
    Removed test which works only < 1.9

commit 7276fc6	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 15:39:50 +0530

    'with_kcode' removed.
    
    Testing Sandbox removed.

D	actionpack/test/lib/testing_sandbox.rb
M	actionpack/test/template/output_safety_helper_test.rb
M	actionpack/test/template/sanitize_helper_test.rb
M	actionpack/test/template/text_helper_test.rb
M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/validations/association_validation_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit de78c7e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 14:18:23 +0530

    Removed test which works only < 1.9

M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/pooled_connections_test.rb

commit 5591965	refs/heads/master
Merge: 08dcd84 0fe311a
Author: José Valim 
Date:   2011-12-21 02:04:24 -0800

    Merge pull request #4092 from qoobaa/other_than_numericality_validator
    
    added :other_than => :!= option to numericality validator

commit 0fe311a	refs/heads/master
Author: Jakub Kuźma 
Date:   2011-12-21 10:52:15 +0100

    added :other_than => :!= option to numericality validator

M	activemodel/lib/active_model/locale/en.yml
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/test/cases/validations/numericality_validation_test.rb

commit 08dcd84	refs/heads/master
Merge: afea8c7 5594387
Author: José Valim 
Date:   2011-12-21 01:47:17 -0800

    Merge pull request #4089 from lest/remove-1-8-code
    
    remove dead code as ruby 1.9.3 has Base64 module

commit fc7e5db	refs/heads/master
Author: Hendy Tanata 
Date:   2011-12-21 00:56:49 -0800

    Doc fixes on Rails::Generators::Base.hook_for.

M	railties/lib/rails/generators/base.rb

commit 5594387	refs/heads/master
Author: lest 
Date:   2011-12-21 11:48:46 +0300

    remove dead code as ruby 1.9.3 has Base64 module

M	activesupport/lib/active_support/base64.rb

commit afea8c7	refs/heads/master
Merge: 49f08bb b7cfd09
Author: José Valim 
Date:   2011-12-21 00:32:31 -0800

    Merge pull request #4076 from lest/remove-1-8-code
    
    remove support for ruby 1.8 in AS String extensions

commit b7cfd09	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-20 22:01:32 +0300

    remove support for ruby 1.8 in AS String extensions

M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/lib/active_support/core_ext/string/conversions.rb

commit 49f08bb	refs/heads/master
Merge: b0011dc b74f5b7
Author: José Valim 
Date:   2011-12-21 00:12:28 -0800

    Merge pull request #4088 from rahul100885/rahul100885_work
    
    Remove unused conditions for 1.9

commit b74f5b7	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2011-12-21 13:34:54 +0530

    Remove unused conditions for 1.9

M	actionpack/test/controller/test_test.rb
M	actionpack/test/template/capture_helper_test.rb
M	actionpack/test/template/text_helper_test.rb

commit b0011dc	refs/heads/master
Merge: 8e749cd ee69ef6
Author: José Valim 
Date:   2011-12-20 23:51:21 -0800

    Merge pull request #4086 from ugisozols/master
    
    Remove some of the ActiveSupport core extensions related to 1.8.

commit ee69ef6	refs/heads/master
Author: Uģis Ozols 
Date:   2011-12-21 09:25:29 +0200

    Remove some of the ActiveSupport core extensions related to 1.8.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/template/resolver.rb
D	activesupport/lib/active_support/core_ext/date/freeze.rb
D	activesupport/lib/active_support/core_ext/float.rb
D	activesupport/lib/active_support/core_ext/float/rounding.rb
D	activesupport/lib/active_support/core_ext/io.rb
M	activesupport/lib/active_support/time.rb
D	activesupport/test/core_ext/float_ext_test.rb
D	activesupport/test/core_ext/io_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 8e749cd	refs/heads/master
Merge: e591686 b4073c9
Author: José Valim 
Date:   2011-12-20 23:08:28 -0800

    Merge pull request #4085 from arunagw/more_1_8_7_removal
    
    No Ruby 1.8 stuff. No more checks in code.

commit e591686	refs/heads/master
Merge: d2abe28 e883c06
Author: José Valim 
Date:   2011-12-20 23:07:12 -0800

    Merge pull request #4071 from rahul100885/rahul100885_work
    
    Updated gemspec for ruby 1.9.3

commit b4073c9	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 12:20:12 +0530

    No Ruby 1.8 stuff. No more checks in code.

M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/base_test.rb

commit e883c06	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2011-12-20 23:43:23 +0530

    Updated gemspec for ruby 1.9.3

M	actionmailer/actionmailer.gemspec
M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activerecord/activerecord.gemspec
M	activeresource/activeresource.gemspec
M	activesupport/activesupport.gemspec
M	rails.gemspec
M	railties/railties.gemspec

commit 040b794	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2011-12-19 13:34:54 -0800

    adding tests for #4029

M	actionpack/test/controller/routing_test.rb
M	actionpack/test/dispatch/mount_test.rb

commit 3131a93	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-20 21:01:47 +0100

    Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228)

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_digest_authentication_test.rb

commit 80ab9e2	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-20 20:34:04 +0100

    Add original_fullpath and original_url methods to Request

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/test/dispatch/request_test.rb

commit 482ec2a	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-20 20:17:17 +0100

    Add ORIGINAL_FULLPATH to env
    
    This behaves similarly to REQUEST_URI, but
    we need to implement it on our own because
    REQUEST_URI is not reliable.
    
    Note that since PATH_INFO does not contain
    information about trailing question mark,
    this is not 100% accurate, for example
    `/foo?` will result in `/foo` in ORIGINAL_FULLPATH

M	railties/lib/rails/application.rb
A	railties/test/application/build_original_fullpath_test.rb
M	railties/test/application/middleware_test.rb

commit d2abe28	refs/heads/master
Author: Brian Rose 
Date:   2011-12-20 13:38:16 -0700

    Check for response to `#last` instead of `#first`.
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 55334f5	refs/heads/master
Author: Brian Rose 
Date:   2011-12-20 13:19:55 -0700

    Ensure option for select helper responds to `#first` before comparison.
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit a2f5df5	refs/tags/v3.2.0.rc2
Merge: cf2d31a a1b2dbd
Author: José Valim 
Date:   2011-12-20 13:48:34 -0800

    Merge pull request #4080 from heimidal/3-2-stable
    
    Fix regression in select form helper when options are non-string values

commit a1b2dbd	refs/tags/v3.2.0.rc2
Author: Brian Rose 
Date:   2011-12-20 13:38:16 -0700

    Check for response to `#last` instead of `#first`.

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit bd89946	refs/tags/v3.2.0.rc2
Author: Brian Rose 
Date:   2011-12-20 13:19:55 -0700

    Ensure option for select helper responds to `#first` before comparison.

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 0d7ca94	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-20 14:03:45 -0600

    skip hstore tests on PG databases that do not have hstore

M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit a8b948d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-20 13:59:08 -0600

    do not compile regexp on every call

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 66d8620	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-20 13:56:42 -0600

    making sure updates work

M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 8daaff5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-20 13:54:10 -0600

    hstores can cycle

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 96838b5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-20 11:18:36 -0800

    can create hstore records via AR API

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 135b3a0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-19 21:19:09 -0800

    multiple key / values work

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 776af48	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-19 21:16:23 -0800

    PostgreSQL hstore types are automatically deserialized from the database.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 8cb7bc8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-19 20:51:16 -0800

    pg columns should understand the hstore type

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
A	activerecord/test/cases/adapters/postgresql/hstore_test.rb

commit 635080f	refs/heads/master
Merge: d4f5398 c056787
Author: José Valim 
Date:   2011-12-20 11:34:12 -0800

    Merge pull request #4078 from Karunakar/fix_failing_test
    
    remove more uses of deprecated loggers

commit d4f5398	refs/heads/master
Merge: b31c2ed ec26dd0
Author: Piotr Sarnacki 
Date:   2011-12-20 11:30:36 -0800

    Merge pull request #4077 from arunagw/gemfile_update
    
    No need to check here now for < 1.9.3

commit c056787	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-12-21 00:57:30 +0530

    remove more uses of deprecated loggers

M	activerecord/test/cases/base_test.rb

commit ec26dd0	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 00:47:48 +0530

    No need to check here now for < 1.9.3

M	Gemfile

commit b31c2ed	refs/heads/master
Merge: cc19290 c01124e
Author: José Valim 
Date:   2011-12-20 11:10:48 -0800

    Merge pull request #4075 from arunagw/activeresource_dead_code_removal
    
    Removal dead code from my side :-)

commit cc19290	refs/heads/master
Merge: 7b32677 c7a485a
Author: Piotr Sarnacki 
Date:   2011-12-20 11:01:17 -0800

    Merge pull request #4063 from andrew/patch-1
    
    Added Capistrano to the development group in Gemfile

commit 2ddedac	refs/tags/v3.1.6
Merge: 5ca308b 41803b2
Author: Santiago Pastorino 
Date:   2011-12-20 10:57:25 -0800

    Merge pull request #4074 from arunagw/doc_fix
    
    doc:rails fixed

commit 7b32677	refs/heads/master
Merge: 9bcd52f 568777b
Author: Santiago Pastorino 
Date:   2011-12-20 10:57:17 -0800

    Merge pull request #4073 from arunagw/doc_rake_fix_master
    
    It should be README.rdoc fixes #4067

commit c01124e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-21 00:09:47 +0530

    Removal dead code from my side :-)

M	activeresource/lib/active_resource/base.rb

commit c7a485a	refs/heads/master
Author: Andrew Nesbitt 
Date:   2011-12-20 18:32:01 +0000

    Added Capistrano to the development group in Gemfile
    
    There's no need for Capistrano to be install on a server, the extra argument in the comment implies this now.

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 568777b	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-20 23:55:57 +0530

    It should be README.rdoc fixes #4067

M	railties/lib/rails/tasks/documentation.rake

commit 41803b2	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2011-12-20 23:54:07 +0530

    It should be README.rdoc fixes #4067

M	railties/lib/rails/tasks/documentation.rake

commit 9bcd52f	refs/heads/master
Merge: 10a5497 e7d827e
Author: José Valim 
Date:   2011-12-20 10:18:49 -0800

    Merge pull request #4070 from lest/remove-require-enumerator
    
    requiring enumerator is not nessessary in ruby 1.9

commit cf2d31a	refs/tags/v3.2.0.rc2
Merge: 437f1e0 490c00b
Author: Santiago Pastorino 
Date:   2011-12-20 10:17:40 -0800

    Merge pull request #4069 from arunagw/issue_4067
    
    It should be README.rdoc

commit e7d827e	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-20 21:14:57 +0300

    requiring enumerator is not nessessary in ruby 1.9

M	activesupport/lib/active_support/core_ext/array/grouping.rb

commit 10a5497	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-20 23:44:33 +0530

    NullStore cache belongs in Active Support

M	activerecord/CHANGELOG.md
M	activesupport/CHANGELOG.md

commit 490c00b	refs/tags/v3.2.0.rc2
Author: Arun Agrawal 
Date:   2011-12-20 23:36:03 +0530

    It should be README.rdoc fixes #4067

M	railties/lib/rails/tasks/documentation.rake

commit 5ca308b	refs/tags/v3.1.6
Merge: c4b13a7 d545642
Author: José Valim 
Date:   2011-12-20 09:52:59 -0800

    Merge pull request #4065 from guilleiguaran/fix-railties-tests
    
    Fix railties tests: I broke development.rb template during last merge

commit 226b4ae	refs/heads/master
Merge: 3ef20aa 11b67b3
Author: Vijay Dev 
Date:   2011-12-20 09:49:24 -0800

    Merge pull request #4061 from indrekj/action-mailer-18n-subject-comments
    
    fix default_i18n_subject comment in ActionMailer::Base

commit d545642	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2011-12-20 12:48:43 -0500

    Fix railties tests: I broke development.rb template during last merge

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit 437f1e0	refs/tags/v3.2.0.rc2
Merge: fec2999 9208813
Author: José Valim 
Date:   2011-12-20 09:43:58 -0800

    Merge pull request #4064 from nashby/date-helper-field-error-proc
    
    fix adding field_with_errors to date selects, closes #3487

commit 3ef20aa	refs/heads/master
Merge: 7ba28d4 e2d19d6
Author: Aaron Patterson 
Date:   2011-12-20 09:42:17 -0800

    Merge pull request #4035 from lest/date-type-cast
    
    handle not only strings in date type cast

commit 7ba28d4	refs/heads/master
Author: José Valim 
Date:   2011-12-20 18:33:28 +0100

    Remove dead code from AMo.

M	activemodel/lib/active_model/test_case.rb
M	activemodel/test/cases/validations/length_validation_test.rb

commit fb1c06a	refs/heads/master
Author: José Valim 
Date:   2011-12-20 18:31:13 +0100

    Remove more dead code from AS.

M	activesupport/lib/active_support/core_ext/module/qualified_const.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/multibyte_chars_test.rb
M	activesupport/test/multibyte_utils_test.rb

commit 6bb4ad3	refs/heads/master
Merge: 7ab4775 9208813
Author: José Valim 
Date:   2011-12-20 09:36:02 -0800

    Merge pull request #4033 from nashby/date-helper-field-error-proc
    
    add failing tests for issue #3487

commit 1bc6467	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-20 23:04:11 +0530

    [docs] Ruby upgrade

M	railties/guides/source/command_line.textile

commit ff573c4	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-20 23:03:07 +0530

    4.0.0.beta now :-)

M	railties/guides/source/command_line.textile

commit 9208813	refs/tags/v3.2.0.rc2
Author: Vasiliy Ermolovich 
Date:   2011-12-20 20:25:56 +0300

    fix adding field_with_errors to date selects, closes #3487

M	actionpack/lib/action_view/helpers/active_model_helper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb

commit 7ab4775	refs/heads/master
Author: José Valim 
Date:   2011-12-20 18:22:21 +0100

    Initial pass at removing dead 1.8.x code from Active Support.
    
    There are a bunch of other implicit branches that adds
    1.8.x specific code that still needs to be removed. Pull
    requests for those cases are welcome.

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/date/conversions.rb
M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/date_time/conversions.rb
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/exception.rb
M	activesupport/lib/active_support/core_ext/module/introspection.rb
M	activesupport/lib/active_support/core_ext/object/instance_variables.rb
M	activesupport/lib/active_support/core_ext/range.rb
D	activesupport/lib/active_support/core_ext/range/cover.rb
M	activesupport/lib/active_support/core_ext/string/encoding.rb
M	activesupport/lib/active_support/core_ext/string/multibyte.rb
M	activesupport/lib/active_support/core_ext/uri.rb
M	activesupport/lib/active_support/multibyte/chars.rb
M	activesupport/lib/active_support/ordered_hash.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
D	activesupport/lib/active_support/testing/performance/ruby/mri.rb
M	activesupport/test/abstract_unit.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	activesupport/test/core_ext/range_ext_test.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb
M	activesupport/test/json/encoding_test.rb
M	activesupport/test/multibyte_chars_test.rb
M	activesupport/test/multibyte_utils_test.rb
M	activesupport/test/ordered_hash_test.rb

commit 53c1ae9	refs/heads/master
Author: Jarrod Carlson 
Date:   2011-10-05 00:18:37 -0400

    Added failing test to demonstrate digest authentication failure

M	actionpack/test/controller/http_digest_authentication_test.rb

commit 51095be	refs/heads/master
Author: José Valim 
Date:   2011-12-20 17:58:45 +0100

    Get rid of more 1.8.x dead code

M	railties/lib/rails.rb
M	railties/lib/rails/commands/plugin.rb
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/test/application/configuration_test.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/mailer_generator_test.rb
M	railties/test/generators/namespaced_generators_test.rb
M	railties/test/railties/generators_test.rb

commit 2d5f5c3	refs/heads/master
Author: José Valim 
Date:   2011-12-20 17:53:21 +0100

    This test is rubbish.

D	railties/test/application/initializers/check_ruby_version_test.rb

commit 9cf38be	refs/heads/master
Author: José Valim 
Date:   2011-12-20 17:51:26 +0100

    Get rid of --old-style-hash

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/mailer_generator_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb

commit fec2999	refs/tags/v3.2.0.rc2
Author: Alex Tambellini 
Date:   2011-12-19 11:41:52 -0500

    Fix reference to old :sql schema_format location
    
    After 15fb430 the default location of the :sql schema_format location was
    changed from environment_name.sql to structure.sql. This pull request updates
    a reference to the old schema format location in the migration guides.

M	railties/guides/source/migrations.textile

commit e149d50	refs/tags/v3.2.0.rc2
Author: Hendy Tanata 
Date:   2011-12-18 00:52:22 -0800

    Improve doc for ActiveRecord::Base.unscoped.

M	activerecord/lib/active_record/scoping/default.rb

commit 500ca98	refs/heads/master
Merge: 4fa615a e52786c
Author: Vijay Dev 
Date:   2011-12-20 22:18:42 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit e52786c	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-20 22:15:45 +0530

    remove unnecessary link. This is already mentioned in section 3 of the guide

M	railties/guides/source/getting_started.textile

commit f4ab16c	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-20 22:10:02 +0530

    Revert "Fixed some grammatical errors in raw_email_with_invalid_characters_in_content_type. Picky, I know."
    
    This reverts commit 30aa4e6c3b33d93c6b1a000685d6d97d51f7ab68.
    
    Reason: docrails doesn't allow changing code. As much as this is a plain
    text file, I would still like to enforce the policy strictly.

M	actionmailer/test/fixtures/raw_email_with_invalid_characters_in_content_type

commit 51e8adb	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-20 17:15:53 +0100

    Depend on 3-2-stable.

M	railties/lib/rails/generators/app_base.rb

commit 0ae4231	refs/heads/master
Author: Mikhail Dieterle 
Date:   2011-12-21 00:12:38 +0800

    wrong link markup

M	railties/guides/source/getting_started.textile

commit 11b67b3	refs/heads/master
Author: Indrek Juhkam 
Date:   2011-12-20 18:09:17 +0200

    fix default_i18n_subject comment in ActionMailer::Base

M	actionmailer/lib/action_mailer/base.rb

commit 173eaca	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-20 08:08:27 -0800

    adds deprecation warnings to the RDoc of Array#uniq_by(!)

M	activesupport/lib/active_support/core_ext/array/uniq_by.rb

commit 737960d	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-20 07:55:10 -0800

    removes some unnecessary selfs

M	activerecord/lib/active_record/persistence.rb

commit 3f92e5e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-22 13:09:43 -0700

    rack bodies should be a list

M	actionpack/test/controller/routing_test.rb

commit de6e92f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-22 12:53:14 -0700

    refactoring routing tests

M	actionpack/test/controller/routing_test.rb

commit 62456a3	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-22 19:42:11 +0000

    Remove 1.8 backport

M	activerecord/lib/active_record/base.rb

commit 1a18198	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-23 01:08:53 +0530

    remove conflict marker

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit 16dbe1d	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-22 19:22:59 +0000

    Make ActiveRecord::Relation#pluck work with serialized attributes

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit c1d3e66	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-22 19:11:11 +0000

    Make read_attribute code path accessible at the class level

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/persistence.rb

commit 367741e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-22 12:21:18 -0700

    Revert "Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*"
    
    This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943.
    
    Conflicts:
    
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/core_ext/enumerable.rb
    	activesupport/test/core_ext/enumerable_test.rb

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/test/core_ext/enumerable_test.rb

commit 2adc145	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-12-22 10:55:38 -0700

    Depend on 4.0.0.beta gems. Use https for github urls.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/shared_generator_tests.rb

commit e003baf	refs/heads/master
Merge: 6def76d c4df2d0
Author: José Valim 
Date:   2011-12-22 09:22:32 -0800

    Merge pull request #4135 from nashby/deprecate-uniq-by
    
    deprecate Array#uniq_by and Array#uniq_by!

commit 6def76d	refs/heads/master
Merge: 91681c2 9d97173
Author: José Valim 
Date:   2011-12-22 09:20:18 -0800

    Merge pull request #4133 from lest/remove-1-8-code
    
    no more need to make Time#to_date and Time#to_datetime public

commit 91681c2	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-22 17:04:01 +0000

    Revert "Merge pull request #4114 from alexeymuranov/my_fix_for_prefix_suffix_fixtures_test"
    
    This reverts commit f8e484d0f71114675ed04e987914d3f2815cb868, reversing
    changes made to fa5adfb1e884bf21a7071ade634a820e37ac4db4.
    
    Reason: broke the postgres tests.

M	activerecord/test/cases/fixtures_test.rb
D	activerecord/test/fixtures/other_topics.yml

commit c4df2d0	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-12-22 19:30:10 +0300

    deprecate Array#uniq_by and Array#uniq_by! in favor of Array#uniq and Array#uniq! from ruby 1.9

M	activesupport/lib/active_support/core_ext/array/uniq_by.rb
M	activesupport/test/core_ext/array_ext_test.rb

commit f8e484d	refs/heads/master
Merge: fa5adfb adb917a
Author: Jon Leighton 
Date:   2011-12-22 08:21:05 -0800

    Merge pull request #4114 from alexeymuranov/my_fix_for_prefix_suffix_fixtures_test
    
    Fix a fixtures test case with table prefix/suffix

commit 9d97173	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-22 18:53:04 +0300

    no more need to make Time#to_date and Time#to_datetime public
    
    they are public in actual 1.9 ruby version (tested at least in 1.9.2-p180)

M	activesupport/lib/active_support/core_ext/string/conversions.rb
M	activesupport/lib/active_support/core_ext/time/conversions.rb
D	activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb
M	activesupport/lib/active_support/time.rb

commit adb917a	refs/heads/master
Author: Alexey Muranov 
Date:   2011-12-19 16:07:02 +0100

    Fix a fixtures test case with table prefix/suffix
    
    Make sure the table name of a model is reset in a test case after assigning ActiveRecord::Base.table_name_prefix and ActiveRecord::Base.table_name_suffix.  This was somebody else's test case, so an independent opinion on the change can be helpful.

M	activerecord/test/cases/fixtures_test.rb
A	activerecord/test/fixtures/other_topics.yml

commit 4fa615a	refs/heads/master
Author: José Valim 
Date:   2011-12-20 16:53:44 +0100

    Update ruby_version_check.

M	.travis.yml
M	railties/lib/rails/ruby_version_check.rb

commit 632fa15	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-12-20 09:30:37 -0600

    rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit c4b13a7	refs/tags/v3.1.6
Merge: 0479789 c32be81
Author: José Valim 
Date:   2011-12-20 07:23:06 -0800

    Merge pull request #4058 from guilleiguaran/asset-pipeline-fixes
    
    Backport multiple fixes for asset pipeline from master to 3-1-stable

commit df28b80	refs/heads/master
Merge: 6a6fc4e 22cb97b
Author: José Valim 
Date:   2011-12-20 07:22:26 -0800

    Merge pull request #4057 from joliss/gitignore
    
    Add db/*.sqlite3-journal to .gitignore

commit c32be81	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2011-12-09 21:52:10 -0500

    Skip assets groups if --skip-sprockets option is given
    
    Conflicts:
    
    	railties/test/generators/app_generator_test.rb

M	railties/lib/rails/generators/app_base.rb

commit 169137f	refs/tags/v3.1.6
Author: Piotr Sarnacki 
Date:   2011-12-11 00:03:24 +0100

    Clarify the default assets.precompile matcher behavior

M	railties/guides/source/asset_pipeline.textile

commit d7fbd63	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2011-12-10 18:07:13 -0500

    Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361.
    
    Is wrong use ProcessedAsset#to_s since it returns the content of the file.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 80c0517	refs/tags/v3.1.6
Author: Piotr Sarnacki 
Date:   2011-12-11 00:12:09 +0100

    Ensure that files that compile to js/css are not compiled by default with `rake assets:precompile`
    
    This case was not tested and documentation was a bit confusing
    on that topic, so it was not obvious if current code
    works properly or not.

M	railties/test/application/assets_test.rb

commit 47bef33	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2011-12-11 08:48:58 -0500

    Skip assets options in environments files when --skip-sprockets is used
    
    Conflicts:
    
    	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
    	railties/test/generators/app_generator_test.rb

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/generators/app_generator_test.rb

commit 22cb97b	refs/heads/master
Author: Jo Liss 
Date:   2011-12-20 16:08:01 +0100

    Add db/*.sqlite3-journal to .gitignore
    
    These can pop up while the SQLite DB is being written to.

M	railties/lib/rails/generators/rails/app/templates/gitignore
M	railties/lib/rails/generators/rails/plugin_new/templates/gitignore

commit 6a6fc4e	refs/heads/master
Author: José Valim 
Date:   2011-12-20 15:18:42 +0100

    Remove deprecations from Active Support.

M	activesupport/lib/active_support.rb
M	activesupport/lib/active_support/concern.rb
D	activesupport/lib/active_support/memoizable.rb
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
D	activesupport/test/flush_cache_on_private_memoization_test.rb
D	activesupport/test/memoizable_test.rb
M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/message_verifier_test.rb

commit 6c57177	refs/heads/master
Author: José Valim 
Date:   2011-12-20 15:12:38 +0100

    Remove deprecation warnings from Action Pack.

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/lib/action_dispatch/routing/redirection.rb
D	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/render_test.rb

commit f29b4a0	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-20 14:56:18 +0100

    Add a test case for layout nil.

M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/test/abstract/layouts_test.rb

commit cae1768	refs/heads/master
Author: José Valim 
Date:   2011-12-20 14:44:48 +0100

    Remove deprecated layout lookup.

M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/test/abstract/layouts_test.rb

commit e97aa2c	refs/tags/v3.2.0.rc2
Author: lest 
Date:   2011-12-20 15:37:20 +0300

    remove warnings about @variable_for_layout
    
    Signed-off-by: José Valim 

M	actionpack/test/controller/render_test.rb

commit 9f3f2b2	refs/heads/master
Merge: 45e85c3 c3c1ff4
Author: José Valim 
Date:   2011-12-20 05:11:06 -0800

    Merge pull request #4052 from lest/warning-variable-for-layout
    
    remove warnings about @variable_for_layout

commit c3c1ff4	refs/heads/master
Author: lest 
Date:   2011-12-20 15:37:20 +0300

    remove warnings about @variable_for_layout

M	actionpack/test/controller/render_test.rb

commit ce650ee	refs/tags/v3.0.14
Merge: b7e45c3 ab05e2b
Author: Santiago Pastorino 
Date:   2011-12-20 03:54:50 -0800

    Merge pull request #4031 from arunagw/3-0-stable
    
    3 0 stable travis sync

commit 45e85c3	refs/heads/master
Author: José Valim 
Date:   2011-12-20 12:39:28 +0100

    Check if source is encoding aware.

M	actionpack/lib/action_view/template.rb

commit 2305a98	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-20 12:39:28 +0100

    Check if source is encoding aware.

M	actionpack/lib/action_view/template.rb

commit 2e0050c	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-20 11:06:37 +0100

    Do not hard code encoding to UTF8

M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/error.rb

commit 1897be9	refs/tags/v3.2.0.rc2
Author: Xu Pan 
Date:   2011-12-20 12:33:34 +0800

    don't encode an UTF-8 encoded template
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/template/error.rb
M	railties/test/application/middleware/exceptions_test.rb

commit 5d91364	refs/tags/v3.2.0.rc2
Author: José Valim 
Date:   2011-12-20 08:51:56 +0100

    Remove i18n dependencies from AP and AMo since they are in AS.

M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec

commit 19292a7	refs/heads/master
Author: José Valim 
Date:   2011-12-20 11:06:37 +0100

    Do not hard code encoding to UTF8

M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/error.rb

commit fde9af0	refs/heads/master
Merge: 23f6cab 10304a2
Author: José Valim 
Date:   2011-12-20 01:58:01 -0800

    Merge pull request #4043 from cqpx/master
    
    don't encode an UTF-8 encoded template

commit 23f6cab	refs/heads/master
Author: José Valim 
Date:   2011-12-20 08:51:56 +0100

    Remove i18n dependencies from AP and AMo since they are in AS.

M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec

commit bb106e9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-19 21:05:28 -0800

    remove more uses of deprecated logger methods

M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/cases/log_subscriber_test.rb

commit 10304a2	refs/heads/master
Author: Xu Pan 
Date:   2011-12-20 12:33:34 +0800

    don't encode an UTF-8 encoded template

M	actionpack/lib/action_view/template/error.rb
M	railties/test/application/middleware/exceptions_test.rb

commit a514469	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-19 20:26:37 -0800

    Revert "Update .travis.yml"
    
    This reverts commit ce0cf7d6fbb39a22a0563934abd8c02ff50dd14c.

M	.travis.yml

commit dcbbfd7	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-19 20:06:12 -0800

    Revert "Updated RUNNING_UNIT_TESTS"
    cp is not a valid command in DOS systems.
    This reverts commit 7d11c12958acf28ffb27d7e11a9c7f5b1418e77f.

M	activerecord/RUNNING_UNIT_TESTS

commit 7d11c12	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-19 19:40:06 -0800

    Updated RUNNING_UNIT_TESTS

M	activerecord/RUNNING_UNIT_TESTS

commit ce0cf7d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-12-19 22:22:37 -0500

    Update .travis.yml

M	.travis.yml

commit 572c3d5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-19 18:41:37 -0800

    * BufferedLogger is deprecated.  Use ActiveSupport::Logger, or the logger
      from Ruby stdlib.

M	actionpack/lib/abstract_controller/logger.rb
M	activerecord/lib/active_record/fixtures.rb
M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support.rb
M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/lib/active_support/core_ext.rb
M	activesupport/lib/active_support/core_ext/logger.rb
M	activesupport/lib/active_support/log_subscriber/test_helper.rb
A	activesupport/lib/active_support/logger.rb
M	activesupport/test/benchmarkable_test.rb
M	activesupport/test/buffered_logger_test.rb
M	activesupport/test/clean_logger_test.rb
M	activesupport/test/tagged_logging_test.rb
M	railties/lib/rails.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/performance_test_help.rb
M	railties/test/abstract_unit.rb

commit 9d6e52b	refs/tags/v3.2.0.rc1 (tag: v3.2.0.rc1)
Author: David Heinemeier Hansson 
Date:   2011-12-19 18:34:57 -0600

    Party like its R-C-UNO!

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 1e941dd	refs/tags/v3.2.0.rc1
Author: David Heinemeier Hansson 
Date:   2011-12-19 18:27:19 -0600

    Add an invitation to use jbuilder, since we are not going to bundle it in 3.2

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 61d0de2	refs/tags/v3.2.0.rc1
Merge: 9d0789c 626c881
Author: Piotr Sarnacki 
Date:   2011-12-19 13:44:24 -0800

    Merge pull request #4036 from Juanmcuello/database_tasks
    
    Fix database tasks in test namespace.

commit 9d0789c	refs/tags/v3.2.0.rc1
Author: Aaron Patterson 
Date:   2011-12-19 13:34:54 -0800

    adding tests for #4029

M	actionpack/test/controller/routing_test.rb
M	actionpack/test/dispatch/mount_test.rb

commit 626c881	refs/tags/v3.2.0.rc1
Author: Juan M. Cuello 
Date:   2011-12-12 15:44:16 -0300

    Fix database tasks in test namespace.
    
    This is mostly the same as 876bade5999c51f5031861f703933d50e48512ff
    that was reverted due to test failures, but now with a correction.

M	activerecord/lib/active_record/railties/databases.rake

commit e2d19d6	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-19 23:41:09 +0300

    handle not only strings in date type cast

M	activerecord/lib/active_record/connection_adapters/column.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit c86359a	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-19 11:53:33 -0800

    Removed period in comment regarding Levenshtein Wikipedia article to make a valid URL.

M	railties/guides/rails_guides/levenshtein.rb

commit 30aa4e6	refs/heads/master
Author: Kristian Freeman 
Date:   2011-12-19 11:48:20 -0800

    Fixed some grammatical errors in raw_email_with_invalid_characters_in_content_type. Picky, I know.

M	actionmailer/test/fixtures/raw_email_with_invalid_characters_in_content_type

commit 024d3b9	refs/tags/v3.2.0.rc2
Author: Vasiliy Ermolovich 
Date:   2011-12-19 21:55:37 +0300

    add failing tests for issue #3487

M	actionpack/test/template/active_model_helper_test.rb

commit 3c1884e	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-19 19:31:36 +0100

    Revert "Merge pull request #4030 from Juanmcuello/database_tasks"
    
    This reverts commit a0edfb4d204857f0885784bd12582ae526af43c3, reversing
    changes made to 4012fcff22e4fe7833aae53b98e3ca9acfe3d3ad.

M	activerecord/lib/active_record/railties/databases.rake

commit ab05e2b	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-12-18 23:37:05 +0000

    Don't notify campfire when the build keeps passing

M	.travis.yml

commit 0479789	refs/tags/v3.1.6
Merge: 9f7fe5d b9aabc7
Author: Santiago Pastorino 
Date:   2011-12-19 09:52:24 -0800

    Merge pull request #4025 from arunagw/travis_sync
    
    Travis sync

commit a0edfb4	refs/tags/v3.2.0.rc1
Merge: 4012fcf 876bade
Author: José Valim 
Date:   2011-12-19 09:43:37 -0800

    Merge pull request #4030 from Juanmcuello/database_tasks
    
    Fix database tasks in test namespace.

commit 2aedb20	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2011-12-20 01:35:43 +0800

    Fix syntax error in rdocs.
    Ruby assumes curly braces in foo {} as a block, for hash we need to put parentheses or omit braces

M	activesupport/lib/active_support/testing/assertions.rb

commit 876bade	refs/tags/v3.2.0.rc1
Author: Juan M. Cuello 
Date:   2011-12-12 15:44:16 -0300

    Fix database tasks in test namespace.

M	activerecord/lib/active_record/railties/databases.rake

commit ff15c87	refs/heads/master
Author: Alex Tambellini 
Date:   2011-12-19 11:41:52 -0500

    Fix reference to old :sql schema_format location
    
    After 15fb430 the default location of the :sql schema_format location was
    changed from environment_name.sql to structure.sql. This pull request updates
    a reference to the old schema format location in the migration guides.

M	railties/guides/source/migrations.textile

commit b9aabc7	refs/tags/v3.1.6
Author: Jon Leighton 
Date:   2011-12-18 23:37:05 +0000

    Don't notify campfire when the build keeps passing

M	.travis.yml

commit 4012fcf	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-18 23:37:05 +0000

    Don't notify campfire when the build keeps passing

M	.travis.yml

commit c59409b	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-19 01:31:12 +0530

    fix a minor typo

M	activerecord/lib/active_record/railties/databases.rake

commit e8d6943	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-18 20:56:59 +0100

    Update activerecord/lib/active_record/railties/databases.rake

M	activerecord/lib/active_record/railties/databases.rake

commit 81deb34	refs/tags/v3.2.0.rc1
Merge: de2306f a2249ee
Author: José Valim 
Date:   2011-12-18 11:54:11 -0800

    Merge pull request #4019 from kommen/rake_db_structure
    
    Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump

commit a2249ee	refs/tags/v3.2.0.rc1
Author: Dieter Komendera 
Date:   2011-12-18 20:43:36 +0100

    Rename STRUCTURE to DB_STRUCTURE, update dump task description and add simple testcase.

M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake_test.rb

commit b7e45c3	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-12-18 18:01:10 +0000

    Prefix newly added method to avoid breakings people's apps.
    
    See
    https://github.com/rails/rails/commit/378ce0e89c498e2844aef0b184c4fe8610d53b72
    
    Fixes #3921.

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association_proxy.rb

commit 9f7fe5d	refs/tags/v3.1.6
Author: Sergey Nartimov 
Date:   2011-12-18 20:42:17 +0300

    backport call scope within unscoped to prevent duplication of where values

M	activerecord/lib/active_record/named_scope.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/topic.rb

commit de2306f	refs/tags/v3.2.0.rc1
Merge: 81c67c1 109db5a
Author: Jon Leighton 
Date:   2011-12-18 09:42:15 -0800

    Merge pull request #4014 from lest/bypass-preloading-for-ids-reader
    
    bypass preloading for ids_reader

commit 81c67c1	refs/tags/v3.2.0.rc1
Merge: 1214e16 04cea56
Author: Jon Leighton 
Date:   2011-12-18 09:35:06 -0800

    Merge pull request #4011 from lest/scope-with-lambda-duplicates
    
    call scope within unscoped to prevent duplication of where values

commit aa0286e	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-18 19:36:32 +0530

    Revert "Update master changelogs with rails 3.0-stable branch info"
    
    This reverts commit 2bc8e5713764b2276036fecfd7f297132597fddb.
    
    Reason: Changelogs are not meant to be changed in docrails.

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 2bc8e57	refs/heads/master
Author: Paco Guzman 
Date:   2011-12-18 11:17:13 +0100

    Update master changelogs with rails 3.0-stable branch info

M	actionmailer/CHANGELOG.md
M	actionpack/CHANGELOG.md
M	activemodel/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	activeresource/CHANGELOG.md
M	activesupport/CHANGELOG.md
M	railties/CHANGELOG.md

commit 5fe5eff	refs/heads/master
Author: Hendy Tanata 
Date:   2011-12-18 00:52:22 -0800

    Improve doc for ActiveRecord::Base.unscoped.

M	activerecord/lib/active_record/scoping/default.rb

commit 1214e16	refs/tags/v3.2.0.rc1
Merge: 5da7927 ff502d9
Author: José Valim 
Date:   2011-12-18 00:09:52 -0800

    Merge pull request #4018 from arunagw/warning_removed_
    
    Warning removed in test

commit ff502d9	refs/tags/v3.2.0.rc1
Author: Arun Agrawal 
Date:   2011-12-18 13:37:07 +0530

    Warning removed in test

M	railties/test/generators/app_generator_test.rb

commit 109db5a	refs/tags/v3.2.0.rc1
Author: Sergey Nartimov 
Date:   2011-12-17 19:50:47 +0300

    bypass preloading for ids_reader
    
    when fetching ids for a collection, bypass preloading
    to avoid the unnecessary performance overhead

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 5da7927	refs/tags/v3.2.0.rc1
Merge: fe72f7d 1e50af9
Author: José Valim 
Date:   2011-12-17 23:56:25 -0800

    Merge pull request #4017 from arunagw/remove_extra_require
    
    No need 'abstract_unit' here. It's already in 'generators_test_helper'

commit 1e50af9	refs/tags/v3.2.0.rc1
Author: Arun Agrawal 
Date:   2011-12-18 13:23:54 +0530

    No need 'abstract_unit' here. It's already in 'generators_test_helper'

M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit fe72f7d	refs/tags/v3.2.0.rc1
Merge: d2951eb 5e68fed
Author: Piotr Sarnacki 
Date:   2011-12-17 14:05:26 -0800

    Merge pull request #4009 from kirs/generate-rake-task
    
    Rake tasks generator

commit d2951eb	refs/tags/v3.2.0.rc1
Merge: 7bde2e2 921dcc2
Author: José Valim 
Date:   2011-12-17 12:42:21 -0800

    Merge pull request #4015 from schneems/schneems/routing_error_help
    
    Add Help Text to Routing Error

commit 921dcc2	refs/tags/v3.2.0.rc1
Author: schneems 
Date:   2011-12-17 14:23:40 -0600

    add help text to routing error
    
    When a newcomer hits the routing error page they
    are often confused about how to trouble shoot the
    next step. Adding a simple help text can gently
    remind coders where to get more help.

M	actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb

commit ad9a0e3	refs/tags/v3.0.14
Author: José Valim 
Date:   2011-12-17 17:44:42 +0100

    Update .travis.yml

M	.travis.yml

commit 10c8e8d	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-12-17 13:08:51 -0200

    Sync .travis.yml with master

M	.travis.yml

commit 2f7e701	refs/tags/v3.1.6
Author: Santiago Pastorino 
Date:   2011-12-17 13:05:14 -0200

    Add campfire notifications for travis

M	.travis.yml

commit 7bde2e2	refs/tags/v3.2.0.rc1
Author: Santiago Pastorino 
Date:   2011-12-17 13:05:14 -0200

    Add campfire notifications for travis

M	.travis.yml

commit 9412130	refs/tags/v3.2.0.rc1
Merge: 8de9694 27f3619
Author: José Valim 
Date:   2011-12-17 05:58:18 -0800

    Merge pull request #4012 from JustinCampbell/master
    
    Allow symbols to be passed as extension aliases in Mime::Type.register

commit 27f3619	refs/tags/v3.2.0.rc1
Author: Justin Campbell 
Date:   2011-12-17 07:52:42 -0500

    Add test for register_alias

M	actionpack/test/dispatch/mime_type_test.rb

commit 5e68fed	refs/tags/v3.2.0.rc1
Author: Kir 
Date:   2011-12-13 15:06:36 +0400

    Rake tasks generator with test

A	railties/lib/rails/generators/rails/task/USAGE
A	railties/lib/rails/generators/rails/task/task_generator.rb
A	railties/lib/rails/generators/rails/task/templates/task.rb
A	railties/test/generators/task_generator_test.rb

commit a87690b	refs/tags/v3.2.0.rc1
Author: Justin Campbell 
Date:   2011-12-17 07:40:54 -0500

    Add test for type aliases

M	actionpack/test/dispatch/mime_type_test.rb

commit 4d5266e	refs/tags/v3.2.0.rc1
Author: Justin Campbell 
Date:   2011-12-17 07:39:52 -0500

    Allow symbols to be passed for extension aliases

M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/test/dispatch/mime_type_test.rb

commit 8de9694	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-17 12:51:38 +0100

    Use gem versions of sass-rails and coffee-rails.

M	railties/lib/rails/generators/app_base.rb

commit 04cea56	refs/tags/v3.2.0.rc1
Author: Sergey Nartimov 
Date:   2011-12-17 14:41:17 +0300

    call scope within unscoped to prevent duplication of where values

M	activerecord/lib/active_record/scoping/named.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/topic.rb

commit 1bfed9e	refs/tags/v3.2.0.rc1
Merge: 3346de6 4fac64b
Author: José Valim 
Date:   2011-12-17 03:23:15 -0800

    Merge pull request #4010 from arunagw/fix_test_activemodel
    
    Fixed test "ArgumentError: wrong number of arguments(1 for 0)"

commit 4fac64b	refs/tags/v3.2.0.rc1
Author: Arun Agrawal 
Date:   2011-12-17 16:47:51 +0530

    Fixed test "ArgumentError: wrong number of arguments(1 for 0)"

M	activemodel/test/cases/validations/validates_test.rb

commit 3346de6	refs/tags/v3.2.0.rc1
Merge: 4f35d5a 23334be
Author: José Valim 
Date:   2011-12-16 22:57:02 -0800

    Merge pull request #4008 from arunagw/warning_variable_for_layout
    
    warning removed "warning: instance variable @variable_for_layout not ini...

commit 23334be	refs/tags/v3.2.0.rc1
Author: Arun Agrawal 
Date:   2011-12-17 12:00:28 +0530

    warning removed "warning: instance variable @variable_for_layout not initialized"

M	actionpack/test/controller/action_pack_assertions_test.rb

commit 4f35d5a	refs/tags/v3.2.0.rc1
Merge: 0065f37 abe915f
Author: José Valim 
Date:   2011-12-16 14:40:09 -0800

    Merge pull request #4007 from exviva/expand_cache_key_for_one_element_array
    
    Fix expanding cache key for single element arrays

commit 0065f37	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-16 12:12:05 -0800

    AS::Concern is not really needed for AR::Explain

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/explain.rb
M	activerecord/lib/active_record/relation.rb

commit 05316ba	refs/tags/v3.2.0.rc1
Merge: 5f6bcd7 66e747b
Author: José Valim 
Date:   2011-12-16 11:24:45 -0800

    Merge pull request #4006 from devton/validation_error_on_message_is_empty_part_2
    
    Fixed bug when error message is an empty string.

commit 66e747b	refs/tags/v3.2.0.rc1
Author: Antonio Roberto 
Date:   2011-12-16 17:17:14 -0200

    Fixed bug when error message is an empty string.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/validations/validates_test.rb

commit 5f6bcd7	refs/tags/v3.2.0.rc1
Merge: bd84b2b 9d77956
Author: Vijay Dev 
Date:   2011-12-16 11:13:39 -0800

    Merge pull request #3780 from marcbowes/master
    
    Fix favicon_link_tag help text

commit bd84b2b	refs/heads/master
Merge: f307f4d bdcc271
Author: Vijay Dev 
Date:   2011-12-16 23:34:00 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit abe915f	refs/tags/v3.2.0.rc1
Author: Olek Janiszewski 
Date:   2011-12-16 17:58:22 +0100

    Fix expanding cache key for single element arrays
    
    In short:
    expand_cache_key(element) should not equal expand_cache_key([element])
    
    This way a fragment cache key for an index page with only a single
    element in the collection is different than a fragment cache for a
    typical show page for that element.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit aa92d37	refs/tags/v3.2.0.rc1
Author: Dieter Komendera 
Date:   2011-12-16 15:59:19 +0100

    Make structure file configureable in db:structure:dump analog to SCHEMA in db:schema dump and clean up a bit.

M	activerecord/lib/active_record/railties/databases.rake

commit f307f4d	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-16 14:52:02 +0000

    Delete obsolete comment

M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb

commit eba5818	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-16 14:51:22 +0000

    Fix the build on postgres. Note: we should probably actually make schema mutations bust the cache.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb

commit 7b1eeea	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-16 13:51:46 +0000

    Should clear the primary keys cache also

M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/test/cases/connection_adapters/schema_cache_test.rb

commit 7f20bb9	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-16 13:07:10 +0000

    Don't store defaults in the schema cache

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/connection_adapters/schema_cache_test.rb

commit dee94d8	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-16 12:00:25 +0000

    Defaults hash can go on the model

M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/lib/active_record/model_schema.rb

commit 0b08ff7	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-16 11:46:34 +0000

    Cache columns at the model level.
    
    Allows two models to use the same table but have different primary keys.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/lib/active_record/model_schema.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/connection_adapters/schema_cache_test.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 4fe76f4	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 13:22:06 +0100

    Wait a full second so we have time for changes to propagate

M	railties/test/application/initializers/i18n_test.rb

commit dbe28f3	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 11:43:29 +0100

    Fix failing asset test.

M	railties/test/application/assets_test.rb

commit 6481bc5	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 10:45:25 +0100

    Update CHANGELOGs and guides.

M	actionpack/CHANGELOG.md
M	railties/CHANGELOG.md
M	railties/guides/source/configuring.textile

commit 654df86	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 10:38:17 +0100

    Show detailed exceptions no longer returns true if the request is local in production.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/rescue.rb
M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/show_exceptions_test.rb
M	railties/test/application/middleware/exceptions_test.rb

commit 192e55c	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 10:29:45 +0100

    Do not raise an exception if an invalid route was generated automatically.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb
M	activerecord/lib/active_record/relation/delegation.rb

commit 5359262	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 09:59:36 +0100

    ShowExceptions should understand X-Cascade responses from exceptions app.

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/lib/action_dispatch/middleware/public_exceptions.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit 7dd1c75	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 09:45:14 +0100

    Improve the specs on exceptions app.

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	railties/test/application/middleware/exceptions_test.rb

commit 02127e6	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 09:41:05 +0100

    Allow a custom exceptions app to set.

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/middleware/exceptions_test.rb

commit deef8dd	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 09:29:37 +0100

    Extract the rendering of public exceptions pages into a Rack app.

M	actionpack/lib/action_dispatch.rb
A	actionpack/lib/action_dispatch/middleware/public_exceptions.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/controller/show_exceptions_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	railties/lib/rails/application.rb

commit d142572	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-16 09:06:30 +0100

    Get rid of the close checks since we cannot reliably close the session anyway.

M	actionpack/lib/action_dispatch.rb
D	actionpack/lib/action_dispatch/middleware/closed_error.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/test/controller/flash_test.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 8015f90	refs/tags/v3.2.0.rc1
Merge: dbfc6b8 aa39149
Author: Piotr Sarnacki 
Date:   2011-12-16 00:45:20 -0800

    Merge pull request #4002 from arunagw/warning_removed_grouped_expression
    
    Warning removed "warning: (...) interpreted as grouped expression"

commit aa39149	refs/tags/v3.2.0.rc1
Author: Arun Agrawal 
Date:   2011-12-16 10:30:20 +0530

    Warning removed "warning: (...) interpreted as grouped expression"

M	actionpack/test/dispatch/debug_exceptions_test.rb

commit dbfc6b8	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-15 15:22:14 -0800

    removes Ruby constraint in RedCloth dependency

M	Gemfile

commit 5e0dec5	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-15 12:56:00 -0800

    it's -> its

M	actionpack/test/controller/default_url_options_with_filter_test.rb

commit 2b22564	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-15 20:35:04 +0000

    Move DefaultScope and NamedScope under Scoping

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/base.rb
D	activerecord/lib/active_record/default_scope.rb
D	activerecord/lib/active_record/named_scope.rb
M	activerecord/lib/active_record/scoping.rb
A	activerecord/lib/active_record/scoping/default.rb
A	activerecord/lib/active_record/scoping/named.rb

commit 17ad71e	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-15 20:21:05 +0000

    Let AttributeMethods do its own including etc

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/attribute_methods/read_test.rb

commit ceb33f8	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-15 20:07:41 +0000

    Split out most of the AR::Base code into separate modules :cake:

M	activerecord/lib/active_record.rb
A	activerecord/lib/active_record/attribute_assignment.rb
M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/base.rb
A	activerecord/lib/active_record/default_scope.rb
A	activerecord/lib/active_record/dynamic_matchers.rb
M	activerecord/lib/active_record/explain.rb
A	activerecord/lib/active_record/inheritance.rb
A	activerecord/lib/active_record/integration.rb
A	activerecord/lib/active_record/model_schema.rb
M	activerecord/lib/active_record/persistence.rb
A	activerecord/lib/active_record/querying.rb
A	activerecord/lib/active_record/readonly_attributes.rb
M	activerecord/lib/active_record/relation.rb
A	activerecord/lib/active_record/sanitization.rb
A	activerecord/lib/active_record/scoping.rb
A	activerecord/lib/active_record/translation.rb
M	activerecord/test/cases/base_test.rb

commit 8854bf2	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-15 20:59:05 +0100

    Set up delegations also for to_a and arel branches.

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/delegation.rb

commit b17bc58	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-15 20:46:30 +0100

    Move delegation reponsibilities of Relation to a module. Also precompile method missing calls for rofscale.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/relation.rb
A	activerecord/lib/active_record/relation/delegation.rb

commit 1e8b751	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-15 20:26:33 +0100

    Make with_scope public so we stop using send :bomb:

M	activerecord/examples/performance.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation.rb

commit 22bd21d	refs/tags/v3.2.0.rc1
Merge: 1af2a1d 4baf145
Author: Xavier Noria 
Date:   2011-12-15 11:09:30 -0800

    Merge pull request #3998 from rafacv/master
    
    Small typo in Rails::Engine documentation

commit 4baf145	refs/tags/v3.2.0.rc1
Author: Rafael Valverde 
Date:   2011-12-15 17:03:19 -0200

    Fixed small typo in the Rails::Engine documentation.

M	railties/lib/rails/engine.rb

commit 1af2a1d	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-15 20:01:56 +0100

    Improve delegate list to avoid method missing.

M	activerecord/lib/active_record/relation.rb

commit 26e7400	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-15 19:43:49 +0100

    Fix diagnostics page for routing errors.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/rescue.rb
M	actionpack/lib/action_controller/railtie.rb
M	actionpack/test/controller/show_exceptions_test.rb
M	railties/lib/rails/application.rb
M	railties/test/application/middleware/exceptions_test.rb

commit 283a087	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-15 18:48:10 +0100

    Clean up the cache before the request in case we are running in the reload_classes_only_on_change schema.

M	activerecord/lib/active_record/railtie.rb
M	railties/lib/rails/application/finisher.rb
M	railties/test/application/console_test.rb
M	railties/test/application/loading_test.rb
M	railties/test/application/rake/migrations_test.rb

commit de947c6	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-15 14:47:22 +0100

    There isn't a column_hash. It was being invoked by method missing.

M	activerecord/lib/active_record/relation.rb

commit df932c4	refs/tags/v3.1.6
Author: Jon Leighton 
Date:   2011-12-15 13:23:18 +0000

    Fix #3987.
    
    Conflicts:
    
    	activerecord/lib/active_record/attribute_methods/primary_key.rb
    	activerecord/test/cases/primary_keys_test.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 8dba32f	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-15 13:23:18 +0000

    Fix #3987.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/primary_keys_test.rb

commit d7e714a	refs/tags/v3.2.0.rc1
Merge: 0ddb9d6 54f60c1
Author: José Valim 
Date:   2011-12-15 04:56:10 -0800

    Merge pull request #3994 from whilefalse/sass_cache_gitignore
    
    Added .sass-cache/ directory to the genrated gitignore in engines.

commit 0ddb9d6	refs/tags/v3.2.0.rc1
Merge: ad87752 774ff18
Author: Jon Leighton 
Date:   2011-12-15 04:50:13 -0800

    Merge pull request #3991 from akaspick/attrfix
    
    Allow nested attributes in associations to update values in it's owner o...

commit 54f60c1	refs/tags/v3.2.0.rc1
Author: Steven Anderson 
Date:   2011-12-15 12:38:52 +0000

    Added .sass-cache/ directory to the genrated gitignore in engines.

M	railties/lib/rails/generators/rails/plugin_new/templates/gitignore

commit bdcc271	refs/heads/master
Merge: dcd59f2 9e39dc4
Author: Alexander 
Date:   2011-12-15 00:16:43 -0800

    Merge pull request #74 from abonec/master
    
    Fixed typo in comments

commit ad87752	refs/tags/v3.2.0.rc1
Merge: e938247 8d82732
Author: José Valim 
Date:   2011-12-14 21:10:47 -0800

    Merge pull request #3990 from ugisozols/master
    
    Remove autoload for non-existent file

commit 8d82732	refs/tags/v3.2.0.rc1
Author: Uģis Ozols 
Date:   2011-12-15 06:52:05 +0200

    Remove autoload for non-existent file.

M	actionpack/lib/action_dispatch/routing.rb

commit e938247	refs/tags/v3.2.0.rc1
Author: Aaron Patterson 
Date:   2011-12-14 19:09:31 -0800

    seed file was already tested for existence. ಠ_ಠ

M	railties/lib/rails/engine.rb

commit 774ff18	refs/tags/v3.2.0.rc1
Author: Andrew Kaspick 
Date:   2011-12-14 20:13:03 -0600

    Allow nested attributes in associations to update values in it's owner object.  Fixes a regression from 3.0.x

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/models/bird.rb

commit 60a91f1	refs/tags/v3.1.6
Author: Xavier Noria 
Date:   2011-12-14 22:23:17 +0100

    let sdoc say which version of rdoc we depend on
    
    Conflicts:
    
    	Gemfile

M	Gemfile

commit dcd59f2	refs/heads/master
Author: Nick Howard 
Date:   2011-12-14 15:38:15 -0700

    escape assigns[:person], assigns[person] etc in actioncontroller testcase

M	actionpack/lib/action_controller/test_case.rb

commit b6105b0	refs/tags/v3.2.0.rc1
Author: Aaron Patterson 
Date:   2011-12-14 13:26:41 -0800

    updating arel and journey dependencies

M	Gemfile
M	actionpack/actionpack.gemspec
M	activerecord/activerecord.gemspec

commit 800252c	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-14 22:23:17 +0100

    let sdoc say which version of rdoc we depend on

M	Gemfile

commit 2a10b91	refs/tags/v3.2.0.rc1
Merge: 889e8be caa1c19
Author: José Valim 
Date:   2011-12-14 12:37:22 -0800

    Merge pull request #3988 from lest/fix-date-select
    
    fix separator insertion in date_select helper

commit caa1c19	refs/tags/v3.2.0.rc1
Author: Sergey Nartimov 
Date:   2011-12-14 23:20:23 +0300

    fix separator insertion in date_select helper

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit b6ae05e	refs/tags/v3.1.6
Author: Jon Leighton 
Date:   2011-12-14 19:20:19 +0000

    Fix #3672 again (dependent: delete_all perf)
    
    Conflicts:
    
    	activerecord/lib/active_record/associations/builder/has_many.rb
    	activerecord/lib/active_record/associations/has_many_association.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb

commit 889e8be	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 19:20:19 +0000

    Fix #3672 again (dependent: delete_all perf)

M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb

commit 8a37970	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 17:34:35 +0000

    Remove that there copy/pasted code :bomb:

M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit 909b337	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 17:25:51 +0000

    Don't try to autosave nested assocs. Fixes #2961.

M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit 9e39dc4	refs/heads/master
Author: Alexander 
Date:   2011-12-14 20:53:39 +0400

    Update activerecord/lib/active_record/reflection.rb

M	activerecord/lib/active_record/reflection.rb

commit 18bf309	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 15:58:43 +0000

    Cache column defaults on model. ~30% on Model.new due to avoiding repeatedly fetching connection.

M	activerecord/lib/active_record/base.rb

commit 7b0edbb	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 15:41:34 +0000

    Avoid super; speeds up Model.new by about 12%

M	activerecord/lib/active_record/locking/optimistic.rb

commit e3a4eb4	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-14 17:03:35 +0100

    Close the response body on cascade pass, closes #3975.

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb

commit 19bea9f	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 15:31:02 +0000

    Stop the build asploding on 1.8.7

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 384a60a	refs/tags/v3.2.0.rc1
Merge: bb44e5a 5f67cfe
Author: Jeremy Kemper 
Date:   2011-12-14 07:07:05 -0800

    Merge pull request #3981 from choonkeat/master
    
    Fix url_for options[:subdomain] to allow objects as values

commit bb44e5a	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 14:49:02 +0000

    Use a separate module for 'external' attribute methods.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb

commit 5f67cfe	refs/tags/v3.2.0.rc1
Author: choonkeat 
Date:   2011-12-14 22:43:42 +0800

    Fix url_for options[:subdomain] to allow objects as values
    * e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param)

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/test/controller/url_for_test.rb

commit a5589db	refs/tags/v3.2.0.rc1
Merge: 665ef11 6cbe270
Author: Piotr Sarnacki 
Date:   2011-12-14 05:48:04 -0800

    Merge pull request #3979 from kommen/dbconsole_db_config
    
    dbconsole: Use the app's database_configuration instead of duplicating loading code.

commit 6cbe270	refs/tags/v3.2.0.rc1
Author: Dieter Komendera 
Date:   2011-12-14 14:08:41 +0100

    dbconsole: Use the app's database_configuration instead of duplicating code.

M	railties/lib/rails/commands/dbconsole.rb

commit 665ef11	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 11:11:12 +0000

    Add return for 1.8.7

M	activerecord/test/cases/relation_scoping_test.rb

commit 3ab49f8	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-14 10:35:29 +0000

    Unfluff the CI.
    
    With transactional fixtures enabled, the session records would end up in
    @_current_transaction_records, and at the end of the transaction,
    methods would be called on them that would trigger method_missing and
    trigger attribute methods to be generated.
    
    However, at this point the sessions table would not exist, and the
    columns were not cached, so an exception would be raised because we
    can't find the columns to generate attribute methods for.
    
    Not sure exactly why this didn't crop up before but there have been
    changes to the schema cache code and perhaps that means that column data
    that was cached previously at that point is now uncached.

M	activerecord/test/cases/session_store/session_test.rb

commit f3531a8	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-14 09:23:34 +0100

    Clean up details keys before some tests to expire the cache.

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/test/template/compiled_templates_test.rb
M	actionpack/test/template/lookup_context_test.rb

commit 38703ac	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-13 23:43:42 +0000

    Revert naive O(1) table_exists? implementation.
    
    It was a bad idea to rescue exceptions here. This can interfere with
    transaction rollbacks which seems to be the cause of current CI
    failure.
    
    Instead, each adapter should implement its own DB-specific O(1)
    implementation, and we fall back on the generic, slower, implementation
    otherwise.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapter_test.rb

commit c7552d9	refs/tags/v3.2.0.rc1
Author: Aaron Patterson 
Date:   2011-12-13 15:26:29 -0800

    dup the details hash if a key has already been set for this object

M	actionpack/lib/action_view/lookup_context.rb

commit dced6d6	refs/tags/v3.1.6
Author: Mikhail Dieterle 
Date:   2011-12-08 21:03:43 +0800

    Typo in list

M	railties/guides/source/i18n.textile

commit ed89235	refs/tags/v3.1.6
Author: Ryan Sandridge 
Date:   2011-12-08 16:18:12 -0500

    Replacing vague mention of an unspecified section above with a link to the actual section containing Asset Organization.

M	railties/guides/source/asset_pipeline.textile

commit 50ac4a3	refs/tags/v3.1.6
Author: Ryan Sandridge 
Date:   2011-12-10 15:58:08 -0500

    Fixing typo in Routing Guide.

M	railties/guides/source/routing.textile

commit 74e46e5	refs/heads/master
Merge: 5dc4868 23bd340
Author: Vijay Dev 
Date:   2011-12-14 02:13:23 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 23bd340	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-14 02:08:40 +0530

    copy edits

M	railties/guides/source/debugging_rails_applications.textile

commit 5dc4868	refs/heads/master
Merge: ab802e7 081431f
Author: José Valim 
Date:   2011-12-13 11:43:13 -0800

    Merge pull request #3970 from lest/backtrace-when-silenced
    
    log exception backtrace when all backtrace lines silenced

commit 081431f	refs/heads/master
Author: Sergey Nartimov 
Date:   2011-12-13 22:32:39 +0300

    log exception backtrace when all backtrace lines silenced

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb

commit ab802e7	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-13 11:28:30 -0800

    locale and default_locale may be the same, so uniq the array

M	actionpack/lib/action_view/lookup_context.rb

commit 9d87a67	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-13 11:25:03 -0800

    stop freezing the details hash

M	actionpack/lib/action_view/lookup_context.rb

commit 8b85e4a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-13 11:13:03 -0800

    stop freezing hash value

M	actionpack/lib/action_view/lookup_context.rb

commit 485e024	refs/heads/master
Author: Mikhail Dieterle 
Date:   2011-12-14 02:28:42 +0800

    typo in textile markup

M	railties/guides/source/debugging_rails_applications.textile

commit 0f4da5b	refs/heads/master
Author: José Valim 
Date:   2011-12-13 15:39:58 +0100

    Fix failing AP tests.

M	actionpack/test/dispatch/routing_test.rb

commit 1668b90	refs/heads/master
Merge: 80256ab d060d6d
Author: José Valim 
Date:   2011-12-13 02:33:05 -0800

    Merge pull request #3963 from lest/logger-missing-require
    
    missing require in buffered logger

commit 80256ab	refs/heads/master
Author: José Valim 
Date:   2011-12-13 11:23:21 +0100

    FileUpdateChecker should be able to handle deleted files.

M	activerecord/lib/active_record/railtie.rb
M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/i18n_railtie.rb
M	activesupport/test/file_update_checker_test.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/application/routes_reloader.rb
M	railties/test/application/loading_test.rb

commit d060d6d	refs/heads/master
Author: lest 
Date:   2011-12-13 12:36:32 +0300

    missing require in buffered logger

M	activesupport/lib/active_support/buffered_logger.rb

commit 1f5b9bb	refs/heads/master
Author: José Valim 
Date:   2011-12-13 10:07:02 +0100

    Clean up FileUpdateChecker API.

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/i18n_railtie.rb
M	activesupport/test/file_update_checker_test.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/application/routes_reloader.rb

commit 693d2be	refs/heads/master
Author: José Valim 
Date:   2011-12-13 09:25:12 +0100

    Move hooks back to initializers (we need an API that allows hooks to be replaced).

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/finisher.rb

commit cd3033e	refs/heads/master
Author: José Valim 
Date:   2011-12-13 09:19:58 +0100

    Add config.file_watcher so developers can provide their own watchers (for instance, hooking on fsevents).

M	railties/guides/source/configuring.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/loading_test.rb

commit 148d15d	refs/heads/master
Merge: f9df3ef f2fa483
Author: José Valim 
Date:   2011-12-12 23:57:02 -0800

    Merge pull request #3958 from lest/comment-on-whitelist
    
    commented whitelist mode enforcement for mass assignment

commit f9df3ef	refs/heads/master
Merge: 11aa167 8a9cf79
Author: José Valim 
Date:   2011-12-12 23:56:00 -0800

    Merge pull request #3960 from lest/activesupport-test-missing-require
    
    missing require in activesupport test

commit 11aa167	refs/heads/master
Author: José Valim 
Date:   2011-12-13 08:49:04 +0100

    Revert "Provide a unique point for running initializers."
    
    This reverts commit c2e3ce8d1e1174e66536d59d8d97eb2cc8ce6f25.
    
    Conflicts:
    
    	railties/lib/rails/application/configuration.rb
    	railties/lib/rails/application/finisher.rb
    	railties/lib/rails/engine.rb

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/engine.rb

commit 8a9cf79	refs/heads/master
Author: lest 
Date:   2011-12-13 10:33:58 +0300

    missing require in activesupport test

M	activesupport/test/buffered_logger_test.rb

commit f2fa483	refs/heads/master
Author: lest 
Date:   2011-12-13 10:14:38 +0300

    commented whitelist mode enforcement for mass assignment

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 4371be2	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2011-12-12 19:45:16 -0800

    use Array#join so that file encoding doesn't impact returned string.
    Fixes #3957

M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/dispatch/response_test.rb

commit 810837d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-12 19:45:16 -0800

    use Array#join so that file encoding doesn't impact returned string.
    Fixes #3957

M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/dispatch/response_test.rb

commit 3d4f913	refs/heads/master
Merge: 676092f f8fa383
Author: Piotr Sarnacki 
Date:   2011-12-12 17:45:18 -0800

    Merge pull request #3950 from guilleiguaran/use-https-for-rubygems-in-apps
    
    Use rubygems https endpoint for the Gemfile on new apps

commit 676092f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-12 16:02:59 -0800

    logger adds a newline for us

M	actionpack/lib/action_controller/log_subscriber.rb

commit d12e6d0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-12 15:58:39 -0800

    use the schema cache when asking for the primary key

M	activerecord/lib/active_record/attribute_methods/primary_key.rb

commit 400929f	refs/heads/master
Merge: ffa8bfe 196407c
Author: José Valim 
Date:   2011-12-12 14:11:16 -0800

    Merge pull request #3943 from sferik/add_explicit_requires
    
    Include TagHelper but don't explicitly require it

commit 196407c	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-12-12 14:05:25 -0800

    Include TagHelper but don't explicitly require it
    
    Allow autoloading to work as intended and avoid multiple requires.

M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/lib/action_view/helpers/text_helper.rb

commit ffa8bfe	refs/heads/master
Merge: fa1d9a8 04d5eae
Author: José Valim 
Date:   2011-12-12 14:03:50 -0800

    Merge pull request #3954 from bdurand/null_store_2
    
    Add ActiveSupport::Cache::NullStore for testing and development

commit fa1d9a8	refs/heads/master
Author: José Valim 
Date:   2011-12-12 22:51:33 +0100

    Speed up development by only reloading classes if dependencies files changed.
    
    This can be turned off by setting `config.reload_classes_only_on_change` to false.
    
    Extensions like Active Record should add their respective files like db/schema.rb and db/structure.sql to `config.watchable_files` if they want their changes to affect classes reloading.
    
    Thanks to https://github.com/paneq/active_reload and Pastorino for the inspiration. <3

M	actionpack/test/dispatch/reloader_test.rb
M	activerecord/lib/active_record/railtie.rb
M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/lib/active_support/i18n_railtie.rb
M	activesupport/test/file_update_checker_test.rb
M	railties/CHANGELOG.md
M	railties/guides/source/configuring.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/application/routes_reloader.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie/configuration.rb
M	railties/test/application/console_test.rb
M	railties/test/application/loading_test.rb

commit 62cda03	refs/heads/master
Author: José Valim 
Date:   2011-12-12 20:26:04 +0100

    Provide a dir => extension API to file update checker.

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/test/file_update_checker_test.rb

commit b04e2d8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-12 13:46:05 -0800

    strip whitespace errors from the generated Gemfile

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 04d5eae	refs/heads/master
Author: Brian Durand 
Date:   2011-12-12 13:40:29 -0600

    Add ActiveSupport::Cache::NullStore to expose caching interface without actually caching for development and test environments.

M	activerecord/CHANGELOG.md
M	activesupport/lib/active_support/cache.rb
A	activesupport/lib/active_support/cache/null_store.rb
M	activesupport/test/caching_test.rb
M	railties/guides/source/caching_with_rails.textile
M	railties/test/application/middleware/cache_test.rb

commit ede647a	refs/heads/master
Author: José Valim 
Date:   2011-12-12 19:23:13 +0100

    Allow reloader to be configured.

M	actionpack/lib/action_dispatch/middleware/reloader.rb
M	actionpack/test/dispatch/reloader_test.rb

commit 9a51053	refs/heads/master
Author: José Valim 
Date:   2011-12-12 18:19:28 +0100

    Update checker returns a boolean if callback was executed or not.

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/test/file_update_checker_test.rb

commit f8fa383	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-12-12 12:37:37 -0500

    Use rubygems https endpoint for the Gemfile on new apps

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 2fdc3ab	refs/heads/master
Merge: af308ff 3ffa01c
Author: Santiago Pastorino 
Date:   2011-12-12 09:31:19 -0800

    Merge pull request #3948 from sferik/use_https_rubygems_source
    
    Use HTTPS rubygems source

commit 2be6df6	refs/heads/master
Author: clst 
Date:   2011-12-12 18:27:51 +0100

    changed :finder_sql example to select *
    because with select p.* you can no longer use count(). Using count will result in an SQL error message.

M	activerecord/lib/active_record/associations.rb

commit af308ff	refs/heads/master
Merge: c046660 5266eb9
Author: José Valim 
Date:   2011-12-12 09:14:48 -0800

    Merge pull request #3946 from pokonski/relative_root
    
    Fix #3365. Default config.relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"].

commit 3ffa01c	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-12-12 08:16:52 -0800

    Make quotes in Gemfile consistent (use single quotes)

M	Gemfile

commit efc74f5	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-12-12 08:16:38 -0800

    Use HTTPS rubygems source

M	Gemfile

commit 5266eb9	refs/heads/master
Author: Piotrek Okoński 
Date:   2011-12-12 16:52:56 +0100

    Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365

M	actionmailer/lib/action_mailer/railtie.rb
M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/action_controller/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit c046660	refs/heads/master
Author: José Valim 
Date:   2011-12-12 16:23:50 +0100

    Give hooks the flexibility to choose the type of callback.

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/finisher.rb

commit a6b15bd	refs/heads/master
Author: clst 
Date:   2011-12-12 15:46:42 +0100

    fixed example for :finder_sql
    people.* will not work when the alias is named p

M	activerecord/lib/active_record/associations.rb

commit c2e3ce8	refs/heads/master
Author: José Valim 
Date:   2011-12-12 15:34:31 +0100

    Provide a unique point for running initializers.

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/engine.rb

commit 27f0add	refs/heads/master
Author: José Valim 
Date:   2011-12-12 15:18:19 +0100

    Improve docs for Rails::Application and add routes_reloader_hook and app_reloader_hooks.

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/application/finisher.rb

commit 57e0c03	refs/heads/master
Author: José Valim 
Date:   2011-12-12 14:53:25 +0100

    Allow FileUpdateChecker to work with globs.

M	activesupport/lib/active_support/file_update_checker.rb
M	activesupport/test/file_update_checker_test.rb

commit 5c234ab	refs/heads/master
Author: José Valim 
Date:   2011-12-12 14:39:22 +0100

    Composition > inheritance.

M	railties/lib/rails/application/routes_reloader.rb

commit b15e2be	refs/heads/master
Author: Suraj N. Kurapati 
Date:   2011-12-11 23:18:58 -0800

    disambiguate "and not" when explaining "&& return"

M	railties/guides/source/layouts_and_rendering.textile

commit 9147613	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-12-11 15:56:21 -0700

    Remove duplicate html_escape docs

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 63cd943	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-12-11 15:30:05 -0700

    Use 1.9 native XML escaping to speed up html_escape and shush regexp warnings
    
            length      user     system      total        real
    before  6      0.010000   0.000000   0.010000 (  0.012378)
    after   6      0.010000   0.000000   0.010000 (  0.012866)
    before  60     0.040000   0.000000   0.040000 (  0.046273)
    after   60     0.040000   0.000000   0.040000 (  0.036421)
    before  600    0.390000   0.000000   0.390000 (  0.390670)
    after   600    0.210000   0.000000   0.210000 (  0.209094)
    before  6000   3.750000   0.000000   3.750000 (  3.751008)
    after   6000   1.860000   0.000000   1.860000 (  1.857901)

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit dc43e40	refs/heads/master
Author: Lennart Fridén 
Date:   2011-12-11 22:19:11 +0100

    Added :use_two_digit_numbers option [Lennart Fridén & Kim Persson]
    
    Added use_two_digit_numbers select_tag option for displaying months and days with leading zeros without affecting the values (useful for e.g. ISO-style dates, 2011-08-01).
    
    Signed-off-by: José Valim 
    
    Conflicts:
    
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit a8f2b20	refs/heads/master
Merge: 6887aed 3d6eafe
Author: José Valim 
Date:   2011-12-11 13:20:55 -0800

    Merge pull request #3941 from azimux/fix_nested_under_indifferent_access
    
    Overrode Hash#nested_under_indifferent_access in HashWithIndifferentAccess

commit 3d6eafe	refs/heads/master
Author: Miles Georgi 
Date:   2011-12-11 12:59:59 -0800

    Overrode Hash#nested_under_indifferent_access in HashWithIndifferentAccess
    to return self.

M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 6887aed	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-11 23:17:54 +0530

    update command line guide: generated README is now an rdoc

M	railties/guides/source/command_line.textile

commit 75a9d88	refs/heads/master
Merge: aa6aa9b ea5a70a
Author: Yehuda Katz 
Date:   2011-12-11 09:26:36 -0800

    Merge pull request #3936 from guilleiguaran/skip-assets-options-when-sprockets-skipped
    
    Skip assets options in environments files when --skip-sprockets is used

commit aa6aa9b	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-11 22:24:50 +0530

    revising doc

M	railties/lib/rails/source_annotation_extractor.rb

commit 78de996	refs/heads/master
Merge: 7983509 3f65e7f
Author: José Valim 
Date:   2011-12-11 06:06:41 -0800

    Merge pull request #3933 from wfarr/master
    
    Add button_tag support to ActionView::Helpers::FormBuilder

commit 3f65e7f	refs/heads/master
Author: Will Farrington 
Date:   2011-12-10 23:53:39 -0500

    Add button_tag support to ActionView::Helpers::FormBuilder.
    
    This support is near-identical to the existing submit_tag support.
    
    Example:
    
        <%= form_for @post do |f| %>
          <%= f.button %>
        <% end %>

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/locale/en.yml
M	actionpack/test/template/form_helper_test.rb

commit ea5a70a	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-12-11 08:48:58 -0500

    Skip assets options in environments files when --skip-sprockets is used

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/generators/app_generator_test.rb

commit 7983509	refs/heads/master
Merge: d102791 7a7e87d
Author: José Valim 
Date:   2011-12-11 01:33:25 -0800

    Merge pull request #3932 from guilleiguaran/fix-assets-helpers
    
    Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361.

commit d102791	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-10 16:33:08 -0800

    ensure @fixture_connections is initialized in case an exception happens during setup

M	activerecord/lib/active_record/fixtures.rb

commit d09b67c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-10 15:32:14 -0800

    Errno::ENOENT error makes more sense when a file cannot be found

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 4beaa9b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-10 16:31:59 -0800

    Try to keep people from calling the deprecated flush method.

M	activesupport/lib/active_support/buffered_logger.rb

commit cde9981	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-11 00:12:09 +0100

    Ensure that files that compile to js/css are not compiled by default with `rake assets:precompile`
    
    This case was not tested and documentation was a bit confusing
    on that topic, so it was not obvious if current code
    works properly or not.

M	railties/test/application/assets_test.rb

commit 7a7e87d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-12-10 18:07:13 -0500

    Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361.
    
    Is wrong use ProcessedAsset#to_s since it returns the content of the file.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 1c2cb7d	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-11 00:03:24 +0100

    Clarify the default assets.precompile matcher behavior

M	railties/guides/source/asset_pipeline.textile

commit 83bc2c2	refs/heads/master
Author: Ryan Sandridge 
Date:   2011-12-10 15:58:08 -0500

    Fixing typo in Routing Guide.

M	railties/guides/source/routing.textile

commit 25ac7e4	refs/tags/v3.1.6
Merge: d06c3b3 49bbdf2
Author: José Valim 
Date:   2011-12-10 06:20:36 -0800

    Merge pull request #3928 from arunagw/fix_template_test
    
    Fix template test

commit 49bbdf2	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2011-12-10 19:42:09 +0530

    Fix broken encoding test

M	actionpack/test/template/template_test.rb

commit d06c3b3	refs/tags/v3.1.6
Merge: e568c67 80b1d4d
Author: José Valim 
Date:   2011-12-10 02:18:42 -0800

    Merge pull request #3705 from guilleiguaran/3-1-stable-therubyrhino
    
    Added therubyrhino to default Gemfile under JRuby

commit cd7fbcb	refs/heads/master
Author: José Valim 
Date:   2011-12-10 11:17:00 +0100

    Fix AS test suite.

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/buffered_logger_test.rb

commit aace38a	refs/heads/master
Merge: 7fc0964 55afc7d
Author: Yehuda Katz 
Date:   2011-12-09 21:25:02 -0800

    Merge pull request #3925 from guilleiguaran/extra-test-for-therubyrhino
    
    Add test to verify that therubyrhino isn't included when JRuby isn't used

commit 7fc0964	refs/heads/master
Merge: 3e55928 b12a176
Author: Yehuda Katz 
Date:   2011-12-09 21:24:02 -0800

    Merge pull request #3926 from guilleiguaran/skip-assets-group-if-sprockets-skipped
    
    Skip assets groups if --skip-sprockets option is given

commit b12a176	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-12-09 21:52:10 -0500

    Skip assets groups if --skip-sprockets option is given

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 80b1d4d	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2011-12-09 21:38:10 -0500

    Add test to verify that therubyrhino isn't included when JRuby isn't used

M	railties/test/generators/app_generator_test.rb

commit 55afc7d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-12-09 21:38:10 -0500

    Add test to verify that therubyrhino isn't included when JRuby isn't used

M	railties/test/generators/app_generator_test.rb

commit 3e55928	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-10 02:10:18 +0100

    revises some stuff that was out of sync with the recent generated README.rdoc

D	railties/guides/code/getting_started/README
A	railties/guides/code/getting_started/README.rdoc
M	railties/guides/source/getting_started.textile

commit efed2d5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-10 01:30:06 +0100

    Update partials documentation, partial_path is no longer generated using RecordIdentifier

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 04ef93d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-09 16:03:18 -0800

    *   ActiveSupport::BufferedLogger#silence is deprecated.  If you want to squelch
        logs for a certain block, change the log level for that block.
    
    *   ActiveSupport::BufferedLogger#open_log is deprecated.  This method should
        not have been public in the first place.
    
    *   ActiveSupport::BufferedLogger's behavior of automatically creating the
        directory for your log file is deprecated.  Please make sure to create the
        directory for your log file before instantiating.
    
    *   ActiveSupport::BufferedLogger#auto_flushing is deprecated.  Either set the
        sync level on the underlying file handle like this:
    
            f = File.open('foo.log', 'w')
            f.sync = true
            ActiveSupport::BufferedLogger.new f
    
        Or tune your filesystem.  The FS cache is now what controls flushing.
    
    *   ActiveSupport::BufferedLogger#flush is deprecated.  Set sync on your
        filehandle, or tune your filesystem.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/benchmarkable_test.rb
M	activesupport/test/buffered_logger_test.rb
M	railties/lib/rails/application/bootstrap.rb

commit f79b257	refs/heads/master
Merge: 866d2db 5c60b44
Author: Aaron Patterson 
Date:   2011-12-09 14:27:41 -0800

    Merge pull request #3924 from laserlemon/readme-ext
    
    Add the .rdoc extension to the README that Rails generates for a new app

commit 5c60b44	refs/heads/master
Author: Steve Richert 
Date:   2011-12-09 16:49:29 -0500

    Add the .rdoc extension to the README that Rails generates for a new application

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/actions_test.rb

commit 866d2db	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 21:19:49 +0100

    Fix indentation

M	railties/test/application/rake/migrations_test.rb

commit 35a1744	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 20:53:55 +0100

    Allow to run migrations with given scope, with SCOPE=
    
    Scope in migrations can be defined by adding suffix in filename,
    like: 01_a_migration.blog.rb. Such migration have blog scope.
    
    Scope is automatically added while copying migrations from engine,
    so if you want to revert all of the migrations from given engine,
    you can just run db:migrate with SCOPE, like:
    
        rake db:migrate SCOPE=blog

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/railties/databases.rake
M	railties/test/application/rake/migrations_test.rb

commit f0b782d	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 20:07:29 +0100

    Allow to filter migrations by passing a block
    
    Example:
      ActiveRecord::Migrator.migrate(path) do |migration|
        migration.name =~ /User/
      end
    
    The above example will migrate only migrations with User in
    the name

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb

commit ab30570	refs/heads/master
Author: José Valim 
Date:   2011-12-09 20:47:33 +0100

    Fix extend -> include.

M	actionpack/lib/abstract_controller/logger.rb
M	actionpack/lib/action_controller/base.rb

commit 5b82f50	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-09 11:23:19 -0800

    Use `table_exists?` from the schema cache.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/session_store/session_test.rb

commit 007965a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-09 10:18:10 -0800

    don't need a begin / end.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit a29d1db	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-09 10:14:49 -0800

    squelch table exists? queries.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit c212a34	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-09 09:33:36 -0800

    only load converter if the encodings are different

M	actionpack/test/template/template_test.rb

commit 22a6079	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-12-09 18:15:28 +0100

    Make ActiveSupport::Benchmarkable a default module for ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/base.rb

commit 929b264	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 12:15:54 +0100

    Compare migrations for copying only by name and scope

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb

commit ed0b1f6	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 11:45:19 +0100

    Add suffix for migrations copied from engines

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb
M	railties/test/railties/shared_tests.rb

commit 255d9f5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 10:33:37 +0100

    String#to_a is not available in 1.9

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb

commit 5ad5215	refs/heads/master
Author: José Valim 
Date:   2011-12-09 07:20:55 +0100

    Deprecate implicit layout lookup in favor of inheriting the _layout config.

M	actionpack/CHANGELOG.md
M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/test/abstract/layouts_test.rb

commit 2995134	refs/heads/master
Author: José Valim 
Date:   2011-12-09 06:25:10 +0100

    Simplify path traversal logic

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 1d9de9d	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 03:15:59 +0100

    Run also migrations in subdirectories.
    
    With this commit, ActiveRecord will also look for migrations
    in db/migrate subdirectories.

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb
A	activerecord/test/migrations/valid_with_subdirectories/1_valid_people_have_last_names.rb
A	activerecord/test/migrations/valid_with_subdirectories/sub/2_we_need_reminders.rb
A	activerecord/test/migrations/valid_with_subdirectories/sub1/3_innocent_jointable.rb

commit b164ab7	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 03:32:37 +0100

    Fix railties tests, identical migrations are not considered when copying

M	railties/test/railties/shared_tests.rb

commit 62d5564	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 01:49:08 +0100

    Ignore origin comment when checking for duplicates on Migration.copy
    
    49ebe51 fixed copying migrations, but existing migrations would still
    trigger warnings. The proper way to compare migrations is to ignore
    origin lines - if migration is identical it means that we can
    silently skip it, regardless where it comes from.

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb
A	activerecord/test/migrations/to_copy_with_name_collision/1_people_have_hobbies.rb

commit 652db2f	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-12-09 00:50:39 +0100

    Fix copying migrations from engines
    
    There was a bug in ActiveRecord::Migration.copy method, which
    prevented adding special comment about the origin of migration.
    
    Because of that, the check if migration is identical or if it's
    not and should be skipped was always saying that migration is
    skipped, which was causing additional useless warnings about
    skipped migrations.

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb

commit 2c471b3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-08 15:11:23 -0800

    load the encoding converter to work around [ruby-core:41556] when switching encodings

D	actionpack/lib/action_view/data/encoding_conversions.txt
M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit 8c26cd5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-08 11:18:01 -0800

    Exceptions should read from the spec configu

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

commit e568c67	refs/tags/v3.1.6
Author: Aaron Patterson 
Date:   2011-12-08 15:11:23 -0800

    load the encoding converter to work around [ruby-core:41556] when switching encodings

D	actionpack/lib/action_view/data/encoding_conversions.txt
M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit d4d99bb	refs/heads/master
Author: José Valim 
Date:   2011-12-08 22:56:50 +0100

    Fix another regression related to the layout optimization.

M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/controller/new_base/render_layout_test.rb

commit 65796bb	refs/heads/master
Author: Ryan Sandridge 
Date:   2011-12-08 16:18:12 -0500

    Replacing vague mention of an unspecified section above with a link to the actual section containing Asset Organization.

M	railties/guides/source/asset_pipeline.textile

commit c41f08c	refs/heads/master
Author: José Valim 
Date:   2011-12-08 21:16:12 +0100

    Move symbolize keys to the inner options as we can assume url_options will be properly symbolized.

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 63293d1	refs/tags/v3.1.6
Author: Jon Leighton 
Date:   2011-12-08 19:58:59 +0000

    Fix #3890. (Calling proxy_association in scope chain.)
    
    Conflicts:
    
    	activerecord/test/models/post.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/models/post.rb

commit 5da90b3	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-08 19:58:59 +0000

    Fix #3890. (Calling proxy_association in scope chain.)

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/models/post.rb

commit ebd71fd	refs/heads/master
Author: José Valim 
Date:   2011-12-08 20:59:43 +0100

    Fix a regression and also fix broken test.

M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/controller/new_base/render_layout_test.rb

commit 92d24b7	refs/tags/v3.1.6
Author: Vijay Dev 
Date:   2011-12-09 01:21:00 +0530

    fix a bad url

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit 94dcbe8	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-09 01:15:54 +0530

    fix nodocs

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/transactions.rb
M	activesupport/lib/active_support/core_ext/string/multibyte.rb
M	railties/lib/rails/engine/configuration.rb

commit 4f0ff15	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-12-08 20:21:48 +0100

    Remove NilClass whiners feature.
    
    Removing this feature causes boost in performance when using Ruby 1.9.
    
    Ruby 1.9 started to do implicit conversions using `to_ary` and `to_str`
    in some STDLIB methods (like Array#join). To do such implicit conversions,
    Ruby 1.9 always dispatches the method and rescues the NoMethodError exception
    in case one is raised.
    
    Therefore, since the whiners feature defined NilClass#method_missing, such
    implicit conversions for nil became much, much slower. In fact, just defining
    NilClass#method_missing (even without the whiners feature) already causes a
    massive slow down. Here is a snippet that shows such slow down:
    
        require "benchmark"
        Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }
    
        class NilClass
          def method_missing(*args)
            raise NoMethodError
          end
        end
    
        Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }

M	activerecord/lib/active_record/base.rb
M	activesupport/lib/active_support/whiny_nil.rb
M	activesupport/test/whiny_nil_test.rb

commit 3952854	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-12-08 19:52:26 +0100

    Improve cache on route_key lookup.
    
    Conflicts:
    
    	activemodel/lib/active_model/naming.rb

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/naming_test.rb

commit 120861c	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-09 01:02:02 +0530

    add haml and slim to the list of extensions supported by rake notes

M	railties/guides/source/command_line.textile

commit 965f6f2	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-09 00:57:13 +0530

    fix comments

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit c81bb97	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-09 00:55:42 +0530

    minor text change

M	Rakefile

commit d1abf29	refs/heads/master
Author: José Valim 
Date:   2011-12-08 20:21:48 +0100

    Remove NilClass whiners feature.
    
    Removing this feature causes boost in performance when using Ruby 1.9.
    
    Ruby 1.9 started to do implicit conversions using `to_ary` and `to_str`
    in some STDLIB methods (like Array#join). To do such implicit conversions,
    Ruby 1.9 always dispatches the method and rescues the NoMethodError exception
    in case one is raised.
    
    Therefore, since the whiners feature defined NilClass#method_missing, such
    implicit conversions for nil became much, much slower. In fact, just defining
    NilClass#method_missing (even without the whiners feature) already causes a
    massive slow down. Here is a snippet that shows such slow down:
    
        require "benchmark"
        Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }
    
        class NilClass
          def method_missing(*args)
            raise NoMethodError
          end
        end
    
        Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }

M	activerecord/lib/active_record/base.rb
M	activesupport/lib/active_support/whiny_nil.rb
M	activesupport/test/whiny_nil_test.rb

commit 7280787	refs/heads/master
Author: José Valim 
Date:   2011-12-08 19:52:26 +0100

    Improve cache on route_key lookup.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/naming_test.rb

commit 3cae753	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-08 10:39:12 -0800

    fixing eval'd line numbers.

M	activerecord/lib/active_record/attribute_methods/read.rb

commit d80e4ee	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-08 10:17:37 -0800

    Regexp.union seems to have different results in 1.8

M	activerecord/test/cases/helper.rb

commit 859a455	refs/heads/master
Author: José Valim 
Date:   2011-12-08 18:54:56 +0100

    Revert accidental change from cattr_accessor to class_attribute.

M	actionpack/lib/action_view/template/resolver.rb

commit b989b80	refs/heads/master
Merge: 7b1930a 255c485
Author: Xavier Noria 
Date:   2011-12-08 09:30:31 -0800

    Merge pull request #3909 from laserlemon/patch-1
    
    Add dependency status (a la build status) to the README

commit 255c485	refs/heads/master
Author: Steve Richert 
Date:   2011-12-08 09:39:08 -0500

    Add dependency status (a la build status) to the README

M	README.rdoc
M	Rakefile

commit 7b1930a	refs/heads/master
Merge: 1bad06a d4d2e8e
Author: José Valim 
Date:   2011-12-08 08:55:03 -0800

    Merge pull request #3908 from kennyj/should_use_default_charset
    
    Fix a failure in railties on ruby 1.8.x

commit d4d2e8e	refs/heads/master
Author: kennyj 
Date:   2011-12-09 01:27:58 +0900

    Fix testcase an error on ruby 1.8.x.
    
    In Ruby 1.8.x, config.encoding sets $KCODE.
    Therefore, the possible values are UTF8, SJIS, or EUC.
    And, if we set SJIS, we'll has the error. Because some rails sources are written in utf-8 encoding.

M	railties/test/application/initializers/frameworks_test.rb

commit 1bad06a	refs/heads/master
Merge: 67cc07e 3ade2f8
Author: José Valim 
Date:   2011-12-08 07:56:07 -0800

    Merge pull request #3906 from kennyj/fix_warnings_for_params_wrapper_test
    
    Fix warning for params_wrapper_test.rb

commit 67cc07e	refs/heads/master
Author: José Valim 
Date:   2011-12-08 16:51:47 +0100

    Just use the proc if there is a chance of layout lookup.

M	actionpack/lib/abstract_controller/layouts.rb

commit 239262f	refs/heads/master
Author: José Valim 
Date:   2011-12-08 16:37:56 +0100

    Optimize layout lookup to avoid double calls.

M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/lib/abstract_controller/view_paths.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb

commit efc28a7	refs/heads/master
Author: José Valim 
Date:   2011-12-08 15:23:23 +0100

    Some small optimizations and improvements to benchmark code.

M	actionpack/examples/performance.rb
M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/template/resolver.rb

commit 06ac7d3	refs/heads/master
Author: José Valim 
Date:   2011-12-08 14:05:18 +0100

    Add performance scripts from wycats/rails-simple-benches to actionpack.

A	actionpack/examples/performance.rb
A	actionpack/examples/views/_collection.erb
A	actionpack/examples/views/_hello.erb
A	actionpack/examples/views/_hundred_partials.erb
A	actionpack/examples/views/_partial.erb
A	actionpack/examples/views/_ten_partials.erb
A	actionpack/examples/views/hashes/_hash.erb
A	actionpack/examples/views/my_hashes/_my_hash.erb
A	actionpack/examples/views/template.html.erb
M	activerecord/examples/performance.rb

commit 0008918	refs/heads/master
Author: José Valim 
Date:   2011-12-08 13:54:57 +0100

    Remove rb-fsevent from Gemfile.

M	Gemfile

commit 3ade2f8	refs/heads/master
Author: kennyj 
Date:   2011-12-08 23:09:09 +0900

    Fix warning for params_wrapper_test.

M	actionpack/test/controller/params_wrapper_test.rb

commit 1e001da	refs/tags/v3.1.6
Author: Xavier Noria 
Date:   2011-12-08 04:56:16 -0800

    use our own fork of sdoc while Vijay's fix is not applied to voloko/sdoc

M	Gemfile

commit 0944785	refs/heads/master
Author: Mikhail Dieterle 
Date:   2011-12-08 21:03:43 +0800

    Typo in list

M	railties/guides/source/i18n.textile

commit c2aadf8	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-08 14:03:42 +0100

    updates the host and port of publish_docs, and changes the release instructions to use the task rather than curl (thanks to Vijay Dev for spotting this one)

M	RELEASING_RAILS.rdoc
M	Rakefile

commit 4936fc3	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-08 04:56:16 -0800

    use our own fork of sdoc while Vijay's fix is not applied to voloko/sdoc

M	Gemfile

commit 2fe5834	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-08 12:35:57 +0100

    releasing instructions: updates the URLs that triggers stable docs generation and publishing

M	RELEASING_RAILS.rdoc

commit bf34a36	refs/heads/master
Merge: 188b8c3 677f968
Author: José Valim 
Date:   2011-12-08 01:13:14 -0800

    Merge pull request #3900 from jfturcot/accessible_wrap_params
    
    ParamsWrapper only wrap the accessible attributes when they were set

commit 188b8c3	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-08 09:06:15 +0000

    Fix broken test_exists_query_logging from the table_exists? change

M	activerecord/test/cases/log_subscriber_test.rb

commit 677f968	refs/heads/master
Author: Jean-Francois Turcot 
Date:   2011-12-08 04:03:55 -0500

    Add information to the changelog about the changes to ActionController::ParamsWrapper

M	actionpack/CHANGELOG.md

commit e2e9eab	refs/heads/master
Author: José Valim 
Date:   2011-12-08 09:20:59 +0100

    Remove dead broken code from AD::Request

M	actionpack/lib/action_dispatch/http/request.rb

commit f84bf83	refs/heads/master
Merge: 0144f4f 199353c
Author: José Valim 
Date:   2011-12-08 00:18:09 -0800

    Merge pull request #3888 from kennyj/should_use_default_charset
    
    Assign config.encoding to AD::Response.default_charset at the initialization time.

commit 0144f4f	refs/heads/master
Merge: a505b13 6f253fb
Author: José Valim 
Date:   2011-12-08 00:04:45 -0800

    Merge pull request #3901 from mark-rushakoff/inflection-regex-fix
    
    Fix inflection regexes for mouse, mice

commit 6f253fb	refs/heads/master
Author: Mark Rushakoff 
Date:   2011-12-07 23:14:02 -0800

    Fix inflection regexes for mouse, mice

M	activesupport/lib/active_support/inflections.rb
M	activesupport/test/inflector_test_cases.rb

commit d552621	refs/heads/master
Author: Jean-Francois Turcot 
Date:   2011-12-07 22:50:01 -0500

    ParamsWrapper only wrap the accessible attributes when they were set

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit a505b13	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-07 17:42:05 -0800

    moving ignored regexp to the instance

M	activerecord/test/cases/helper.rb

commit 38a8f7f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-07 17:32:01 -0800

    speeding up ignored sql testing

M	activerecord/test/cases/helper.rb

commit 76c29a6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-07 17:25:31 -0800

    Use a hash to look up column definitions

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit 7e176a6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-07 16:18:39 -0800

    try to normalize the objects passed to column()

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit 483a3cf	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-07 16:01:53 -0800

    automatically add the column definition to the columns list if creating a new one

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit 1fc47a1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-07 15:35:27 -0800

    stop calling String#to_s so frequently

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit 8523784	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-07 15:01:04 -0800

    the required sqlite3 adapter responds to encoding, so stop checking.

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 30f0d7b	refs/heads/master
Author: José Valim 
Date:   2011-12-07 19:16:14 +0100

    Remove #:nodoc: from partial renderer.

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 12be0a5	refs/heads/master
Merge: 6867212 0a958d8
Author: José Valim 
Date:   2011-12-07 10:15:07 -0800

    Merge pull request #3895 from kennyj/should_use_freezed_constant
    
    Should use freezed string constant here.

commit 6867212	refs/heads/master
Merge: 0df2ef3 c6e6ce4
Author: José Valim 
Date:   2011-12-07 10:14:26 -0800

    Merge pull request #3889 from kielkowicz/master
    
    Annotating haml and slim file

commit 0a958d8	refs/heads/master
Author: kennyj 
Date:   2011-12-08 01:51:23 +0900

    Use freezed string constant. Some string literals is used repeatedly.

M	actionpack/lib/action_dispatch/http/cache.rb
M	actionpack/lib/action_dispatch/http/parameter_filter.rb
M	actionpack/lib/action_dispatch/http/response.rb

commit c6e6ce4	refs/heads/master
Author: Kazimierz Kiełkowicz 
Date:   2011-12-07 17:34:29 +0100

    Moves migrations tests from railties/test/application/rake_test.rb to railties/test/application/rake/migrations_test.rb

A	railties/test/application/rake/migrations_test.rb
M	railties/test/application/rake_test.rb

commit c45f744	refs/heads/master
Author: Kazimierz Kiełkowicz 
Date:   2011-12-07 17:31:31 +0100

    Move rake notes test to railties/test/application/rake/notes_test.rb

A	railties/test/application/rake/notes_test.rb
D	railties/test/railties/rake_tasks_test.rb

commit 8188d26	refs/heads/master
Author: Kazimierz Kiełkowicz 
Date:   2011-12-07 17:30:03 +0100

    Update source_annotation_extractor comment.

M	railties/lib/rails/source_annotation_extractor.rb

commit 0df2ef3	refs/heads/master
Merge: 4f10738 18ceed2
Author: José Valim 
Date:   2011-12-07 08:00:45 -0800

    Merge pull request #3884 from sikachu/master-fix_layout
    
    Allow layout fallback when using `layout` method

commit 4f10738	refs/heads/master
Merge: eb22901 dd647d9
Author: Santiago Pastorino 
Date:   2011-12-07 07:10:27 -0800

    Merge pull request #3894 from kelyar/master
    
    reversible migration example

commit dd647d9	refs/heads/master
Author: Evgeniy Kelyarsky 
Date:   2011-12-07 17:03:51 +0200

    reversible migration example had missing block parameter

M	activerecord/lib/active_record/migration.rb

commit 8f61df0	refs/heads/master
Author: Kazimierz Kiełkowicz 
Date:   2011-12-07 13:17:50 +0100

    Add annotation to haml and slim template.

M	railties/lib/rails/source_annotation_extractor.rb
A	railties/test/railties/rake_tasks_test.rb

commit 199353c	refs/heads/master
Author: kennyj 
Date:   2011-12-07 21:11:08 +0900

    Assign config.encoding to AD::Response.default_charset at the initialization time.

M	actionpack/lib/action_dispatch/railtie.rb
M	railties/test/application/initializers/frameworks_test.rb

commit eb22901	refs/heads/master
Merge: 885a599 a1986e7
Author: José Valim 
Date:   2011-12-07 04:07:51 -0800

    Merge pull request #3878 from kennyj/should_use_default_charset
    
    Use default charset when we read content type without charset.

commit a1986e7	refs/heads/master
Author: kennyj 
Date:   2011-12-07 01:46:41 +0900

    Use default charset when we read content type without charset.

M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/dispatch/response_test.rb

commit 18ceed2	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-12-06 21:05:56 -0500

    Allow layout fallback when using `layout` method
    
    Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail.
    
    For example, consider this snippet:
    
        class CarsController
          layout 'single_car', :only => :show
        end
    
    Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.

M	actionpack/CHANGELOG.md
M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/test/abstract/layouts_test.rb

commit 0460b3a	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-12-02 13:13:36 -0500

    Fix bug in assert_template when using only `:layout` option
    
    Currently if you're do this:
    
        assert_template :layout => "foo"
    
    Regardless of what layout you were using, the test will always pass. This was broken since the introduction of :layout option in [d9375f3f].
    
    We have a lot of test cases in actionpack/test/controller/layout_test.rb that use this feature. This will make sure that those test cases are not true negative.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/action_pack_assertions_test.rb
M	actionpack/test/controller/layout_test.rb

commit 885a599	refs/heads/master
Author: José Valim 
Date:   2011-12-06 12:32:34 +0100

    Just track "require" if we have something in the watching stack.
    
    A patch has been provided earlier and we have asked for feedback:
    
        https://gist.github.com/1437939
    
    Except one case, all other cases showed improvements in boot time.

M	activesupport/lib/active_support/dependencies.rb

commit 9dee540	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-06 10:07:47 -0800

    avoid deprecated methods

M	activerecord/test/cases/migration_test.rb

commit 0968ee3	refs/heads/master
Author: Vasiliy Ermolovich 
Date:   2011-11-26 17:23:20 +0300

    add prefix and suffix to renamed tables, closes #1510

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/migration_test.rb
A	activerecord/test/migrations/rename/1_we_need_things.rb
A	activerecord/test/migrations/rename/2_rename_things.rb

commit 7eb596c	refs/heads/master
Merge: 9be2353 89647a3
Author: Vijay Dev 
Date:   2011-12-06 23:05:43 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 89647a3	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-06 22:58:23 +0530

    Revert "Added link to ActiveResource::Base documentation"
    
    This reverts commit 03d438878619cfd3808623f3ed709b6fa166a85c.
    
    Conflicts:
    
    	activeresource/README.rdoc
    
    Reason: I don't think this is absolutely necessary given the
    fact that such links won't work in both GitHub and Rails API
    at the same time. See links in rails/README.rdoc and rails/Rakefile
    for some hackery that needs to be done to get such links work in
    both places.

M	activeresource/README.rdoc

commit 078b4b5	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-06 22:51:07 +0530

    use textile syntax in links

M	railties/guides/source/action_controller_overview.textile

commit d1bf7db	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-06 22:50:24 +0530

    rxml and rhtml are no longer searched for source code annotations

M	railties/guides/source/command_line.textile

commit cec909d	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-06 22:49:22 +0530

    copy edits in layouts guide, change links to be relative

M	railties/guides/source/layouts_and_rendering.textile

commit 9be2353	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-12-06 11:28:05 -0200

    Sync AP CHANGELOG with 3-1-stable

M	actionpack/CHANGELOG.md

commit acfa6c7	refs/tags/v3.1.6
Author: Santiago Pastorino 
Date:   2011-12-06 11:23:58 -0200

    Add CHANGELOG entry

M	actionpack/CHANGELOG.md

commit a2f4ef1	refs/tags/v3.1.6
Author: Santiago Pastorino 
Date:   2011-12-06 05:16:24 -0800

    Merge pull request #3428 from adrianpike/asset_path_conflicts
    
    Issue #3427 - asset_path_conflicts

M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/template/sprockets_helper_with_routes_test.rb

commit e58d663	refs/heads/master
Merge: f0f0e59 25007ad
Author: Santiago Pastorino 
Date:   2011-12-06 05:16:24 -0800

    Merge pull request #3428 from adrianpike/asset_path_conflicts
    
    Issue #3427 - asset_path_conflicts

commit f0f0e59	refs/heads/master
Author: José Valim 
Date:   2011-12-06 14:13:44 +0100

    Ensure length validator also works on 1.8.7.

M	activemodel/lib/active_model/validations/length.rb

commit b5e333d	refs/heads/master
Author: sandeepravi 
Date:   2011-12-06 18:09:42 +0530

    Added link to ActiveResource::Base documentation

M	activeresource/README.rdoc

commit 03d4388	refs/heads/master
Author: sandeepravi 
Date:   2011-12-06 18:03:41 +0530

    Added link to ActiveResource::Base documentation

M	activeresource/README.rdoc

commit 7e12aa7	refs/heads/master
Author: Thomas von Deyen 
Date:   2011-12-06 13:26:22 +0100

    Added git --rebase option for pulling rails master

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit bc99447	refs/heads/master
Author: sandeepravi 
Date:   2011-12-06 17:50:16 +0530

    Added wiki link to REST

M	railties/guides/source/action_controller_overview.textile

commit d722eb3	refs/heads/master
Merge: 81fec5d 0da31a1
Author: José Valim 
Date:   2011-12-06 04:11:59 -0800

    Merge pull request #3876 from tvdeyen/string_as_url_for_expire_action
    
    Allow string as url for expire_action

commit 0da31a1	refs/heads/master
Author: Thomas von Deyen 
Date:   2011-12-06 13:05:15 +0100

    Allowing string as url argument for expire_action

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 8a67b63	refs/heads/master
Author: sandeepravi 
Date:   2011-12-06 17:22:48 +0530

    Added wiki link for REST

M	railties/guides/source/action_controller_overview.textile

commit 81fec5d	refs/heads/master
Merge: 1ee832b d834755
Author: José Valim 
Date:   2011-12-06 00:41:43 -0800

    Merge pull request #3872 from marcandre/i18n_key
    
    ActiveModel::Name#i18n_key: Fix doc and add tests

commit 1ee832b	refs/heads/master
Merge: a2f7c1d 5ff71ac
Author: José Valim 
Date:   2011-12-06 00:41:05 -0800

    Merge pull request #3873 from iangreenleaf/no_default_tokenizer
    
    Don't tokenize string when counting characters

commit d834755	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-12-05 21:52:45 -0500

    ActiveModel::Name#i18n_key: Fix doc and add tests

M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/naming_test.rb

commit a2f7c1d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-05 18:36:27 -0800

    make method signatures match the superclass signature

M	activesupport/lib/active_support/dependencies.rb

commit b942ae8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-05 18:36:08 -0800

    return value is never tested, so stop calling `presence`

M	activesupport/lib/active_support/dependencies.rb

commit 25007ad	refs/heads/master
Author: Adrian Pike 
Date:   2011-10-24 15:57:14 -0700

    Let's do the same trick for asset_path that we do for [image,javascript,stylesheet]_path to avoid namespace conflicts on named routes.
    Closes #3427

M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/template/sprockets_helper_with_routes_test.rb

commit 8aa7b86	refs/heads/master
Author: Aaron Patterson 
Date:   2011-12-05 14:20:14 -0800

    Quitoting the table name before querying.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 988061d	refs/heads/master
Merge: 38185f6 73a331c
Author: Aaron Patterson 
Date:   2011-12-05 14:15:50 -0800

    Merge pull request #3867 from jadeforrest/master
    
    Increase performance for table_exists?

commit d645aed	refs/heads/master
Author: Uģis Ozols 
Date:   2011-12-05 23:11:20 +0200

    Use do end for multiline block.

M	actionpack/lib/action_view/base.rb

commit 38185f6	refs/heads/master
Merge: f6cc4fd d2f46d0
Author: José Valim 
Date:   2011-12-05 12:31:37 -0800

    Merge pull request #3866 from ugisozols/master
    
    Remove .rxml, .rjs and .rhtml from source annotation regexp.

commit d2f46d0	refs/heads/master
Author: Uģis Ozols 
Date:   2011-12-05 21:24:09 +0200

    Remove .rxml, .rjs and .rhtml from source annotation regexp.

M	railties/lib/rails/source_annotation_extractor.rb

commit 73a331c	refs/heads/master
Author: Jade Rubick 
Date:   2011-12-05 10:32:56 -0800

    Speed up table_exists? for databases with a large number of tables
    
    At New Relic, we have hundreds of thousands of tables, and our migrations took 30 minutes without this similar patch. This cuts it down to a more reasonable amount of time.
    
    The rescue false part is ugly, but necessary as far as I can tell. I don't know of a cross-database statement you can make that will work without trapping errors.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 8d55a6d	refs/tags/v3.1.6
Author: kennyj 
Date:   2011-11-22 18:31:58 +0900

    Use show create table.
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 1c65962	refs/heads/master
Author: Uģis Ozols 
Date:   2011-12-05 20:37:08 +0200

    .rhtml and .rxml was removed in Rails 3.

M	actionpack/lib/action_view/base.rb

commit 47bc206	refs/tags/v3.1.6
Merge: d2ab2b0 a070dd1
Author: Aaron Patterson 
Date:   2011-12-05 09:05:28 -0800

    Merge pull request #3860 from sumbach/test-return-value-from-require-on-3-1-stable
    
    Test return value from require on 3-1-stable

commit f6cc4fd	refs/heads/master
Merge: 168c088 71d769e
Author: José Valim 
Date:   2011-12-05 08:48:25 -0800

    Merge pull request #3861 from andyjeffries/master
    
    Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)

commit 168c088	refs/heads/master
Merge: d4964b3 1f0e21c
Author: José Valim 
Date:   2011-12-05 08:46:10 -0800

    Merge pull request #3863 from lest/params-wrapper-inflections
    
    use classify in ParamsWrapper to derive model name from controller name

commit 1f0e21c	refs/heads/master
Author: lest 
Date:   2011-12-05 19:05:03 +0300

    use classify in ParamsWrapper to derive model name from controller name

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 71d769e	refs/heads/master
Author: Andy Jeffries 
Date:   2011-12-05 15:41:38 +0000

    Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb

commit d4964b3	refs/heads/master
Author: José Valim 
Date:   2011-12-05 15:39:41 +0100

    Namespaced attribute lookup now works as 'model/association.attribute'.

M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit 0bcac98	refs/heads/master
Merge: c9cc535 c921ba9
Author: Sergey Parizhskiy 
Date:   2011-12-05 16:25:25 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit c9cc535	refs/heads/master
Author: Sergey Parizhskiy 
Date:   2011-12-05 16:25:02 +0200

    changes in the way of how the stylesheets_link_tag works

M	railties/guides/source/layouts_and_rendering.textile

commit 2985151	refs/heads/master
Merge: be482bd dff19f7
Author: José Valim 
Date:   2011-12-05 06:09:33 -0800

    Merge pull request #3859 from kuroda/human_attribute_name
    
    Fix human_attribute_name to handle names with dots

commit dff19f7	refs/heads/master
Author: Tsutomu Kuroda 
Date:   2011-12-05 22:57:47 +0900

    Fix human_attribute_name to handle names with dots
    
    Nested I18n namespace lookup under activerecord.models is deprecated now (c19bd4f).
    But when a model uses accepts_nested_attributes_for, its Errors object can have
    an attribute name with "addresses.street" style. In this case, the dots should be
    substituted with slashes so that we can provide the translation under the
    "activemodel.attributes.person.addresses/street" key.

M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit a070dd1	refs/tags/v3.1.6
Author: Sam Umbach 
Date:   2011-12-03 13:10:58 -0500

    Simplify load and require tests
    
    - These tests don't use autoloading so there's no need to add anything to autoload_paths

M	activesupport/test/dependencies_test.rb

commit 0f81554	refs/tags/v3.1.6
Author: Sam Umbach 
Date:   2011-12-03 13:08:18 -0500

    Test that require and load raise LoadError if file not found

M	activesupport/test/dependencies_test.rb

commit 31cead7	refs/tags/v3.1.6
Author: Sam Umbach 
Date:   2011-12-03 12:58:31 -0500

    Test return value of ActiveSupport::Dependencies::Loadable#load

M	activesupport/test/dependencies_test.rb

commit 9a780f6	refs/tags/v3.1.6
Author: Sam Umbach 
Date:   2011-12-03 09:41:03 -0500

    Test return value of ActiveSupport::Dependencies::Loadable#require
    
    - Add tests to protect from regressions in require's return value behavior
    - See a10606c490471d8e1483acb3b31d7f2d51e9ebbe (require needs to return true or false) for the original bug fix

M	activesupport/test/dependencies_test.rb

commit c921ba9	refs/heads/master
Author: Jason Noble 
Date:   2011-12-05 05:22:13 -0700

    Remove redundant or

M	railties/guides/source/migrations.textile

commit be482bd	refs/heads/master
Merge: 446bdb4 9fb5ee8
Author: Xavier Noria 
Date:   2011-12-05 02:55:08 -0800

    Merge pull request #3858 from Overbryd/redirect_to_url_with_network_path_reference
    
    redirect_to url with network path reference: Do not escape forward slashes within a curly regexp

commit 9fb5ee8	refs/heads/master
Author: Overbryd 
Date:   2011-12-05 11:48:05 +0100

    Minor enhancement by not unnecessarely escaping forward slashing within a curly regexp and by mentoining the protocol relative scheme in the internal comment

M	actionpack/lib/action_controller/metal/redirecting.rb

commit 446bdb4	refs/heads/master
Merge: cf6ccf0 e31c4ac
Author: José Valim 
Date:   2011-12-05 02:30:21 -0800

    Merge pull request #3857 from Overbryd/redirect_to_url_with_network_path_reference
    
    Fix for redirect_to to respect urls with a network path reference like "//asset.host.com/resources/1235"

commit e31c4ac	refs/heads/master
Author: Overbryd 
Date:   2011-12-05 11:14:21 +0100

    Fix for redirect_to to respect urls with a network path reference like "//asset.host.com/resources/1235" see issue #3856

M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/test/controller/redirect_test.rb

commit 5ff71ac	refs/heads/master
Author: Ian Young 
Date:   2011-12-04 23:20:54 -0800

    Don't tokenize string when counting characters

M	activemodel/lib/active_model/validations/length.rb

commit cf6ccf0	refs/heads/master
Merge: 4ded0dd a8134ac
Author: José Valim 
Date:   2011-12-04 15:57:13 -0800

    Merge pull request #3854 from exviva/validates_associated_marked_for_destruction
    
    Do not validate associated records marked for destruction

commit a8134ac	refs/heads/master
Author: Olek Janiszewski 
Date:   2011-12-04 23:34:58 +0100

    Do not validate associated records marked for destruction
    
    The main reason for this change is to fix a bug where
    `validates_associated` would prevent `accepts_nested_attributes_for`
    with `allow_destroy: true` from destroying invalid associated records.

M	activerecord/lib/active_record/validations/associated.rb
M	activerecord/test/cases/validations/association_validation_test.rb

commit 4ded0dd	refs/heads/master
Merge: 4e74bd1 82ae5c4
Author: Jon Leighton 
Date:   2011-12-04 15:19:17 -0800

    Merge pull request #3851 from ebeigarts/fix_sequence_name
    
    Fix sequence name with abstract classes.

commit 4e74bd1	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-04 13:53:26 -0800

    moves some auto explain logic to the subscriber [José Valim & Xavier Noria]

M	activerecord/lib/active_record/explain.rb
M	activerecord/lib/active_record/explain_subscriber.rb

commit 7f3ce35	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-04 13:27:03 -0800

    simplifies ActiveRecord::ExplainSubscriber [José Valim & Xavier Noria]

M	activerecord/lib/active_record/explain_subscriber.rb

commit d59bfeb	refs/tags/v3.2.0.rc1
Merge: 0ec0c9a cfeac38
Author: Xavier Noria 
Date:   2011-12-04 11:55:53 -0800

    Merge branch 'explain'

commit cfeac38	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-04 11:29:56 -0800

    implements a much faster auto EXPLAIN, closes #3843 [José Valim & Xavier Noria]
    
    This commit vastly reduces the impact of auto
    explain logging when enabled, while keeping
    a negligible cost when disabled.
    
    The first implementation was based on the idea
    of subscribing to "sql.active_record" when
    needed, and unsubscribing once done. This is
    the idea behind AR::Relation#explain. Subscribe,
    collect, unsubscribe.
    
    But with the current implementation of notifications
    unsubscribing is costly, because it wipes an internal
    cache and that puts a penalty on the next event.
    
    So we are switching to an approach where a long-running
    subscriber is listening. Instead of collecting the
    queries with a closure in a dedicated subscriber, now
    we setup a thread local.
    
    If the feature is disabled by setting the threshold
    to nil, the subscriber will call a method that does
    nothing. That's totally cheap.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/explain.rb
A	activerecord/lib/active_record/explain_subscriber.rb
M	activerecord/lib/active_record/log_subscriber.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/explain_test.rb

commit 0ec0c9a	refs/tags/v3.2.0.rc1
Merge: c24928c e29773f
Author: José Valim 
Date:   2011-12-04 11:25:12 -0800

    Merge pull request #3853 from nashby/form_for_as_option
    
    form_for with :as option uses "action_as" as css class and id

commit c24928c	refs/tags/v3.2.0.rc1
Merge: 3134b46 cfc467f
Author: Aaron Patterson 
Date:   2011-12-04 11:22:09 -0800

    Merge pull request #3845 from sumbach/test-return-value-from-require
    
    Add tests for the return value of require

commit e29773f	refs/tags/v3.2.0.rc1
Author: Vasiliy Ermolovich 
Date:   2011-12-04 22:12:24 +0300

    form_for with +:as+ option uses "action_as" as css class and id

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 3134b46	refs/heads/master
Merge: 91a3e92 69341d3
Author: Vijay Dev 
Date:   2011-12-04 23:56:46 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 82ae5c4	refs/heads/master
Author: Edgars Beigarts 
Date:   2011-12-04 18:05:54 +0200

    Fix sequence name with abstract classes.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 91a3e92	refs/heads/master
Merge: 5dfdc69 4e836e4
Author: José Valim 
Date:   2011-12-04 04:46:59 -0800

    Merge pull request #3850 from carlosantoniodasilva/readonly-attributes
    
    Refactor readonly attributes conditional

commit 4e836e4	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2011-12-04 01:05:29 -0200

    Refactor readonly attributes conditional

M	activerecord/lib/active_record/base.rb

commit 69341d3	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-04 16:29:11 +0530

    copy edits in the migrations guide

M	railties/guides/source/migrations.textile

commit 5dfdc69	refs/tags/v3.2.0.rc1
Merge: e9b6659 ac4763f
Author: Xavier Noria 
Date:   2011-12-04 01:56:50 -0800

    Merge pull request #3848 from arunagw/sqlite3_bump
    
    SQlite3 Bump

commit ac4763f	refs/tags/v3.2.0.rc1
Author: Arun Agrawal 
Date:   2011-12-04 10:27:44 +0530

    SQlite3 Bump

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit 95213ac	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:31:04 -0700

    Be explicit about where to add/remove stuff to the migration

M	railties/guides/source/migrations.textile

commit b6d7ce9	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:30:43 -0700

    Fix missing /ruby block

M	railties/guides/source/migrations.textile

commit 718d0ea	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:24:43 -0700

    Be explicit of where the constraints are.

M	railties/guides/source/migrations.textile

commit 914b85f	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:24:28 -0700

    Improve readability

M	railties/guides/source/migrations.textile

commit 452b624	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:23:20 -0700

    Be more friendly than "shut up"

M	railties/guides/source/migrations.textile

commit 6589359	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:22:55 -0700

    A table format makes this section easier to read

M	railties/guides/source/migrations.textile

commit e9b3b9e	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:22:31 -0700

    This section is more about changing the output of running migrations

M	railties/guides/source/migrations.textile

commit d1ef1b2	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:22:12 -0700

    Improve readability

M	railties/guides/source/migrations.textile

commit 90f18cc	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:21:43 -0700

    Readability improvements

M	railties/guides/source/migrations.textile

commit 82ba3a7	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:21:08 -0700

    Move this into a section so that "Resetting the database" will show up in TOC

M	railties/guides/source/migrations.textile

commit d8c8bf5	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:20:40 -0700

    Change wording to be more explicit on what migrating with a version does

M	railties/guides/source/migrations.textile

commit 93d9845	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:19:59 -0700

    Migrations can also run the "change" method

M	railties/guides/source/migrations.textile

commit 4130fe3	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:19:17 -0700

    Reword section to make it more readable.

M	railties/guides/source/migrations.textile

commit f41d099	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:18:45 -0700

    We're using methods, not writing them

M	railties/guides/source/migrations.textile

commit aca34b8	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:18:27 -0700

    Change wording to be more understandable

M	railties/guides/source/migrations.textile

commit f7740f2	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:17:00 -0700

    We're using the method, not writing it

M	railties/guides/source/migrations.textile

commit eedb863	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:16:20 -0700

    Change The other... to Another...

M	railties/guides/source/migrations.textile

commit 7480738	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:15:52 -0700

    Reword confusing section

M	railties/guides/source/migrations.textile

commit a41295f	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:13:34 -0700

    Correct grammatical errors

M	railties/guides/source/migrations.textile

commit bc6d1eb	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:12:23 -0700

    It's more that Rails needs to know how to recreate the columns

M	railties/guides/source/migrations.textile

commit ec27272	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:11:51 -0700

    Added "also" to read better

M	railties/guides/source/migrations.textile

commit b3f8cbd	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:11:22 -0700

    Explain the t.timestamps method a little better

M	railties/guides/source/migrations.textile

commit 1f765a2	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:10:49 -0700

    Re-word confusing section

M	railties/guides/source/migrations.textile

commit c8f8ecf	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:03:26 -0700

    Rollback is used elsewhere in the tutorial

M	railties/guides/source/migrations.textile

commit 78f6672	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:03:01 -0700

    Alphabetize fields to make reading easier

M	railties/guides/source/migrations.textile

commit f9cc3f0	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 19:01:53 -0700

    Improve wording, fix some formatting issues

M	railties/guides/source/migrations.textile

commit 9d87fb8	refs/heads/master
Author: Jason Noble 
Date:   2011-12-03 16:48:41 -0700

    Constrained to 80 chars per line

M	railties/guides/source/migrations.textile

commit d7c2fcd	refs/heads/master
Author: Ryan Bigg 
Date:   2011-12-04 08:49:26 +1100

    Update layouts and rendering guide javascript_include_tag to bring it in line with Rails 3.1

M	railties/guides/source/layouts_and_rendering.textile

commit e9b6659	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-03 20:39:49 +0000

    Add missing require

M	activerecord/test/cases/adapters/postgresql/utils_test.rb

commit 51dcf85	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-12-03 20:09:43 +0000

    Enable postgres on the CI :heart: :beer: :sparkles:
    
    Conflicts:
    
    	Gemfile

M	.travis.yml
M	Gemfile

commit d2ab2b0	refs/tags/v3.1.6
Author: Jon Leighton 
Date:   2011-12-03 20:09:43 +0000

    Enable postgres on the CI :heart: :beer: :sparkles:

M	.travis.yml
M	Gemfile

commit c1e2c1a	refs/tags/v3.1.6
Author: Jon Leighton 
Date:   2011-12-03 20:06:46 +0000

    Avoid postgres 9.X syntax

M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 3f23c04	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-03 20:09:43 +0000

    Enable postgres on the CI :heart: :beer: :sparkles:

M	.travis.yml
M	Gemfile

commit 51c2ef0	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-03 20:06:46 +0000

    Avoid postgres 9.X syntax

M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 36b6c52	refs/tags/v3.0.14
Merge: 9ebacf3 cc3fb2e
Author: Aaron Patterson 
Date:   2011-12-03 11:24:27 -0800

    Merge pull request #3846 from sumbach/backport-load-and-require-fixes-to-3-0
    
    Backport load and require fixes to 3 0

commit cc3fb2e	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-08-23 17:04:05 -0700

    `load` should also return the value from `super`

M	activesupport/lib/active_support/dependencies.rb

commit 8fabf78	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-08-23 16:55:11 -0700

    require needs to return true or false. thank you Ryan "zenspider" Davis

M	activesupport/lib/active_support/dependencies.rb

commit 289ae94	refs/tags/v3.0.14
Author: Sam Umbach 
Date:   2011-12-03 13:10:58 -0500

    Simplify load and require tests
    
    - These tests don't use autoloading so there's no need to add anything to autoload_paths

M	activesupport/test/dependencies_test.rb

commit 0531e26	refs/tags/v3.0.14
Author: Sam Umbach 
Date:   2011-12-03 13:08:18 -0500

    Test that require and load raise LoadError if file not found

M	activesupport/test/dependencies_test.rb

commit 9effced	refs/tags/v3.0.14
Author: Sam Umbach 
Date:   2011-12-03 12:58:31 -0500

    Test return value of ActiveSupport::Dependencies::Loadable#load

M	activesupport/test/dependencies_test.rb

commit cfc467f	refs/tags/v3.2.0.rc1
Author: Sam Umbach 
Date:   2011-12-03 13:10:58 -0500

    Simplify load and require tests
    
    - These tests don't use autoloading so there's no need to add anything to autoload_paths

M	activesupport/test/dependencies_test.rb

commit 2a9f063	refs/tags/v3.2.0.rc1
Author: Sam Umbach 
Date:   2011-12-03 13:08:18 -0500

    Test that require and load raise LoadError if file not found

M	activesupport/test/dependencies_test.rb

commit 0a48530	refs/tags/v3.2.0.rc1
Author: Sam Umbach 
Date:   2011-12-03 12:58:31 -0500

    Test return value of ActiveSupport::Dependencies::Loadable#load

M	activesupport/test/dependencies_test.rb

commit dea2e9c	refs/tags/v3.0.14
Author: Sam Umbach 
Date:   2011-12-03 09:41:03 -0500

    Test return value of ActiveSupport::Dependencies::Loadable#require
    
    - Add tests to protect from regressions in require's return value behavior
    - See a10606c490471d8e1483acb3b31d7f2d51e9ebbe (require needs to return true or false) for the original bug fix

M	activesupport/test/dependencies_test.rb

commit 93580f4	refs/tags/v3.2.0.rc1
Author: Sam Umbach 
Date:   2011-12-03 09:41:03 -0500

    Test return value of ActiveSupport::Dependencies::Loadable#require
    
    - Add tests to protect from regressions in require's return value behavior
    - See a10606c490471d8e1483acb3b31d7f2d51e9ebbe (require needs to return true or false) for the original bug fix

M	activesupport/test/dependencies_test.rb

commit 9c172b2	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-03 16:46:46 +0000

    Fix #3837.
    
    We also need to time zone convert time zone aware attributes when
    accessed via read_attribute, not only when via direct access.

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit de24ed9	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-03 14:26:34 +0100

    removes the convenience instance version of AR::Base.silence_auto_explain
    
    Rationale: As discussed with José and Jon, this convenience
    shortcut is not clearly justified and it could let the user
    thing the disabled EXPLAINs are related to the model instance
    rather than being globally disabled.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/explain.rb
M	activerecord/test/cases/explain_test.rb
M	railties/guides/source/active_record_querying.textile

commit a02691c	refs/tags/v3.2.0.rc1
Merge: 2e902d5 24b8814
Author: Jon Leighton 
Date:   2011-12-03 04:01:14 -0800

    Merge pull request #3820 from jaylevitt/nested_loading_through_assoc
    
    reintroduce patch from #726 to handle nested eager loading via associations

commit 2e902d5	refs/tags/v3.2.0.rc1
Merge: 75981a9 f3470b0
Author: Jon Leighton 
Date:   2011-12-03 03:36:00 -0800

    Merge pull request #3833 from kennyj/fix_3678-3
    
    Use show create table (fix 3678: third time).

commit 75981a9	refs/tags/v3.2.0.rc1
Merge: 2ab2077 c4f1868
Author: José Valim 
Date:   2011-12-03 02:45:22 -0800

    Merge pull request #3842 from arunagw/app_gen_test
    
    App Generator test

commit c4f1868	refs/tags/v3.2.0.rc1
Author: Arun Agrawal 
Date:   2011-12-03 15:46:24 +0530

    Simplifying test in app/generator

M	railties/test/generators/app_generator_test.rb

commit 2ab2077	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-03 11:38:25 +0100

    Fix failing cascade exception.

M	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/dispatch/debug_exceptions_test.rb

commit 1583dab	refs/tags/v3.1.6
Author: Jon Jensen 
Date:   2011-12-02 12:55:33 -0700

    Restore performance of ERB::Util.html_escape
    
    Revert html_escape to do a single gsub again, but add the "n" flag (no
    language, i.e. not multi-byte) to protect against XSS via invalid utf8
    
    Signed-off-by: José Valim 

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 0e17cf1	refs/tags/v3.2.0.rc1
Author: Jon Jensen 
Date:   2011-12-02 12:55:33 -0700

    Restore performance of ERB::Util.html_escape
    
    Revert html_escape to do a single gsub again, but add the "n" flag (no
    language, i.e. not multi-byte) to protect against XSS via invalid utf8
    
    Signed-off-by: José Valim 

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 9ac6310	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-03 03:08:18 +0530

    fix a typo in query guide

M	railties/guides/source/active_record_querying.textile

commit 3a96780	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-02 11:44:04 -0800

    yield > block.call

M	activerecord/lib/active_record/explain.rb

commit 15dab0d	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-02 11:29:35 -0800

    two small details from the previous patch

M	activerecord/lib/active_record/explain.rb
M	railties/guides/source/active_record_querying.textile

commit 0be5ada	refs/tags/v3.2.0.rc1
Author: Xavier Noria 
Date:   2011-12-02 11:16:07 -0800

    implements AR::Base(.|#)silence_auto_explain

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/explain.rb
M	activerecord/test/cases/explain_test.rb
M	railties/guides/source/active_record_querying.textile

commit 36c0141	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-03 00:23:58 +0530

    fix typo in railties changelog

M	railties/CHANGELOG.md

commit ee45823	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-02 23:53:21 +0530

    revises Enumerable#pluck in AS guide

M	railties/guides/source/active_support_core_extensions.textile

commit 2512192	refs/tags/v3.1.6
Author: Leandro Santos 
Date:   2011-11-30 14:29:17 -0500

    typo in the performance testing rails guide

M	railties/guides/source/performance_testing.textile

commit 9473f7d	refs/tags/v3.1.6
Author: Richard Hulse 
Date:   2011-12-02 10:44:34 +1300

    [docs] removed last-modifed line from examples
    
    This is no longer best-practice.
    
    ref:
    http://stackoverflow.com/questions/8344186/rails-3-1-on-apache-pagespeed-says-specify-cache-validator-when-using-asset-p/8348385#8348385

M	railties/guides/source/asset_pipeline.textile

commit baa93a1	refs/heads/master
Merge: f402ef5 3d550e5
Author: Vijay Dev 
Date:   2011-12-02 23:43:52 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit f402ef5	refs/heads/master
Author: Vijay Dev 
Date:   2011-12-02 23:41:50 +0530

    rephrase doc on explain threshold

M	railties/guides/source/configuring.textile

commit 3d550e5	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-02 23:15:08 +0530

    Added doc about pluck for active_support core ext

M	railties/guides/source/active_support_core_extensions.textile

commit 31a3124	refs/heads/master
Merge: 36cc1f7 9a59475
Author: Xavier Noria 
Date:   2011-12-02 09:29:26 -0800

    Merge pull request #3832 from arunagw/indentation
    
    indentation fix warning

commit 9a59475	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-02 22:55:15 +0530

    indentation fix warning

M	activerecord/lib/active_record/relation.rb

commit f3470b0	refs/tags/v3.2.0.rc1
Author: kennyj 
Date:   2011-11-22 18:31:58 +0900

    Use show create table.

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

commit 36cc1f7	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-02 09:19:13 -0800

    revises some details in the previous explain patch

M	activerecord/lib/active_record/explain.rb
M	activerecord/lib/active_record/relation.rb
M	railties/CHANGELOG.md

commit 9acb340	refs/heads/master
Author: Jon Leighton 
Date:   2011-12-02 13:23:31 +0000

    Revert "Roflscaling!" (for now)
    
    This reverts commit f6b5046305d43c5f64bcb6fed0e44f7bca99a603.
    
    Fear not, the roflscale will return when I have a bit more time and
    figure out a better way to do it. (In particular, a way that doesn't
    break the build.)

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb

commit 0306f82	refs/heads/master
Author: Xavier Noria 
Date:   2011-12-02 04:32:18 -0800

    implements automatic EXPLAIN logging for slow queries

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
A	activerecord/lib/active_record/explain.rb
M	activerecord/lib/active_record/relation.rb
A	activerecord/test/cases/explain_test.rb
M	railties/CHANGELOG.md
M	railties/guides/code/getting_started/config/environments/development.rb
M	railties/guides/code/getting_started/config/environments/production.rb
M	railties/guides/source/configuring.textile
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/generators/app_generator_test.rb

commit 4d20de8	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-12-02 13:00:03 +0100

    Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/test/core_ext/enumerable_test.rb

commit 76a3ec7	refs/heads/master
Author: José Valim 
Date:   2011-12-02 09:57:43 +0100

    Try to play nice with plugins doing monkey patches.

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb

commit 9f623e2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-02 08:45:11 +0530

    [Docs] Information about ActionDispatch::DebugExceptions in rake task

M	railties/guides/source/rails_on_rack.textile

commit 330db28	refs/heads/master
Author: Arun Agrawal 
Date:   2011-12-02 08:44:32 +0530

    Adding information about ActionDispatch::DebugExceptions

M	railties/guides/source/command_line.textile

commit 6bff643	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 22:57:34 +0000

    Fewer string allocations in attribute method

M	activerecord/lib/active_record/attribute_methods/read.rb

commit f6b5046	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 22:47:12 +0000

    Roflscaling!
    
    Don't prefix the name with attribute_. Avoids a string allocation on
    read_attribute, which is a bit faster.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb

commit 9ead413	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 22:30:15 +0000

    Create method with known identifier then alias into place.
    
    This means we never have to rely on define_method (which is slower and
    uses more memory), even when we have attributes containing characters
    that are not allowed in standard method names.
    
    (I am mainly changing this because the duplication annoys me, though.)

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/base_test.rb

commit bd920ea	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 22:20:06 +0000

    Remove some unnecessary code etc

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

commit e9fb6d0	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 21:55:59 +0000

    Add test for read_attribute(:id) with non-standard PK.
    
    Also make it actually work.
    
    It slows down all read_attribute accesses to map 'id' to whatever the PK
    actually is, inside read_attribute. So instead make sure the necessary
    methods are defined and that they redirect wherever they need to go.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/primary_keys_test.rb

commit f1a534a	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 17:55:27 +0000

    Remove the need for type_cast_attribute.
    
    This is good because it reduces duplication.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/base.rb

commit 47b97a7	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 17:36:03 +0000

    Fix up test altering global state that was causing me grief

M	activerecord/test/cases/locking_test.rb

commit 3a40d38	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 11:24:30 +0000

    Get rid of the underscore versions of attribute methods!
    
    This makes me happy!

M	activerecord/lib/active_record.rb
A	activerecord/lib/active_record/attribute_methods/deprecated_underscore_read.rb
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 3dcb127	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 15:16:41 +0000

    Don't rely on underscore-prefixed attribute methods.
    
    Define singleton methods on the attributes module instead. This reduces
    method pollution on the actual model classes. It also seems to make
    something faster, I am unsure why! O_o

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

commit 365e10b	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 15:03:50 +0000

    Remove unnecessary *args

M	activerecord/lib/active_record/attribute_methods.rb

commit d72a85c	refs/heads/master
Author: Richard Hulse 
Date:   2011-12-02 10:44:34 +1300

    [docs] removed last-modifed line from examples
    
    This is no longer best-practice.
    
    ref:
    http://stackoverflow.com/questions/8344186/rails-3-1-on-apache-pagespeed-says-specify-cache-validator-when-using-asset-p/8348385#8348385

M	railties/guides/source/asset_pipeline.textile

commit 07f90f6	refs/tags/v3.2.0.rc1
Merge: 83d29a2 6a4606d
Author: José Valim 
Date:   2011-12-01 21:18:47 +0100

    Merge branch 'exceptions' with the following features:
    
    * A Railtie API for registering new exceptions and their respective status code (check Active Record railtie for an example)
    
    * Extraction of ShowExceptions middleware logging and debugging features into a middleware called DebugExceptions
    
    Conflicts:
    	actionpack/CHANGELOG.md

commit 6a4606d	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-01 21:17:11 +0100

    Remove unnecessary test setup.

M	actionpack/test/dispatch/show_exceptions_test.rb

commit f9edc07	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-01 21:15:42 +0100

    Split and improve show and debug exceptions middlewares.

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
A	actionpack/test/dispatch/debug_exceptions_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	railties/CHANGELOG.md

commit 750bb5c	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-01 20:46:18 +0100

    Split ShowExceptions responsibilities in two middlewares.

M	actionpack/lib/action_dispatch.rb
A	actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
M	actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/controller/show_exceptions_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	railties/lib/rails/application.rb
A	railties/test/application/middleware/exceptions_test.rb
D	railties/test/application/middleware/show_exceptions_test.rb
M	railties/test/application/middleware_test.rb

commit 83d29a2	refs/tags/v3.2.0.rc1
Author: David Heinemeier Hansson 
Date:   2011-12-01 20:45:47 +0100

    Revert "Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale? conditional get methods from Action Pack"
    
    Needless indirection with no added value.
    
    This reverts commit 535853e83b9092078035a5abb2aa242fba815c05.

M	actionpack/lib/action_controller/metal/conditional_get.rb
M	actionpack/test/controller/render_test.rb
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb

commit 956ecff	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-01 20:16:12 +0100

    Add a deprecation to old show exceptions API (even though it was not public).

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb

commit 0b677b1	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-01 20:02:00 +0100

    Add an ExceptionWrapper that wraps an exception and provide convenience helpers.

M	actionpack/lib/action_controller/log_subscriber.rb
M	actionpack/lib/action_dispatch.rb
A	actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/lib/action_dispatch/railtie.rb

commit 535853e	refs/tags/v3.2.0.rc1
Author: David Heinemeier Hansson 
Date:   2011-12-01 19:47:14 +0100

    Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale? conditional get methods from Action Pack

M	actionpack/lib/action_controller/metal/conditional_get.rb
M	actionpack/test/controller/render_test.rb
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb

commit b4359bc	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-01 19:16:19 +0100

    Allow rescue responses to be configured through a railtie.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	activerecord/lib/active_record/railtie.rb
M	railties/test/application/middleware/show_exceptions_test.rb
M	railties/test/application/middleware_test.rb

commit 218c272	refs/tags/v3.2.0.rc1
Author: David Heinemeier Hansson 
Date:   2011-12-01 19:09:22 +0100

    Allow fresh_when/stale? to take a record instead of an options hash [DHH]

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/metal/conditional_get.rb
M	actionpack/test/controller/render_test.rb

commit b4e1903	refs/heads/master
Merge: fae9ad9 1e51cd9
Author: Olli Jokinen 
Date:   2011-12-01 15:32:59 +0200

    Merge remote-tracking branch 'upstream/master'

commit bb2adab	refs/heads/master
Author: Tim Sjoberg 
Date:   2011-12-01 14:27:51 +0200

    fixed finger-dyslexia in active_support core extensions guide

M	railties/guides/source/active_support_core_extensions.textile

commit 1e51cd9	refs/tags/v3.2.0.rc1
Author: José Valim 
Date:   2011-12-01 13:22:28 +0100

    Update CHANGELOG.

M	actionpack/CHANGELOG.md

commit 7fc91aa	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-12-01 13:21:21 +0100

    Update CHANGELOG.

M	actionpack/CHANGELOG.md

commit 0ce562c	refs/tags/v3.1.6
Author: Jonathan del Strother 
Date:   2011-11-17 11:48:12 +0000

    Leave default_asset_host_protocol unset
    
    When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit f8b9342	refs/tags/v3.2.0.rc1
Merge: cb71457 88237da
Author: José Valim 
Date:   2011-12-01 04:18:41 -0800

    Merge pull request #3660 from jdelStrother/asset_protocol
    
    default_asset_host_protocol should not default to :relative

commit 88237da	refs/tags/v3.2.0.rc1
Author: Jonathan del Strother 
Date:   2011-11-17 11:48:12 +0000

    Leave default_asset_host_protocol unset
    
    When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)

M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit cb71457	refs/tags/v3.2.0.rc1
Merge: 52eedf5 814a4c3
Author: José Valim 
Date:   2011-11-30 22:09:56 -0800

    Merge pull request #3823 from avakhov/av-length-validation-exception-msg-fix
    
    Fix argument error message for length validation

commit 814a4c3	refs/tags/v3.2.0.rc1
Author: Alexey Vakhov 
Date:   2011-12-01 09:12:16 +0400

    Fix argument error message for length validation

M	activemodel/lib/active_model/validations/length.rb

commit 52eedf5	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-12-01 01:15:16 +0000

    Add hackery to make Syck use encode_with/init_with. Fixes 1.8 after recent changes to attribute serialization.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/yaml_serialization_test.rb

commit 6fd9c1d	refs/tags/v3.1.6
Author: Jon Leighton 
Date:   2011-11-30 23:47:10 +0000

    don't alter global state in test

M	activerecord/test/cases/attribute_methods_test.rb

commit 5f27545	refs/tags/v3.1.6
Author: Julius de Bruijn 
Date:   2011-11-30 17:56:16 +0100

    If the table behind has no primary key, do not ask again and just return nil.
    
    Conflicts:
    
    	activerecord/test/cases/attribute_methods_test.rb

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 1c783c6	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 23:47:10 +0000

    don't alter global state in test

M	activerecord/test/cases/attribute_methods_test.rb

commit 4e38082	refs/tags/v3.2.0.rc1
Author: Julius de Bruijn 
Date:   2011-11-30 17:56:16 +0100

    If the table behind has no primary key, do not ask again and just return nil.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 7a4949e	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 23:03:45 +0000

    consistency

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/write.rb

commit d5f7884	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 22:45:35 +0000

    Don't check column type, you might implement a custom coder that serializes to a different type

M	activerecord/lib/active_record/attribute_methods/serialization.rb

commit 7895182	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 22:31:52 +0000

    omg computer science!
    
    Implement a mini state machine for serialized attributes. This means we
    do not have to deserialize the values upon initialization, which means
    that if we never actually access the attribute, we never have to
    deserialize it.

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 4f20eb5	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 21:49:24 +0000

    Fix typo

M	activerecord/test/cases/store_test.rb

commit 035b424	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 16:12:51 +0000

    Don't need second param

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/serialization.rb

commit efcc95a	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 16:06:42 +0000

    No longer need to undef id as we are defining it ourselves

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 6c63f1a	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 16:00:19 +0000

    Move some serialization stuff out of Base

M	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/base.rb

commit f4853dc	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 15:52:09 +0000

    Extract attribute serialization code into a separate module

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
A	activerecord/lib/active_record/attribute_methods/serialization.rb
M	activerecord/lib/active_record/base.rb

commit 61489dc	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 15:09:50 +0000

    Use inheritance to avoid special-case code for the 'id' method

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 4c33d51	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 14:16:30 +0000

    #id is an alias for whatever the primary key is

M	activerecord/lib/active_record/attribute_methods/primary_key.rb

commit 40840aa	refs/tags/v3.2.0.rc1
Author: Jon Leighton 
Date:   2011-11-30 14:08:32 +0000

    fix indent

M	activerecord/lib/active_record/attribute_methods/dirty.rb

commit 24b8814	refs/tags/v3.2.0.rc1
Author: Jay Levitt 
Date:   2011-11-30 18:12:24 -0500

    reintroduce patch from #726 to handle nested eager loading via associations

M	activerecord/lib/active_record/associations/join_dependency.rb
M	activerecord/test/cases/associations/eager_test.rb

commit cbeeaa6	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-01 01:23:19 +0530

    expand on pluck docs

M	railties/guides/source/active_record_querying.textile

commit a72839b	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-01 01:06:24 +0530

    minor typo fix

M	actionpack/lib/action_view/helpers/form_helper.rb
M	railties/guides/source/form_helpers.textile

commit 04b4fe7	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-01 01:04:47 +0530

    s/is is/is

M	activerecord/lib/active_record/associations.rb

commit a604983	refs/tags/v3.2.0.rc1
Merge: 0092f06 13cab6e
Author: Yehuda Katz 
Date:   2011-11-30 11:45:18 -0800

    Merge pull request #3816 from lest/exception-page-utf-8
    
    fix exception page when template contains utf-8 and parameters contain utf-8

commit fca655f	refs/heads/master
Author: Leandro Santos 
Date:   2011-11-30 14:29:17 -0500

    typo in the performance testing rails guide

M	railties/guides/source/performance_testing.textile

commit 0092f06	refs/tags/v3.2.0.rc1
Merge: 9811c36 331080a
Author: Vijay Dev 
Date:   2011-11-30 11:23:37 -0800

    Merge pull request #3786 from nashby/add-namespace-to-form
    
    update guides for the namespace option in form helpers

commit 9811c36	refs/tags/v3.2.0.rc1
Author: Vijay Dev 
Date:   2011-12-01 00:32:37 +0530

    fix bad nodocs

M	activeresource/lib/active_resource/exceptions.rb

commit 13cab6e	refs/tags/v3.2.0.rc1
Author: lest 
Date:   2011-11-30 21:51:01 +0300

    fix exception page when template contains utf-8 and parameters contain utf-8

M	actionpack/lib/action_view/template/error.rb
M	railties/test/application/middleware/show_exceptions_test.rb

commit 5b3d4f0	refs/tags/v3.2.0.rc1
Author: Aaron Patterson 
Date:   2011-11-30 10:14:01 -0800

    switch WatchStack to use composition, tighten up API

M	activesupport/lib/active_support/dependencies.rb

commit 88daf08	refs/heads/master
Merge: 5b2eb64 e3bc138
Author: Vijay Dev 
Date:   2011-11-30 23:32:01 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 5b2eb64	refs/heads/master
Author: José Valim 
Date:   2011-11-30 18:38:28 +0100

    Revert "Implement ArraySerializer and move old serialization API to a new namespace."
    
    This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0.
    
    Conflicts:
    
    	activemodel/lib/active_model.rb
    	activemodel/lib/active_model/serializable.rb
    	activemodel/lib/active_model/serializer.rb
    	activemodel/test/cases/serializer_test.rb

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model.rb
D	activemodel/lib/active_model/serializable.rb
D	activemodel/lib/active_model/serializable/json.rb
D	activemodel/lib/active_model/serializable/xml.rb
M	activemodel/lib/active_model/serialization.rb
D	activemodel/lib/active_model/serializer.rb
M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/serializers/xml.rb
D	activemodel/test/cases/serializable/json_test.rb
D	activemodel/test/cases/serializable/xml_test.rb
D	activemodel/test/cases/serializable_test.rb
A	activemodel/test/cases/serialization_test.rb
A	activemodel/test/cases/serializers/json_serialization_test.rb
A	activemodel/test/cases/serializers/xml_serialization_test.rb
M	activerecord/lib/active_record/serialization.rb
M	activerecord/lib/active_record/serializers/xml_serializer.rb
M	activeresource/lib/active_resource/base.rb
M	activesupport/lib/active_support/json/encoding.rb

commit be99f0c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-30 09:46:35 -0800

    Revert "avoid hundreds of thousands of calls to (Symbol|String)#to_s"
    Test coverage isn't comprehensive enough to catch what this breaks. :(
    This reverts commit 45dad592e47944704ab6951351b2fa29d4a2385f.

M	activesupport/lib/active_support/dependencies.rb

commit 45dad59	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-30 09:08:21 -0800

    avoid hundreds of thousands of calls to (Symbol|String)#to_s

M	activesupport/lib/active_support/dependencies.rb

commit 4da8790	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 23:36:12 -0800

    `run_test` method conflicts with newer minitest, so change the name

M	railties/test/application/test_test.rb

commit b757663	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-11-30 10:06:07 -0700

    Using InstanceMethods in a Concern is deprecated

M	actionmailer/lib/action_mailer/test_case.rb

commit 3b07bb3	refs/heads/master
Merge: 2b96b20 6ce924f
Author: José Valim 
Date:   2011-11-30 08:07:51 -0800

    Merge pull request #3810 from lest/fix-warnings
    
    fix method redefined warnings in tests

commit 6ce924f	refs/heads/master
Author: lest 
Date:   2011-11-30 18:47:49 +0300

    fix method redefined warning in activemodel

M	activemodel/test/cases/serializable/json_test.rb
M	activemodel/test/cases/serializable/xml_test.rb

commit 93387e2	refs/heads/master
Author: lest 
Date:   2011-11-30 18:44:37 +0300

    fix deprecation warnings in activeresource

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/custom_methods.rb

commit 565d92f	refs/heads/master
Author: lest 
Date:   2011-11-30 18:34:16 +0300

    fix method redefined warnings in tests

M	actionpack/test/abstract_unit.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/controller/url_for_integration_test.rb

commit 2b96b20	refs/heads/master
Merge: ae53fcc a985309
Author: José Valim 
Date:   2011-11-30 07:11:40 -0800

    Merge pull request #3809 from lest/test-helpers-in-erb
    
    fix warning in tests when using render_erb helper

commit a985309	refs/heads/master
Author: lest 
Date:   2011-11-30 18:05:23 +0300

    fix warning in tests when using render_erb helper

M	actionpack/test/abstract_unit.rb

commit ae53fcc	refs/heads/master
Merge: 271308c e975fe7
Author: José Valim 
Date:   2011-11-30 06:47:05 -0800

    Merge pull request #3806 from lest/test-helpers-in-erb
    
    Test helpers in erb using erb

commit e975fe7	refs/heads/master
Author: lest 
Date:   2011-11-30 17:38:09 +0300

    test helpers in erb using erb

M	actionpack/test/abstract_unit.rb
A	actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	actionpack/test/template/record_tag_helper_test.rb
M	actionpack/test/template/tag_helper_test.rb

commit 9ebacf3	refs/tags/v3.0.14
Merge: 13ad879 be8485e
Author: José Valim 
Date:   2011-11-30 02:43:22 -0800

    Merge pull request #3805 from arunagw/active_model_patch_3-0-stable
    
    Active model patch 3 0 stable

commit be8485e	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-11-30 16:09:13 +0530

    ActiveModel confirmation validator fix fixes #1152
    
    If you have an ActiveModel class that has a
    method email_address_confirmation.
    This method is being overwritten by the
    method defined in the Confirmation validator.

M	activemodel/lib/active_model/validations/confirmation.rb

commit 271308c	refs/heads/master
Merge: 38ab982 a382d60
Author: Jon Leighton 
Date:   2011-11-30 01:41:09 -0800

    Merge pull request #1915 from bogdan/active_record_map
    
    ActiveRecord::Base.map method for direct select by single column

commit a382d60	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-11-30 11:03:00 +0200

    ActiveRecord::Relation#pluck method

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb
M	railties/guides/source/active_record_querying.textile

commit 38ab982	refs/heads/master
Author: José Valim 
Date:   2011-11-30 09:52:52 +0100

    Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a before callback halts.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_controller/log_subscriber.rb
M	actionpack/lib/action_controller/metal/instrumentation.rb
M	actionpack/test/controller/log_subscriber_test.rb
M	activemodel/lib/active_model/callbacks.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callbacks_test.rb

commit a6ee246	refs/heads/master
Author: José Valim 
Date:   2011-11-29 10:19:54 +0100

    Update sprockets which theoretically fixes the regression we have seen.

M	actionpack/actionpack.gemspec

commit 6093d88	refs/heads/master
Author: José Valim 
Date:   2011-11-29 10:17:25 +0100

    Fixes for using action view template in isolation.

M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/template/handlers/builder.rb
M	actionpack/lib/action_view/template/handlers/erb.rb

commit e3bc138	refs/heads/master
Author: Aviv Ben-Yosef 
Date:   2011-11-30 06:55:34 +0200

    Fixing incorrect documentation
    
    `path_names` can only be used for affecting `new` and `edit`

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit d9c2882	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 15:40:46 -0800

    Module#synchronize is deprecated with no replacement.  Please use `monitor` from ruby's standard library.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/module/synchronization.rb
D	activesupport/test/core_ext/module/synchronization_test.rb

commit c606fe2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 15:30:04 -0800

    push synchronization in to each method. Reduces method calls and makes
    it clear which methods are synchronized.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 0e2477b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 15:04:41 -0800

    Automatic closure of connections in threads is deprecated.  For example
    the following code is deprecated:
    
    Thread.new { Post.find(1) }.join
    
    It should be changed to close the database connection at the end of
    the thread:
    
    Thread.new {
      Post.find(1)
      Post.connection.close
    }.join
    
    Only people who spawn threads in their application code need to worry
    about this change.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/transactions_test.rb

commit 29d2040	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 14:40:37 -0800

    AbstractAdapter#close can be called to add the connection back to the
    pool.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb

commit ce3d8d6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:56:24 -0800

    Start implementing @reserved_connections in terms of connection leases.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 5725e39	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:48:31 -0800

    Rename `checked_out` to more descriptive `active_connections`

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit b72b477	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:40:27 -0800

    Use connection lease to determine "checked_out" connections

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit f866f66	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:19:58 -0800

    expire will set in_use to false

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb

commit 79306de	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:16:34 -0800

    last_use is set on connection lease

M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb

commit 134cc8f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:15:20 -0800

    Leased connections return false on second lease

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb

commit 9bf8bf8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:12:56 -0800

    Adapters keep in_use flag when leased

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
A	activerecord/test/cases/connection_adapters/abstract_adapter_test.rb

commit 7837574	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 13:05:57 -0800

    namespace the adapter test

M	activerecord/test/cases/adapter_test.rb

commit 3da5fba	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 20:43:05 +0000

    Fix ruby 1.8 compat. const_defined? only takes a second arg on 1.9.

M	activerecord/lib/active_record/base.rb

commit 8df787d	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 20:10:33 +0000

    Deprecated `define_attr_method` in `ActiveModel::AttributeMethods`
    
    This only existed to support methods like `set_table_name` in Active
    Record, which are themselves being deprecated.

M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/locking_test.rb

commit f3c84dc	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 19:40:29 +0000

    Deprecate set_locking_column in favour of self.locking_column=

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/models/legacy_thing.rb

commit 1a474cc	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 18:58:41 +0000

    Deprecate set_primary_key in favour of self.primary_key=

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/models/country.rb
M	activerecord/test/models/dashboard.rb
M	activerecord/test/models/keyboard.rb
M	activerecord/test/models/minivan.rb
M	activerecord/test/models/mixed_case_monkey.rb
M	activerecord/test/models/owner.rb
M	activerecord/test/models/pet.rb
M	activerecord/test/models/speedometer.rb
M	activerecord/test/models/string_key_object.rb
M	activerecord/test/models/subscriber.rb
M	activerecord/test/models/toy.rb
M	activerecord/test/models/treaty.rb

commit 4aad289	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 18:30:22 +0000

    Make sure the original_foo accessor still works (but deprecated) if we are using self.foo=

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit e51ecfa	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 17:42:05 +0000

    extract method

M	activerecord/lib/active_record/base.rb

commit 7af719e	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 16:33:50 +0000

    Deprecate set_sequence_name in favour of self.sequence_name=

M	actionpack/test/fixtures/company.rb
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/models/company.rb

commit fd7ca98	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 16:04:22 +0000

    Add tests for set_sequence_name etc

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 34609d6	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 15:34:22 +0000

    Deprecate set_inheritance_column in favour of self.inheritance_column=

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/models/parrot.rb

commit 0b72a04	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 12:28:04 +0000

    Deprecate set_table_name in favour of self.table_name= or defining your own method.

M	actionpack/test/activerecord/polymorphic_routes_test.rb
M	actionpack/test/fixtures/developer.rb
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/adapters/postgresql/view_test.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/transaction_callbacks_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/models/joke.rb
M	activerecord/test/models/liquid.rb
M	activerecord/test/models/warehouse_thing.rb
M	railties/guides/source/active_record_basics.textile

commit f73f534	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-29 11:48:55 -0800

    respond_to? information of AR is not the responsibility of the spec
    resolver.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_specification/resolver_test.rb

commit 2169603	refs/heads/master
Merge: d534c8f c347b3c
Author: Jon Leighton 
Date:   2011-11-29 10:09:42 -0800

    Merge pull request #3636 from joshsusser/master
    
    association methods are now generated in modules

commit c347b3c	refs/heads/master
Author: Josh Susser 
Date:   2011-11-29 09:14:21 -0800

    don't change class definition in test case

M	activerecord/test/cases/associations_test.rb
M	activerecord/test/models/post.rb

commit d534c8f	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 12:47:54 +0000

    Fix resolver_test.rb on travis (postgresql isn't setup, so it can't load the connection adapter)

M	activerecord/test/cases/connection_specification/resolver_test.rb

commit 1defb6a	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-29 12:29:42 +0000

    Fix schema_cache_test.rb for sqlite3_mem

M	activerecord/test/cases/connection_adapters/schema_cache_test.rb

commit 6e399ac	refs/heads/master
Merge: 42d70d9 69d56cb
Author: Vijay Dev 
Date:   2011-11-29 02:23:06 -0800

    Merge pull request #3797 from HeeL/test
    
    splited a long line to shorter ones

commit 69d56cb	refs/heads/master
Author: Sergey Parizhskiy 
Date:   2011-11-29 11:50:02 +0200

    splited a long line to shorter ones

M	activerecord/examples/performance.rb

commit 42d70d9	refs/heads/master
Merge: 913c42a 2a76f33
Author: Vijay Dev 
Date:   2011-11-29 00:30:00 -0800

    Merge pull request #3790 from masterkain/patch-1
    
    Fix typo in AS::TaggedLogging

commit 913c42a	refs/heads/master
Merge: 52a9884 d3bc12b
Author: José Valim 
Date:   2011-11-28 23:56:42 -0800

    Merge pull request #3793 from marcandre/asset_host
    
    Handle correctly optional parameters for callable asset_host.

commit d3bc12b	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-11-29 01:59:36 -0500

    Handle correctly optional parameters for callable asset_host.

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 2a76f33	refs/heads/master
Author: Claudio Poli 
Date:   2011-11-29 00:26:58 +0100

    Fix typo in AS::TaggedLogging

M	activesupport/lib/active_support/tagged_logging.rb

commit 52a9884	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-28 15:20:24 -0800

    remove unused instance variable

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit beff819	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-28 15:10:41 -0800

    just check in all connections

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 884a040	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-28 13:37:42 -0800

    remove useless class_eval

M	activerecord/lib/active_record/base.rb

commit dde2113	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-28 13:07:42 -0800

    Move connection resoluion logic to it's own testable class.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_management_test.rb
A	activerecord/test/cases/connection_specification/resolver_test.rb

commit 30f7c59	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-28 11:56:29 -0800

    clean up string => hash conversion for connection pool

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

commit ffb218c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-28 11:46:16 -0800

    pools are 1:1 with spec now rather than 1:1 with class

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb
M	activerecord/test/cases/multiple_db_test.rb

commit 2a9a8ad	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-28 11:06:59 -0800

    break establish_connection to smaller methods

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_management_test.rb

commit 237272e	refs/heads/master
Author: Travis Pew 
Date:   2011-11-28 15:46:09 -0500

    Fix ActionDispatch::Request method explanations
    
    The methods, "post?", "put?", "head?", etc. contain an incorrect
    explanation. They state that they are equivalent to request_method ==
    :type, but this is not accurate because the methods convert the string
    to a symbol. They are actually equivalent to:
      request_method_symbol == :type

M	actionpack/lib/action_dispatch/http/request.rb

commit d1afd98	refs/heads/master
Author: Jakub Kuźma 
Date:   2011-11-28 19:27:58 +0100

    added information about callbacks created by autosave association (#3639)

M	activerecord/lib/active_record/autosave_association.rb

commit 331080a	refs/tags/v3.2.0.rc1
Author: Vasiliy Ermolovich 
Date:   2011-11-28 20:37:08 +0300

    update guides

M	railties/guides/source/form_helpers.textile

commit ba0b3ee	refs/heads/master
Merge: a0c61c8 cba5a3a
Author: Aaron Patterson 
Date:   2011-11-28 09:35:43 -0800

    Merge pull request #3768 from janv/master
    
    Test and fix for Issue 3450

commit a0c61c8	refs/heads/master
Merge: 970caea fe7d4f0
Author: José Valim 
Date:   2011-11-28 08:43:14 -0800

    Merge pull request #3785 from lest/backtrace-cleaner-env
    
    Put backtrace_cleaner to env

commit fe7d4f0	refs/heads/master
Author: lest 
Date:   2011-11-28 19:25:37 +0300

    put backtrace_cleaner to env

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	railties/lib/rails/application.rb
M	railties/test/application/configuration_test.rb

commit afa31cf	refs/heads/master
Author: Sergey Parizhskiy 
Date:   2011-11-28 17:40:14 +0200

    there is no need to repeat about possibility of using -h option to get full help

M	railties/guides/source/command_line.textile

commit e2e2d62	refs/heads/master
Merge: 493cf44 6d05c79
Author: Sergey Parizhskiy 
Date:   2011-11-28 17:33:23 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 493cf44	refs/heads/master
Author: Sergey Parizhskiy 
Date:   2011-11-28 17:33:01 +0200

    completed documentation for the rails server command

M	railties/guides/source/command_line.textile

commit 970caea	refs/heads/master
Merge: f4ce002 cc5f68d
Author: Vijay Dev 
Date:   2011-11-28 07:18:22 -0800

    Merge pull request #3783 from HeeL/master
    
    fixed a typo in a travis message

commit 6d05c79	refs/heads/master
Author: Rodrigo Rosenfeld Rosas 
Date:   2011-11-28 13:15:07 -0200

    Update information about foreign key plugins support in the guides
    
    There is not "a number" of up-to-date maintained plugins for dealing with foreign keys.
    
    The foreign_key_migrations does not have any update since 2009 and is also about to be removed:
    
    Extracted from http://www.harukizaemon.com/2009/09/plugins-grab-em-while-theyre-stale.html,
    referenced in the plugin reference of the old guide version:
    
    "And so it is that I will very shortly (within the next month) delete most of the plugins from
    my GitHub account (harukizaemon)"

M	railties/guides/source/migrations.textile

commit cc5f68d	refs/heads/master
Author: Sergey Parizhskiy 
Date:   2011-11-28 16:45:40 +0200

    fixed a typo in a message when there is no failuresin a build

M	ci/travis.rb

commit f4ce002	refs/heads/master
Merge: 5f75a92 8ef1ec4
Author: José Valim 
Date:   2011-11-28 04:25:55 -0800

    Merge pull request #3278 from arunagw/rails_rake_task_warning
    
    Global variable `$rails_rake_task' not initialized Warning removed

commit 8ef1ec4	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-10 19:02:06 +0530

    global variable `$rails_rake_task' not initialized Warning removed

M	railties/lib/rails/application/finisher.rb

commit c6e513b	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2011-11-17 12:44:06 +0530

    Bump Mysql2!

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 5f75a92	refs/heads/master
Merge: 9ca58ba 13847cc
Author: José Valim 
Date:   2011-11-28 03:15:30 -0800

    Merge pull request #3657 from arunagw/mysql2_bump_master
    
    Bump Mysql2!

commit 9ca58ba	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-28 16:29:55 +0530

    Revert "use any? to check for size"
    
    This reverts commit c4af5f00f602b9e1c3166872902265836daf321b.

M	actionpack/lib/action_view/helpers/atom_feed_helper.rb

commit 89925e8	refs/heads/master
Author: José Valim 
Date:   2011-11-28 11:18:39 +0100

    Revert "Use any instead of length"
    
    This reverts commit 1756629835d39f60ef4c96aff81ac503c71b98b7.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 152bd3c	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-28 11:07:01 +0100

    Revert "Used any? instead of length call"
    
    Reason: This is slower, and any? is not equivalent in the
    general case.
    
    See discussion in https://github.com/rails/rails/pull/3779
    
    This reverts commit 20cbf8eddc3844126d20f1218f068889d17b0dcf.

M	activesupport/lib/active_support/xml_mini/jdom.rb
M	activesupport/lib/active_support/xml_mini/nokogiri.rb

commit 9d77956	refs/tags/v3.2.0.rc1
Author: Marc Bowes 
Date:   2011-11-28 11:55:14 +0200

    * A `/` is required if you want to explicitly skip the assets directory. This is important because `public/assets` is typically git-ignored.
    * The asset id is no longer generated.

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit e7dff9c	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-28 14:10:23 +0530

    Revert "fixed typo in getting started form_for for comments"
    
    This reverts commit 2f428a6245a18017c7942f8fef3da4a85bec8cc5.
    
    See comments here 2f428a6245a18017c7942f8fef3da4a85bec8cc5

M	railties/guides/source/getting_started.textile

commit 2f428a6	refs/heads/master
Author: Tim Reischmann 
Date:   2011-11-28 09:27:42 +0100

    fixed typo in getting started form_for for comments

M	railties/guides/source/getting_started.textile

commit ad5c8b0	refs/heads/master
Merge: 5cf56a4 2559256
Author: José Valim 
Date:   2011-11-27 23:59:36 -0800

    Merge pull request #3776 from nashby/add-namespace-to-form
    
    add namespace options to form_for

commit 2559256	refs/tags/v3.2.0.rc1
Author: Vasiliy Ermolovich 
Date:   2011-11-28 10:54:12 +0300

    update CHANGELOG

M	actionpack/CHANGELOG.md

commit 5cf56a4	refs/heads/master
Merge: b00cf12 20cbf8e
Author: José Valim 
Date:   2011-11-27 23:13:39 -0800

    Merge pull request #3779 from rahul100885/rahul100885_work
    
    Used any? instead of length call

commit 20cbf8e	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2011-11-28 12:05:39 +0530

    Used any? instead of length call

M	activesupport/lib/active_support/xml_mini/jdom.rb
M	activesupport/lib/active_support/xml_mini/nokogiri.rb

commit 124c97f	refs/heads/master
Author: Josh Susser 
Date:   2011-11-27 14:15:40 -0800

    avoid warnings
    
    This change uses Module.redefine_method as defined in ActiveSupport.
    Making Module.define_method public would be as clean in the code, and
    would also emit warnings when redefining an association. That is pretty
    messy given current tests, so I'm leaving it for someone else to decide
    what approach is better.

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/builder/singular_association.rb

commit 10834e9	refs/heads/master
Author: Josh Susser 
Date:   2011-11-27 14:12:46 -0800

    changelog & docs for GeneratedFeatureMethods

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations.rb

commit cba5a3a	refs/heads/master
Author: Jan Varwig 
Date:   2011-11-27 11:47:45 +0100

    Test case and fix for rails/rails#3450
    
    Asssigning a parent id to a belongs_to association actually updates the object that is validated when the association has :validates => true

M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/test/cases/autosave_association_test.rb

commit b00cf12	refs/heads/master
Merge: af3aaca 0f5104d
Author: Jon Leighton 
Date:   2011-11-27 13:05:19 -0800

    Merge pull request #3748 from samsonasu/has_many_custom_pk_new_record
    
    New records should load has_many relationships with custom primary keys

commit fb8b555	refs/tags/v3.2.0.rc1
Author: Vasiliy Ermolovich 
Date:   2011-11-27 23:41:23 +0300

    add namespace options to form_for
    
    You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
    The namespace attribute will be prefixed with underscore on the generate HTML id

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit af3aaca	refs/heads/master
Merge: 0b7cd7b 1756629
Author: Santiago Pastorino 
Date:   2011-11-27 12:11:41 -0800

    Merge pull request #3773 from rahul100885/rahul100885_work
    
    Use any instead of length

commit 0b7cd7b	refs/heads/master
Merge: e7e046f 7f8f554
Author: José Valim 
Date:   2011-11-27 11:25:07 -0800

    Merge pull request #3771 from kennyj/fix_rake_test_warnings
    
    Call a block passed rake_tasks method in the self context

commit 61bcc31	refs/heads/master
Author: Josh Susser 
Date:   2011-11-27 11:22:12 -0800

    use GeneratedFeatureMethods module for associations

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/models/author.rb

commit 9b654d4	refs/heads/master
Author: karevn 
Date:   2011-11-28 00:55:50 +0600

    Fix: when using subdomains and constraints, request params were not passed to constraints callback

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb

commit e7e046f	refs/tags/v3.2.0.rc1
Merge: ee8db25 78ad94a
Author: José Valim 
Date:   2011-11-27 07:12:15 -0800

    Merge pull request #3769 from kennyj/fix_index_html
    
    avoid url started with "/" for the rails.png in public/index.html

commit ee8db25	refs/tags/v3.2.0.rc1
Merge: 3c81fc3 bc81ba2
Author: José Valim 
Date:   2011-11-27 06:47:32 -0800

    Merge pull request #3772 from lest/label-with-block
    
    fix label with block in erb

commit 1756629	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2011-11-27 20:02:09 +0530

    Use any instead of length

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit bc81ba2	refs/tags/v3.2.0.rc1
Author: lest 
Date:   2011-11-27 16:59:44 +0300

    fix label with block in erb

M	actionpack/lib/action_view/helpers/form_helper.rb
A	actionpack/test/fixtures/test/_label_with_block.erb
M	actionpack/test/template/form_helper_test.rb

commit 7f8f554	refs/heads/master
Author: kennyj 
Date:   2011-11-27 22:49:37 +0900

    Call a block passed rake_tasks method in the self context

M	railties/lib/rails/railtie.rb

commit 9cf2855	refs/heads/master
Author: Tadas Tamošauskas 
Date:   2011-11-27 12:44:14 +0000

    Update Object#in? description for https://github.com/rails/rails/pull/3767

M	railties/guides/source/active_support_core_extensions.textile

commit 78ad94a	refs/tags/v3.2.0.rc1
Author: kennyj 
Date:   2011-11-27 20:25:05 +0900

    avoid absolute path for the rails.png in index.html

M	railties/lib/rails/generators/rails/app/templates/public/index.html
M	railties/test/generators/app_generator_test.rb

commit 28e3935	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-27 12:53:08 +0530

    [Docs] Adding RequestId middleware in configuring middleware

M	railties/guides/source/configuring.textile

commit 0ce64ba	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-27 12:34:14 +0530

    Documentation about config.log_level config options

M	railties/guides/source/configuring.textile

commit 448df2d	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-27 10:23:40 +0400

    Cosmetic fixes in AM validatations docs

M	activemodel/lib/active_model/validations/presence.rb
M	activemodel/lib/active_model/validations/with.rb

commit 3c81fc3	refs/heads/master
Merge: 71b387d ebf69ab
Author: Yehuda Katz 
Date:   2011-11-26 18:10:48 -0800

    Merge pull request #3767 from tadast/object_in
    
    Object#in? also accepts multiple parameters

commit ebf69ab	refs/heads/master
Author: Tadas Tamošauskas 
Date:   2011-11-26 23:51:09 +0000

    Object#in? also accepts multiple parameters

M	activesupport/lib/active_support/core_ext/object/inclusion.rb
M	activesupport/test/core_ext/object/inclusion_test.rb

commit 71b387d	refs/heads/master
Merge: 140a0e4 4e5eaae
Author: José Valim 
Date:   2011-11-26 11:05:28 -0800

    Merge pull request #3765 from qoobaa/orm-instance-fix
    
    added tests to #3763

commit 4e5eaae	refs/heads/master
Author: Jakub Kuźma 
Date:   2011-11-26 19:57:51 +0100

    added tests, replaced classify with constantize - using classify here cuts the last 's' in ORM name

M	railties/lib/rails/generators/resource_helpers.rb
A	railties/test/generators/orm_test.rb

commit 140a0e4	refs/heads/master
Merge: d157ca8 89d6db0
Author: José Valim 
Date:   2011-11-26 10:28:36 -0800

    Merge pull request #3763 from qoobaa/orm-instance-fix
    
    allow using orm_instance without invoking orm_class in generators

commit d157ca8	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 23:53:57 +0530

    add more tests for monday and sunday methods

M	activesupport/test/core_ext/date_ext_test.rb

commit 9030cda	refs/heads/master
Merge: ab854db cd6c567
Author: Vijay Dev 
Date:   2011-11-26 10:18:07 -0800

    Merge pull request #3764 from arunagw/test_sunday_monday
    
    Tests added for monday and sunday

commit ab854db	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 23:43:52 +0530

    documenting monday and sunday methods

M	railties/guides/source/active_support_core_extensions.textile

commit cd6c567	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-26 23:37:01 +0530

    Tests added for monday and sunday
    
    Reference commits :
    a8f2860d0e7db86c61bb70935006100b04667ab1
    80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b

M	activesupport/test/core_ext/date_ext_test.rb

commit 80ac4dc	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 23:10:42 +0530

    Adds Time#sunday method

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	railties/guides/source/active_support_core_extensions.textile

commit a8f2860	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 22:26:52 +0530

    Convert aliases monday and sunday to methods
    
    A recent change to beginning_of_week and end_of_week added an argument
    that can be used to specify the week's starting day as a symbol. Now
    these methods were aliased as monday and sunday respectively which as a
    consequence of the argument addition, made calls like obj.monday(:sunday)
    possible. This commit makes them methods on their own.

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	railties/guides/source/active_support_core_extensions.textile

commit fc20d6b	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-26 22:38:58 +0530

    Let's say this 3.1.3 instead of 3.1.1 in docs

M	railties/guides/source/getting_started.textile

commit 8135e5e	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 22:04:56 +0530

    s/end_on_week/end_of_week

M	railties/guides/source/active_support_core_extensions.textile

commit 99ff8fd	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 22:04:20 +0530

    minor doc changes

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 89d6db0	refs/heads/master
Author: Jakub Kuźma 
Date:   2011-11-26 17:11:17 +0100

    allow using orm_instance without invoking orm_class first in generators

M	railties/lib/rails/generators/resource_helpers.rb

commit 7f6b1a5	refs/tags/v3.1.6
Author: Uģis Ozols 
Date:   2011-11-25 14:24:14 +0200

    what's -> that's

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit c7da693	refs/tags/v3.1.6
Author: Robert Ross 
Date:   2011-11-21 17:06:00 -0800

    Fix missing single quote that was messing up syntax highlighting.

M	activeresource/lib/active_resource/custom_methods.rb

commit 7aae61f	refs/tags/v3.1.6
Author: Alexey Vakhov 
Date:   2011-11-19 12:19:59 +0600

    Small docs fix in Active Model callbacks module

M	activemodel/lib/active_model/callbacks.rb

commit 1506ef0	refs/tags/v3.1.6
Author: Matt Burke 
Date:   2011-11-18 14:10:17 -0500

    Add config.active_record.identity_map to the configuration guide.

M	railties/guides/source/configuring.textile

commit f754521	refs/heads/master
Merge: 1d89540 9817a8b
Author: José Valim 
Date:   2011-11-26 06:35:42 -0800

    Merge pull request #3760 from arunagw/warning_removed_unused_var
    
    Warning removed unused variable

commit 9817a8b	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-26 19:03:58 +0530

    Warning removed unused variable

M	activemodel/test/cases/naming_test.rb

commit 1d89540	refs/heads/master
Merge: b6916e0 5c2a2ee
Author: Vijay Dev 
Date:   2011-11-26 19:14:39 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 5c2a2ee	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 19:06:53 +0530

    rephrased ef38c3089e1269e2b315aff503e61c0b23c95f00 and
    mentioned about OS X and windows usually having a JS runtime

M	railties/guides/source/getting_started.textile

commit c4af5f0	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-26 18:52:10 +0530

    use any? to check for size

M	actionpack/lib/action_view/helpers/atom_feed_helper.rb

commit b6916e0	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-25 15:06:30 -0800

    removes a Serialization constant left in the previous revert

M	actionpack/lib/action_controller/base.rb

commit b30b932	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-25 14:58:43 -0800

    finders guide: adds some pointers to help users interpret the output of EXPLAIN

M	railties/guides/source/active_record_querying.textile

commit 1be9830	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-25 14:29:34 -0800

    add the query to AR::Relation#explain output
    
    Rationale: this is more readable if serveral queries
    are involved in one call. Also, it will be possible
    to let AR log EXPLAINs automatically in production
    mode, where queries are not even around.

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/adapters/mysql2/explain_test.rb
M	activerecord/test/cases/adapters/postgresql/explain_test.rb
M	activerecord/test/cases/adapters/sqlite3/explain_test.rb
M	railties/guides/source/active_record_querying.textile

commit a5b362d	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-25 12:01:58 -0800

    some tweaks to PR#3547. [Closes #3547]

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 7a33a00	refs/heads/master
Author: gregolsen 
Date:   2011-11-07 13:26:56 +0200

    API docstrings updated with default value info

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 3f1a4c3	refs/heads/master
Author: gregolsen 
Date:   2011-11-06 21:42:03 +0200

    beginning_of_week extended in both Time and Date so that to return week start based on start day that is monday by default

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 0a4035b	refs/heads/master
Author: José Valim 
Date:   2011-11-25 19:29:39 +0000

    Revert the serializers API as other alternatives are now also under discussion

M	actionpack/lib/action_controller.rb
D	actionpack/lib/action_controller/metal/serialization.rb
M	actionpack/test/controller/render_json_test.rb
M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model.rb
M	activemodel/lib/active_model/serializable.rb
D	activemodel/test/cases/serializer_test.rb
M	railties/CHANGELOG.md
D	railties/guides/source/serializers.textile
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
D	railties/lib/rails/generators/rails/serializer/USAGE
D	railties/lib/rails/generators/rails/serializer/serializer_generator.rb
D	railties/lib/rails/generators/rails/serializer/templates/serializer.rb
D	railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
D	railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb
M	railties/test/generators/scaffold_generator_test.rb
D	railties/test/generators/serializer_generator_test.rb

commit 2dab493	refs/heads/master
Merge: 6f5fdf8 95e9b5f
Author: José Valim 
Date:   2011-11-25 09:44:14 -0800

    Merge pull request #3756 from johnmdonahue/update-gem-action-linebreaks-and-indentation
    
    Updating newline fix to maintain existing linebreaks and indentation and...

commit 95e9b5f	refs/heads/master
Author: John Donahue 
Date:   2011-11-25 09:06:14 -0800

    Updating newline fix to maintain existing linebreaks and indentation and test for b/eol on inserts

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit 0f5104d	refs/heads/master
Author: Brian Samson 
Date:   2011-11-24 13:11:33 -0700

    load has_many associations keyed off a custom primary key if that key is present but the record is unsaved

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 6f5fdf8	refs/heads/master
Merge: 8ff8fa5 cd9d28d
Author: José Valim 
Date:   2011-11-25 05:33:26 -0800

    Merge pull request #3747 from lest/middleware-logger
    
    middlewares should have configurable logger

commit a607a9d	refs/heads/master
Author: Uģis Ozols 
Date:   2011-11-25 14:24:14 +0200

    what's -> that's

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 9a45867	refs/heads/master
Author: Uģis Ozols 
Date:   2011-11-25 14:22:36 +0200

    Remove unnecessary comment.

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 8ff8fa5	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-11-25 12:54:39 +0100

    I suck, forgot to also change rake's task description

M	railties/lib/rails/tasks/routes.rake

commit c9bb099	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-11-25 12:42:11 +0100

    Display mounted engines in `rake routes` by default

M	railties/CHANGELOG.md
M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit cd9d28d	refs/heads/master
Author: lest 
Date:   2011-11-24 22:37:48 +0300

    middlewares should use logger from env

M	actionpack/lib/action_dispatch/middleware/params_parser.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/abstract_unit.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	railties/lib/rails/application.rb
M	railties/test/application/configuration_test.rb

commit fcacc69	refs/heads/master
Merge: 4565c87 696d01f
Author: José Valim 
Date:   2011-11-25 09:58:18 +0000

    Merge branch 'serializers'
    
    This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides.
    
    From José and Yehuda with love.
    
    Conflicts:
    	railties/CHANGELOG.md

commit 4565c87	refs/heads/master
Merge: 0cd3bf8 c8d7291
Author: José Valim 
Date:   2011-11-25 01:51:56 -0800

    Merge pull request #3752 from ganeshkumar/gem_lending
    
    Added tests for #3751

commit 696d01f	refs/remotes/origin/serializers (origin/serializers)
Author: José Valim 
Date:   2011-11-25 09:49:54 +0000

    Add docs to serializers. Update CHANGELOGs.

M	actionpack/lib/action_controller/metal/serialization.rb
M	activemodel/CHANGELOG.md
M	activemodel/lib/active_model/serializer.rb
M	railties/CHANGELOG.md

commit c8d7291	refs/heads/master
Author: ganesh 
Date:   2011-11-25 14:55:28 +0530

    Added tests for #3751

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit 6d9f9b3	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-25 09:17:32 +0000

    Add a hook for serializers in the scaffold generator (off for now).

M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
M	railties/test/generators/scaffold_generator_test.rb

commit ebb8ea2	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-25 09:13:19 +0000

    Add generators for serializers.

A	railties/lib/rails/generators/rails/serializer/USAGE
A	railties/lib/rails/generators/rails/serializer/serializer_generator.rb
A	railties/lib/rails/generators/rails/serializer/templates/serializer.rb
A	railties/lib/rails/generators/test_unit/serializer/serializer_generator.rb
A	railties/lib/rails/generators/test_unit/serializer/templates/unit_test.rb
A	railties/test/generators/serializer_generator_test.rb

commit 0cd3bf8	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-11-24 01:45:50 +0100

    Allow to display engine's routes when running `rake routes ENGINES=true`

M	railties/CHANGELOG.md
M	railties/lib/rails/application/route_inspector.rb
M	railties/lib/rails/tasks/routes.rake
M	railties/test/application/route_inspect_test.rb

commit 30cf3e1	refs/heads/master
Merge: a478389 dc39af0
Author: Piotr Sarnacki 
Date:   2011-11-24 06:56:46 -0800

    Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classes
    
    make ActiveModel::Name fail gracefully with anonymous classes

commit dc39af0	refs/heads/master
Author: Jakub Kuźma 
Date:   2011-11-24 15:50:21 +0100

    make ActiveModel::Name fail gracefully with anonymous classes

M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/naming_test.rb

commit a478389	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-11-24 01:59:01 +0100

    Forgot to add CHANGELOG entry for config.railties_order

M	railties/CHANGELOG.md

commit 510502e	refs/heads/master
Author: rpq 
Date:   2011-11-23 23:23:48 -0500

    comma

M	railties/guides/source/active_support_core_extensions.textile

commit ef38c30	refs/heads/master
Author: Michael Pearson 
Date:   2011-11-24 10:59:29 +1100

    Move JS runtime instructions to where the error would be encountered, remove gem install.

M	railties/guides/source/getting_started.textile

commit 28bcda4	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-23 23:53:20 +0000

    Rename UserSerializer to DefaultUserSerializer in tests.

M	activemodel/test/cases/serializer_test.rb

commit 7fcc8c0	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-23 23:45:27 +0000

    Rely solely on active_model_serializer and remove the fancy constant lookup.

M	actionpack/lib/action_controller/metal/serialization.rb
M	actionpack/test/controller/render_json_test.rb
M	activemodel/lib/active_model/serializable.rb
M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/class_cache_test.rb

commit 0e74430	refs/heads/master
Author: Michael Pearson 
Date:   2011-11-24 10:33:04 +1100

    Add step to getting_started to install JS Runtime.
    
    abstrakt on #rubyonrails found that the guide, when followed step by step,
    does fails at the 'rails server' command due to a lacking JS runtime.

M	railties/guides/source/getting_started.textile

commit 6da52c6	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-23 23:22:46 +0000

    Remove listings from the serialization guide that won't make 3.2.

M	railties/guides/source/serializers.textile

commit 8896b4f	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-23 23:18:13 +0000

    Implement ArraySerializer and move old serialization API to a new namespace.
    
    The following constants were renamed:
    
      ActiveModel::Serialization     => ActiveModel::Serializable
      ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON
      ActiveModel::Serializers::Xml  => ActiveModel::Serializable::XML
    
    The main motivation for such a change is that `ActiveModel::Serializers::JSON`
    was not actually a serializer, but a module that when included allows the target to be serializable to JSON.
    
    With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer.

M	activemodel/lib/active_model.rb
A	activemodel/lib/active_model/serializable.rb
A	activemodel/lib/active_model/serializable/json.rb
A	activemodel/lib/active_model/serializable/xml.rb
M	activemodel/lib/active_model/serialization.rb
M	activemodel/lib/active_model/serializer.rb
M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/serializers/xml.rb
A	activemodel/test/cases/serializable/json_test.rb
A	activemodel/test/cases/serializable/xml_test.rb
A	activemodel/test/cases/serializable_test.rb
D	activemodel/test/cases/serialization_test.rb
M	activemodel/test/cases/serializer_test.rb
D	activemodel/test/cases/serializers/json_serialization_test.rb
D	activemodel/test/cases/serializers/xml_serialization_test.rb
M	activerecord/lib/active_record/serialization.rb
M	activerecord/lib/active_record/serializers/xml_serializer.rb
M	activesupport/lib/active_support/json/encoding.rb

commit 0536ea8	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-23 21:43:03 +0000

    Add safe_constantize to ActiveSupport::Dependencies.

M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/class_cache_test.rb

commit e6cfd85	refs/heads/master
Merge: 40b19e0 98a1717
Author: José Valim 
Date:   2011-11-23 12:58:56 -0800

    Merge pull request #3739 from lest/config-always-write-cookie
    
    configuration option to always write cookie

commit 98a1717	refs/heads/master
Author: lest 
Date:   2011-11-23 23:36:56 +0300

    configuration option to always write cookie

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	actionpack/test/dispatch/cookies_test.rb
A	railties/test/application/middleware/cookies_test.rb

commit e62de52	refs/remotes/origin/serializers
Merge: afd7140 fd86a1b
Author: José Valim 
Date:   2011-11-23 20:43:06 +0000

    Merge branch 'master' into serializers

commit 40b19e0	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-11-22 23:26:27 +0100

    Allow to change engine's loading priority with config.railties_order=

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb

commit 8549f7a	refs/heads/master
Merge: e9f63c5 d78a702
Author: Yehuda Katz 
Date:   2011-11-23 11:11:40 -0800

    Merge pull request #3731 from HeeL/master
    
    code stats calculation

commit e9f63c5	refs/heads/master
Merge: fd86a1b 453f553
Author: Yehuda Katz 
Date:   2011-11-23 11:10:27 -0800

    Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test
    
    Warnings removed. (ambiguous first argument)

commit fd86a1b	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-23 19:06:45 +0000

    Rely on a public contract between railties instead of accessing railtie methods directly.

M	actionpack/lib/abstract_controller/railties/routes_helpers.rb
M	actionpack/lib/action_controller/railties/paths.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb
M	actionpack/test/lib/controller/fake_models.rb
M	actionpack/test/template/form_helper_test.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/naming_test.rb
M	activemodel/test/models/blog_post.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie.rb
M	railties/test/railties/engine_test.rb

commit 3ee0116	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-11-23 18:22:09 +0000

    Optimize cache expansion by skipping rails cache id in nested keys.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 2c568f1	refs/remotes/origin/serializers
Merge: f62f545 a650dd0
Author: José Valim 
Date:   2011-11-23 10:17:34 -0800

    Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_key
    
    Issues/3737 AS::Cache.expand_cache_key

commit f62f545	refs/remotes/origin/serializers
Merge: a93ee92 ea70e02
Author: José Valim 
Date:   2011-11-23 09:55:31 -0800

    Merge pull request #3735 from kennyj/fix_3728
    
    Fix #3728 Remove unreachable code, and add additional testcases.

commit a650dd0	refs/remotes/origin/serializers
Author: Olek Janiszewski 
Date:   2011-11-23 18:11:36 +0100

    Fix #3737 AS::expand_cache_key generates wrong key in certain situations (part 2)
    
    `nil` and `false` both expand to `""` (empty string), while `true` expands to
    `"true"`; `false` should expand to `"false"`

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit d8e6dc9	refs/remotes/origin/serializers
Author: Olek Janiszewski 
Date:   2011-11-23 18:06:15 +0100

    Fix #3737 AS::expand_cache_key generates wrong key in certain situations
    
    `cache_key` method is never called when the argument is a 1-element array
    with something that responds to `cache_key`

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit ea70e02	refs/remotes/origin/serializers
Author: kennyj 
Date:   2011-11-23 23:49:43 +0900

    Remove unreachable code, and add additional testcases.

M	actionpack/lib/action_dispatch/middleware/params_parser.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb

commit 453f553	refs/heads/master
Author: kennyj 
Date:   2011-11-24 00:10:34 +0900

    Warnings removed. (ambiguous first argument)

M	actionpack/test/controller/show_exceptions_test.rb

commit d78a702	refs/heads/master
Author: Sergey Parizhskiy 
Date:   2011-11-23 14:10:30 +0200

    improved code stats calculation, check on multiline comments and rewrite regexps according to a class naming convention

M	railties/lib/rails/code_statistics.rb

commit 745b7a1	refs/heads/master
Author: Marc Chung 
Date:   2011-11-22 17:04:19 -0700

    - Avoid using .first since it will create an additional query.
    - Handle scenario where @posts is empty.

M	actionpack/lib/action_view/helpers/atom_feed_helper.rb

commit 57d9f8b	refs/heads/master
Author: Jan Dupal 
Date:   2011-11-22 23:07:22 +0100

    fix Helpers::DateHelper with :use_hidden - hide separators

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit a93ee92	refs/remotes/origin/serializers
Merge: 9b7be78 a491207
Author: Yehuda Katz 
Date:   2011-11-22 13:01:37 -0800

    Merge pull request #3725 from marcandre/twz_eql
    
    Fix inconsistencies with Time{WithZone}#{hash,eql?}

commit 9b7be78	refs/remotes/origin/serializers
Merge: b13b49c 05e02de
Author: Yehuda Katz 
Date:   2011-11-22 12:38:05 -0800

    Merge pull request #3724 from marcandre/media_default
    
    stylesheet_tag default's media is "screen"

commit a491207	refs/remotes/origin/serializers
Author: Marc-Andre Lafortune 
Date:   2011-11-22 15:37:16 -0500

    Fix inconsistencies with Time{WithZone}#{hash,eql?}

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/time_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 05e02de	refs/remotes/origin/serializers
Author: Marc-Andre Lafortune 
Date:   2011-11-22 15:16:23 -0500

    Make explicit the default media when calling stylesheet_tag and change the default generators.

M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	railties/guides/code/getting_started/app/views/layouts/application.html.erb
M	railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
M	railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt

commit b13b49c	refs/heads/master
Merge: 39ecbfd aa491f6
Author: José Valim 
Date:   2011-11-22 09:45:11 -0800

    Merge pull request #3718 from lest/fix-javascript-include-tag
    
    javascript_include_tag should add '.js' to sources that contain '.'

commit 5c61b72	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-22 23:14:13 +0530

    Revert "Added links to the 'Rails Initialization Guide', marked as a work in progress"
    
    This reverts commit 6b4939c3fd22924ee3d906f08fe739d848f80a3d.
    
    Reason: This guide is still incomplete and is not yet reviewed or ready
    to go to the index.

M	railties/guides/source/index.html.erb
M	railties/guides/source/layout.html.erb

commit 39ecbfd	refs/heads/master
Merge: 8cae31c 3a1d519
Author: José Valim 
Date:   2011-11-22 07:19:39 -0800

    Merge pull request #3717 from lest/show-exceptions-refactor
    
    Show exceptions refactor: controller should be responsible for choice to show exceptions

commit 3a1d519	refs/heads/master
Author: lest 
Date:   2011-11-22 17:36:58 +0300

    deprecation warning, changelog entry

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb

commit cd392fd	refs/tags/v3.1.6
Author: Vijay Dev 
Date:   2011-11-14 23:20:12 +0530

    caching 'false' properly

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit aa491f6	refs/heads/master
Author: lest 
Date:   2011-11-22 16:39:07 +0300

    javascript_include_tag should add '.js' to sources that contain '.'

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 13847cc	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-17 12:44:06 +0530

    Bump Mysql2!

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 8cae31c	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-22 17:12:37 +0530

    remove nodoc on OrderedHash

M	activesupport/lib/active_support/ordered_hash.rb

commit 5bcd119	refs/heads/master
Author: lest 
Date:   2011-11-22 13:34:13 +0300

    move show_detailed_exceptions? to Rescue module

M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_controller/metal/rescue.rb
M	actionpack/lib/action_controller/railtie.rb
M	actionpack/test/controller/show_exceptions_test.rb

commit c6d6b28	refs/heads/master
Author: lest 
Date:   2011-11-22 11:24:05 +0300

    refactor show exceptions tests

A	actionpack/test/controller/show_exceptions_test.rb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit a9e8cf7	refs/heads/master
Author: lest 
Date:   2011-11-21 20:13:54 +0300

    add ActionController::Metal#show_detailed_exceptions?

M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/dispatch/show_exceptions_test.rb
M	railties/lib/rails/application.rb

commit 9dc9db1	refs/heads/master
Author: Robert Ross 
Date:   2011-11-21 17:06:00 -0800

    Fix missing single quote that was messing up syntax highlighting.

M	activeresource/lib/active_resource/custom_methods.rb

commit 8f57bf2	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-21 14:22:02 -0800

    tests predicates according to the boolean interpretation of their return value, not expecting specifically true or false
    
    Respecting Genuine assert_equal false Edition

M	activesupport/test/caching_test.rb

commit 401393b	refs/heads/master
Author: José Valim 
Date:   2011-11-21 22:07:24 +0000

    Deprecate InstanceMethods namespace handling in ActiveSupport::Concern.
    
    This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions.

M	activesupport/lib/active_support/concern.rb
M	activesupport/test/concern_test.rb

commit f312e21	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-21 14:14:11 -0800

    Revert "tests predicates according to the boolean interpretation of their return value, not expecting specifically true or false"
    
    Reason: there were some genuine tests for false when
    reading values, going to revise those ones.
    
    This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit a539a5e	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-21 14:11:19 -0800

    tests predicates according to the boolean interpretation of their return value, not expecting specifically true or false

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit f355477	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-21 14:01:53 -0800

    cache entry: options[:compressed] is a regular flag, no need for !!

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 91678a5	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-21 13:53:40 -0800

    adds a comment to clarify an edge case

M	activesupport/lib/active_support/cache.rb

commit 60e3e21	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-21 22:11:31 +0100

    a couple of spurious spaces I saw in passing

M	activesupport/lib/active_support/cache.rb

commit 4c872c0	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-22 00:05:46 +0530

    Remove the -h option to dbconsole which is the shorter form of --header
    
    This is done since the -h option to dbconsole hides the conventional
    -h for help and forces users to use --help to see the usage options for
    dbconsole.

M	railties/lib/rails/commands/dbconsole.rb

commit 06c23c4	refs/heads/master
Author: Sven Bohm 
Date:   2011-11-21 13:14:16 -0500

    postgresql adapter handles quoting of not a number (NaN) and Infinity

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/quoting_test.rb

commit 3df6c73	refs/tags/v3.1.6
Merge: e9474c8 dcafc76
Author: José Valim 
Date:   2011-11-21 04:12:42 -0800

    Merge pull request #3710 from dmathieu/cherry-pick-ssl-config
    
    Cherry pick ssl config

commit dcafc76	refs/tags/v3.1.6
Author: Justin Leitgeb 
Date:   2011-09-26 22:22:52 -0400

    Make the Rack::SSL middleware configurable

M	railties/guides/source/configuring.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/middleware_test.rb

commit 8b8ff98	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2011-11-20 16:20:19 -0500

    Update CHANGELOG with the addition of therubyrhino

M	railties/CHANGELOG.md

commit b710cea	refs/tags/v3.1.6
Author: Guillermo Iguaran 
Date:   2011-11-14 07:07:38 -0500

    Added therubyrhino to default Gemfile under JRuby

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 5d704fa	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-20 15:11:11 -0800

    oops! I suck! :bomb:

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 008abd1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-20 15:09:03 -0800

    fixing tests on ruby 1.8

M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit e9474c8	refs/tags/v3.1.3 (tag: v3.1.3)
Author: Jon Leighton 
Date:   2011-11-20 22:48:20 +0000

    Preparing for 3.1.3 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 36cefec	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-20 22:26:13 +0000

    Fix sass-rails dependency. Closes #3704.

M	railties/CHANGELOG.md
M	railties/lib/rails/generators/app_base.rb

commit 574ed06	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-20 22:18:42 +0000

    Downgrade sprockets to 2.0.3. Closes #3686.

M	actionpack/CHANGELOG.md
M	actionpack/actionpack.gemspec

commit 26c542b	refs/heads/master
Merge: 599d7c4 be9d3a2
Author: Aaron Patterson 
Date:   2011-11-19 23:17:26 -0800

    Merge pull request #3701 from arunagw/arel_bump
    
    Bump Arel

commit be9d3a2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-20 12:27:25 +0530

    Bump Arel

M	activerecord/activerecord.gemspec

commit 599d7c4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-19 20:43:04 -0800

    removing deprecated methods

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 3d2bd69	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-19 20:35:54 -0800

    Revert "copy options keys to the right place so that undo will work correctly"
    
    This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 24fa524	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-19 20:28:41 -0800

    adding visitors to the respective adapters

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit bd2f5c0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-19 20:19:53 -0800

    pushing caching and visitors down to the connection

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
A	activerecord/lib/active_record/connection_adapters/schema_cache.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/lib/active_record/session_store.rb
M	activerecord/test/active_record/connection_adapters/fake_adapter.rb
M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
A	activerecord/test/cases/connection_adapters/schema_cache_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/pooled_connections_test.rb

commit 5660a16	refs/heads/master
Author: James Dean Shepherd 
Date:   2011-11-20 02:36:50 +0000

    Minor grammar, typo & readability fixes for beginning of Rails Initialization guide

M	railties/guides/source/initialization.textile

commit 6b4939c	refs/heads/master
Author: James Dean Shepherd 
Date:   2011-11-20 02:34:55 +0000

    Added links to the 'Rails Initialization Guide', marked as a work in progress

M	railties/guides/source/index.html.erb
M	railties/guides/source/layout.html.erb

commit 4cdd44e	refs/heads/master
Merge: 43158e5 8d83e33
Author: Santiago Pastorino 
Date:   2011-11-19 11:52:44 -0800

    Merge pull request #3668 from gregolsen/api_docstring_fix
    
    updating API docstring so that user can infer default value

commit 43158e5	refs/heads/master
Merge: bc04455 c220b4d
Author: José Valim 
Date:   2011-11-19 11:04:39 -0800

    Merge pull request #3696 from lest/fix-plugin-generator
    
    fix rails plugin new CamelCasedName bug

commit c220b4d	refs/heads/master
Author: lest 
Date:   2011-11-19 21:51:37 +0300

    fix warning about instance variable in plugin generator

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit 39d2251	refs/heads/master
Author: lest 
Date:   2011-11-19 19:03:44 +0200

    fix rails plugin new CamelCasedName bug
    
    refs #3684

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit bc04455	refs/heads/master
Merge: fec85cf 771635e
Author: Yehuda Katz 
Date:   2011-11-19 07:38:22 -0800

    Merge pull request #3695 from tobiassvn/partial_path_error
    
    Meaningful errors for unexpected partial arguments. Fixes #3573

commit cb0c3e4	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-19 14:10:21 +0000

    Perf fix
    
    If we're deleting all records in an association, don't add a IN(..)
    clause to the query.
    
    Fixes #3672.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/has_many_association.rb

commit fec85cf	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-19 14:10:21 +0000

    Perf fix
    
    If we're deleting all records in an association, don't add a IN(..)
    clause to the query.
    
    Fixes #3672.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/associations/has_many_association.rb

commit da327fc	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-19 13:34:50 +0000

    Add missing CHANGELOG entry for #3678. Closes #3678.

M	activerecord/CHANGELOG.md

commit 2ef4947	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-19 13:34:50 +0000

    Add missing CHANGELOG entry for #3678. Closes #3678.

M	activerecord/CHANGELOG.md

commit 13ad879	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-11-19 13:19:20 +0000

    Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
    
    Conflicts:
    
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 1edef70	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-19 13:19:20 +0000

    Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 603a679	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-19 13:19:20 +0000

    Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 86b5e81	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-19 13:06:34 +0000

    Bump sprockets to 2.1.1

M	actionpack/actionpack.gemspec

commit 3b6087e	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-19 13:06:34 +0000

    Bump sprockets to 2.1.1
    
    Conflicts:
    
    	actionpack/actionpack.gemspec

M	actionpack/actionpack.gemspec

commit 771635e	refs/heads/master
Author: Tobias Svensson 
Date:   2011-11-19 13:02:56 +0000

    Meaningful errors for unexpected partial arguments. Fixes #3573

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/render_test.rb

commit 1b2d546	refs/tags/v3.1.3
Author: kennyj 
Date:   2011-11-19 03:40:06 +0900

    Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678)

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/schema_dumper.rb

commit 11afb74	refs/heads/master
Merge: 9c37416 f9b9179
Author: Jon Leighton 
Date:   2011-11-19 05:00:37 -0800

    Merge pull request #3687 from kennyj/fix_3678-2
    
    Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678)

commit c5197d4	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-19 12:34:15 +0000

    Verify that #3690 has been closed by previous changes to the mysql
    adapters.
    
    These tests fail on the v3.1.2 tag.
    
    Closes #3690.
    
    Conflicts:
    
    	activerecord/CHANGELOG.md

M	activerecord/CHANGELOG.md
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 9c37416	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-19 12:34:15 +0000

    Verify that #3690 has been closed by previous changes to the mysql
    adapters.
    
    These tests fail on the v3.1.2 tag.
    
    Closes #3690.

M	activerecord/CHANGELOG.md
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit 8f4f8db	refs/tags/v3.1.3
Merge: 9848b47 0e6b118
Author: Jon Leighton 
Date:   2011-11-19 11:09:35 +0000

    Merge branch '3-1-2' into 3-1-stable

commit 89bbb6c	refs/heads/master
Merge: 396ef44 d806ea2
Author: Yehuda Katz 
Date:   2011-11-18 22:42:14 -0800

    Merge pull request #3689 from arunagw/warning_removed_actionpack
    
    Warning removed for shadowing variable

commit efbb735	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-19 12:19:59 +0600

    Small docs fix in Active Model callbacks module

M	activemodel/lib/active_model/callbacks.rb

commit d806ea2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-19 11:29:29 +0530

    Warning removed for shadowing variable

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 6fc2e12	refs/heads/master
Author: Hendy Tanata 
Date:   2011-11-18 11:22:18 -0800

    Some fixes on RELEASING_RAILS.rdoc.

M	RELEASING_RAILS.rdoc

commit f9b9179	refs/heads/master
Author: kennyj 
Date:   2011-11-19 04:11:38 +0900

    Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678)

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/schema_dumper.rb

commit 9848b47	refs/tags/v3.1.3
Author: Aaron Patterson 
Date:   2011-11-18 11:14:24 -0800

    fixing my bad merge. doh!

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit ed5586f	refs/heads/master
Author: Matt Burke 
Date:   2011-11-18 14:10:17 -0500

    Add config.active_record.identity_map to the configuration guide.

M	railties/guides/source/configuring.textile

commit 8fedb5f	refs/tags/v3.1.3
Author: Aaron Patterson 
Date:   2011-11-17 14:41:53 -0800

    allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development

M	.gitignore
M	Gemfile

commit 396ef44	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-18 10:36:02 -0800

    Revert "make sure to require the right deprecation warning file"
    
    This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 99d94f1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-01 15:53:02 -0200

    Refactoring the redirect method for the router api.

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit d34efdd	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-31 18:18:04 -0400

    moving redirection to objects

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 0809c67	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-31 17:49:20 -0400

    remove the :path feature to redirects, since it cannot work

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit a8a4264	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-31 16:36:48 -0400

    make sure to require the right deprecation warning file

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 163b645	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-31 16:28:38 -0400

    arity check has been pushed up, so no need for proc wrapping

M	actionpack/lib/action_dispatch/routing/redirection.rb

commit 4589b24	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-31 16:26:11 -0400

    require that all blocks have arity of 2

M	actionpack/lib/action_dispatch/routing/redirection.rb
M	actionpack/test/dispatch/routing_test.rb

commit 3178cc9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 16:47:49 -0700

    copy options keys to the right place so that undo will work correctly

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit ecbae99	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 15:40:10 -0700

    no need for type checking

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 636405d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 15:18:36 -0700

    cleaning up variable names to match method parameter names

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 33543ac	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 15:14:25 -0700

    stop doing is_a? checks on the resource type

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 648f611	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 15:04:48 -0700

    move constants to methods since nothing else is using them

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 7459ba4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 11:42:59 -0700

    pushing hash validation up

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 494ab25	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 11:15:41 -0700

    breaking match down to smaller methods

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 76780c3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-21 10:25:47 -0700

    some refactoring of the match method

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit dda6787	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-19 00:07:50 +0530

    mailer guide - update info about using default host. Fixes #3642

M	railties/guides/source/action_mailer_basics.textile

commit a099116	refs/tags/v3.1.3
Merge: ae4974a fc44737
Author: Vijay Dev 
Date:   2011-11-18 09:49:27 -0800

    Merge pull request #3682 from sikachu/3-1-stable-fix_test_variable
    
    Update variable's name in the test case to reflect the class we're testing

commit ae4974a	refs/tags/v3.1.3
Author: capps 
Date:   2011-11-16 15:57:54 -0800

    "denoted" instead of "donated"
    "parentheses" instead of "use brackets"

M	railties/guides/source/i18n.textile

commit b7fe7c3	refs/tags/v3.1.3
Author: Philip Arndt 
Date:   2011-11-18 23:50:14 +1300

    Fixed typo: expect -> expected

M	activesupport/lib/active_support/dependencies.rb

commit a31a805	refs/tags/v3.1.3
Author: Aaron Patterson 
Date:   2011-11-18 09:37:29 -0800

    Merge pull request #3683 from christos/schema_introspection_speedup
    
    Only used detailed schema introspection when doing a schema dump.
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/schema_dumper.rb

commit 48b580a	refs/heads/master
Merge: 2debbe1 9d03529
Author: Vijay Dev 
Date:   2011-11-18 23:11:46 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 9d03529	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-18 23:10:12 +0530

    remove unneeded params from issue tracker url

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 5a2db4c	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-18 23:09:30 +0530

    put back the removed eg

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 2debbe1	refs/heads/master
Merge: 581ba1d 280b2b7
Author: Aaron Patterson 
Date:   2011-11-18 09:37:29 -0800

    Merge pull request #3683 from christos/schema_introspection_speedup
    
    Only used detailed schema introspection when doing a schema dump.

commit 581ba1d	refs/heads/master
Merge: d4119e1 0e2156d
Author: Vijay Dev 
Date:   2011-11-18 09:33:26 -0800

    Merge pull request #3681 from sikachu/fix_test_variable
    
    Update variable's name in the test case to reflect the class we're testing

commit 280b2b7	refs/heads/master
Author: Christos Zisopoulos 
Date:   2011-11-18 18:29:47 +0100

    Only used detailed schema introspection when doing a schema dump.
    
    Fixes #3678

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/schema_dumper.rb

commit fc44737	refs/tags/v3.1.3
Author: Prem Sichanugrist 
Date:   2011-11-18 11:51:05 -0500

    Update variable's name in the test case to reflect the class we're testing

M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/format_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit 0e2156d	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-11-18 11:51:05 -0500

    Update variable's name in the test case to reflect the class we're testing

M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/format_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit d4119e1	refs/heads/master
Merge: 1c4564b 42954c4
Author: Jon Leighton 
Date:   2011-11-18 07:21:57 -0800

    Merge pull request #3680 from rubys/master
    
    This fix causes the AWDwR test to go back to being green on Rails master.

commit 42954c4	refs/heads/master
Author: Sam Ruby 
Date:   2011-11-18 10:05:06 -0500

    Stop db:seed from performing a reload of the db
    Fix regression introduced by 38d26b0cb56d82093889efa95992a35ba3bb9f29

M	activerecord/lib/active_record/railties/databases.rake

commit 1c4564b	refs/heads/master
Merge: 307fc12 a89fabb
Author: Vijay Dev 
Date:   2011-11-18 04:21:56 -0800

    Merge pull request #3666 from oscardelben/databases_rake_cleanup
    
    Cleanup of databases.rake psql env variables

commit 307fc12	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-18 13:05:25 +0100

    release instructions: new section about docs generation

M	RELEASING_RAILS.rdoc

commit bc9b1e0	refs/heads/master
Author: Philip Arndt 
Date:   2011-11-18 23:50:14 +1300

    Fixed typo: expect -> expected

M	activesupport/lib/active_support/dependencies.rb

commit 96792d2	refs/heads/master
Merge: e8d57f3 e375970
Author: Vijay Dev 
Date:   2011-11-17 23:40:33 -0800

    Merge pull request #3669 from parndt/patch-1
    
    Fixed typo: expect -> expected

commit 0e6b118	refs/tags/v3.1.2 (tag: v3.1.2)
Author: Jon Leighton 
Date:   2011-11-18 01:27:59 +0000

    Preparing for 3.1.2 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 66a4beb	refs/tags/v3.0.11 (tag: v3.0.11)
Author: Jon Leighton 
Date:   2011-11-18 01:19:17 +0000

    Preparing for 3.0.11 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit fe88745	refs/heads/master
Author: Edward Anderson 
Date:   2011-11-17 20:10:49 -0500

    Fix a number_with_delimiter :separator example

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 618300e	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-03-01 10:11:32 -0800

    fixing test case test on 1.9.3dev

M	activesupport/test/test_case_test.rb

commit 0e9910e	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-03-07 15:44:39 -0800

    removing stubs. 1.9.3 implements Date.today in C so mocking the return value of Time.now does nothing

M	activesupport/test/core_ext/date_ext_test.rb

commit ba2d850	refs/tags/v3.0.14
Author: lest 
Date:   2011-11-17 18:29:55 +0300

    _html translation should escape interpolated arguments
    
    Conflicts:
    
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 2d5b105	refs/tags/v3.1.2
Author: lest 
Date:   2011-11-17 18:29:55 +0300

    _html translation should escape interpolated arguments

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 1b527d7	refs/tags/v3.1.3
Author: lest 
Date:   2011-11-17 18:29:55 +0300

    _html translation should escape interpolated arguments

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 78f649e	refs/tags/v3.1.3
Merge: 3bcb247 1d8c576
Author: José Valim 
Date:   2011-11-17 15:09:02 -0800

    Merge pull request #3665 from wildchild/label_i18n_3-1-stable
    
    Fix impractical I18n lookup in nested fields_for (3-1-stable)

commit e8d57f3	refs/heads/master
Author: lest 
Date:   2011-11-17 18:29:55 +0300

    _html translation should escape interpolated arguments

M	actionpack/CHANGELOG.md
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 3bcb247	refs/tags/v3.1.3
Author: Xavier Noria 
Date:   2011-11-17 23:59:19 +0100

    Revert "warn the user values are directly interpolated into _html translation strings"
    
    Reason: After another round of discussion, it has been
    decided to let interpolation deal with unsafe strings
    as it should do.
    
    This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b.

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	railties/guides/source/i18n.textile

commit 1079724	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-17 23:59:19 +0100

    Revert "warn the user values are directly interpolated into _html translation strings"
    
    Reason: After another round of discussion, it has been
    decided to let interpolation deal with unsafe strings
    as it should do.
    
    This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b.

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	railties/guides/source/i18n.textile

commit a437986	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-17 14:41:53 -0800

    allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development

M	.gitignore
M	Gemfile

commit eb46afa	refs/tags/v3.1.3
Author: Xavier Noria 
Date:   2011-11-17 23:07:06 +0100

    warn the user values are directly interpolated into _html translation strings

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	railties/guides/source/i18n.textile

commit d57d809	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-17 23:07:06 +0100

    warn the user values are directly interpolated into _html translation strings

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	railties/guides/source/i18n.textile

commit a03f018	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-11-06 10:36:56 +0000

    Implement a workaround for a bug in ruby-1.9.3p0.
    
    The bug is that an error would be raised while attempting to convert a
    template from one encoding to another.
    
    Please see http://redmine.ruby-lang.org/issues/5564 for more details.
    
    The workaround is to load all conversions into memory ahead of time,
    and will only happen if the ruby version is *exactly* 1.9.3p0. The
    hope is obviously that the underlying problem will be resolved in
    the next patchlevel release of 1.9.3.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG
A	actionpack/lib/action_view/data/encoding_conversions.txt
M	actionpack/lib/action_view/template.rb

commit e375970	refs/heads/master
Author: Philip Arndt 
Date:   2011-11-18 10:17:16 +1300

    Fixed typo: expect -> expected

M	activesupport/lib/active_support/dependencies.rb

commit 961b4a0	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-09-06 13:45:19 +0100

    Use broken YAML that will fail with Syck as well as Psych. Fixes test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
    
    Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c
    
    Conflicts:
    
    	activerecord/test/cases/fixtures_test.rb

M	activerecord/test/cases/fixtures_test.rb

commit 8d83e33	refs/heads/master
Author: gregolsen 
Date:   2011-11-17 22:17:33 +0200

    updating API docstring so that user can infer default value

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 9b53406	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-18 01:17:21 +0530

    update guide: db:structure:dump produces structure.sql now

M	railties/guides/source/migrations.textile

commit a2f14e2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-17 10:28:23 -0800

    Revert "Merge pull request #1163 from amatsuda/sexier_migration_31"
    
    This reverts commit 0e407a90413d8a19002b85508d811ccdf2190783, reversing
    changes made to 533a9f84b035756eedf9fdccf0c494dc9701ba72.
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
    	activerecord/test/cases/migration_test.rb

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/session_store.rb
M	activerecord/test/cases/migration_test.rb

commit 649f251	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-17 10:00:33 -0800

    Revert "Merge pull request #3603 from vijaydev/change_table_without_block_arg"
    
    This reverts commit 81fad6a270ec3cbbb88553c9f2e8200c34fd4d13, reversing
    changes made to 23101de283de13517e30c4c3d1ecc65525264886.
    
    Conflicts:
    
    	activerecord/test/cases/migration_test.rb

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/migration_test.rb

commit a89fabb	refs/heads/master
Author: Oscar Del Ben 
Date:   2011-11-17 18:49:47 +0100

    Cleanup of databases.rake psql env variables

M	activerecord/lib/active_record/railties/databases.rake

commit 8d17af2	refs/heads/master
Author: Sunny Ripert 
Date:   2011-11-17 17:05:53 +0100

    Guides: better example to find the last sent email

M	railties/guides/source/testing.textile

commit 1d8c576	refs/tags/v3.1.3
Author: Alexander Uvarov 
Date:   2011-11-17 12:04:46 +0600

    Fix impractical I18n lookup in nested fields_for

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit d8b2b6a	refs/heads/master
Merge: e2d3060 0af9308
Author: José Valim 
Date:   2011-11-17 07:10:11 -0800

    Merge pull request #3663 from atambo/master
    
    Move schema_format :sql config setting from test.rb to application.rb

commit 0af9308	refs/heads/master
Author: Alex Tambellini 
Date:   2011-11-17 09:44:17 -0500

    Move schema_format :sql config setting from test.rb to application.rb
    
    I've moved the schema_format :sql config setting to application.rb because you would
    never enable this only for the test environment. If you use database constraints
    or database specific data types you would want all of your environments to use them.

M	railties/guides/code/getting_started/config/application.rb
M	railties/guides/code/getting_started/config/environments/test.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit e2d3060	refs/heads/master
Merge: e6f3299 c2b6f63
Author: José Valim 
Date:   2011-11-17 00:02:49 -0800

    Merge pull request #3654 from wildchild/label_i18n
    
    Fix impractical I18n lookup in nested fields_for

commit de44773	refs/tags/v3.0.14
Merge: 2ba0309 4e72f59
Author: José Valim 
Date:   2011-11-17 00:01:54 -0800

    Merge pull request #3655 from arunagw/mysql_bump_3-0-stable
    
    Mysql bump 3 0 stable

commit e6f3299	refs/heads/master
Merge: 4148a7c c3ae1d2
Author: Vijay Dev 
Date:   2011-11-16 23:30:45 -0800

    Merge pull request #3658 from arunagw/fix_initialize_var_name
    
    It should be @calculated_ip not @calculate_ip

commit c3ae1d2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-17 12:50:19 +0530

    It should be @calculated_ip not @calculate_ip
    
    We are using @calculated_ip.
    @calculate_ip is no where used

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 4148a7c	refs/heads/master
Merge: e367142 5ccd9bc
Author: Vijay Dev 
Date:   2011-11-16 23:00:40 -0800

    Merge pull request #3656 from arunagw/readline_to_read
    
    No need to `readlines` then `join`, just use `read` :heart:

commit 5ccd9bc	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-17 12:24:40 +0530

    No need to `readlines` then `join`, just use `read` :heart:
    
    same as 4c1a1933cbc5ab96efe340a3b31ac5fee12c99c8

M	activerecord/lib/active_record/railties/databases.rake

commit 4e72f59	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-11-17 12:17:44 +0530

    Mysql2 version bump!
    
    I saw one bug fixed here
    
    https://github.com/brianmario/mysql2/commit/e60599b912dfc6c0c0394656b103f537414d93f4

M	Gemfile
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/app_generator_test.rb

commit c2b6f63	refs/heads/master
Author: Alexander Uvarov 
Date:   2011-11-17 12:04:46 +0600

    Fix impractical I18n lookup in nested fields_for

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit e367142	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 16:55:11 -0800

    Initialize our instance variables.

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 70f9b74	refs/heads/master
Merge: 4c1a193 a9044d0
Author: Aaron Patterson 
Date:   2011-11-16 16:44:09 -0800

    Merge pull request #3649 from indirect/remote_ip
    
    Fixes for Request#remote_ip (no middleware, all proxies)

commit 4c1a193	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 16:18:00 -0800

    No need to `readlines` then `join`, just use `read` :heart:

M	activerecord/lib/active_record/railties/databases.rake

commit 64a3175	refs/heads/master
Author: capps 
Date:   2011-11-16 15:57:54 -0800

    "denoted" instead of "donated"
    "parentheses" instead of "use brackets"

M	railties/guides/source/i18n.textile

commit bb95e81	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 15:51:25 -0800

    Adding a deprecation warning for use of the schema_info table.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 97ca635	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 15:40:20 -0800

    Join method uses empty string by default, so remove it

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

commit b96aaf8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 15:30:00 -0800

    dbfile isn't supported anymore, so remove

M	activerecord/lib/active_record/railties/databases.rake

commit ca69408	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 15:27:47 -0800

    Reduce schema format tests

M	activerecord/lib/active_record/railties/databases.rake

commit 38d26b0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 15:01:02 -0800

    Move conditionals to separate tasks so they can be reused.

M	activerecord/lib/active_record/railties/databases.rake

commit 272f2b7	refs/heads/master
Merge: 540e929 a50f659
Author: Jon Leighton 
Date:   2011-11-16 15:26:31 -0800

    Merge pull request #3500 from olivierlacan/error-whitespace
    
    CSS fix to prevent error output from being breaking out of body element.

commit 540e929	refs/heads/master
Merge: a152fd3 73cb0f9
Author: Jon Leighton 
Date:   2011-11-16 15:23:44 -0800

    Merge pull request #3438 from lazyatom/becomes-includes-errors
    
    Becomes includes errors

commit 73cb0f9	refs/heads/master
Author: James Adam 
Date:   2011-10-26 12:51:38 +0100

    `ActiveRecord::Base#becomes` should retain the errors of the original object.
    
    This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance.

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/base_test.rb

commit a9044d0	refs/heads/master
Author: Andre Arko 
Date:   2011-11-16 12:58:49 -1000

    the object itself isn't the IP, #to_s is the IP

M	actionpack/lib/action_dispatch/http/request.rb

commit a152fd3	refs/heads/master
Merge: cef1e14 76b6027
Author: Jon Leighton 
Date:   2011-11-16 14:57:48 -0800

    Merge pull request #3608 from arunagw/unused_var_remove
    
    Unused variable removed

commit 5621abd	refs/heads/master
Author: Andre Arko 
Date:   2011-11-16 12:49:15 -1000

    :facepalm: Request#remote_ip has to work without the middleware

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit f05ccf8	refs/heads/master
Author: Andre Arko 
Date:   2011-11-16 12:53:43 -1000

    Revert "Revert "Merge pull request #3640 from indirect/remote_ip""
    
    This reverts commit 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f, because I have fixed the issues this commit caused in the next commit.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit cef1e14	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 14:45:18 -0800

    removing some useless conditionals

M	activerecord/lib/active_record/railties/databases.rake

commit 43821bf	refs/heads/master
Merge: 3a6a10a 15fb430
Author: Aaron Patterson 
Date:   2011-11-16 14:37:24 -0800

    Merge pull request #2948 from atambo/master
    
    schema_format :sql should behave like schema_format :ruby

commit 3a6a10a	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-16 21:37:10 +0000

    Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644.

D	actionpack/lib/action_view/data/encoding_conversions.dump
A	actionpack/lib/action_view/data/encoding_conversions.txt
M	actionpack/lib/action_view/template.rb

commit 6f08621	refs/tags/v3.1.2
Author: Jon Leighton 
Date:   2011-11-16 21:37:10 +0000

    Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644.

D	actionpack/lib/action_view/data/encoding_conversions.dump
A	actionpack/lib/action_view/data/encoding_conversions.txt
M	actionpack/lib/action_view/template.rb

commit f754f3d	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-16 21:37:10 +0000

    Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644.

D	actionpack/lib/action_view/data/encoding_conversions.dump
A	actionpack/lib/action_view/data/encoding_conversions.txt
M	actionpack/lib/action_view/template.rb

commit 61228e9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 13:25:55 -0800

    fixing tests on PG

M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit df5ec41	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-16 10:42:56 -0800

    bundler treats trunk ruby as ruby 1.9, hack around that for now

M	Gemfile

commit 325abe9	refs/heads/master
Author: Daniel Dyba 
Date:   2011-07-17 23:09:51 -0700

    Substituted RailsCommands for Rails::Commands

M	railties/lib/rails/commands/plugin.rb

commit 21c5a0a	refs/heads/master
Author: Daniel Dyba 
Date:   2011-07-16 16:54:03 -0700

    Changed Commands module to RailsCommands.
    
    This is to avoid a conflict that occurs when you add Rake to
    your Gemfile. There is a Commands Object in Rake that conflicts
    with the Commands module in plugin.rb. See rails issue #1866.

M	railties/lib/rails/commands/plugin.rb

commit 2ba0309	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-11-16 10:21:58 -0800

    Revert "Merge pull request #2122 from dyba/3-0-stable"
    
    This reverts commit b81c3f7d6a41488ba40f41b2b0ed9c32d83e0b39, reversing
    changes made to 6122924121f286e79a947cdf4abfe7ca8e78bbd6.

M	railties/lib/rails/commands/plugin.rb

commit b81c3f7	refs/tags/v3.0.14
Merge: 6122924 71c010d
Author: Aaron Patterson 
Date:   2011-11-16 10:18:38 -0800

    Merge pull request #2122 from dyba/3-0-stable
    
    Issue #1866: Changed Commands module to RailsCommands.

commit 6122924	refs/tags/v3.0.14
Merge: 394dd6f 328ae5b
Author: Yehuda Katz 
Date:   2011-11-16 09:38:04 -0800

    Merge pull request #3646 from mhuffnagle/3-0-stable
    
    Fix for relative_url_root= missing parameter (issue 3645)

commit 9364043	refs/heads/master
Merge: 8d1a2b3 63a22ca
Author: Aaron Patterson 
Date:   2011-11-16 09:26:02 -0800

    Merge pull request #3634 from RyanNaughton/fixes_3483
    
    Fixes 3483

commit 9cdf33a	refs/heads/master
Author: Josh Susser 
Date:   2011-11-15 23:30:25 -0800

    add test for super-ing to association methods

M	activerecord/test/cases/associations_test.rb

commit 7cba6a3	refs/heads/master
Author: Josh Susser 
Date:   2011-11-14 22:57:15 -0800

    association methods are now generated in modules
    
    Instead of generating association methods directly in the model
    class, they are generated in an anonymous module which
    is then included in the model class. There is one such module
    for each association. The only subtlety is that the
    generated_attributes_methods module (from ActiveModel) must
    be forced to be included before association methods are created
    so that attribute methods will not shadow association methods.

M	activerecord/lib/active_record/associations/builder/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/collection_association.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/builder/singular_association.rb
M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/associations_test.rb

commit bc00514	refs/heads/master
Author: rpq 
Date:   2011-11-15 23:20:21 -0500

    added comma

M	railties/guides/source/asset_pipeline.textile

commit 328ae5b	refs/tags/v3.0.14
Author: mhuffnagle 
Date:   2011-11-15 22:32:49 -0500

    Added a missing parameter to relative_url_root= that was causing an ArgumentError: wrong number of arguments (1 for 0) to be thrown at actionpack-3.0.10/lib/action_controller/railtie.rb:54.

M	actionpack/lib/action_controller/deprecated/base.rb

commit 8d1a2b3	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-15 22:47:18 +0000

    Revert "Merge pull request #3640 from indirect/remote_ip"
    
    This reverts commit 6491aadc525b8703708e0fd0fbf05bd436a47801, reversing
    changes made to 83bf0b626cf2134260903e57d74f67de57384073.
    
    See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
    explanation.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 17c84c5	refs/tags/v3.1.3
Merge: 798a3c1 b02daec
Author: Jon Leighton 
Date:   2011-11-15 14:39:13 -0800

    Merge pull request #3633 from Juanmcuello/3-1-stable
    
    Backport #3232 to 3-1-stable

commit ffd1519	refs/tags/v3.1.2
Author: Jon Leighton 
Date:   2011-11-15 14:39:13 -0800

    Merge pull request #3633 from Juanmcuello/3-1-stable
    
    Backport #3232 to 3-1-stable

M	activerecord/CHANGELOG.md
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 6491aad	refs/heads/master
Merge: 83bf0b6 d743954
Author: Yehuda Katz 
Date:   2011-11-15 13:59:31 -0800

    Merge pull request #3640 from indirect/remote_ip
    
    GetIp#to_s should never return nil. That's icky.

commit 83bf0b6	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-16 02:36:36 +0530

    refactor test_multiple_of

M	activesupport/test/core_ext/integer_ext_test.rb

commit b02daec	refs/tags/v3.1.3
Author: Juan M. Cuello 
Date:   2011-10-05 14:42:15 -0300

    Backport #3232 to 3-1-stable.
    
    Use the schema_search_path in prepared statements in postgres.
    
    Only the tests are backported, the fix was already included by
    commit 818d285305502cc6191a98400b43633f44394f6e.

M	activerecord/CHANGELOG.md
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit df08273	refs/heads/master
Author: Sergey Parizhskiy 
Date:   2011-11-15 13:09:41 +0200

    made url to a github issues a bit shorter - no need in a page param when it's a first page

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 3dc80b7	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-11-15 10:33:25 +0200

    AS::Callbacks::Callback refactor
    
    In order to make Callbacks code always operate on valid peaces of code
    Concatenated Callback#start and Callback#end method into #apply
    method.

M	activesupport/lib/active_support/callbacks.rb

commit 76b6027	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-11 15:34:47 +0530

    Unused variable removed

M	railties/test/application/console_test.rb
M	railties/test/application/rackup_test.rb

commit 63a22ca	refs/heads/master
Author: Ryan Naughton 
Date:   2011-11-14 21:43:27 -0600

    Fixes issue #3483, regarding using a mixture of ranges and discrete values in find conditions. Paired with Joey Schoblaska.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/finder_test.rb

commit e1b79c5	refs/heads/master
Author: Gabriel Sobrinho 
Date:   2011-11-01 08:40:30 -0200

    Failing test case for issue #3483

M	activerecord/test/cases/finder_test.rb

commit d743954	refs/heads/master
Author: Andre Arko 
Date:   2011-11-14 16:43:21 -1000

    GetIp#to_s should never return nil. That's icky.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit c7ab43f	refs/heads/master
Merge: 25c9e44 b8c85de
Author: Jon Leighton 
Date:   2011-11-14 15:06:41 -0800

    Merge pull request #3632 from indirect/b8c85de
    
    unit test for fix from a few minutes ago

commit b8c85de	refs/heads/master
Author: Andre Arko 
Date:   2011-11-14 12:29:51 -1000

    add test for bug fixed in 4f2bf64

M	actionpack/test/dispatch/request_test.rb

commit 25c9e44	refs/heads/master
Merge: 9fa329b 4f2bf64
Author: José Valim 
Date:   2011-11-14 13:27:36 -0800

    Merge pull request #3631 from indirect/remote_ip
    
    Force calculation of remote IP before using || operator

commit 4f2bf64	refs/heads/master
Author: Andre Arko 
Date:   2011-11-14 11:22:44 -1000

    Return the calculated remote_ip or ip
    
    This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?

M	actionpack/lib/action_dispatch/http/request.rb

commit cda1a5d	refs/heads/master
Author: Andre Arko 
Date:   2011-11-14 11:20:57 -1000

    memoize the relatively expensive remote IP code

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 00a0a4d	refs/heads/master
Author: Andre Arko 
Date:   2011-11-14 11:20:20 -1000

    cleaner names

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 9fa329b	refs/heads/master
Author: José Valim 
Date:   2011-11-14 20:12:17 +0100

    Speed up attribute invocation by checking if both name and calls are compilable.

M	activemodel/lib/active_model/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb

commit 2088f1b	refs/heads/master
Merge: 1df22bb 49cd6a0
Author: José Valim 
Date:   2011-11-14 09:53:57 -0800

    Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile
    
    Added therubyrhino to default Gemfile under JRuby

commit 1df22bb	refs/heads/master
Merge: be777b3 af64ac4
Author: Yehuda Katz 
Date:   2011-11-14 09:52:12 -0800

    Merge pull request #3628 from oscardelben/refactoring
    
    use any? instead of !empty?

commit be777b3	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-14 17:08:24 +0000

    Add a note to REALEASING_RAILS about testing the gem locally before releasing

M	RELEASING_RAILS.rdoc

commit 156784f	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-14 16:51:02 +0000

    rake release should push the tag

M	tasks/release.rb

commit 5ea132b	refs/tags/v3.1.2
Author: Jon Leighton 
Date:   2011-11-14 16:51:02 +0000

    rake release should push the tag

M	tasks/release.rb

commit 798a3c1	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-14 16:51:02 +0000

    rake release should push the tag

M	tasks/release.rb

commit af64ac4	refs/heads/master
Author: Oscar Del Ben 
Date:   2011-11-14 16:56:05 +0100

    use any? instead of !empty?

M	activemodel/lib/active_model/dirty.rb

commit e29f27a	refs/tags/v3.1.2.rc2 (tag: v3.1.2.rc2)
Author: Jon Leighton 
Date:   2011-11-14 15:44:50 +0000

    Preparing for 3.1.2.rc2 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 4847cbe	refs/tags/v3.1.2.rc2
Author: Jon Leighton 
Date:   2011-11-14 15:25:34 +0000

    Put sass-rails 3.1.5.rc.2 in the default Gemfile.
    
    Otherwise there will be dependency conflicts with sprockets.

M	railties/lib/rails/generators/app_base.rb

commit 307a9e2	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-14 15:25:34 +0000

    Put sass-rails 3.1.5.rc.2 in the default Gemfile.
    
    Otherwise there will be dependency conflicts with sprockets.

M	railties/lib/rails/generators/app_base.rb

commit 68ed8ea	refs/tags/v3.1.2.rc1 (tag: v3.1.2.rc1)
Author: Jon Leighton 
Date:   2011-11-14 14:12:59 +0000

    Preparing for 3.1.2.rc1 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 11c9fc9	refs/heads/master
Merge: ca3b468 5bc23e4
Author: Aaron Patterson 
Date:   2011-11-14 04:36:55 -0800

    Merge pull request #3371 from yahonda/fix_ora_00932_error
    
    Fix ORA-00932 error when trying to insert 0 to DATE type columns.

commit ca3b468	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-14 12:23:43 +0000

    Sync changelog entry

M	actionpack/CHANGELOG.md

commit 0d78459	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-14 03:40:17 -0800

    Merge pull request #3625 from guilleiguaran/sprockets-2.1.0
    
    Upgrade Sprockets to 2.1.0
    Conflicts:
    
    	actionpack/actionpack.gemspec

M	actionpack/CHANGELOG.md
M	actionpack/actionpack.gemspec

commit 4d8081b	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-14 12:08:03 +0000

    Add note about checking postgres tests before release

M	RELEASING_RAILS.rdoc

commit 49cd6a0	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-11-14 07:07:38 -0500

    Added therubyrhino to default Gemfile under JRuby

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit d023078	refs/heads/master
Merge: c7b8468 e0eb229
Author: Jon Leighton 
Date:   2011-11-14 03:40:17 -0800

    Merge pull request #3625 from guilleiguaran/sprockets-2.1.0
    
    Upgrade Sprockets to 2.1.0

commit c7b8468	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-14 11:29:57 +0000

    Add note about syncing CHANGELOGs

M	RELEASING_RAILS.rdoc

commit da02f79	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-14 11:28:12 +0000

    Sync CHANGELOGs from 3-1-stable

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	railties/CHANGELOG.md

commit e0eb229	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-11-14 06:25:03 -0500

    Upgrade Sprockets to 2.1.0
    
    This version brings bug fixes for performance and caching.

M	actionpack/actionpack.gemspec

commit e6d8ed5	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-14 11:20:49 +0000

    Add missing CHANGELOG entries

M	actionpack/CHANGELOG.md
M	activerecord/CHANGELOG.md
M	railties/CHANGELOG.md

commit e52dc33	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-14 01:44:32 +0000

    Revert "Properly cache value when it is "false""
    
    This reverts commit 551f31340592b562a206591f45c76678830fc934.
    
    Reason: see
    https://github.com/rails/rails/pull/2010#issuecomment-2725865

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 2ec8d52	refs/heads/master
Merge: d37e169 bf6efa8
Author: Yehuda Katz 
Date:   2011-11-13 13:38:45 -0800

    Merge pull request #3622 from noefroidevaux/issue_3595
    
    Fix pull request #3609

commit d37e169	refs/heads/master
Merge: e0efe48 9c4532b
Author: José Valim 
Date:   2011-11-13 12:34:23 -0800

    Merge pull request #3623 from indirect/remote_ip
    
    Remote IP fixes/cleanup

commit 9c4532b	refs/heads/master
Author: Andre Arko 
Date:   2011-11-13 10:22:12 -1000

    remove ignored flag, fixes warnings

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 2d063c6	refs/heads/master
Author: Andre Arko 
Date:   2011-11-13 10:20:55 -1000

    turns out the tests expect remote_addrs.first

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 2189bff	refs/heads/master
Author: Andre Arko 
Date:   2011-11-13 10:20:29 -1000

    correctly raise IpSpoofAttackError message

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 8f0085a	refs/heads/master
Author: Andre Arko 
Date:   2011-11-13 10:19:54 -1000

    change tests to expect X-F-F over REMOTE_ADDR

M	actionpack/test/dispatch/request_test.rb

commit 8971cca	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 10:20:03 -0700

    Move tooltip on re-running rails new with a different --database option

M	railties/guides/source/getting_started.textile

commit b015d92b	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-11-10 09:45:57 +0400

    Cosmetic fix in number_to_currency docs

M	actionpack/lib/action_view/helpers/number_helper.rb

commit c27c783	refs/tags/v3.1.3
Author: Jean Boussier 
Date:   2011-11-10 18:49:37 +0100

    Fix a tiny typo in custom validators documentation

M	activemodel/lib/active_model/validations/validates.rb

commit e0efe48	refs/heads/master
Merge: 2591cc6 3012230
Author: Vijay Dev 
Date:   2011-11-13 22:29:26 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 3012230	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-13 22:27:44 +0530

    copy edits in getting started guide

M	railties/guides/source/getting_started.textile

commit af51409	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-13 22:07:54 +0530

    Revert "Move Tip up higher so users who are fine with SQLite can skip to the next section"
    
    This reverts commit 4bf057b8661754948681a18cf17ff5676518d774.
    
    Reason: Prefer to keep the configuration of all databases at the same
    level

M	railties/guides/source/getting_started.textile

commit c8c08bd	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-13 21:57:39 +0530

    Revert "Use rails help new instead of rails new -h"
    
    This reverts commit 6ac65c92029d3eefd101f9458d86bae0314cd14c.

M	railties/guides/source/getting_started.textile

commit e1099eb	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-13 21:50:18 +0530

    Revert "Update guide to use Ruby 1.9 hash syntax"
    
    This reverts commit 50a9de514f8724b04d3681aa9ca228a8ca490909.
    
    Reason: Let's keep the guides at 1.8 syntax

M	railties/guides/source/getting_started.textile

commit 2591cc6	refs/heads/master
Merge: df300a7 317f4e2
Author: José Valim 
Date:   2011-11-13 04:53:51 -0800

    Merge pull request #3617 from indirect/remote_ip
    
    refactor RemoteIp middleware

commit 50a9de5	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 03:15:56 -0700

    Update guide to use Ruby 1.9 hash syntax

M	railties/guides/source/getting_started.textile

commit a3156ac	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 03:15:22 -0700

    Add output for add_index command

M	railties/guides/source/getting_started.textile

commit 0774f22	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 03:13:58 -0700

    Convert tables to table format

M	railties/guides/source/getting_started.textile

commit c0ee497	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 03:12:13 -0700

    Grammar change

M	railties/guides/source/getting_started.textile

commit bf6efa8	refs/heads/master
Author: Noé Froidevaux 
Date:   2011-11-13 11:03:22 +0100

    Fix pull request #3609

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 5e83491	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:40:28 -0700

    Be explicit on where the show.html.erb is located

M	railties/guides/source/getting_started.textile

commit 3e3872b	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:35:08 -0700

    Make the guide more friendly
    
    - Changed Rails 3.0 to 3.0+

M	railties/guides/source/getting_started.textile

commit 9b96f74	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:33:29 -0700

    Be explicit about changing code

M	railties/guides/source/getting_started.textile

commit cb552f8	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:32:26 -0700

    p.errors.full_messages is a little more human readable

M	railties/guides/source/getting_started.textile

commit fc8f0a8	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:31:33 -0700

    Add link to AR Validations and Callbacks to further explain validations

M	railties/guides/source/getting_started.textile

commit 1394c54	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:31:07 -0700

    Update wording to read better

M	railties/guides/source/getting_started.textile

commit 06a8d16	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:29:11 -0700

    Update wording to be more explicit on what the timestamp fields track

M	railties/guides/source/getting_started.textile

commit 094bb8e	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:28:09 -0700

    Update order so they show up in the order they do in the scaffolding output

M	railties/guides/source/getting_started.textile

commit 434fbe4	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:27:14 -0700

    Update wording to flow better

M	railties/guides/source/getting_started.textile

commit 703d5c2	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:26:23 -0700

    Fix typo

M	railties/guides/source/getting_started.textile

commit 4bf057b	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:25:45 -0700

    Move Tip up higher so users who are fine with SQLite can skip to the next section

M	railties/guides/source/getting_started.textile

commit 194a42e	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:24:44 -0700

    Updated wording to read better

M	railties/guides/source/getting_started.textile

commit b778a7e	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:21:40 -0700

    Updated wording on what 'rails new blog' did for the user
    
    - Alphabetized the files/folders created
    - Added link to Configuring Rails Applications

M	railties/guides/source/getting_started.textile

commit 6ac65c9	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:19:21 -0700

    Use rails help new instead of rails new -h

M	railties/guides/source/getting_started.textile

commit ee10012	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:18:24 -0700

    Move paragraphs to flow better
    
    - Give the user a way to know they are fully installed and ready to continue

M	railties/guides/source/getting_started.textile

commit 962c55d	refs/heads/master
Author: Jason Noble 
Date:   2011-11-13 01:16:58 -0700

    Add Tip about skipping to Section 3 if they want to come back to the philosophy later

M	railties/guides/source/getting_started.textile

commit f323b42	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2011-11-13 13:35:32 +0800

    Fix bad English.

M	railties/guides/source/caching_with_rails.textile

commit d9703fe	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2011-11-13 13:34:16 +0800

    Clearing cache in action caching is not "the exact same way" as with page caching.

M	railties/guides/source/caching_with_rails.textile

commit 650ec89	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2011-11-13 13:25:39 +0800

    Suggest a workaround for page caching and parameters instead of an unhelpful warning.

M	railties/guides/source/caching_with_rails.textile

commit a02b40a	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2011-11-13 13:18:55 +0800

    Fix "in memory" where it should be "in-memory".

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/lib/active_support/cache/strategy/local_cache.rb

commit 551f313	refs/tags/v3.1.3
Author: Sebi Burkhard 
Date:   2011-07-08 18:08:37 +0700

    Properly cache value when it is "false"

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit df300a7	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-11-12 15:16:53 -0200

    Allow to use ruby-debug in 1.9.3

M	Gemfile

commit 8f20d59	refs/heads/master
Merge: c3035e1 b74aedf
Author: Jon Leighton 
Date:   2011-11-12 06:49:47 -0800

    Merge pull request #3618 from amatsuda/ad_headers_unmemoizable
    
    Unneeded require 'active_support/memoizable'

commit b74aedf	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-12 23:15:54 +0900

    Unneeded require memoizable

M	actionpack/lib/action_dispatch/http/headers.rb

commit 317f4e2	refs/heads/master
Author: Andre Arko 
Date:   2011-11-12 00:45:31 -1000

    defer calculating the remote IP until requested

M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 9432163	refs/heads/master
Author: Andre Arko 
Date:   2011-11-11 21:22:49 -1000

    refactor RemoteIp middleware
    
    - return the last forwarded IP before REMOTE_ADDR to handle proxies
    - remove completely superfluous RemoteIpGetter class
    - remove duplication of trusted proxies regexp
    - remove unused constant from Request
    - move comments from Request to where they are actually relevant
    - edit comments for clarity of purpose
    
    The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address.

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/remote_ip.rb

commit 84908fa	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-11-11 13:34:55 -0500

    For what it's worth; Update `memcache-client` gem name

M	railties/guides/source/caching_with_rails.textile

commit c3035e1	refs/heads/master
Merge: b7052a0 a766d83
Author: Xavier Noria 
Date:   2011-11-11 10:03:29 -0800

    Merge pull request #3613 from mitio/fix-actionpack-responder-docs
    
    Fix wording and minor typos in the Responder RDoc

commit a766d83	refs/heads/master
Author: Dimitar Dimitrov 
Date:   2011-11-11 19:37:54 +0200

    Fix wording and minor typos in the Responder RDoc

M	actionpack/lib/action_controller/metal/responder.rb

commit b7052a0	refs/heads/master
Merge: 1c6d6b6 8483c7c
Author: José Valim 
Date:   2011-11-11 08:03:02 -0800

    Merge pull request #3611 from bogdan/compile_options
    
    AS::Callbacks::Callback#_compile_option refactored

commit 8483c7c	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-11-11 14:27:40 +0200

    AS::Callbacks::Callback#_compile_option refactored

M	activesupport/lib/active_support/callbacks.rb

commit 9fd0cd3	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-11 17:12:42 +0530

    Revert "Fix "in memory" where it should be "in-memory"."
    
    This reverts commit e34e4d43301618307f94123d3710f094297f91f3.
    
    Reason: code changes are not allowed in docrails.

M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/lib/active_support/cache/strategy/local_cache.rb

commit 1c6d6b6	refs/heads/master
Merge: 7352efa 27c5800
Author: Aaron Patterson 
Date:   2011-11-11 03:38:49 -0800

    Merge pull request #3609 from noefroidevaux/issue_3595
    
    Prevent multiple SHOW TABLES calls when a table don't exists in database...

commit 27c5800	refs/heads/master
Author: Noé Froidevaux 
Date:   2011-11-11 12:09:51 +0100

    Prevent multiple SHOW TABLES calls when a table don't exists in database.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 7352efa	refs/heads/master
Merge: 2e5c471 08cc49b
Author: José Valim 
Date:   2011-11-11 02:02:59 -0800

    Merge pull request #3607 from bogdan/callbacks
    
    AS::Callbacks.__run_keyed_callback: remove unused cache

commit df5c9fd	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2011-11-11 17:07:02 +0800

    Update Memcached website to its new one at http://memcached.org/.

M	activesupport/lib/active_support/cache/mem_cache_store.rb

commit e34e4d4	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2011-11-11 17:04:50 +0800

    Fix "in memory" where it should be "in-memory".

M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/lib/active_support/cache/strategy/local_cache.rb

commit 2e5c471	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-11 12:47:03 +0530

    change_table bulk test case should check if the connection supports bulk alter

M	activerecord/test/cases/migration_test.rb

commit 81fad6a	refs/heads/master
Merge: 23101de 6e112e4
Author: José Valim 
Date:   2011-11-10 14:39:00 -0800

    Merge pull request #3603 from vijaydev/change_table_without_block_arg
    
    Modify change_table to remove the need for the block argument

commit 6e112e4	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-11 02:47:27 +0530

    Modify change_table to remove the need for the block argument.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/migration_test.rb

commit b9aaa31	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-11 01:49:05 +0530

    update ci file name in contributing guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 9ce5d51	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2011-11-10 18:52:39 +0100

    fixed example code indentation

M	railties/lib/rails/engine.rb

commit fd17ffc	refs/heads/master
Author: Jean Boussier 
Date:   2011-11-10 18:49:37 +0100

    Fix a tiny typo in custom validators documentation

M	activemodel/lib/active_model/validations/validates.rb

commit 23101de	refs/heads/master
Merge: 74233d4 b805c71
Author: José Valim 
Date:   2011-11-10 09:37:58 -0800

    Merge pull request #3600 from vijaydev/migration_arity
    
    Checking the arity of the block passed to create_table

commit b805c71	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-10 19:05:37 +0530

    Checking the arity of the block passed to create_table
    
    A recent change made to create_table does away with the
    need for the block argument. Checking the arity will prevent the
    mixing up of the two syntaxes.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/migration_test.rb

commit 74233d4	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-10 22:36:20 +0530

    Fixes deprecation warning about passing a template handler
    in the template name while generating guide related pages
    like index, layout and credits

M	railties/guides/rails_guides/generator.rb

commit 08cc49b	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-11-10 16:42:27 +0200

    AS::Callbacks.__run_keyed_callback: remove unused cache

M	activesupport/lib/active_support/callbacks.rb

commit 80f96eb	refs/heads/master
Author: José Valim 
Date:   2011-11-10 08:57:09 -0200

    self.class.name -> self.name (we are already inside a class).

M	activesupport/lib/active_support/callbacks.rb

commit bdd76fb	refs/heads/master
Merge: 909e5cc b5c3987
Author: José Valim 
Date:   2011-11-10 02:53:43 -0800

    Merge pull request #3592 from avakhov/av-highlight-regexp
    
    Fix and simplify highlight regexp

commit 909e5cc	refs/heads/master
Merge: c778f4e 4934908
Author: José Valim 
Date:   2011-11-10 02:53:19 -0800

    Merge pull request #3591 from tylercoville/fix-plugin-new
    
    Fixed error with 'rails generate new plugin' where the .gitignore was not

commit c778f4e	refs/heads/master
Merge: d2cfa98 bf6e29e
Author: José Valim 
Date:   2011-11-10 02:50:46 -0800

    Merge pull request #3593 from bogdan/callbacks
    
    AS::Callbacks._define_runner better abstraction

commit d2cfa98	refs/heads/master
Merge: a625523 be7ab83
Author: José Valim 
Date:   2011-11-10 00:49:14 -0800

    Merge pull request #3581 from amatsuda/metal_response_body_19
    
    AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9

commit bf6e29e	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-11-10 10:25:27 +0200

    AS::Callbacks#_define_runner refactored
    
    Incapsulate the logic of keyed callback method definition and execution
    in the separated method.

M	activesupport/lib/active_support/callbacks.rb

commit b5c3987	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-10 11:26:42 +0400

    Fix and simplify highlight regexp

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 4934908	refs/heads/master
Author: Tyler Coville 
Date:   2011-11-09 23:22:26 -0800

    Fixed error with 'rails generate new plugin' where the .gitignore was not properly generated if --dummy-path was used and added test case

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/gitignore
M	railties/test/generators/plugin_new_generator_test.rb

commit 983a2dc	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-10 09:45:57 +0400

    Cosmetic fix in number_to_currency docs

M	actionpack/lib/action_view/helpers/number_helper.rb

commit be7ab83	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-10 10:54:56 +0900

    A test case to ensure that AC::Metal#response_body= always wraps the given value in an Array in both Ruby 1.8 and 1.9 (refs #3581)

M	actionpack/test/controller/new_base/bare_metal_test.rb

commit a625523	refs/heads/master
Author: José Valim 
Date:   2011-11-09 20:11:46 -0200

    Don't marshal dump twice when using encryptor.

M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/test/message_encryptor_test.rb

commit 71e84a3	refs/heads/master
Author: José Valim 
Date:   2011-11-09 19:48:56 -0200

    Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt.

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/test/message_encryptor_test.rb

commit 4c59170	refs/heads/master
Merge: f686d94 a658fd2
Author: José Valim 
Date:   2011-11-09 14:04:04 -0800

    Merge pull request #3589 from amatsuda/console_extend_command_bundle_fix
    
    Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application

commit a658fd2	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-10 06:47:35 +0900

    Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application

M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/console.rb

commit f686d94	refs/heads/master
Author: José Valim 
Date:   2011-10-26 09:40:49 +0200

    Use head :no_content on the guides as well.

M	railties/guides/code/getting_started/app/controllers/posts_controller.rb
M	railties/guides/source/getting_started.textile

commit 4857339	refs/heads/master
Merge: fba28ec 6d09f27
Author: José Valim 
Date:   2011-11-09 02:14:50 -0800

    Merge pull request #3509 from amatsuda/console_extend_command_bundle
    
    move Rails console top level methods to IRB context

commit 6d09f27	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-09 15:42:19 +0900

    Modulize Rails console methods so that other console libraries such as Pry can include these methods

M	railties/lib/rails/application.rb
M	railties/lib/rails/console/app.rb
M	railties/lib/rails/console/helpers.rb
M	railties/test/application/console_test.rb

commit fba28ec	refs/heads/master
Merge: 2843d3b f642724
Author: Vijay Dev 
Date:   2011-11-08 22:26:31 -0800

    Merge pull request #3579 from arunagw/missing_md_in_changelog
    
    CHANGELOG => CHANGELOG.md

commit f642724	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-09 09:59:17 +0530

    CHANGELOG => CHANGELOG.md
    
    I missed these in previous commit

M	railties/lib/rails/tasks/documentation.rake

commit 2843d3b	refs/heads/master
Merge: 6e87281 5f826ea
Author: Vijay Dev 
Date:   2011-11-08 22:15:29 -0800

    Merge pull request #3574 from arunagw/refactor_testing_uncommitted_task
    
    Refactor test:uncommitted task.

commit e7ec79d	refs/tags/v3.1.3
Merge: 1c61365 a0676b6
Author: Vijay Dev 
Date:   2011-11-08 22:10:45 -0800

    Merge pull request #3576 from arunagw/changelog_changelog_md
    
    Changelog changelog md

commit ed2eac8	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-09 14:34:10 +0900

    Remove j alias for ERB::Util.json_escape

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit a0676b6	refs/tags/v3.1.3
Author: Arun Agrawal 
Date:   2011-11-09 10:04:46 +0530

    CHANGELOG to CHANGELOG.md

M	Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	tasks/release.rb

commit 5f826ea	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-09 09:46:06 +0530

    Refactor test:uncommitted task.
    
    Thanks to @sobrinho (Gabriel Sobrinho)

M	railties/lib/rails/test_unit/testing.rake

commit 6e87281	refs/heads/master
Merge: 5b21bfa 74c6e80
Author: Aaron Patterson 
Date:   2011-11-08 12:39:50 -0800

    Merge pull request #3572 from amatsuda/ar_exists_uniq_order
    
    exclude ORDER BY clause when querying Relation#exists?

commit 74c6e80	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-09 04:46:11 +0900

    exclude ORDER BY clause when querying Relation#exists?

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 5b21bfa	refs/heads/master
Merge: cff1d75 8e56866
Author: Vijay Dev 
Date:   2011-11-08 10:04:41 -0800

    Merge pull request #3562 from rahul100885/rahul100885_work
    
    Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md

commit 8e56866	refs/heads/master
Author: Rahul Chaudhari 
Date:   2011-11-08 11:38:33 +0530

    Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md

M	Rakefile

commit 1c61365	refs/tags/v3.1.3
Author: Joost Baaij 
Date:   2011-11-08 16:27:15 +0100

    Replace example with SQL placeholder syntax.
    This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability.

M	railties/guides/source/association_basics.textile

commit cd14cbd	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-11-08 18:01:19 +0400

    Fix small typo in link_to_function doc

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit 23ca708	refs/tags/v3.1.3
Author: Akira Matsuda 
Date:   2011-11-07 14:03:33 +0900

    document fix: remove_column takes multiple column_names

M	activerecord/lib/active_record/migration.rb

commit 510e49b	refs/tags/v3.1.3
Author: Akira Matsuda 
Date:   2011-11-07 11:56:50 +0900

    self.up, self.down => up, down

M	activerecord/README.rdoc
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit df43c98	refs/tags/v3.1.3
Author: Dalibor Nasevic 
Date:   2011-11-06 14:43:11 +0100

    Fixed stale doc in AbstractController::Layouts

M	actionpack/lib/abstract_controller/layouts.rb

commit cff1d75	refs/heads/master
Merge: 34f61f8 1ffd5ec
Author: Vijay Dev 
Date:   2011-11-08 21:35:17 +0530

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	railties/guides/source/active_record_querying.textile

commit 1ffd5ec	refs/heads/master
Author: Joost Baaij 
Date:   2011-11-08 16:27:15 +0100

    Replace example with SQL placeholder syntax.
    This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability.

M	railties/guides/source/association_basics.textile

commit 979f3f8	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-08 18:01:19 +0400

    Fix small typo in link_to_function doc

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit dbecc52	refs/tags/v3.1.3
Merge: 12df79c 0fdcd54
Author: José Valim 
Date:   2011-11-08 06:00:29 -0800

    Merge pull request #3561 from bfolkens/3-1-stable-url_subdomain_with_numeric_host
    
    3 1 stable url subdomain with numeric host

commit 34f61f8	refs/heads/master
Merge: 1347665 bd559b0
Author: José Valim 
Date:   2011-11-08 06:00:22 -0800

    Merge pull request #3568 from bfolkens/master-url_subdomain_with_numeric_host
    
    Fix trouble using :subdomain in development environment when using numeric addresses.

commit bd559b0	refs/heads/master
Author: Bradford Folkens 
Date:   2011-11-08 07:52:35 -0600

        Fix trouble using :subdomain in development environment when using numeric addresses.
    
        See-also pull request #3561 from 3-1-stable
    
        Otherwise the following occurs:
    
        TypeError: can't convert nil into String
            /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain'
            /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for'
            /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host'
            /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run'
            /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send'
            /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/test/controller/url_for_test.rb

commit 0fdcd54	refs/tags/v3.1.3
Author: Bradford Folkens 
Date:   2011-11-08 07:27:42 -0600

    Fixed ' and ' should be ' && '

M	actionpack/lib/action_dispatch/http/url.rb

commit 1347665	refs/heads/master
Merge: 805e39b fe67501
Author: José Valim 
Date:   2011-11-08 02:28:41 -0800

    Merge pull request #3564 from arunagw/uncommitted_rake_fix
    
    Should be checking if file exists or not.

commit fe67501	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-08 14:10:44 +0530

    Should be checking if file exists or not.
    
    I found this bug when running rake test:uncommitted
    on a newly generated rails app which don't have
    test file for application_controller.
    Can see detail here #3461

M	railties/lib/rails/test_unit/testing.rake

commit 805e39b	refs/heads/master
Merge: 588faed b3175f6
Author: Xavier Noria 
Date:   2011-11-08 01:24:58 -0800

    Merge pull request #3565 from arunagw/warning_remove_release_file
    
    Warnings removed.

commit b3175f6	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-08 14:28:28 +0530

    Warnings removed.

M	tasks/release.rb

commit 588faed	refs/heads/master
Merge: f5ca190 b53f77e
Author: Vijay Dev 
Date:   2011-11-07 23:54:28 -0800

    Merge pull request #3563 from arunagw/changelog_to_md
    
    CHANGELOG to CHANGELOG.md

commit b53f77e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-11-08 12:56:51 +0530

    CHANGELOG to CHANGELOG.md

M	railties/lib/rails/tasks/documentation.rake
M	tasks/release.rb

commit 92955d0	refs/tags/v3.1.3
Author: Bradford Folkens 
Date:   2011-11-07 23:23:36 -0600

    Fix trouble using :subdomain in development environment when using numeric addresses.
    
    Otherwise the following occurs:
    
    TypeError: can't convert nil into String
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/test/controller/url_for_test.rb

commit f5ca190	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-08 10:37:06 +0530

    fix typo again (Thanks Phillip Oertel)

M	activesupport/lib/active_support/inflector/methods.rb

commit 396638c	refs/heads/master
Merge: 6ac56ac cf0a96b
Author: José Valim 
Date:   2011-11-07 07:09:06 -0800

    Merge pull request #3552 from evtuhovich/master
    
    Doc patch, DrbStore no more exists in rails

commit cf0a96b	refs/heads/master
Author: Ivan Evtukhovich 
Date:   2011-11-07 18:57:55 +0400

    DrbStore removed from cache backends

M	actionpack/lib/action_controller/caching.rb

commit 6ac56ac	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-07 17:58:03 +0530

    fix incorrect code example

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit 6a29ea0	refs/heads/master
Merge: 17ecdd3 aabd61a
Author: Aaron Patterson 
Date:   2011-11-07 03:02:26 -0800

    Merge pull request #3549 from luckydev/rmethod
    
    remove_method tests and changes

commit aabd61a	refs/heads/master
Author: Anand 
Date:   2011-11-07 16:22:52 +0530

    added remove_method core_ext tests

A	activesupport/test/core_ext/module/remove_method_test.rb

commit 4cef581	refs/heads/master
Author: Anand 
Date:   2011-11-07 16:22:30 +0530

    replaced remove and define method calls to :redefine

M	activemodel/lib/active_model/observing.rb

commit 17ecdd3	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-07 02:01:37 -0800

    adds trailing +s to the output of EXPLAIN for MySQL

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	railties/guides/source/active_record_querying.textile

commit 1a8df8a	refs/heads/master
Merge: b454601 42cf5eb
Author: José Valim 
Date:   2011-11-07 01:56:03 -0800

    Merge pull request #3542 from amatsuda/controller_generator_remove_blank_line
    
    Remove redundant blank line at the bottom of generated controller code

commit cc3e738	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-07 16:24:54 +0900

    Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9
    
    This was because String#respond_to?(:each) differs in 1.8 and 1.9

M	actionpack/lib/action_controller/metal.rb

commit b454601	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-06 22:21:05 -0800

    revises EXPLAIN tests for SQLite3
    
    The output in Travis is a bit different. The SQLite
    documentation (http://www.sqlite.org/eqp.html) warns
    output may change dramatically between releases. I
    do not want to mock the result set because I want a
    real EXPLAIN to happen. I prefer a test that may fail
    in future releases than a test that may give false
    positives in future releases.

M	activerecord/test/cases/adapters/sqlite3/explain_test.rb

commit 42cf5eb	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-07 14:31:12 +0900

    Remove redundant blank line at the bottom

M	railties/lib/rails/generators/rails/controller/templates/controller.rb

commit aff9e68	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-07 14:03:33 +0900

    document fix: remove_column takes multiple column_names

M	activerecord/lib/active_record/migration.rb

commit bcdc2c0	refs/heads/master
Merge: 4db1bd3 9a7d916
Author: Aaron Patterson 
Date:   2011-11-06 19:00:07 -0800

    Merge pull request #3541 from dvyjones/fix-datetime-warnings
    
    Removed argument throwing warnings when running tests

commit 55b203d	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-07 11:56:50 +0900

    self.up, self.down => up, down

M	activerecord/README.rdoc
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit 12df79c	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-11-06 11:46:28 +0400

    Docs cosmetic fixes in Action View form_helper.rb

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 9a7d916	refs/heads/master
Author: Henrik Hodne 
Date:   2011-11-06 17:35:02 +0100

    Removed argument throwing warnings when running tests.
    
    The last argument to DateTime.new/civil is the Julian day number for
    when the calendar reform occured. DateTime ignores it if it's 0, and
    sets it to the default of DateTime::ITALY instead, so we could just
    leave it out. This also removes the warnings while running the
    ActiveSupport tests (there still are some for the setup though).

M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 4db1bd3	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-06 22:03:06 +0530

    fix typo

M	activesupport/lib/active_support/inflector/methods.rb

commit 9b46613	refs/heads/master
Author: Aaron Patterson 
Date:   2011-11-06 08:15:34 -0800

    Merge pull request #3521 from nulogy/fix_postgres_adapter_to_handle_spaces_between_schemas
    
    Fix postgres adapter to handle spaces between schemas

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit a018403	refs/tags/v3.1.3
Merge: eef4679 58f2fbc
Author: Aaron Patterson 
Date:   2011-11-06 08:15:34 -0800

    Merge pull request #3521 from nulogy/fix_postgres_adapter_to_handle_spaces_between_schemas
    
    Fix postgres adapter to handle spaces between schemas

commit 6950639	refs/heads/master
Merge: 17947ce 1934b77
Author: José Valim 
Date:   2011-11-06 05:59:31 -0800

    Merge pull request #3536 from pkumar/master
    
    Make pluralize follow singularize's logic of uncountability check

commit 1934b77	refs/heads/master
Author: Pavan Kumar Sunkara 
Date:   2011-11-06 19:22:32 +0530

    Added the test case for #3537

M	activesupport/test/inflector_test_cases.rb

commit 759906d	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-11-06 14:43:11 +0100

    Fixed stale doc in AbstractController::Layouts

M	actionpack/lib/abstract_controller/layouts.rb

commit 8750c9a	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-06 18:58:55 +0530

    fix markups for plus in AR guide

M	railties/guides/source/active_record_querying.textile

commit 17947ce	refs/heads/master
Merge: 8a2f0a9 949b3e7
Author: Vijay Dev 
Date:   2011-11-06 17:27:44 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit eef4679	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-06 10:54:59 +0000

    RUBY_ENGINE is not defined on 1.8

M	actionpack/lib/action_view/template.rb

commit 8a2f0a9	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-06 10:54:59 +0000

    RUBY_ENGINE is not defined on 1.8

M	actionpack/lib/action_view/template.rb

commit 83e9446	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-06 10:36:56 +0000

    Implement a workaround for a bug in ruby-1.9.3p0.
    
    The bug is that an error would be raised while attempting to convert a
    template from one encoding to another.
    
    Please see http://redmine.ruby-lang.org/issues/5564 for more details.
    
    The workaround is to load all conversions into memory ahead of time,
    and will only happen if the ruby version is *exactly* 1.9.3p0. The
    hope is obviously that the underlying problem will be resolved in
    the next patchlevel release of 1.9.3.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md

M	actionpack/CHANGELOG.md
A	actionpack/lib/action_view/data/encoding_conversions.dump
M	actionpack/lib/action_view/template.rb

commit fc98811	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-06 10:36:56 +0000

    Implement a workaround for a bug in ruby-1.9.3p0.
    
    The bug is that an error would be raised while attempting to convert a
    template from one encoding to another.
    
    Please see http://redmine.ruby-lang.org/issues/5564 for more details.
    
    The workaround is to load all conversions into memory ahead of time,
    and will only happen if the ruby version is *exactly* 1.9.3p0. The
    hope is obviously that the underlying problem will be resolved in
    the next patchlevel release of 1.9.3.

M	actionpack/CHANGELOG.md
A	actionpack/lib/action_view/data/encoding_conversions.dump
M	actionpack/lib/action_view/template.rb

commit 7776055	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-06 10:15:04 +0000

    Revert "Skip test_default_external_works on the CI for Ruby 1.9.3."
    
    This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521.

M	actionpack/test/template/template_test.rb

commit a02bb72	refs/heads/master
Merge: 62512b9 52fa34f
Author: José Valim 
Date:   2011-11-06 02:20:06 -0800

    Merge pull request #3537 from dvyjones/refactor-pluralize-singularize
    
    Refactored pluralize and singularize into a common method

commit 52fa34f	refs/heads/master
Author: Henrik Hodne 
Date:   2011-11-06 11:13:51 +0100

    Refactored pluralize and singularize into a common method.
    
    See diff discussion on rails/#3536.

M	activesupport/lib/active_support/inflector/methods.rb

commit 62512b9	refs/heads/master
Merge: e7b7b44 c7d2078
Author: Jon Leighton 
Date:   2011-11-06 01:27:29 -0800

    Merge pull request #3535 from jmazzi/master
    
    Update ActiveRecord#attribute_present? to work as documented

commit 311a21b	refs/tags/v3.1.3
Merge: 3cd33ea fb73423
Author: Jon Leighton 
Date:   2011-11-06 01:23:56 -0800

    Merge pull request #3533 from kennyj/fix_3440-2
    
    Barckport to 3-1-stable: fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)

commit 949b3e7	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-06 11:46:28 +0400

    Docs cosmetic fixes in Action View form_helper.rb

M	actionpack/lib/action_view/helpers/form_helper.rb

commit c7d2078	refs/heads/master
Author: Justin Mazzi 
Date:   2011-11-05 22:36:19 -0400

    Update ActiveRecord#attribute_present? to work as documented
    
    "Returns true if the specified attribute has been set by the user or by
    a database load and is neither nil nor empty?"
    
    Fixes #1613

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit e7b7b44	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-20 10:50:08 -0700

    implements AR::Relation#explain
    
    This is a first implementation, EXPLAIN is highly
    dependent on the database and I have made some
    compromises.
    
    On one hand, the method allows you to run the most
    common EXPLAIN and that's it. If you want EXPLAIN
    ANALYZE in PostgreSQL you need to do it by hand.
    
    On the other hand, I've tried to construct a string
    as close as possible to the ones built by the
    respective shells. The rationale is that IMO the
    user should feel at home with the output and
    recognize it at first sight. Per database.
    
    I don't know whether this implementation is going
    to work well. Let's see whether people like it.

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation.rb
A	activerecord/test/cases/adapters/mysql2/explain_test.rb
A	activerecord/test/cases/adapters/postgresql/explain_test.rb
A	activerecord/test/cases/adapters/sqlite3/explain_test.rb
M	railties/guides/source/active_record_querying.textile

commit 89d7372	refs/heads/master
Merge: 4d9f779 44e751f
Author: Xavier Noria 
Date:   2011-11-05 17:28:52 -0700

    Merge pull request #3534 from guilleiguaran/arel-git-gemfile
    
    Add arel to Gemfile on apps generated in edge Rails

commit 44e751f	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-11-05 19:26:23 -0500

    Add arel to Gemfile on apps generated in edge Rails

M	railties/lib/rails/generators/app_base.rb

commit 4d9f779	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-05 15:33:36 -0700

    bumps up sprockets

M	actionpack/actionpack.gemspec

commit 56f16e2	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-05 12:09:18 -0700

    fixes typo

M	activesupport/lib/active_support/notifications.rb

commit d287e90	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-05 12:02:54 -0700

    implements AS::Notifications.subscribed, which provides subscriptions to events while a block runs

M	activesupport/CHANGELOG.md
M	activesupport/lib/active_support/notifications.rb
M	activesupport/test/notifications_test.rb

commit fb73423	refs/tags/v3.1.3
Author: kennyj 
Date:   2011-11-06 03:28:14 +0900

    Barckport to 3-1-stable: fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit b33232f	refs/heads/master
Author: Xavier Noria 
Date:   2011-11-05 10:29:28 -0700

    expands the documentation of AS::Notifications

M	activesupport/lib/active_support/notifications.rb

commit f575e21	refs/heads/master
Merge: f140445 fb0bf3c
Author: Jon Leighton 
Date:   2011-11-05 10:29:18 -0700

    Merge pull request #3525 from kennyj/fix_3440-1
    
    Fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)

commit f140445	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-05 17:21:58 +0000

    Revert "Merge pull request #2378 from cesario/remove_warnings_activemodel"
    
    This reverts commit 6aaae3de277b572f37e09f16ae12737c3c87dfb7, reversing
    changes made to fdbc4e5f4e5746ebf558485348c841b33f038fda.
    
    Reason: build failure.

M	activemodel/test/cases/serializers/xml_serialization_test.rb

commit fb0bf3c	refs/heads/master
Author: kennyj 
Date:   2011-10-31 22:53:47 +0900

    Fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit 5562150	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-05 22:31:39 +0530

    make class name consistent with the filename

M	activesupport/test/flush_cache_on_private_memoization_test.rb

commit 10773f9	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-05 16:42:53 +0000

    Skip test_default_external_works on the CI for Ruby 1.9.3.
    
    This test is affected by a bug in Ruby 1.9.3p0 and trunk:
    http://redmine.ruby-lang.org/issues/5564
    
    Given we cannot fix it for ourselves, it is better to skip for now so
    that we will easily see if further failures are introduced.
    
    Jon Leighton is monitoring the bug report and will revert this when a
    suitable solution is found (either a new Ruby release or a generic
    workaround).
    
    If you are using 1.9.3 in your app and have templates that are not in
    UTF-8, you should add a workaround early on in the boot process. For
    example, if your templates are Shift_JIS encoded, then add the
    following in an initializer:
    
    Encoding::Converter.new('Shift_JIS', 'UTF-8')

M	actionpack/test/template/template_test.rb

commit 9a111c7	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-04 16:34:42 +0000

    Use uniq instead of manually putting a DISTINCT in the query

M	activerecord/lib/active_record/associations/association_scope.rb

commit 562583c	refs/heads/master
Author: Jon Leighton 
Date:   2011-11-04 16:10:18 +0000

    Add ActiveRecord::Relation#uniq for toggling DISTINCT in the SQL query

M	Gemfile
M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	railties/guides/source/active_record_querying.textile

commit 6aaae3d	refs/heads/master
Merge: fdbc4e5 325fdfc
Author: Vijay Dev 
Date:   2011-11-05 08:44:16 -0700

    Merge pull request #2378 from cesario/remove_warnings_activemodel
    
    Remove warnings by calling remove_method

commit 3cd33ea	refs/tags/v3.1.3
Author: Vijay Dev 
Date:   2011-11-05 20:59:46 +0530

    Fixed after_initialize/after_find guide
    
    Defining after_initialize and after_find as ordinary methods like
    documented in the guide doesn't work with Rails 3.1.1; now macro-style
    is used here, too.
    
    Conflicted while cherry picking from master (Original Author: Florian Walch)

M	railties/guides/source/active_record_validations_callbacks.textile

commit 64122c7	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-11-03 09:02:11 +0400

    Fix javascript_include_tag examples in documentation

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit d753596	refs/tags/v3.1.3
Author: Henrik Hodne 
Date:   2011-11-03 22:19:49 +0100

    Added bundle exec to rake test.
    
    This is in response to rails/rails#3504.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 8261230	refs/tags/v3.1.3
Author: Ryan Bigg 
Date:   2011-11-01 11:18:17 +1100

    [config guide] mention that config methods are to be called on Railtie subclasses

M	railties/guides/source/configuring.textile

commit 740655c	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-11-01 08:55:03 +0400

    Fix typo in constraints method documentation

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 1389ebf	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-10-31 10:36:38 +0400

    Update routing guides, root route should be at the top of the file

M	railties/guides/source/routing.textile

commit fdbc4e5	refs/heads/master
Merge: 2751e21 09298e4
Author: Vijay Dev 
Date:   2011-11-05 20:45:11 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 09298e4	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-05 20:43:04 +0530

    Revert "outline two ways to invoke a custom active model validator"
    
    This reverts commit d163d3bf7ebb98d90977974aed8f85b7ec678afd.
    
    Reason: The alternate approach can be documented in the guide and
    not disrupt the existing flow in the readme.

M	activemodel/README.rdoc

commit 53f61ac	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-05 20:38:07 +0530

    Revert "make the inline text a comment in the code block"
    
    This reverts commit 36a5f48f9323c4a770c290a9a16ae58388e7925f.
    
    Reason: Editing .gitignore in docrails is not allowed. Docrails is meant
    only for documentation.

M	.gitignore
M	activemodel/README.rdoc

commit 2751e21	refs/heads/master
Merge: cb06727 69dcd45
Author: Jon Leighton 
Date:   2011-11-05 08:03:19 -0700

    Merge pull request #3529 from vjebelev/ar_ordered_indexes2
    
    AR changes to support creating ordered (asc, desc) indexes

commit bcd25e7	refs/heads/master
Author: Florian Walch 
Date:   2011-11-05 13:34:01 +0100

    Fixed after_initialize/after_find guide
    
    Defining after_initialize and after_find as ordinary methods like documented
    in the guide doesn't work with Rails 3.1.1; now macro-style is used here, too.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 194d7a4	refs/tags/v3.1.3
Merge: e3ba072 eb5391c
Author: Xavier Noria 
Date:   2011-11-05 02:34:40 -0700

    Merge pull request #3528 from arunagw/doc_fix
    
    Doc fix

commit eb5391c	refs/tags/v3.1.3
Author: Arun Agrawal 
Date:   2011-11-05 12:46:12 +0530

    Doc Fix It should be :git not :path in Gmefile Fix #3527

M	railties/guides/source/performance_testing.textile

commit 15fb430	refs/heads/master
Author: Alex Tambellini 
Date:   2011-09-08 16:07:04 -0400

    schema_format :sql should behave like schema_format :ruby
    
    This commit adds a db:structure:load task that is run instead of
    db:schema:load when schema_format is set to :sql. This patch also removes
    the prefixing of the structure.sql files to mimic the use of a single
    schema.rb file. The patch originates from github issue #715.

M	activerecord/lib/active_record/railties/databases.rake

commit 69dcd45	refs/heads/master
Author: Vlad Jebelev 
Date:   2011-11-04 15:45:24 -0500

    AR changes to support creating ordered (asc, desc) indexes

M	activerecord/CHANGELOG.md
M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/migration_test.rb

commit cb06727	refs/remotes/origin/serializers
Author: Vijay Dev 
Date:   2011-11-04 16:44:59 +0530

    add tests for the case where size is explicitly passed to number_field helper

M	actionpack/test/template/form_helper_test.rb

commit 58f2fbc	refs/tags/v3.1.3
Author: Sean Kirby 
Date:   2011-11-04 12:33:25 -0400

    fixes bug with PostgreSQLAdapter#indexes
    
    When the search path has multiple schemas, spaces were not being stripped
    from the schema names after the first.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit e3ba072	refs/tags/v3.1.3
Merge: 43486e0 fbc2fde
Author: Jon Leighton 
Date:   2011-11-04 07:06:19 -0700

    Merge pull request #3518 from cesario/gemspec-3-1-stable
    
    Resynchronizing the gemspecs

commit 76dedf0	refs/remotes/origin/serializers
Merge: 0fcf8bf 6da5586
Author: Jon Leighton 
Date:   2011-11-04 07:04:43 -0700

    Merge pull request #3517 from arunagw/test_fix_activerecord
    
    Fix test as one more has_many added

commit fbc2fde	refs/tags/v3.1.3
Author: Franck Verrot 
Date:   2011-11-04 14:46:35 +0100

    Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.md
    (cherry picked from commit 1679aa56f3f93ab976a8124bd071c0f4be69c46a)

M	actionmailer/actionmailer.gemspec
M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activerecord/activerecord.gemspec
M	activeresource/activeresource.gemspec
M	activesupport/activesupport.gemspec
M	railties/railties.gemspec

commit 09811a0	refs/tags/v3.1.3
Author: Franck Verrot 
Date:   2011-05-25 15:28:04 +0200

    Add the MIT-LICENSE to the Active Support gemspec
    (cherry picked from commit 4633772a12121e0f1ab16abdc8ecfd049c9f79f7)

M	activesupport/activesupport.gemspec

commit 04c15b7	refs/tags/v3.1.3
Author: Franck Verrot 
Date:   2011-05-25 15:27:58 +0200

    Add the MIT-LICENSE to the Active Resource gemspec
    (cherry picked from commit 85283f05924e2850e0929bc1d8821b7f3d226dc9)

M	activeresource/activeresource.gemspec

commit e3609d6	refs/tags/v3.1.3
Author: Franck Verrot 
Date:   2011-05-25 15:27:49 +0200

    Add the MIT-LICENSE to the Active Record gemspec
    (cherry picked from commit 64d977359d425ef8df2dc69ae0b1be81ecdb66c2)

M	activerecord/activerecord.gemspec

commit 6da5586	refs/remotes/origin/serializers
Author: Arun Agrawal 
Date:   2011-11-04 19:30:59 +0530

    Fix test as one more has_many added

M	activerecord/test/cases/reflection_test.rb

commit 0fcf8bf	refs/remotes/origin/serializers
Merge: 281272a 1679aa5
Author: Jon Leighton 
Date:   2011-11-04 06:54:32 -0700

    Merge pull request #3516 from cesario/fix_gemspec
    
    Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.md

commit 1679aa5	refs/remotes/origin/serializers
Author: Franck Verrot 
Date:   2011-11-04 14:46:35 +0100

    Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.md

M	actionmailer/actionmailer.gemspec
M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activerecord/activerecord.gemspec
M	activeresource/activeresource.gemspec
M	activesupport/activesupport.gemspec
M	railties/railties.gemspec

commit 43486e0	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-04 13:00:59 +0000

    Convert CHANGELOGs to Markdown format.
    
    Reasons:
    
     * Markdown reads well as plain text, but can also be formatted.
     * It will make it easier for people to read on the web as Github
       formats the Markdown nicely.
     * It will encourage a level of consistency when people are writing
       CHANGELOG entries.
    
    The script used to perform the conversion is at
    https://gist.github.com/1339263

D	actionmailer/CHANGELOG
A	actionmailer/CHANGELOG.md
D	actionpack/CHANGELOG
A	actionpack/CHANGELOG.md
D	activemodel/CHANGELOG
A	activemodel/CHANGELOG.md
D	activerecord/CHANGELOG
A	activerecord/CHANGELOG.md
D	activeresource/CHANGELOG
A	activeresource/CHANGELOG.md
D	activesupport/CHANGELOG
A	activesupport/CHANGELOG.md
D	railties/CHANGELOG
A	railties/CHANGELOG.md

commit 281272a	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-04 12:55:17 +0000

    Convert CHANGELOGs to Markdown format.
    
    Reasons:
    
     * Markdown reads well as plain text, but can also be formatted.
     * It will make it easier for people to read on the web as Github
       formats the Markdown nicely.
     * It will encourage a level of consistency when people are writing
       CHANGELOG entries.
    
    The script used to perform the conversion is at
    https://gist.github.com/1339263

D	actionmailer/CHANGELOG
A	actionmailer/CHANGELOG.md
D	actionpack/CHANGELOG
A	actionpack/CHANGELOG.md
D	activemodel/CHANGELOG
A	activemodel/CHANGELOG.md
D	activerecord/CHANGELOG
A	activerecord/CHANGELOG.md
D	activeresource/CHANGELOG
A	activeresource/CHANGELOG.md
D	activesupport/CHANGELOG
A	activesupport/CHANGELOG.md
D	railties/CHANGELOG
A	railties/CHANGELOG.md

commit e6cc2ea	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-04 11:16:55 +0000

    Allow the :class_name option for associations to take a symbol.
    
    This is to avoid confusing newbies, and to be consistent with the fact
    that other options like :foreign_key already allow a symbol or a string.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/company.rb

commit 2c67845	refs/remotes/origin/serializers
Merge: 0e407a9 56207a3
Author: José Valim 
Date:   2011-11-04 03:31:39 -0700

    Merge pull request #3514 from waseem/remove_size_attribute_from_number_field
    
    Remove 'size' attribute from number_field form helper fixes #3454

commit 0e407a9	refs/remotes/origin/serializers
Merge: 533a9f8 696c2ea
Author: Aaron Patterson 
Date:   2011-11-04 03:29:59 -0700

    Merge pull request #1163 from amatsuda/sexier_migration_31
    
    Sexier migrations

commit 36a5f48	refs/heads/master
Author: Karthik Muthupalaniappan 
Date:   2011-11-04 15:22:50 +0530

    make the inline text a comment in the code block

M	.gitignore
M	activemodel/README.rdoc

commit d163d3b	refs/heads/master
Author: Karthik Muthupalaniappan 
Date:   2011-11-04 15:18:37 +0530

    outline two ways to invoke a custom active model validator

M	activemodel/README.rdoc

commit 56207a3	refs/remotes/origin/serializers
Author: Waseem Ahmad 
Date:   2011-11-04 15:03:02 +0530

    Remove 'size' attribute from number_field form helper fixes #3454
    
    f.number_field generates  which is
    invalid HTML5. See: http://dev.w3.org/html5/spec/Overview.html#number-state

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 533a9f8	refs/remotes/origin/serializers
Author: Jeremy Kemper 
Date:   2011-11-03 21:14:51 -0700

    Merge pull request #3507 from jmazzi/issue-3503
    
    Preserve SELECT columns on the COUNT for finder_sql when possible

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit bd56b5a	refs/tags/v3.1.3
Merge: 75ae4b3 bad2d6f
Author: Jeremy Kemper 
Date:   2011-11-03 21:14:51 -0700

    Merge pull request #3507 from jmazzi/issue-3503
    
    Preserve SELECT columns on the COUNT for finder_sql when possible

commit bad2d6f	refs/tags/v3.1.3
Author: Justin Mazzi 
Date:   2011-11-03 15:01:12 -0400

    Preserve SELECT columns on the COUNT for finder_sql when possible.
    Pull request #3503

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 8611f14	refs/heads/master
Author: Henrik Hodne 
Date:   2011-11-03 22:19:49 +0100

    Added bundle exec to rake test.
    
    This is in response to rails/rails#3504.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 7102a3d	refs/heads/master
Author: Akira Matsuda 
Date:   2011-11-04 04:50:53 +0900

    move Rails console top level methods to IRB context

M	railties/lib/rails/console/app.rb
M	railties/lib/rails/console/helpers.rb
M	railties/test/application/console_test.rb

commit 75ae4b3	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-03 16:09:57 +0000

    Stub find_template so that when handle_render_error is called in ActionView::Template, we get to see the actual underlying error rather than a NoMethodError.
    
    This shows an encoding bug on Ruby 1.9.3.

M	actionpack/test/template/template_test.rb

commit b5f908a	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-03 16:09:57 +0000

    Stub find_template so that when handle_render_error is called in ActionView::Template, we get to see the actual underlying error rather than a NoMethodError.
    
    This shows an encoding bug on Ruby 1.9.3.

M	actionpack/test/template/template_test.rb

commit d5e63b1	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-03 15:07:24 +0000

    Fix #3271.
    
    Building the conditions of a nested through association could
    potentially modify the conditions of the through and/or source
    association.
    
    This is a Bad Thing.
    
    Conflicts:
    
    	activerecord/test/cases/reflection_test.rb

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit d486103	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-03 15:07:24 +0000

    Fix #3271.
    
    Building the conditions of a nested through association could
    potentially modify the conditions of the through and/or source
    association.
    
    This is a Bad Thing.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit a50f659	refs/heads/master
Author: Olivier Lacan 
Date:   2011-11-03 10:01:32 -0400

    CSS fix to prevent error output from being breaking out of body element.
    
    Using the white-space: pre-wrap adds extra line breaks to prevent the text from breaking out of the element's box. In this case single line output can be extremely long, breaking out the  element.
    
    See for reference: http://www.quirksmode.org/css/whitespace.html
    
    Before: http://link.olivierlacan.com/BVU4
    After: http://link.olivierlacan.com/BUfM

M	actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb

commit 567d454	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-03 13:24:39 +0000

    Memoize through association

M	activerecord/lib/active_record/associations/has_many_through_association.rb

commit e8ce2a5	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-03 13:12:04 +0000

    Remove all revelant through records.
    
    If a record is removed from a has_many :through, all of the join records
    relating to that record should also be removed from the through
    association's target.
    
    (Previously the records were removed in the database, but only one was
    removed from the in-memory target array.)

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 19b2a5f	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-03 13:12:04 +0000

    Remove all revelant through records.
    
    If a record is removed from a has_many :through, all of the join records
    relating to that record should also be removed from the through
    association's target.
    
    (Previously the records were removed in the database, but only one was
    removed from the in-memory target array.)

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 175c02d	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-03 12:37:37 +0000

    Fix adding multiple instances of the same record to a has_many :through.
    
    Fixes #3425.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 71bc921	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-03 12:37:37 +0000

    Fix adding multiple instances of the same record to a has_many :through.
    
    Fixes #3425.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 01eae34	refs/tags/v3.1.3
Author: Jon Leighton 
Date:   2011-11-03 10:23:42 +0000

    Fix #3247.
    
    Fixes creating records in a through association with a polymorphic source
    type.
    
    Conflicts:
    
    	activerecord/CHANGELOG

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit b4b178f	refs/remotes/origin/serializers
Author: Jon Leighton 
Date:   2011-11-03 10:23:42 +0000

    Fix #3247.
    
    Fixes creating records in a through association with a polymorphic source
    type.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit a846873	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-03 09:02:11 +0400

    Fix javascript_include_tag examples in documentation

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit 7463317	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-03 08:43:28 +0400

    Fix small typos in routing docs

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit bc09a11	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-02 23:34:27 +0530

    minor edit

M	railties/guides/source/action_view_overview.textile

commit b3c1cfa	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-02 23:01:30 +0530

    minor edits in AR validations guide

M	railties/guides/source/active_record_validations_callbacks.textile

commit 982a0f3	refs/remotes/origin/serializers
Merge: 836b620 5745a5e
Author: José Valim 
Date:   2011-11-02 06:41:46 -0700

    Merge pull request #3494 from sinisterchipmunk/usage-erb
    
    treat USAGE as an ERB template

commit 5745a5e	refs/remotes/origin/serializers
Author: Colin MacKenzie IV 
Date:   2011-11-02 09:00:18 -0400

    treat USAGE as an ERB template

M	railties/lib/rails/generators/base.rb
A	railties/test/fixtures/lib/generators/usage_template/USAGE
A	railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
M	railties/test/generators_test.rb

commit 7c36934	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-11-01 17:42:45 -0700

    Revert "Disable 1.9.3 builds until upgraded from -preview1 to -rc1"
    
    This reverts commit a1fb214ff08b7b8332190a494e081b321d49c9e4.

M	.travis.yml

commit 836b620	refs/remotes/origin/serializers
Author: Jeremy Kemper 
Date:   2011-11-01 17:41:37 -0700

    Revert "Disable 1.9.3 builds until upgraded from -preview1 to -rc1"
    
    This reverts commit 8a6acc17bb8badf70e300f599bf0440ee197028c.

M	.travis.yml

commit 9aa880f	refs/heads/master
Author: Vijay Dev 
Date:   2011-11-02 00:37:18 +0530

    use relative urls for linking to sections in the guides

M	railties/guides/source/initialization.textile

commit ed4bde5	refs/heads/master
Author: juandebravo 
Date:   2011-11-01 20:45:00 +0200

    Fix wrong link in initialization doc

M	railties/guides/source/initialization.textile

commit 394dd6f	refs/tags/v3.0.14
Author: Josh Kalderimis 
Date:   2011-05-12 15:24:10 +0200

    Remove a circular require in AS deprecations. This is safe as AS deprecations is autoloaded as needed.

M	activesupport/lib/active_support/core_ext/module/deprecation.rb

commit 702aecb	refs/heads/master
Author: Aviv Ben-Yosef 
Date:   2011-11-01 08:59:20 +0200

    Fix typo in Dispatcher#controller documentation

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 5f45508	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-11-01 08:55:03 +0400

    Fix typo in constraints method documentation

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 816f0b6	refs/tags/v3.1.3
Author: Santiago Pastorino 
Date:   2011-06-22 20:34:33 -0700

    Merge pull request #1796 from jdeseno/master
    
    link_to doesn't allow rel attribute when also specifying method

M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit e28bd7b	refs/heads/master
Author: Ryan Bigg 
Date:   2011-11-01 11:18:17 +1100

    [config guide] mention that config methods are to be called on Railtie subclasses

M	railties/guides/source/configuring.textile

commit dfdbbe0	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-28 18:46:18 +1100

    [engines guide] add 'General engine configuration' section

M	railties/guides/source/engines.textile

commit 8e6f86e	refs/tags/v3.1.3
Author: Aaron Patterson 
Date:   2011-10-31 15:17:16 -0400

    this should never return nil, so no use for "try"

M	actionpack/lib/action_controller/caching/actions.rb

commit b23cd21	refs/tags/v3.1.3
Author: Christopher Meiklejohn 
Date:   2011-07-30 00:49:36 -0400

    Ensure that the format isn't applied twice to the cache key, else it becomes impossible to target with expire_action.

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 62a8674	refs/remotes/origin/serializers
Author: Aaron Patterson 
Date:   2011-10-31 15:17:16 -0400

    this should never return nil, so no use for "try"

M	actionpack/lib/action_controller/caching/actions.rb

commit 6cbe422	refs/remotes/origin/serializers
Author: Christopher Meiklejohn 
Date:   2011-07-30 00:49:36 -0400

    Ensure that the format isn't applied twice to the cache key, else it becomes impossible to target with expire_action.

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 1afe269	refs/remotes/origin/serializers
Author: Vijay Dev 
Date:   2011-10-31 19:01:03 +0530

    assert_match takes a regexp and a string in that order

M	activerecord/test/cases/migration_test.rb

commit 2407a7a	refs/remotes/origin/serializers
Merge: 818bf1d ff9c279
Author: José Valim 
Date:   2011-10-31 03:01:02 -0700

    Merge pull request #3477 from rud/stable-migrations-version-order-rebased
    
    dump_schema_information: explicitly order inserts into schema_migrations

commit ff9c279	refs/remotes/origin/serializers
Author: Laust Rud Jacobsen 
Date:   2011-11-01 07:29:48 +0100

    dump_schema_information: explicitly order inserts into schema_migrations table
    
    This change reduces churn in the db/development_structure.sql file when using :sql as
    active_record.schema_format, and makes comparing diffs much easier.
    
    Test ensures the output SQL-statements are lexically ordered by version.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/migration_test.rb

commit 2a7230a	refs/heads/master
Author: arvida 
Date:   2011-10-31 10:27:23 +0100

    Ensuring a HTTP Date header when setting Cache-Control's max-age with #expires_in

M	actionpack/lib/action_controller/metal/conditional_get.rb

commit 964b282	refs/heads/master
Author: arvida 
Date:   2011-10-31 10:26:05 +0100

    Added accessor methods for Date header

M	actionpack/lib/action_dispatch/http/cache.rb

commit bb4a793	refs/heads/master
Author: arvida 
Date:   2011-10-31 10:24:03 +0100

    Added test for setting of HTTP Date header when calling #expires_in

M	actionpack/test/controller/render_test.rb

commit d106b34	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-31 10:36:38 +0400

    Update routing guides, root route should be at the top of the file

M	railties/guides/source/routing.textile

commit 2d337ef	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-10-30 18:34:49 -0200

    Fix typo on the performance test guide

M	railties/guides/source/performance_testing.textile

commit 818bf1d	refs/remotes/origin/serializers
Merge: 3e6ecfb 7670a51
Author: Santiago Pastorino 
Date:   2011-10-30 09:42:39 -0700

    Merge pull request #3469 from kennyj/dont_use_old_code
    
    Refactor ActiveSupport::Cache::FileStore.

commit 7670a51	refs/remotes/origin/serializers
Author: kennyj 
Date:   2011-10-30 21:50:17 +0900

    Refactor ActiveSupport::Cache::FileStore. used  method and deleted duplicate code.

M	activesupport/lib/active_support/cache/file_store.rb

commit 3e6ecfb	refs/remotes/origin/serializers
Merge: c6b933f 38da624
Author: Vijay Dev 
Date:   2011-10-30 03:29:18 -0700

    Merge pull request #3468 from kennyj/fix_a_document_for_compress_limit
    
    fix a document for :compress_threshold. DEFAULT_COMPRESS_LIMIT is 16K.

commit 38da624	refs/remotes/origin/serializers
Author: kennyj 
Date:   2011-10-30 19:18:23 +0900

    fix a document for :compress_threshold. DEFAULT_COMPRESS_LIMIT is 16K.

M	activesupport/lib/active_support/cache.rb

commit c6b933f	refs/remotes/origin/serializers
Author: Xavier Noria 
Date:   2011-10-30 02:24:30 -0700

    prefer qualified constant "name" to "reference expression", much simpler

M	railties/guides/source/active_support_core_extensions.textile

commit 58b0d50	refs/tags/v3.1.3
Author: mjy 
Date:   2011-10-25 15:08:28 -0400

    Adds missing closing regex slashes.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 0275946	refs/tags/v3.1.3
Author: Henare Degan 
Date:   2011-10-26 19:03:53 +1200

    Fix a little typo

M	railties/guides/source/asset_pipeline.textile

commit 1acb0eb	refs/tags/v3.1.3
Author: Bruce Adams 
Date:   2011-10-24 16:18:42 -0400

    note that after_initialize is run for rake tasks

M	railties/guides/source/configuring.textile

commit c809de8	refs/heads/master
Merge: 9d1ba37 f936996
Author: Vijay Dev 
Date:   2011-10-30 14:47:23 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 9d1ba37	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-30 02:08:59 -0700

    fixes a typo (thanks to Alexey Vakhov)

M	activesupport/lib/active_support/core_ext/string/inflections.rb

commit 75ee4d9	refs/heads/master
Merge: 11f6795 3b546af
Author: Santiago Pastorino 
Date:   2011-10-29 19:18:46 -0700

    Merge pull request #3464 from kennyj/avoid_to_call_twice
    
    avoided to call `Marshal.dump` twice

commit 11f6795	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-29 18:03:35 -0700

    defines Module#qualified_const_(defined?|get|set) and String#deconstantize
    
    This commit also implements a faster version of #demodulize I was unable
    to isolate with git add --patch.
    
    Not a big fan of the name #deconstantize. It complements #demodulize
    getting rid of the rightmost constant, hence the name, but it is
    unrelated to the well-known #constantize. So unsure. Could not come
    with anything better, please feel free to rename.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/module.rb
A	activesupport/lib/active_support/core_ext/module/qualified_const.rb
M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/lib/active_support/inflector/methods.rb
A	activesupport/test/core_ext/module/qualified_const_test.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	activesupport/test/inflector_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit aa34ab7	refs/tags/v3.1.3
Author: Santiago Pastorino 
Date:   2011-10-29 17:53:00 -0700

    Merge pull request #3463 from kennyj/fix_document_for_cache
    
    fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache isn't exist.

M	activesupport/lib/active_support/cache.rb

commit 8ef1bd9	refs/heads/master
Merge: eabda41 7b65d12
Author: Santiago Pastorino 
Date:   2011-10-29 17:53:00 -0700

    Merge pull request #3463 from kennyj/fix_document_for_cache
    
    fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache isn't exist.

commit 5275b5d	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-10-29 14:14:13 -0700

    Removing db/seeds.rb is fine. Don't blow up.

M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb

commit eabda41	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-29 14:14:13 -0700

    Removing db/seeds.rb is fine. Don't blow up.

M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb

commit 3b546af	refs/heads/master
Author: kennyj 
Date:   2011-10-30 03:14:35 +0900

    avoided to call  twice

M	activesupport/lib/active_support/cache.rb

commit 7b65d12	refs/heads/master
Author: kennyj 
Date:   2011-10-30 01:55:09 +0900

    fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache isn't exist

M	activesupport/lib/active_support/cache.rb

commit e848bca	refs/heads/master
Merge: e886f97 596d625
Author: José Valim 
Date:   2011-10-29 09:40:28 -0700

    Merge pull request #3462 from kennyj/remove_deprecated_code
    
    removed a reference to SynchronizedMemoryStore and CompressedMemCacheStore

commit 596d625	refs/heads/master
Author: kennyj 
Date:   2011-10-30 01:32:02 +0900

    removed reference to SynchronizedMemoryStore and CompressedMemCacheStore (the remaining code from 9cafc28874)

M	activesupport/lib/active_support/cache.rb

commit e886f97	refs/heads/master
Merge: e22a4c6 010622b
Author: José Valim 
Date:   2011-10-29 09:03:45 -0700

    Merge pull request #3337 from htanata/fix_rake_routes_for_controller_only_route
    
    Remove trailing "#" on rake routes for controller only routes

commit e22a4c6	refs/heads/master
Merge: 74f3f19 3fa8f36
Author: Xavier Noria 
Date:   2011-10-29 06:20:21 -0700

    Merge pull request #3460 from arunagw/method_redefine_warning_removed
    
    method redefined warning removed!

commit 010622b	refs/heads/master
Author: Hendy Tanata 
Date:   2011-10-15 17:20:54 +0800

    On inpsect routes, show :controller and :action to indicate dynamic.

M	railties/lib/rails/application/route_inspector.rb
M	railties/test/application/route_inspect_test.rb

commit 3fa8f36	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-29 15:45:04 +0530

    method redefined warning removed!

M	railties/lib/rails/test_unit/testing.rake

commit 74f3f19	refs/heads/master
Merge: 0fc5313 0c7c1db
Author: Vijay Dev 
Date:   2011-10-29 01:53:06 -0700

    Merge pull request #3459 from arunagw/running_test_doc_fix
    
    ActiveRecord is no more in controller directory.

commit 0fc5313	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-29 01:07:54 -0700

    let demodulize do less work, and add tests
    
    This is also faster on 1.9.

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test.rb

commit 0c7c1db	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-29 12:34:08 +0530

    ActiveRecord is no more in controller directory.

M	actionpack/RUNNING_UNIT_TESTS

commit f936996	refs/heads/master
Author: Joost Baaij 
Date:   2011-10-28 13:24:14 +0200

    Updated links to authentication plugins.
    
    Removed mention of restful_authentication.
    Added devise and authlogic.
    Also mention Rails 3.1 built-in logic.

M	railties/guides/source/security.textile

commit 2e74334	refs/heads/master
Merge: 4a065d5 07c4297
Author: José Valim 
Date:   2011-10-27 23:42:22 -0700

    Merge pull request #3456 from pwim/documentation-fix
    
    Add missing type to number_field_tag documentation

commit 07c4297	refs/heads/master
Author: Paul McMahon 
Date:   2011-10-28 15:34:12 +0900

    Add missing type to number_field_tag documentation

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 74fbbca	refs/tags/v3.1.3
Author: Aaron Patterson 
Date:   2011-10-27 10:55:52 -0700

    clear statement cache when tables are altered

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 9317752	refs/tags/v3.1.3
Author: Joe Van Dyk 
Date:   2011-10-27 08:25:42 -0700

    Added failing test case for changing schema in migration not clearing the prepared statement cache

M	activerecord/test/cases/query_cache_test.rb

commit 4a065d5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-27 10:55:52 -0700

    clear statement cache when tables are altered

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 420f7fd	refs/heads/master
Author: Joe Van Dyk 
Date:   2011-10-27 08:25:42 -0700

    Added failing test case for changing schema in migration not clearing the prepared statement cache

M	activerecord/test/cases/query_cache_test.rb

commit 1ad9138	refs/heads/master
Merge: a9863d6 95d9c12
Author: José Valim 
Date:   2011-10-27 04:05:06 -0700

    Merge pull request #3449 from arunagw/checks_for_instance_writers
    
    More checks for instance writers.

commit 95d9c12	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-27 16:25:50 +0530

    More checks for instance writers.

M	activerecord/test/cases/mass_assignment_security_test.rb

commit a9863d6	refs/heads/master
Merge: 30c0a00 80fc29f
Author: José Valim 
Date:   2011-10-27 03:26:47 -0700

    Merge pull request #3448 from arunagw/instance_disable_fix
    
    Test fix Allow instances to disable record_timestamps

commit 80fc29f	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-27 15:47:56 +0530

    Adding more checks for instance_writer false

M	activerecord/test/cases/mass_assignment_security_test.rb

commit 485b996	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-27 15:41:15 +0530

    Test fix Allow instances to disable record_timestamps
    
    Removed here 0d0176c4ffe5c58fd1002efbd8f7bd45a8872e33

M	activerecord/test/cases/mass_assignment_security_test.rb

commit 30c0a00	refs/heads/master
Merge: 9027643 177f893
Author: José Valim 
Date:   2011-10-26 23:57:13 -0700

    Merge pull request #3445 from odorcicd/fix_railtie_wrap_parameter_test
    
    Fix railtie configuration test calling PostsController#create which didn'

commit 177f893	refs/heads/master
Author: Denis Odorcic 
Date:   2011-10-27 02:16:59 -0400

    Fix railtie configuration test calling PostsController#create which didn't exist

M	railties/test/application/configuration_test.rb

commit 9027643	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-26 10:30:14 -0700

    scumbag 1.8: strings are enumerable :'(

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 0d0176c	refs/heads/master
Author: Pratik Naik 
Date:   2011-10-26 18:20:12 +0100

    Allow instances to disable record_timestamps

M	activerecord/lib/active_record/timestamp.rb
M	activerecord/test/cases/timestamp_test.rb

commit c90a1d2	refs/tags/v3.1.3
Author: Vijay Dev 
Date:   2011-10-22 23:53:52 +0530

    minor fixes in the composed_of doc

M	activerecord/lib/active_record/aggregations.rb

commit 26b9e71	refs/tags/v3.1.3
Author: bradrobertson 
Date:   2011-10-26 09:31:37 -0400

    correct documentation on initialize method to accept a single parameter

M	activemodel/lib/active_model/validator.rb

commit a89d16b	refs/heads/master
Merge: 408bbfe 2e62af3
Author: Vijay Dev 
Date:   2011-10-26 07:27:15 -0700

    Merge pull request #3439 from bradrobertson/master
    
    ActiveModel::Validator only takes one parameter, documentation had two params listed.

commit 2e62af3	refs/heads/master
Author: bradrobertson 
Date:   2011-10-26 09:31:37 -0400

    correct documentation on initialize method to accept a single parameter

M	activemodel/lib/active_model/validator.rb

commit 408bbfe	refs/heads/master
Merge: 80768b7 f7e56a3
Author: Santiago Pastorino 
Date:   2011-10-26 00:36:36 -0700

    Merge pull request #3435 from MDaubs/action_pack_deprecations
    
    Fix deprecation warnings in action pack render tests

commit 80768b7	refs/heads/master
Author: José Valim 
Date:   2011-10-26 09:31:56 +0200

    Responders now return 204 No Content for API requests without a response body (as in the new scaffold)

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/test/controller/mime_responds_test.rb

commit aef62c4	refs/heads/master
Author: José Valim 
Date:   2011-10-26 09:29:38 +0200

    Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box.

M	railties/CHANGELOG
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

commit 20c59dd	refs/heads/master
Author: José Valim 
Date:   2011-10-26 09:17:14 +0200

    Fix failing tests.

M	railties/test/application/rack/logger_test.rb

commit df5f88c	refs/heads/master
Author: Henare Degan 
Date:   2011-10-26 19:03:53 +1200

    Fix a little typo

M	railties/guides/source/asset_pipeline.textile

commit 450257c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-25 17:44:17 -0700

    properly handle lists of lists. Thanks @adrianpike for reporting!

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 1d9ab88	refs/heads/master
Merge: 5daf077 8aabdc6
Author: David Heinemeier Hansson 
Date:   2011-10-25 17:22:55 -0500

    Merge branch 'master' of github.com:rails/rails

commit 5daf077	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-25 17:22:52 -0500

    Fix that changing a store should mark the store attribute as changed

M	activerecord/lib/active_record/store.rb
M	activerecord/test/cases/store_test.rb

commit 8aabdc6	refs/heads/master
Merge: 139562f d21405a
Author: Vijay Dev 
Date:   2011-10-25 13:43:47 -0700

    Merge pull request #3357 from rahul100885/rahul100885_ws
    
    Added test case for postgresql database

commit 139562f	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-25 13:30:50 -0700

    Clean up .gitignore and make a note about using global ignores

M	.gitignore

commit 057a268	refs/heads/master
Author: José Valim 
Date:   2011-10-25 22:23:55 +0200

    Revert "Ignore .rbx directories (rbx compiled bytecode files)"
    
    This should go in your ~/.gitignore.
    
    This reverts commit e75c18bff811b95e12634cdbf04df244a227d46d.

M	.gitignore

commit 771ca79	refs/heads/master
Author: José Valim 
Date:   2011-10-25 22:22:43 +0200

    Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup"
    
    Tests were failing on Travis-CI.
    
    This reverts commit 79d01a8f16e20c556a086a2f07e3ccb4400f9819, reversing
    changes made to b838570bd69ff13d677fb43e79f10d6f3168c696.

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb
M	railties/guides/source/caching_with_rails.textile

commit 2856d74	refs/heads/master
Merge: ddce29b b6fc412
Author: Vijay Dev 
Date:   2011-10-25 12:18:54 -0700

    Merge pull request #3422 from arunagw/unused_var_warning
    
    Unused variable removed

commit f7e56a3	refs/heads/master
Author: Matthew Daubert 
Date:   2011-10-25 15:11:45 -0400

    Fix deprecation warnings in action pack test suite due to passing template formats in the template name.

M	actionpack/test/template/render_test.rb

commit ddce29b	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-26 00:41:41 +0530

    safeguard against configs missing environment or the database key

M	activerecord/lib/active_record/railties/databases.rake

commit e368583	refs/heads/master
Author: mjy 
Date:   2011-10-25 15:08:28 -0400

    Adds missing closing regex slashes.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit a764105	refs/heads/master
Author: Nick Howard 
Date:   2011-10-25 10:39:20 -0600

    add namespacing when referring to ActionController::RedirectBackError

M	actionpack/lib/action_controller/metal/redirecting.rb

commit 80bcfb0	refs/heads/master
Author: Joost Baaij 
Date:   2011-10-25 13:57:24 +0300

    Added a note that optimistic locking also needs a hidden field to function across web workers.

M	activerecord/lib/active_record/locking/optimistic.rb

commit 7c6d437	refs/heads/master
Author: Bruce Adams 
Date:   2011-10-24 16:18:42 -0400

    note that after_initialize is run for rake tasks

M	railties/guides/source/configuring.textile

commit 7eaa2ee	refs/heads/master
Merge: 9dd168c 98fbb50
Author: José Valim 
Date:   2011-10-24 11:57:06 -0700

    Merge pull request #3424 from avakhov/av-scaffold-func-test-remove-to_param
    
    Remove needless to_param in scaffold functional test

commit 98fbb50	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-24 22:38:10 +0400

    Remove needless to_param in scaffold functional test

M	railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb

commit b6fc412	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-24 21:56:27 +0530

    Unused variable removed

M	activesupport/test/buffered_logger_test.rb

commit 9dd168c	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-24 14:46:28 +0200

    minor revision to some new code in databases.rake

M	activerecord/lib/active_record/railties/databases.rake

commit 17bf04f	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-24 14:43:46 +0200

    registers PR #2419 in the CHANGELOG

M	activerecord/CHANGELOG

commit b064614	refs/heads/master
Merge: 0e8a4b3 78de4fc
Author: Xavier Noria 
Date:   2011-10-24 05:35:06 -0700

    Merge pull request #2419 from dmitriy-kiriyenko/drop_test_database_in_development_when_running_rake_db_drop
    
    When running "rake db:drop" also drop test database in development environment

commit 0e8a4b3	refs/heads/master
Merge: e75c18b 244dcfe
Author: José Valim 
Date:   2011-10-24 01:48:32 -0700

    Merge pull request #3416 from arunagw/rbx_test_fixes
    
    ActionPack test fix for RBX

commit 244dcfe	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-24 14:11:20 +0530

    ActionPack test fix for RBX

M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/template/html-scanner/tag_node_test.rb

commit e75c18b	refs/heads/master
Author: Jon Leighton 
Date:   2011-10-23 18:07:00 +0300

    Ignore .rbx directories (rbx compiled bytecode files)

M	.gitignore

commit 2032304	refs/tags/v3.1.3
Merge: 8ce3ff3 6f7d4ae
Author: Vijay Dev 
Date:   2011-10-22 13:55:18 -0700

    Merge pull request #3409 from guilleiguaran/lock-turn-version
    
    Lock turn version to 0.8.2 if Ruby version is 1.9.2

commit 6f7d4ae	refs/tags/v3.1.3
Author: Guillermo Iguaran 
Date:   2011-10-22 15:45:28 -0500

    Lock turn version to 0.8.2 if Ruby version is 1.9.2

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 8ce3ff3	refs/tags/v3.1.3
Author: Prem Sichanugrist 
Date:   2011-10-20 17:15:28 -0400

    Add some note on adding index to HABTM table

M	activerecord/lib/active_record/associations.rb

commit d044069	refs/tags/v3.1.3
Author: Prem Sichanugrist 
Date:   2011-10-20 17:13:01 -0400

    Use new migration style in HABTM join table
    
    Yes, we're on Rails 3.1 now.

M	activerecord/lib/active_record/associations.rb

commit 8203338	refs/tags/v3.1.3
Author: Pepe Hipolito 
Date:   2011-10-20 15:58:51 -0400

    Fixed typo.
    
    Ruby will know to look for this file at => Ruby will know how to look for this file at

M	railties/guides/source/initialization.textile

commit 3063afa	refs/tags/v3.1.3
Author: Pepe Hipolito 
Date:   2011-10-20 15:37:35 -0400

    Fixed typo.
    
    a long the way => along the way

M	railties/guides/source/initialization.textile

commit 8698deb	refs/heads/master
Merge: 337ff13 227c31f
Author: Vijay Dev 
Date:   2011-10-23 01:38:37 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 227c31f	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-23 01:34:02 +0530

    edge doesnt provide turn gem in the gemfile anymore

M	railties/guides/code/getting_started/Gemfile

commit 337ff13	refs/heads/master
Merge: dabf6cf 91be318
Author: Vijay Dev 
Date:   2011-10-22 13:01:24 -0700

    Merge pull request #3352 from arunagw/bump_sprockets
    
    Bump sprockets

commit dabf6cf	refs/heads/master
Merge: 259741a a458833
Author: José Valim 
Date:   2011-10-22 12:56:21 -0700

    Merge pull request #3408 from guilleiguaran/remove-turn
    
    Remove Turn from default Gemfile.

commit a458833	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-10-22 14:34:05 -0500

    Remove Turn from default Gemfile.
    
    We still looking for a best presentation for tests output.

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/test/generators/app_generator_test.rb

commit 259741a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-22 12:28:06 -0700

    Revert "Merge pull request #3405 from arunagw/middleware_name"
    
    This reverts commit c33090523c3504a2a125d7f725a7f2a4b99ff3c0, reversing
    changes made to 1c1c3fc2c06fc02e67a8272adf2c2d2381e005b4.

M	railties/lib/rails/info.rb

commit c330905	refs/heads/master
Merge: 1c1c3fc bc5d334
Author: Aaron Patterson 
Date:   2011-10-22 11:45:38 -0700

    Merge pull request #3405 from arunagw/middleware_name
    
    Using middleware name to show proper name in the info

commit 1c1c3fc	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-22 23:53:52 +0530

    minor fixes in the composed_of doc

M	activerecord/lib/active_record/aggregations.rb

commit ebe64f8	refs/tags/v3.1.3
Author: Arun Agrawal 
Date:   2011-10-22 21:47:33 +0530

    No need to check ruby version here
    
    As rake 0.9.2.2 is out with the same
    fix as 0.9.3.beta having

M	Gemfile

commit f0a9411	refs/heads/master
Merge: de17426 c930170
Author: Xavier Noria 
Date:   2011-10-22 11:04:40 -0700

    Merge pull request #3407 from arunagw/rake_upgrade
    
    No need to check ruby version here as rake 9.2.2 is out with the same fix

commit c930170	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-22 21:47:33 +0530

    No need to check ruby version here
    
    As rake 0.9.2.2 is out with the same
    fix as 0.9.3.beta having

M	Gemfile

commit bc5d334	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-22 19:16:43 +0530

    Using middleware name to show proper name in the info

M	railties/lib/rails/info.rb

commit e6b9db5	refs/tags/v3.1.3
Merge: d103161 7cd5448
Author: Vijay Dev 
Date:   2011-10-22 04:47:29 -0700

    Merge pull request #3403 from arunagw/rack_doc_update
    
    middleware doc updated

commit de17426	refs/heads/master
Merge: 3c31299 50dfd58
Author: José Valim 
Date:   2011-10-22 04:06:52 -0700

    Merge pull request #3404 from arunagw/warning_removed_request_id
    
    Warnings removed from RequestIdTest

commit 50dfd58	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-22 16:30:48 +0530

    Warnings removed from RequestIdTest

M	actionpack/test/dispatch/request_id_test.rb

commit 7cd5448	refs/tags/v3.1.3
Author: Arun Agrawal 
Date:   2011-10-22 16:01:20 +0530

    rake about information updated for 3.1 branch

M	railties/guides/source/command_line.textile

commit 4ea21b6	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-22 15:54:55 +0530

    Updated rack version in docs for 3.2

M	railties/guides/source/command_line.textile

commit 6d5b92c	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-22 15:53:11 +0530

    Rails version to 3.2.0.beta in docs

M	railties/guides/source/command_line.textile

commit 50be423	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-22 15:51:55 +0530

    Middleware details updated for 3.2

M	railties/guides/source/command_line.textile

commit 3c31299	refs/heads/master
Merge: d8b09f3 2b04c2f
Author: José Valim 
Date:   2011-10-21 23:41:15 -0700

    Merge pull request #3396 from bdurand/session_cache_store
    
    Add ActionDispatch::Session::CacheStore as a generic way of storing sessions in a cache

commit d8b09f3	refs/heads/master
Merge: 79d01a8 f092be8
Author: Aaron Patterson 
Date:   2011-10-21 16:49:21 -0700

    Merge pull request #3400 from greinacker/sqlite-decimal
    
    sqlite3 adapter drops :decimal columns precision & scale when migration tries to alter them

commit f092be8	refs/heads/master
Author: Greg Reinacker 
Date:   2011-10-21 17:30:39 -0600

    preserve decimal column attributes after migration

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/migration_test.rb

commit 79d01a8	refs/heads/master
Merge: b838570 ec93f36
Author: José Valim 
Date:   2011-10-21 12:42:06 -0700

    Merge pull request #3395 from bdurand/fix_file_store_cleanup
    
    Fix ActiveSupport::Cache::FileStore.cleanup to actually work.

commit b838570	refs/heads/master
Merge: e2aaae1 d565fda
Author: José Valim 
Date:   2011-10-21 12:29:14 -0700

    Merge pull request #3394 from bdurand/buffered_logger_threads
    
    Fix threading issues with BufferedLogger.

commit ec93f36	refs/heads/master
Author: Brian Durand 
Date:   2011-10-21 13:28:24 -0500

    Fix ActiveSupport::Cache::FileStore.cleanup to actually work.

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb
M	railties/guides/source/caching_with_rails.textile

commit 2b04c2f	refs/heads/master
Author: Brian Durand 
Date:   2011-10-21 13:13:29 -0500

    Add ActionDispatch::Session::CacheStore as a generic way of storing sessions in a cache.

M	actionpack/lib/action_dispatch.rb
A	actionpack/lib/action_dispatch/middleware/session/cache_store.rb
A	actionpack/test/dispatch/session/cache_store_test.rb
M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/rails_on_rack.textile
M	railties/guides/source/security.textile

commit d565fda	refs/heads/master
Author: Brian Durand 
Date:   2011-10-21 12:43:52 -0500

    Fix threading issues with BufferedLogger.

M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/test/buffered_logger_test.rb

commit e2aaae1	refs/heads/master
Merge: af1b5c5 c495cbc
Author: José Valim 
Date:   2011-10-21 03:46:13 -0700

    Merge pull request #3387 from arunagw/tagged_log_nil
    
    Checking blank if tag might coming nil or blank

commit c495cbc	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-21 15:12:00 +0530

    Checking blank if tag might coming nil or blank
    
    In log it should not show the empty array.

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit f0be2cb	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-10-20 17:15:28 -0400

    Add some note on adding index to HABTM table

M	activerecord/lib/active_record/associations.rb

commit d64e095	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-10-20 17:13:01 -0400

    Use new migration style in HABTM join table
    
    Yes, we're on Rails 3.1 now.

M	activerecord/lib/active_record/associations.rb

commit 0cd93a6	refs/heads/master
Author: Pepe Hipolito 
Date:   2011-10-20 15:58:51 -0400

    Fixed typo.
    
    Ruby will know to look for this file at => Ruby will know how to look for this file at

M	railties/guides/source/initialization.textile

commit 48e1f8b	refs/heads/master
Author: Pepe Hipolito 
Date:   2011-10-20 15:37:35 -0400

    Fixed typo.
    
    a long the way => along the way

M	railties/guides/source/initialization.textile

commit d103161	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-10-15 23:54:26 +0400

    HTMl -> HTML: html scanner comment fix

M	actionpack/lib/action_controller/vendor/html-scanner/html/document.rb

commit 9bc6a4e	refs/tags/v3.1.3
Author: Pascal Lindelauf 
Date:   2011-10-17 14:45:45 +0200

    Clarified that the config.assets.initialize_on_precompile directive needs to be set in application.rb

M	railties/guides/source/asset_pipeline.textile

commit 2ab011a	refs/tags/v3.1.3
Author: Andy Lindeman 
Date:   2011-10-18 23:45:56 -0300

    Fixes the defaults for config.cache_classes

M	railties/guides/source/configuring.textile

commit 195fcd2	refs/tags/v3.1.3
Author: Martin Svalin 
Date:   2011-10-20 16:31:10 +0200

    Fixed misleading docs for String#to_formatted_s(:db)

M	activesupport/lib/active_support/core_ext/array/conversions.rb

commit af1b5c5	refs/heads/master
Merge: ee9d9fb 274c3fa
Author: Vijay Dev 
Date:   2011-10-20 23:20:44 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit ee9d9fb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-20 08:44:55 -0700

    Merge pull request #3258 from ileitch/3-1-stable
    
    Postgres: Do not attempt to deallocate a statement if the connection is no longer active.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/statement_pool_test.rb

commit 88ac481	refs/tags/v3.1.3
Merge: 960882f fc55fa7
Author: Aaron Patterson 
Date:   2011-10-20 08:44:55 -0700

    Merge pull request #3258 from ileitch/3-1-stable
    
    Postgres: Do not attempt to deallocate a statement if the connection is no longer active.

commit 274c3fa	refs/heads/master
Author: Martin Svalin 
Date:   2011-10-20 16:31:10 +0200

    Fixed misleading docs for String#to_formatted_s(:db)

M	activesupport/lib/active_support/core_ext/array/conversions.rb

commit 66880cf	refs/heads/master
Author: Andrew France 
Date:   2011-10-20 12:32:11 +0200

    Correct ActionMailer subject i18n lookup scope.
    
    The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct.

M	actionmailer/lib/action_mailer/base.rb

commit ef3e149	refs/heads/master
Merge: 00eb67e 5c5d5b3
Author: José Valim 
Date:   2011-10-20 00:35:07 -0700

    Merge pull request #3375 from arunagw/middleware_test_fix
    
    Adding ActionDispatch::RequestId in middleware test

commit ee1223c	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-20 18:30:50 +1100

    [engines guide] explanation of overriding views + referencing routes from an engine within an application

M	railties/guides/source/engines.textile

commit 5c5d5b3	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-20 12:59:27 +0530

    Adding ActionDispatch::RequestId in middleware test

M	railties/test/application/middleware_test.rb

commit 00eb67e	refs/heads/master
Merge: 4e9729d 951a325
Author: José Valim 
Date:   2011-10-20 00:11:06 -0700

    Merge pull request #3374 from marcbowes/master
    
    Regexp fixup

commit 951a325	refs/heads/master
Author: Marc Bowes 
Date:   2011-10-20 10:00:42 +0300

    Remove the unneeded `\d` when sanitizing `X-Request-Id`.

M	actionpack/lib/action_dispatch/middleware/request_id.rb

commit 13e6f0c	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-20 17:32:34 +1100

    [engines guide] some fixes for the author id migration including proof of not copying over other migrations again

M	railties/guides/source/engines.textile

commit 3e2d35b	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-20 17:10:46 +1100

    [engines guide] add missing end for to_s method

M	railties/guides/source/engines.textile

commit 4e9729d	refs/heads/master
Author: José Valim 
Date:   2011-10-20 00:38:20 +0200

    Don't use :path in Gemfile for --dev except for Rails.

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 1cc6105	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-20 08:46:41 +1100

    [engines guide] wrap up 'Configuring an Engine' section

M	railties/guides/source/engines.textile

commit 8ede74e	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-20 08:46:20 +1100

    [engines guide] Rather than calling name, require a to_s method to be defined on the 'User' class

M	railties/guides/source/engines.textile

commit 9694ca1	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-19 18:26:19 +1100

    [engines guide] mention that we cover similar ground to the Getting Started Guide

M	railties/guides/source/engines.textile

commit be27bf1	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-19 16:24:00 -0500

    Fix the proper production.rb

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 1359152	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-19 16:16:44 -0500

    Encourage use of tagged logging even when using a different logger

M	railties/guides/code/getting_started/config/environments/production.rb

commit 930dc33	refs/heads/master
Author: Martin Svalin 
Date:   2011-10-19 23:06:08 +0200

    Removed mention of deprecated ActiveModel::Errors#on

M	activemodel/lib/active_model/errors.rb

commit c83d9a1	refs/heads/master
Author: José Valim 
Date:   2011-10-19 22:39:11 +0200

    Unify logger and taggedlogging middleware as both address logging concerns.

M	railties/CHANGELOG
M	railties/lib/rails/application.rb
M	railties/lib/rails/rack.rb
M	railties/lib/rails/rack/logger.rb
D	railties/lib/rails/rack/tagged_logging.rb

commit 6c12601	refs/heads/master
Author: José Valim 
Date:   2011-10-19 22:26:56 +0200

    Ensure TaggegLogging is thread safe.

M	activesupport/lib/active_support/tagged_logging.rb
M	activesupport/test/tagged_logging_test.rb

commit 4ef7453	refs/heads/master
Author: José Valim 
Date:   2011-10-19 22:10:43 +0200

    Load object/blank and make use of presence.

M	actionpack/lib/action_dispatch/middleware/request_id.rb

commit f1fecd9	refs/heads/master
Author: José Valim 
Date:   2011-10-19 22:09:36 +0200

    Make tests run on 1.8.x, add integration setup.

M	actionpack/lib/action_dispatch/middleware/request_id.rb
M	actionpack/test/dispatch/request_id_test.rb

commit 5bc23e4	refs/heads/master
Author: Yasuo Honda 
Date:   2011-10-19 15:56:25 -0400

    Fix ORA-00932 error when trying to insert 0 to DATE type columns.

M	activerecord/test/cases/migration_test.rb

commit 18dbfcb	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-19 14:53:34 -0500

    Programatically define the log level methods and use the Logger constants instead (SyslogLogger didnt define them as I expected)

M	activesupport/lib/active_support/tagged_logging.rb

commit 533451a	refs/heads/master
Merge: ada7806 c9ca86c
Author: José Valim 
Date:   2011-10-19 12:52:48 -0700

    Merge pull request #3369 from martinsvalin/am_errors_added
    
    New #added? method on ActiveModel::Errors

commit ada7806	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-19 14:45:42 -0500

    Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for Rails 4.0 to drop compatibility with 1.8.x

M	actionpack/lib/action_dispatch/middleware/request_id.rb
M	actionpack/test/dispatch/request_id_test.rb

commit c9ca86c	refs/heads/master
Author: Martin Svalin 
Date:   2011-10-19 18:47:28 +0200

    New #added? method on ActiveModel::Errors
    
    The #added? method makes it possible to check if a specific error has been added, using the same parameters as for #add.

M	activemodel/CHANGELOG
M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 1b50207	refs/heads/master
Author: José Valim 
Date:   2011-10-19 22:17:54 +0300

    Require missing string access dependency.

M	actionpack/lib/action_dispatch/middleware/request_id.rb

commit ddbb2ca	refs/heads/master
Author: José Valim 
Date:   2011-10-19 22:15:25 +0300

    Require securerandom as it is the proper dependency.

M	actionpack/lib/action_dispatch/middleware/request_id.rb

commit 4a4927f	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-19 13:24:28 -0500

    Simplify TaggedLogging symbol shortcuts (thanks Jose!)

M	railties/lib/rails/rack/tagged_logging.rb

commit afde6fd	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-19 12:59:33 -0500

    Added X-Request-Id tracking and TaggedLogging to easily log that and other production concerns

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_dispatch/http/request.rb
A	actionpack/lib/action_dispatch/middleware/request_id.rb
A	actionpack/test/dispatch/request_id_test.rb
M	activesupport/CHANGELOG
M	activesupport/lib/active_support.rb
A	activesupport/lib/active_support/tagged_logging.rb
A	activesupport/test/tagged_logging_test.rb
M	railties/CHANGELOG
M	railties/guides/code/getting_started/config/environments/production.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/rack.rb
M	railties/lib/rails/rack/logger.rb
A	railties/lib/rails/rack/tagged_logging.rb

commit 960882f	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-10-19 12:31:06 -0500

    Use toplevel Rack::ContentLength

M	railties/lib/rails/commands/server.rb

commit 3a746f7	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-19 12:31:06 -0500

    Use toplevel Rack::ContentLength

M	railties/lib/rails/commands/server.rb

commit 89a164a	refs/heads/master
Merge: c2f3c9b bed5825
Author: Vijay Dev 
Date:   2011-10-19 00:28:33 -0700

    Merge pull request #3362 from avakhov/p-superfluous-assign-cookies
    
    Remove superfluous assignment in cookies

commit 044e6ac	refs/heads/master
Author: Andy Lindeman 
Date:   2011-10-18 23:45:56 -0300

    Fixes the defaults for config.cache_classes

M	railties/guides/source/configuring.textile

commit c2f3c9b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-18 13:30:01 -0700

    only use now() on pg!

M	activerecord/test/cases/migration_test.rb

commit bed5825	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-18 22:57:55 +0400

    Remove superfluous assignment in cookies

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 97b3d10	refs/tags/v3.1.3
Author: Santiago Pastorino 
Date:   2011-10-18 16:03:58 -0200

    Use again Rack's ContentLength middleware

M	actionpack/actionpack.gemspec
M	railties/lib/rails/commands/server.rb
M	railties/lib/rails/rack.rb
D	railties/lib/rails/rack/content_length.rb

commit a5d3b90	refs/tags/v3.1.3
Author: José Valim 
Date:   2011-10-18 21:25:35 +0300

    Update actionpack/CHANGELOG

M	actionpack/CHANGELOG

commit 6a28c51	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-18 11:12:18 -0700

    reset prepared statement when schema changes imapact statement results. fixes #3335

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 818d285	refs/tags/v3.1.3
Author: Aaron Patterson 
Date:   2011-10-18 11:12:18 -0700

    reset prepared statement when schema changes imapact statement results. fixes #3335

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit d44702c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-10-18 16:14:38 -0200

    Use again Rack's ContentLength middleware part 2

M	railties/lib/rails/commands/server.rb

commit 7f184aa	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-10-18 16:03:58 -0200

    Use again Rack's ContentLength middleware

M	railties/lib/rails/commands/server.rb
M	railties/lib/rails/rack.rb
D	railties/lib/rails/rack/content_length.rb

commit 71325bb	refs/heads/master
Merge: 76af281 40d1555
Author: José Valim 
Date:   2011-10-18 10:09:13 -0700

    Merge pull request #3350 from whilefalse/rake_environment_in_engines
    
    Added environment rake task to engines

commit 76af281	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-18 10:07:40 -0700

    use now() for dates in pg

M	activerecord/test/cases/migration_test.rb

commit 40d1555	refs/heads/master
Author: steve 
Date:   2011-10-18 17:06:32 +0100

    Added test for rake environment in an engine

M	railties/test/railties/shared_tests.rb

commit c547e96	refs/heads/master
Author: Steven Anderson 
Date:   2011-10-17 16:28:00 +0100

    Added environment rake task to engines

M	railties/lib/rails/tasks/engine.rake

commit 8d3cd53	refs/heads/master
Author: Robert Glaser 
Date:   2011-10-18 15:29:16 +0200

    Fixed DataMapper namings in symbols and constants.

M	railties/lib/rails/engine/configuration.rb
M	railties/lib/rails/generators/active_model.rb
M	railties/test/application/generators_test.rb
M	railties/test/railties/engine_test.rb

commit d21405a	refs/heads/master
Author: Rahul P. Chaudhari 
Date:   2011-10-17 00:30:07 +0530

    Added test case for postgresql database

M	railties/test/generators/app_generator_test.rb

commit 5e1b912	refs/heads/master
Merge: 7511f97 124bb17
Author: José Valim 
Date:   2011-10-17 23:04:24 -0700

    Merge pull request #3356 from arunagw/bunp_rack
    
    Bump Rack to 1.3.5

commit 124bb17	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-18 11:09:59 +0530

    Bump Rack to 1.3.5

M	actionpack/actionpack.gemspec

commit 7511f97	refs/heads/master
Merge: 59d6df5 8510a0b
Author: José Valim 
Date:   2011-10-17 11:15:58 -0700

    Merge pull request #3340 from surfacedamage/exclude_destroy_in_all_blank_check
    
    Exclude _destroy parameter in :all_blank check (issue #2937)

commit 91be318	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-17 23:13:42 +0530

    Bump sprockets

M	actionpack/actionpack.gemspec

commit 8510a0b	refs/heads/master
Author: Aaron Christy 
Date:   2011-10-15 19:53:36 -0400

    Exclude _destroy parameter in :all_blank check (issue #2937)

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit 59d6df5	refs/heads/master
Merge: 8dffc62 4535191
Author: José Valim 
Date:   2011-10-17 07:02:39 -0700

    Merge pull request #3151 from zenprogrammer/pluralize_without_count
    
    Added include_count parameter to pluralize.

commit 8dffc62	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-17 19:15:24 +0530

    use variables from test setup

M	activemodel/test/cases/secure_password_test.rb

commit 826a850	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-17 19:14:29 +0530

    fix a typo and slightly reword has_secure_password comment

M	activemodel/lib/active_model/secure_password.rb

commit fd67735	refs/tags/v3.0.14
Merge: e2c03bf 68ae66d
Author: Vijay Dev 
Date:   2011-10-17 05:56:44 -0700

    Merge pull request #3330 from arunagw/ignore_sqlnet_3-0-stable
    
    Ignore sqlnet 3 0 stable

commit 86919a6	refs/heads/master
Author: Pascal Lindelauf 
Date:   2011-10-17 14:45:45 +0200

    Clarified that the config.assets.initialize_on_precompile directive needs to be set in application.rb

M	railties/guides/source/asset_pipeline.textile

commit cb95cca	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-17 20:26:37 +1100

    [engines guide] missed a spot in the 'Using a class section' + further text for 'Configuring an engine' section

M	railties/guides/source/engines.textile

commit 518b30c	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-17 20:25:45 +1100

    [engines guide] Point out that we need to run rake db:migrate after creating user model

M	railties/guides/source/engines.textile

commit 2f87b72	refs/heads/master
Merge: 8919a68 180d413
Author: José Valim 
Date:   2011-10-17 00:34:35 -0700

    Merge pull request #3319 from martinsvalin/active_model_errors_fixes
    
    ActiveModel::Errors#generate_message without i18n_scope, and more test cases for #add

commit 180d413	refs/heads/master
Author: Martin Svalin 
Date:   2011-10-11 21:44:22 +0200

    ActiveModel::Errors#generate_message without i18n_scope, and more test cases for #add

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 7d8c650	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-17 17:12:31 +1100

    [engines guide] [reviewing] remove excessive 'Now'

M	railties/guides/source/engines.textile

commit 8919a68	refs/heads/master
Merge: f10d62c 3dbedd2
Author: Aaron Patterson 
Date:   2011-10-16 16:14:56 -0700

    Merge pull request #3334 from mperham/master
    
    Default timestamps to non-null

commit 5bf0ea6	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-17 08:55:32 +1100

    [engines guide] Complete section about using an application's class

M	railties/guides/source/engines.textile

commit f10d62c	refs/heads/master
Merge: 098c95a 9210458
Author: Vijay Dev 
Date:   2011-10-16 07:43:54 -0700

    Merge pull request #3343 from vatrai/fix_warning
    
    fix to remove warning in test cases

commit 4341480	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-16 09:53:26 +1100

    [engines guide] beginning to cover using application's classes

M	railties/guides/source/engines.textile

commit 0f87cc1	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-15 09:52:07 +1100

    [engines guide] Add 'Engine setup' section in 'Hooking into an application' section

M	railties/guides/source/engines.textile

commit bb8ee92	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-15 09:51:30 +1100

    [engines guide] improve intro to 'Hooking into an application' section

M	railties/guides/source/engines.textile

commit 9210458	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-10-16 14:29:06 +0530

    fix to remove warning in test cases

M	activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb

commit abf4f09	refs/heads/master
Author: mhutchin 
Date:   2011-10-15 15:59:26 -0700

    [layouts and rendering] Copy editing

M	railties/guides/source/layouts_and_rendering.textile

commit afd7140	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 22:33:58 +0200

    Remove 1.9 Hash syntax - tests passing on 1.8.7

M	activemodel/test/cases/serializer_test.rb

commit 8f473dc	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-15 23:54:26 +0400

    HTMl -> HTML: html scanner comment fix

M	actionpack/lib/action_controller/vendor/html-scanner/html/document.rb

commit 4867bfa	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-10-16 01:12:00 +0530

    more doc changes on railties README

M	railties/README.rdoc

commit 018e84a	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-10-16 01:00:57 +0530

    railties README change to make consistent like others eg:activerecord

M	railties/README.rdoc

commit 2abb2e6	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 19:22:16 +0200

    Add initial support for embed API

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit a230f04	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 18:54:20 +0200

    Add support for the root attribute

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit 7a28498	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 18:37:12 +0200

    Fix nil has_one association

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit 322f478	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 18:27:56 +0200

    Add association_ids

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit 22c322f	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 17:01:08 +0200

    Add support for overriding associations, mostly used for authorization

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit 776da53	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 16:53:22 +0200

    Add support for implicit serializers

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit 2a4aaae	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-10-15 16:20:45 +0200

    Added has_one and has_many

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit 598fc57	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-09-27 17:35:11 -0400

    Don't unnecessarily use String eval.

M	activesupport/lib/active_support/core_ext/object/to_json.rb

commit e407dfb	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-09-27 17:34:47 -0400

    Don't require serializable_hash to take options.

M	activemodel/lib/active_model/serializer.rb
M	activemodel/test/cases/serializer_test.rb

commit f583654	refs/remotes/origin/serializers
Author: Vijay Dev 
Date:   2011-09-28 17:05:03 +0530

    minor edits in serializers guide

M	railties/guides/source/serializers.textile

commit c3de52d	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-09-26 19:29:37 -0400

    Initial implementation of ActiveModel::Serializer

M	activemodel/lib/active_model.rb
A	activemodel/lib/active_model/serializer.rb
A	activemodel/test/cases/serializer_test.rb

commit a4c04a4	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-09-26 18:57:49 -0400

    Refactor to make renderers a Set

M	actionpack/lib/action_controller/metal/renderers.rb

commit 8ff7693	refs/remotes/origin/serializers
Author: Jose and Yehuda 
Date:   2011-09-26 18:48:19 -0400

    Initial commit of serializer support

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
A	actionpack/lib/action_controller/metal/serialization.rb
M	actionpack/test/controller/render_json_test.rb
A	railties/guides/source/serializers.textile

commit 26204de	refs/heads/master
Author: mhutchin 
Date:   2011-10-15 05:32:13 -0700

    [layouts and rendering] Copy editing to improve readability

M	railties/guides/source/layouts_and_rendering.textile

commit 098c95a	refs/heads/master
Merge: e759c88 d32a90b
Author: José Valim 
Date:   2011-10-15 01:56:30 -0700

    Merge pull request #3320 from sunaku/space-align
    
    fix inconsistent alignment in Gemfile generator

commit f247c5f	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-15 11:34:33 +0400

    Update AC::RecordIdentifier example

M	actionpack/lib/action_controller/record_identifier.rb

commit 3dbedd2	refs/heads/master
Author: Mike Perham 
Date:   2011-10-14 21:09:53 -0700

    Default timestamps to non-null

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/test/cases/migration_test.rb

commit dd27e2e	refs/tags/v3.1.3
Author: Diego Carrion 
Date:   2011-10-13 16:27:10 -0300

    improved ActiveResource's .element_path and .new_element_path methods documentation by specifing how .site should be declared in order to use prefix_options

M	activeresource/lib/active_resource/base.rb

commit 840246c	refs/tags/v3.1.3
Author: Steve Bourne 
Date:   2011-10-12 10:46:08 -0700

    change activerecord query conditions example to avoid 'type' as column name
    
    'Type' is a reserved column for STI.  Changed conditions example to
    avoid using that column name as an example.  The example isn't
    STI-related (and mentioning STI here is needless clutter), so changing
    to avoid accidentally encouraging users to use 'type' as a column name
    for other purposes.

M	activerecord/lib/active_record/base.rb

commit a27f6ec	refs/tags/v3.1.3
Author: Akira Matsuda 
Date:   2011-10-12 15:44:19 +0900

    status is a number in Rails 3

M	actionpack/lib/action_controller/metal/data_streaming.rb

commit 2a73d00	refs/tags/v3.1.3
Author: Stephen Pike 
Date:   2011-10-11 09:32:23 -0400

    Runtime conditions for associations should use procs
    
    The association guide previously recommended using a trick with single
    quote delaying of string interpolation in order to handle setting association
    conditions that would be evaluated at runtime. Using a proc is the new way as
    this no longer works.

M	railties/guides/source/association_basics.textile

commit 78bab03	refs/tags/v3.1.3
Author: Evgeniy Dolzhenko 
Date:   2011-10-11 14:13:08 +0100

    Use .add instead of << to add errors

M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/lib/active_model/validations/with.rb
M	activemodel/lib/active_model/validator.rb

commit 077dffa	refs/tags/v3.1.3
Author: RAHUL CHAUDHARI 
Date:   2011-10-11 17:17:20 +0530

    Fixed typos in active_support_core_extensions.textile

M	railties/guides/source/active_support_core_extensions.textile

commit b336254	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-10-11 12:31:27 +0400

    Add ActionController#head example

M	actionpack/lib/action_controller/metal/head.rb

commit e759c88	refs/heads/master
Merge: 521a089 e2a3952
Author: Vijay Dev 
Date:   2011-10-14 22:21:40 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 521a089	refs/heads/master
Merge: 401d00d c6f0461
Author: José Valim 
Date:   2011-10-14 09:42:03 -0700

    Merge pull request #3331 from fabrik42/master
    
    Include affected record when raising an ActiveRecord::StaleObjectError

commit c6f0461	refs/heads/master
Author: Christian Bäuerlein 
Date:   2011-10-14 18:20:41 +0200

    Consider attempted action in exception message of ActiveRecord::StaleObjectError

M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/locking/optimistic.rb

commit 410fa4c	refs/heads/master
Author: Christian Bäuerlein 
Date:   2011-10-14 16:28:02 +0200

    Includes stale record in StaleObjectError

M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/test/cases/locking_test.rb

commit 68ae66d	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-10-14 17:50:44 +0530

    activerecord/sqlnet.log into gitignore when running with oracle.

M	.gitignore

commit e2a3952	refs/heads/master
Merge: 6df79bf dadfa1e
Author: Vijay Dev 
Date:   2011-10-14 03:08:08 -0700

    Merge pull request #72 from pote/master
    
    small fix

commit 6df79bf	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-14 18:43:49 +1100

    [engines guide] WIP for explaining how to hook engine into application

M	railties/guides/source/engines.textile

commit aae77d2	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-14 18:06:23 +1100

    [engines guide] complete comments resource generation

M	railties/guides/source/engines.textile

commit 3d192c7	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-14 18:05:45 +1100

    [engines guide] Add heading for comments

M	railties/guides/source/engines.textile

commit 2c8b8ce	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-14 07:51:45 +1100

    [engines guide] make clear that the comment generator command is just one line

M	railties/guides/source/engines.textile

commit 2101bc9	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-14 07:51:07 +1100

    [engines guide] make it clear that the scaffold generator output isn't part of the actual command

M	railties/guides/source/engines.textile

commit 690dd2f	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-14 07:45:00 +1100

    [engines guide] correct render line is blorgh/comments/form

M	railties/guides/source/engines.textile

commit 411613a	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-14 07:42:06 +1100

    [engines guide] improve wording for sentence describing comments/form partial

M	railties/guides/source/engines.textile

commit 401d00d	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-13 21:42:15 -0700

    Symbol captures may generate multiple path segments, so don't escape / -> %2F. Test splat escaping.

M	actionpack/test/dispatch/routing_test.rb

commit bceec4c	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-13 21:41:30 -0700

    / is allowed in URI fragments

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/test/controller/url_rewriter_test.rb

commit ec37160	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-13 21:40:42 -0700

    Leave escaping up to Journey

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 45ced7e	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-13 18:50:23 -0700

    Failing tests for path parameter escaping

M	actionpack/test/dispatch/routing_test.rb

commit dadfa1e	refs/heads/master
Author: PoTe 
Date:   2011-10-13 22:31:32 -0200

    security reasonS should be plural

M	railties/guides/source/action_controller_overview.textile

commit a5b0f91	refs/heads/master
Merge: 8cbe826 20728f5
Author: Santiago Pastorino 
Date:   2011-10-13 16:26:55 -0700

    Merge pull request #3314 from macmartine/master
    
    Remove user-specified delimiter from start when no area code is present (in number_to_phone)

commit 8cbe826	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-13 16:11:00 -0700

    Rails 4 is just around the corner. Stuck with 1.8 until then.

M	activerecord/test/cases/store_test.rb

commit 0a9b6de	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-13 15:54:53 -0700

    Tests gotta run in 1.8 too

M	activerecord/test/models/admin/user.rb

commit df5ea6b	refs/heads/master
Merge: 85b64f9 8ae7008
Author: Santiago Pastorino 
Date:   2011-10-13 15:48:49 -0700

    Merge pull request #2224 from kommen/fix_fragment_caching_for_master
    
    Fix fragment cache helper regression on cache miss introduced with 03d01e

commit d32a90b	refs/heads/master
Author: Suraj N. Kurapati 
Date:   2011-10-13 10:16:50 -0700

    fix inconsistent alignment in Gemfile generator

M	railties/lib/rails/generators/app_base.rb

commit 85b64f9	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-10-13 16:23:48 -0500

    Added ActiveRecord::Base.store for declaring simple single-column key/value stores [DHH]

M	activerecord/CHANGELOG
M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/base.rb
A	activerecord/lib/active_record/store.rb
A	activerecord/test/cases/store_test.rb
M	activerecord/test/models/admin/user.rb
M	activerecord/test/schema/schema.rb

commit 8f11d53	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-23 13:50:34 -0700

    Merge pull request #2219 from kommen/fix_fragment_caching_squashed
    
    Fix fragment caching (squashed commits)

M	actionpack/lib/action_view/helpers/cache_helper.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/fixtures/functional_caching/fragment_cached.html.erb

commit b7cccae	refs/heads/master
Author: Diego Carrion 
Date:   2011-10-13 16:27:10 -0300

    improved ActiveResource's .element_path and .new_element_path methods documentation by specifing how .site should be declared in order to use prefix_options

M	activeresource/lib/active_resource/base.rb

commit 74fbbf1	refs/heads/master
Merge: f6c9349 dc3f33e
Author: José Valim 
Date:   2011-10-13 01:04:42 -0700

    Merge pull request #3315 from rahul100885/rahul100885_workspace
    
    Added test to check that the vendor/assets/stylesheets directory is creat

commit 66b2dc0	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-13 18:05:33 +1100

    [engines guide] don't show actual timestamp in migration generation

M	railties/guides/source/engines.textile

commit e537a3f	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-13 18:04:55 +1100

    [engines guide] change comments resource generation
    
    Totally didn't like where this section was going, so scrapped it.
    
    Scaffold is great for some things (lol) but nested resources is definitely not one of them.
    
    Best to walk people through how to do it right, as they would in the real world

M	railties/guides/source/engines.textile

commit dc3f33e	refs/heads/master
Author: Rahul Chaudhari 
Date:   2011-10-13 12:17:19 +0530

    Added test to check that the vendor/assets/stylesheets directory is created

M	railties/test/generators/app_generator_test.rb

commit 20728f5	refs/heads/master
Author: Mac Martine 
Date:   2011-10-12 17:06:44 -0700

    remove user-specified delimiter from start when no area code is present (in number_to_phone)

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit e6b2e7f	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-13 02:17:01 +0530

    refactor guide example

M	railties/guides/source/security.textile

commit f6c9349	refs/heads/master
Merge: 2cb2ca6 84672b0
Author: José Valim 
Date:   2011-10-12 11:37:09 -0700

    Merge pull request #3287 from sgerrand/vendor_assets_javascripts_should_be_created
    
    Ensure that the directory 'vendor/assets/javascripts' is created by AppGenerator

commit e552fe1	refs/heads/master
Author: Steve Bourne 
Date:   2011-10-12 10:46:08 -0700

    change activerecord query conditions example to avoid 'type' as column name
    
    'Type' is a reserved column for STI.  Changed conditions example to
    avoid using that column name as an example.  The example isn't
    STI-related (and mentioning STI here is needless clutter), so changing
    to avoid accidentally encouraging users to use 'type' as a column name
    for other purposes.

M	activerecord/lib/active_record/base.rb

commit 532e6d5	refs/heads/master
Author: Craig Monson 
Date:   2011-10-12 10:34:27 -0400

    quoting 'and' to make it more distinct.

M	railties/guides/source/active_record_querying.textile

commit 2cb2ca6	refs/heads/master
Author: José Valim 
Date:   2011-10-12 09:24:13 +0200

    Add some implementation docs. closes #3298. closes #2509.

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 4cdc31c	refs/tags/v3.1.3
Author: José Valim 
Date:   2011-10-12 09:24:13 +0200

    Add some implementation docs. closes #3298. closes #2509.

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 4d986c4	refs/tags/v3.1.3
Author: Bruno Zanchet 
Date:   2011-10-11 19:58:33 -0300

    swallow error when can't unmarshall object from session
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 86a5271	refs/tags/v3.1.3
Author: José Valim 
Date:   2011-10-12 09:19:21 +0200

    Provide failing test case for #3298 #2509

M	actionpack/test/dispatch/session/cookie_store_test.rb

commit f23f5ec	refs/tags/v3.1.3
Author: José Valim 
Date:   2011-10-12 09:01:00 +0200

    Fix wrong identation and remove extra spaces.

M	actionpack/test/dispatch/cookies_test.rb

commit 4a025f0	refs/heads/master
Author: Akira Matsuda 
Date:   2011-10-12 15:44:19 +0900

    status is a number in Rails 3

M	actionpack/lib/action_controller/metal/data_streaming.rb

commit e5d0bb2	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-11 21:03:08 -0700

    Fix version number in CHANGELOG

M	activeresource/CHANGELOG

commit b8bb5f4	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-11 21:01:11 -0700

    Treat 303 See Other as a redirect response, too

M	activeresource/CHANGELOG
M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/connection.rb
M	activeresource/test/cases/connection_test.rb

commit 027ecd3	refs/heads/master
Merge: fa79408 a78a75d
Author: Jeremy Kemper 
Date:   2011-10-11 20:43:14 -0700

    Merge remote-tracking branch 'jimherz/activeresource_redirection_patch'
    
    Closes #3302

commit a78a75d	refs/heads/master
Author: Jim Herzberg 
Date:   2011-10-11 17:46:24 -0700

    activeresource should treat HTTP status 307 as redirection, same as 301 and 302; added missing test cases for statii 301 and 302.

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/connection.rb
M	activeresource/test/cases/connection_test.rb

commit fa79408	refs/heads/master
Merge: 7b84e36 1adf566
Author: José Valim 
Date:   2011-10-11 09:50:53 -0700

    Merge pull request #3295 from zhengjia/master
    
    Fix multiple includes with options

commit 1adf566	refs/heads/master
Author: zhengjia 
Date:   2011-10-11 11:09:43 -0500

    Fixed serialization issues with multiple includes with options

M	activemodel/lib/active_model/serialization.rb
M	activemodel/test/cases/serialization_test.rb

commit c4e2954	refs/heads/master
Author: Stephen Pike 
Date:   2011-10-11 09:32:23 -0400

    Runtime conditions for associations should use procs
    
    The association guide previously recommended using a trick with single
    quote delaying of string interpolation in order to handle setting association
    conditions that would be evaluated at runtime. Using a proc is the new way as
    this no longer works.

M	railties/guides/source/association_basics.textile

commit 3ca2696	refs/heads/master
Author: mhutchin 
Date:   2011-10-11 06:27:01 -0700

    Heavy copy editing of the find_each and find_in_batches section

M	railties/guides/source/active_record_querying.textile

commit c317419	refs/heads/master
Author: Evgeniy Dolzhenko 
Date:   2011-10-11 14:13:08 +0100

    Use .add instead of << to add errors

M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/lib/active_model/validations/with.rb
M	activemodel/lib/active_model/validator.rb

commit c568a9b	refs/heads/master
Merge: 419d4c0 1f62c6d
Author: Rahul P. Chaudhari 
Date:   2011-10-11 04:54:58 -0700

    Merge pull request #71 from rahul100885/rahul100885_workspace
    
    Fixed typos in active_support_core_extensions.textile

commit 1f62c6d	refs/heads/master
Author: RAHUL CHAUDHARI 
Date:   2011-10-11 17:17:20 +0530

    Fixed typos in active_support_core_extensions.textile

M	railties/guides/source/active_support_core_extensions.textile

commit 7b84e36	refs/heads/master
Merge: 1735868 50d262f
Author: José Valim 
Date:   2011-10-11 02:06:22 -0700

    Merge pull request #3289 from avakhov/p-respond_to-conditions
    
    Support symbol and string actions in AC#respond_to options

commit 50d262f	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-11 12:48:03 +0400

    Support symbol and string actions in AC#respond_to options

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/test/controller/mime_responds_test.rb

commit 419d4c0	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-11 12:31:27 +0400

    Add ActionController#head example

M	actionpack/lib/action_controller/metal/head.rb

commit 84672b0	refs/heads/master
Author: Sasha Gerrand 
Date:   2011-10-11 18:48:51 +1100

    Added test to check that the vendor/assets/javascripts directory is created

M	railties/test/generators/app_generator_test.rb

commit 1735868	refs/heads/master
Merge: b5f66cf 8f86374
Author: José Valim 
Date:   2011-10-10 23:57:03 -0700

    Merge pull request #3285 from dcrec1/master
    
    Fixes #3280: Shorthand route nested in scope produces missing controller error

commit b5f66cf	refs/heads/master
Merge: fcb70f3 16a0013
Author: Vijay Dev 
Date:   2011-10-10 23:28:53 -0700

    Merge pull request #3286 from rahul100885/rahul100885_workspace
    
    Corrected typo

commit 43c01ef	refs/heads/master
Author: Sasha Gerrand 
Date:   2011-10-11 17:04:24 +1100

    Added method to create vendor/assets/javascripts, added it to methods called within vendor method

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 16a0013	refs/heads/master
Author: RAHUL CHAUDHARI 
Date:   2011-10-11 10:26:22 +0530

    Corrected typo

M	railties/guides/source/engines.textile

commit 8f86374	refs/heads/master
Author: Diego Carrion 
Date:   2011-10-10 19:53:42 -0300

    allow shorthand routes with nested optional parameters

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 1b6886a	refs/tags/v3.1.3
Author: Ryan Bigg 
Date:   2011-10-10 20:10:35 +1100

    Fix rails/generators/base.rb documentation for generator lookup

M	railties/lib/rails/generators/base.rb

commit 5bf183c	refs/tags/v3.1.3
Author: Dan McDonald 
Date:   2011-10-09 09:31:11 -0600

    ActiveRecordStore is now called SessionStore.

M	railties/guides/source/security.textile

commit fcb70f3	refs/heads/master
Merge: e9413b5 9c9583f
Author: Vijay Dev 
Date:   2011-10-10 19:41:25 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit e9413b5	refs/heads/master
Merge: b27ca99 af7eeaa
Author: Vijay Dev 
Date:   2011-10-10 04:39:18 -0700

    Merge pull request #3274 from arunagw/warning_removed_mysql2
    
    ambiguous first argument; put parentheses or even spaces Warning removed!

commit b27ca99	refs/heads/master
Merge: c3c1571 2886513
Author: Vijay Dev 
Date:   2011-10-10 04:34:22 -0700

    Merge pull request #3265 from arunagw/warning_uri_parser
    
    URI.escape is obsolete : warning removed

commit c3c1571	refs/heads/master
Merge: 84c8b2f ceb65a6
Author: José Valim 
Date:   2011-10-10 03:45:27 -0700

    Merge pull request #3275 from simi/patch-1
    
    Improve ActiveRecord changelog

commit 9c9583f	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-10 21:04:08 +1100

    [engines guide] add TODO for RedCarpet example

M	railties/guides/source/engines.textile

commit 59c9825	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-10 21:03:55 +1100

    [engines guide] cover generating the comment resource

M	railties/guides/source/engines.textile

commit 44fc397	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-10 20:10:35 +1100

    Fix rails/generators/base.rb documentation for generator lookup

M	railties/lib/rails/generators/base.rb

commit be01aa6	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-10 08:42:47 +1100

    [engines guide] amend two TODOs for further things in this guide

M	railties/guides/source/engines.textile

commit 9e6d43f	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-10 08:42:27 +1100

    [engines guide] finish covering what the scaffold generator does within an engine

M	railties/guides/source/engines.textile

commit da030cf	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-07 10:07:29 +1100

    [engines guide] final line change

M	railties/guides/source/engines.textile

commit 765d3e9	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-07 09:56:50 +1100

    [engines guide] Add TODO for mentioning rails s and rails c

M	railties/guides/source/engines.textile

commit b02bd74	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-07 09:06:43 +1100

    [engines guide] begin explaining what the scaffold generator outputs within an engine

M	railties/guides/source/engines.textile

commit 685c24d	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-07 07:15:14 +1100

    [engines guide] reword first two dot points in prologue

M	railties/guides/source/engines.textile

commit c580812	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-06 18:28:50 +1100

    [engines guide] Credit where credit is due + explaning directory structure

M	railties/guides/source/engines.textile

commit 454492d	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-06 18:20:38 +1100

    [engines guide] Credit where credit is due

M	railties/guides/source/engines.textile

commit ceb65a6	refs/heads/master
Author: Josef Šimánek 
Date:   2011-10-10 12:19:31 +0300

    Active Record changelog mistakes

M	activerecord/CHANGELOG

commit af7eeaa	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-10 14:16:45 +0530

    ambiguous first argument; put parentheses or even spaces Warning removed!

M	activerecord/test/cases/adapters/mysql2/case_sensitivity_test.rb

commit 84c8b2f	refs/heads/master
Merge: 3456ef1 a0a68ec
Author: José Valim 
Date:   2011-10-10 00:06:56 -0700

    Merge pull request #3272 from odorcicd/fix_json_error_root
    
    JSON responder should return errors with :errors root

commit a0a68ec	refs/heads/master
Author: Denis Odorcic 
Date:   2011-10-10 01:42:12 -0400

    JSON responder should return errors with :error root

M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/test/controller/mime_responds_test.rb

commit 3456ef1	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-06 13:45:19 +0100

    Use broken YAML that will fail with Syck as well as Psych. Fixes test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
    
    Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c

M	activerecord/test/cases/fixtures_test.rb

commit 11b183e	refs/heads/master
Author: mhutchin 
Date:   2011-10-09 16:07:30 -0700

    Copy editing to improve readability, consistency, and tone

M	railties/guides/source/association_basics.textile

commit 5f632a8	refs/heads/master
Author: mhutchin 
Date:   2011-10-09 15:56:01 -0700

    Minor copy editing

M	railties/guides/source/association_basics.textile

commit 8dba127	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-09 14:21:12 -0700

    Remove stray whitespace

M	activerecord/test/cases/adapters/mysql2/case_sensitivity_test.rb

commit c90e5ce	refs/heads/master
Author: Joseph Palermo 
Date:   2011-10-09 04:38:36 -0700

    Only use LOWER for mysql case insensitive uniqueness check when column has a case sensitive collation.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/validations/uniqueness.rb
A	activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb
A	activerecord/test/cases/adapters/mysql2/case_sensitivity_test.rb
M	activerecord/test/schema/mysql2_specific_schema.rb
M	activerecord/test/schema/mysql_specific_schema.rb

commit df03e1d	refs/tags/v3.1.3
Author: Santiago Pastorino 
Date:   2011-10-09 17:32:29 -0200

    Add 3.1.1 release date

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 8f8fd4f	refs/heads/master
Merge: a2edc88 6d05597
Author: Santiago Pastorino 
Date:   2011-10-09 10:42:21 -0700

    Merge pull request #3270 from kennyj/fix_invalid_regex
    
    (small patch) fix invalid regex in testcase

commit c2f03d1	refs/heads/master
Merge: 74b9441 b9b4cfc
Author: Guillermo Iguaran 
Date:   2011-10-09 10:01:09 -0700

    Merge pull request #70 from mcdd/master
    
    Update security guide ActiveRecordStore/SessionStore

commit 6d05597	refs/heads/master
Author: kennyj 
Date:   2011-10-10 01:54:54 +0900

    fix invalid regex

M	railties/test/application/assets_test.rb

commit 74b9441	refs/heads/master
Author: mhutchin 
Date:   2011-10-09 09:36:19 -0700

    Copy editing: s/Rails guesses/Rails assumes/g

M	railties/guides/source/association_basics.textile

commit b9b4cfc	refs/heads/master
Author: Dan McDonald 
Date:   2011-10-09 09:31:11 -0600

    ActiveRecordStore is now called SessionStore.

M	railties/guides/source/security.textile

commit b2858e6	refs/tags/v3.1.3
Author: Roy Tomeij 
Date:   2011-10-09 13:45:54 +0200

    Fix a typo that was mysteriously entered in previous commit

M	railties/guides/source/asset_pipeline.textile

commit 0834102	refs/tags/v3.1.3
Author: Roy Tomeij 
Date:   2011-10-09 13:38:47 +0200

    Add note about how Sass & Sprockets don't match

M	railties/guides/source/asset_pipeline.textile

commit 4805a65	refs/tags/v3.1.3
Author: Alexey Vakhov 
Date:   2011-10-08 10:12:58 +0400

    Fix params hash example in AC::Base comment

M	actionpack/lib/action_controller/base.rb

commit a2edc88	refs/heads/master
Merge: 1774ec7 3a72c01
Author: Vijay Dev 
Date:   2011-10-09 20:10:53 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 1774ec7	refs/heads/master
Merge: 2ed66fe ca219a2
Author: Santiago Pastorino 
Date:   2011-10-09 07:34:56 -0700

    Merge pull request #3266 from arunagw/warnings_removed
    
    Warnings removed when running with 1.9.3

commit 3a72c01	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-09 19:58:14 +0530

    Corrections to the ajax guide recent changes. This guide is very
    outdated and will need a lot of changes to make it useful for Rails 3+

M	railties/guides/source/ajax_on_rails.textile

commit ca219a2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-09 17:15:55 +0530

    Warnings removed when running with 1.9.3

M	actionpack/lib/sprockets/assets.rake
M	railties/lib/rails/generators/resource_helpers.rb
M	railties/test/generators/assets_generator_test.rb

commit d214e54	refs/heads/master
Author: Roy Tomeij 
Date:   2011-10-09 13:45:54 +0200

    Fix a typo that was mysteriously entered in previous commit

M	railties/guides/source/asset_pipeline.textile

commit da773a2	refs/heads/master
Author: Roy Tomeij 
Date:   2011-10-09 13:38:47 +0200

    Add note about how Sass & Sprockets don't match

M	railties/guides/source/asset_pipeline.textile

commit 2886513	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-09 15:27:35 +0530

    URI.escape is obsolete : warning removed

M	railties/test/application/assets_test.rb

commit 2ed66fe	refs/heads/master
Merge: 501e5b0 d68f27e
Author: José Valim 
Date:   2011-10-09 02:52:42 -0700

    Merge pull request #3262 from subdigital/master
    
    Add optional host option to force_ssl

commit 501e5b0	refs/heads/master
Merge: bedd6dc 8df7fe3
Author: José Valim 
Date:   2011-10-09 02:15:19 -0700

    Merge pull request #3196 from avakhov/patch-am-av-tests-2
    
    Improve tests method for ActionView::TestCase and ActionMailer::TestCase

commit 9de9f6b	refs/heads/master
Author: mhutchin 
Date:   2011-10-09 01:50:53 -0700

    Copy editing to improve readability and remove any potential ambiguity

M	railties/guides/source/association_basics.textile

commit 43baad7	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-10-09 12:46:25 +0530

    improving the docs for ajax_on_rails

M	railties/guides/source/ajax_on_rails.textile

commit ac8555b	refs/heads/master
Author: mhutchin 
Date:   2011-10-08 23:02:33 -0700

    copy editing

M	railties/guides/source/association_basics.textile

commit 3deb35e	refs/heads/master
Author: mhutchin 
Date:   2011-10-08 22:45:31 -0700

    copy editing

M	railties/guides/source/association_basics.textile

commit bedd6dc	refs/heads/master
Merge: 114218e 17a7943
Author: Jeremy Kemper 
Date:   2011-10-08 20:29:56 -0700

    Merge pull request #500 from cyril/patch-1
    
    Use quotes for command substitution

commit 114218e	refs/heads/master
Author: Liborio Cannici 
Date:   2011-09-15 00:35:53 +0200

    Fixes an issue when creating a date select with too many options.
    
    Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93
    
    Closes #239.
    
    Conflicts:
    
    	actionpack/CHANGELOG

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit d68f27e	refs/heads/master
Author: Ben Scheirman 
Date:   2011-10-08 18:38:02 -0500

    accept optional :host parameter to force_ssl

M	actionpack/lib/action_controller/metal/force_ssl.rb
M	actionpack/test/controller/force_ssl_test.rb

commit 09bb9de	refs/tags/v3.1.3
Author: Guillermo Iguaran 
Date:   2011-10-08 16:27:22 -0500

    Isolate rake action tests that should be run under default env

M	railties/test/generators/actions_test.rb

commit f655895	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-10-08 16:27:22 -0500

    Isolate rake action tests that should be run under default env

M	railties/test/generators/actions_test.rb

commit e63c05f	refs/tags/v3.1.3
Author: Guillermo Iguaran 
Date:   2011-10-08 15:24:52 -0500

    Test utf8 assets filenames with request instead of manifest lookup

M	railties/test/application/assets_test.rb

commit 2274c92	refs/heads/master
Merge: 4888aba b111b41
Author: Jeremy Kemper 
Date:   2011-10-08 13:29:16 -0700

    Merge remote-tracking branch 'guilleiguaran/test-utf8-assets-filename'
    
    Closes #3261

commit e051375	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-10-08 13:09:28 -0700

    The generator invokes rake with either the :env option, ENV['RAILS_ENV'], or development. So if Travis has exported RAILS_ENV=test, it'll be used instead of development, breaking these brittle expectations.

M	railties/test/generators/actions_test.rb

commit 5d18346	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-10-08 12:56:06 -0700

    Skip broken asset precompilation test on Macs. Issues with NFD vs NFC normalization on the asset filename. Major red flag with asset lookups!

M	railties/test/application/assets_test.rb

commit b111b41	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-10-08 15:24:52 -0500

    Test utf8 assets filenames with request instead of manifest lookup

M	railties/test/application/assets_test.rb

commit 4888aba	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-08 13:09:28 -0700

    The generator invokes rake with either the :env option, ENV['RAILS_ENV'], or development. So if Travis has exported RAILS_ENV=test, it'll be used instead of development, breaking these brittle expectations.

M	railties/test/generators/actions_test.rb

commit 9ce03d1	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-08 12:56:06 -0700

    Skip broken asset precompilation test on Macs. Issues with NFD vs NFC normalization on the asset filename. Major red flag with asset lookups!

M	railties/test/application/assets_test.rb

commit 6a5eeab	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-10-09 00:03:12 +0530

    Revert "Revert "updated the ajax_on_rails.textile for rails3" because of invalid git user"
    
    This reverts commit 5d2ffbb992b4ab875a121761fc0cf14dcaa12033.

M	railties/guides/source/ajax_on_rails.textile

commit 62c0381	refs/heads/master
Author: mhutchin 
Date:   2011-10-08 03:59:13 -0700

    copy editing
    
    "updated the ajax_on_rails.textile for rails3"

M	railties/guides/source/active_record_validations_callbacks.textile

commit 51550ed	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-10-08 11:13:48 -0700

    Don't notify IRC on every single build, just failures and first success after a string of failures

M	.travis.yml

commit a1fb214	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-10-08 11:13:12 -0700

    Disable 1.9.3 builds until upgraded from -preview1 to -rc1

M	.travis.yml

commit 0d0ded3	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-08 11:13:48 -0700

    Don't notify IRC on every single build, just failures and first success after a string of failures

M	.travis.yml

commit 8a6acc1	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-08 11:13:12 -0700

    Disable 1.9.3 builds until upgraded from -preview1 to -rc1

M	.travis.yml

commit fc55fa7	refs/tags/v3.1.3
Author: Ian Leitch 
Date:   2011-10-08 18:06:18 +0100

    Postgres: Do not attempt to deallocate a statement if the connection is no longer active.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/statement_pool_test.rb

commit 7319f14	refs/tags/v3.1.3
Author: Jeremy Kemper 
Date:   2011-10-08 08:04:05 -0700

    Add comments to our generated .gitignore, including a note about when to use a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored.

M	railties/lib/rails/generators/rails/app/templates/gitignore

commit 1851791	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-08 08:04:05 -0700

    Add comments to our generated .gitignore, including a note about when to use a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored.

M	railties/lib/rails/generators/rails/app/templates/gitignore

commit f03556b	refs/tags/v3.1.3
Author: Santiago Pastorino 
Date:   2011-10-08 12:56:55 -0200

    Revert "Merge pull request #3255 from arunagw/app_gitignore_sqlnet_log_3-1-stable"
    
    This reverts commit d12af7a7033f0df5bafef7ff928404941c422adf, reversing
    changes made to 8199b99049f3e0f5712897a0bc61836b161c0006.

M	railties/lib/rails/generators/rails/app/templates/gitignore

commit 96e1dc3	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-10-08 12:54:24 -0200

    Revert "Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log"
    
    This reverts commit bb8e0673299899c913d664c0fd3c483d8569846c, reversing
    changes made to 11687382db08ec1523f71e485c48d6039de25324.

M	railties/lib/rails/generators/rails/app/templates/gitignore

commit d12af7a	refs/tags/v3.1.3
Merge: 8199b99 d11769c
Author: Santiago Pastorino 
Date:   2011-10-08 05:47:37 -0700

    Merge pull request #3255 from arunagw/app_gitignore_sqlnet_log_3-1-stable
    
    App gitignore sqlnet log 3 1 stable

commit bb8e067	refs/heads/master
Merge: 1168738 6c9090d
Author: Santiago Pastorino 
Date:   2011-10-08 05:47:33 -0700

    Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log
    
    Sqlnet should also be ignored into the app gitignore

commit d11769c	refs/tags/v3.1.3
Author: Arun Agrawal 
Date:   2011-10-08 14:42:58 +0530

    Sqlnet.log should also be ignored into the app gitignore

M	railties/lib/rails/generators/rails/app/templates/gitignore

commit 6c9090d	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-08 14:39:19 +0530

    Sqlnet should also be ignored into the app gitignore

M	railties/lib/rails/generators/rails/app/templates/gitignore

commit 8199b99	refs/tags/v3.1.3
Merge: 5d624e3 574a25d
Author: José Valim 
Date:   2011-10-08 02:06:59 -0700

    Merge pull request #3253 from arunagw/gitignore_sqlnet_file
    
    Gitignore sqlnet file

commit b2deeab	refs/heads/master
Author: mhutchin 
Date:   2011-10-08 01:58:57 -0700

    Correct stylesheet filename and remove reference to old stylesheet compilation location

M	railties/guides/source/active_record_validations_callbacks.textile

commit 574a25d	refs/tags/v3.1.3
Author: Arun Agrawal 
Date:   2011-10-08 14:27:38 +0530

    Sqlnet.log should be ignored

M	.gitignore

commit 5d624e3	refs/tags/v3.1.3
Merge: e740673 b5439b4
Author: José Valim 
Date:   2011-10-08 01:18:15 -0700

    Merge pull request #3248 from arunagw/query_cache_test_fix_3-1-stable
    
    Query cache test fix 3 1 stable

commit 1168738	refs/heads/master
Merge: 135a97a 34d950b
Author: José Valim 
Date:   2011-10-08 01:17:57 -0700

    Merge pull request #3249 from arunagw/query_cache_test_fix
    
    Fixed BodyProxy.new for tests! for wrong argument

commit 135a97a	refs/heads/master
Merge: cf92e41 1e8feb8
Author: José Valim 
Date:   2011-10-08 01:17:28 -0700

    Merge pull request #3250 from arunagw/adding_sqlnet_to_gitignore
    
    sqlnet.log file to gitignore. Generates when running with oracle!

commit cf92e41	refs/heads/master
Merge: 7f64e47 a4515b6
Author: José Valim 
Date:   2011-10-08 01:15:21 -0700

    Merge pull request #3252 from avakhov/p-remove-expire_page-dup
    
    Remove unnecessary dup in expire_page

commit a4515b6	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-08 11:01:31 +0400

    Remove unnecessary dup in expire_page

M	actionpack/lib/action_controller/caching/pages.rb

commit 22b6e82	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-08 10:12:58 +0400

    Fix params hash example in AC::Base comment

M	actionpack/lib/action_controller/base.rb

commit 1e8feb8	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-08 10:06:19 +0530

    sqlnet.log file to gitignore. Generates when running with oracle!

M	.gitignore

commit 34d950b	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-08 10:01:58 +0530

    Fixed BodyProxy.new for tests! for wrong argument

M	activerecord/test/cases/query_cache_test.rb

commit b5439b4	refs/tags/v3.1.3
Author: Arun Agrawal 
Date:   2011-10-08 09:58:28 +0530

    Fixed BodyProxy.new for tests!

M	activerecord/test/cases/query_cache_test.rb

commit 7f64e47	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-07 16:56:18 -0700

    just check to see that the first item in the list is an array

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit e740673	refs/tags/v3.1.3
Author: Vijay Dev 
Date:   2011-10-08 02:20:09 +0530

    fix bad formatting in the assets guide

M	railties/guides/source/asset_pipeline.textile

commit d2db917	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-08 02:20:09 +0530

    fix bad formatting in the assets guide

M	railties/guides/source/asset_pipeline.textile

commit e424906	refs/tags/v3.1.3
Author: José Valim 
Date:   2011-10-07 22:25:03 +0200

    testing.rake should set the default task, closes #2564

M	railties/lib/rails/tasks/misc.rake
M	railties/lib/rails/test_unit/testing.rake

commit 8a4239f	refs/heads/master
Author: José Valim 
Date:   2011-10-07 22:25:03 +0200

    testing.rake should set the default task, closes #2564

M	railties/lib/rails/tasks/misc.rake
M	railties/lib/rails/test_unit/testing.rake

commit 0d3d9a1	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-07 23:53:12 +0530

    closes #3241 - partial doc fix

M	actionpack/lib/action_view/helpers/rendering_helper.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit bec61bd	refs/heads/master
Merge: 4930f9d 4015080
Author: Vijay Dev 
Date:   2011-10-07 10:26:45 -0700

    Merge pull request #3244 from ugisozols/master
    
    One of the activemodel naming tests wasn't asserting anything.

commit 39c7b63	refs/tags/v3.1.3
Author: clay shentrup 
Date:   2011-10-06 16:09:36 -0700

    Clarifying ambiguous description of require_self in the asset pipeline

M	railties/guides/source/asset_pipeline.textile

commit 9e5b4f3	refs/tags/v3.1.3
Author: Nick Quaranto 
Date:   2011-10-05 22:27:33 -0400

    use Rails.root.join for assets guide

M	railties/guides/source/asset_pipeline.textile

commit 4930f9d	refs/heads/master
Merge: 9312d21 cb244f4
Author: Vijay Dev 
Date:   2011-10-07 22:20:29 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit cb244f4	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-07 22:19:55 +0530

    use https for github url

M	railties/guides/source/migrations.textile

commit b992f52	refs/tags/v3.1.3
Author: Santiago Pastorino 
Date:   2011-10-07 05:25:31 -0700

    Merge pull request #3243 from mjtko/connection-pool-thread-fix
    
    QueryCache/ConnectionPool thread fix (was #1670)

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/lib/active_record/query_cache.rb

commit fca2613	refs/heads/master
Author: mhutchin 
Date:   2011-10-07 08:26:05 -0700

    Correct formatting

M	railties/guides/source/migrations.textile

commit d4ea804	refs/heads/master
Author: mhutchin 
Date:   2011-10-07 08:16:33 -0700

    Replace the reference to the annotate_models plugin (unchanged since 2008) with more current annotate_models gem

M	railties/guides/source/migrations.textile

commit ba70812	refs/tags/v3.1.1 (tag: v3.1.1)
Author: Santiago Pastorino 
Date:   2011-10-07 13:13:42 -0200

    Bumping to 3.1.1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 4015080	refs/heads/master
Author: Uģis Ozols 
Date:   2011-10-07 16:42:44 +0300

    One of the activemodel naming tests wasn't asserting anything.

M	activemodel/test/cases/naming_test.rb

commit 9312d21	refs/heads/master
Merge: b1c20e3 ea341b8
Author: Xavier Noria 
Date:   2011-10-07 15:07:14 +0200

    Merge branch 'master' of github.com:rails/rails

commit be6527f	refs/tags/v3.1.1
Author: Xavier Noria 
Date:   2011-10-07 15:05:14 +0200

    asset pipeline guide: removes Apache config for serving pre-compressed assets, and expands the information about nginx support for this
    
    A robust Apache configuration for this feature seems to be tricky,
    one that takes into account Accept-Encoding, sets Vary, ensures
    Content-Type is right, etc.

M	railties/guides/source/asset_pipeline.textile

commit b1c20e3	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-07 15:05:14 +0200

    asset pipeline guide: removes Apache config for serving pre-compressed assets, and expands the information about nginx support for this
    
    A robust Apache configuration for this feature seems to be tricky,
    one that takes into account Accept-Encoding, sets Vary, ensures
    Content-Type is right, etc.

M	railties/guides/source/asset_pipeline.textile

commit ea341b8	refs/heads/master
Merge: 3088d23 f41b58d
Author: Santiago Pastorino 
Date:   2011-10-07 05:25:31 -0700

    Merge pull request #3243 from mjtko/connection-pool-thread-fix
    
    QueryCache/ConnectionPool thread fix (was #1670)

commit f41b58d	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-06-13 02:14:18 +0100

    use thread locals and an instance variable within QueryCache#BodyProxy to maintain appropriate linkage with AR database connection across threads

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/lib/active_record/query_cache.rb

commit 3088d23	refs/heads/master
Merge: 9988848 ac659b8
Author: Aaron Patterson 
Date:   2011-10-06 20:08:05 -0700

    Merge pull request #3232 from Juanmcuello/pg_prepared_statements
    
    Use the schema_search_path in prepared statements.

commit ddee206	refs/heads/master
Author: Dimitar Dimitrov 
Date:   2011-10-07 03:14:59 +0300

    More understandable warning in the local_constant_names section
    
    Rewrite the warning about local_constant_names in Ruby 1.8 to make it more understandable. Word ordering fixes in the same section.

M	railties/guides/source/active_support_core_extensions.textile

commit 0549ba1	refs/heads/master
Author: clay shentrup 
Date:   2011-10-06 16:09:36 -0700

    Clarifying ambiguous description of require_self in the asset pipeline

M	railties/guides/source/asset_pipeline.textile

commit 9988848	refs/heads/master
Author: Aaron Patterson 
Date:   2011-10-06 11:06:38 -0700

    fix require

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit a17e5e2	refs/heads/master
Merge: 29bf193 545ddbd
Author: Manuel Menezes de Sequeira 
Date:   2011-10-06 21:31:26 +0100

    Merge branch 'master' of github.com:lifo/docrails

commit 29bf193	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-06 21:29:58 +0100

    Undid previous change which violated the convention regarding output (use "# =>") used in these guides. Corrected typo in previous correction. (Thanks for pointing this out, vijaydev.)

M	railties/guides/source/active_record_querying.textile

commit 545ddbd	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-06 23:50:16 +0530

    fix an example

M	railties/guides/source/caching_with_rails.textile

commit 7bf12a1	refs/tags/v3.1.1
Author: Vijay Dev 
Date:   2011-10-06 20:04:09 +0530

    fix a space in the assets guide

M	railties/guides/source/asset_pipeline.textile

commit c57aec5	refs/tags/v3.1.6
Author: OZAWA Sakuro 
Date:   2011-10-06 12:42:59 +0900

    Support data: url scheme in asset paths.

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 2224a06	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-06 20:04:09 +0530

    fix a space in the assets guide

M	railties/guides/source/asset_pipeline.textile

commit 9d091c0	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-06 16:22:40 +0200

    revises the precompilation section of the asset pipeline guide (web server configuration for gzipped assets pending)

M	railties/guides/source/asset_pipeline.textile

commit 05386ce	refs/tags/v3.1.1
Merge: 471e1f1 7f60202
Author: Xavier Noria 
Date:   2011-10-06 16:22:49 +0200

    Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable

commit 471e1f1	refs/tags/v3.1.1
Author: Xavier Noria 
Date:   2011-10-06 16:22:40 +0200

    revises the precompilation section of the asset pipeline guide (web server configuration for gzipped assets pending)

M	railties/guides/source/asset_pipeline.textile

commit 7f60202	refs/tags/v3.1.1
Author: Jared Mehle 
Date:   2011-10-03 14:50:40 -0500

    Quoted path to _structure.sql file in db:test:clone_structure task.
    
    Leaving the path unquoted causes errors in paths containing spaces or dashes.

M	activerecord/lib/active_record/railties/databases.rake

commit f40bbc9	refs/tags/v3.1.1
Author: Yasuo Honda 
Date:   2011-10-06 07:44:48 -0400

    Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea
    
    Signed-off-by: José Valim 

M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 89623e9	refs/heads/master
Merge: 33799c8 281b8ca
Author: José Valim 
Date:   2011-10-06 04:52:25 -0700

    Merge pull request #3236 from yahonda/fix_test_nonexisting_method_with_arguments
    
    Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea

commit 281b8ca	refs/heads/master
Author: Yasuo Honda 
Date:   2011-10-06 07:44:48 -0400

    Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea

M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 33799c8	refs/heads/master
Merge: 0adab7c 80e0cd3
Author: Vijay Dev 
Date:   2011-10-06 02:13:36 -0700

    Merge pull request #3203 from jrmehle/fix_clone_structure
    
    db:test:clone_structure if path to .sql file contains spaces or dashes

commit e2c03bf	refs/tags/v3.0.14
Merge: 543b587 346973e
Author: Vijay Dev 
Date:   2011-10-06 00:54:26 -0700

    Merge pull request #3233 from benolee/fix_spelling_in_doc_app_rake_task
    
    Fix spelling in doc:app rake task

commit d42d97d	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-06 10:39:37 +0400

    Fix comment in AbstractController callbacks

M	actionpack/lib/abstract_controller/callbacks.rb

commit 79a719a	refs/heads/master
Author: Hendy Tanata 
Date:   2011-10-06 14:03:46 +0800

    Grammar fixes for the routing guide.

M	railties/guides/source/routing.textile

commit 4f5878a	refs/heads/master
Merge: 02eac2d 3d595c5
Author: Ryan Bigg 
Date:   2011-10-06 13:33:55 +1100

    Merge branch 'master' of github.com:lifo/docrails
    
    * 'master' of github.com:lifo/docrails:
      use Rails.root.join for assets guide

commit 02eac2d	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-06 13:32:39 +1100

    [config guide] Show example of defining initialization hooks

M	railties/guides/source/configuring.textile

commit 00751f0	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-06 13:32:21 +1100

    [config guide] mention that to_prepare hooks are called upon every request in dev, but only once in production

M	railties/guides/source/configuring.textile

commit 0adab7c	refs/heads/master
Merge: 82d41c9 999b7ed
Author: Jeremy Kemper 
Date:   2011-10-05 19:31:47 -0700

    Merge branch 'multiple-transactional-fixture-connections'

commit 3d595c5	refs/heads/master
Author: Nick Quaranto 
Date:   2011-10-05 22:27:33 -0400

    use Rails.root.join for assets guide

M	railties/guides/source/asset_pipeline.textile

commit 999b7ed	refs/heads/master
Author: Jeremy Kemper 
Date:   2011-10-05 17:21:43 -0700

    Transactional fixtures enlist all active database connections.
    
    You can use multiple databases in your tests without disabling transactional fixtures.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/unconnected_test.rb

commit 57a01f3	refs/tags/v3.1.1.rc3 (tag: v3.1.1.rc3)
Author: Santiago Pastorino 
Date:   2011-10-05 22:00:08 -0200

    Bumping to 3.1.1.rc3

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 162e13d	refs/tags/v3.1.1.rc3
Author: Santiago Pastorino 
Date:   2011-10-05 21:42:59 -0200

    Add missing CHANGELOG entried

M	actionpack/CHANGELOG
M	activesupport/CHANGELOG

commit 543b587	refs/tags/v3.0.14
Author: Akira Matsuda 
Date:   2011-10-02 06:21:32 +0900

    ruby193: String#prepend is also unsafe

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 984d031	refs/tags/v3.0.14
Author: Akira Matsuda 
Date:   2011-10-02 06:20:58 +0900

    override unsafe methods only if defined on String

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 82d41c9	refs/heads/master
Author: José Valim 
Date:   2011-10-06 00:34:39 +0200

    Revert "don't raise NoMethodError the tried method doesn't exists"
    
    This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6.

M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 3c6cbad	refs/tags/v3.1.1.rc3
Author: José Valim 
Date:   2011-10-06 00:33:56 +0200

    Revert "don't raise NoMethodError the tried method doesn't exists"
    
    This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6.

M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 876d3f2	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-06 08:47:06 +1100

    [engines guide] More explanation for 'Generating an engine'

M	railties/guides/source/engines.textile

commit 1ba6b40	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-06 08:40:36 +1100

    [engines] Expanded 'What are engines?' and 'Generating an engine' sections

M	railties/guides/source/engines.textile

commit cde5294	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-05 22:52:50 +0100

    Some small corrections and improvements to the text.

M	railties/guides/source/active_record_querying.textile

commit 07343d2	refs/heads/master
Merge: 8d775d5 d6c7185
Author: Manuel Menezes de Sequeira 
Date:   2011-10-05 22:14:49 +0100

    Merge branch 'master' of github.com:lifo/docrails

commit 8d775d5	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-05 22:14:41 +0100

    Correction of code snippet tag from shell to ruby.

M	railties/guides/source/active_record_validations_callbacks.textile

commit f8beca0	refs/tags/v3.1.1.rc3
Author: Jon Leighton 
Date:   2011-10-05 20:20:04 +0100

    Raise an exception on unknown primary key inside AssociationReflection.
    
    An association between two models cannot be made if a relevant key is
    unknown, so fail fast rather than generating invalid SQL. Fixes #3207.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit 2e9e647	refs/heads/master
Author: Jon Leighton 
Date:   2011-10-05 20:20:04 +0100

    Raise an exception on unknown primary key inside AssociationReflection.
    
    An association between two models cannot be made if a relevant key is
    unknown, so fail fast rather than generating invalid SQL. Fixes #3207.

M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit 6474765	refs/heads/master
Author: Jon Leighton 
Date:   2011-10-05 18:11:25 +0100

    Revert "Raise error on unknown primary key."
    
    This reverts commit ee2be435b1e5c0e94a4ee93a1a310e0471a77d07.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 346973e	refs/tags/v3.0.14
Author: Ben Holley 
Date:   2011-10-05 13:41:35 -0500

    Fix spelling in doc:app rake task

M	railties/lib/rails/tasks/documentation.rake

commit d6c7185	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-10-05 15:31:14 -0300

    Update Rails routing guide to mention that `redirect()` is a 301 permanent redirect
    
    I had to try out myself to realize that it's 301, so this should be helpful to everyone.

M	railties/guides/source/routing.textile

commit ac659b8	refs/heads/master
Author: Juan M. Cuello 
Date:   2011-10-05 14:42:15 -0300

    refs #3232. Prepared statements and postgreSQL schemas.
    
    Add tests for prepared statements with multiple schemas in
    postgreSQL.

M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 4f2c238	refs/tags/v3.1.1.rc3
Author: Santiago Pastorino 
Date:   2011-10-05 15:41:28 -0200

    stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't throw Sprockets::FileOutsidePaths exception anymore

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit fd8f0b2	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-10-05 15:41:28 -0200

    stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't throw Sprockets::FileOutsidePaths exception anymore

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 84eece0	refs/heads/master
Merge: 1996540 c495bfc
Author: Dmitry Polushkin 
Date:   2011-10-05 17:35:59 +0100

    Merge branch 'master' of git://github.com/rails/rails

commit cfc95d8	refs/heads/master
Author: Juan M. Cuello 
Date:   2011-10-05 11:43:03 -0300

    Use the schema_search_path in prepared statements.
    
    To allow the use of prepared statements when changing schemas in
    postgres, the schema search path is added to the sql key.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit c495bfc	refs/heads/master
Author: José Valim 
Date:   2011-10-05 15:31:01 +0200

    Do not require railtie as it messes up Rails.application setup.

M	actionpack/test/template/compressors_test.rb

commit cf4d166	refs/tags/v3.1.1.rc3
Author: Alexey Vakhov 
Date:   2011-10-03 10:36:13 +0400

    missed underscore in AV::TestCase helper_method documentation

M	actionpack/lib/action_view/test_case.rb

commit 14e2fe2	refs/tags/v3.1.1.rc3
Author: Uģis Ozols 
Date:   2011-09-29 14:33:32 +0300

    Class name specified in example is Person, not AttributePerson.

M	activemodel/lib/active_model/attribute_methods.rb

commit 46ce7f1	refs/heads/master
Merge: ae4febd ea49935
Author: Vijay Dev 
Date:   2011-10-05 18:42:18 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit ea49935	refs/heads/master
Author: Vijay Dev 
Date:   2011-10-05 18:40:45 +0530

    copy editing

M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/migrations.textile

commit 34ed939	refs/heads/master
Merge: 4406bbe a44bbfc
Author: Manuel Menezes de Sequeira 
Date:   2011-10-05 11:59:47 +0100

    Merge branch 'master' of github.com:lifo/docrails

commit 4406bbe	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-05 11:59:03 +0100

    s/help/helper/

M	railties/guides/source/active_record_validations_callbacks.textile

commit a44bbfc	refs/heads/master
Author: Hendy Tanata 
Date:   2011-10-05 17:35:58 +0800

    Corrections to Active Record Validations and Callbacks guide.

M	railties/guides/source/active_record_validations_callbacks.textile

commit fc9b521	refs/tags/v3.1.1.rc3
Merge: c6d13b6 aa11f73
Author: José Valim 
Date:   2011-10-05 01:16:21 -0700

    Merge pull request #3230 from amatsuda/string_prepend_31
    
    ruby193: String#prepend for 3-1-stable

commit aa11f73	refs/tags/v3.1.1.rc3
Author: Akira Matsuda 
Date:   2011-10-02 06:21:32 +0900

    ruby193: String#prepend is also unsafe

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 9257a21	refs/tags/v3.1.1.rc3
Author: Akira Matsuda 
Date:   2011-10-02 06:20:58 +0900

    override unsafe methods only if defined on String

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit ae4febd	refs/heads/master
Merge: 4cea4ee 87eab59
Author: José Valim 
Date:   2011-10-05 00:38:57 -0700

    Merge pull request #3229 from amatsuda/string_prepend
    
    ruby193: String#prepend

commit 4cea4ee	refs/heads/master
Author: José Valim 
Date:   2011-10-05 09:35:27 +0200

    Fix regression when calling helpers inside sprockets.

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers.rb
A	actionpack/lib/sprockets/helpers/isolated_helper.rb
D	actionpack/lib/sprockets/helpers/precompile_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit c6d13b6	refs/tags/v3.1.1.rc3
Author: José Valim 
Date:   2011-10-05 09:35:27 +0200

    Fix regression when calling helpers inside sprockets.

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers.rb
A	actionpack/lib/sprockets/helpers/isolated_helper.rb
D	actionpack/lib/sprockets/helpers/precompile_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit 463223c	refs/heads/master
Merge: ac49fb1 2c4e08d
Author: Robert Ross 
Date:   2011-10-04 23:42:50 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit ac49fb1	refs/heads/master
Author: Robert Ross 
Date:   2011-10-04 23:42:37 -0700

    Change one more place for JSON string to Hash

M	activemodel/lib/active_model/serializers/json.rb

commit 87eab59	refs/heads/master
Author: Akira Matsuda 
Date:   2011-10-02 06:21:32 +0900

    ruby193: String#prepend is also unsafe

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 9c4fe30	refs/heads/master
Author: Akira Matsuda 
Date:   2011-10-02 06:20:58 +0900

    override unsafe methods only if defined on String

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 87c57bb	refs/heads/master
Author: José Valim 
Date:   2011-10-05 02:17:29 +0200

    Fix the lame config.action_controller.present? check scattered throughout assets_path.
    
    Conflicts:
    
    	actionpack/test/template/sprockets_helper_test.rb

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers.rb
A	actionpack/lib/sprockets/helpers/precompile_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit d9d1bb2	refs/tags/v3.1.1.rc3
Author: José Valim 
Date:   2011-10-05 02:17:29 +0200

    Fix the lame config.action_controller.present? check scattered throughout assets_path.

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers.rb
A	actionpack/lib/sprockets/helpers/precompile_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit ee2be43	refs/heads/master
Author: Jon Leighton 
Date:   2011-10-05 01:09:43 +0100

    Raise error on unknown primary key.
    
    If we don't have a primary key when we ask for it, it's better to fail
    fast. Fixes GH #2307.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 5711a35	refs/heads/master
Author: José Valim 
Date:   2011-10-05 02:07:25 +0200

    Ensure default_asset_host_protocol is respected, closes #2980.

M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit db8db4a	refs/tags/v3.1.1.rc3
Author: José Valim 
Date:   2011-10-05 02:07:25 +0200

    Ensure default_asset_host_protocol is respected, closes #2980.

M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit ac2f6bd	refs/heads/master
Author: José Valim 
Date:   2011-10-05 01:17:04 +0200

    Encapsulate common rake invocation logic in a method.
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake

commit 110ce85	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-04 23:27:53 +0100

    added comment about why nondigest assets requires a reinvocation
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake

commit 26a62a6	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-04 23:27:29 +0100

    only reinvoke if necessary
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake

commit 42eda8f	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-04 23:22:51 +0100

    only execute the nondigest task if needed
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake

commit ee51cc3	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-04 23:10:11 +0100

    don't munge the environment, let rake do that for us
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake

commit b41bd96	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-04 23:05:01 +0100

    assets compilation task refactoring
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/static_compiler.rb

commit 188d21c	refs/tags/v3.1.1.rc3
Author: José Valim 
Date:   2011-10-05 01:17:04 +0200

    Encapsulate common rake invocation logic in a method.

M	actionpack/lib/sprockets/assets.rake

commit 0ad5040	refs/tags/v3.1.1.rc3
Merge: 4bc6e2f 871cbae
Author: José Valim 
Date:   2011-10-04 16:04:08 -0700

    Merge pull request #3225 from mjtko/assets-compilation-refactoring-the-sequel
    
    assets rake task refactoring work - the sequel

commit 871cbae	refs/tags/v3.1.1.rc3
Author: Mark J. Titorenko 
Date:   2011-10-04 23:27:53 +0100

    added comment about why nondigest assets requires a reinvocation

M	actionpack/lib/sprockets/assets.rake

commit 45cdb3e	refs/tags/v3.1.1.rc3
Author: Mark J. Titorenko 
Date:   2011-10-04 23:27:29 +0100

    only reinvoke if necessary

M	actionpack/lib/sprockets/assets.rake

commit 20173e2	refs/tags/v3.1.1.rc3
Author: Mark J. Titorenko 
Date:   2011-10-04 23:22:51 +0100

    only execute the nondigest task if needed

M	actionpack/lib/sprockets/assets.rake

commit bbdb7f3	refs/tags/v3.1.1.rc3
Author: Mark J. Titorenko 
Date:   2011-10-04 23:10:11 +0100

    don't munge the environment, let rake do that for us

M	actionpack/lib/sprockets/assets.rake

commit 63bab28	refs/tags/v3.1.1.rc3
Author: Mark J. Titorenko 
Date:   2011-10-04 23:05:01 +0100

    assets compilation task refactoring

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/static_compiler.rb

commit 2c4e08d	refs/heads/master
Author: Ryan Bigg 
Date:   2011-10-05 08:37:38 +1100

    [engines guide] initial layout

A	railties/guides/source/engines.textile

commit dc85fc5	refs/heads/master
Author: José Valim 
Date:   2011-10-04 22:03:59 +0200

    Fix failing test added in previous commit.
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake

commit 9c69ef3	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-04 19:02:28 +0100

    correct path used in "digested assets are not mistakenly removed" test
    
    Signed-off-by: José Valim 

M	railties/test/application/assets_test.rb

commit 1f0b78e	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-04 19:02:06 +0100

    add failing test: "digested assets are removed from configured path"
    
    Signed-off-by: José Valim 

M	railties/test/application/assets_test.rb

commit 4bc6e2f	refs/tags/v3.1.1.rc3
Author: José Valim 
Date:   2011-10-04 22:03:59 +0200

    Fix failing test added in previous commit.

M	actionpack/lib/sprockets/assets.rake

commit 306123b	refs/tags/v3.1.1.rc3
Merge: 8bf761f a5eca91
Author: José Valim 
Date:   2011-10-04 12:57:46 -0700

    Merge pull request #3221 from mjtko/asset-tests
    
    Failing test for assets:clean task issue

commit a5eca91	refs/tags/v3.1.1.rc3
Author: Mark J. Titorenko 
Date:   2011-10-04 19:02:28 +0100

    correct path used in "digested assets are not mistakenly removed" test

M	railties/test/application/assets_test.rb

commit 8093e38	refs/tags/v3.1.1.rc3
Author: Mark J. Titorenko 
Date:   2011-10-04 19:02:06 +0100

    add failing test: "digested assets are removed from configured path"

M	railties/test/application/assets_test.rb

commit eef176d	refs/heads/master
Author: Robert Ross 
Date:   2011-10-04 09:37:54 -0700

    Fix as_json doc to say what it actually returns.

M	activemodel/lib/active_model/serializers/json.rb

commit 8bf761f	refs/tags/v3.1.1.rc3
Author: Santiago Pastorino 
Date:   2011-10-04 14:16:39 -0200

    Bump sprockets to 2.0.2

M	actionpack/actionpack.gemspec

commit db26221	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-10-04 14:14:36 -0200

    Bump sprockets to 2.0.2

M	actionpack/actionpack.gemspec

commit bb4edc8	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-04 16:13:16 +0100

    More corrections and clarifications to the Active Record Validations and Callbacks guide.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 997efed	refs/heads/master
Merge: 96aa3bd 02b0f8d
Author: Santiago Pastorino 
Date:   2011-10-04 05:34:25 -0700

    Merge pull request #3212 from ayrton/master
    
    incorrect to_formatted_s example

commit 02b0f8d	refs/heads/master
Author: Ayrton De Craene 
Date:   2011-10-04 15:21:23 +0300

    to_formatted_s is an instance method for a Range not an Array

M	activesupport/lib/active_support/core_ext/range/conversions.rb

commit 96aa3bd	refs/heads/master
Author: José Valim 
Date:   2011-10-04 11:31:47 +0200

    Clean up subdomain code a bit.

M	actionpack/lib/action_dispatch/http/url.rb

commit b039069	refs/heads/master
Merge: 7f1a666 de942e5
Author: José Valim 
Date:   2011-10-04 02:26:40 -0700

    Merge pull request #3209 from ksob/subdomain_false_strips_subdomains
    
    :subdomain => false will remove all subdomains now. Closes #2025

commit 7f1a666	refs/heads/master
Author: José Valim 
Date:   2011-10-04 11:24:12 +0200

    Fix failing tests and refactor assets.rake

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 88f60fd	refs/heads/master
Author: Ben Woosley 
Date:   2011-10-03 22:24:45 -0700

    Changing rake db:schema:dump to run :environment as well as :load_config, as running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter.
    
    This reverses a change made here: https://github.com/rails/rails/commit/5df72a238e9fcb18daf6ab6e6dc9051c9106d7bb#L0L324
    
    I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do".
    
    Signed-off-by: José Valim 

M	activerecord/lib/active_record/railties/databases.rake

commit 360b8c4	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-10-04 11:24:12 +0200

    Fix failing tests and refactor assets.rake

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 9d34991	refs/tags/v3.1.6
Merge: 3530afa e41bd38
Author: José Valim 
Date:   2011-10-04 01:44:09 -0700

    Merge pull request #3208 from Empact/patch-1
    
    Change rake db:schema:dump to load schema dumper extensions such as those used by foreigner and spatial_adapter

commit de942e5	refs/heads/master
Author: Kamil Sobieraj 
Date:   2011-10-04 09:16:34 +0100

    :subdomain can now be specified with a value of false in url_for, allowing for subdomain(s) removal from the host during link generation. Closes #2025

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/controller/url_for_test.rb
M	actionpack/test/dispatch/request_test.rb

commit e41bd38	refs/tags/v3.1.6
Author: Ben Woosley 
Date:   2011-10-03 22:24:45 -0700

    Changing rake db:schema:dump to run :environment as well as :load_config, as running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter.
    
    This reverses a change made here: https://github.com/rails/rails/commit/5df72a238e9fcb18daf6ab6e6dc9051c9106d7bb#L0L324
    
    I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do".

M	activerecord/lib/active_record/railties/databases.rake

commit 80e0cd3	refs/heads/master
Author: Jared Mehle 
Date:   2011-10-03 14:50:40 -0500

    Quoted path to _structure.sql file in db:test:clone_structure task.
    
    Leaving the path unquoted causes errors in paths containing spaces or dashes.

M	activerecord/lib/active_record/railties/databases.rake

commit 3530afa	refs/tags/v3.1.6
Author: Brendan Ribera 
Date:   2011-10-03 11:27:02 -0700

    Require rack-cache 1.1.
    
    Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when
    config.action_controller.perform_caching is true. This has two problems:
     * unexpected inconsistent behaviour between development & production environments
     * breaks applications that use of these headers
    
    Signed-off-by: José Valim 

M	actionpack/actionpack.gemspec

commit 9533ff0	refs/tags/v3.1.6
Author: Brendan Ribera 
Date:   2011-10-03 11:17:12 -0700

    Test demonstrating #3053: If-Modified-Since gets swallowed up by rack-cache.
    
    Signed-off-by: José Valim 

M	railties/test/application/middleware/cache_test.rb

commit 1eac911	refs/heads/master
Merge: c10fcd2 b05a56f
Author: José Valim 
Date:   2011-10-03 12:28:31 -0700

    Merge pull request #3202 from abscondment/3053-missing-headers
    
    Use rack-cache 1.1

commit b05a56f	refs/heads/master
Author: Brendan Ribera 
Date:   2011-10-03 11:27:02 -0700

    Require rack-cache 1.1.
    
    Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when
    config.action_controller.perform_caching is true. This has two problems:
     * unexpected inconsistent behaviour between development & production environments
     * breaks applications that use of these headers

M	actionpack/actionpack.gemspec

commit 57d9737	refs/heads/master
Author: Brendan Ribera 
Date:   2011-10-03 11:17:12 -0700

    Test demonstrating #3053: If-Modified-Since gets swallowed up by rack-cache.

M	railties/test/application/middleware/cache_test.rb

commit 87bbf48	refs/tags/v3.0.14
Author: Jeremy Kemper 
Date:   2011-10-03 10:53:09 -0700

    Merge pull request #2801 from jeremyevans/patch-1
    
    Fix obviously breakage of Time.=== for Time subclasses

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 5a9e79b	refs/tags/v3.1.6
Author: Jeremy Kemper 
Date:   2011-10-03 10:53:09 -0700

    Merge pull request #2801 from jeremyevans/patch-1
    
    Fix obviously breakage of Time.=== for Time subclasses

M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit c10fcd2	refs/heads/master
Merge: e141cbd da8f00a
Author: Jeremy Kemper 
Date:   2011-10-03 10:53:09 -0700

    Merge pull request #2801 from jeremyevans/patch-1
    
    Fix obviously breakage of Time.=== for Time subclasses

commit 547f4af	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-03 18:03:35 +0100

    Several small corrections and clarifications to the Active Record Validations and Callbacks guide.

M	railties/guides/source/active_record_validations_callbacks.textile

commit e141cbd	refs/heads/master
Merge: 2120d7b 8cc70cf
Author: Aaron Patterson 
Date:   2011-10-03 09:04:46 -0700

    Merge pull request #3191 from yahonda/activerecord_unittest_db2
    
    To support ActiveRecord unit tests for IBM DB2

commit 8cc70cf	refs/heads/master
Author: Yasuo Honda 
Date:   2011-10-03 11:56:11 -0400

    Fix typo in Rakefile

M	Gemfile

commit 2120d7b	refs/heads/master
Author: José Valim 
Date:   2011-10-03 17:31:11 +0200

    Fix #3198.

M	actionpack/lib/sprockets/assets.rake

commit a7648c2	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-10-03 13:42:50 +0100

    add failing test for #3198
    
    Signed-off-by: José Valim 

M	railties/test/application/assets_test.rb

commit 2db49c5	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-10-03 17:31:11 +0200

    Fix #3198.

M	actionpack/lib/sprockets/assets.rake

commit 6b1e4a2	refs/tags/v3.1.6
Author: Mark J. Titorenko 
Date:   2011-10-03 13:42:50 +0100

    add failing test for #3198
    
    Signed-off-by: José Valim 

M	railties/test/application/assets_test.rb

commit 177ccbf	refs/heads/master
Merge: 6f429f3 bb5e295
Author: Santiago Pastorino 
Date:   2011-10-03 08:24:35 -0700

    Merge pull request #3200 from docwhat/spelling-booboo
    
    Rescuable spelling error

commit bb5e295	refs/heads/master
Author: Christian Höltje 
Date:   2011-10-03 10:15:31 -0400

    Rescuable spelling error

M	activesupport/test/rescuable_test.rb

commit e3d4603	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-03 14:47:24 +0100

    Several small corrections and improvements to the Migrations and Active Record Basics guides.

M	railties/guides/source/active_record_basics.textile
M	railties/guides/source/migrations.textile

commit 8df7fe3	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-03 12:05:25 +0400

    normalize arg for ActionView::TestCase tests method

M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/template/test_test.rb

commit 0defbc6	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-03 11:04:22 +0400

    normalize arg for ActionMailer::TestCase tests method

M	actionmailer/lib/action_mailer/test_case.rb
A	actionmailer/test/test_test.rb

commit 6f429f3	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-10-03 16:06:04 +1030

    Ensure that enhancements to assets:precompile task are only run once
    
    Signed-off-by: José Valim 

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 0e1f7e0	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-10-03 16:05:05 +1030

    Replace calls to capture(:stdout) with quietly in assets tests
    
    Signed-off-by: José Valim 

M	railties/test/application/assets_test.rb

commit 9c6d480	refs/heads/master
Merge: daca35c 0eb80fa
Author: José Valim 
Date:   2011-10-03 02:10:40 -0700

    Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantize
    
    use safe_constantize instead constantize in AC::TestCase

commit daca35c	refs/heads/master
Merge: d68884f 8e946da
Author: José Valim 
Date:   2011-10-03 02:10:29 -0700

    Merge pull request #3194 from avakhov/patch-ac-test-case-tests
    
    normalize arg for AC::TestCase tests class method

commit 7e03ace	refs/tags/v3.1.6
Merge: 41cbd15 a6614c5
Author: José Valim 
Date:   2011-10-03 02:07:58 -0700

    Merge pull request #3192 from spohlenz/precompile-enhancement-fix
    
    Fix regression in assets:precompile task when task is enhanced

commit 8e946da	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-03 10:19:15 +0400

    normalize arg for AC::TestCase tests class method

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit f51cb36	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-03 10:36:13 +0400

    missed underscore in AV::TestCase helper_method documentation

M	actionpack/lib/action_view/test_case.rb

commit 0eb80fa	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-10-03 10:01:52 +0400

    use safe_constantize instead constantize in AC::TestCase

M	actionpack/lib/action_controller/test_case.rb

commit a6614c5	refs/tags/v3.1.6
Author: Sam Pohlenz 
Date:   2011-10-03 16:06:04 +1030

    Ensure that enhancements to assets:precompile task are only run once

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 29c2fc3	refs/tags/v3.1.6
Author: Sam Pohlenz 
Date:   2011-10-03 16:05:05 +1030

    Replace calls to capture(:stdout) with quietly in assets tests

M	railties/test/application/assets_test.rb

commit b564ffc	refs/heads/master
Author: Yasuo Honda 
Date:   2011-10-02 22:51:01 -0400

    To support ActiveRecord unit tests for IBM DB2

M	Gemfile
M	activerecord/test/config.example.yml

commit 41cbd15	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-10-02 22:13:43 +0200

    Update sass and coffee dependencies to latest.

M	railties/lib/rails/generators/app_base.rb

commit ee8a37c	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-10-02 22:02:12 +0200

    :group => :assets should only run in the assets environment.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/initializable.rb
M	railties/test/initializable_test.rb

commit d68884f	refs/heads/master
Author: José Valim 
Date:   2011-10-02 22:02:12 +0200

    :group => :assets should only run in the assets environment.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/initializable.rb
M	railties/test/initializable_test.rb

commit d94aa10	refs/tags/v3.1.6
Author: Xavier Noria 
Date:   2011-10-02 12:33:14 -0700

    rewords the docs of config.assets.initialize_on_precompile in the asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit ac1fc5c	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-02 12:33:14 -0700

    rewords the docs of config.assets.initialize_on_precompile in the asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 6e00c05	refs/heads/master
Author: Xavier Noria 
Date:   2011-10-02 11:35:41 -0700

    documents config.assets.initialize_on_precompile in the asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 27ec2d3	refs/tags/v3.1.6
Author: Xavier Noria 
Date:   2011-10-02 11:35:41 -0700

    documents config.assets.initialize_on_precompile in the asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit d2219c5	refs/tags/v3.1.6
Author: Santiago Pastorino 
Date:   2011-10-02 13:57:29 -0200

    Precompile properly refers files referenced with asset_path test

M	railties/test/application/assets_test.rb

commit e6156cb	refs/tags/v3.1.6
Author: Santiago Pastorino 
Date:   2011-10-02 13:52:29 -0200

    capture was commented out

M	railties/test/application/assets_test.rb

commit c1547fc	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-10-02 13:57:29 -0200

    Precompile properly refers files referenced with asset_path test

M	railties/test/application/assets_test.rb

commit 9b34e31	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-10-02 13:52:29 -0200

    capture was commented out

M	railties/test/application/assets_test.rb

commit 7534240	refs/heads/master
Author: José Valim 
Date:   2011-10-02 12:14:31 +0200

    Provide initialize_on_precompile which, when set to false, does not initialize the app for precompilation. Defaults to true.

M	actionpack/lib/sprockets/assets.rake
M	railties/CHANGELOG
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit 258fe7d	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-10-02 12:14:31 +0200

    Provide initialize_on_precompile which, when set to false, does not initialize the app for precompilation. Defaults to true.

M	actionpack/lib/sprockets/assets.rake
M	railties/CHANGELOG
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit f63b1de	refs/tags/v3.1.6
Author: José Valim 
Date:   2011-10-02 11:28:48 +0200

    TestCase should respect the view_assigns API instead of pulling variables on its own.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/test/controller/test_test.rb

commit ef9cf3d	refs/tags/v3.1.6
Author: Philippe Huibonhoa 
Date:   2011-10-02 01:39:52 -0700

    Improved testing so that it tests the real functionality and not the private method.
    
    Signed-off-by: José Valim 

M	activesupport/test/caching_test.rb

commit 5986d9b	refs/tags/v3.1.6
Author: Philippe Huibonhoa 
Date:   2011-09-29 18:59:40 -0700

    Added fix so that file store does not raise an exception when cache dir does not exist yet. This can happen if a delete_matched is called before anything is saved in the cache.
    
    Signed-off-by: José Valim 

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit 1efe41d	refs/heads/master
Merge: 6e8fe1b 119a484
Author: José Valim 
Date:   2011-10-02 02:30:44 -0700

    Merge pull request #3174 from phuibonhoa/master
    
    Fixed file store to handle delete_matched being called before cache dir is created.

commit 6e8fe1b	refs/heads/master
Author: José Valim 
Date:   2011-10-02 11:28:48 +0200

    TestCase should respect the view_assigns API instead of pulling variables on its own.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/test/controller/test_test.rb

commit 63f6da0	refs/heads/master
Author: José Valim 
Date:   2011-10-02 11:17:06 +0200

    Update CHANGELOG.

M	railties/CHANGELOG

commit 5af5e77	refs/heads/master
Merge: ec53b80 101fb42
Author: José Valim 
Date:   2011-10-02 02:13:30 -0700

    Merge pull request #2583 from guilleiguaran/railsrc
    
    Read extra args for 'rails new' from ~/.railsrc

commit 119a484	refs/heads/master
Author: Philippe Huibonhoa 
Date:   2011-10-02 01:39:52 -0700

    Improved testing so that it tests the real functionality and not the private method.

M	activesupport/test/caching_test.rb

commit 101fb42	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-10-02 01:06:39 -0500

    Print information about .railsrc to users

M	railties/lib/rails/commands/application.rb
M	railties/lib/rails/generators/rails/app/USAGE

commit 7039def	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-07-31 16:17:37 -0500

    Read extra args for 'rails new' from ~/.railsrc

M	railties/lib/rails/commands/application.rb

commit 1996540	refs/heads/master
Merge: 9d54f89 ec53b80
Author: Dmitry Polushkin 
Date:   2011-10-01 20:49:14 +0100

    Merge branch 'master' of git://github.com/rails/rails

commit ec53b80	refs/heads/master
Merge: 926e97c b30ffbb
Author: José Valim 
Date:   2011-10-01 04:59:23 -0700

    Merge pull request #3185 from arunagw/void_context_warnings_removed
    
    Use of :: in void context Warning removed

commit 581173d	refs/tags/v3.1.6
Merge: aead572 32df5b6
Author: José Valim 
Date:   2011-10-01 04:59:00 -0700

    Merge pull request #3186 from arunagw/void_context_warnings_removed_3-1-stable
    
    Void context warnings removed 3 1 stable

commit a917c2b	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-01 12:48:34 +0100

    Several other small corrections.

M	railties/guides/source/getting_started.textile

commit 059c04d	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-10-01 11:39:00 +0100

    Several small corrections and clarifications.

M	railties/guides/source/getting_started.textile

commit 32df5b6	refs/tags/v3.1.6
Author: Arun Agrawal 
Date:   2011-10-01 14:31:59 +0530

    Warning Use of :: in void context Warning removed

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/configuration_test.rb

commit b30ffbb	refs/heads/master
Author: Arun Agrawal 
Date:   2011-10-01 14:27:12 +0530

    Use of :: in void context Warning removed

M	actionpack/lib/sprockets/assets.rake

commit 409268e	refs/heads/master
Author: Manuel Menezes de Sequeira 
Date:   2011-09-30 23:28:51 +0100

    Small typo corrected.

M	railties/guides/source/getting_started.textile

commit 926e97c	refs/heads/master
Merge: d4457dc 44791a2
Author: José Valim 
Date:   2011-09-30 09:44:26 -0700

    Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixtures
    
    Modified how to handle if ActiveRecord is defined.

commit 44791a2	refs/heads/master
Author: Yasuo Honda 
Date:   2011-09-30 12:05:53 -0400

    Modified how to handle if ActiveRecord is defined.

M	railties/lib/rails/test_help.rb

commit d4457dc	refs/heads/master
Author: José Valim 
Date:   2011-09-30 14:20:41 +0200

    Provide read_attribute_for_serialization as the API to serialize attributes.

M	activemodel/lib/active_model/serialization.rb
M	activemodel/test/cases/serialization_test.rb
M	activeresource/lib/active_resource/base.rb

commit 37b9594	refs/heads/master
Author: José Valim 
Date:   2011-09-30 12:45:36 +0200

    Set the default options value for as_json in the encoder object.

M	activesupport/lib/active_support/core_ext/object/to_json.rb
M	activesupport/lib/active_support/json/encoding.rb

commit afeb897	refs/heads/master
Merge: fe157a7 da914fa
Author: José Valim 
Date:   2011-09-30 03:42:53 -0700

    Merge pull request #3175 from nhocki/as-json-patch
    
    Allow default options for `as_json` method on models

commit fe157a7	refs/heads/master
Merge: 47a14a0 e81c427
Author: José Valim 
Date:   2011-09-30 03:35:16 -0700

    Merge pull request #3177 from arunagw/void_warnings_removed
    
    possibly useless use of :: in void context Warning removed

commit 47a14a0	refs/heads/master
Merge: d2888de b0b436e
Author: José Valim 
Date:   2011-09-30 03:34:38 -0700

    Merge pull request #3178 from arunagw/argument_warning_removed
    
    warning removed : '&' interpreted as argument prefix

commit b0b436e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-30 15:56:38 +0530

    warning removed : '&' interpreted as argument prefix

M	railties/lib/rails/generators/actions.rb

commit e81c427	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-30 14:12:43 +0530

    possibly useless use of :: in void context Warning removed

M	railties/test/application/configuration_test.rb

commit da914fa	refs/heads/master
Author: Nicolás Hock Isaza 
Date:   2011-09-29 20:07:19 -0500

    Fixing `as_json` method for ActiveRecord models.
    
    When you've got an AR Model and you override the `as_json` method,
    you should be able to add default options to the renderer, like this:
    
        class User < ActiveRecord::Base
          def as_json(options = {})
            super(options.merge(:except => [:password_digest]))
          end
        end
    
    This was not possible before this commit. See the added test case.

M	activemodel/test/cases/serializers/json_serialization_test.rb
M	activesupport/lib/active_support/core_ext/object/to_json.rb

commit 0baa8f8	refs/heads/master
Author: Philippe Huibonhoa 
Date:   2011-09-29 18:59:40 -0700

    Added fix so that file store does not raise an exception when cache dir does not exist yet. This can happen if a delete_matched is called before anything is saved in the cache.

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit aead572	refs/tags/v3.1.1.rc2 (tag: v3.1.1.rc2)
Author: Santiago Pastorino 
Date:   2011-09-29 17:11:55 -0300

    Bumping to 3.1.1.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit d2888de	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-29 16:07:59 -0300

    Add CHANGELOG entries

M	actionpack/CHANGELOG
M	activerecord/CHANGELOG
M	railties/CHANGELOG

commit 8aee03b	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-29 16:07:59 -0300

    Add CHANGELOG entries

M	actionpack/CHANGELOG
M	activerecord/CHANGELOG
M	railties/CHANGELOG

commit 45c56bd	refs/tags/v3.1.1.rc2
Author: Jon Leighton 
Date:   2011-09-29 17:59:40 +0100

    Don't call self.class unless necessary. Closes #3171.

M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit adb8ac1	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-29 17:59:40 +0100

    Don't call self.class unless necessary. Closes #3171.

M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit 4284e13	refs/heads/master
Merge: 64b0c88 148e4a5
Author: José Valim 
Date:   2011-09-29 06:19:26 -0700

    Merge pull request #3167 from dmitriy-kiriyenko/honour_rails_env_environment_variable_when_running_rake
    
    RAILS_ENV environment variable is ignored when running rake from thor script using Rails::Generators::Actions

commit 148e4a5	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-09-29 15:35:25 +0300

    Honour RAILS_ENV environment variable when running rake.

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit 78de4fc	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-08-04 15:44:08 +0300

    When running "rake db:drop" also drop test database in development environment.

M	activerecord/lib/active_record/railties/databases.rake

commit 62a9e5a	refs/heads/master
Author: Uģis Ozols 
Date:   2011-09-29 14:33:32 +0300

    Class name specified in example is Person, not AttributePerson.

M	activemodel/lib/active_model/attribute_methods.rb

commit 85f8458	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-28 23:16:57 -0300

    Fix tests in 1.8.7

M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 7e2de38	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-28 20:13:24 -0300

    javascript_path and stylesheet_path should honor the asset pipelining

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 64b0c88	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-28 20:13:24 -0300

    javascript_path and stylesheet_path should honor the asset pipelining

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit ad304e9	refs/heads/master
Merge: a5e7318 41365a8
Author: José Valim 
Date:   2011-09-28 15:49:35 -0700

    Merge pull request #3159 from elliterate/digest_auth_with_query_string
    
    Fixed digest authentication for requests with a query string [#3158]

commit 00f0fb8	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-28 15:39:05 -0700

    Merge pull request #3156 from ihower/enhance_button_to_helper_v2
    
    Make button_to helper support "form" option

M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit a5e7318	refs/heads/master
Merge: cba3c00 3058d13
Author: Santiago Pastorino 
Date:   2011-09-28 15:39:05 -0700

    Merge pull request #3156 from ihower/enhance_button_to_helper_v2
    
    Make button_to helper support "form" option

commit 41365a8	refs/heads/master
Author: Colin Shield & Ian Lesperance 
Date:   2011-09-28 15:23:47 -0700

    Fixed digest authentication for requests with a query string [#3158]

M	activeresource/lib/active_resource/connection.rb
M	activeresource/test/cases/authorization_test.rb

commit cba3c00	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-28 13:48:23 -0700

    partial pass over the assets guide

M	railties/guides/source/asset_pipeline.textile

commit 05f0c41	refs/tags/v3.1.1.rc2
Author: Xavier Noria 
Date:   2011-09-28 13:48:23 -0700

    partial pass over the assets guide

M	railties/guides/source/asset_pipeline.textile

commit 4535191	refs/heads/master
Author: Ryan Oblak 
Date:   2011-09-27 22:39:31 -0700

    Modified String#pluralize to take an optional count parameter.

M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 8df638d	refs/tags/v3.1.1.rc2
Author: 45north 
Date:   2011-09-13 15:25:46 +0300

    Fixed markup error.

M	railties/guides/source/initialization.textile

commit 3058d13	refs/heads/master
Author: Wen-Tien Chang 
Date:   2011-09-29 01:40:15 +0800

    Make button_to helper support "form" option which is the form attributes.

M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit d76b79b	refs/tags/v3.1.1.rc2
Author: Vijay Dev 
Date:   2011-09-28 13:35:46 +0530

    fixing typo in assets guide

M	railties/guides/source/asset_pipeline.textile

commit f3b8cd9	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-28 13:35:46 +0530

    fixing typo in assets guide

M	railties/guides/source/asset_pipeline.textile

commit ddfa00c	refs/heads/master
Merge: 771b76a aefc403
Author: Jon Leighton 
Date:   2011-09-28 00:57:21 -0700

    Merge pull request #3152 from rocky-jaiswal/fix-failed-ar-test
    
    Fixed failed test under 1.8.7 as map.keys order in indeterminable

commit aefc403	refs/heads/master
Author: Rocky Jaiswal 
Date:   2011-09-28 11:57:34 +0530

    Fixed failed test under 1.8.7 as map.keys order in indeterminable

M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit d6c333c	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-27 19:31:24 -0700

    Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require
    
    add missing require to html sanitizer

M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb

commit 771b76a	refs/heads/master
Merge: 41c8277 1bd88fd
Author: Santiago Pastorino 
Date:   2011-09-27 19:31:24 -0700

    Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require
    
    add missing require to html sanitizer

commit 0678a5b	refs/heads/master
Author: Michael Hutchinson 
Date:   2011-09-27 18:11:01 -0700

    Corrected a typo.

M	railties/guides/source/active_record_querying.textile

commit 9f74ce2	refs/heads/master
Author: Justin Leitgeb 
Date:   2011-09-27 18:45:21 -0400

    Make case in configuration document consistent

M	railties/guides/source/configuring.textile

commit 76cd9c0	refs/tags/v3.1.1.rc2
Author: Xavier Noria 
Date:   2011-09-27 13:55:41 -0700

    the infamous detail only spotted in GitHub diffs no matter how careful you were before pushing

M	railties/guides/source/asset_pipeline.textile

commit 41c8277	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-27 13:55:41 -0700

    the infamous detail only spotted in GitHub diffs no matter how careful you were before pushing

M	railties/guides/source/asset_pipeline.textile

commit c612183	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-27 13:50:49 -0700

    partial pass over the asset pipeline

M	railties/guides/source/asset_pipeline.textile

commit 7ebae12	refs/tags/v3.1.1.rc2
Author: Xavier Noria 
Date:   2011-09-27 13:50:49 -0700

    partial pass over the asset pipeline

M	railties/guides/source/asset_pipeline.textile

commit 1bd88fd	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-27 23:39:52 +0400

    add missing require to html sanitizer

M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb

commit 0cebbf4	refs/tags/v3.1.1.rc2
Author: Diego Plentz 
Date:   2011-09-26 20:06:17 -0300

    fixing docs for delete_sql where quotes should be used in this example.

M	activerecord/lib/active_record/associations.rb

commit 0b151a4	refs/tags/v3.1.1.rc2
Author: Nicolás Hock Isaza 
Date:   2011-09-26 16:34:42 -0500

    Alert about the new Bundler require for asset gems
    
    If you are coming from a Rails 3.0 application, you won't have
    the correct Bundler require statement.
    
    This will cause the gems under the `assets` group not to be available
    in the development and production environment.
    
    I think this is related to the issue #39 in rails-sass
    https://github.com/rails/sass-rails/issues/39

M	railties/guides/source/asset_pipeline.textile

commit e9de9e2	refs/tags/v3.1.1.rc2
Author: Alexey Vakhov 
Date:   2011-09-26 21:52:16 +0400

    update ActionMailer example using last truncate helper method signature

M	actionmailer/lib/action_mailer/base.rb

commit ef0f6ce	refs/tags/v3.1.1.rc2
Author: Alexey Vakhov 
Date:   2011-09-26 21:46:25 +0400

    fix ActionMailer readme example

M	actionmailer/README.rdoc

commit 33b55cf	refs/heads/master
Merge: 9a7e2b8 a775853
Author: Vijay Dev 
Date:   2011-09-28 00:04:45 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit a775853	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-28 00:00:50 +0530

    copy edit d47c2c4

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 1000ada	refs/tags/v3.0.14
Merge: 378ce0e 0dd7411
Author: José Valim 
Date:   2011-09-27 00:58:18 -0700

    Merge pull request #3142 from parndt/3-0-stable
    
    Fixes #3087

commit 9a7e2b8	refs/heads/master
Merge: 01e5e2f cb5c39f
Author: José Valim 
Date:   2011-09-27 00:44:18 -0700

    Merge pull request #3141 from jsl/make_ssl_configurable
    
    Make the Rack::SSL middleware configurable

commit 0dd7411	refs/tags/v3.0.14
Author: Philip Arndt 
Date:   2011-09-27 17:35:28 +1300

    Fixes #3087 by removing autoload for non-existant DeprecatedBlockHelpers

M	actionpack/lib/action_view/helpers.rb

commit cb5c39f	refs/heads/master
Author: Justin Leitgeb 
Date:   2011-09-26 22:22:52 -0400

    Make the Rack::SSL middleware configurable

M	railties/guides/source/configuring.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/middleware_test.rb

commit 01e5e2f	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-26 18:18:52 -0700

    partial pass over the asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 9f080e4	refs/tags/v3.1.1.rc2
Author: Xavier Noria 
Date:   2011-09-26 18:18:52 -0700

    partial pass over the asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit aafd4c0	refs/heads/master
Author: Diego Plentz 
Date:   2011-09-26 20:06:17 -0300

    fixing docs for delete_sql where quotes should be used in this example.

M	activerecord/lib/active_record/associations.rb

commit 94ed1e2	refs/heads/master
Author: Nicolás Hock Isaza 
Date:   2011-09-26 16:34:42 -0500

    Alert about the new Bundler require for asset gems
    
    If you are coming from a Rails 3.0 application, you won't have
    the correct Bundler require statement.
    
    This will cause the gems under the `assets` group not to be available
    in the development and production environment.
    
    I think this is related to the issue #39 in rails-sass
    https://github.com/rails/sass-rails/issues/39

M	railties/guides/source/asset_pipeline.textile

commit 80f1d40	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-26 21:52:16 +0400

    update ActionMailer example using last truncate helper method signature

M	actionmailer/lib/action_mailer/base.rb

commit 893ee7f	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-26 21:46:25 +0400

    fix ActionMailer readme example

M	actionmailer/README.rdoc

commit 75e97a4	refs/tags/v3.1.1.rc2
Author: Jon Leighton 
Date:   2011-09-26 18:14:16 +0100

    Don't require a DB connection when setting primary key.
    
    Closes #2807.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/primary_keys_test.rb

commit b3407c8	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-26 18:14:16 +0100

    Don't require a DB connection when setting primary key.
    
    Closes #2807.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 493077c	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-26 10:02:02 -0700

    Merge pull request #3138 from christos/correct_image_path_with_pipeline
    
    Correctly override image_path in sprockets rails_helper

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit e97b6f2	refs/heads/master
Merge: cf90181 1996e93
Author: Santiago Pastorino 
Date:   2011-09-26 10:02:02 -0700

    Merge pull request #3138 from christos/correct_image_path_with_pipeline
    
    Correctly override image_path in sprockets rails_helper

commit cf90181	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-26 09:56:38 -0700

    Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile
    
    Avoid use of existing precompiled assets during rake assets:precompile run

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit b703cdb	refs/tags/v3.1.1.rc2
Merge: 6ba472c b605bd5
Author: Santiago Pastorino 
Date:   2011-09-26 09:56:38 -0700

    Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile
    
    Avoid use of existing precompiled assets during rake assets:precompile run

commit 1996e93	refs/heads/master
Author: Christos Zisopoulos 
Date:   2011-09-26 18:56:30 +0200

    Refactor image_path to use asset_path directly

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 6ba472c	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-26 13:50:20 -0300

    Copy assets to nondigested filenames too

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 17882d2	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-26 13:50:20 -0300

    Copy assets to nondigested filenames too

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit b8ea315	refs/heads/master
Author: Christos Zisopoulos 
Date:   2011-09-26 18:45:49 +0200

    Correctly override image_path in sprockets rails_helper

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit b605bd5	refs/tags/v3.1.1.rc2
Author: Guillermo Iguaran 
Date:   2011-09-25 17:59:10 -0500

    Avoid use of existing precompiled assets during rake assets:precompile run. Closes #3119

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 89e98e2	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-26 08:45:53 -0700

    Merge pull request #3030 from htanata/fix_habtm_select_query_method
    
    Fix: habtm doesn't respect select query method

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit ecf5584	refs/tags/v3.1.1.rc2
Author: Jon Leighton 
Date:   2011-09-26 16:51:49 +0100

    Add CHANGELOG

M	activerecord/CHANGELOG

commit 5767609	refs/tags/v3.1.1.rc2
Merge: ceb56f3 8dd3968
Author: Jon Leighton 
Date:   2011-09-26 08:45:53 -0700

    Merge pull request #3030 from htanata/fix_habtm_select_query_method
    
    Fix: habtm doesn't respect select query method

commit ceb56f3	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-26 12:20:52 -0300

    Just assert_equal here

M	actionpack/test/template/sprockets_helper_test.rb

commit d6cff93	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-26 12:20:52 -0300

    Just assert_equal here

M	actionpack/test/template/sprockets_helper_test.rb

commit 7e43dee	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-26 08:16:02 -0700

    Merge pull request #3135 from christos/respect_assets_digest_value
    
    Give precedence to `config.digest = false` over the existence of manifest.yml asset digests

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 2c3a507	refs/heads/master
Merge: 3b87c38 793e9da
Author: Santiago Pastorino 
Date:   2011-09-26 08:16:02 -0700

    Merge pull request #3135 from christos/respect_assets_digest_value
    
    Give precedence to `config.digest = false` over the existence of manifest.yml asset digests

commit d25bee4	refs/tags/v3.1.1.rc2
Author: Jon Leighton 
Date:   2011-09-26 15:44:32 +0100

    Forgot CHANGELOG entry.

M	activerecord/CHANGELOG

commit 4aeb7f2	refs/tags/v3.1.1.rc2
Author: Jon Leighton 
Date:   2011-09-26 15:41:31 +0100

    Fix belongs_to polymorphic with custom primary key on target.
    
    Closes #3104.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/reflection_test.rb

commit 3b87c38	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-26 15:41:31 +0100

    Fix belongs_to polymorphic with custom primary key on target.
    
    Closes #3104.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/reflection_test.rb

commit 5c0e933	refs/heads/master
Author: José Valim 
Date:   2011-09-26 16:26:04 +0200

    Encapsulate assets initialization in its own rake task.

M	actionpack/lib/sprockets/assets.rake

commit ef7de0c	refs/tags/v3.1.1.rc2
Author: José Valim 
Date:   2011-09-26 16:26:04 +0200

    Encapsulate assets initialization in its own rake task.

M	actionpack/lib/sprockets/assets.rake

commit 0cb84f1	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-26 11:20:30 -0300

    image_tag should use /assets if asset pipelining is turned on. Closes #3126

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit b855327	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-26 11:20:30 -0300

    image_tag should use /assets if asset pipelining is turned on. Closes #3126

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 6c5295f	refs/tags/v3.1.1.rc2
Author: Jon Leighton 
Date:   2011-09-26 14:15:03 +0100

    Add deprecation for the preload_associations method. Fixes #3022.

M	activerecord/lib/active_record/associations.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 793e9da	refs/heads/master
Author: Christos Zisopoulos 
Date:   2011-09-26 14:27:04 +0200

    Give precedence to `config.digest = false` over manifest.yml asset digests

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit a15424b	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-26 12:40:03 +0100

    Make serializable_hash take attr values directly from attributes hash.
    
    Previously, it would use send() to get the attribute. In Active
    Resource, this would rely on hitting method missing. If a method with
    the same name was defined further up the ancestor chain, that method
    would wrongly be called.
    
    This change fixes test_to_xml_with_private_method_name_as_attribute in
    activeresource/test/cases/base_test.rb, which was broken after
    51bef9d8fb0b4da7a104425ab8545e9331387743, because that change made
    to_xml use serializable_hash.

M	activemodel/lib/active_model/serialization.rb
M	activemodel/test/cases/serialization_test.rb
M	activeresource/test/cases/base_test.rb

commit 7d603ff	refs/tags/v3.1.1.rc2
Author: Vijay Dev 
Date:   2011-09-26 16:24:01 +0530

    remove stray line

M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 2d7dd9b	refs/tags/v3.1.1.rc2
Author: Jon Leighton 
Date:   2011-09-26 10:41:11 +0100

    CollectionProxy#replace should change the DB records rather than just mutating the array. Fixes #3020.
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit b838059	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-26 10:41:11 +0100

    CollectionProxy#replace should change the DB records rather than just mutating the array. Fixes #3020.

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 51cc6e4	refs/heads/master
Author: Chris Kimpton 
Date:   2011-09-26 09:21:12 +0200

    Fixed typo that I added - doh.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit d47c2c4	refs/heads/master
Author: Chris Kimpton 
Date:   2011-09-26 08:17:28 +0200

    Clarify that the Active Record config should just work automatically

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 4b9b2f3	refs/heads/master
Author: Chris Kimpton 
Date:   2011-09-26 08:06:41 +0200

    add some notes on setup for Active Record tests

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 541018a	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-25 23:21:31 +0530

    fix deprecation warning in cookie_store_test
    
    The options argument to MessageVerifier#initialize should be a hash.

M	actionpack/test/dispatch/session/cookie_store_test.rb

commit 6185929	refs/heads/master
Merge: 933ba0c 86cf3fb
Author: José Valim 
Date:   2011-09-25 05:26:18 -0700

    Merge pull request #3125 from dolzenko/master
    
    Implement Mime::Type#respond_to? (consistently with #method_missing) Closes #3032

commit 86cf3fb	refs/heads/master
Author: Evgeniy Dolzhenko 
Date:   2011-09-25 13:03:01 +0100

    Implement Mime::Type#respond_to? (consistently with #method_missing)

M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/test/dispatch/mime_type_test.rb

commit a61d85c	refs/tags/v3.1.1.rc2
Author: Alexey Vakhov 
Date:   2011-09-25 09:40:49 +0400

    escape options for the stylesheet_link_tag method
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 933ba0c	refs/heads/master
Merge: ef4d1ce 5ffa697
Author: José Valim 
Date:   2011-09-25 04:03:13 -0700

    Merge pull request #3124 from avakhov/patch-6-stylesheet-link
    
    escape options for the stylesheet_link_tag method

commit ef4d1ce	refs/heads/master
Merge: 6eaa9f0 038808b
Author: José Valim 
Date:   2011-09-25 04:01:37 -0700

    Merge pull request #2246 from guilleiguaran/sprockets-compressors-api
    
    Public API for add new compressors to Sprockets

commit 5ffa697	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-25 09:40:49 +0400

    escape options for the stylesheet_link_tag method

M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 038808b	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-24 18:01:08 -0500

    Add public API for register new js and css compressors for Sprockets

M	actionpack/lib/sprockets/bootstrap.rb
M	actionpack/lib/sprockets/compressors.rb
M	actionpack/lib/sprockets/railtie.rb
A	actionpack/test/template/compressors_test.rb

commit 42c2b24	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-24 14:22:44 -0700

    Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-s
    
    remove superfluous to_s in ERB::Util.html_escape

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 6eaa9f0	refs/heads/master
Merge: d54ff41 f916474
Author: Santiago Pastorino 
Date:   2011-09-24 14:22:44 -0700

    Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-s
    
    remove superfluous to_s in ERB::Util.html_escape

commit d54ff41	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-24 14:18:01 -0700

    Merge pull request #3121 from cablegram/3-1-stable
    
    Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows

M	actionpack/lib/sprockets/assets.rake

commit 6cb0d35	refs/tags/v3.1.1.rc2
Merge: 3200cd0 21f1e45
Author: Santiago Pastorino 
Date:   2011-09-24 14:18:01 -0700

    Merge pull request #3121 from cablegram/3-1-stable
    
    Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows

commit 3200cd0	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-24 01:34:49 -0300

    Revert "Make process reuse the env var passed as argument"
    
    This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd.

M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit 3de95fd	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-24 01:34:49 -0300

    Revert "Make process reuse the env var passed as argument"
    
    This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd.

M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit f916474	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-24 23:27:06 +0400

    remove superfluous to_s in ERB::Util.html_escape

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 21f1e45	refs/tags/v3.1.1.rc2
Author: cablegram 
Date:   2011-09-24 13:17:50 -0500

    Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows
    
    The Kernel.exec method launches the current program ($0) after setting some environment variables.  This current ruby script has a shebang line and no .rb in its name. Launching a script this way does not work on Windows. By using the +ruby+ method that is included in Rake, we can launch the current script with the current ruby version and bypass the identified Windows issue.

M	actionpack/lib/sprockets/assets.rake

commit e690115	refs/heads/master
Author: José Valim 
Date:   2011-09-24 03:05:36 +0200

    Avoid using pathnames and automatically create the manifest directory if one does not exist yet.

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/static_compiler.rb
M	railties/test/application/assets_test.rb

commit e9b02ae	refs/heads/master
Author: José Valim 
Date:   2011-09-24 02:40:02 +0200

    Add test for belongs_to? and group initializers.

M	railties/test/initializable_test.rb

commit 6795a9b	refs/heads/master
Author: José Valim 
Date:   2011-09-24 02:15:18 +0200

    Remove the ENV flag, yagni.

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit eb367af	refs/heads/master
Author: José Valim 
Date:   2011-09-24 01:56:49 +0200

    `rake assets:precompile` loads the application but does not initialize it.
    
    To the app developer, this means configuration add in
    config/initializers/* will not be executed.
    
    Plugins developers need to special case their initializers that are
    meant to be run in the assets group by adding :group => :assets.
    
    Conflicts:
    
    	railties/CHANGELOG
    	railties/test/application/assets_test.rb

M	actionpack/lib/sprockets/assets.rake
A	actionpack/lib/sprockets/bootstrap.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/CHANGELOG
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/initializable.rb
M	railties/test/application/assets_test.rb
M	railties/test/initializable_test.rb
M	railties/test/isolation/abstract_unit.rb

commit 7f8f1f3	refs/tags/v3.1.1.rc2
Author: José Valim 
Date:   2011-09-24 03:09:35 +0200

    Fix spacing on Gemfile.

M	railties/lib/rails/generators/app_base.rb

commit 253c0bc	refs/tags/v3.1.1.rc2
Author: José Valim 
Date:   2011-09-24 03:05:36 +0200

    Avoid using pathnames and automatically create the manifest directory if one does not exist yet.

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/static_compiler.rb
M	railties/test/application/assets_test.rb

commit 0a4b8fb	refs/tags/v3.1.1.rc2
Author: José Valim 
Date:   2011-09-24 02:40:02 +0200

    Add test for belongs_to? and group initializers.

M	railties/test/initializable_test.rb

commit 2a68867	refs/tags/v3.1.1.rc2
Author: José Valim 
Date:   2011-09-24 02:15:18 +0200

    Remove the ENV flag, yagni.

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit b479889	refs/tags/v3.1.1.rc2
Author: José Valim 
Date:   2011-09-24 01:56:49 +0200

    `rake assets:precompile` loads the application but does not initialize it.
    
    To the app developer, this means configuration add in
    config/initializers/* will not be executed.
    
    Plugins developers need to special case their initializers that are
    meant to be run in the assets group by adding :group => :assets.

M	actionpack/lib/sprockets/assets.rake
A	actionpack/lib/sprockets/bootstrap.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/CHANGELOG
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/initializable.rb
M	railties/test/application/assets_test.rb
M	railties/test/initializable_test.rb
M	railties/test/isolation/abstract_unit.rb

commit f64a352	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-23 12:07:30 -0700

    Merge pull request #3115 from guilleiguaran/refactor-rails-helpers
    
    Remove Sprockets compute_public_path, AV compute_plubic_path can be used

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 096717e	refs/heads/master
Merge: 8bde477 a29c2bf
Author: Santiago Pastorino 
Date:   2011-09-23 12:07:30 -0700

    Merge pull request #3115 from guilleiguaran/refactor-rails-helpers
    
    Remove Sprockets compute_public_path, AV compute_plubic_path can be used

commit a29c2bf	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-23 13:34:11 -0500

    Remove Sprockets compute_public_path, AV compute_public_path can be used directly

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 8bde477	refs/heads/master
Merge: 5dcb269 06634f4
Author: José Valim 
Date:   2011-09-23 10:30:15 -0700

    Merge pull request #3114 from zenprogrammer/fix_constantize_doc
    
    Minor doc fix to String#constantize

commit 06634f4	refs/heads/master
Author: Ryan Oblak 
Date:   2011-09-23 10:21:34 -0700

    Minor doc fix to String#constantize

M	activesupport/lib/active_support/core_ext/string/inflections.rb

commit d4f999f	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-23 09:34:04 -0700

    Merge pull request #3092 from asee/master
    
    Sprockets to use config.assets.prefix, with tests

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 5dcb269	refs/heads/master
Merge: 3669997 c070cc4
Author: Santiago Pastorino 
Date:   2011-09-23 09:34:04 -0700

    Merge pull request #3092 from asee/master
    
    Sprockets to use config.assets.prefix, with tests

commit 3669997	refs/heads/master
Author: José Valim 
Date:   2011-09-23 16:49:05 +0200

    Update CHANGELOG for safe_constantize.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/inflector/methods.rb

commit e8987c3	refs/heads/master
Author: José Valim 
Date:   2011-09-23 16:46:33 +0200

    Use safe_constantize where possible.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_view/test_case.rb
M	activesupport/lib/active_support/core_ext/module/reachable.rb

commit b2f34d1	refs/heads/master
Author: José Valim 
Date:   2011-09-23 16:16:53 +0200

    Ensure that constantize just rescues NameError that applies to the constant being currently loaded.

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/constantize_test_cases.rb

commit 310565f	refs/heads/master
Author: Ryan Oblak 
Date:   2011-09-22 12:17:42 -0700

    Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; refactored common constantize tests into ConstantizeTestCases

M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
A	activesupport/test/constantize_test_cases.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	activesupport/test/inflector_test.rb

commit 17ba60a	refs/heads/master
Author: Waynn Lue 
Date:   2011-09-23 00:25:37 -0700

    pluralize "locales" since that's what's used in other parts of the document, and add a missing "on"

M	railties/guides/source/i18n.textile

commit d62fc8e	refs/heads/master
Author: José Valim 
Date:   2011-09-23 00:44:55 +0200

    Update CHANGELOG.

M	actionpack/CHANGELOG

commit 48d2736	refs/heads/master
Author: José Valim 
Date:   2011-09-23 00:42:20 +0200

    Fix failing tests and add tests for :formats on partial.

M	actionpack/test/template/render_test.rb

commit 552df29	refs/heads/master
Author: Nick Sutterer 
Date:   2011-09-23 00:03:48 +0200

    Using #extract_details in PartialRenderer, too!

M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 2e3eb25	refs/heads/master
Author: Nick Sutterer 
Date:   2011-09-22 23:51:44 +0200

    Allow both sym and array for details options in #render. using LC#registered_details to extract options.

M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/template/render_test.rb

commit f8e6664	refs/heads/master
Author: Nick Sutterer 
Date:   2011-09-22 16:02:14 +0200

    added tests for render :file/:template and the :formats/:handlers/:locale options.

A	actionpack/test/fixtures/comments/empty.de.html.erb
A	actionpack/test/fixtures/comments/empty.html.builder
M	actionpack/test/template/render_test.rb

commit 4bfbdc1	refs/heads/master
Author: José Valim 
Date:   2011-09-23 00:19:46 +0200

    Refactor AMo as_json.

M	activemodel/lib/active_model/serializers/json.rb

commit c19c555	refs/heads/master
Merge: 9d46823 6e78bbe
Author: José Valim 
Date:   2011-09-22 14:24:39 -0700

    Merge pull request #3106 from mattetti/master
    
    ActiveModel JSON serialization bug fix

commit 6e78bbe	refs/heads/master
Author: Matt Aimonetti 
Date:   2011-09-22 14:05:25 -0700

    fixed a bug with the json serialization when the class setting is set to not include the root, but an instance is serialized with the root option passed as true

M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/test/cases/serializers/json_serialization_test.rb

commit 9d46823	refs/heads/master
Author: Terence Lee 
Date:   2011-09-22 12:03:59 -0500

    set env to let rails know we're precompiling

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 9eb628a	refs/tags/v3.1.1.rc2
Merge: 710a284 d123489
Author: José Valim 
Date:   2011-09-22 11:46:39 -0700

    Merge pull request #3103 from hone/precompile_flag
    
    set env to let rails and co. (read gems) know we're precompiling

commit d123489	refs/tags/v3.1.1.rc2
Author: Terence Lee 
Date:   2011-09-22 12:03:59 -0500

    set env to let rails know we're precompiling

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 1de89e5	refs/heads/master
Author: Terence Lee 
Date:   2011-09-22 12:29:46 -0500

    AR wants sqlite3 1.3.4

M	Gemfile

commit 710a284	refs/tags/v3.1.1.rc2
Merge: 1b780cc 16b8fde
Author: José Valim 
Date:   2011-09-22 10:49:44 -0700

    Merge pull request #3102 from hone/3-1-stable
    
    Bump sqlite3 in Gemfile to 1.3.4

commit c070cc4	refs/heads/master
Author: docunext 
Date:   2011-09-21 13:19:48 -0400

    Fixes #1489 again, with updated code and numerous tests to confirm

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 16b8fde	refs/tags/v3.1.1.rc2
Author: Terence Lee 
Date:   2011-09-22 12:29:46 -0500

    AR wants sqlite3 1.3.4

M	Gemfile

commit 1b780cc	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-22 14:14:24 -0300

    No need to create a range object

M	activesupport/lib/active_support/cache/file_store.rb

commit 667ef57	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-22 14:14:24 -0300

    No need to create a range object

M	activesupport/lib/active_support/cache/file_store.rb

commit 52edadf	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-22 10:03:54 -0700

    Merge pull request #3096 from phuibonhoa/master
    
    FileStore key_file_path does not properly limit filenames to 255 characters

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit 855184c	refs/heads/master
Merge: 43d27e9 a0352a4
Author: Santiago Pastorino 
Date:   2011-09-22 10:03:54 -0700

    Merge pull request #3096 from phuibonhoa/master
    
    FileStore key_file_path does not properly limit filenames to 255 characters

commit d879213	refs/tags/v3.1.1.rc2
Author: Pawel Pierzchala 
Date:   2011-09-21 18:12:55 +0200

    Fix named routes modifying arguments
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 43d27e9	refs/heads/master
Author: José Valim 
Date:   2011-09-22 15:37:38 +0200

    Deprecate passing the template handler in the template name.
    
    For example, calling hello.erb is now deprecated. Since Rails 3.0
    passing the handler had no effect whatsover. This commit simply
    deprecates such cases so we can clean up the code in later releases.

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/test/abstract/abstract_controller_test.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/controller/layout_test.rb
M	actionpack/test/controller/new_base/render_file_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/fixtures/test/_layout_with_partial_and_yield.html.erb
M	actionpack/test/template/compiled_templates_test.rb
M	actionpack/test/template/log_subscriber_test.rb
M	actionpack/test/template/render_test.rb
M	actionpack/test/template/streaming_render_test.rb

commit c3fa2e9	refs/heads/master
Author: José Valim 
Date:   2011-09-22 15:06:04 +0200

    Make handlers a registered detail.

M	actionpack/lib/action_view/lookup_context.rb

commit 119e9e2	refs/heads/master
Author: José Valim 
Date:   2011-09-22 15:03:05 +0200

    Get rid of update_details in favor of passing details to find_template.

M	actionmailer/test/mailers/base_mailer.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/test/controller/new_base/render_partial_test.rb
M	actionpack/test/controller/new_base/render_template_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/template/lookup_context_test.rb
M	actionpack/test/template/render_test.rb

commit cbaad67	refs/heads/master
Author: Nick Sutterer 
Date:   2011-09-22 11:54:13 +0200

    it is now possible to pass details options (:formats, :details, :locales, ...) to #render, #find_template and friends. this doesn't change anything in global context.

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
A	actionpack/test/fixtures/comments/empty.html.erb
A	actionpack/test/fixtures/comments/empty.xml.erb
M	actionpack/test/template/render_test.rb

commit 41bca5d	refs/heads/master
Author: Nick Sutterer 
Date:   2011-09-22 13:52:52 +0200

    Add rake test:template.

M	actionpack/Rakefile

commit 1ca3fbf	refs/heads/master
Author: José Valim 
Date:   2011-09-22 12:26:27 +0200

    No need to recalculate the @details_key after update_details.

M	actionpack/lib/action_view/lookup_context.rb

commit 8de0bbe	refs/heads/master
Merge: 2bf33bd 019eea4
Author: José Valim 
Date:   2011-09-22 02:56:00 -0700

    Merge pull request #3099 from wrozka/master
    
    Named routes are modifying passed options

commit 019eea4	refs/heads/master
Author: Pawel Pierzchala 
Date:   2011-09-21 18:12:55 +0200

    Fix named routes modifying arguments

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit a58fcd9	refs/heads/master
Author: Nat Welch 
Date:   2011-09-21 23:59:22 -0700

    Not checking for nil is apparently a lot faster.

M	activerecord/lib/active_record/schema_dumper.rb

commit 667d218	refs/heads/master
Merge: f690367 2bf33bd
Author: Nat Welch 
Date:   2011-09-21 23:53:18 -0700

    Merge branch 'master' of git://github.com/rails/rails

commit a0352a4	refs/heads/master
Author: Philippe Huibonhoa 
Date:   2011-09-21 21:03:59 -0700

    Updated existing test that fails with this fix (8d63678d1406c5518d437709af0fde717c0248d7).  Before the fix the test was giving a false positive, because file_store.key_file_path would return an empty filename (i.e. test/tmp_cache/4D0/F4D rather than test/tmp_cache/4D0/F4D/xxxx…).
    
    Even though the fix referenced above divides the filename into directories to prevent it from being too long, it seems that 1000 characters will always raise an error, so reducing the key size to 900).

M	activesupport/test/caching_test.rb

commit 8d63678	refs/heads/master
Author: Philippe Huibonhoa 
Date:   2011-09-21 21:00:46 -0700

    Fixed issue in file store where it could create a filename that was too long for the file system.  (https://github.com/rails/rails/issues/3072)

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit 49584b2	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-21 18:25:40 -0700

    Merge pull request #3027 from alex3/assets-precompile-regex-fix
    
    Default precompile regex was erroneously matching files

M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit 2bf33bd	refs/heads/master
Merge: 676ddfc 6e63e02
Author: Santiago Pastorino 
Date:   2011-09-21 18:25:40 -0700

    Merge pull request #3027 from alex3/assets-precompile-regex-fix
    
    Default precompile regex was erroneously matching files

commit 40a574f	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-21 17:21:44 -0700

    Merge pull request #3081 from guilleiguaran/move-precompile-to-class
    
    Move precompiling from task to Sprockets::StaticCompiler

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
A	actionpack/lib/sprockets/static_compiler.rb

commit 676ddfc	refs/heads/master
Merge: 007f567 857d20e
Author: Santiago Pastorino 
Date:   2011-09-21 17:21:44 -0700

    Merge pull request #3081 from guilleiguaran/move-precompile-to-class
    
    Move precompiling from task to Sprockets::StaticCompiler

commit efb8a7a	refs/heads/master
Author: Christopher Arrowsmith 
Date:   2011-09-22 01:18:22 +0100

    Changed "en-UK" to "en-GB"
    
    Signed-off-by: Christopher Arrowsmith 

M	railties/guides/source/i18n.textile

commit ed96ee5	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-21 20:51:30 -0300

    Add jquery-rails to Gemfile of plugins, test/dummy app uses it.
    Closes #3091

M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile

commit 007f567	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-21 20:51:30 -0300

    Add jquery-rails to Gemfile of plugins, test/dummy app uses it.
    Closes #3091

M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile

commit f373f29	refs/heads/master
Author: José Valim 
Date:   2011-09-21 15:28:05 -0700

    Slightly reorganize lookup context modules in order to better isolate cache responsibilities.

M	actionpack/lib/action_view/lookup_context.rb

commit 8aa537c	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-22 02:13:04 +0530

    fix incorrect comment

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 03d3063	refs/tags/v3.1.1.rc2
Author: Vijay Dev 
Date:   2011-09-20 19:47:33 +0530

    copy edits 302e5707

M	railties/guides/source/i18n.textile

commit caf42a8	refs/tags/v3.1.1.rc2
Author: Vijay Dev 
Date:   2011-09-20 19:39:46 +0530

    copy edits 908f2616

M	activerecord/lib/active_record/relation/query_methods.rb

commit f289404	refs/tags/v3.1.1.rc2
Author: Vijay Dev 
Date:   2011-09-20 19:33:01 +0530

    remove unnecessary markup

M	railties/guides/source/active_support_core_extensions.textile

commit 5deb664	refs/tags/v3.1.1.rc2
Author: Jan Vlnas 
Date:   2011-09-18 16:41:21 +0300

    Locale code for Czech is ":cs"

M	railties/guides/source/i18n.textile

commit c7ed6f3	refs/tags/v3.1.1.rc2
Author: Ryan Bigg 
Date:   2011-09-14 18:53:08 +1000

    Document ActiveRecord::QueryMethods#select

M	activerecord/lib/active_record/relation/query_methods.rb

commit a8501c1	refs/tags/v3.1.1.rc2
Author: Uģis Ozols 
Date:   2011-09-17 10:00:53 +0300

    sass-rails helpers - hyphenated in Sass, underscored in Ruby.

M	railties/guides/source/asset_pipeline.textile

commit cde34fb	refs/tags/v3.1.1.rc2
Author: Vijay Dev 
Date:   2011-09-16 22:12:41 +0530

    Fixing incorrect notextile tags

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/api_documentation_guidelines.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/ruby_on_rails_guides_guidelines.textile
M	railties/guides/source/security.textile

commit e3b1d9a	refs/tags/v3.1.1.rc2
Author: Vijay Dev 
Date:   2011-09-16 23:22:03 +0530

    minor edit

M	railties/guides/source/asset_pipeline.textile

commit 6867150	refs/tags/v3.1.1.rc2
Author: Kir Shatrov 
Date:   2011-09-16 17:43:05 +0400

    "Passing variables into the translation" section added

M	railties/guides/source/i18n.textile

commit ce758e2	refs/tags/v3.1.1.rc2
Author: Guillermo Iguaran 
Date:   2011-09-15 20:07:01 -0500

    Add reference about --skip-sprockets to Asset Pipeline Guide

M	railties/guides/source/asset_pipeline.textile

commit bcbc484	refs/tags/v3.1.1.rc2
Author: Alexey Vakhov 
Date:   2011-09-15 10:41:55 +0400

    update guides, use html safe translations in i18n

A	railties/guides/assets/images/i18n/demo_html_safe.png
M	railties/guides/source/i18n.textile

commit caa95ab	refs/heads/master
Merge: 95646f4 3e80462
Author: Vijay Dev 
Date:   2011-09-21 19:35:09 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 3e80462	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-21 19:28:36 +0530

    Revert "add a missing "on" and remove the "endprologue" text"
    
    This reverts commit 3c5340ec9cbf12d19e734289ba748186af492d60.
    
    Reason: endprologue should not have been removed.

M	railties/guides/source/i18n.textile

commit 8d7aee7	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-21 02:19:44 +0530

    indentation fixes

M	railties/guides/source/active_support_core_extensions.textile

commit 3c5340e	refs/heads/master
Author: Waynn Lue 
Date:   2011-09-21 02:10:07 -0700

    add a missing "on" and remove the "endprologue" text

M	railties/guides/source/i18n.textile

commit 564d7ed	refs/heads/master
Author: Waynn Lue 
Date:   2011-09-21 01:28:59 -0700

    add a '.' to etc

M	railties/guides/source/i18n.textile

commit 952bccd	refs/heads/master
Author: Waynn Lue 
Date:   2011-09-21 01:23:58 -0700

    add "the" to mirror the structure of the other two points

M	railties/README.rdoc

commit 4e37995	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-20 20:57:41 -0700

    Merge pull request #3065 from brainopia/fix_to_param_test
    
    Fix test to reflect use of to_param for keys

M	activesupport/test/core_ext/hash_ext_test.rb

commit 95646f4	refs/heads/master
Merge: 7dbf696 8e3d267
Author: Santiago Pastorino 
Date:   2011-09-20 20:57:41 -0700

    Merge pull request #3065 from brainopia/fix_to_param_test
    
    Fix test to reflect use of to_param for keys

commit 857d20e	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-20 02:12:29 -0500

    Move precompile task to Sprockets::StaticCompiler

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
A	actionpack/lib/sprockets/static_compiler.rb

commit 21d27f6	refs/heads/master
Author: Esad Hajdarevic 
Date:   2011-09-20 23:02:02 +0200

    Add a missing require for 'active_support/deprecation' in Module#deprecate

M	activesupport/lib/active_support/core_ext/module/deprecation.rb

commit 5684ecf	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-20 19:47:33 +0530

    copy edits 302e5707

M	railties/guides/source/i18n.textile

commit ed1ada8	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-20 19:39:46 +0530

    copy edits 908f2616

M	activerecord/lib/active_record/relation/query_methods.rb

commit 7ed97bc	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-20 19:33:01 +0530

    remove unnecessary markup

M	railties/guides/source/active_support_core_extensions.textile

commit af46454	refs/tags/v3.1.1.rc2
Merge: 081d41a 2d4ac4f
Author: Santiago Pastorino 
Date:   2011-09-19 12:45:54 -0700

    Merge pull request #3060 from arunagw/query_cache_test_3-1-stable
    
    Query cache test 3 1 stable

commit 7dbf696	refs/heads/master
Merge: 51bef9d d589d9f
Author: Santiago Pastorino 
Date:   2011-09-19 12:35:18 -0700

    Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_test
    
    fix test error when running with postgresql.

commit 8e3d267	refs/heads/master
Author: brainopia 
Date:   2011-09-18 23:37:27 +0400

    Fix test to reflect use of to_param for keys

M	activesupport/test/core_ext/hash_ext_test.rb

commit 2d4ac4f	refs/tags/v3.1.1.rc2
Author: Arun Agrawal 
Date:   2011-09-18 09:06:43 +0530

    fixed test for JRuby.
    for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION

M	activerecord/test/cases/query_cache_test.rb

commit d589d9f	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-18 23:20:09 +0530

    fix test error when running with postgresql.
    This Sqlite3 should be in if block.
    Was giving error because sqlite3 is not loaded

M	activerecord/test/cases/query_cache_test.rb

commit 51bef9d	refs/heads/master
Author: José Valim 
Date:   2011-09-18 09:09:01 -0700

    to_xml should also rely on serializable hash.

M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/test/cases/serializers/xml_serialization_test.rb
M	activerecord/lib/active_record/serializers/xml_serializer.rb

commit ea29968	refs/heads/master
Author: Jan Vlnas 
Date:   2011-09-18 16:41:21 +0300

    Locale code for Czech is ":cs"

M	railties/guides/source/i18n.textile

commit 081d41a	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-17 17:15:33 -0700

    Merge pull request #3049 from brainopia/fix_to_query_edge_case
    
    Fix Hash#to_query edge case with html_safe string on 1.8 ruby

M	activesupport/lib/active_support/core_ext/object/to_query.rb
M	activesupport/test/core_ext/object/to_query_test.rb

commit cb0dbe3	refs/heads/master
Merge: 364879c 3a04e37
Author: Santiago Pastorino 
Date:   2011-09-17 17:15:33 -0700

    Merge pull request #3049 from brainopia/fix_to_query_edge_case
    
    Fix Hash#to_query edge case with html_safe string on 1.8 ruby

commit 364879c	refs/heads/master
Merge: 03346df b2bf725
Author: Santiago Pastorino 
Date:   2011-09-17 17:12:48 -0700

    Merge pull request #3057 from arunagw/arjdbc_bump_master
    
    Bump AR-JDBC version.

commit df97bf5	refs/tags/v3.1.1.rc2
Merge: 12d4514 4d2089c
Author: Santiago Pastorino 
Date:   2011-09-17 17:11:56 -0700

    Merge pull request #3056 from arunagw/arjdbc_bump
    
    Arjdbc bump

commit 03346df	refs/heads/master
Merge: 1811679 afa78fe
Author: Santiago Pastorino 
Date:   2011-09-17 17:07:31 -0700

    Merge pull request #3058 from arunagw/jruby_query_cache_test
    
    Fixed test for JRuby.

commit 908f261	refs/heads/master
Author: Ryan Bigg 
Date:   2011-09-14 18:53:08 +1000

    Document ActiveRecord::QueryMethods#select

M	activerecord/lib/active_record/relation/query_methods.rb

commit afa78fe	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-18 00:23:48 +0530

    Fixed test for JRuby.
    for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION

M	activerecord/test/cases/query_cache_test.rb

commit b2bf725	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-17 18:39:30 +0530

    Bump AR-JDBC version.
    THis version is compatible with 3.1 and above

M	Gemfile

commit 4d2089c	refs/tags/v3.1.1.rc2
Author: Arun Agrawal 
Date:   2011-09-17 18:37:00 +0530

    Bump AR-JDBC version.
    THis version is compatible with 3.1 and above

M	Gemfile

commit 6630318	refs/heads/master
Author: Uģis Ozols 
Date:   2011-09-17 10:00:53 +0300

    sass-rails helpers - hyphenated in Sass, underscored in Ruby.

M	railties/guides/source/asset_pipeline.textile

commit 12d4514	refs/tags/v3.1.1.rc2
Author: Andrew White 
Date:   2011-09-17 07:26:35 +0100

    Revert "Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested."
    
    This reverts commit 99f59f9be4ad9aab3eb9b77a2dce5279aa5f31cb.

M	railties/guides/source/asset_pipeline.textile

commit 99f59f9	refs/tags/v3.1.1.rc2
Author: Marcus Ilgner 
Date:   2011-09-06 16:27:26 +0200

    Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested.
    (cherry picked from commit 5e2bf4de62014820798b271e97fa010ddc1a7e02)
    
    Signed-off-by: Andrew White 

M	railties/guides/source/asset_pipeline.textile

commit 6e63e02	refs/heads/master
Author: Alex Yakoubian 
Date:   2011-09-14 23:14:23 -0700

    Default precompile regexp that properly matches application.js and application.css

M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit 12a7dc4	refs/tags/v3.1.1.rc2
Author: Santiago Pastorino 
Date:   2011-09-16 17:25:40 -0700

    Proper lines numbers for stack trace info

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 1811679	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-16 17:25:40 -0700

    Proper lines numbers for stack trace info

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 3a04e37	refs/heads/master
Author: brainopia 
Date:   2011-09-16 22:59:16 +0400

    Fix Hash#to_query edge case with html_safe string on 1.8 ruby

M	activesupport/lib/active_support/core_ext/object/to_query.rb
M	activesupport/test/core_ext/object/to_query_test.rb

commit 27f1320	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-16 22:12:41 +0530

    Fixing incorrect notextile tags

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/api_documentation_guidelines.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/ruby_on_rails_guides_guidelines.textile
M	railties/guides/source/security.textile

commit 8411f63	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-16 23:22:03 +0530

    minor edit

M	railties/guides/source/asset_pipeline.textile

commit e314b3f	refs/heads/master
Merge: d5bf12a b0ae34a
Author: Vijay Dev 
Date:   2011-09-16 10:41:18 -0700

    Merge pull request #3048 from masterkain/patch-2
    
    Fix typo in deprecation notice

commit b0ae34a	refs/heads/master
Author: Claudio Poli 
Date:   2011-09-16 19:54:48 +0300

    Fix typo in deprecation notice

M	activesupport/lib/active_support/message_verifier.rb

commit b09b2a8	refs/heads/master
Author: Denis Odorcic 
Date:   2011-09-16 11:04:12 -0400

    Fix ActiveResource JSON error parser and incorrect tests

M	activeresource/lib/active_resource/validations.rb
M	activeresource/test/cases/base_errors_test.rb

commit 6dae0ab	refs/tags/v3.1.1.rc2
Author: José Valim 
Date:   2011-09-15 18:08:42 -0700

    Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-precompile
    
    config.action_controller.asset_host shouldn't set to nil during precompile

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 9f0db93	refs/heads/master
Merge: 2867701 302e570
Author: Kir Shatrov 
Date:   2011-09-16 06:44:04 -0700

    Merge pull request #68 from kirs/master
    
    Paragraph about using variables in I18n translations was added to I18n Guide

commit 302e570	refs/heads/master
Author: Kir Shatrov 
Date:   2011-09-16 17:43:05 +0400

    "Passing variables into the translation" section added

M	railties/guides/source/i18n.textile

commit d5bf12a	refs/heads/master
Merge: 79c7f23 c9aac2a
Author: Vijay Dev 
Date:   2011-09-16 06:17:15 -0700

    Merge pull request #3042 from splattael/patch-1
    
    Fix typo in deprecation warning.

commit c9aac2a	refs/heads/master
Author: Peter Suschlik 
Date:   2011-09-16 09:08:53 +0300

    Fix typo in deprecation warning.

M	activesupport/lib/active_support/message_encryptor.rb

commit 79c7f23	refs/heads/master
Merge: 8a32a58 b50394b
Author: José Valim 
Date:   2011-09-15 18:08:42 -0700

    Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-precompile
    
    config.action_controller.asset_host shouldn't set to nil during precompile

commit 2867701	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-15 20:07:01 -0500

    Add reference about --skip-sprockets to Asset Pipeline Guide

M	railties/guides/source/asset_pipeline.textile

commit b50394b	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-15 19:55:52 -0500

    config.action_controller.asset_host shouldn't set to nil during precompile

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 8a32a58	refs/heads/master
Merge: 28300f4 6d52080
Author: José Valim 
Date:   2011-09-15 13:22:05 -0700

    Merge pull request #3037 from wvanbergen/master
    
    MessageVerifier: set serializer and crypto algorithm using an option hash

commit 06b5182	refs/tags/v3.1.1.rc2
Merge: 3f9665b 5b20d4c
Author: Jon Leighton 
Date:   2011-09-15 13:15:09 -0700

    Merge pull request #3036 from dmathieu/cherry-pick-1318
    
    Cherry pick 1318

commit 5b20d4c	refs/tags/v3.1.1.rc2
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-15 22:00:43 +0200

    cherry-pick #1318 into 3-1-stable

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb

commit 6d52080	refs/heads/master
Author: Willem van Bergen 
Date:   2011-09-15 15:51:30 -0400

    Test deprecation warning when not using an options hash as second parameter.

M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/message_verifier_test.rb

commit 41fea03	refs/heads/master
Author: Willem van Bergen 
Date:   2011-09-15 14:27:12 -0400

    Use an options hash to specify digest/cipher algorithm and a serializer for MessageVerifier and MessageEncryptor.

M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/message_verifier_test.rb

commit 28300f4	refs/heads/master
Merge: 06c3ca8 2d30d4c
Author: José Valim 
Date:   2011-09-15 10:50:19 -0700

    Merge pull request #3035 from wvanbergen/master
    
    Make API for custom message serializers nicer.

commit 2d30d4c	refs/heads/master
Author: Willem van Bergen 
Date:   2011-09-15 13:23:08 -0400

    Add some documentation for the new serializer property of MessageVerifier and MessageEncryptor.

M	activesupport/lib/active_support/message_verifier.rb

commit db040cd	refs/heads/master
Author: Willem van Bergen 
Date:   2011-09-15 13:15:21 -0400

    Implement API suggestions of pull request.

M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/message_verifier_test.rb

commit 06c3ca8	refs/heads/master
Merge: da7f042 a8aaef6
Author: José Valim 
Date:   2011-09-15 09:14:16 -0700

    Merge pull request #3031 from wvanbergen/master
    
    Custom serializers and deserializers in MessageVerifier and MessageEncryptor.

commit a8aaef6	refs/heads/master
Author: Willem van Bergen 
Date:   2011-09-15 09:50:39 -0400

    Fixed tests so that they will also run properly in other timezones.

M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/message_verifier_test.rb

commit bffaa88	refs/heads/master
Author: Willem van Bergen 
Date:   2011-09-15 08:28:53 -0400

    Custom serializers and deserializers in MessageVerifier and MessageEncryptor.
    
    By default, these classes use Marshal for serializing and deserializing messages. Unfortunately, the Marshal format is closely associated with Ruby internals and even changes between different interpreters. This makes the resulting message very hard to impossible to unserialize messages generated by these classes in other environments like node.js.
    
    This patch solves this by allowing you to set your own custom serializer and deserializer lambda functions. By default, it still uses Marshal to be backwards compatible.

M	activesupport/lib/active_support/message_encryptor.rb
M	activesupport/lib/active_support/message_verifier.rb
M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/message_verifier_test.rb

commit 8dd3968	refs/tags/v3.1.1.rc2
Author: Hendy Tanata 
Date:   2011-09-15 19:16:42 +0800

    Fix: habtm doesn't respect select query method.
    
    Patch for issue #2923.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 9d54f89	refs/heads/master
Merge: edd2f21 da7f042
Author: Dmitry Polushkin 
Date:   2011-09-15 09:39:26 +0100

    Merge branch 'master' of git://github.com/rails/rails

commit 7531aa7	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-15 10:41:55 +0400

    update guides, use html safe translations in i18n

A	railties/guides/assets/images/i18n/demo_html_safe.png
M	railties/guides/source/i18n.textile

commit 3f9665b	refs/tags/v3.1.1.rc1 (tag: v3.1.1.rc1)
Author: Santiago Pastorino 
Date:   2011-09-14 16:01:48 -0700

    Bumping up to 3.1.1.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit ae6c555	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-14 16:25:01 -0700

    Add some CHANGELOG missing stuff

M	actionmailer/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	railties/CHANGELOG

commit 64de4dd	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-14 14:47:49 -0700

    Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit da7f042	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-14 14:47:49 -0700

    Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 9a2fa21	refs/tags/v3.1.1.rc1
Author: Ben Walding 
Date:   2011-09-14 15:27:38 +1000

    Add equivalent nginx configuration

M	railties/guides/source/asset_pipeline.textile

commit e20d761	refs/tags/v3.1.1.rc1
Author: Jaime Iniesta 
Date:   2011-09-14 00:09:59 +0200

    Fix typos and broken link on asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 49476ee	refs/heads/master
Merge: 823e16f 9980f46
Author: Vijay Dev 
Date:   2011-09-15 00:32:52 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 9980f46	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-15 00:13:29 +0530

    No more changelogs inside guides

M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_model_basics.textile
M	railties/guides/source/active_record_querying.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_resource_basics.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/api_documentation_guidelines.textile
M	railties/guides/source/association_basics.textile
M	railties/guides/source/caching_with_rails.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/debugging_rails_applications.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/layouts_and_rendering.textile
M	railties/guides/source/migrations.textile
M	railties/guides/source/performance_testing.textile
M	railties/guides/source/plugins.textile
M	railties/guides/source/rails_application_templates.textile
M	railties/guides/source/rails_on_rack.textile
M	railties/guides/source/routing.textile
M	railties/guides/source/ruby_on_rails_guides_guidelines.textile
M	railties/guides/source/security.textile
M	railties/guides/source/testing.textile

commit 5f2a356	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-14 23:39:55 +0530

    Mention that old fixes are to be done on 3-0-stable

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit dcd7077	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-14 23:15:18 +0530

    minor edit

M	activerecord/lib/active_record/relation/query_methods.rb

commit 5e1285d	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-14 23:05:29 +0530

    change first_or_new to first_or_initialize as per 11870117, and some edits

M	railties/guides/source/active_record_querying.textile

commit 823e16f	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-14 22:46:12 +0530

    update 3.1 release date in changelogs

M	actionmailer/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit bc05850	refs/heads/master
Author: Dallas Reedy 
Date:   2011-09-14 09:32:27 -0700

    forgot to sign my name to the Changelog

M	railties/guides/source/association_basics.textile

commit 499ea51	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-09-14 05:26:53 -0700

    Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompile
    
    Clear cache before of each precompile to avoid inconsistencies. Fixes #3014

M	actionpack/lib/sprockets/assets.rake

commit c7835c5	refs/heads/master
Author: Dallas Reedy 
Date:   2011-09-13 16:32:43 -0700

    Removed mention of deprecated proxy methods in favor of using proxy_association.

M	railties/guides/source/association_basics.textile

commit 7302e1c	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-14 19:02:08 +0530

    remove info about guides hackfest

M	railties/guides/source/index.html.erb

commit 63f6fad	refs/heads/master
Merge: 425362d 9c7e885
Author: José Valim 
Date:   2011-09-14 05:26:53 -0700

    Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompile
    
    Clear cache before of each precompile to avoid inconsistencies. Fixes #3014

commit 511070f	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-14 00:58:44 -0700

    Merge pull request #3012 from guilleiguaran/3-1-1-changelogs
    
    Add missing changelog entries for actionpack

M	actionpack/CHANGELOG

commit 425362d	refs/heads/master
Merge: 0d48b3a fae70cb
Author: Santiago Pastorino 
Date:   2011-09-14 00:58:44 -0700

    Merge pull request #3012 from guilleiguaran/3-1-1-changelogs
    
    Add missing changelog entries for actionpack

commit f85cd49	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-14 00:29:03 -0700

    Revert "Provide a way to access to assets without using the digest, useful for static files and emails"
    
    This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db.

M	actionpack/lib/sprockets/assets.rake
M	railties/CHANGELOG
M	railties/test/application/assets_test.rb

commit 0d48b3a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-14 00:29:03 -0700

    Revert "Provide a way to access to assets without using the digest, useful for static files and emails"
    
    This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db.

M	actionpack/lib/sprockets/assets.rake
M	railties/CHANGELOG
M	railties/test/application/assets_test.rb

commit 5f28c22	refs/heads/master
Merge: 410b0ec 6c43532
Author: Santiago Pastorino 
Date:   2011-09-14 00:27:45 -0700

    Merge pull request #2964 from msgehard/silence_warnings
    
    Silence Ruby warnings about uninitialized instance variable.

commit b3ff720	refs/heads/master
Author: Ben Walding 
Date:   2011-09-14 15:27:38 +1000

    Add equivalent nginx configuration

M	railties/guides/source/asset_pipeline.textile

commit 9c7e885	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-13 22:05:46 -0500

    Clear cache before of each precompile to avoid inconsistencies. Fixes #3014

M	actionpack/lib/sprockets/assets.rake

commit fae70cb	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-13 19:40:47 -0500

    Add missing changelog entries for actionpack

M	actionpack/CHANGELOG

commit 681c4db	refs/heads/master
Author: Ryan Bigg 
Date:   2011-09-14 09:43:31 +1000

    Add documentation for the extending method in ActiveRecord:QueryMethods

M	activerecord/lib/active_record/relation/query_methods.rb

commit 058593d	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-13 16:40:53 -0700

    Merge pull request #3011 from guilleiguaran/disable-sprockets-server
    
    Don't mount Sprockets if config.assets.compile is disabled

M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit 410b0ec	refs/heads/master
Merge: 3b8a7cf a89d39e
Author: Santiago Pastorino 
Date:   2011-09-13 16:40:53 -0700

    Merge pull request #3011 from guilleiguaran/disable-sprockets-server
    
    Don't mount Sprockets if config.assets.compile is disabled

commit a89d39e	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-13 18:36:38 -0500

    Fix broken asset test

M	railties/test/application/assets_test.rb

commit f22407d	refs/heads/master
Author: Mark J. Titorenko 
Date:   2011-09-06 10:34:24 +0100

    Don't mount Sprockets at config.assets.prefix if config.assets.compile is false.

M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit 3b8a7cf	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-13 23:52:38 +0100

    Stop trying to be clever about when to define attribute methods.
    
    There is no meaningful performance penalty in defining attribute
    methods, since it only happens once.
    
    There is also no reason *not* to define them, since they get thrown in
    an included module, so they will not 'overwrite' anything. In fact, this
    is desirable, since it allows us to call super.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 778c82b	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-13 23:46:43 +0100

    Generate attribute method unless it's already in the module.
    
    There's no harm in generating a method name that's already defined on
    the host class, since we're generating the attribute methods in a module
    that gets included. In fact, this is desirable as it allows the host
    class to call super.

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 55da28d	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-13 23:23:29 +0100

    We don't need to build a set for DangerousAttributeError.
    
    We can just use method_defined? and private_method_defined?

M	activerecord/lib/active_record/attribute_methods.rb

commit 65cf784	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-13 15:16:53 -0700

    Provide a way to access to assets without using the digest, useful for static files and emails

M	actionpack/lib/sprockets/assets.rake
M	railties/CHANGELOG
M	railties/test/application/assets_test.rb

commit 82afaa0	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-13 15:16:53 -0700

    Provide a way to access to assets without using the digest, useful for static files and emails

M	actionpack/lib/sprockets/assets.rake
M	railties/CHANGELOG
M	railties/test/application/assets_test.rb

commit bde113a	refs/heads/master
Author: Jaime Iniesta 
Date:   2011-09-14 00:09:59 +0200

    Fix typos and broken link on asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 3777d42	refs/heads/master
Author: Erik Behrends 
Date:   2011-09-13 22:42:39 +0300

    [:class_name] option in belongs_to should mention belongs_to and not has_one

M	activerecord/lib/active_record/associations.rb

commit 1187011	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-13 19:09:01 +0100

    Rename first_or_new to first_or_initialize.
    
    For consistency with find_or_initialize_by. Also remove first_or_build
    alias.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/relations_test.rb

commit 7ee8be5	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-07 13:41:49 -0700

    Merge pull request #2922 from wayneeseguin/master
    
    Include ActiveRecord SQLServer Adapter by @metaskills in new application generator.

M	railties/lib/rails/generators/app_base.rb

commit f74a4d8	refs/tags/v3.1.1.rc1
Author: dharmatech 
Date:   2011-09-12 15:55:01 -0500

    getting_started.textile: Fix typo and split up a sentence in section "Building a Multi-Model Form"

M	railties/guides/source/getting_started.textile

commit fbde94a	refs/tags/v3.1.1.rc1
Author: dharmatech 
Date:   2011-09-12 12:05:15 -0500

    getting_started.textile: Fix typos in section "Rendering a Partial Form"

M	railties/guides/source/getting_started.textile

commit e66dd14	refs/tags/v3.1.1.rc1
Author: Semyon Perepelitsa 
Date:   2011-09-12 20:53:10 +0400

    Fix a typo in date

M	activesupport/lib/active_support/time_with_zone.rb

commit c3751a4	refs/tags/v3.1.1.rc1
Author: Alan Zeino 
Date:   2011-09-12 11:12:09 +1000

    Slight change to reflect current 'destroy' code generated by scaffold in 3.1 release.

M	railties/guides/source/getting_started.textile

commit 4e4783f	refs/tags/v3.1.1.rc1
Author: Mike Gunderloy 
Date:   2011-09-13 06:47:13 -0500

    Fix typo

M	railties/guides/source/rails_on_rack.textile

commit 59ba0dd	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-09-12 23:25:33 +0530

    Delete contribute.textile now that its contents are merged to the contributing_to_ruby_on_rails guide

D	railties/guides/source/contribute.textile

commit 01378f3	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-09-12 23:24:14 +0530

    change GH issue tracker url

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 330d426	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-09-11 19:44:42 +0530

    merged the contribution guides and changed the
    link in the layout accordingly

M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/layout.html.erb

commit d3baa92	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-13 18:46:34 +0530

    delete stray backup files from guides sample app

D	railties/guides/code/getting_started/app/views/home/index.html.erb~
D	railties/guides/code/getting_started/config/routes.rb~

commit 23fc5fe	refs/heads/master
Merge: ae04fbf 7b22b01
Author: Vijay Dev 
Date:   2011-09-13 18:39:36 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 7b22b01	refs/heads/master
Author: 45north 
Date:   2011-09-13 15:25:46 +0300

    Fixed markup error.

M	railties/guides/source/initialization.textile

commit 317ad8c	refs/heads/master
Author: Mike Gunderloy 
Date:   2011-09-13 06:47:13 -0500

    Fix typo

M	railties/guides/source/rails_on_rack.textile

commit a244ad4	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-13 02:45:05 -0700

    Fix asset_path relative_url_root method

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit ae04fbf	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-13 02:45:05 -0700

    Fix asset_path relative_url_root method

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 874e012	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-13 02:41:27 -0700

    Merge pull request #3001 from guilleiguaran/fix-assets-precompile-host-test
    
    Fix precompile asset_host test

M	railties/test/application/assets_test.rb

commit 60fd88d	refs/heads/master
Merge: 8a005ff a65010f
Author: Santiago Pastorino 
Date:   2011-09-13 02:41:27 -0700

    Merge pull request #3001 from guilleiguaran/fix-assets-precompile-host-test
    
    Fix precompile asset_host test

commit a65010f	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-13 04:35:12 -0500

    Fix precompile asset_host test

M	railties/test/application/assets_test.rb

commit bb93687	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-13 02:29:33 -0700

    Merge pull request #3000 from guilleiguaran/fix-relative-url-root
    
    Fix for relative url root in assets

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 8a005ff	refs/heads/master
Merge: 536bb7b f509b69
Author: Santiago Pastorino 
Date:   2011-09-13 02:29:33 -0700

    Merge pull request #3000 from guilleiguaran/fix-relative-url-root
    
    Fix for relative url root in assets

commit f509b69	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-13 04:27:30 -0500

    Fix for relative url root in assets

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit ecf38fe	refs/tags/v3.1.1.rc1
Merge: f79fac5 3d042fa
Author: Santiago Pastorino 
Date:   2011-09-13 01:48:15 -0700

    Merge pull request #2997 from guilleiguaran/move-assets-test-3-1-stable
    
    Backport e767cda (move assets tests to assets_test file) to 3-1-stable

commit 3d042fa	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-13 03:35:33 -0500

    Backport e767cda6ea17 (move assets tests to assets_test file)

M	railties/test/application/assets_test.rb
M	railties/test/application/rake_test.rb

commit 536bb7b	refs/heads/master
Merge: 5bad79d e767cda
Author: Santiago Pastorino 
Date:   2011-09-13 01:27:58 -0700

    Merge pull request #2996 from guilleiguaran/move-assets-tests
    
    Move asset tests to assets_test file

commit e767cda	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-13 03:19:02 -0500

    Move asset tests to assets_test file

M	railties/test/application/assets_test.rb
M	railties/test/application/rake_test.rb

commit f79fac5	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-13 00:27:29 -0700

    always rewrite_relative_url_root

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 5bad79d	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-13 00:27:29 -0700

    always rewrite_relative_url_root

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit c289dea	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-12 23:25:28 -0700

    Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets

M	actionpack/CHANGELOG
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit f1c3903	refs/heads/master
Merge: b0cee70 73e8dd1
Author: Santiago Pastorino 
Date:   2011-09-12 23:51:23 -0700

    Merge pull request #2993 from deepakprasanna/generator_test_fix
    
    fixed the failing generators_test in railties.

commit 73e8dd1	refs/heads/master
Author: Deepak Prasanna 
Date:   2011-09-13 11:59:40 +0530

    fixed the failing generators_test

M	railties/test/railties/generators_test.rb

commit b0cee70	refs/heads/master
Merge: 038e45a 9279d11
Author: Santiago Pastorino 
Date:   2011-09-12 23:25:28 -0700

    Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets
    
    Set relative url root in assets when controller isn't available for Sprockets

commit 8c3f6f6	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-12 23:04:14 -0700

    Merge pull request #2987 from kennyj/master

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/rake_test.rb

commit 038e45a	refs/heads/master
Merge: f65b221 21eaba4
Author: Santiago Pastorino 
Date:   2011-09-12 23:04:14 -0700

    Merge pull request #2987 from kennyj/master
    
    fix https://github.com/rails/rails/issues/2947 (with testcase)

commit 9279d11	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-11 01:38:55 -0500

    Set relative url root in assets when controller isn't available for Sprockets. Fix #2435
    
    See https://github.com/rails/sass-rails/issues/42 for details

M	actionpack/CHANGELOG
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit f65b221	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-12 16:50:25 -0700

    removing backwards compatibility module

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 68ec26c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-12 16:49:36 -0700

    point rails at Journey for dev and edge

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb

commit ea7ef95	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-12 16:30:54 -0700

    partially expand the parameters to `match`

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit ad1a891	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-12 16:11:55 -0700

    unfactor the Route class to private factory methods

D	actionpack/lib/action_dispatch/routing/route.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 943aa82	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-12 15:48:03 -0700

    reduce dependencies of external objects in the Route class

M	actionpack/lib/action_dispatch/routing/route.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb

commit f5ab680	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-11 17:52:19 -0700

    delete unused code, pass path explicitly to journey

M	actionpack/lib/action_dispatch/routing/route.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb

commit d21e0e2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-11 17:14:42 -0700

    adjust route inspection to work with Journey

M	railties/lib/rails/application/route_inspector.rb

commit a08bee7	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-11 17:14:29 -0700

    all routes can be stored in the Journey Routes object

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/dispatch/mapper_test.rb

commit b7ccfa9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 14:41:12 -0700

    clear! does not need to be called from initialize

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 59b9fe9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 14:38:46 -0700

    reuse the route collection and formatter by clearing them

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 4ffe667	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 14:09:33 -0700

    Instantiate each part of our routing system:
    
      * A collection of Routes
      * The Router, which consults the collection of routes
      * A formatter that consults the collection of routes

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 537ed6e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 13:53:10 -0700

    stop freezing the routes

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit a05a9ff	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 10:52:04 -0700

    stop using a hash for parameterizing

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 5f0b37c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 10:51:23 -0700

    Switching rack-mount to journey.

M	Gemfile
M	actionpack/actionpack.gemspec
M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 1a421ce	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-12 23:58:37 +0100

    Deprecate using method_missing for attributes that are columns.
    
    This shouldn't ever happen unless people are doing something
    particularly weird, but adding a deprecation in case there are bugs not
    caught by our tests.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit c89e1c7	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-12 23:58:20 +0100

    Add an attribute_missing method to ActiveModel::AttributeMethods.
    
    This can be overloaded by implementors if necessary.

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 6d8dbec	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-12 22:29:45 +0100

    Avoid double super call in some cases.
    
    If super was false earlier, it is still going to be false, so we don't
    need to call it again at the end of the method.

M	activemodel/lib/active_model/attribute_methods.rb

commit ac687ed	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-12 22:12:12 +0100

    Let Ruby deal with method visibility.
    
    Check respond_to_without_attributes? in method_missing. If there is any
    method that responds (even private), let super handle it and raise
    NoMethodError if necessary.

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb
M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit cf115d2	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-11 16:07:24 +0100

    Reset column info when messing with columns.
    
    We are subclassing Session here, but messing with the columns will
    affect the attribute methods defined on the Session superclass, and
    therefore other tests, unless we properly isolate it by resetting column
    info before and after the test run.

M	activerecord/test/cases/session_store/session_test.rb

commit eecfa84	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-11 14:48:40 +0100

    Always generate attribute methods on the base class.
    
    This fixes a situation I encountered where a subclass would cache the
    name of a generated attribute method in @_defined_class_methods. Then,
    when the superclass has it's attribute methods undefined, the subclass
    would always have to dispatch through method_missing, because the
    presence of the attribute in @_defined_class_methods would mean that it
    is never generated again, even if undefine_attribute_methods is called
    on the subclass.
    
    There various other confusing edge cases like this. STI classes share
    columns, so let's just keep all the attribute method generation state
    isolated to the base class.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 50d395f	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-10 21:10:01 +0100

    Raise error when using write_attribute with a non-existent attribute.
    
    Previously we would just silently write the attribute. This can lead to
    subtle bugs (for example, see the change in AutosaveAssociation where a
    through association would wrongly gain an attribute.
    
    Also, ensuring that we never gain any new attributes after
    initialization will allow me to reduce our dependence on method_missing.

M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/timestamp.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/models/contact.rb
M	activerecord/test/schema/schema.rb

commit 8667d3a	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-10 09:41:42 +0100

    Make protected method public so we avoid method_missing.

M	activerecord/test/models/topic.rb

commit 3386a08	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-10 09:36:27 +0100

    Fix warnings.
    
    Make sure we don't redefine an already-defined attribute method.

M	activerecord/lib/active_record/attribute_methods.rb

commit 99bd6b5	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-09 09:08:27 +0100

    Add deprecation for doing `attribute_method_suffix ''`

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb
M	activerecord/lib/active_record/attribute_methods/read.rb

commit 93d574c	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-09 09:02:40 +0100

    refactoring

M	activemodel/lib/active_model/attribute_methods.rb

commit 8b8b714	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-04 22:07:07 +0100

    Use an empty AttributeMethodMatcher by default.
    
    This means that attribute methods which don't exist will get generated
    when define_attribute_methods is called, so we don't have to use hacks
    like `attribute_method_suffix ''`.

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 8d59e0b	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-04 22:05:53 +0100

    Alias id= if necessary, rather than relying on method_missing

M	activerecord/lib/active_record/attribute_methods/write.rb

commit 7d235b9	refs/heads/master
Author: dharmatech 
Date:   2011-09-12 15:55:01 -0500

    getting_started.textile: Fix typo and split up a sentence in section "Building a Multi-Model Form"

M	railties/guides/source/getting_started.textile

commit 79509a2	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-12 11:49:43 -0700

    Merge pull request #2988 from guilleiguaran/remove-extra-line
    
    Remove odd asignation

M	actionpack/lib/action_view/asset_paths.rb

commit 1a4ea1b	refs/heads/master
Merge: e9db217 f746927
Author: Santiago Pastorino 
Date:   2011-09-12 11:49:43 -0700

    Merge pull request #2988 from guilleiguaran/remove-extra-line
    
    Remove odd asignation

commit f746927	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-12 13:16:55 -0500

    Remove odd asignation

M	actionpack/lib/action_view/asset_paths.rb

commit c5c4482	refs/heads/master
Merge: acc6252 6e782f8
Author: Vijay Dev 
Date:   2011-09-12 11:00:16 -0700

    Merge pull request #67 from alanzeino/master
    
    'Getting Started' guide typo fix

commit 21eaba4	refs/heads/master
Author: kennyj 
Date:   2011-09-13 02:59:57 +0900

    fix https://github.com/rails/rails/issues/2947 (with testcase)

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/rake_test.rb

commit acc6252	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-12 23:25:33 +0530

    Delete contribute.textile now that its contents are merged to the contributing_to_ruby_on_rails guide

D	railties/guides/source/contribute.textile

commit c5118f2	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-12 23:24:14 +0530

    change GH issue tracker url

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit e9db217	refs/heads/master
Author: José Valim 
Date:   2011-09-12 10:53:20 -0700

    Use the proper executable on tests.

M	railties/test/isolation/abstract_unit.rb

commit 7e26ab1	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-12 10:18:19 -0700

    Merge pull request #2985 from kennyj/master
    
    fix https://github.com/rails/rails/issues/2582 (with testcase)

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/rake_test.rb

commit d762e22	refs/heads/master
Merge: 8397a56 3ce8302
Author: Santiago Pastorino 
Date:   2011-09-12 10:18:19 -0700

    Merge pull request #2985 from kennyj/master
    
    fix https://github.com/rails/rails/issues/2582 (with testcase)

commit 184d8a2	refs/tags/v3.1.1.rc1
Author: John Mileham 
Date:   2011-08-23 19:04:35 -0400

    ActiveResource shouldn't rely on the presence of Content-Length

M	activeresource/lib/active_resource/base.rb

commit 8397a56	refs/heads/master
Merge: 11fa70d a06d174
Author: Jon Leighton 
Date:   2011-09-12 10:11:39 -0700

    Merge pull request #2678 from jmileham/ares_content_length_bug
    
    ActiveResource shouldn't rely on the presence of Content-Length

commit 70198fd	refs/heads/master
Author: dharmatech 
Date:   2011-09-12 12:05:15 -0500

    getting_started.textile: Fix typos in section "Rendering a Partial Form"

M	railties/guides/source/getting_started.textile

commit 21b4244	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2011-09-12 20:53:10 +0400

    Fix a typo in date

M	activesupport/lib/active_support/time_with_zone.rb

commit 3ce8302	refs/heads/master
Author: kennyj 
Date:   2011-09-13 01:06:31 +0900

    fix https://github.com/rails/rails/issues/2582 (with testcase)

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/rake_test.rb

commit 11fa70d	refs/heads/master
Author: José Valim 
Date:   2011-09-12 09:05:11 -0700

    Just provide the executable for railtie. This should be fine since Rubygems now warns before overriding them.

D	bin/rails
M	rails.gemspec
M	railties/bin/rails

commit a299105	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-09-12 09:01:40 -0700

    Remove rails executable from the gemspec.

M	railties/railties.gemspec

commit 91f549b	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-09-12 08:56:35 -0700

    Revert "Copy the bin to railties so it also works if you don't have the rails gem."
    
    This reverts commit 20db68701a2e4e4a744c31934b0a02b68c81141f.

D	railties/bin/rails

commit 112c730	refs/tags/v3.1.1.rc1
Merge: 90cd024 981f076
Author: José Valim 
Date:   2011-09-12 08:05:55 -0700

    Merge pull request #2983 from sikachu/3-1-stable-hash-backported
    
    Issue #636 - Parsing an xml file with multiple records and extra attribut

commit 63082af	refs/heads/master
Merge: 4bcacc8 d7154d4
Author: Xavier Noria 
Date:   2011-09-12 07:49:36 -0700

    Merge pull request #2984 from jrgifford/master
    
    Added getting_started application to railties/guides/code/getting_started

commit d7154d4	refs/heads/master
Author: James Gifford 
Date:   2011-09-12 10:30:45 -0400

    Added getting_started code, updated guide with link to rails github repo and path to code

A	railties/guides/code/getting_started/Gemfile
A	railties/guides/code/getting_started/README
A	railties/guides/code/getting_started/Rakefile
A	railties/guides/code/getting_started/app/assets/images/rails.png
A	railties/guides/code/getting_started/app/assets/javascripts/application.js
A	railties/guides/code/getting_started/app/assets/javascripts/comments.js.coffee
A	railties/guides/code/getting_started/app/assets/javascripts/home.js.coffee
A	railties/guides/code/getting_started/app/assets/javascripts/posts.js.coffee
A	railties/guides/code/getting_started/app/assets/stylesheets/application.css
A	railties/guides/code/getting_started/app/assets/stylesheets/comments.css.scss
A	railties/guides/code/getting_started/app/assets/stylesheets/home.css.scss
A	railties/guides/code/getting_started/app/assets/stylesheets/posts.css.scss
A	railties/guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
A	railties/guides/code/getting_started/app/controllers/application_controller.rb
A	railties/guides/code/getting_started/app/controllers/comments_controller.rb
A	railties/guides/code/getting_started/app/controllers/home_controller.rb
A	railties/guides/code/getting_started/app/controllers/posts_controller.rb
A	railties/guides/code/getting_started/app/helpers/application_helper.rb
A	railties/guides/code/getting_started/app/helpers/comments_helper.rb
A	railties/guides/code/getting_started/app/helpers/home_helper.rb
A	railties/guides/code/getting_started/app/helpers/posts_helper.rb
A	railties/guides/code/getting_started/app/mailers/.gitkeep
A	railties/guides/code/getting_started/app/models/.gitkeep
A	railties/guides/code/getting_started/app/models/comment.rb
A	railties/guides/code/getting_started/app/models/post.rb
A	railties/guides/code/getting_started/app/models/tag.rb
A	railties/guides/code/getting_started/app/views/comments/_comment.html.erb
A	railties/guides/code/getting_started/app/views/comments/_form.html.erb
A	railties/guides/code/getting_started/app/views/home/index.html.erb
A	railties/guides/code/getting_started/app/views/home/index.html.erb~
A	railties/guides/code/getting_started/app/views/layouts/application.html.erb
A	railties/guides/code/getting_started/app/views/posts/_form.html.erb
A	railties/guides/code/getting_started/app/views/posts/edit.html.erb
A	railties/guides/code/getting_started/app/views/posts/index.html.erb
A	railties/guides/code/getting_started/app/views/posts/new.html.erb
A	railties/guides/code/getting_started/app/views/posts/show.html.erb
A	railties/guides/code/getting_started/app/views/tags/_form.html.erb
A	railties/guides/code/getting_started/config.ru
A	railties/guides/code/getting_started/config/application.rb
A	railties/guides/code/getting_started/config/boot.rb
A	railties/guides/code/getting_started/config/database.yml
A	railties/guides/code/getting_started/config/environment.rb
A	railties/guides/code/getting_started/config/environments/development.rb
A	railties/guides/code/getting_started/config/environments/production.rb
A	railties/guides/code/getting_started/config/environments/test.rb
A	railties/guides/code/getting_started/config/initializers/backtrace_silencers.rb
A	railties/guides/code/getting_started/config/initializers/inflections.rb
A	railties/guides/code/getting_started/config/initializers/mime_types.rb
A	railties/guides/code/getting_started/config/initializers/secret_token.rb
A	railties/guides/code/getting_started/config/initializers/session_store.rb
A	railties/guides/code/getting_started/config/initializers/wrap_parameters.rb
A	railties/guides/code/getting_started/config/locales/en.yml
A	railties/guides/code/getting_started/config/routes.rb
A	railties/guides/code/getting_started/config/routes.rb~
A	railties/guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
A	railties/guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
A	railties/guides/code/getting_started/db/migrate/20110901013701_create_tags.rb
A	railties/guides/code/getting_started/db/schema.rb
A	railties/guides/code/getting_started/db/seeds.rb
A	railties/guides/code/getting_started/doc/README_FOR_APP
A	railties/guides/code/getting_started/lib/assets/.gitkeep
A	railties/guides/code/getting_started/lib/tasks/.gitkeep
A	railties/guides/code/getting_started/public/404.html
A	railties/guides/code/getting_started/public/422.html
A	railties/guides/code/getting_started/public/500.html
A	railties/guides/code/getting_started/public/favicon.ico
A	railties/guides/code/getting_started/public/robots.txt
A	railties/guides/code/getting_started/script/rails
A	railties/guides/code/getting_started/test/fixtures/.gitkeep
A	railties/guides/code/getting_started/test/fixtures/comments.yml
A	railties/guides/code/getting_started/test/fixtures/posts.yml
A	railties/guides/code/getting_started/test/fixtures/tags.yml
A	railties/guides/code/getting_started/test/functional/.gitkeep
A	railties/guides/code/getting_started/test/functional/comments_controller_test.rb
A	railties/guides/code/getting_started/test/functional/home_controller_test.rb
A	railties/guides/code/getting_started/test/functional/posts_controller_test.rb
A	railties/guides/code/getting_started/test/integration/.gitkeep
A	railties/guides/code/getting_started/test/performance/browsing_test.rb
A	railties/guides/code/getting_started/test/test_helper.rb
A	railties/guides/code/getting_started/test/unit/.gitkeep
A	railties/guides/code/getting_started/test/unit/comment_test.rb
A	railties/guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
A	railties/guides/code/getting_started/test/unit/helpers/home_helper_test.rb
A	railties/guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
A	railties/guides/code/getting_started/test/unit/post_test.rb
A	railties/guides/code/getting_started/test/unit/tag_test.rb
A	railties/guides/code/getting_started/vendor/assets/stylesheets/.gitkeep
A	railties/guides/code/getting_started/vendor/plugins/.gitkeep
M	railties/guides/source/getting_started.textile

commit 378ce0e	refs/tags/v3.0.14
Author: Pratik Naik 
Date:   2011-09-11 03:02:49 +0100

    Dont use association proxy#reload to load the target for the first time

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association_proxy.rb

commit 981f076	refs/tags/v3.1.1.rc1
Author: Sidu Ponnappa 
Date:   2011-05-25 17:25:32 +0530

    Issue #636 - Parsing an xml file with multiple records and extra attributes (besides type) fails

M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 6e782f8	refs/heads/master
Author: Alan Zeino 
Date:   2011-09-12 11:12:09 +1000

    Slight change to reflect current 'destroy' code generated by scaffold in 3.1 release.

M	railties/guides/source/getting_started.textile

commit 4bcacc8	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-11 17:05:16 -0700

    Merge pull request #2936 from joelmoss/migration_status
    
    db:migrate:status not looking at all migration paths

M	activerecord/lib/active_record/railties/databases.rake

commit 90cd024	refs/tags/v3.1.1.rc1
Merge: 96d63e1 dffd058
Author: Santiago Pastorino 
Date:   2011-09-11 17:05:16 -0700

    Merge pull request #2936 from joelmoss/migration_status
    
    db:migrate:status not looking at all migration paths

commit a06d174	refs/heads/master
Author: John Mileham 
Date:   2011-08-23 19:04:35 -0400

    ActiveResource shouldn't rely on the presence of Content-Length

M	activeresource/lib/active_resource/base.rb

commit 96d63e1	refs/tags/v3.1.1.rc1
Merge: df761ba 1ca38c6
Author: Santiago Pastorino 
Date:   2011-09-11 11:35:17 -0700

    Merge pull request #2969 from arunagw/warnings_removed_3_1_stable
    
    Warnings removed 3 1 stable

commit 78a4aea	refs/tags/v3.0.14
Author: misfo 
Date:   2011-02-08 12:08:35 +0800

    prevent errors when passing a frozen string as a param to ActionController::TestCase#process
    
    since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process.  This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed
    thanks and high fives to kinsteronline

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit e47bb1c	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-11 19:44:42 +0530

    merged the contribution guides and changed the
    link in the layout accordingly

M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/layout.html.erb

commit df761ba	refs/tags/v3.1.1.rc1
Author: Emin Hasanov 
Date:   2011-09-11 14:18:07 +0600

    Fix typo in "must-revalidate" header name

M	railties/guides/source/asset_pipeline.textile

commit b9c66fa	refs/tags/v3.1.1.rc1
Author: Andy Lindeman 
Date:   2011-09-10 21:49:13 -0400

    Fix for :instance_reader => false code example

M	railties/guides/source/active_support_core_extensions.textile

commit 04767d1	refs/tags/v3.1.1.rc1
Author: Michael P Laing 
Date:   2011-09-10 16:38:50 +0200

    Update to conform to rails 3.1 generated caode

M	railties/guides/source/getting_started.textile

commit 06ed248	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-09-08 18:25:43 +0530

    some copy-edits

M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/getting_started.textile

commit fbcff81	refs/tags/v3.1.1.rc1
Author: dharmatech 
Date:   2011-09-07 20:23:28 -0500

    getting_started.textile section 6: Correct file names in table

M	railties/guides/source/getting_started.textile

commit 95fdaf9	refs/heads/master
Merge: a950928 715b099
Author: Vijay Dev 
Date:   2011-09-11 17:41:39 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 715b099	refs/heads/master
Merge: 28e3259 22a4f7e
Author: Emin Hasanov 
Date:   2011-09-11 03:36:24 -0700

    Merge pull request #66 from hasanove/master
    
    typo in asset pipeline guide

commit 22a4f7e	refs/heads/master
Author: Emin Hasanov 
Date:   2011-09-11 14:18:07 +0600

    Fix typo in "must-revalidate" header name

M	railties/guides/source/asset_pipeline.textile

commit 28e3259	refs/heads/master
Author: Andy Lindeman 
Date:   2011-09-10 21:49:13 -0400

    Fix for :instance_reader => false code example

M	railties/guides/source/active_support_core_extensions.textile

commit a950928	refs/heads/master
Merge: d0946fd dbef311
Author: Santiago Pastorino 
Date:   2011-09-10 17:29:04 -0700

    Merge pull request #2974 from md5/csrf_token_warning
    
    Use ensure instead of rescue

commit 41d179b	refs/heads/master
Author: Ray Baxter 
Date:   2011-09-10 13:50:33 -0700

    Revert "Fixed syntax error in "block setting of attributes" example."
    
    Code and CHANGELOGS can't be edited in docrails.
    You'll need to make this change in rails/rails.
    
    This reverts commit 465752ba6bf2cc124dc78f4a9eb7a1d74dd8c868.

M	activerecord/CHANGELOG

commit 465752b	refs/heads/master
Author: Erik Ostrom 
Date:   2011-09-10 13:39:25 -0500

    Fixed syntax error in "block setting of attributes" example.

M	activerecord/CHANGELOG

commit dbef311	refs/heads/master
Author: Mike Dillon 
Date:   2011-09-10 11:01:22 -0700

    Use ensure instead of rescue

M	actionpack/test/controller/request_forgery_protection_test.rb

commit d0946fd	refs/heads/master
Merge: e8e1911 e7e6515
Author: Aaron Patterson 
Date:   2011-09-10 10:45:47 -0700

    Merge pull request #2972 from md5/master
    
    Use log.warn instead of debug for CSRF token warning

commit a7998dc	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-09-10 19:29:50 +0200

    clarify that documentation bugs have to be reported as Rails issues. [Closes #2858]

M	railties/guides/source/layout.html.erb

commit e8e1911	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-10 19:29:50 +0200

    clarify that documentation bugs have to be reported as Rails issues. [Closes #2858]

M	railties/guides/source/layout.html.erb

commit e7e6515	refs/heads/master
Author: Mike Dillon 
Date:   2011-09-10 09:54:57 -0700

    Fix changelog entry

M	actionpack/CHANGELOG

commit 538fb18	refs/heads/master
Author: Mike Dillon 
Date:   2011-09-10 09:51:55 -0700

    Add test for warning and CHANGELOG entry

M	actionpack/CHANGELOG
M	actionpack/test/controller/request_forgery_protection_test.rb

commit c0775c6	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-10 09:20:02 -0700

    Merge pull request #2970 from deepakprasanna/master
    
    Added a case to check the status of the migration after a rollback and redo.

M	railties/test/application/rake_test.rb

commit 0a67568	refs/heads/master
Merge: 365aaea ab5f487
Author: Santiago Pastorino 
Date:   2011-09-10 09:20:02 -0700

    Merge pull request #2970 from deepakprasanna/master
    
    Added a case to check the status of the migration after a rollback and redo.

commit f8c4519	refs/tags/v3.1.1.rc1
Merge: 7317f6c 38c7a67
Author: Santiago Pastorino 
Date:   2011-09-10 09:17:13 -0700

    Merge pull request #2967 from arunagw/add_missing_assert
    
    Add missing assert

commit 365aaea	refs/heads/master
Merge: 4d3a73e abbd27f
Author: Vijay Dev 
Date:   2011-09-10 09:00:19 -0700

    Merge pull request #2968 from arunagw/form_helper_test
    
    No need to use  here. It's already in whole_form block

commit 7fb99e5	refs/heads/master
Author: Mike Dillon 
Date:   2011-09-02 08:22:29 -0700

    Change log level for CSRF token verification warning

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 8a08764	refs/heads/master
Author: Michael P Laing 
Date:   2011-09-10 16:38:50 +0200

    Update to conform to rails 3.1 generated caode

M	railties/guides/source/getting_started.textile

commit 813e288	refs/tags/v3.0.14
Author: Vijay Dev 
Date:   2011-09-10 15:45:25 +0530

    fix assert message

M	activerecord/test/cases/adapter_test.rb

commit 1ca38c6	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-10 12:17:26 +0530

    Warnings removed unused variables. Please don't add them

M	actionmailer/test/old_base/mail_service_test.rb
M	actionpack/test/dispatch/session/test_session_test.rb
M	actionpack/test/template/html-scanner/document_test.rb
M	actionpack/test/template/record_tag_helper_test.rb
M	actionpack/test/template/render_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/text_helper_test.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activeresource/test/cases/base/load_test.rb
M	activeresource/test/cases/finder_test.rb
M	activeresource/test/cases/log_subscriber_test.rb
M	activeresource/test/cases/observing_test.rb

commit ab5f487	refs/heads/master
Author: Deepak Prasanna 
Date:   2011-09-10 12:55:37 +0530

    added test for db migrate:redo

M	railties/test/application/rake_test.rb

commit 38c7a67	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-10 12:15:18 +0530

    Adding assert for "test_form_for_with_isolated_namespaced_model"

M	actionpack/test/template/form_helper_test.rb

commit abbd27f	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-10 12:22:29 +0530

    No need to use  here. It's already in whole_form block

M	actionpack/test/template/form_helper_test.rb

commit 7317f6c	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-09 21:58:37 -0700

    Merge pull request #2957 from waseem/migration_status_tests
    
    Tests for rake db:migrate:status.

M	railties/test/application/rake_test.rb

commit 4d3a73e	refs/heads/master
Merge: be24be6 bc7edde
Author: Santiago Pastorino 
Date:   2011-09-09 21:58:37 -0700

    Merge pull request #2957 from waseem/migration_status_tests
    
    Tests for rake db:migrate:status.

commit 082f53a	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-09 21:56:28 -0700

    Merge pull request #2876 from alex3/patch-1
    
    Fixed assets precompile regex

M	actionpack/lib/sprockets/assets.rake
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit be24be6	refs/heads/master
Merge: f43ffdc 901c02d
Author: Santiago Pastorino 
Date:   2011-09-09 21:56:28 -0700

    Merge pull request #2876 from alex3/patch-1
    
    Fixed assets precompile regex

commit f43ffdc	refs/heads/master
Merge: 0f04260 fb73be8
Author: Santiago Pastorino 
Date:   2011-09-09 21:50:10 -0700

    Merge pull request #2966 from arunagw/no_use_warnings_removed
    
    Not used variables removed. Warnings removed.

commit fb73be8	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-10 00:11:35 +0530

    Not used variables removed. Warnings removed.

M	activerecord/test/cases/relations_test.rb
M	activeresource/test/cases/base/load_test.rb

commit 0f04260	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-09 19:00:33 -0700

    railties depends on actionpack, so put actionpack in the include path

M	railties/Rakefile

commit 9736cb2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-09 18:56:11 -0700

    rake already ships with a ruby command

M	railties/Rakefile

commit 7bc6a00	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-09 18:50:32 -0700

    move route inspecting to an object so that we can more easily test it

A	railties/lib/rails/application/route_inspector.rb
M	railties/lib/rails/tasks/routes.rake
M	railties/test/application/rake_test.rb
A	railties/test/application/route_inspect_test.rb

commit f776661	refs/heads/master
Author: John Mileham 
Date:   2011-08-24 15:18:55 -0400

    Failing test: ActiveResource shouldn't rely on the presence of Content-Length

M	activeresource/test/cases/base_test.rb

commit 6c43532	refs/heads/master
Author: Mike Gehard 
Date:   2011-09-09 15:48:43 -0600

    Silence Ruby warnings about uninitialized instance variable.

M	actionpack/test/lib/controller/fake_models.rb

commit a748c60	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-09-09 14:24:12 -0700

    Exceptions from database adapters should not lose their backtrace.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/test/cases/adapter_test.rb

commit 06e400e	refs/heads/master
Merge: b325a77 b7f1735
Author: Aaron Patterson 
Date:   2011-09-09 10:49:05 -0700

    Merge pull request #2960 from guilleiguaran/fix-isolated-ar-tests
    
    Add missing require in base_test.rb, fixes isolated test

commit b7f1735	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-09 12:31:11 -0500

    Add missing require in base_test.rb, fixes isolated test

M	activerecord/test/cases/base_test.rb

commit bc7edde	refs/heads/master
Author: Waseem Ahmad 
Date:   2011-09-09 15:38:27 +0530

    Tests for rake db:migrate:status.

M	railties/test/application/rake_test.rb

commit b325a77	refs/heads/master
Merge: ac1a363 8817796
Author: José Valim 
Date:   2011-09-09 01:49:17 -0700

    Merge pull request #2956 from lawrencepit/full_messages
    
    Ability to get single full error message

commit 8817796	refs/heads/master
Author: Lawrence Pit 
Date:   2011-09-09 18:34:13 +1000

    Added test for obj.errors.as_json

M	activemodel/test/cases/errors_test.rb

commit f5a944f	refs/heads/master
Author: Lawrence Pit 
Date:   2011-09-09 18:28:25 +1000

    Add ability to get an individual full error message + test for full_messages.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit edd2f21	refs/heads/master
Author: Dmitry Polushkin 
Date:   2011-09-09 08:31:54 +0100

    Test polymorphic record with optimistic locking and counter cache should be destoyed without catching the ActiveRecord::StaleObjectError.

M	activerecord/test/cases/locking_test.rb
M	activerecord/test/models/car.rb
M	activerecord/test/schema/schema.rb

commit 37f1cf0	refs/heads/master
Author: Jeff Dutil 
Date:   2011-09-08 22:53:38 -0400

    Travis-ci build image should link to the rails travis ci build page rather than to the image.

M	README.rdoc

commit ac1a363	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 16:04:46 -0700

    Pull up a method we only use once.

M	actionpack/test/controller/resources_test.rb

commit 41a085e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-08 16:02:56 -0700

    Conditions must never be equal

M	actionpack/test/controller/resources_test.rb

commit cbf1dc7	refs/heads/master
Merge: 04baa4b 7231788
Author: Jon Leighton 
Date:   2011-09-08 15:07:23 -0700

    Merge pull request #2757 from andmej/first_or_create_pull_request
    
    Add first_or_create family of methods to Active Record

commit 562277b	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-08 22:25:18 +0100

    Remove failing test which was wrongly introduced.
    
    This test was introduced in pull request #2577. The author of the pull
    request included the test, which was originally in #2230, at the same
    time as fixing a separate (but related) bug. However, the author did not
    include a fix for this test, so when #2577 was merged, a failing test
    was introduced.
    
    So I am removing the failing test for now. If anyone wants to fix the
    bug, please do so and submit a complete pull request with a test and
    a fix.

M	railties/test/railties/mounted_engine_test.rb

commit 04baa4b	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-08 22:25:18 +0100

    Remove failing test which was wrongly introduced.
    
    This test was introduced in pull request #2577. The author of the pull
    request included the test, which was originally in #2230, at the same
    time as fixing a separate (but related) bug. However, the author did not
    include a fix for this test, so when #2577 was merged, a failing test
    was introduced.
    
    So I am removing the failing test for now. If anyone wants to fix the
    bug, please do so and submit a complete pull request with a test and
    a fix.

M	railties/test/railties/mounted_engine_test.rb

commit 901c02d	refs/heads/master
Author: Alex Yakoubian 
Date:   2011-09-08 13:44:08 -0700

    Fixed assets precompile regex, now accepts Procs

M	actionpack/lib/sprockets/assets.rake
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit e05d4ce	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-09 01:05:07 +0530

    revert the changes from c60995f3 - related to marking sub,gsub as unavailable to use with safe strings

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 9987f1e	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-08 21:28:17 +0200

    delete the CHANGELOG entry re SafeBuffer and sub/gsub, since it has been reverted

M	activesupport/CHANGELOG

commit 6b010c2	refs/heads/master
Author: José Valim 
Date:   2011-09-08 20:49:08 +0200

    Revert removing gsub and sub from safe buffer.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test.rb
M	activesupport/test/inflector_test_cases.rb
M	activesupport/test/safe_buffer_test.rb

commit 9c2ff32	refs/tags/v3.0.14
Merge: f863af9 5c10a53
Author: Vijay Dev 
Date:   2011-09-08 11:50:48 -0700

    Merge pull request #2682 from guilleiguaran/3-0-stable-changelogs
    
    Update changelogs (3-0-stable)

commit 5c10a53	refs/tags/v3.0.14
Author: Guillermo Iguaran 
Date:   2011-08-24 22:21:01 -0500

    Updating changelogs in 3-0-stable

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit f863af9	refs/tags/v3.0.14
Merge: de178df a8cfc99
Author: José Valim 
Date:   2011-09-08 10:57:29 -0700

    Merge pull request #2939 from akaspick/url_for_fix_3_0
    
    fix url_for when passing a hash to prevent unwanted additional values being added to the hash (backport to 3-0-stable)

commit a8cfc99	refs/tags/v3.0.14
Author: Andrew Kaspick 
Date:   2011-09-08 12:57:41 -0500

    fix url_for to not add additional unwanted options when called with a hash

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 45b7731	refs/tags/v3.0.14
Author: Andrew Kaspick 
Date:   2011-08-11 13:28:31 -0500

    when calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash... calling #dup on the hash prevents this

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/dispatch/routing_test.rb

commit dffd058	refs/tags/v3.1.1.rc1
Author: Joel Moss 
Date:   2011-09-08 16:15:03 +0100

    db:migrate:status correctly uses ActiveRecord::Migrator.migrations_paths instead of only the apps db/migrate directory, which will include engine migrations.

M	activerecord/lib/active_record/railties/databases.rake

commit 59198ec	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-08 18:25:43 +0530

    some copy-edits

M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/getting_started.textile

commit 5ed3e6a	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-09-07 22:32:49 +0530

    copy edit assets guide

M	railties/guides/source/asset_pipeline.textile

commit fa6bfce	refs/tags/v3.1.1.rc1
Author: Ryan Walker 
Date:   2011-09-06 14:06:34 -0300

    Added note about adding a javascript runtime to Gemfile for production environment.

M	railties/guides/source/asset_pipeline.textile

commit ac60460	refs/tags/v3.1.1.rc1
Author: Marcus Ilgner 
Date:   2011-09-06 16:27:26 +0200

    Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested.

M	railties/guides/source/asset_pipeline.textile

commit 7e587c2	refs/tags/v3.1.1.rc1
Author: Uģis Ozols 
Date:   2011-09-06 17:13:30 +0300

    Change hyphen to underscore.

M	railties/guides/source/asset_pipeline.textile

commit 8461804	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-04 21:17:23 -0500

    Add reference about "bundle install --without assets" in Precompiling Assets section.

M	railties/guides/source/asset_pipeline.textile

commit abb0af1	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-04 21:01:04 -0500

    Add CoffeeScript example to JavaScript and ERB section

M	railties/guides/source/asset_pipeline.textile

commit 2451a68	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-04 20:56:47 -0500

    Add JavaScript and ERB section to Asset Guide

M	railties/guides/source/asset_pipeline.textile

commit 0d25491	refs/heads/master
Merge: d1d5107 f50aeda
Author: Vijay Dev 
Date:   2011-09-08 18:06:43 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit d1d5107	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-08 05:22:02 -0700

    mention the issue number for future reference

M	activesupport/CHANGELOG

commit fb84450	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-08 05:13:56 -0700

    registers removal of sub and friends for safe strings in the CHANGELOG

M	activesupport/CHANGELOG

commit 827fcf4	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-08 05:02:47 -0700

    this should have gone with the previous commit

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit f7627de	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-08 04:48:18 -0700

    copy-edits a couple of exception messages
    
    "Safe Buffer" should either be the constant with the class name,
    or go in lower case. I've chosen to follow the same terminology
    that is used in the AS core extensiong guide, "safe string",
    though "safe buffer" is also used elsewhere, we should pick one.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 06b218d	refs/heads/master
Merge: b4a6e2f c60995f
Author: Vijay Dev 
Date:   2011-09-08 02:31:45 -0700

    Merge pull request #2931 from dmathieu/safe_gsub_doc
    
    better method documentation on disable safe string methods

commit c60995f	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-08 11:08:50 +0200

    better method documentation on disable safe string methods

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit b4a6e2f	refs/heads/master
Merge: e1b500e 3718ccd
Author: José Valim 
Date:   2011-09-08 01:26:55 -0700

    Merge pull request #2248 from dmathieu/safe_gsub
    
    make gsub and sub unavailable in SafeBuffers - Closes #1555

commit 3718ccd	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-08 10:21:50 +0200

    remove support of symbols on classify and camelize

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test.rb
M	activesupport/test/inflector_test_cases.rb
M	activesupport/test/safe_buffer_test.rb

commit e9f48cd	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-08 09:53:41 +0200

    make gsub and sub unavailable in SafeBuffers - Closes #1555

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/inflector/methods.rb

commit f50aeda	refs/heads/master
Author: dharmatech 
Date:   2011-09-07 20:23:28 -0500

    getting_started.textile section 6: Correct file names in table

M	railties/guides/source/getting_started.textile

commit de178df	refs/tags/v3.0.14
Author: Sergio Gil Pérez de la Manga 
Date:   2011-09-08 00:05:42 +0200

    Update changelog for 'Backport "ActiveRecord::Persistence#touch should not use default_scope" (pull request #1519)'

M	activerecord/CHANGELOG

commit d93213f	refs/tags/v3.0.14
Author: Dmitriy Kiriyenko 
Date:   2011-06-06 10:30:34 +0300

    This way asserting that updated_at was changed in touch look more obvious.

M	activerecord/test/cases/timestamp_test.rb

commit 4364157	refs/tags/v3.0.14
Author: Dmitriy Kiriyenko 
Date:   2011-06-06 10:30:05 +0300

    Do not use default_scope in ActiveRecord::Persistence#touch.

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/timestamp_test.rb

commit b92a025	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-07 15:26:26 -0700

    LRU cache in mysql and sqlite are now per-process caches.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
A	activerecord/test/cases/adapters/mysql/statement_pool_test.rb
A	activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb

commit 24b3783	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-07 15:09:10 -0700

    fixing file name

D	activerecord/test/cases/adapters/postgresql/statement_cache_test.rb
A	activerecord/test/cases/adapters/postgresql/statement_pool_test.rb

commit 77e0bdd	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-07 15:06:42 -0700

    LRU should cache per process in postgresql. fixes #1339

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
A	activerecord/test/cases/adapters/postgresql/statement_cache_test.rb

commit e1b500e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-07 15:26:26 -0700

    LRU cache in mysql and sqlite are now per-process caches.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
A	activerecord/test/cases/adapters/mysql/statement_pool_test.rb
A	activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb

commit e6adeaa	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-07 15:09:10 -0700

    fixing file name

D	activerecord/test/cases/adapters/postgresql/statement_cache_test.rb
A	activerecord/test/cases/adapters/postgresql/statement_pool_test.rb

commit 834d429	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-07 15:06:42 -0700

    LRU should cache per process in postgresql. fixes #1339

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
A	activerecord/test/cases/adapters/postgresql/statement_cache_test.rb

commit 866303d	refs/tags/v3.1.1.rc1
Merge: 6a18262 954543e
Author: Jon Leighton 
Date:   2011-09-07 15:24:54 -0700

    Merge pull request #2926 from akaspick/assert_select_email_fix_3_1
    
    assert_select_email fix for 3-1-stable

commit 954543e	refs/tags/v3.1.1.rc1
Author: Andrew Kaspick 
Date:   2011-09-07 17:16:55 -0500

    assert_select_email fix entry

M	actionpack/CHANGELOG

commit 05d4d8b	refs/tags/v3.1.1.rc1
Author: Andrew Kaspick 
Date:   2011-08-11 17:49:31 -0500

    fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/controller/assert_select_test.rb

commit 3a3344a	refs/tags/v3.0.14
Merge: 9ef9f98 c7f3429
Author: Jon Leighton 
Date:   2011-09-07 14:35:30 -0700

    Merge pull request #2918 from akaspick/assert_select_email_fix_3_0
    
    assert_select_email fix for 3-0-stable

commit 8e79c52	refs/heads/master
Merge: 82de8ad 8b63559
Author: Aaron Patterson 
Date:   2011-09-07 13:41:49 -0700

    Merge pull request #2922 from wayneeseguin/master
    
    Include ActiveRecord SQLServer Adapter by @metaskills in new application generator.

commit c7f3429	refs/tags/v3.0.14
Author: Andrew Kaspick 
Date:   2011-09-07 15:32:54 -0500

    more descriptive CHANGELOG entry

M	actionpack/CHANGELOG

commit 6a18262	refs/tags/v3.1.1.rc1
Merge: 76993f6 8f2f39b
Author: Santiago Pastorino 
Date:   2011-09-07 13:32:05 -0700

    Merge pull request #2921 from akaspick/exists_fix_3_1
    
    fix exists? to return false if passed nil (backport to 3-1-stable)

commit 8f2f39b	refs/tags/v3.1.1.rc1
Author: Andrew Kaspick 
Date:   2011-09-07 15:48:26 -0500

    entry for fixing exists?

M	actionpack/CHANGELOG

commit 44a5849	refs/tags/v3.1.1.rc1
Author: Andrew Kaspick 
Date:   2011-08-10 12:55:29 -0500

    fix exists? to return false if passed nil (which may come from a missing URL param)

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 8b63559	refs/heads/master
Author: Wayne E. Seguin 
Date:   2011-09-07 17:27:32 -0300

    Thanks to the hard work of Ken Collins ( @metaskills ) on the ActiveRecord SQLServer Adapter ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter ), AR SQLServer Adapter works for Linux, OSX and Windows. Thus the sqlserver adapter should include so that users may use it with the new application generator:
    
        rails new w00t -d sqlserver ...

M	railties/lib/rails/generators/app_base.rb

commit 82de8ad	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-08 01:27:24 +0530

    Use Travis https build status image in order to prevent GitHub from
    caching the http version.
    
    The syntax for including an https image url in RDoc taken from
    http://about.travis-ci.org/docs/user/status-images. Having this in a
    line of its own now to make regex replacement for the API simpler!

M	README.rdoc
M	Rakefile

commit 9ef9f98	refs/tags/v3.0.14
Merge: 59a64a8 3e00e49
Author: Jon Leighton 
Date:   2011-09-07 12:36:43 -0700

    Merge pull request #2919 from akaspick/exists_fix_3_0
    
    fix exists? to return false if passed nil (backport to 3-0-stable)

commit 3e00e49	refs/tags/v3.0.14
Author: Andrew Kaspick 
Date:   2011-09-07 14:49:59 -0500

    entry for fixing exists?

M	activerecord/CHANGELOG

commit 15dcdf6	refs/tags/v3.0.14
Author: Andrew Kaspick 
Date:   2011-08-10 12:55:29 -0500

    fix exists? to return false if passed nil (which may come from a missing URL param)

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit cf0ea79	refs/tags/v3.0.14
Author: Andrew Kaspick 
Date:   2011-09-07 14:33:24 -0500

    assert_select_email entry

M	actionpack/CHANGELOG

commit 8094d29	refs/tags/v3.0.14
Author: Andrew Kaspick 
Date:   2011-08-11 17:49:31 -0500

    fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/controller/assert_select_test.rb

commit b9f66f4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-07 10:44:18 -0700

    fixing view queries

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit d9a2071	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-07 10:30:30 -0700

    use the supplied bind values

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit f5ea24b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-07 10:24:25 -0700

    Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails into rawr
    
    * https://github.com/rails/rails:
      Postgresql adapter: added current_schema check for table_exists?
      Postgresql adapter: added current_schema check for table_exists?

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 76993f6	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-07 10:30:30 -0700

    use the supplied bind values

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 190a2bf	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-07 22:33:04 +0530

    Revert "Rails.root is a Pathname, no need to use File.join first."
    
    This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa.
    
    Reason: We need a fully qualified path string here, not a Pathname.

M	railties/guides/source/asset_pipeline.textile

commit a6178c3	refs/tags/v3.1.1.rc1
Merge: 4a2e619 6a14b01
Author: Aaron Patterson 
Date:   2011-09-07 10:24:25 -0700

    Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails into rawr
    
    * https://github.com/rails/rails:
      Postgresql adapter: added current_schema check for table_exists?
      Postgresql adapter: added current_schema check for table_exists?

commit 0fb3aa7	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-07 22:32:49 +0530

    copy edit assets guide

M	railties/guides/source/asset_pipeline.textile

commit 9dd5c03	refs/heads/master
Merge: f670952 3937d44
Author: Jon Leighton 
Date:   2011-09-07 10:22:39 -0700

    Merge pull request #2914 from yahonda/add_rownum_to_test_first_and_last
    
    Add ROWNUM to test first and last to support Oracle.

commit da8f00a	refs/heads/master
Author: Jeremy Evans 
Date:   2011-09-07 10:09:04 -0700

    Add tests for fixes to Time.===

M	activesupport/test/core_ext/time_ext_test.rb

commit 4a2e619	refs/tags/v3.1.1.rc1
Merge: 759f3e5 d6d4740
Author: Aaron Patterson 
Date:   2011-09-07 09:10:47 -0700

    Merge pull request #2913 from toolmantim/3-1-stable
    
    Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already present

commit 98b55ee	refs/heads/master
Author: dharmatech 
Date:   2011-09-07 09:09:11 -0500

    getting_started.textile: Fix another typo

M	railties/guides/source/getting_started.textile

commit ea83a8d	refs/heads/master
Author: Nicolás Hock Isaza 
Date:   2011-09-07 08:19:39 -0500

    Fixing `record_key_for_dom_id` documentation.
    
    The default implementation joins everything with '_' and not with '-'

M	actionpack/lib/action_controller/record_identifier.rb

commit 760fd1e	refs/heads/master
Author: Joost Baaij 
Date:   2011-09-07 16:09:56 +0300

    Rails.root is a Pathname, no need to use File.join first.

M	railties/guides/source/asset_pipeline.textile

commit d6d4740	refs/tags/v3.1.1.rc1
Author: Tim Lucas 
Date:   2011-09-07 14:21:18 +0300

    Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already present.
    
    This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map)
    
    TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache)

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/values/time_zone.rb

commit 759f3e5	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-07 06:02:01 -0700

    Merge pull request #2904 from guilleiguaran/refactor-assets-tests
    
    Refactor assets tests to use add_to_config

M	railties/test/application/assets_test.rb

commit f670952	refs/heads/master
Merge: 16f1ce4 1db5836
Author: Santiago Pastorino 
Date:   2011-09-07 06:02:01 -0700

    Merge pull request #2904 from guilleiguaran/refactor-assets-tests
    
    Refactor assets tests to use add_to_config

commit 16f1ce4	refs/heads/master
Merge: fb5dbe8 60d358b
Author: Jon Leighton 
Date:   2011-09-07 05:51:31 -0700

    Merge pull request #2499 from akaspick/assert_select_email_fix
    
    Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.

commit fb5dbe8	refs/heads/master
Merge: 2b354fe 2147f35
Author: Jon Leighton 
Date:   2011-09-07 05:20:52 -0700

    Merge pull request #2911 from toolmantim/patch-1
    
    Make sure require_tzinfo only calls Kernel#require if TZInfo isn't alread

commit 3937d44	refs/heads/master
Author: Yasuo Honda 
Date:   2011-09-07 07:40:55 -0400

    Add ROWNUM to test first and last to support Oracle.

M	activerecord/test/cases/finder_test.rb

commit 2147f35	refs/heads/master
Author: Tim Lucas 
Date:   2011-09-07 14:21:18 +0300

    Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already present.
    
    This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map)
    
    TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache)

M	activesupport/lib/active_support/values/time_zone.rb

commit 2b354fe	refs/heads/master
Merge: 1437690 9821d98
Author: Vijay Dev 
Date:   2011-09-07 03:07:09 -0700

    Merge pull request #2905 from nhocki/patch-1
    
    Fixing small typo in the `record_key_for_dom_id` documentation.

commit df21e3d	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-07 09:26:02 +0100

    Don't include any of includes, preload, joins, eager_load in the through association scope.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit 1437690	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-07 09:26:02 +0100

    Don't include any of includes, preload, joins, eager_load in the through association scope.

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit db8d54e	refs/heads/master
Merge: 4edf6ea d48dd18
Author: Jon Leighton 
Date:   2011-09-07 00:38:51 -0700

    Merge pull request #2485 from akaspick/exists_fix
    
    fix exists? to return false if passed nil (which may come from a missing

commit 6a14b01	refs/tags/v3.1.1.rc1
Author: Kym 
Date:   2011-09-07 17:02:34 +1000

    Postgresql adapter: added current_schema check for table_exists?

M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 81a19c4	refs/tags/v3.1.1.rc1
Author: Kym 
Date:   2011-09-07 16:51:43 +1000

    Postgresql adapter: added current_schema check for table_exists?

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 9821d98	refs/heads/master
Author: Nicolás Hock Isaza 
Date:   2011-09-06 23:26:56 -0500

    Fixing `record_key_for_dom_id` documentation.
    
    The default implementation joins everything with '_' and not with '-'

M	actionpack/lib/action_controller/record_identifier.rb

commit 1db5836	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-06 23:00:36 -0500

    Refactor assets tests to use add_to_config instead of creating initializers with config values

M	railties/test/application/assets_test.rb

commit 4edf6ea	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-06 17:43:14 -0700

    Merge pull request #2897 from rsutphin/ar31-remove_connection
    
    Patch for issue #2820

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb

commit 9198c7a	refs/tags/v3.1.1.rc1
Merge: 4263a79 c5af3a6
Author: Aaron Patterson 
Date:   2011-09-06 17:43:14 -0700

    Merge pull request #2897 from rsutphin/ar31-remove_connection
    
    Patch for issue #2820

commit 4263a79	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-06 17:26:06 -0700

    updating changelog

M	actionpack/CHANGELOG

commit 9959233	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-06 17:25:20 -0700

    Eliminate newlines in basic auth. fixes #2882

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_basic_authentication_test.rb

commit f6ced69	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-06 17:25:20 -0700

    Eliminate newlines in basic auth. fixes #2882

M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_basic_authentication_test.rb

commit de03d4f	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-06 17:02:29 -0700

    updating changelog with pool limit

M	activerecord/CHANGELOG

commit 7c04e16	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-06 16:47:34 -0700

    Database adapters use a statement pool.
    
    Database adapters use a statement pool for limiting the number of open
    prepared statments on the database.  The limit defaults to 1000, but can
    be adjusted in your database config by changing 'statement_limit'.

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit b37112f	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-06 16:06:27 -0700

    adding a statement pool for mysql and sqlite3

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
A	activerecord/lib/active_record/connection_adapters/statement_pool.rb

commit 54b7e78	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-06 16:47:34 -0700

    Database adapters use a statement pool.
    
    Database adapters use a statement pool for limiting the number of open
    prepared statments on the database.  The limit defaults to 1000, but can
    be adjusted in your database config by changing 'statement_limit'.

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 2cf0bb4	refs/heads/master
Author: Jeff Dutil 
Date:   2011-09-06 19:14:38 -0400

    Revert "Use https for travis-ci build status image to prevent Github from caching the failed build image. [ci skip]"
    
    This reverts commit a873ea8e9fa5613acf6bfde3cfa2b17daf9a43df.
    
    rdoc doesn't generate the image over https.

M	README.rdoc

commit a873ea8	refs/heads/master
Author: Jeff Dutil 
Date:   2011-09-06 19:11:04 -0400

    Use https for travis-ci build status image to prevent Github from caching the failed build image. [ci skip]

M	README.rdoc

commit a4fa6ea	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-06 16:06:27 -0700

    adding a statement pool for mysql and sqlite3

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
A	activerecord/lib/active_record/connection_adapters/statement_pool.rb

commit c5af3a6	refs/tags/v3.1.1.rc1
Author: Rhett Sutphin 
Date:   2011-09-06 14:57:35 -0500

    Completely remove the pool when removing a connection. Fixes #2820.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb

commit 198092e	refs/heads/master
Author: Ryan Walker 
Date:   2011-09-06 14:06:34 -0300

    Added note about adding a javascript runtime to Gemfile for production environment.

M	railties/guides/source/asset_pipeline.textile

commit 51652a4	refs/heads/master
Merge: ef14a0e e0335e2
Author: Aaron Patterson 
Date:   2011-09-06 09:41:06 -0700

    Merge pull request #2893 from dmathieu/errors_has_key
    
    add has_key? to ActiveModel::Errors

commit e0335e2	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-06 18:35:12 +0200

    add has_key? to ActiveModel::Errors

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 699b83a	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-06 09:10:39 -0700

    Merge pull request #2577 from rails-noob/master
    
    Fix double slash at start of paths when mounting an engine at the root.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	railties/test/railties/mounted_engine_test.rb

commit ef14a0e	refs/heads/master
Merge: 1e61f26 43fbb1e
Author: Santiago Pastorino 
Date:   2011-09-06 09:10:39 -0700

    Merge pull request #2577 from rails-noob/master
    
    Fix double slash at start of paths when mounting an engine at the root.

commit a22701e	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-06 09:03:52 -0700

    Merge pull request #2889 from guilleiguaran/perform-caching-assets
    
    config.action_controller.perform_caching isn't used anymore in asset pipeline

M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit 1e61f26	refs/heads/master
Merge: 9bde73f 6fc518e
Author: Santiago Pastorino 
Date:   2011-09-06 09:03:52 -0700

    Merge pull request #2889 from guilleiguaran/perform-caching-assets
    
    config.action_controller.perform_caching isn't used anymore in asset pipeline

commit 6fc518e	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-06 09:24:22 -0500

    config.action_controller.perform_caching isn't used anymore in assets pipeline, instead we are using config.assets.digest now

M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit d4b9829	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-06 16:34:32 +0100

    Nested through associations: preloads from the default scope of a through model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit 9bde73f	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-06 16:34:32 +0100

    Nested through associations: preloads from the default scope of a through model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit 43fbb1e	refs/heads/master
Author: rails-noob 
Date:   2011-08-23 18:01:02 +0000

    Fix bug #2579.
    Avoids double slash at start of paths when mounting an engine at the root.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	railties/test/railties/mounted_engine_test.rb

commit a48e332	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-06 15:58:07 +0100

    Ensure we are not comparing a string with a symbol in HasManyAssociation#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/car.rb

commit b24d668	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-06 15:58:07 +0100

    Ensure we are not comparing a string with a symbol in HasManyAssociation#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be.

M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/car.rb

commit 5e2bf4d	refs/heads/master
Author: Marcus Ilgner 
Date:   2011-09-06 16:27:26 +0200

    Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested.

M	railties/guides/source/asset_pipeline.textile

commit 9584e15	refs/heads/master
Author: Uģis Ozols 
Date:   2011-09-06 17:13:30 +0300

    Change hyphen to underscore.

M	railties/guides/source/asset_pipeline.textile

commit b8d4692	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-06 13:45:19 +0100

    Use broken YAML that will fail with Syck as well as Psych. Fixes test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.

M	activerecord/test/cases/fixtures_test.rb

commit 9f3e732	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-06 12:59:11 +0100

    Make the logic easier to read

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb

commit bf27792	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-06 11:45:08 +0100

    Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.

M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/base_test.rb

commit 77ff1ce	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-06 11:45:08 +0100

    Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.

M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/base_test.rb

commit 679a4eb	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-06 09:36:04 +0200

    #first doesn't take an order in this test

M	activerecord/test/cases/named_scope_test.rb

commit 3c846c2	refs/heads/master
Merge: 1fdd95d e8d5920
Author: Jon Leighton 
Date:   2011-09-06 02:56:15 -0700

    Merge pull request #2883 from dmathieu/fix_test
    
    #first doesn't take an order in this test

commit 431d766	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-06 10:55:41 +0100

    Add CHANGELOG entry for 78c896ce83f96df2a133ac314b317c1628101f31

M	activerecord/CHANGELOG

commit 1fdd95d	refs/heads/master
Merge: bd17c76 a76fbee
Author: Jon Leighton 
Date:   2011-09-06 02:50:27 -0700

    Merge pull request #2851 from dasch/patch-6
    
    No need to use a begin block there

commit e8d5920	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-06 09:36:04 +0200

    #first doesn't take an order in this test

M	activerecord/test/cases/named_scope_test.rb

commit 7231788	refs/heads/master
Author: Andrés Mejía 
Date:   2011-09-06 02:45:54 -0500

    Using more precise method signatures for AR::Relation#first_or_create family of methods.

M	activerecord/lib/active_record/relation.rb

commit d03aff7	refs/heads/master
Author: Andrés Mejía 
Date:   2011-09-06 02:02:28 -0500

    Adding first example with no arguments to AR::Relation#first_or_create and removing examples that create several users at the same time (this is confusing and not really helpful).

M	activerecord/lib/active_record/relation.rb

commit b949fde	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-05 20:34:11 -0300

    Bump uglifier up

M	railties/lib/rails/generators/app_base.rb

commit bd17c76	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-05 20:33:26 -0300

    Bump uglifier up

M	railties/lib/rails/generators/app_base.rb

commit 10f2c01	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-05 16:09:19 -0700

    Merge pull request #2870 from arunagw/uglifier_bump
    
    Uglifier bump

M	Gemfile

commit c0f3df3	refs/heads/master
Merge: 1643820 5e35d62
Author: Santiago Pastorino 
Date:   2011-09-05 16:09:19 -0700

    Merge pull request #2870 from arunagw/uglifier_bump
    
    Uglifier bump

commit d194397	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-05 15:41:59 -0700

    Merge pull request #2877 from dmathieu/fix_tests_pg_18
    
    Last orders the records by id

M	activerecord/test/cases/named_scope_test.rb

commit 1643820	refs/heads/master
Merge: 6d93f70 51da1e5
Author: Santiago Pastorino 
Date:   2011-09-05 15:41:59 -0700

    Merge pull request #2877 from dmathieu/fix_tests_pg_18
    
    Last orders the records by id

commit 51da1e5	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-05 19:37:53 +0200

    first and last orders the records by id

M	activerecord/test/cases/named_scope_test.rb

commit c33b7c4	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-05 14:17:55 -0700

    Merge pull request #2716 from jbbarth/fix_invert_rename_index
    
    Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 6d93f70	refs/heads/master
Merge: 2175012 24674b3
Author: Aaron Patterson 
Date:   2011-09-05 14:17:55 -0700

    Merge pull request #2716 from jbbarth/fix_invert_rename_index
    
    Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index

commit 78c896c	refs/tags/v3.1.1.rc1
Author: Georg Friedrich 
Date:   2011-09-05 21:25:57 +1000

    Don't find belongs_to target when the foreign_key is NULL. Fixes #2828

M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 2175012	refs/heads/master
Author: Georg Friedrich 
Date:   2011-09-05 21:25:57 +1000

    Don't find belongs_to target when the foreign_key is NULL. Fixes #2828

M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit a7f5532	refs/tags/v3.1.1.rc1
Merge: 76d3b47 d1a2701
Author: Santiago Pastorino 
Date:   2011-09-05 07:23:38 -0700

    Merge pull request #2874 from sikachu/3-1-stable-extractable_ordered_hash
    
    Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!`

commit d1a2701	refs/tags/v3.1.1.rc1
Author: Prem Sichanugrist 
Date:   2011-09-03 14:43:33 +0700

    Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!`
    
    `ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/ordered_hash.rb
M	activesupport/test/ordered_hash_test.rb

commit 76d3b47	refs/tags/v3.1.1.rc1
Merge: 4b39d4d 327fa94
Author: Jon Leighton 
Date:   2011-09-05 07:12:21 -0700

    Merge pull request #2871 from dmathieu/limit-3-1-stable
    
    Backport #2789 to 3-1-stable

commit 4b39d4d	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-05 07:09:13 -0700

    Merge pull request #2873 from guilleiguaran/remove-unused-config
    
    Remove unused config variable from test.rb template

M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 7f7e362	refs/heads/master
Merge: a23e385 e8cb06a
Author: Santiago Pastorino 
Date:   2011-09-05 07:09:13 -0700

    Merge pull request #2873 from guilleiguaran/remove-unused-config
    
    Remove unused config variable from test.rb template

commit a23e385	refs/heads/master
Merge: f4a690d ffe56f3
Author: Santiago Pastorino 
Date:   2011-09-05 07:08:39 -0700

    Merge pull request #2872 from sikachu/content_tag_html_safe
    
    Make sure that result from content_tag_for with collection is html_safe

commit e8cb06a	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-05 08:59:37 -0500

    Remove unused config variable from test.rb template

M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 327fa94	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-05 15:03:31 +0200

    Backport #2789 and add changelog entry

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit f4a690d	refs/heads/master
Merge: c255e0e fddf7ea
Author: Santiago Pastorino 
Date:   2011-09-05 06:13:14 -0700

    Merge pull request #2815 from avakhov/current-page-non-get-requests
    
    current_page? returns false for non-GET requests

commit c255e0e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-05 06:10:12 -0700

    Merge pull request #2799 from tomstuart/3-1-stable
    
    Never return stored content from content_for when a block is given

M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/test/template/capture_helper_test.rb

commit a2baf03	refs/tags/v3.1.1.rc1
Merge: 0b7a1f8 f49faeb
Author: Santiago Pastorino 
Date:   2011-09-05 06:10:12 -0700

    Merge pull request #2799 from tomstuart/3-1-stable
    
    Never return stored content from content_for when a block is given

commit ffe56f3	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-09-05 20:04:37 +0700

    Make sure that result from content_tag_for with collection is html_safe
    
    Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.

M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	actionpack/test/template/record_tag_helper_test.rb

commit e221108	refs/heads/master
Merge: 24ee573 5f5527c
Author: Jon Leighton 
Date:   2011-09-05 05:41:46 -0700

    Merge pull request #2789 from dmathieu/limit_first_last
    
    Use LIMIT SQL word in first - Closes #2783

commit 5f5527c	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-05 13:40:49 +0200

    Use LIMIT sql word in last when it's possible

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 451cdd6	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-09-01 11:24:19 +0200

    use LIMIT SQL word in first - Closes #2783

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 5e35d62	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-05 15:07:45 +0530

    Uglifier bump

M	Gemfile

commit a76c23e	refs/heads/master
Author: dharmatech 
Date:   2011-09-05 04:07:48 -0500

    getting_started.textile: fix minor typo

M	railties/guides/source/getting_started.textile

commit 24ee573	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-05 13:41:25 +0530

    add blanks between methods

M	actionpack/test/template/record_tag_helper_test.rb

commit 0b7a1f8	refs/tags/v3.1.1.rc1
Merge: 1458ada 1b1bd6c
Author: Jon Leighton 
Date:   2011-09-05 00:23:17 -0700

    Merge pull request #2867 from arunagw/batches_test_pg_3-1-stable
    
    Need to make sure about order here.

commit 499ad11	refs/heads/master
Merge: 7e16394 76e9401
Author: Jon Leighton 
Date:   2011-09-05 00:23:10 -0700

    Merge pull request #2868 from arunagw/batches_test_pg_master
    
    Sort here to make sure the order is ok.

commit 76e9401	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-05 12:49:34 +0530

    Sort here to make sure the order is ok.

M	activerecord/test/cases/batches_test.rb

commit 7e16394	refs/heads/master
Merge: 4f87773 5acbc19
Author: José Valim 
Date:   2011-09-05 00:16:41 -0700

    Merge pull request #2713 from FLOChip/500-fixed
    
    remove misleading line on 500 error page. #2648

commit 1b1bd6c	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-05 12:46:38 +0530

    Sort here to make sure the order is ok.

M	activerecord/test/cases/batches_test.rb

commit 4f87773	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-05 00:43:51 -0300

    Remove empty test

M	actionpack/test/template/record_tag_helper_test.rb

commit 8bffd6c	refs/heads/master
Merge: 1e13fac fa0ebf4
Author: Santiago Pastorino 
Date:   2011-09-04 20:37:02 -0700

    Merge pull request #2863 from raybaxter/silence_unitialized_instance_variable_warnings
    
    Silence unitialized instance variable warnings

commit fa0ebf4	refs/heads/master
Author: Ray Baxter 
Date:   2011-09-04 13:11:54 -0700

    Tests shouldn't produce warnings

M	actionpack/test/template/record_tag_helper_test.rb

commit 8df4fb1	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-04 21:17:23 -0500

    Add reference about "bundle install --without assets" in Precompiling Assets section.

M	railties/guides/source/asset_pipeline.textile

commit 1458ada	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-04 19:01:46 -0700

    Merge pull request #2861 from guilleiguaran/assets-fix-changelog
    
    Add entry about Asset behaviour fix to ActionPack ChangeLog

M	actionpack/CHANGELOG

commit 1e13fac	refs/heads/master
Merge: 6521cf3 81d7157
Author: Santiago Pastorino 
Date:   2011-09-04 19:01:46 -0700

    Merge pull request #2861 from guilleiguaran/assets-fix-changelog
    
    Add entry about Asset behaviour fix to ActionPack ChangeLog

commit a1dbd94	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-04 21:01:04 -0500

    Add CoffeeScript example to JavaScript and ERB section

M	railties/guides/source/asset_pipeline.textile

commit 3e62235	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-04 20:56:47 -0500

    Add JavaScript and ERB section to Asset Guide

M	railties/guides/source/asset_pipeline.textile

commit 81d7157	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-04 20:35:27 -0500

    Add entry about Asset behaviour fix to ActionPack ChangeLog

M	actionpack/CHANGELOG

commit 0a2ea92	refs/heads/master
Author: Hendy Tanata 
Date:   2011-09-05 08:05:06 +0800

    Fix grammar for content_tag_for and div_for docs.

M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	railties/guides/source/action_view_overview.textile

commit 3250c7f	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-04 15:41:13 -0700

    Merge pull request #2860 from guilleiguaran/fix-assets-behavior
    
    Fix AssetNotPrecompiledError behavior

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	railties/test/application/assets_test.rb

commit 6521cf3	refs/heads/master
Merge: a1fa756 9bc0082
Author: Santiago Pastorino 
Date:   2011-09-04 15:41:13 -0700

    Merge pull request #2860 from guilleiguaran/fix-assets-behavior
    
    Fix AssetNotPrecompiledError behavior

commit 9bc0082	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-04 17:24:01 -0500

    AssetNotPrecompiledError should be raise when config.assets.digest = false, config.assets.compile = false and manifest file isn't present

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	railties/test/application/assets_test.rb

commit 59a64a8	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-09-04 17:43:58 -0300

    * is not allowed in windows file names. Closes #2574 #2847

M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/hello,world.erb
D	actionpack/test/fixtures/test/hello_w*rld.erb

commit ba13004	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-04 17:43:58 -0300

    * is not allowed in windows file names. Closes #2574 #2847

M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/hello,world.erb
D	actionpack/test/fixtures/test/hello_w*rld.erb

commit a1fa756	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-04 17:43:58 -0300

    * is not allowed in windows file names. Closes #2574 #2847

M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/hello,world.erb
D	actionpack/test/fixtures/test/hello_w*rld.erb

commit 6c46506	refs/heads/master
Merge: e865d12 9066e34
Author: Jon Leighton 
Date:   2011-09-04 13:39:28 -0700

    Merge pull request #2855 from arunagw/fix_find_in_batches_master
    
    We need to recorder here. Need to drop the order from default scope.

commit 6abb8c9	refs/tags/v3.1.1.rc1
Merge: 6be4deb c0f73be
Author: Jon Leighton 
Date:   2011-09-04 13:38:39 -0700

    Merge pull request #2854 from arunagw/find_in_batches_changelog
    
    Find in batches changelog

commit 14157b7	refs/heads/master
Author: Ray Baxter 
Date:   2011-09-04 13:34:07 -0700

    clarify where the branch name will exist

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 9066e34	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-05 00:12:57 +0530

    We need to recorder here. Need to drop the order from default scope.
    
    Fixes #2832

M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/models/post.rb

commit c0f73be	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-05 00:04:32 +0530

    Changelog updated for find_in_batches fix.

M	activerecord/CHANGELOG

commit 6be4deb	refs/tags/v3.1.1.rc1
Merge: 9ef943c e8761b3
Author: Jon Leighton 
Date:   2011-09-04 11:28:46 -0700

    Merge pull request #2850 from arunagw/find_in_batch_fix
    
    Find in batch fix

commit e8761b3	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-04 17:48:21 +0530

    We need to recorder here. Need to drop the order from default scope.
    
    Fixes #2832

M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/models/post.rb

commit e865d12	refs/heads/master
Merge: abb0905 9b08afd
Author: Jon Leighton 
Date:   2011-09-04 09:05:45 -0700

    Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checks
    
    if ... nil? is more expensive than unless

commit a76fbee	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-09-04 18:48:50 +0300

    No need to use a begin block there

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 9b08afd	refs/heads/master
Author: Milan Dobrota 
Date:   2011-09-04 10:44:08 -0500

    if ... nil? is more expensive than unless

M	actionpack/lib/action_controller/caching/sweeping.rb
M	actionpack/lib/action_controller/metal/redirecting.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb

commit 9ef943c	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-09-04 18:49:16 +0530

    minor fixes in assets guide

M	railties/guides/source/asset_pipeline.textile

commit c0b73b5	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-09-04 03:44:47 +0530

    add some missing dots in the docs

M	railties/guides/source/configuring.textile

commit abb0905	refs/heads/master
Merge: 74372f7 a6bafb3
Author: Vijay Dev 
Date:   2011-09-04 18:58:34 +0530

    Merge docrails, resolving conflicts in the assets guide

commit a6bafb3	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-04 18:49:16 +0530

    minor fixes in assets guide

M	railties/guides/source/asset_pipeline.textile

commit 74372f7	refs/heads/master
Merge: ef7e60f fc5e3ff
Author: Jon Leighton 
Date:   2011-09-04 03:11:45 -0700

    Merge pull request #2848 from arunagw/jruby_activesupport_fix
    
    Need to have a check here for JAVA PLATFORM for JRuby

commit df3360f	refs/tags/v3.1.1.rc1
Merge: 000fee7 5df885e
Author: Jon Leighton 
Date:   2011-09-04 03:11:13 -0700

    Merge pull request #2849 from arunagw/jruby_activesupport_fix_3-1-stable
    
    Jruby activesupport fix 3 1 stable for JRuby

commit fc5e3ff	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-04 13:18:57 +0530

    We can't simply check the first line of the backtrace,
    because JRuby reports the call to __send__ in the backtrace.

M	activesupport/test/core_ext/module_test.rb

commit 5df885e	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-04 13:30:40 +0530

    We can't simply check the first line of the
    backtrace, because JRuby reports the call
    to __send__ in the backtrace.
    
    In JRuby first is "org/jruby/RubyKernel.java"

M	activesupport/test/core_ext/module_test.rb

commit ef7e60f	refs/heads/master
Author: Jon Leighton 
Date:   2011-09-04 09:56:55 +0100

    Revert "Fixes bug in ActiveRecord::QueryMethods, #1697"
    
    This reverts commit 0df27c98d982ec87d2fb48cfda82694eb267993e.
    
    Reverted due to failing test, see #2845.

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 000fee7	refs/tags/v3.1.1.rc1
Merge: 04c25a7 8be13b5
Author: Jon Leighton 
Date:   2011-09-04 01:47:54 -0700

    Merge pull request #2846 from arunagw/bcrypt_3-1-stable
    
    Bcrypt 3 1 stable

commit 98c3fd8	refs/heads/master
Merge: 036a250 47bc5d0
Author: José Valim 
Date:   2011-09-04 01:47:10 -0700

    Merge pull request #2841 from wojtekmach/app-generators-group
    
    Add gem group support to generators

commit 47bc5d0	refs/heads/master
Author: Wojciech Mach 
Date:   2011-09-04 10:14:53 +0200

    Add gem_group support to generators

M	railties/guides/source/generators.textile
M	railties/guides/source/rails_application_templates.textile
M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit 036a250	refs/heads/master
Merge: 0eefd8d b84cee0
Author: José Valim 
Date:   2011-09-04 00:28:15 -0700

    Merge pull request #2816 from sikachu/content_tag_for
    
    Make `content_tag_for` and `div_for` accepts the array of records

commit b84cee0	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-09-02 21:35:24 +0700

    Make `content_tag_for` and `div_for` accepts the array of records
    
    So instead of having to do this:
    
       @items.each do |item|
         content_tag_for(:li, item) do
            Title: <%= item.title %>
         end
       end
    
    You can now do this:
    
       content_tag_for(:li, @items) do |item|
         Title: <%= item.title %>
       end

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/record_tag_helper.rb
M	actionpack/test/template/record_tag_helper_test.rb
M	railties/guides/source/action_view_overview.textile

commit 479c853	refs/heads/master
Merge: 5014b33 d72ecd9
Author: Guillermo Iguaran 
Date:   2011-09-03 21:03:28 -0700

    Merge pull request #64 from rinaldifonseca/master
    
    Added |t| to create_table block

commit 8be13b5	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-04 09:32:15 +0530

    require bcrypt to pass the test

M	activerecord/test/cases/base_test.rb

commit d72ecd9	refs/heads/master
Author: Rinaldi Fonseca 
Date:   2011-09-04 00:34:56 -0300

    Added |t| to create_table block

M	railties/guides/source/3_1_release_notes.textile

commit 04c25a7	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-09-04 00:24:31 -0300

    Remove useless parens

M	railties/test/railties/shared_tests.rb

commit 0eefd8d	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-04 00:24:31 -0300

    Remove useless parens

M	railties/test/railties/shared_tests.rb

commit 60b8bfa	refs/heads/master
Merge: 0a38e2a a6c6022
Author: Santiago Pastorino 
Date:   2011-09-03 20:17:07 -0700

    Merge pull request #2844 from arunagw/warnings_removed_master
    
    Warnings removed from master

commit 4fa403c	refs/tags/v3.1.1.rc1
Merge: 45f0dc4 f397ced
Author: Santiago Pastorino 
Date:   2011-09-03 20:17:04 -0700

    Merge pull request #2843 from arunagw/warnings_removed_for_test_3-1-stable
    
    Warnings removed for test 3 1 stable

commit f397ced	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-04 08:41:50 +0530

    stop circular require warnings

M	actionpack/lib/action_dispatch/railtie.rb
M	activesupport/lib/active_support/i18n_railtie.rb
M	activesupport/lib/active_support/railtie.rb

commit a6c6022	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-04 08:24:02 +0530

    Modified content in guides and comments
    for "assert /" warnings.
    Removed because if somebody will use this code
    they will get warnings!

M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/testing.textile
M	railties/lib/rails/generators/test_case.rb

commit c8d0dc3	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-04 08:23:13 +0530

    Warnings removed for "assert_match /" Please do
    not add more.!

M	railties/test/application/asset_debugging_test.rb
M	railties/test/application/assets_test.rb
M	railties/test/application/rake_test.rb
M	railties/test/generators/plugin_new_generator_test.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/shared_tests.rb

commit 34618e6	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-04 08:17:53 +0530

    Warnings removed for using shadow variable.

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/shared_generator_tests.rb

commit 9859928	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-04 08:10:48 +0530

    Modified content in guides and comments
    for "assert /" warnings.
    Removed because if somebody will use this code
    they will get warnings!

M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/testing.textile
M	railties/lib/rails/generators/test_case.rb

commit 009a0f8	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-04 08:09:13 +0530

    Warnings removed for "assert_match /" Please do
    not add more.!

M	railties/test/application/assets_test.rb
M	railties/test/application/initializers/notifications_test.rb
M	railties/test/application/rack/logger_test.rb
M	railties/test/application/rake_test.rb
M	railties/test/generators/plugin_new_generator_test.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/shared_tests.rb

commit 2a959d8	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-04 08:08:22 +0530

    Warnings removed for unused variables.
    Warnings removed for using shadow variable.

M	activesupport/test/safe_buffer_test.rb
M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/shared_generator_tests.rb

commit 45f0dc4	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-09-03 15:20:18 -0700

    restores the API docs of AR::Fixtures, made a quick pass over them, revises link in fixture template [closes #2840]
    
    Conflicts:
    
    	activerecord/lib/active_record/fixtures.rb

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/fixtures/tasks.yml
M	railties/lib/rails/generators/test_unit/model/templates/fixtures.yml

commit 0a38e2a	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-03 15:20:18 -0700

    restores the API docs of AR::Fixtures, made a quick pass over them, revises link in fixture template [closes #2840]

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/fixtures/tasks.yml
M	railties/lib/rails/generators/test_unit/model/templates/fixtures.yml

commit 5014b33	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-04 03:44:47 +0530

    add some missing dots in the docs

M	railties/guides/source/configuring.textile

commit 510a970	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-09-03 15:12:48 -0700

    Merge pull request #2835 from guilleiguaran/actionpack-changelog
    
    Include ticket numbers in AP CHANGELOG

M	actionpack/CHANGELOG

commit caec291	refs/tags/v3.1.1.rc1
Merge: ba75385 d3b7c34
Author: Santiago Pastorino 
Date:   2011-09-03 15:12:48 -0700

    Merge pull request #2835 from guilleiguaran/actionpack-changelog
    
    Include ticket numbers in AP CHANGELOG

commit ba75385	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-31 20:05:59 -0500

    Review config.assets options.

M	railties/guides/source/configuring.textile

commit ce5b559	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-09-01 10:52:59 +1200

    Added new asset config options to guides

M	railties/guides/source/configuring.textile

commit d3b7c34	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-03 13:29:50 -0500

    Include ticket numbers in CHANGELOG

M	actionpack/CHANGELOG

commit 9da07d1	refs/heads/master
Merge: 8a9f4c6 19ec3c1
Author: Vijay Dev 
Date:   2011-09-03 13:17:16 -0700

    Merge pull request #2836 from avakhov/action-controller-helpers-desc
    
    fix helpers behavior description

commit 19ec3c1	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-03 23:13:40 +0400

    fix helpers behavior description

M	actionpack/lib/action_controller/metal/helpers.rb

commit 459e62a	refs/tags/v3.1.1.rc1
Merge: b7a62f2 0a6de72
Author: Aaron Patterson 
Date:   2011-09-03 10:52:06 -0700

    Merge pull request #2826 from guilleiguaran/changelog-remove-bcrypt
    
    Changelog entry about remove of bcrypt as hard dependency on ActiveModel

commit 0a6de72	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-03 01:33:00 -0500

    Add entry about bcrypt-ruby remove to ActiveModel changelog

M	activemodel/CHANGELOG

commit b7a62f2	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-03 10:14:11 -0700

    Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments
    
    Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile

M	activemodel/lib/active_model/secure_password.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 8a9f4c6	refs/heads/master
Merge: 867c830 9b02f3f
Author: Aaron Patterson 
Date:   2011-09-03 10:14:11 -0700

    Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments
    
    Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile

commit 867c830	refs/heads/master
Merge: d50c0ac bf4117a
Author: Aaron Patterson 
Date:   2011-09-03 10:12:39 -0700

    Merge pull request #2824 from arunagw/bcrypt_fix
    
    Need to add here to pass the test

commit 66754c4	refs/tags/v3.1.1.rc1
Merge: e835aa0 e7eba93
Author: Aaron Patterson 
Date:   2011-09-03 10:04:17 -0700

    Merge pull request #2829 from arunagw/pg_min_fix
    
    pg does not allow aliases in the having clause, but functions are fine

commit e835aa0	refs/tags/v3.1.1.rc1
Merge: e491444 891d0d7
Author: Aaron Patterson 
Date:   2011-09-03 10:03:35 -0700

    Merge pull request #2831 from arunagw/pg_abstract_class_fix
    
    Fixed test for 3-1-stable. Abstract class is having nil class name.

commit 891d0d7	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-03 17:20:23 +0530

    We need to check here for the table name.
    Abstract classes are having nil class name.
    So nil.gsub will give a error here.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit e491444	refs/tags/v3.1.1.rc1
Merge: e7ee2a9 df01e2e
Author: Vijay Dev 
Date:   2011-09-03 04:00:05 -0700

    Merge pull request #2830 from arunagw/warning_removed_3-1-stable
    
    Warning removed 3 1 stable

commit df01e2e	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-03 16:13:43 +0530

    Warning removed.

M	activerecord/test/cases/base_test.rb

commit e7eba93	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-09-03 16:01:53 +0530

    pg does not allow aliases in the having clause, but functions are fine

M	activerecord/test/cases/calculations_test.rb

commit bf4117a	refs/heads/master
Author: Arun Agrawal 
Date:   2011-09-03 10:07:07 +0530

    Need to add here to pass the test
    As in previous commit it's removed.

M	activerecord/test/cases/base_test.rb

commit d50c0ac	refs/heads/master
Merge: 5912ed9 9984266
Author: José Valim 
Date:   2011-09-03 01:25:44 -0700

    Merge pull request #2827 from sikachu/extractable_ordered_hash
    
    Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!

commit 9984266	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-09-03 14:43:33 +0700

    Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!`
    
    `ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/ordered_hash.rb
M	activesupport/test/ordered_hash_test.rb

commit 9b02f3f	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-03 00:27:07 -0500

    Add comments about bcrypt-ruby gem to SecurePassword

M	activemodel/lib/active_model/secure_password.rb

commit af54fc5	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-03 00:05:37 -0500

    Add bcrypt-ruby to Gemfile template

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit e7ee2a9	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-09-03 01:39:28 +0200

    syncs asset pipeline guide with master

M	railties/guides/source/asset_pipeline.textile

commit 5912ed9	refs/heads/master
Author: Xavier Noria 
Date:   2011-09-03 01:36:57 +0200

    fixes CSS example in the asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 1b8290d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-02 17:10:11 -0500

    Fix asset_path example in CSS and ERB section

M	railties/guides/source/asset_pipeline.textile

commit 5b7bcb4	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-03 02:44:49 +0530

    document send_file guesses content type from the file extension
    and remove info about x_send_file option to send_file

M	railties/guides/source/action_controller_overview.textile

commit a3edf3d	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-03 09:11:20 +1200

    fix YUI description
    
    YUI CSS compressor does not extend syntax! Also
    added link to more info

M	railties/guides/source/asset_pipeline.textile

commit b3a0325	refs/heads/master
Author: David Peckham 
Date:   2011-09-02 13:38:13 -0700

    Fixed a typo in the section about migration.

M	railties/guides/source/getting_started.textile

commit f83f169	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-03 01:40:00 +0530

    some of the changes for validation earlier reverted from d20281a

M	railties/guides/source/active_model_basics.textile
M	railties/guides/source/active_record_querying.textile
M	railties/guides/source/performance_testing.textile

commit 78497c7	refs/heads/master
Author: Franco Catena 
Date:   2011-09-02 14:52:58 -0300

    Change photos_path to photos_url in Using redirect_to
    
    Is more "correct" a complete url than only the path

M	railties/guides/source/layouts_and_rendering.textile

commit eeda840	refs/heads/master
Merge: 6779064 44284a6
Author: Vijay Dev 
Date:   2011-09-02 23:00:59 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 44284a6	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-02 22:57:03 +0530

    Revert "Fixing guides validation errors."
    
    This reverts commit d20281add192e5afba66e555ce67cf73943b033b.
    
    Reason: This needs more investigation. Will apply when this is verified.

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_model_basics.textile
M	railties/guides/source/active_record_querying.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/performance_testing.textile

commit 220c77d	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-02 22:42:23 +0530

    debug option to js, stylesheet tags are ignored when debug mode is off

M	railties/guides/source/asset_pipeline.textile

commit 2b15762	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-01 23:54:17 -0500

    Remove hard dependency on bcrypt.

M	Gemfile
M	activemodel/activemodel.gemspec
M	activemodel/lib/active_model/secure_password.rb

commit 6779064	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-01 23:54:17 -0500

    Remove hard dependency on bcrypt.

M	Gemfile
M	activemodel/activemodel.gemspec
M	activemodel/lib/active_model/secure_password.rb

commit 57847fb	refs/heads/master
Merge: 3a7c16d d20281a
Author: Andrew Olson 
Date:   2011-09-02 12:02:14 -0400

    Merge branch 'fix_validation_errors'

commit d20281a	refs/heads/master
Author: Andrew Olson 
Date:   2011-09-02 11:48:45 -0400

    Fixing guides validation errors.

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_model_basics.textile
M	railties/guides/source/active_record_querying.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/performance_testing.textile

commit 3a7c16d	refs/heads/master
Author: Matt Burke 
Date:   2011-09-02 10:20:23 -0400

    When a collection is empty, render returns nil.

M	railties/guides/source/layouts_and_rendering.textile

commit fddf7ea	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-02 18:20:10 +0400

    current_page? returns false for non-GET requests

M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit 36b640e	refs/heads/master
Merge: 16aa433 d0f9f4e
Author: Josh Nesbitt 
Date:   2011-09-02 13:29:20 +0100

    Merge branch 'activemodel_typo_fix'

commit d0f9f4e	refs/heads/master
Author: Josh Nesbitt 
Date:   2011-09-02 13:28:38 +0100

    Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class method, not attribute.

M	activemodel/lib/active_model/dirty.rb

commit 36f1612	refs/heads/master
Merge: 6f3c699 e61d6af
Author: José Valim 
Date:   2011-09-02 03:05:49 -0700

    Merge pull request #2811 from avakhov/fix-environment-generator-action
    
    fix indent for generator environment method

commit e61d6af	refs/heads/master
Author: Alexey Vakhov 
Date:   2011-09-02 13:31:00 +0400

    fix indent for generator environment method

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit c0ae44c	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-09-02 08:55:47 +0100

    Add missing CHANGELOG entry. Closes #2791.

M	activerecord/CHANGELOG

commit 16aa433	refs/heads/master
Author: Stephen J. Butler 
Date:   2011-09-01 19:55:38 -0500

    Change the styling of 'initialize' to '+initialize+' (the former breaks the HTML generation).

M	railties/guides/source/initialization.textile

commit e6fd4ed	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-01 15:24:16 -0700

    preserve the backtrace of the exception

M	activerecord/lib/active_record/fixtures.rb

commit f2aa46b	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-09-01 15:00:31 -0700

    * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 6f3c699	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-01 15:00:31 -0700

    * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/fixtures/file.rb
M	activerecord/test/cases/fixtures_test.rb

commit e46c4f1	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-01 15:00:31 -0700

    * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 8b9ddbd	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-01 14:06:20 -0700

    make sure encoding_aware? is available

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 3afa90d	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-01 14:06:20 -0700

    make sure encoding_aware? is available

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit ca7c37a	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-02 08:39:16 +1200

    fix some minor omissions in pipeline docs

M	railties/guides/source/asset_pipeline.textile

commit af7c9b9	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-09-01 13:37:14 -0700

    CookieJar is enumerable. fixes #2795

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit fdd619e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-09-01 13:37:14 -0700

    CookieJar is enumerable. fixes #2795

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 2d92962	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-09-01 16:02:08 -0300

    Add #update_attributes as another alternative to #update_column.

M	railties/guides/source/3_1_release_notes.textile

commit 5fbbf44	refs/heads/master
Merge: c96cb88 3f64fa9
Author: Vijay Dev 
Date:   2011-09-01 11:51:31 -0700

    Merge pull request #63 from carlosparamio/master
    
    Fix name of parent resource params when declaring nested resources at routes

commit 1ebf84a	refs/heads/master
Author: Jeremy Evans 
Date:   2011-09-01 11:49:49 -0700

    Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHub

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 3f64fa9	refs/heads/master
Author: Carlos Paramio 
Date:   2011-09-01 20:34:15 +0200

    Fix name of parent resource params when declaring nested resources at routes

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 90248d2	refs/heads/master
Merge: 7a7a3bc 0df27c9
Author: Aaron Patterson 
Date:   2011-09-01 11:29:20 -0700

    Merge pull request #2775 from jaw6/fix/reverse
    
    Fixes bug in ActiveRecord::QueryMethods, #1697

commit c96cb88	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-01 23:50:31 +0530

    Revert "Fix logic in 3.1 release notes sentence"
    
    This reverts commit 30d65da17e5fb1cdd3f10a6d14f4295b57e26286.
    
    Reason: This commit is incorrect. It is indeed recommended to use
    update_attribute when you want callbacks to be invoked.

M	railties/guides/source/3_1_release_notes.textile

commit 7a7a3bc	refs/heads/master
Merge: 47f465d a720243
Author: Vijay Dev 
Date:   2011-09-01 10:45:34 -0700

    Merge pull request #2718 from dasch/patch-5
    
    Split long string into multiple shorter ones

commit 8e900f1	refs/heads/master
Author: Andy Leeper 
Date:   2011-09-01 10:42:28 -0700

    Modified ActionMailer Basics doc with the following change:
    * Changed the lines that said config/environments/env.rb to config/environments/$RAILS_ENV.rb.  People were mis-interpreting the filename to literally be env.rb.

M	railties/guides/source/action_mailer_basics.textile

commit 47f465d	refs/heads/master
Merge: da516e8 28d605f
Author: José Valim 
Date:   2011-09-01 10:08:37 -0700

    Merge pull request #2585 from marcgg/fix-ruby19-splitoptions
    
    In some case ActiveResource fails to handle serialized attributes with Ruby 1.9 and crashes

commit 28d605f	refs/heads/master
Author: Marc G Gauthier 
Date:   2011-09-01 18:26:29 +0200

    Do not use objects that don't respond to to_sym (integers, floats, dates...) as parameters

M	activeresource/lib/active_resource/base.rb
M	activeresource/test/cases/base/load_test.rb

commit bc83e48	refs/heads/master
Merge: 752d74f 3461a5d
Author: Vijay Dev 
Date:   2011-09-01 09:02:35 -0700

    Merge pull request #62 from roytomeij/master
    
    Call Sass by it's proper name while talking about the language, instead of using "SCSS" (which is a syntax within Sass).

commit 3461a5d	refs/heads/master
Author: Roy Tomeij 
Date:   2011-09-01 17:24:26 +0200

    Change "SCSS" to "Sass" in sentences where it's referred to as "language", because Sass is the language (SCSS is one possible syntax within the Sass language), as per documentation on sass-lang.com.

M	railties/guides/source/asset_pipeline.textile

commit 752d74f	refs/heads/master
Author: Vijay Dev 
Date:   2011-09-01 01:35:28 +0530

    docs formatting changes

M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit f49faeb	refs/tags/v3.1.1.rc1
Author: Tom Stuart 
Date:   2011-09-01 10:42:43 +0100

    Never return stored content from content_for when a block is given
    
    The capture helper may return nil when evaluation of the block has
    produced a buffer which contains only whitespace, but that doesn't
    mean content_for should return stored content.

M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/test/template/capture_helper_test.rb

commit b149021	refs/tags/v3.1.1.rc1
Author: Tom Stuart 
Date:   2011-09-01 12:21:44 +0100

    Improve content_for test coverage

M	actionpack/test/template/capture_helper_test.rb

commit cfd785f	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-01 21:20:26 +1200

    Move css data URI into css/erb section

M	railties/guides/source/asset_pipeline.textile

commit 1f998c7	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-01 21:15:06 +1200

    pipeline docs improvement
    
    Some cleaning up of whitespace/punctuation
    and text refinements to clarify some things.

M	railties/guides/source/asset_pipeline.textile

commit da516e8	refs/heads/master
Merge: b93c360 58b0c97
Author: José Valim 
Date:   2011-09-01 01:59:58 -0700

    Merge pull request #2788 from spohlenz/precompile-without-digests-master
    
    assets:precompile should not append asset digests when config.assets.digest is false

commit 58b0c97	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-09-01 09:23:51 +0930

    assets:precompile should not append asset digests when config.assets.digest is false

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 8b049a1	refs/tags/v3.1.1.rc1
Merge: 9bfaef0 a5619c0
Author: José Valim 
Date:   2011-09-01 01:29:24 -0700

    Merge pull request #2782 from spohlenz/precompile-without-digests
    
    assets:precompile should not append asset digests when config.assets.digest is false

commit b93c360	refs/heads/master
Merge: 9af2b5e 5bb1c7a
Author: José Valim 
Date:   2011-09-01 01:20:18 -0700

    Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master
    
    Add missing changelog entries for 3.1.1

commit 9af2b5e	refs/heads/master
Merge: 3ce3b5b d5165e5
Author: José Valim 
Date:   2011-09-01 01:15:34 -0700

    Merge pull request #2786 from spohlenz/extract-asset-paths-config-master
    
    Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper

commit 5bb1c7a	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-01 03:12:13 -0500

    Add missing changelog entries for 3.1.1

M	actionpack/CHANGELOG

commit d5165e5	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-09-01 14:59:16 +0930

    Move references to Rails.application.config out of Sprockets AssetPaths

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit a5619c0	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-09-01 09:23:51 +0930

    assets:precompile should not append asset digests when config.assets.digest is false

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 9bfaef0	refs/tags/v3.1.1.rc1
Merge: 6ba9aa7 6bc6978
Author: José Valim 
Date:   2011-09-01 00:47:06 -0700

    Merge pull request #2785 from spohlenz/extract-asset-paths-config
    
    Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper

commit 6ba9aa7	refs/tags/v3.1.1.rc1
Merge: c2a323d 08f46b6
Author: José Valim 
Date:   2011-09-01 00:40:36 -0700

    Merge pull request #2784 from guilleiguaran/changelog-3-1-1
    
    Add missing changelog entries for 3.1.1

commit 5421d4d	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-01 18:25:24 +1200

    pipeline docs - spelling and some whitespace

M	railties/guides/source/asset_pipeline.textile

commit 72fea6d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-01 01:18:20 -0500

    Adding reference about ExecJS for CoffeeScript

M	railties/guides/source/asset_pipeline.textile

commit fdf2f51	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-01 01:15:19 -0500

    Add reference to ExecJS in JavaScript Compression section

M	railties/guides/source/asset_pipeline.textile

commit 418e321	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-01 01:01:31 -0500

    Fixing sass-rails helpers methods examples

M	railties/guides/source/asset_pipeline.textile

commit 4ba35dd	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-09-01 00:35:01 -0500

    Giving info about what are the defaults for test environment

M	railties/guides/source/asset_pipeline.textile

commit 6bc6978	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-09-01 14:59:16 +0930

    Move references to Rails.application.config out of Sprockets AssetPaths

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 08f46b6	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-09-01 00:14:01 -0500

    Add missing changelog entries for 3.1.1

M	actionpack/CHANGELOG

commit 3ce3b5b	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-31 18:50:38 -0700

    Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes
    
    Assets pipeline: fix in manifest location and remove unused code

M	actionpack/lib/sprockets/assets.rake
M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit c2a323d	refs/tags/v3.1.1.rc1
Merge: c45ce6e e7a86b9
Author: Santiago Pastorino 
Date:   2011-08-31 18:50:38 -0700

    Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes
    
    Assets pipeline: fix in manifest location and remove unused code

commit ed1dfaf	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-01 13:28:33 +1200

    update pipeline docs to reflect new defaults
    
    Production section has been changed to reflect the
    new default of precompilation and using the asset
    manifest.
    
    Development has been swapped around to reflect the
    new default (debug mode is on).
    
    Other changes to support this elsewhere.

M	railties/guides/source/asset_pipeline.textile

commit fe07669	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-31 20:05:59 -0500

    Review config.assets options.

M	railties/guides/source/configuring.textile

commit 91fc865	refs/heads/master
Merge: e851e9e de6660b
Author: Xavier Noria 
Date:   2011-08-31 17:58:46 -0700

    Merge pull request #61 from gabebw/master
    
    Improve examples by using .each instead of for...in

commit de6660b	refs/heads/master
Author: Gabe Berke-Williams 
Date:   2011-08-31 20:52:35 -0400

    Improve examples: use each instead of for...in

M	actionpack/lib/action_view/base.rb
M	activerecord/lib/active_record/fixtures.rb

commit e7a86b9	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-31 17:46:41 -0500

    Remove deprecated code used only in Sprockets < 2.0.0.beta.15

M	actionpack/lib/sprockets/assets.rake

commit a4b7363	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-31 17:39:23 -0500

    Manifest should be nil by default. Closes #2776

M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit c5a91d0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-31 16:08:14 -0700

    should be using a / in this route rather than a #

M	railties/test/application/routing_test.rb

commit e851e9e	refs/heads/master
Merge: 6ce6ba8 f0af563
Author: Xavier Noria 
Date:   2011-08-31 16:10:09 -0700

    Merge branch 'master' of git://github.com/lifo/docrails

commit 6ce6ba8	refs/heads/master
Author: Kir 
Date:   2011-09-01 02:37:54 +0400

    Instructions for nginx and apache added

M	railties/guides/source/asset_pipeline.textile

commit f0af563	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-01 10:52:59 +1200

    Added new asset config options to guides

M	railties/guides/source/configuring.textile

commit c45ce6e	refs/tags/v3.1.1.rc1
Merge: d3d2cea 3fb0579
Author: Xavier Noria 
Date:   2011-08-31 15:56:19 -0700

    Merge pull request #2779 from kirs/3-1-stable
    
    Nginx and Apache configs to serve precompiled gzip assets were added to Asset Pipeline Guide

commit 5767c13	refs/heads/master
Author: Greg Leppert 
Date:   2011-08-31 19:39:41 -0300

    Update wording surrounding template file extensions to include Rails 3 and above.

M	railties/guides/source/layouts_and_rendering.textile

commit 3fb0579	refs/tags/v3.1.1.rc1
Author: Kir 
Date:   2011-09-01 02:37:54 +0400

    Instructions for nginx and apache added

M	railties/guides/source/asset_pipeline.textile

commit 2422fbf	refs/heads/master
Author: Ray Baxter 
Date:   2011-08-31 15:19:06 -0700

    make code example agree with text just above

M	railties/guides/source/getting_started.textile

commit d3d2cea	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-08-28 02:25:54 +0530

    doc fixes

M	README.rdoc
M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 8bb9bb2	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-09-01 09:11:00 +1200

    Add section to pipeline docs to help people upgrading
    
    These are the options from a brand new app, and
    should help people get it right when upgrading.

M	railties/guides/source/asset_pipeline.textile

commit 27bcd96	refs/heads/master
Merge: e3efe78 054bdc1
Author: Xavier Noria 
Date:   2011-08-31 14:30:25 -0700

    Merge branch 'master' of git://github.com/lifo/docrails

commit 054bdc1	refs/heads/master
Author: Richard Hulse 
Date:   2011-09-01 09:11:00 +1200

    Add section to pipeline docs to help people upgrading
    
    These are the options from a brand new app, and
    should help people get it right when upgrading.

M	railties/guides/source/asset_pipeline.textile

commit 0df27c9	refs/heads/master
Author: Joshua Wehner 
Date:   2011-08-31 15:04:41 -0400

    Fixes bug in ActiveRecord::QueryMethods, #1697
    
    Replace split on comma with a regexp that will reverse all ASC/DESC specifically

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit b550ecc	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-08-31 11:30:54 -0700

    use String#start_with? rather than creating regexps or comparing character values

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit e3efe78	refs/heads/master
Merge: 508f33f 8707460
Author: José Valim 
Date:   2011-08-31 11:25:47 -0700

    Merge pull request #2772 from guilleiguaran/backports-assets-pipeline
    
    Backports of the assets pipeline changes done in 3-1-stable

commit 120b534	refs/heads/master
Author: Andrew Olson 
Date:   2011-08-31 14:18:01 -0400

    Fixing spelling, throught -> through.

M	railties/guides/source/asset_pipeline.textile

commit 8707460	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-31 13:09:35 -0500

    Fix asset debugging tests to reflect last changes in 3-1-stable

M	railties/test/application/asset_debugging_test.rb

commit d0b3937	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-30 16:30:53 -0500

    Set default location of manifest with config.assets.manifest

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/application/assets_test.rb

commit f236e00	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-31 12:47:33 -0500

    Backport f443f9cb0c64 to master

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/application/assets_test.rb

commit fa04c37	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-31 12:42:54 -0500

    Backport b0f30631662 to master

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit dffdd82	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-29 16:28:11 -0500

    Read digests of assets from manifest.yml if config.assets.manifest is on

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/application/assets_test.rb

commit 508f33f	refs/heads/master
Author: Chris Griego 
Date:   2011-08-30 21:22:14 -0500

    Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public." to support date implementations without private to_date/to_datetime on Time (home_run).
    
    This reverts commit 080345baca1076a9788dff4803153600aec31f86.
    
    Signed-off-by: José Valim 

M	activesupport/lib/active_support/core_ext/time/conversions.rb

commit 73d34fe	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-31 09:42:43 -0500

    Always enable digest and compile in the Rake task

M	actionpack/lib/sprockets/assets.rake

commit 15b75b4	refs/tags/v3.1.1.rc1
Author: David Heinemeier Hansson 
Date:   2011-08-23 16:33:06 -0700

    Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore
    
    Add .rbenv-version to .gitignore

M	.gitignore

commit 8812807	refs/tags/v3.1.1.rc1
Merge: 5c5021f d6a0078
Author: Aaron Patterson 
Date:   2011-08-31 08:30:15 -0700

    Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable
    
    * '3-1-stable' of github.com:rails/rails:
      Always enable digest and compile in the Rake task
      don't need edgeapi now that we are on 3.1
      release notes: adds a couple of blank lines to get the markup right
      adds the release notes of 3.1 to the index
      Update Assets guide to reflect all the new changes
      Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public." to support date implementations without private to_date/to_datetime on Time (home_run).

commit d6a0078	refs/tags/v3.1.1.rc1
Merge: 57dd60f 3f29342
Author: José Valim 
Date:   2011-08-31 08:10:18 -0700

    Merge pull request #2768 from guilleiguaran/fix-assets-rake-task
    
    Always enable digest and compile in the Rake task

commit 3f29342	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-31 09:42:43 -0500

    Always enable digest and compile in the Rake task

M	actionpack/lib/sprockets/assets.rake

commit d0fafaf	refs/heads/master
Merge: e746c40 b5f68cc
Author: Vijay Dev 
Date:   2011-08-31 07:39:48 -0700

    Merge pull request #2706 from mitio/doc-changes
    
    Fixed some typos and made minor text changes in the Plugins guide.

commit 30d65da	refs/heads/master
Author: Rodrigo Rosenfeld Rosas 
Date:   2011-08-31 10:50:08 -0300

    Fix logic in 3.1 release notes sentence

M	railties/guides/source/3_1_release_notes.textile

commit 47b8415	refs/heads/master
Merge: 6d772c0 e746c40
Author: Xavier Noria 
Date:   2011-08-31 04:27:59 -0700

    Merge branch 'master' of git://github.com/rails/rails

commit 6d772c0	refs/heads/master
Author: Semyon Perepelitsa 
Date:   2011-08-31 14:40:45 +0400

    Fix typo: => instead of =

M	railties/guides/source/3_1_release_notes.textile

commit e746c40	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-31 02:04:36 -0700

    syncs assets guide with what's in 3-1-stable

M	railties/guides/source/asset_pipeline.textile

commit 57dd60f	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-08-30 22:32:09 -0700

    don't need edgeapi now that we are on 3.1

M	railties/guides/source/3_1_release_notes.textile

commit 271cf98	refs/tags/v3.1.1.rc1
Merge: 417c31c 1cda269
Author: Xavier Noria 
Date:   2011-08-31 01:59:19 -0700

    Merge pull request #2762 from guilleiguaran/assets-documentation
    
    Assets Guide updates

commit 19e8532	refs/heads/master
Merge: d7be97e 331dad1
Author: Xavier Noria 
Date:   2011-08-31 01:59:00 -0700

    Merge pull request #2761 from raybaxter/bump_api_url
    
    don't need edgeapi now that we are on 3.1

commit 417c31c	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-08-31 01:52:43 -0700

    release notes: adds a couple of blank lines to get the markup right

M	railties/guides/source/3_1_release_notes.textile

commit d7be97e	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-31 01:52:43 -0700

    release notes: adds a couple of blank lines to get the markup right

M	railties/guides/source/3_1_release_notes.textile

commit dc5957a	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-08-31 01:44:59 -0700

    adds the release notes of 3.1 to the index

M	railties/guides/source/index.html.erb
M	railties/guides/source/layout.html.erb

commit 73263f6	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-31 01:44:59 -0700

    adds the release notes of 3.1 to the index

M	railties/guides/source/index.html.erb
M	railties/guides/source/layout.html.erb

commit 1cda269	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-30 23:58:38 -0500

    Update Assets guide to reflect all the new changes

M	railties/guides/source/asset_pipeline.textile

commit 331dad1	refs/heads/master
Author: Ray Baxter 
Date:   2011-08-30 22:32:09 -0700

    don't need edgeapi now that we are on 3.1

M	railties/guides/source/3_1_release_notes.textile

commit 5c5021f	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-30 20:42:43 -0700

    adding changelog dates

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 403dc11	refs/tags/v3.1.1.rc1
Merge: 7cdc9fd e63c638
Author: Aaron Patterson 
Date:   2011-08-30 19:38:27 -0700

    Merge pull request #2760 from cgriego/home_run
    
    Fix ActiveSupport compatibility with home_run

commit e63c638	refs/tags/v3.1.1.rc1
Author: Chris Griego 
Date:   2011-08-30 21:22:14 -0500

    Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public." to support date implementations without private to_date/to_datetime on Time (home_run).
    
    This reverts commit 080345baca1076a9788dff4803153600aec31f86.

M	activesupport/lib/active_support/core_ext/time/conversions.rb

commit 7cdc9fd	refs/tags/v3.1.1.rc1
Merge: 36352ca 505e845
Author: Aaron Patterson 
Date:   2011-08-30 19:19:43 -0700

    Merge branch '3-1-0' into 3-1-stable
    
    * 3-1-0:
      bumping to 3.1.0
      Bump sprockets up
      Depend on sass-rails and coffee-rails 3.1.0
      Revert "Merge pull request #2647 from dmathieu/no_rescue"
      Merge pull request #2756 from guilleiguaran/manifest-location
      Merge pull request #2748 from guilleiguaran/assets-version-config
      adds the asset pipeline guide to the index
      incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.

commit 505e845	refs/tags/v3.1.0 (tag: v3.1.0)
Author: Aaron Patterson 
Date:   2011-08-30 18:58:35 -0700

    bumping to 3.1.0

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit c970818	refs/tags/v3.1.0
Author: Santiago Pastorino 
Date:   2011-08-30 22:49:03 -0300

    Bump sprockets up

M	actionpack/actionpack.gemspec

commit 36352ca	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-30 22:49:03 -0300

    Bump sprockets up

M	actionpack/actionpack.gemspec

commit f4492b8	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-30 22:49:03 -0300

    Bump sprockets up

M	actionpack/actionpack.gemspec

commit 48cdecd	refs/tags/v3.1.0
Author: Santiago Pastorino 
Date:   2011-08-30 21:06:09 -0300

    Depend on sass-rails and coffee-rails 3.1.0

M	railties/lib/rails/generators/app_base.rb

commit 49c75a8	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-30 21:06:09 -0300

    Depend on sass-rails and coffee-rails 3.1.0

M	railties/lib/rails/generators/app_base.rb

commit e5f2b0d	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-30 20:47:01 -0300

    Revert "Merge pull request #2647 from dmathieu/no_rescue"
    
    This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/abstract_unit.rb

commit 8bc6fc5	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-30 20:47:01 -0300

    Revert "Merge pull request #2647 from dmathieu/no_rescue"
    
    This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/abstract_unit.rb

commit 69c7213	refs/tags/v3.1.0
Author: Santiago Pastorino 
Date:   2011-08-30 20:47:01 -0300

    Revert "Merge pull request #2647 from dmathieu/no_rescue"
    
    This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/abstract_unit.rb

commit aa94342	refs/tags/v3.1.0
Author: Aaron Patterson 
Date:   2011-08-30 16:05:57 -0700

    Merge pull request #2756 from guilleiguaran/manifest-location
    
    Change manifest.yml location with config.assets.manifest

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/application/assets_test.rb

commit a244d11	refs/tags/v3.1.1.rc1
Merge: 3a8319e ee3cc8f
Author: Aaron Patterson 
Date:   2011-08-30 16:05:57 -0700

    Merge pull request #2756 from guilleiguaran/manifest-location
    
    Change manifest.yml location with config.assets.manifest

commit ee3cc8f	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-30 16:30:53 -0500

    Set default location of manifest with config.assets.manifest

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/application/assets_test.rb

commit 6376e66	refs/tags/v3.1.0
Merge: 1db0f20 5e293bc
Author: Aaron Patterson 
Date:   2011-08-30 14:38:36 -0700

    Merge branch '3-1-0' of github.com:rails/rails into 3-1-0
    
    * '3-1-0' of github.com:rails/rails:
      adds the asset pipeline guide to the index
      incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.

commit ee822f2	refs/heads/master
Author: Nicolas Hock Isaza 
Date:   2011-08-30 15:40:09 -0500

    Adding `first_or_new` documentation to the AR Querying guide.

M	railties/guides/source/active_record_querying.textile

commit 1db0f20	refs/tags/v3.1.0
Author: Aaron Patterson 
Date:   2011-08-30 13:29:01 -0700

    Merge pull request #2748 from guilleiguaran/assets-version-config
    
    Add config.assets.version to config/application.rb

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 60d8e4a	refs/heads/master
Author: Raimonds Simanovskis 
Date:   2011-08-30 20:37:16 +0300

    Ensure correct ordering of results in test_update_all_with_joins_and_offset_and_order
    
    Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order.

M	activerecord/test/cases/relations_test.rb

commit 84dad44	refs/heads/master
Author: Andrés Mejía 
Date:   2011-08-27 23:10:25 -0500

    Adding first_or_create, first_or_create!, first_or_new and first_or_build to Active Record.
    
    This let's you write things like:
    
        User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson", :hot => true)
    
    Related to #2420.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/relations_test.rb
M	railties/guides/source/active_record_querying.textile

commit 3a8319e	refs/tags/v3.1.1.rc1
Merge: 714128f bef6ea1
Author: Jon Leighton 
Date:   2011-08-30 14:25:53 -0700

    Merge pull request #2752 from rsim/fix_test_update_all_with_joins_and_offset_and_order
    
    Ensure correct ordering of results in test_update_all_with_joins_and_offset_and_order

commit 714128f	refs/tags/v3.1.1.rc1
Merge: 5b2e79c eaea03b
Author: Xavier Noria 
Date:   2011-08-30 13:49:26 -0700

    Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable

commit 5e293bc	refs/tags/v3.1.0
Author: Xavier Noria 
Date:   2011-08-30 13:48:16 -0700

    adds the asset pipeline guide to the index

M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/index.html.erb
M	railties/guides/source/layout.html.erb

commit 5b2e79c	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-08-30 13:48:16 -0700

    adds the asset pipeline guide to the index

M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/index.html.erb
M	railties/guides/source/layout.html.erb

commit 2350fec	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-30 13:48:16 -0700

    adds the asset pipeline guide to the index

M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/index.html.erb
M	railties/guides/source/layout.html.erb

commit 54c9a43	refs/tags/v3.1.0
Author: Waynn Lue 
Date:   2011-08-24 23:00:43 -0700

    incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.

M	railties/README.rdoc

commit 4869df1	refs/tags/v3.1.1.rc1
Author: Waynn Lue 
Date:   2011-08-24 23:00:43 -0700

    incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.

M	railties/README.rdoc

commit a7a01b8	refs/heads/master
Merge: bd4bd3f 6bdf4a3
Author: Xavier Noria 
Date:   2011-08-30 13:32:59 -0700

    Merge pull request #2684 from waynn/patch-2
    
    Rephrasing to sound more natural, and some grammar fixes.

commit eaea03b	refs/tags/v3.1.1.rc1
Merge: 602a3c2 b0f3063
Author: Aaron Patterson 
Date:   2011-08-30 13:29:01 -0700

    Merge pull request #2748 from guilleiguaran/assets-version-config
    
    Add config.assets.version to config/application.rb

commit 602a3c2	refs/tags/v3.1.1.rc1
Merge: c96788a 94e3059
Author: Aaron Patterson 
Date:   2011-08-30 12:07:02 -0700

    Merge branch '3-1-0' into 3-1-stable
    
    * 3-1-0:
      Configuration changes for asset pipeline: remove config.assets.allow_debugging, add config.assets.compile and config.assets.digest
      Read digests of assets from manifest.yml if config.assets.manifest is on
      let SDoc add a link to the source code in GitHub for each method
      Documentation fixes
      bumping to 3.1.0.rc8
      bumping to 3.1.0.rc7
      Update Rails 3.1 CHANGELOGs
      Bump rack-cache, rack-test, rack-mount and sprockets up
      clear and disable query cache when an exception is raised from called middleware
      assert_no_match
      deletes spurious arrow
      use sdoc to generate the API
      Don't modify params in place - fixes #2624
      the command line guide is good to go
      `load` should also return the value from `super`
      require needs to return true or false. thank you Ryan "zenspider" Davis
      bumping bcrypt-ruby requirement
      Make ActionController::TestCase#recycle! set @protocol to nil
      Add failing test case for #2654
    
    Conflicts:
    	activerecord/test/cases/query_cache_test.rb

commit 94e3059	refs/tags/v3.1.0
Merge: 4a60a9e f443f9c
Author: Aaron Patterson 
Date:   2011-08-30 12:02:25 -0700

    Merge pull request #2747 from guilleiguaran/manifest-on-by-default
    
    Manifest is generated by default when assets are precompiled

commit f443f9c	refs/tags/v3.1.0
Author: Guillermo Iguaran 
Date:   2011-08-30 09:42:35 -0500

    Configuration changes for asset pipeline: remove config.assets.allow_debugging, add config.assets.compile and config.assets.digest

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/application/assets_test.rb

commit bd4bd3f	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-30 09:56:42 -0700

    Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_for_oracle
    
    Fix test column names are escaped for oracle

M	activerecord/test/cases/base_test.rb

commit bef6ea1	refs/tags/v3.1.1.rc1
Author: Raimonds Simanovskis 
Date:   2011-08-30 20:37:16 +0300

    Ensure correct ordering of results in test_update_all_with_joins_and_offset_and_order
    
    Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order.

M	activerecord/test/cases/relations_test.rb

commit 0195846	refs/tags/v3.0.14
Merge: d7d0c25 941a9d0
Author: Aaron Patterson 
Date:   2011-08-30 10:16:11 -0700

    Merge pull request #2744 from arunagw/mysql2_bump
    
    Mysql2 bump

commit 9af7828	refs/heads/master
Merge: 5aa86f7 725617a
Author: Aaron Patterson 
Date:   2011-08-30 10:15:54 -0700

    Merge pull request #2636 from dasch/document-sprockets-compressors
    
    Document the Sprockets compressors

commit c96788a	refs/tags/v3.1.1.rc1
Merge: cb25537 db41b63
Author: Jon Leighton 
Date:   2011-08-30 09:56:42 -0700

    Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_for_oracle
    
    Fix test column names are escaped for oracle

commit db41b63	refs/tags/v3.1.1.rc1
Author: Raimonds Simanovskis 
Date:   2011-08-30 19:23:41 +0300

    Oracle adapter removes double quotes when quoting table and column names

M	activerecord/test/cases/base_test.rb

commit b0f3063	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-30 00:52:50 -0500

    Add a default asset version to production config, this give to the users an idea about how to use it

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 725617a	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-22 19:21:35 +0200

    Document the Sprockets compressors
    
    Add documentation to Sprockets::NullCompressor and
    Sprockets::LazyCompressor. Also, make LazyCompressor#compressor
    private, as it isn't part of the public API.

M	actionpack/lib/sprockets/compressors.rb

commit 941a9d0	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-08-30 14:26:44 +0530

    MySQL2 Bump to 0.2.13

M	Gemfile
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/app_generator_test.rb

commit 4a60a9e	refs/tags/v3.1.0
Merge: fa1e3b2 af0f14e
Author: Aaron Patterson 
Date:   2011-08-29 21:47:32 -0700

    Merge pull request #2741 from guilleiguaran/assets-manifest-yml
    
    Read digests of assets from manifest.yml if config.assets.manifest is on

commit af0f14e	refs/tags/v3.1.0
Author: Guillermo Iguaran 
Date:   2011-08-29 16:28:11 -0500

    Read digests of assets from manifest.yml if config.assets.manifest is on

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/application/assets_test.rb

commit fa1e3b2	refs/tags/v3.1.0
Author: Xavier Noria 
Date:   2011-08-29 15:47:56 -0700

    let SDoc add a link to the source code in GitHub for each method

M	Rakefile

commit cb25537	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-08-29 15:47:56 -0700

    let SDoc add a link to the source code in GitHub for each method

M	Rakefile

commit 5aa86f7	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-29 15:47:56 -0700

    let SDoc add a link to the source code in GitHub for each method

M	Rakefile

commit 92619e4	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-29 23:04:50 +0100

    Fix test failures on 1.8.7, since Object#initialize_dup is not defined there (and this call to super is no essential, so easiest to simply remove)

M	activerecord/lib/active_record/timestamp.rb

commit 6094672	refs/tags/v3.1.0
Author: Igor Zubkov 
Date:   2011-08-28 23:08:06 +0300

    Documentation fixes

M	railties/guides/source/asset_pipeline.textile

commit 37df184	refs/tags/v3.1.1.rc1
Author: Igor Zubkov 
Date:   2011-08-28 23:08:06 +0300

    Documentation fixes

M	railties/guides/source/asset_pipeline.textile

commit 04f7338	refs/heads/master
Merge: cebff6d 871696a
Author: Xavier Noria 
Date:   2011-08-29 14:35:08 -0700

    Merge pull request #2720 from biow0lf/master
    
    Doc fixes

commit cebff6d	refs/heads/master
Merge: c59c9bb a982443
Author: Aaron Patterson 
Date:   2011-08-29 13:38:10 -0700

    Merge pull request #2021 from dasch/more_postgres_utils
    
    Make #extract_schema_and_table an instance method in Utils

commit c59c9bb	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-29 17:39:09 +0100

    Move clear_timestamp_attributes into Timestamp module

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/timestamp.rb

commit 132586e	refs/tags/v3.1.1.rc1
Author: Bogdan Gusiev 
Date:   2011-07-05 10:51:40 +0300

    Fixed CollectionAssociation#find to be compatible with Array#find
    
    In order to make CollectionAssociation behave closer to Array
    Add the ability to pass block to #find method just like Array#find does.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit d7618c7	refs/tags/v3.1.1.rc1
Author: Dmitriy Kiriyenko 
Date:   2011-07-05 13:17:39 +0300

    Fixed failing query when performing calculation with having based on select.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 7abf441	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-08-29 15:01:17 +0100

    The join_nodes must be passed to the JoinDependency initializer and therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/toy.rb

commit 735d985	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-29 15:01:17 +0100

    The join_nodes must be passed to the JoinDependency initializer and therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/toy.rb

commit fd22d04	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-29 12:43:17 +0100

    Move the bulk alter table code into the abstract mysql adapter, hence it is supported for mysql2 as well now.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 4fcd847	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-29 12:25:15 +0100

    Extract simplified_type into the abstract class

M	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 5766539	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-25 22:28:46 +0100

    Create an AbstractMysqlAdapter to abstract the common code between MysqlAdapter and Mysql2Adapter.

A	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/adapters/mysql/active_schema_test.rb
M	activerecord/test/cases/column_definition_test.rb

commit c4ce550	refs/tags/v3.1.0.rc8 (tag: v3.1.0.rc8)
Author: Santiago Pastorino 
Date:   2011-08-29 00:10:06 -0300

    bumping to 3.1.0.rc8

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit a720243	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-29 04:15:15 +0300

    Split long string into multiple shorter ones
    
    This makes the code more readable.

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit ca26feb	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-28 17:05:49 -0700

    Merge pull request #2724 from guilleiguaran/avoid-recursive-call-sprockets-helper
    
    Avoid extra recursive call in Sprockets helpers

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit cfe7548	refs/heads/master
Merge: 734792a 381904d
Author: Santiago Pastorino 
Date:   2011-08-28 17:05:49 -0700

    Merge pull request #2724 from guilleiguaran/avoid-recursive-call-sprockets-helper
    
    Avoid extra recursive call in Sprockets helpers

commit 381904d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-28 19:00:58 -0500

    Avoid extra recursive call in Sprockets helpers

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit e4fc8e2	refs/tags/v3.1.0.rc7 (tag: v3.1.0.rc7)
Author: Santiago Pastorino 
Date:   2011-08-28 20:47:19 -0300

    bumping to 3.1.0.rc7

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 734792a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-28 16:41:15 -0700

    Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
    
    Update changelogs for Rails 3.1.0

M	actionpack/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 97e0a77	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-28 16:41:15 -0700

    Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
    
    Update changelogs for Rails 3.1.0

M	actionpack/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 3b13fb7	refs/tags/v3.1.0.rc7
Merge: c13216b c677461
Author: Santiago Pastorino 
Date:   2011-08-28 16:41:15 -0700

    Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
    
    Update changelogs for Rails 3.1.0

commit 871696a	refs/heads/master
Author: Igor Zubkov 
Date:   2011-08-28 23:08:06 +0300

    Documentation fixes

M	railties/guides/source/asset_pipeline.textile

commit c677461	refs/tags/v3.1.0.rc7
Author: Guillermo Iguaran 
Date:   2011-08-28 18:32:23 -0500

    Update Rails 3.1 CHANGELOGs

M	actionpack/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 89f540c	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-28 16:31:04 -0700

    fixing typo

M	activerecord/test/cases/query_cache_test.rb

commit d63688d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-28 16:31:04 -0700

    fixing typo

M	activerecord/test/cases/query_cache_test.rb

commit 49af31e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-28 19:04:38 -0300

    Bump rack-cache, rack-test, rack-mount and sprockets up

M	actionpack/actionpack.gemspec

commit 65d607f	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-28 19:04:38 -0300

    Bump rack-cache, rack-test, rack-mount and sprockets up

M	actionpack/actionpack.gemspec

commit c13216b	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-28 19:04:38 -0300

    Bump rack-cache, rack-test, rack-mount and sprockets up

M	actionpack/actionpack.gemspec

commit a045033	refs/tags/v3.1.0.rc7
Author: Aaron Patterson 
Date:   2011-08-28 14:15:51 -0700

    clear and disable query cache when an exception is raised from called middleware

M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit 1130b72	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-28 14:15:51 -0700

    clear and disable query cache when an exception is raised from called middleware

M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit b4ff82a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-28 14:15:51 -0700

    clear and disable query cache when an exception is raised from called middleware

M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit e145acd	refs/heads/master
Merge: bb4dedb 62a61ad
Author: Aaron Patterson 
Date:   2011-08-28 09:52:54 -0700

    Merge pull request #2711 from dasch/patch-3
    
    Refactor ActionDispatch::Http::UploadedFile

commit 62a61ad	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-28 07:24:58 +0300

    Refactor ActionDispatch::Http::UploadedFile

M	actionpack/lib/action_dispatch/http/upload.rb

commit 24674b3	refs/heads/master
Author: jbbarth 
Date:   2011-08-28 06:02:15 +0200

    Fixed bad options order in ActiveRecord::Migration::CommandRecorder#invert_rename_index

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit cd00e3b	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-27 22:32:10 -0300

    assert_no_match

M	railties/test/application/assets_test.rb

commit 7748327	refs/tags/v3.1.0.rc7
Author: Xavier Noria 
Date:   2011-08-27 15:34:33 -0700

    deletes spurious arrow

M	actionpack/lib/action_controller/metal/url_for.rb

commit 8653ac3	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-08-27 15:34:33 -0700

    deletes spurious arrow

M	actionpack/lib/action_controller/metal/url_for.rb

commit bb4dedb	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-27 15:34:33 -0700

    deletes spurious arrow

M	actionpack/lib/action_controller/metal/url_for.rb

commit bd0550e	refs/heads/master
Merge: 827a0fe 8526f72
Author: Santiago Pastorino 
Date:   2011-08-27 14:03:55 -0700

    Merge pull request #2714 from vijaydev/docs
    
    doc fixes

commit 8526f72	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-28 02:25:54 +0530

    doc fixes

M	README.rdoc
M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb

commit b5f68cc	refs/heads/master
Author: Dimitar Dimitrov 
Date:   2011-08-26 18:34:57 +0300

    Fixed typos and made minor changes in the Plugins guide.

M	railties/guides/source/plugins.textile

commit 5acbc19	refs/heads/master
Author: Teng Siong Ong 
Date:   2011-08-27 14:31:24 -0500

    remove misleading line on 500 error page.

M	railties/lib/rails/generators/rails/app/templates/public/500.html

commit 1606b6c	refs/heads/master
Author: Jared Tame 
Date:   2011-08-23 02:26:55 -0700

    fixed 500 error message which is misleading by suggesting all rails apps have exception notifications by default

M	railties/lib/rails/generators/rails/app/templates/public/500.html

commit 772173a	refs/tags/v3.1.0.rc7
Author: Xavier Noria 
Date:   2011-08-27 03:55:01 -0700

    use sdoc to generate the API

M	Gemfile
M	Rakefile

commit c563796	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-08-27 03:55:01 -0700

    use sdoc to generate the API

M	Gemfile
M	Rakefile

commit 827a0fe	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-27 03:55:01 -0700

    use sdoc to generate the API

M	Gemfile
M	Rakefile

commit 6bdf4a3	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-24 23:00:43 -0700

    incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.

M	railties/README.rdoc

commit e8b525f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-26 10:14:57 -0700

    stop messing with the load path, load path should be adjusted in the test task

M	activerecord/lib/active_record.rb

commit 5145e98	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-26 10:14:57 -0700

    stop messing with the load path, load path should be adjusted in the test task

M	activerecord/lib/active_record.rb

commit 4a4dcb5	refs/heads/master
Merge: e3a020a 651ef61
Author: Santiago Pastorino 
Date:   2011-08-26 05:41:59 -0700

    Merge pull request #2702 from arunagw/removed_unused_var
    
    Removed Unused Variable.

commit 0353435	refs/tags/v3.1.1.rc1
Merge: 20c0717 aa99f8f
Author: Santiago Pastorino 
Date:   2011-08-26 05:31:25 -0700

    Merge pull request #2701 from guilleiguaran/fix-asset-test-1.8
    
    Fix failing asset test under 1.8

commit 651ef61	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-26 11:29:05 +0530

    Removed Unused Variable.

M	actionpack/test/template/form_tag_helper_test.rb

commit aa99f8f	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-26 00:51:43 -0500

    Fix failing asset test under 1.8

M	railties/test/application/assets_test.rb

commit e3a020a	refs/heads/master
Merge: 42a7979 a071c9b
Author: Aaron Patterson 
Date:   2011-08-25 19:12:24 -0700

    Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8
    
    Fix failing asset debug test under 1.8

commit a071c9b	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-25 21:04:49 -0500

    Fix failing asset debug test under 1.8

M	railties/test/application/asset_debugging_test.rb

commit 20c0717	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-25 16:07:44 -0700

    Force binary data inserted for a string data type to utf-8 and log an
    error.  Strings tagged as binary will be stored in sqlite3 as blobs.  It
    is an error to insert binary data to a string column, so an error is
    emitted in the log file.  People are highly encouraged to track down the
    source of the binary strings and make sure that the encoding is set
    correctly before inserting to the database.

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit 42a7979	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-25 16:07:44 -0700

    Force binary data inserted for a string data type to utf-8 and log an
    error.  Strings tagged as binary will be stored in sqlite3 as blobs.  It
    is an error to insert binary data to a string column, so an error is
    emitted in the log file.  People are highly encouraged to track down the
    source of the binary strings and make sure that the encoding is set
    correctly before inserting to the database.

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit 635b9d4	refs/heads/master
Merge: 8ba491a 3731a0f
Author: Xavier Noria 
Date:   2011-08-25 15:07:11 -0700

    Merge pull request #2681 from guilleiguaran/doc-changes
    
    Documentation changes: Assets Pipeline guide and Railties changelog

commit 8ba491a	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-25 18:51:17 +0100

    Revert all the stuff to do with disallowing non-public methods for Module#delegate

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/lib/active_support/core_ext/object.rb
D	activesupport/lib/active_support/core_ext/object/public_send.rb
M	activesupport/test/core_ext/module_test.rb
D	activesupport/test/core_ext/object/public_send_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit abab612	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-25 14:18:16 -0700

    Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpers
    
    Removing redundant stringify_keys in Sprockets helpers

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit bad6803	refs/heads/master
Merge: 25ee309 f5472a3
Author: Santiago Pastorino 
Date:   2011-08-25 14:18:16 -0700

    Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpers
    
    Removing redundant stringify_keys in Sprockets helpers

commit f5472a3	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-25 15:54:18 -0500

    Removing redundant stringify_keys in Sprockets helpers

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 25ee309	refs/heads/master
Merge: a840172 8724f00
Author: Aaron Patterson 
Date:   2011-08-25 11:47:23 -0700

    Merge pull request #2695 from dasch/more-debug-assets
    
    Don't require a specific value for the ?debug flag

commit 8724f00	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-25 20:39:18 +0200

    Don't require a specific value for the ?debug flag
    
    Previously, only "1" and "true" were accepted. This change makes
    any value, or no value at all, have the same effect.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit a840172	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-25 09:06:11 +0530

    Yes we need this to pass the test. we are using config.log_level.
    
    Fix broken test test_copying_migrations(RailtiesTest::EngineTest):
    NoMethodError: undefined method `log_level' for #

M	railties/lib/rails/plugin.rb

commit 9c33576	refs/tags/v3.1.1.rc1
Merge: 933120c dcb5f2b
Author: Aaron Patterson 
Date:   2011-08-25 11:12:56 -0700

    Merge pull request #2683 from arunagw/engine_test_fix
    
    Engine test fix

commit dcb5f2b	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-08-25 09:06:11 +0530

    Yes we need this to pass the test. we are using config.log_level.
    
    Fix broken test test_copying_migrations(RailtiesTest::EngineTest):
    NoMethodError: undefined method `log_level' for #

M	railties/lib/rails/plugin.rb

commit df948f3	refs/heads/master
Merge: 35f3907 b59aa35
Author: Aaron Patterson 
Date:   2011-08-25 11:05:57 -0700

    Merge pull request #2690 from dasch/pretty-debug-assets
    
    Make Sprockets::Helpers::RailsHelper#debug_assets? more readable

commit 35f3907	refs/heads/master
Merge: a16e888 372892e
Author: Aaron Patterson 
Date:   2011-08-25 11:04:34 -0700

    Merge pull request #2688 from dasch/refactor-asset-debugging-tests
    
    Refactor asset debugging tests

commit a16e888	refs/heads/master
Merge: eb69068 f2f05da
Author: Santiago Pastorino 
Date:   2011-08-25 10:14:25 -0700

    Merge pull request #2694 from bogdan/internal_validation
    
    Moved strict validation changelog entry to right place

commit f2f05da	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-08-25 19:37:11 +0300

    Moved strict validation changelog entry to right place

M	railties/guides/source/active_model_basics.textile
M	railties/guides/source/active_record_validations_callbacks.textile

commit 3731a0f	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-24 21:42:19 -0500

    Update Debugging Assets section of Assets Pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 9a68ea9	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-24 21:13:41 -0500

    Add missing CHANGELOG entries for Railties

M	railties/CHANGELOG

commit eb69068	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-25 11:40:59 -0300

    Tiny refactor

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 67274ca	refs/heads/master
Merge: d150693 895d645
Author: Santiago Pastorino 
Date:   2011-08-25 07:39:31 -0700

    Merge pull request #2491 from waynn/fix_symbol
    
    fix destructive stringify_keys for label_tag

commit 283f597	refs/tags/v3.1.0.rc7
Author: Andrew White 
Date:   2011-08-23 11:07:37 +0100

    Don't modify params in place - fixes #2624

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit d150693	refs/heads/master
Merge: 68424fb cbb1479
Author: José Valim 
Date:   2011-08-25 07:10:16 -0700

    Merge pull request #2563 from bogdan/internal_validation
    
    Implemented strict validation concept

commit cbb1479	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-08-25 16:43:43 +0300

    Typo fix

M	activemodel/lib/active_model/validations/validates.rb

commit b59aa35	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-25 12:36:11 +0200

    Make Sprockets::Helpers::RailsHelper#debug_assets? more readable

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 372892e	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-25 11:40:10 +0200

    Move asset debugging tests into a separate test case
    
    Also:
    
    - Refactor AssetDebuggingTest.
    - Use the %r regexp syntax. That way we don't need to escape the /'s.

A	railties/test/application/asset_debugging_test.rb
M	railties/test/application/assets_test.rb

commit 933120c	refs/tags/v3.1.1.rc1
Author: Akira Matsuda 
Date:   2011-08-24 21:09:41 +0900

    do not compute table names for abstract classes

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 50db00d	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-24 16:52:23 -0700

    fix ambiguous * and remove unused variable

M	railties/lib/rails/generators.rb

commit 68424fb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 16:52:23 -0700

    fix ambiguous * and remove unused variable

M	railties/lib/rails/generators.rb

commit 7e80394	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-24 16:48:30 -0700

    fix ambiguous use of *

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 32836e7	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 16:48:30 -0700

    fix ambiguous use of *

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit b907271	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 16:47:01 -0700

    stop circular require warnings

M	actionpack/lib/action_dispatch/railtie.rb
M	activesupport/lib/active_support/i18n_railtie.rb
M	activesupport/lib/active_support/railtie.rb

commit 23c5403	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-24 16:33:49 -0700

    only backport the to_d method if it does not exist

M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb

commit 95d35fc	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-24 16:33:36 -0700

    only define the encoding reader since we define the writer later on

M	railties/lib/rails/application/configuration.rb

commit bac5da3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 16:33:49 -0700

    only backport the to_d method if it does not exist

M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb

commit 4af4312	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 16:33:36 -0700

    only define the encoding reader since we define the writer later on

M	railties/lib/rails/application/configuration.rb

commit 3cbc1bd	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-24 16:23:24 -0700

    we are *sure* we want to set the encoding, so silence warnings around it

M	railties/lib/rails.rb
M	railties/lib/rails/application/configuration.rb

commit 3096629	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 16:23:24 -0700

    we are *sure* we want to set the encoding, so silence warnings around it

M	railties/lib/rails.rb
M	railties/lib/rails/application/configuration.rb

commit 5345958	refs/heads/master
Merge: 0a2b105 0a0da9d
Author: Aaron Patterson 
Date:   2011-08-24 16:05:24 -0700

    Merge pull request #2679 from amatsuda/nullify_abstract_class_table_name
    
    do not compute table names for abstract classes

commit 5978fae	refs/tags/v3.1.0.rc7
Author: Xavier Noria 
Date:   2011-08-24 14:45:42 -0700

    the command line guide is good to go

M	railties/guides/source/index.html.erb

commit 8184373	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-08-24 14:45:42 -0700

    the command line guide is good to go

M	railties/guides/source/index.html.erb

commit 0a2b105	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-24 14:45:42 -0700

    the command line guide is good to go

M	railties/guides/source/index.html.erb

commit 28a4d37	refs/heads/master
Merge: e7634c2 098cc18
Author: Jon Leighton 
Date:   2011-08-24 14:33:09 -0700

    Merge pull request #2674 from masterkain/master
    
    Add back autoload :Table

commit dc61b8f	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-24 14:11:35 -0700

    Merge pull request #2677 from guilleiguaran/refactor-sprockets-helpers
    
    Refactoring javascript_include_tag and stylesheet_link_tag Sprockets helpers

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit e7634c2	refs/heads/master
Merge: 09e2109 23b5c55
Author: Santiago Pastorino 
Date:   2011-08-24 14:11:35 -0700

    Merge pull request #2677 from guilleiguaran/refactor-sprockets-helpers
    
    Refactoring javascript_include_tag and stylesheet_link_tag Sprockets helpers

commit 23b5c55	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-24 16:01:06 -0500

    Preserve stylesheet_link_tag and javascript_include_tag options on debug

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit e0db9cb	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-24 15:54:47 -0500

    Use super in javascript_include_tag and stylesheet_link_tag instead of generate tags manually

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit c5a5285	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-24 15:40:10 -0500

    Remove redundant join and call to html_safe

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 93a9cad	refs/tags/v3.1.0.rc7
Author: Aaron Patterson 
Date:   2011-08-23 17:04:05 -0700

    `load` should also return the value from `super`

M	activesupport/lib/active_support/dependencies.rb

commit b359628	refs/tags/v3.1.0.rc7
Author: Aaron Patterson 
Date:   2011-08-23 16:55:11 -0700

    require needs to return true or false. thank you Ryan "zenspider" Davis

M	activesupport/lib/active_support/dependencies.rb

commit 36d06d1	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-23 17:04:05 -0700

    `load` should also return the value from `super`

M	activesupport/lib/active_support/dependencies.rb

commit 7c5cd40	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-23 16:55:11 -0700

    require needs to return true or false. thank you Ryan "zenspider" Davis

M	activesupport/lib/active_support/dependencies.rb

commit d7dc94a	refs/tags/v3.1.0.rc7
Author: Aaron Patterson 
Date:   2011-08-24 13:26:38 -0700

    bumping bcrypt-ruby requirement

M	activemodel/activemodel.gemspec

commit 7286ecb	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-24 13:26:38 -0700

    bumping bcrypt-ruby requirement

M	activemodel/activemodel.gemspec

commit 09e2109	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 13:26:38 -0700

    bumping bcrypt-ruby requirement

M	activemodel/activemodel.gemspec

commit c29426d	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-24 13:25:11 -0700

    dealing with some -w warnings on startup

M	activesupport/lib/active_support/i18n_railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/plugin.rb

commit 44f0709	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-24 13:25:11 -0700

    dealing with some -w warnings on startup

M	activesupport/lib/active_support/i18n_railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/plugin.rb

commit 2f88743	refs/heads/master
Merge: 289540e e0714ee
Author: José Valim 
Date:   2011-08-24 10:29:16 -0700

    Merge pull request #2675 from jdelStrother/load_once_pathnames_fix
    
    Fix autoload_once_paths when using Pathnames & ruby 1.9

commit 098cc18	refs/heads/master
Author: Claudio Poli 
Date:   2011-08-24 19:15:49 +0200

    Adding missing autoload

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit e0714ee	refs/heads/master
Author: Jonathan del Strother 
Date:   2011-08-24 17:30:50 +0100

    Fix autoload_once_paths when using Pathnames & ruby 1.9
    
    Under ruby 1.9.2 -
      "/var/log".starts_with?(Pathname.new("/var"))  # => false
    
    so setting config.autoload_once_paths with Pathnames would not work

M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/dependencies_test.rb

commit 621fe98	refs/tags/v3.1.0.rc7
Author: David Majda 
Date:   2011-08-23 14:12:41 +0200

    Make ActionController::TestCase#recycle! set @protocol to nil
    
    This ensures that the protocol does not get carried over when there are
    two or more requests in functional tests. This was a problem when e.g.
    the first request was HTTP and the second request was HTTPS.
    
    Closes #2654.
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_controller/test_case.rb

commit 257061d	refs/tags/v3.1.0.rc7
Author: Andrew White 
Date:   2011-08-23 15:33:59 +0100

    Add failing test case for #2654

M	actionpack/test/controller/test_test.rb

commit 289540e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-24 13:21:18 -0300

    Revert "Simplify JavaScriptHelper#escape_javascript"
    This commit broke the build without any improvement.
    
    This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4.

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit 5493d22	refs/heads/master
Author: Joshua Peek 
Date:   2011-08-24 10:54:01 -0500

    Bring in sprockets precompile task

M	actionpack/lib/sprockets/assets.rake

commit 64c1d8a	refs/tags/v3.1.1.rc1
Merge: e65c2fe 4327e21
Author: Joshua Peek 
Date:   2011-08-24 10:56:01 -0500

    Merge branch '3-1-0' into 3-1-stable

commit 4327e21	refs/tags/v3.1.0.rc7
Author: Joshua Peek 
Date:   2011-08-24 10:54:01 -0500

    Bring in sprockets precompile task

M	actionpack/lib/sprockets/assets.rake

commit 19c1403	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-24 08:01:08 -0700

    Merge pull request #2644 from guilleiguaran/allow-assets-debugging
    
    Add config.allow_debugging option

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
M	railties/test/application/assets_test.rb

commit e65c2fe	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-24 08:01:08 -0700

    Merge pull request #2644 from guilleiguaran/allow-assets-debugging
    
    Add config.allow_debugging option

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
M	railties/test/application/assets_test.rb

commit 976b2be	refs/heads/master
Merge: 23d8a98 827cdae
Author: Santiago Pastorino 
Date:   2011-08-24 08:01:08 -0700

    Merge pull request #2644 from guilleiguaran/allow-assets-debugging
    
    Add config.allow_debugging option

commit 827cdae	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-22 23:19:25 -0500

    Add config.allow_debugging option to determine if the debug_assets query param can be passed by user

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
M	railties/test/application/assets_test.rb

commit 8ac61f5	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-24 07:46:04 -0700

    Merge pull request #2668 from guilleiguaran/debug-assets-media-type
    
    Debug assets shouldn't ignore media type for stylesheets. Closes #2625

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit d15e7aa	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-24 07:46:04 -0700

    Merge pull request #2668 from guilleiguaran/debug-assets-media-type
    
    Debug assets shouldn't ignore media type for stylesheets. Closes #2625

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 23d8a98	refs/heads/master
Merge: 52207ec d133fd6
Author: Santiago Pastorino 
Date:   2011-08-24 07:46:04 -0700

    Merge pull request #2668 from guilleiguaran/debug-assets-media-type
    
    Debug assets shouldn't ignore media type for stylesheets. Closes #2625

commit 8c0d89e	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-24 07:22:43 -0700

    Merge pull request #2390 from arunagw/test_for_environment_file
    
    Test added to check development.rb, test.rb and production.rb content

M	railties/test/generators/app_generator_test.rb

commit 1fdae97	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-24 07:22:43 -0700

    Merge pull request #2390 from arunagw/test_for_environment_file
    
    Test added to check development.rb, test.rb and production.rb content

M	railties/test/generators/app_generator_test.rb

commit 52207ec	refs/heads/master
Merge: f162f84 3c7b29d
Author: Santiago Pastorino 
Date:   2011-08-24 07:22:43 -0700

    Merge pull request #2390 from arunagw/test_for_environment_file
    
    Test added to check development.rb, test.rb and production.rb content

commit 125b1b0	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-24 07:02:03 -0700

    Merge pull request #2647 from dmathieu/no_rescue
    
    remove useless rescue

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/abstract_unit.rb

commit 72802c6	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-24 07:02:03 -0700

    Merge pull request #2647 from dmathieu/no_rescue
    
    remove useless rescue

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/abstract_unit.rb

commit f162f84	refs/heads/master
Merge: 61e6630 13dd775
Author: Santiago Pastorino 
Date:   2011-08-24 07:02:03 -0700

    Merge pull request #2647 from dmathieu/no_rescue
    
    remove useless rescue

commit 61e6630	refs/heads/master
Merge: eb0b714 11146f1
Author: Santiago Pastorino 
Date:   2011-08-24 05:49:26 -0700

    Merge pull request #2669 from BMorearty/remove-extra-word
    
    docs: Remove extra word from sentence in initialization guide.

commit 0a0da9d	refs/heads/master
Author: Akira Matsuda 
Date:   2011-08-24 21:09:41 +0900

    do not compute table names for abstract classes

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit eb0b714	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-23 13:42:36 +0200

    Simplify JavaScriptHelper#escape_javascript
    
    Use the Linus-style conditional. Also fix the documentation slightly.
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit 13dd775	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-08-23 11:02:44 +0200

    remove useless rescue
    
    params is a method, defined in every controller, which always returns a hash.
    If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/abstract_unit.rb

commit afe04da	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-08-24 10:26:18 +0300

    Add change log entry on strict validation

M	activemodel/CHANGELOG

commit a5e925c	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-08-24 10:25:29 +0300

    Add strict validation example to guides

M	railties/guides/source/active_model_basics.textile
M	railties/guides/source/active_record_validations_callbacks.textile

commit 11146f1	refs/heads/master
Author: Brian Morearty 
Date:   2011-08-23 21:34:43 -0700

    Remove extra word from sentence in initialization guide.

M	railties/guides/source/initialization.textile

commit d133fd6	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-23 21:36:21 -0500

    Debug assets shouldn't ignore media type for stylesheets. Closes #2625

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 29004de	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-23 17:04:05 -0700

    `load` should also return the value from `super`

M	activesupport/lib/active_support/dependencies.rb

commit a10606c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-23 16:55:11 -0700

    require needs to return true or false. thank you Ryan "zenspider" Davis

M	activesupport/lib/active_support/dependencies.rb

commit 4cc9349	refs/heads/master
Merge: 68a13ed 4fb4484
Author: David Heinemeier Hansson 
Date:   2011-08-23 16:33:06 -0700

    Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore
    
    Add .rbenv-version to .gitignore

commit 25f60cc	refs/tags/v3.1.0.rc7
Author: Anand 
Date:   2011-08-23 16:30:02 +0530

    added missing require array/wrap in serialization

M	activemodel/lib/active_model/serialization.rb

commit 0d9363d	refs/tags/v3.1.0.rc7
Author: Joost Baaij 
Date:   2011-08-23 14:18:06 +0200

    removed the link to my blog to help stop endless comments

M	railties/guides/source/getting_started.textile

commit e3ba2cf	refs/tags/v3.1.1.rc1
Author: Joost Baaij 
Date:   2011-08-23 14:18:06 +0200

    removed the link to my blog to help stop endless comments

M	railties/guides/source/getting_started.textile

commit e695538	refs/tags/v3.1.1.rc1
Author: Anand 
Date:   2011-08-23 16:30:02 +0530

    added missing require array/wrap in serialization

M	activemodel/lib/active_model/serialization.rb

commit 94a7803	refs/tags/v3.1.1.rc1
Author: David Majda 
Date:   2011-08-23 14:12:41 +0200

    Make ActionController::TestCase#recycle! set @protocol to nil
    
    This ensures that the protocol does not get carried over when there are
    two or more requests in functional tests. This was a problem when e.g.
    the first request was HTTP and the second request was HTTPS.
    
    Closes #2654.
    
    Signed-off-by: Andrew White 
    (cherry picked from commit 68a13eded347248fb9d4c8ef7f0ed2af52bba994)

M	actionpack/lib/action_controller/test_case.rb

commit 586b284	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-08-23 15:33:59 +0100

    Add failing test case for #2654
    (cherry picked from commit ebea387e4bb9f44d8c678ed9bad2ab2091d1f9c6)

M	actionpack/test/controller/test_test.rb

commit 68a13ed	refs/heads/master
Author: David Majda 
Date:   2011-08-23 14:12:41 +0200

    Make ActionController::TestCase#recycle! set @protocol to nil
    
    This ensures that the protocol does not get carried over when there are
    two or more requests in functional tests. This was a problem when e.g.
    the first request was HTTP and the second request was HTTPS.
    
    Closes #2654.
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_controller/test_case.rb

commit ebea387	refs/heads/master
Author: Andrew White 
Date:   2011-08-23 15:33:59 +0100

    Add failing test case for #2654

M	actionpack/test/controller/test_test.rb

commit 13400ac	refs/heads/master
Author: Andrew White 
Date:   2011-08-23 14:55:31 +0100

    Ensure regexp and hash key are UTF-8

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit f7f9003	refs/heads/master
Merge: 45f8ca5 707378c
Author: Xavier Noria 
Date:   2011-08-23 05:27:11 -0700

    Merge pull request #2616 from tilsammans/patch-2
    
    Removed my name from the changelog as the amount of blogspam became ridic

commit 707378c	refs/heads/master
Author: Joost Baaij 
Date:   2011-08-23 14:18:06 +0200

    removed the link to my blog to help stop endless comments

M	railties/guides/source/getting_started.textile

commit c46befb	refs/heads/master
Author: Joost Baaij 
Date:   2011-08-23 14:17:29 +0200

    Revert "Removed my name from the changelog as the amount of blogspam became ridiculous.
"
    
    This reverts commit 95bece9155c46a2273a3febc3a2e176b8c15df8f.

M	railties/guides/source/getting_started.textile

commit 45f8ca5	refs/heads/master
Merge: eb18f3d 1be3442
Author: Xavier Noria 
Date:   2011-08-23 04:05:34 -0700

    Merge pull request #2653 from luckydev/ser-wrap
    
    Missing require array/wrap in serialization

commit eb18f3d	refs/heads/master
Merge: 5536d90 cacdbb9
Author: Xavier Noria 
Date:   2011-08-23 04:00:59 -0700

    Merge pull request #2652 from dasch/remove-trailing-whitespace
    
    Remove trailing whitespace

commit 1be3442	refs/heads/master
Author: Anand 
Date:   2011-08-23 16:30:02 +0530

    added missing require array/wrap in serialization

M	activemodel/lib/active_model/serialization.rb

commit 5536d90	refs/heads/master
Merge: 14cf4b2 56e32ad
Author: José Valim 
Date:   2011-08-23 03:55:24 -0700

    Merge pull request #2651 from luckydev/serialization-tests
    
    More tests for only-include and except-include options in serialization

commit cacdbb9	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-23 12:39:07 +0200

    Remove trailing whitespace

M	activesupport/test/core_ext/array_ext_test.rb

commit 56e32ad	refs/heads/master
Author: Anand 
Date:   2011-08-23 16:03:58 +0530

    added more tests for only-include and except-include options in serialization

M	activemodel/test/cases/serialization_test.rb

commit 2af37b0	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-08-23 11:07:37 +0100

    Don't modify params in place - fixes #2624
    (cherry picked from commit 14cf4b2e353f923155aab1ae0eaafed3c2924b12)

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit 14cf4b2	refs/heads/master
Author: Andrew White 
Date:   2011-08-23 11:07:37 +0100

    Don't modify params in place - fixes #2624

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit d7d0c25	refs/tags/v3.0.14
Merge: c8ec8f7 8226dfc
Author: Aaron Patterson 
Date:   2011-08-22 23:01:18 -0700

    Merge pull request #1995 from guilleiguaran/prototype-ujs-fix
    
    Prototype rails.js fixes for 3-0-stable

commit 7079701	refs/heads/master
Merge: 0b6da0c d17954c
Author: Aaron Patterson 
Date:   2011-08-22 22:54:42 -0700

    Merge pull request #2646 from guilleiguaran/add-destroy-alias-to-engine
    
    Add destroy alias to engines

commit d17954c	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-22 23:39:17 -0500

    Add destroy alias to engines

M	railties/lib/rails/engine/commands.rb

commit b113089	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-22 11:50:27 -0700

    Merge pull request #2411 from ai/debug_assets_by_config
    
    Debug assets by config

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/guides/source/asset_pipeline.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit b938b04	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-22 11:50:27 -0700

    Merge pull request #2411 from ai/debug_assets_by_config
    
    Debug assets by config

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/guides/source/asset_pipeline.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit 0b6da0c	refs/heads/master
Merge: 999e7ea 18b2223
Author: Santiago Pastorino 
Date:   2011-08-22 11:50:27 -0700

    Merge pull request #2411 from ai/debug_assets_by_config
    
    Debug assets by config

commit 999e7ea	refs/heads/master
Merge: d7ec3ee 71232f5
Author: Aaron Patterson 
Date:   2011-08-22 11:29:01 -0700

    Merge pull request #2627 from luckydev/tr
    
    travis status image added

commit d7ec3ee	refs/heads/master
Merge: 0942879 44f0d94
Author: Aaron Patterson 
Date:   2011-08-22 11:28:26 -0700

    Merge pull request #2611 from ognevsky/add-destroy-alias
    
    Added destroy alias to rails generator

commit 1f1d4aa	refs/tags/v3.1.0.rc7
Merge: c2ab1b1 2f20c6c
Author: Aaron Patterson 
Date:   2011-08-22 11:20:16 -0700

    Merge branch '3-1-stable' into 3-1-0
    
    * 3-1-stable: (21 commits)
      Added a test to check for correct behaviour with no options in add_index command recorder
      Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
      Neatened up the invert_add_index method as per suggeston
      Simple fix for correctly inverting an add_index migration when a name has been provided
      Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
      Fix Sprockets rewrite_asset_path
      Merge pull request #2620 from cesario/3-1-0
      Fix sprockets warnings
      Use typewriter styling on url_for in documentation
      Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
      remove extra space since comment_if already returns the space. (cherry picked from commit 5e73a2fa50e0e54ee69ab8725dc2d23facaf807d)
      Merge pull request #2596 from dharmatech/patch-1
      Merge pull request #2595 from smartinez87/assets-guide
      Merge pull request #2597 from dharmatech/patch-2
      Merge pull request #2604 from vijaydev/params_wrapper_docs
      Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
      Merge pull request #2603 from vijaydev/guides
      Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
      Revert "Deprecate the use of non-public methods by Module#delegate"
      mailer guide: fixes indentation, and use fixed width fonts wherever necessary
      ...

commit c8ec8f7	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-08-22 10:36:12 -0700

    Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
    
    Use mysql_creation_options inside rescue block

M	activerecord/lib/active_record/railties/databases.rake

commit 2f20c6c	refs/tags/v3.1.1.rc1
Author: David Workman 
Date:   2011-05-24 17:06:40 +0100

    Added a test to check for correct behaviour with no options in add_index command recorder

M	activerecord/test/cases/migration/command_recorder_test.rb

commit 00c8151	refs/tags/v3.1.1.rc1
Author: David Workman 
Date:   2011-05-23 22:33:03 +0100

    Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat

M	activerecord/lib/active_record/migration/command_recorder.rb

commit 9934c97	refs/tags/v3.1.1.rc1
Author: David Workman 
Date:   2011-05-23 15:03:42 +0100

    Neatened up the invert_add_index method as per suggeston

M	activerecord/lib/active_record/migration/command_recorder.rb

commit 54866b0	refs/tags/v3.1.1.rc1
Author: David Workman 
Date:   2011-05-23 13:54:38 +0100

    Simple fix for correctly inverting an add_index migration when a name has been provided

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 5ec3430	refs/tags/v3.1.1.rc1
Merge: 9a26ba3 c4ba1af
Author: Santiago Pastorino 
Date:   2011-08-22 10:43:18 -0700

    Merge pull request #2216 from martinisoft/remove_generated_whitespace
    
    Remove generated whitespace

commit c2ab1b1	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-22 10:36:12 -0700

    Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
    
    Use mysql_creation_options inside rescue block

M	activerecord/lib/active_record/railties/databases.rake

commit 9a26ba3	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-22 10:36:12 -0700

    Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
    
    Use mysql_creation_options inside rescue block

M	activerecord/lib/active_record/railties/databases.rake

commit 0942879	refs/heads/master
Merge: cfb5e14 4bb7abc
Author: Santiago Pastorino 
Date:   2011-08-22 10:36:12 -0700

    Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
    
    Use mysql_creation_options inside rescue block

commit 812d1ae	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-08-22 11:12:54 -0500

    Fix Sprockets rewrite_asset_path

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit cfb5e14	refs/heads/master
Merge: 041f1c7 e1f11ff
Author: Joshua Peek 
Date:   2011-08-22 10:24:16 -0700

    Merge pull request #2634 from guilleiguaran/fix-sprockets-rewrite-asset-path
    
    Fix Sprockets rewrite_asset_path

commit 71232f5	refs/heads/master
Author: Anand 
Date:   2011-08-22 17:07:23 +0530

    Travis status image added to GitHub README, excluding API pages.

M	README.rdoc
M	Rakefile

commit e1f11ff	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-22 11:12:54 -0500

    Fix Sprockets rewrite_asset_path

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 041f1c7	refs/heads/master
Merge: aae5ebf db181bd
Author: Santiago Pastorino 
Date:   2011-08-22 08:11:35 -0700

    Merge pull request #2631 from dasch/refactor-sprockets
    
    Refactor Sprockets::Helpers::RailsHelper#performing_caching?

commit db181bd	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-08-22 16:50:33 +0200

    Refactor Sprockets::Helpers::RailsHelper#performing_caching?
    
    No need for them lines to get so long! Also, move that comment into
    the method body where it belongs!

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 44f0d94	refs/heads/master
Author: Andrey Ognevsky 
Date:   2011-08-21 01:25:11 +0300

    Add Destroy Alias
    
    * Added destroy alias to rails generator
    
    * add alias info for destroy command
    
    * Updated command line guides

M	railties/guides/source/command_line.textile
M	railties/lib/rails/commands.rb

commit f690367	refs/heads/master
Author: Nat Welch 
Date:   2011-08-22 00:35:53 -0700

    From @dasch's recommendation.

M	activerecord/lib/active_record/schema_dumper.rb

commit aae5ebf	refs/heads/master
Merge: 35c8a89 f6ceb94
Author: Aaron Patterson 
Date:   2011-08-21 18:42:17 -0700

    Merge pull request #2618 from FLOChip/unicode_j
    
    fix escape_javascript for unicode character \u2028.

commit 35c8a89	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-21 15:55:15 -0700

    Merge pull request #2620 from cesario/3-1-0
    
    Fix CI and rename 1 misleading test case.

M	railties/test/generators/app_generator_test.rb

commit d81fe8d	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-21 15:55:15 -0700

    Merge pull request #2620 from cesario/3-1-0
    
    Fix CI and rename 1 misleading test case.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 9d1fc08	refs/tags/v3.1.0.rc7
Merge: 61fa600 2173e04
Author: Santiago Pastorino 
Date:   2011-08-21 15:55:15 -0700

    Merge pull request #2620 from cesario/3-1-0
    
    Fix CI and rename 1 misleading test case.

commit 0c89344	refs/heads/master
Author: Nat Welch 
Date:   2011-08-21 15:54:59 -0700

    Fixes bug with schema dumper when using with Padrino.

M	activerecord/lib/active_record/schema_dumper.rb

commit 18b2223	refs/heads/master
Author: Andrey A.I. Sitnik 
Date:   2011-08-22 09:36:36 +1100

    Allow to debug assets by config.assets.debug

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/guides/source/asset_pipeline.textile
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit d7bef0a	refs/tags/v3.1.1.rc1
Author: Joshua Peek 
Date:   2011-08-21 16:42:06 -0500

    Fix sprockets warnings
    
    Fixes #2598

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb

commit 63d3809	refs/heads/master
Author: Joshua Peek 
Date:   2011-08-21 16:42:06 -0500

    Fix sprockets warnings
    
    Fixes #2598

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb

commit 95bece9	refs/heads/master
Author: Joost Baaij 
Date:   2011-08-22 00:10:01 +0300

    Removed my name from the changelog as the amount of blogspam became ridiculous.
    When will docrails be back? :-p

M	railties/guides/source/getting_started.textile

commit 2173e04	refs/tags/v3.1.0.rc7
Author: Franck Verrot 
Date:   2011-08-21 22:43:53 +0200

    Add a trailing space to the comment_if method

M	railties/lib/rails/generators/app_base.rb

commit f63a134	refs/tags/v3.1.0.rc7
Author: Franck Verrot 
Date:   2011-08-21 22:44:27 +0200

    This is a test on --skip-sprockets, not --skip-active-record
    (cherry picked from commit 0c79098720e46e2a4a8380703ab9abc7dd0a4121)

M	railties/test/generators/app_generator_test.rb

commit f6ceb94	refs/heads/master
Author: Teng Siong Ong 
Date:   2011-08-21 15:14:45 -0500

    fix escape_javascript for unicode character \u2028.

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 61fa600	refs/tags/v3.1.0.rc7
Author: asmega 
Date:   2011-08-20 23:28:49 +0100

    Use typewriter styling on url_for in documentation

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 1fd3c26	refs/tags/v3.1.1.rc1
Author: asmega 
Date:   2011-08-20 23:28:49 +0100

    Use typewriter styling on url_for in documentation

M	actionpack/lib/action_view/helpers/url_helper.rb

commit f25d65d	refs/heads/master
Merge: 83b91c1 ebe9155
Author: Xavier Noria 
Date:   2011-08-21 09:17:47 -0700

    Merge pull request #2610 from asmega/documentation
    
    added link to url_for in documentation

commit ebe9155	refs/heads/master
Author: asmega 
Date:   2011-08-20 23:28:49 +0100

    Use typewriter styling on url_for in documentation

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 7a6b220	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-21 07:36:02 -0700

    Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
    
    Bump sprockets to 2.0.0.beta.14

M	actionpack/actionpack.gemspec

commit a79530a	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-21 07:36:02 -0700

    Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
    
    Bump sprockets to 2.0.0.beta.14

M	actionpack/actionpack.gemspec

commit 83b91c1	refs/heads/master
Merge: 74b57b3 f71c481
Author: Santiago Pastorino 
Date:   2011-08-21 07:36:02 -0700

    Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
    
    Bump sprockets to 2.0.0.beta.14

commit cc36385	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-21 07:32:50 -0700

    Merge pull request #2615 from cesario/cherry_picks_on_rc6
    
    Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb

commit fe7282e	refs/tags/v3.1.1.rc1
Merge: 9b7f493 365ebdb
Author: Santiago Pastorino 
Date:   2011-08-21 07:32:50 -0700

    Merge pull request #2615 from cesario/cherry_picks_on_rc6
    
    Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.

commit 74b57b3	refs/heads/master
Merge: 165fb83 dbe9a9b
Author: Xavier Noria 
Date:   2011-08-21 04:36:12 -0700

    Merge pull request #2600 from al/finder_sql_example_update
    
    Updated the docs for the has_many :finder_sql option

commit 365ebdb	refs/tags/v3.1.1.rc1
Author: Teng Siong Ong 
Date:   2011-07-13 00:59:30 +0800

    remove extra space since comment_if already returns the space.
    (cherry picked from commit 5e73a2fa50e0e54ee69ab8725dc2d23facaf807d)

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb

commit 0ebdef2	refs/tags/v3.0.14
Author: José Valim 
Date:   2011-08-21 09:22:38 +0300

    Edited .travis.yml via GitHub

M	.travis.yml

commit f71c481	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-20 17:10:15 -0500

    Bump sprockets to 2.0.0.beta.14

M	actionpack/actionpack.gemspec

commit 088f6f0	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-20 14:16:15 -0700

    Merge pull request #2596 from dharmatech/patch-1
    
    ActionController::Redirecting : fix docs typo

M	actionpack/lib/action_controller/metal/redirecting.rb

commit a0cb706	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-20 14:15:47 -0700

    Merge pull request #2595 from smartinez87/assets-guide
    
    Document debugging assets set by default for dev and test envs on guides

M	railties/guides/source/asset_pipeline.textile

commit a7ea1ff	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-20 14:14:54 -0700

    Merge pull request #2597 from dharmatech/patch-2
    
    actionpack/lib/action_controller/base.rb: docs typo

M	actionpack/lib/action_controller/base.rb

commit 9b7f493	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-20 14:16:15 -0700

    Merge pull request #2596 from dharmatech/patch-1
    
    ActionController::Redirecting : fix docs typo

M	actionpack/lib/action_controller/metal/redirecting.rb

commit b82bd6c	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-20 14:15:47 -0700

    Merge pull request #2595 from smartinez87/assets-guide
    
    Document debugging assets set by default for dev and test envs on guides

M	railties/guides/source/asset_pipeline.textile

commit 52e1e45	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-20 14:14:54 -0700

    Merge pull request #2597 from dharmatech/patch-2
    
    actionpack/lib/action_controller/base.rb: docs typo

M	actionpack/lib/action_controller/base.rb

commit 165fb83	refs/heads/master
Merge: 1299640 31d38d3
Author: Santiago Pastorino 
Date:   2011-08-20 14:16:15 -0700

    Merge pull request #2596 from dharmatech/patch-1
    
    ActionController::Redirecting : fix docs typo

commit 1299640	refs/heads/master
Merge: 71ef72c 0b3b91c
Author: Santiago Pastorino 
Date:   2011-08-20 14:15:47 -0700

    Merge pull request #2595 from smartinez87/assets-guide
    
    Document debugging assets set by default for dev and test envs on guides

commit 71ef72c	refs/heads/master
Merge: 77dfcae dfd03fd
Author: Santiago Pastorino 
Date:   2011-08-20 14:14:54 -0700

    Merge pull request #2597 from dharmatech/patch-2
    
    actionpack/lib/action_controller/base.rb: docs typo

commit 4fb4484	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-20 15:57:24 -0500

    Add .rbenv-version to .gitignore

M	.gitignore

commit 1d354fa	refs/tags/v3.1.1.rc1
Merge: f8f1e18 bf4714f
Author: Aaron Patterson 
Date:   2011-08-20 12:30:18 -0700

    Merge pull request #2605 from ernie/3-1-stable-2602-backport
    
    3-1-stable 2602 backport

commit 3655e7b	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-20 12:20:53 -0700

    Merge pull request #2604 from vijaydev/params_wrapper_docs
    
    Minor edit in the params wrapper api docs

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit f8f1e18	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-20 12:20:53 -0700

    Merge pull request #2604 from vijaydev/params_wrapper_docs
    
    Minor edit in the params wrapper api docs

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit 77dfcae	refs/heads/master
Merge: 257366d 7da70a4
Author: Santiago Pastorino 
Date:   2011-08-20 12:20:53 -0700

    Merge pull request #2604 from vijaydev/params_wrapper_docs
    
    Minor edit in the params wrapper api docs

commit bf4714f	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-08-20 11:49:17 -0700

    Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
    
    Fix assumption of primary key name in PredicateBuilder subquery.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/relations_test.rb

commit 7da70a4	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-20 23:49:57 +0530

    params wrapper docs correction

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit 257366d	refs/heads/master
Merge: 9ca44e3 f74f5f7
Author: Aaron Patterson 
Date:   2011-08-20 11:49:17 -0700

    Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
    
    Fix assumption of primary key name in PredicateBuilder subquery.

commit dbe9a9b	refs/heads/master
Author: Alan Larkin 
Date:   2011-08-20 13:12:10 +0100

    Updated the docs for the has_many :finder_sql option to reflect changes made in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required.

M	activerecord/lib/active_record/associations.rb

commit a263cb8	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-20 11:38:45 -0700

    Merge pull request #2603 from vijaydev/guides
    
    Minor change in the 3.1 release notes

M	railties/guides/source/3_1_release_notes.textile

commit d29eec6	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-20 11:38:45 -0700

    Merge pull request #2603 from vijaydev/guides
    
    Minor change in the 3.1 release notes

M	railties/guides/source/3_1_release_notes.textile

commit 9ca44e3	refs/heads/master
Merge: 8bd76aa 7444c62
Author: Santiago Pastorino 
Date:   2011-08-20 11:38:45 -0700

    Merge pull request #2603 from vijaydev/guides
    
    Minor change in the 3.1 release notes

commit 7444c62	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-20 23:27:31 +0530

    minor change in the 3.1 release notes

M	railties/guides/source/3_1_release_notes.textile

commit f74f5f7	refs/heads/master
Author: Ernie Miller 
Date:   2011-08-20 13:16:39 -0400

    Fix PredicateBuilder clobbering select_values in subquery.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/relations_test.rb

commit e2ae015	refs/heads/master
Author: Ernie Miller 
Date:   2011-08-20 13:00:26 -0400

    Fix assumption of primary key name in PredicateBuilder subquery.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/relations_test.rb

commit dfd03fd	refs/heads/master
Author: dharmatech 
Date:   2011-08-20 00:17:44 -0500

    actionpack/lib/action_controller/base.rb: docs typo

M	actionpack/lib/action_controller/base.rb

commit 31d38d3	refs/heads/master
Author: dharmatech 
Date:   2011-08-20 00:07:34 -0500

    ActionController::Redirecting : fix docs typo

M	actionpack/lib/action_controller/metal/redirecting.rb

commit 0b3b91c	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-08-19 19:45:55 -0300

    Document debugging assets set by default for dev and test envs in the asset_pipeline guide.

M	railties/guides/source/asset_pipeline.textile

commit a7afb84	refs/tags/v3.1.0.rc7
Author: Santiago Pastorino 
Date:   2011-08-19 15:28:52 -0700

    Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
    
    Debug assets by default in development and test environments

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit c09dbf2	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-08-19 15:28:52 -0700

    Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
    
    Debug assets by default in development and test environments

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 8bd76aa	refs/heads/master
Merge: 72bc89f 7223f10
Author: Santiago Pastorino 
Date:   2011-08-19 15:28:52 -0700

    Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
    
    Debug assets by default in development and test environments

commit b0d9548	refs/tags/v3.1.0.rc7
Author: Jon Leighton 
Date:   2011-08-19 23:06:02 +0100

    Revert "Deprecate the use of non-public methods by Module#delegate"
    
    This reverts commit aa1d1e4962ba218f34defd0e7f0b665c795eb12b.
    
    Conflicts:
    
    	activesupport/lib/active_support/core_ext/module/delegation.rb
    	activesupport/test/core_ext/module_test.rb

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit 1b819d3	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-08-19 23:06:02 +0100

    Revert "Deprecate the use of non-public methods by Module#delegate"
    
    This reverts commit aa1d1e4962ba218f34defd0e7f0b665c795eb12b.
    
    Conflicts:
    
    	activesupport/lib/active_support/core_ext/module/delegation.rb
    	activesupport/test/core_ext/module_test.rb

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit dbdb230	refs/tags/v3.1.0.rc7
Author: Vijay Dev 
Date:   2011-08-20 00:17:37 +0530

    mailer guide: fixes indentation, and use fixed width fonts wherever necessary

M	railties/guides/source/action_mailer_basics.textile

commit 155f734	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-08-20 00:17:37 +0530

    mailer guide: fixes indentation, and use fixed width fonts wherever necessary

M	railties/guides/source/action_mailer_basics.textile

commit 72bc89f	refs/heads/master
Merge: cc90adf 129ad72
Author: Xavier Noria 
Date:   2011-08-19 13:09:50 -0700

    Merge pull request #2589 from vijaydev/guides
    
    Mailer guide fixes

commit 129ad72	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-20 00:17:37 +0530

    mailer guide: fixes indentation, and use fixed width fonts wherever necessary

M	railties/guides/source/action_mailer_basics.textile

commit 03b9630	refs/heads/master
Author: Marc G Gauthier 
Date:   2011-08-19 11:11:17 +0200

    Do not try to use as a parameter elements that are not acceptable

M	activeresource/lib/active_resource/base.rb

commit 7223f10	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-18 14:59:27 -0500

    Debug assets by default in development and test environments

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 0df00d9	refs/tags/v3.1.0.rc7
Author: Xavier Noria 
Date:   2011-08-18 02:59:02 -0700

    minor details revised in a gsub
    
    Regexps have a construct to express alternation of characters, which
    is character classes. In addition to being the most specific idiom to
    write this pattern, it reads better without the backslashes. Also, it
    is better not to use a capture if none is needed. As a side-effect of
    these changes, the gsub is marginally faster, but speed is not the
    point of this commit.

M	actionpack/lib/action_view/template/resolver.rb

commit cc90adf	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-18 02:59:02 -0700

    minor details revised in a gsub
    
    Regexps have a construct to express alternation of characters, which
    is character classes. In addition to being the most specific idiom to
    write this pattern, it reads better without the backslashes. Also, it
    is better not to use a capture if none is needed. As a side-effect of
    these changes, the gsub is marginally faster, but speed is not the
    point of this commit.

M	actionpack/lib/action_view/template/resolver.rb

commit 4b411c8	refs/tags/v3.1.0.rc7
Author: Jeff Dutil 
Date:   2011-08-16 22:59:36 -0400

    Fix ruby typo to correctly render code block in initializer.textile

M	railties/guides/source/initialization.textile
M	railties/guides/source/migrations.textile

commit 6f3bac4	refs/tags/v3.1.0.rc7
Author: Jeff Dutil 
Date:   2011-08-16 22:48:01 -0400

    Fix spacing in plugins.textile to fix html rendering and remove extra whitespace from security.textile

M	railties/guides/source/plugins.textile
M	railties/guides/source/security.textile

commit 12c0ea9	refs/heads/master
Merge: 3b5eb11 6783ce0
Author: Xavier Noria 
Date:   2011-08-17 17:30:47 -0700

    Merge branch 'master' of https://github.com/lifo/docrails

commit 3b5eb11	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-17 14:37:27 -0700

    fixes generation of the AR querying guide

M	railties/guides/source/active_record_querying.textile

commit 2e45cfe	refs/tags/v3.1.0.rc7
Author: Xavier Noria 
Date:   2011-08-17 14:37:27 -0700

    fixes generation of the AR querying guide

M	railties/guides/source/active_record_querying.textile

commit 8620bf9	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-08-17 17:26:00 +0300

    Implemented strict validation concept
    
    In order to deliver debug information to dev team
    instead of display error message to end user
    Implemented strict validation concept
    that suppose to define validation that always raise exception when fails

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activemodel/lib/active_model/validations/validates.rb
M	activemodel/lib/active_model/validations/with.rb
M	activemodel/test/cases/validations_test.rb

commit 5912f3f	refs/heads/master
Merge: 22e611e 3ebb322
Author: Xavier Noria 
Date:   2011-08-17 02:37:50 -0700

    Merge pull request #2551 from rgo/remove-blank-spaces-application-css
    
    Cleanup application.css

commit 6783ce0	refs/heads/master
Author: Jeff Dutil 
Date:   2011-08-16 23:35:40 -0400

    Updates to remove extra whitespaces and notably fix a whitespace issue with ajax_on_rails causing a code block not to render the entire block properly.

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_model_basics.textile
M	railties/guides/source/active_record_basics.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/api_documentation_guidelines.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/caching_with_rails.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/getting_started.textile

commit 6eadf5d	refs/heads/master
Author: Jeff Dutil 
Date:   2011-08-16 23:04:16 -0400

    Fix typo in i18n.textile header and remove extra whitespace.

M	railties/guides/source/i18n.textile

commit f302370	refs/heads/master
Author: Jeff Dutil 
Date:   2011-08-16 22:59:36 -0400

    Fix ruby typo to correctly render code block in initializer.textile

M	railties/guides/source/initialization.textile
M	railties/guides/source/migrations.textile

commit 7ff894d	refs/heads/master
Author: Jeff Dutil 
Date:   2011-08-16 22:48:01 -0400

    Fix spacing in plugins.textile to fix html rendering and remove extra whitespace from security.textile

M	railties/guides/source/plugins.textile
M	railties/guides/source/security.textile

commit 3ebb322	refs/heads/master
Author: Rafa García 
Date:   2011-08-17 04:01:07 +0200

    Cleanup application.css

M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit 22e611e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-16 17:39:58 -0700

    making the order more clear, adding linux distros mailing lists to our cc

M	RELEASING_RAILS.rdoc

commit 9d9f591	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-16 16:30:29 -0700

    adding lessons learned so I do not make the same mistake twice

M	RELEASING_RAILS.rdoc

commit 0b37704	refs/tags/v3.0.14
Merge: 4c8a211 4f15f39
Author: Aaron Patterson 
Date:   2011-08-16 15:34:19 -0700

    Merge branch '3-0-10' into 3-0-stable
    
    * 3-0-10:
      bumping rails to 3.0.10
      properly subsituting bad utf8 characters
      Tags with invalid names should also be stripped in order to prevent XSS attacks.  Thanks Sascha Depold for the report.
      prevent sql injection attacks by escaping quotes in column names
      Properly escape glob characters.
      bumping to 3.0.10.rc1
      more changelog updates
      updating CHANGELOGs

commit 633a569	refs/tags/v3.1.0.rc6 (tag: v3.1.0.rc6)
Author: Aaron Patterson 
Date:   2011-08-16 15:29:50 -0700

    bumping to 3.1.0.rc6

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 5f94b93	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-16 15:16:45 -0700

    Properly escape glob characters.

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/hello_w*rld.erb

commit bfc4325	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-16 15:18:53 -0700

    properly escape html to avoid invalid utf8 causing XSS attacks

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 586a944	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-16 15:17:49 -0700

    Tags with invalid names should also be stripped in order to prevent
    XSS attacks.  Thanks Sascha Depold for the report.

M	actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
M	actionpack/test/template/html-scanner/sanitizer_test.rb

commit 8a39f41	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-16 15:17:17 -0700

    prevent sql injection attacks by escaping quotes in column names

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/base_test.rb

commit a19ee5c	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-16 15:18:53 -0700

    properly escape html to avoid invalid utf8 causing XSS attacks

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 66c3e31	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-16 15:17:49 -0700

    Tags with invalid names should also be stripped in order to prevent
    XSS attacks.  Thanks Sascha Depold for the report.

M	actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
M	actionpack/test/template/html-scanner/sanitizer_test.rb

commit f9b642c	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-16 15:17:17 -0700

    prevent sql injection attacks by escaping quotes in column names

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/base_test.rb

commit 09ad48f	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-16 15:16:45 -0700

    Properly escape glob characters.

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/hello_w*rld.erb

commit 4f15f39	refs/tags/v3.0.10 (tag: v3.0.10)
Author: Aaron Patterson 
Date:   2011-08-16 15:10:17 -0700

    bumping rails to 3.0.10

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit b45dfc7	refs/tags/v3.0.10
Author: Aaron Patterson 
Date:   2011-08-16 15:09:28 -0700

    properly subsituting bad utf8 characters

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 3480d97	refs/tags/v3.0.10
Author: Aaron Patterson 
Date:   2011-08-16 15:08:10 -0700

    Tags with invalid names should also be stripped in order to prevent
    XSS attacks.  Thanks Sascha Depold for the report.

M	actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
M	actionpack/test/template/html-scanner/sanitizer_test.rb

commit fb4747b	refs/tags/v3.0.10
Author: Aaron Patterson 
Date:   2011-08-16 15:07:36 -0700

    prevent sql injection attacks by escaping quotes in column names

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/base_test.rb

commit e0c03f8	refs/tags/v3.0.10
Author: Aaron Patterson 
Date:   2011-08-16 15:06:57 -0700

    Properly escape glob characters.

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/controller/render_test.rb
A	actionpack/test/fixtures/test/hello_w*rld.erb

commit e0774e4	refs/tags/v2.3.14 (tag: v2.3.14)
Author: Aaron Patterson 
Date:   2011-08-16 14:58:39 -0700

    fixing utf8 escape vulerability

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 60f783d	refs/tags/v2.3.14
Author: Aaron Patterson 
Date:   2011-08-16 14:58:13 -0700

    fixing strip tags vulnerability

M	actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
M	actionpack/test/controller/html-scanner/sanitizer_test.rb

commit 6b46d65	refs/tags/v2.3.14
Author: Aaron Patterson 
Date:   2011-08-16 14:57:48 -0700

    fixing sql injection problem

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/base_test.rb

commit fb1588c	refs/tags/v2.3.14
Author: Aaron Patterson 
Date:   2011-08-16 14:57:05 -0700

    2.3.14. yay. :'(

M	actionmailer/Rakefile
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/Rakefile
M	actionpack/lib/action_pack/version.rb
M	activerecord/Rakefile
M	activerecord/lib/active_record/version.rb
M	activeresource/Rakefile
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/Rakefile
M	railties/lib/rails/version.rb

commit dea5a10	refs/tags/v2.3.13 (tag: v2.3.13)
Author: Aaron Patterson 
Date:   2011-08-16 14:34:14 -0700

    bumping to 2.3.13

M	actionmailer/Rakefile
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/Rakefile
M	actionpack/lib/action_pack/version.rb
M	activerecord/Rakefile
M	activerecord/lib/active_record/version.rb
M	activeresource/Rakefile
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/Rakefile
M	railties/lib/rails/version.rb

commit c238ba0	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 22:27:07 +0100

    Fix non-public method warning in Module#delegate. Fixes #2548.

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 11dafea	refs/tags/v2.3.13
Author: Aaron Patterson 
Date:   2011-08-16 14:25:45 -0700

    fixing response splitting problem

M	actionpack/lib/action_controller/response.rb
M	actionpack/test/controller/content_type_test.rb

commit bb99aa1	refs/tags/v2.3.13
Author: Aaron Patterson 
Date:   2011-08-16 14:24:44 -0700

    adding notification for rdoc

M	railties/lib/tasks/documentation.rake

commit dde5b87	refs/heads/master
Author: Trek Glowacki 
Date:   2011-08-16 16:27:07 -0400

    When a route references a missing controller, raise ActionController::RoutingError with a clearer message

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb

commit b0555bb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-16 11:29:54 -0700

    adding security email address

M	RELEASING_RAILS.rdoc

commit 98fac99	refs/heads/master
Merge: 0245792 8e23615
Author: Xavier Noria 
Date:   2011-08-16 11:19:20 -0700

    Merge branch 'master' of github.com:rails/rails

commit 2330c0c	refs/tags/v3.1.0.rc6
Merge: ae69c4c 29d0ce0
Author: Xavier Noria 
Date:   2011-08-16 11:19:02 -0700

    Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable

commit ae69c4c	refs/tags/v3.1.0.rc6
Author: Xavier Noria 
Date:   2011-08-16 11:18:51 -0700

    syncs the 3.1 release notes and asset pipeline guide with master

M	railties/guides/source/3_1_release_notes.textile
M	railties/guides/source/asset_pipeline.textile

commit 29d0ce0	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 19:14:06 +0100

    Use lazy load hooks to set parameter wrapping configuration. This means that it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 8e23615	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 19:14:06 +0100

    Use lazy load hooks to set parameter wrapping configuration. This means that it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 4b4e67f	refs/tags/v3.1.0.rc6
Author: Jeff Dutil 
Date:   2011-08-16 13:12:07 -0400

    Fix formatting of active_record_validations_callbacks.textile so guide will render properly at http://edgeguides.rubyonrails.org/active_record_validations_callbacks.html#displaying-validation-errors-in-the-view

M	railties/guides/source/active_record_validations_callbacks.textile

commit f3f5a8f	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-16 14:57:36 +0530

    document Array#append and Array#prepend methods in AS guide

M	railties/guides/source/active_support_core_extensions.textile

commit ebf0cc4	refs/tags/v3.1.0.rc6
Author: Sebastian Martinez 
Date:   2011-08-15 20:20:28 -0300

    Document Hash#extract!.

M	activesupport/lib/active_support/core_ext/hash/slice.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 927d3c2	refs/tags/v3.1.0.rc6
Author: Jacob Mattingley 
Date:   2011-08-15 16:00:53 -0700

    Fixed mistakes in layouts/rendering guide about yield
    
    yield(:unspecified_block) actually returns true even if :unspecified_block never
    exists. This means you can't use the form yield(:unspecified_block) or yield.

M	railties/guides/source/layouts_and_rendering.textile

commit d8c6bab	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-15 21:46:21 +0530

    assets guide - add info about require_directory, minor rephrasings

M	railties/guides/source/asset_pipeline.textile

commit 0c3bdc0	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-15 20:36:32 +0530

    minor changes in app templates guide

M	railties/guides/source/rails_application_templates.textile

commit 4eac844	refs/tags/v3.1.0.rc6
Author: Kamil Śliwak 
Date:   2011-08-15 03:13:07 +0300

    Fix a typo in 'Configuring Rails Applications' guide
    
    - The initializer is called `set_autoload_paths`, not `set_autoload_path`. See https://github.com/rails/rails/blob/master/railties/lib/rails/engine.rb#L506

M	railties/guides/source/configuring.textile

commit dbd72be	refs/tags/v3.1.0.rc6
Author: Raul Murciano 
Date:   2011-08-14 10:24:48 -0700

    Typo

M	railties/guides/source/action_mailer_basics.textile

commit 282ee95	refs/tags/v3.1.0.rc6
Author: Raul Murciano 
Date:   2011-08-14 10:14:28 -0700

    Action Mailer guide: mention how to use :cc and :bcc parameters.

M	railties/guides/source/action_mailer_basics.textile

commit 92d3b51	refs/tags/v3.1.0.rc6
Author: Raul Murciano 
Date:   2011-08-14 10:13:23 -0700

    Action Mailer guide update: the :to parameter now supports both String and Array values to indicate recipients.

M	railties/guides/source/action_mailer_basics.textile

commit 073d9ff	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-14 20:15:51 +0530

    rephrase how the verbose methods in a migration work

M	railties/guides/source/migrations.textile

commit 9e9b127	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-14 20:15:22 +0530

    document alias for rails runner

M	railties/guides/source/initialization.textile

commit 388f09c	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-14 19:29:35 +0530

    fix misleading comment (originally made by Tate Johnson, we lost this commit while porting to the rails repo)

M	activemodel/lib/active_model/errors.rb

commit 0245792	refs/heads/master
Merge: d0d25a9 c5f97b5
Author: Xavier Noria 
Date:   2011-08-16 11:06:40 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit d0d25a9	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-16 10:49:20 -0700

    prefer ends_with? over slicing

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 53a1308	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-16 10:34:18 -0700

    AS guide: document in Module#delegate that the method must be public in the target

M	railties/guides/source/active_support_core_extensions.textile

commit c5f97b5	refs/heads/master
Author: Jeff Dutil 
Date:   2011-08-16 13:12:07 -0400

    Fix formatting of active_record_validations_callbacks.textile so guide will render properly at http://edgeguides.rubyonrails.org/active_record_validations_callbacks.html#displaying-validation-errors-in-the-view

M	railties/guides/source/active_record_validations_callbacks.textile

commit 0ab65e8	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 16:37:56 +0100

    Fix assets tests in railties

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 458128d	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 15:13:57 +0100

    Don't reference ActiveRecord::Base in initializers/wrap_parameters.rb. Use config.active_record instead. This yields about a 20% decrease in startup time because it means that the connection is not created immediately on startup. Of course, this is only useful if you are not going to immediately use the database after startup.

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 5902391	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 16:37:56 +0100

    Fix assets tests in railties

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 4dd985a	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 15:13:57 +0100

    Don't reference ActiveRecord::Base in initializers/wrap_parameters.rb. Use config.active_record instead. This yields about a 20% decrease in startup time because it means that the connection is not created immediately on startup. Of course, this is only useful if you are not going to immediately use the database after startup.

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 0d5a6f6	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 15:01:18 +0100

    In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit c6e5746	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-16 09:24:49 -0300

    Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"
    
    This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing
    changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8.

M	activerecord/test/cases/attribute_methods_test.rb

commit 87152f2	refs/heads/master
Merge: 0d3615f 21e2eea
Author: Santiago Pastorino 
Date:   2011-08-16 05:22:27 -0700

    Merge pull request #2543 from htanata/unused_require_in_ar_test
    
    Remove unused require in activerecord/test/cases/attribute_methods_test.rb

commit bd4800d	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-16 14:57:36 +0530

    document Array#append and Array#prepend methods in AS guide

M	railties/guides/source/active_support_core_extensions.textile

commit 21e2eea	refs/heads/master
Author: Hendy Tanata 
Date:   2011-08-16 12:39:13 +0800

    Remove unused require.

M	activerecord/test/cases/attribute_methods_test.rb

commit 3594102	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 02:42:30 +0100

    Fix tzinfo require (it broke test_raises_when_an_invalid_timezone_is_defined_in_the_config in railties)

M	activesupport/lib/active_support/values/time_zone.rb

commit 0d3615f	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 02:42:30 +0100

    Fix tzinfo require (it broke test_raises_when_an_invalid_timezone_is_defined_in_the_config in railties)

M	activesupport/lib/active_support/values/time_zone.rb

commit 4b70376	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 02:28:13 +0100

    Fix wrap_parameters initializer template

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit f76842f	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 02:28:13 +0100

    Fix wrap_parameters initializer template

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 72de6ab	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 01:33:34 +0100

    Be more lazy about creating time zone objects. Decreases startup time by about 10%. (#734)

M	activesupport/lib/active_support/values/time_zone.rb

commit bfb9e61	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 01:33:34 +0100

    Be more lazy about creating time zone objects. Decreases startup time by about 10%. (#734)

M	activesupport/lib/active_support/values/time_zone.rb

commit 6cf15ae	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-16 00:59:59 +0100

    Don't refer to ActionController::Base in the wrap_parameters initializer - use config object instead. Cuts about 15% off the load time. (#734)

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 6c5f67c	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-16 00:59:59 +0100

    Don't refer to ActionController::Base in the wrap_parameters initializer - use config object instead. Cuts about 15% off the load time. (#734)

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 3085957	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-08-15 20:20:28 -0300

    Document Hash#extract!.

M	activesupport/lib/active_support/core_ext/hash/slice.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 583d7c1	refs/heads/master
Author: Jacob Mattingley 
Date:   2011-08-15 16:00:53 -0700

    Fixed mistakes in layouts/rendering guide about yield
    
    yield(:unspecified_block) actually returns true even if :unspecified_block never
    exists. This means you can't use the form yield(:unspecified_block) or yield.

M	railties/guides/source/layouts_and_rendering.textile

commit f7626ea	refs/heads/master
Author: JESii 
Date:   2011-08-15 15:17:13 -0700

    Updates to Asset Pipeline Guide
    
    Grammar/syntax/style changes:
    1. Changed all 'we' to 'you'
    2. Corrected typos
    3. Make consistent styline (e.g., dashes & double-dash usage)
    4. Change use of future tense (will...) to present tense (easier to read).

M	railties/guides/source/asset_pipeline.textile

commit 03a045b	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 23:07:39 +0100

    Bump arel dependency

M	activerecord/activerecord.gemspec

commit c3dcb79	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-11 08:52:48 +0100

    Use new SelectManager#source method

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit cc206a3	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-11 08:45:42 +0100

    Use new SelectManager#projections= method

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 12aaad0	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-11 08:38:47 +0100

    use update.key instead of update.ast.key. make better use of select manager.

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 8778c82	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-10 00:49:20 +0100

    Use a SelectCore rather than a full SelectManager

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit fe0ec85	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-10 00:06:30 +0100

    Refactor building the update manager

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/relation.rb

commit 43b99f2	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-10 00:03:49 +0100

    Support for multi-table updates with limits, offsets and orders

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/relations_test.rb

commit 128d006	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-09 00:12:53 +0100

    Support updates with joins. Fixes #522.

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit c388a95	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-15 23:07:39 +0100

    Bump arel dependency

M	activerecord/activerecord.gemspec

commit c6bf713	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-11 08:52:48 +0100

    Use new SelectManager#source method

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit c701b3f	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-11 08:45:42 +0100

    Use new SelectManager#projections= method

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit eff8aee	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-11 08:38:47 +0100

    use update.key instead of update.ast.key. make better use of select manager.

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit e85c644	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-10 00:49:20 +0100

    Use a SelectCore rather than a full SelectManager

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 24ade58	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-10 00:06:30 +0100

    Refactor building the update manager

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/relation.rb

commit e81e508	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-10 00:03:49 +0100

    Support for multi-table updates with limits, offsets and orders
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/test/cases/relations_test.rb

commit 044fb8c	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-09 00:12:53 +0100

    Support updates with joins. Fixes #522.
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
    	activerecord/test/cases/relations_test.rb

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 9482554	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-08-15 16:56:33 -0500

    Added Array#prepend as an alias for Array#unshift and Array#append as an alias for Array#<< [DHH]

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/array.rb
A	activesupport/lib/active_support/core_ext/array/prepend_and_append.rb
M	activesupport/test/core_ext/array_ext_test.rb

commit bb4e790	refs/heads/master
Merge: fd29b4e 83eec4c
Author: Jon Leighton 
Date:   2011-08-15 13:32:52 -0700

    Merge pull request #2539 from arunagw/delegate_expl
    
    Delegate expl

commit 83eec4c	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-16 01:36:21 +0530

    Requiring delegate.

M	activesupport/test/notifications_test.rb
M	railties/lib/rails/railtie.rb

commit b246928	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 14:06:42 +0100

    Removing unnecessary require, solve 'circular require considered harmful' warning.

M	activesupport/lib/active_support/notifications.rb

commit e749abc	refs/tags/v3.1.0.rc6
Merge: 28e250e f4e535e
Author: Jon Leighton 
Date:   2011-08-15 11:54:39 -0700

    Merge pull request #2538 from arunagw/notifications_test_fix
    
    Notifications test fix

commit f4e535e	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-08-16 00:20:06 +0530

    Notification Test Fix

M	activesupport/test/notifications_test.rb

commit fd29b4e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-15 15:35:47 -0300

    Fix typo

M	railties/test/application/assets_test.rb

commit 28e250e	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-15 15:31:47 -0300

    rake assets:precompile executes in production environment as default if RAILS_ENV was not provided

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 4ca605b	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-15 15:31:47 -0300

    rake assets:precompile executes in production environment as default if RAILS_ENV was not provided

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit b01cc22	refs/heads/master
Merge: ebb2e94 45ccd64
Author: Santiago Pastorino 
Date:   2011-08-15 10:55:52 -0700

    Merge pull request #2536 from arunagw/unused_var
    
    Unused variable removed.

commit 4c8a211	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-08-15 17:23:15 +0100

    Update travis config on @joshk's instructions

M	.travis.yml

commit 81151eb	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-15 17:23:15 +0100

    Update travis config on @joshk's instructions

M	.travis.yml

commit ebb2e94	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 17:23:15 +0100

    Update travis config on @joshk's instructions

M	.travis.yml

commit 45ccd64	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-15 21:49:12 +0530

    Unused variable removed.

M	actionpack/test/template/form_tag_helper_test.rb

commit c0c5d5f	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-15 21:46:21 +0530

    assets guide - add info about require_directory, minor rephrasings

M	railties/guides/source/asset_pipeline.textile

commit 6bb6519	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-15 16:00:35 +0100

    Ensure empty has_many :through association preloaded via joins is marked as loaded. Fixes #2054.

M	activerecord/lib/active_record/associations/join_dependency.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit c80876f	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 16:26:37 +0100

    Document Object#public_send

M	activesupport/lib/active_support/core_ext/object/public_send.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 2e2f3f5	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 16:07:49 +0100

    Add a test for delegating a method ending in '=' as this is a special case.

M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit b8363f8	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-15 20:36:32 +0530

    minor changes in app templates guide

M	railties/guides/source/rails_application_templates.textile

commit 7a9da9c	refs/tags/v3.1.0.rc6
Merge: 68cb618 801cd66
Author: Jon Leighton 
Date:   2011-08-15 08:03:26 -0700

    Merge pull request #2535 from arunagw/delegation_fix
    
    Delegation fix

commit 57423d8	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 16:00:35 +0100

    Ensure empty has_many :through association preloaded via joins is marked as loaded. Fixes #2054.

M	activerecord/lib/active_record/associations/join_dependency.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 801cd66	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-08-15 19:55:48 +0530

    Including delegation

M	railties/lib/rails/railtie.rb

commit 4c743d9	refs/heads/master
Merge: 27da0c5 10b99f2
Author: Jon Leighton 
Date:   2011-08-15 06:46:59 -0700

    Merge pull request #2534 from arunagw/public_send_require
    
    Need to include public_send

commit 10b99f2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-15 19:13:25 +0530

    Need to include public_send

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 68cb618	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-15 14:06:42 +0100

    Removing unnecessary require, solve 'circular require considered harmful' warning.

M	activesupport/lib/active_support/notifications.rb

commit 27da0c5	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 13:56:04 +0100

    Split up the definitions in Module#delegate depending on :allow_nil, and don't use exceptions for flow control in the :allow_nil => true case.

M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit 63d100e	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-15 12:50:57 +0100

    Fix the line number in the backtrace when Module#delegate raises

M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit 75d5195	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-15 12:50:57 +0100

    Fix the line number in the backtrace when Module#delegate raises

M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit 1aab850	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-07-18 16:35:21 +0100

    Fix deprecation warnings due to private methods which are delegated to.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb

commit 7b56fb0	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-18 16:35:21 +0100

    Fix private methods which are delegated to. This previously worked because Module#delegate previously ignored method visibility.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb

commit 8bba95f	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-18 16:06:21 +0100

    Just do the method call directly in Module#delegate, if we can (we cannot for method names ending in '='). Two reasons: 1) it's faster, see https://gist.github.com/1089783 and 2) more importantly, delegate should not allow you to accidentally call private or protected methods.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit aa1d1e4	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-07-18 16:06:21 +0100

    Deprecate the use of non-public methods by Module#delegate

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/module/delegation.rb
M	activesupport/test/core_ext/module_test.rb

commit 6f4b405	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-18 15:50:02 +0100

    Backport Object#public_send to 1.8 so that we can implement Module#delegate such that non-public methods raise

M	activesupport/lib/active_support/core_ext/object.rb
A	activesupport/lib/active_support/core_ext/object/public_send.rb
A	activesupport/test/core_ext/object/public_send_test.rb

commit 7b53d13	refs/heads/master
Author: Sebi Burkhard 
Date:   2011-08-15 16:54:13 +0700

    JSON: Encode infinite or NaN floats as null to generate valid JSON.

M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/json/encoding_test.rb

commit 9e3f0cd	refs/heads/master
Merge: 7712db4 c026cc2
Author: Kamil Śliwak 
Date:   2011-08-14 17:23:02 -0700

    Merge pull request #58 from cameel/fix-set_autoload_path-typo
    
    Fix a typo in 'Configuring Rails Applications' guide

commit c026cc2	refs/heads/master
Author: Kamil Śliwak 
Date:   2011-08-15 03:13:07 +0300

    Fix a typo in 'Configuring Rails Applications' guide
    
    - The initializer is called `set_autoload_paths`, not `set_autoload_path`. See https://github.com/rails/rails/blob/master/railties/lib/rails/engine.rb#L506

M	railties/guides/source/configuring.textile

commit 0e19c7c	refs/tags/v3.1.0.rc6
Author: José Valim 
Date:   2011-08-14 10:53:31 -0700

    Ensure changing RAILS_GROUPS will load the proper dependencies.

M	actionpack/lib/sprockets/assets.rake

commit 652ab43	refs/heads/master
Author: José Valim 
Date:   2011-08-14 10:52:46 -0700

    Ensure changing RAILS_GROUPS will load the proper dependencies.

M	actionpack/lib/sprockets/assets.rake

commit 7712db4	refs/heads/master
Author: Raul Murciano 
Date:   2011-08-14 10:24:48 -0700

    Typo

M	railties/guides/source/action_mailer_basics.textile

commit 51b2502	refs/heads/master
Author: Raul Murciano 
Date:   2011-08-14 10:14:28 -0700

    Action Mailer guide: mention how to use :cc and :bcc parameters.

M	railties/guides/source/action_mailer_basics.textile

commit 169a509	refs/heads/master
Author: Raul Murciano 
Date:   2011-08-14 10:13:23 -0700

    Action Mailer guide update: the :to parameter now supports both String and Array values to indicate recipients.

M	railties/guides/source/action_mailer_basics.textile

commit 99f87c9	refs/heads/master
Merge: bf2b9d2 75dd33a
Author: José Valim 
Date:   2011-08-14 10:04:14 -0700

    Merge pull request #2527 from cesario/fix_2511
    
    Methods like status and location are interfering with redirect_to [Closes #2511]

commit 75dd33a	refs/heads/master
Author: Franck Verrot 
Date:   2011-08-14 18:58:29 +0200

    Methods like status and location are interfering with redirect_to [Closes #2511]

M	actionpack/lib/action_controller/metal/instrumentation.rb
M	actionpack/test/controller/redirect_test.rb

commit ac4dc5e	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-14 20:15:51 +0530

    rephrase how the verbose methods in a migration work

M	railties/guides/source/migrations.textile

commit 3c57155	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-14 20:15:22 +0530

    document alias for rails runner

M	railties/guides/source/initialization.textile

commit 9f76e47	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-14 19:52:22 +0530

    added a few more items in the release notes

M	railties/guides/source/3_1_release_notes.textile

commit b98d3ab	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-14 19:29:35 +0530

    fix misleading comment (originally made by Tate Johnson, we lost this commit while porting to the rails repo)

M	activemodel/lib/active_model/errors.rb

commit 17154e3	refs/tags/v3.1.0.rc6
Merge: 41ce161 5a5171b
Author: Santiago Pastorino 
Date:   2011-08-14 06:08:02 -0700

    Merge pull request #2522 from arunagw/railties_test_fix
    
    Railties test fix

commit 4bb7abc	refs/heads/master
Author: Jonathon M. Abbott 
Date:   2011-07-27 17:35:35 +1000

    Use mysql_creation_options inside rescue block
    
    Commit ecd37084b28a05f05251 did not take into account the use of
    creation_options inside the access denied exception handler.

M	activerecord/lib/active_record/railties/databases.rake

commit 5a5171b	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-08-14 13:48:04 +0530

    Need to use initializers true here to pass the test.

M	railties/test/application/assets_test.rb

commit 322b978	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-08-14 13:47:38 +0530

    Bringing back the jquery-rails. One test is dependent.

M	Gemfile

commit 33be1b0	refs/heads/master
Author: Hendy Tanata 
Date:   2011-08-14 13:11:36 +0800

    Active Model instead of ActiveModel.

M	railties/guides/source/3_1_release_notes.textile

commit e10b288	refs/heads/master
Author: Hendy Tanata 
Date:   2011-08-14 12:30:37 +0800

    Use fixed-width font where necessary.

M	railties/guides/source/3_1_release_notes.textile

commit 4d525b8	refs/heads/master
Author: Hendy Tanata 
Date:   2011-08-14 13:05:25 +0800

    Fix tt tag appearing on 3_1_release_notes guide.

M	railties/guides/source/3_1_release_notes.textile

commit bf2b9d2	refs/heads/master
Merge: acfdb18 f566fb3
Author: Xavier Noria 
Date:   2011-08-13 16:30:07 -0700

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	RELEASING_RAILS.rdoc
    	actionpack/lib/sprockets/railtie.rb
    	actionpack/test/template/sprockets_helper_test.rb
    	activerecord/test/cases/calculations_test.rb
    	railties/guides/source/3_1_release_notes.textile
    	railties/guides/source/active_resource_basics.textile
    	railties/guides/source/command_line.textile

commit f566fb3	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-12 17:23:16 -0700

    "suits" is correct here, not "suites"

M	RELEASING_RAILS.rdoc

commit aa0d3ce	refs/heads/master
Author: Oge Nnadi 
Date:   2011-08-12 12:00:32 -0300

    Typo fix

M	actionpack/lib/action_controller/caching/actions.rb

commit 0196f0f	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-08-11 21:28:57 -0300

    Some fixes on the 3_1_release_notes guide.

M	railties/guides/source/3_1_release_notes.textile

commit 53e1a9d	refs/heads/master
Author: geemus 
Date:   2011-08-11 14:43:48 -0500

    update abstract_controller callbacks to document meta-programmed filters

M	actionpack/lib/abstract_controller/callbacks.rb

commit 54cd73e	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-05 20:15:48 +0530

    ActiveModel::Validations basic guide

M	railties/guides/source/active_model_basics.textile

commit 56efdbc	refs/heads/master
Author: Florent Guilleux 
Date:   2011-08-08 19:31:03 -0500

    Document exclamation point on dynamic finders

M	activerecord/lib/active_record/base.rb

commit 1b0d03b	refs/heads/master
Author: Emili Parreño 
Date:   2011-08-10 23:32:11 +0200

    update rails on rack guide, section 2 needs to be changed or maybe deleted

M	railties/guides/source/rails_on_rack.textile

commit 635c1ca	refs/heads/master
Author: Mr. Wolfe 
Date:   2011-08-10 23:27:00 +0200

    Revert "update rails on rack guide, section 2 needs to be changed or maybe deleted"
    
    This reverts commit 7a4e545eccf834cb620df0f909ef3f4bec4e6608.

M	railties/guides/source/rails_on_rack.textile

commit 3b4e7c9	refs/heads/master
Author: Mr. Wolfe 
Date:   2011-08-10 23:22:16 +0200

    update rails on rack guide, section 2 needs to be changed or maybe deleted

M	railties/guides/source/rails_on_rack.textile

commit 7615814	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-09 11:37:13 -0700

    comma is more appropriate here

M	activeresource/README.rdoc

commit 9cf56c7	refs/heads/master
Author: Floris Huetink 
Date:   2011-08-09 15:48:34 +0200

    Fixed typo (attachments method name was missing an s) in Action Mailer basics guide

M	railties/guides/source/action_mailer_basics.textile

commit 239e615	refs/heads/master
Author: Tate Johnson 
Date:   2011-08-09 20:01:06 +1000

    Fixed typo

M	activemodel/lib/active_model/errors.rb

commit 49e81f2	refs/heads/master
Author: Richard Hulse 
Date:   2011-08-08 22:21:25 +1200

    [asset pipeline] update snippet to reflect patch
    
    Two commented lines in example to match the
    commit (8845ae683e2688)

M	railties/guides/source/asset_pipeline.textile

commit 32da2f8	refs/heads/master
Author: Richard Hulse 
Date:   2011-08-08 18:02:19 +1200

    [asset pipeline] update to reflect new sendfile header default
    
    X-Sendfile headers are now set to nil and are off by default.
    See commit eff7fddeb26eaa346827

M	railties/guides/source/asset_pipeline.textile

commit 93ec7bb	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-07 21:45:12 +0530

    3.1 release notes: fixed font changes

M	railties/guides/source/3_1_release_notes.textile

commit 8c133fc	refs/heads/master
Author: ov3y 
Date:   2011-08-07 07:55:59 -0300

    Point to current, official upgrade plugin

M	railties/guides/source/3_0_release_notes.textile

commit b840d71	refs/heads/master
Author: Richard Hulse 
Date:   2011-08-07 09:37:39 +1200

    [asset pipeline] Update Capistrano info
    
    v2.8.0 of Capistrano has a recipe to handle precompile
    and symlinking.

M	railties/guides/source/asset_pipeline.textile

commit dbf2256	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-06 23:53:53 +0530

    3.1 release notes: organize action_pack notes

M	railties/guides/source/3_1_release_notes.textile

commit 8320fbb	refs/heads/master
Author: JudeArasu 
Date:   2011-08-06 05:21:27 +0530

    prototype switch

M	railties/guides/source/3_1_release_notes.textile

commit 31b820e	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-06 01:39:05 +0530

    expand tmp:* tasks, and a few more additions in the command line guide

M	railties/guides/source/command_line.textile

commit bc9eaf4	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-06 01:01:54 +0530

    indentation fixes

M	railties/guides/source/initialization.textile

commit 86ae14d	refs/heads/master
Author: Sukeerthi Adiga G 
Date:   2011-08-05 15:21:12 +0530

    Dirty object methods added to active model basics

M	railties/guides/source/active_model_basics.textile

commit a3cf682	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-05 15:28:01 +0530

    ActiveModel::Conversion basic guide

M	railties/guides/source/active_model_basics.textile

commit d5adaf2	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-05 14:48:00 +0530

    ActiveModel::Callbacks basic guide

M	railties/guides/source/active_model_basics.textile

commit 33d7a6b	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-05 14:35:04 +0530

    ActiveModel::Callbacks basic guide

M	railties/guides/source/active_model_basics.textile

commit bc49d6d	refs/heads/master
Author: Richard Hulse 
Date:   2011-08-05 20:46:20 +1200

    [asset pipeline] fixed example
    
    Changed << to += because we are _concatenating_
    this new array to the end of config array, NOT
    pushing this array in it.

M	railties/guides/source/asset_pipeline.textile

commit b905f8c	refs/heads/master
Author: Sukeerthi Adiga 
Date:   2011-08-05 14:04:43 +0530

    Rubygems => RubyGems

M	actionmailer/README.rdoc
M	actionpack/README.rdoc
M	activerecord/README.rdoc
M	activeresource/README.rdoc
M	activesupport/README.rdoc
M	railties/README.rdoc
M	railties/guides/source/performance_testing.textile

commit 2579d88	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-05 01:17:09 -0700

    capitalize RubyGems properl

M	activemodel/README.rdoc

commit a7b2867	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-05 01:08:53 -0700

    rephrase "like to be"

M	actionpack/README.rdoc

commit 9eb3e63	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-05 13:34:28 +0530

    AttributeMethods refector suffix method added some usages

M	railties/guides/source/active_model_basics.textile

commit 7963099	refs/heads/master
Author: Sukeerthi Adiga G 
Date:   2011-08-05 13:13:31 +0530

    ActiveResource::Validations module basics updated

M	railties/guides/source/active_resource_basics.textile

commit 4bde1b0	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-05 13:13:22 +0530

    ActiveModel::AttributeMethods basic guide

M	railties/guides/source/active_model_basics.textile

commit ac287b2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-05 12:16:53 +0530

    Adding Basic file for ActiveModel. @vatrai and @sukeerthiadiga is going to take care other detailed stuff.

A	railties/guides/source/active_model_basics.textile

commit c8e5c0d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 16:31:57 -0700

    we should not ignore all gems in here

M	.gitignore

commit 5852fcf	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-04 18:43:13 -0300

    Add git push and git push --tags to RELEASING_RAILS.rdoc

M	RELEASING_RAILS.rdoc

commit 5399b20	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 14:15:45 -0700

    moving CI and Sam Ruby to the top of the list.  I :heart: CI and Sam

M	RELEASING_RAILS.rdoc

commit bf0b6e4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 14:13:41 -0700

    add section about notifying implementors

M	RELEASING_RAILS.rdoc

commit a7a3169	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 14:07:23 -0700

    fixing assert_difference issues on ruby 1.8

M	activesupport/lib/active_support/testing/assertions.rb

commit 886d011	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 12:00:06 -0700

    fixing wrong words.  thanks @jbrown

M	RELEASING_RAILS.rdoc

commit ebfca24	refs/heads/master
Author: Casebook Developer 
Date:   2011-08-04 13:34:47 -0400

    ActionView::Helpers::TextHelper#simple_format should not change the text in place. Now it duplicates it.

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 6b80917	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 11:27:26 -0700

    adding my brain dump of the release process

A	RELEASING_RAILS.rdoc

commit 68c4b66	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-29 17:43:05 -0700

    fix stringify_keys destructive behavior for most FormTagHelper functions
    add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 66e114c	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-04 00:23:58 +0100

    Quote these dates to prevent intermittent test failure. Suppose local time is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.

M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/fixtures/pirates.yml

commit f2ea1dd	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-03 21:04:32 -0300

    Fix a bit precompile and lazy compile comments

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit eaee18d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-03 16:55:00 -0700

    make assert_difference error message not suck

M	activesupport/lib/active_support/testing/assertions.rb

commit bb72183	refs/heads/master
Author: artemk 
Date:   2011-08-04 00:34:13 +0300

    accept option for recreate db for postgres (same as mysql now)

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit ab6b61e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-03 19:18:34 -0300

    Don't require assets group in production by default, you can change this default in the application.rb anyways

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit a9b2634	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-03 18:14:11 -0300

    This dep is already defined in activerecord.gemspec

M	Gemfile

commit 1ff52cb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-03 08:57:52 -0700

    initializing @open_transactions in the initialize method

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit d6af6fc	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-02 20:01:38 -0700

    add a migrate class method and delegate to the new instance

M	activerecord/lib/active_record/migration.rb

commit 9d31acf	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-07-29 23:17:12 -0400

    Ensure that .up and .down work as well.

M	activerecord/test/cases/invertible_migration_test.rb

commit 9d19bae	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-07-29 21:26:21 -0400

    Support backwards compatible interface for migration down/up with rails 3.0.x.

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/invertible_migration_test.rb

commit 8293b10	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-01 17:29:03 -0700

    use File.directory? as Dir.exists? is only 1.9.2+

M	railties/lib/rails/paths.rb

commit f9a69e8	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-01 12:32:17 -0700

    Merge pull request #2324 from zenapsis/3-1-stable
    
    Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories

M	railties/lib/rails/engine.rb
M	railties/lib/rails/paths.rb
M	railties/test/application/assets_test.rb

commit 05d4b9d	refs/heads/master
Author: Brian Durand 
Date:   2011-08-01 12:05:29 -0500

    Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the delete_entry call.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit cc78a8f	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-08-01 18:00:41 +0300

    Remove unnecessary require (happened after fcbde454f6)

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit f86f770	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-07-28 11:56:08 +0300

    MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer
    
    In order to use StrictSanitizer in test mode
    Consider :id as not sensetive attribute that can be filtered from
    mass assignement without exception.

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 5f3265c	refs/heads/master
Author: thoefer 
Date:   2011-08-01 11:28:31 +0200

    Fix the issue where default_url_options is being cached on test cases. Closes #1872. Closes #2031.
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb
A	actionpack/test/controller/default_url_options_with_filter_test.rb

commit b6b6e81	refs/heads/master
Author: José Valim 
Date:   2011-08-01 11:42:00 +0200

    Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/render_test.rb
M	activemodel/CHANGELOG
M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/lint.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/conversion_test.rb
M	activemodel/test/cases/naming_test.rb

commit 30ef55d	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-31 23:36:21 +0530

    Removing extra requires from the test. Already loaded in abstract_unit.

M	actionpack/test/controller/helper_test.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	activesupport/test/dependencies_test.rb
M	activesupport/test/json/decoding_test.rb
M	activesupport/test/multibyte_utils_test.rb
M	activesupport/test/test_test.rb

commit 9d0b376	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-31 23:12:28 +0530

    remove extra require for 'active_support/dependencies' as it is required in abstract_unit.rb

M	actionpack/test/controller/routing_test.rb

commit 665a89e	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-31 18:05:05 +0530

    remove extra require for 'stringio' as it is required in helper.rb

M	activerecord/test/cases/schema_dumper_test.rb

commit 076afd0	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 21:39:10 +0530

    fixes #2368. rake about not showing the middleware, db adapter and db schema version

M	railties/lib/rails/tasks/misc.rake

commit e1b5464	refs/heads/master
Author: Brad Ediger 
Date:   2011-07-31 07:38:38 -0500

    remove_possible_method: test if method exists
    
    This speeds up remove_possible_method substantially since it doesn't
    have to rescue a NameError in the common case.
    
    Closes #2346.

M	activesupport/lib/active_support/core_ext/module/remove_method.rb

commit 3d2bda9	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-30 09:19:58 +0530

    magic comment test only if encoding_aware?.

M	activerecord/test/cases/schema_dumper_test.rb

commit 67d76f4	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-29 23:05:40 +0530

    Covering more files in test for plugin new generator.

M	railties/test/generators/plugin_new_generator_test.rb

commit 3d87d01	refs/heads/master
Author: Brian Cardarella 
Date:   2011-07-30 12:08:26 -0400

    Resolve warnings by instantizing @attrubtes as nil

M	activerecord/test/cases/attribute_methods_test.rb

commit 7598155	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-29 17:07:27 -0700

    remove redundant calls to stringify_keys

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 48fce08	refs/heads/master
Author: Brian Durand 
Date:   2011-07-29 17:27:45 -0500

    Change ActiveSupport::Cache behavior to always return duplicate objects instead of frozen objects.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit f85b966	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-29 14:38:57 -0700

    delay backtrace scrubbing until we actually raise an exception. fixes #1936

M	activesupport/lib/active_support/dependencies.rb

commit 4a74493	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-29 12:28:12 -0700

    default writing the schema file as utf-8

M	activerecord/lib/active_record/railties/databases.rake

commit 17a66a8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-29 12:23:37 -0700

    dump IO encoding value along with schema.rb so the file can be reloaded. fixes #1592

M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit 55fb178	refs/heads/master
Author: Brian Cardarella 
Date:   2011-07-29 12:08:35 -0400

    Instead of removing the instance variable just set it to nil, resolves the warnings because of a missing instance variable

M	actionpack/test/template/sprockets_helper_test.rb

commit 9d5340e	refs/heads/master
Author: Brian Cardarella 
Date:   2011-07-29 13:06:45 -0400

    Reset @dirty to false when slicing an instance of SafeBuffer

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 1deb025	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-29 22:06:36 +0530

    Test add for plugin new generator generate mailer

M	railties/test/generators/plugin_new_generator_test.rb

commit bfde063	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 15:41:08 -0400

    Include empty app/mailers directory in mountable and full plugins

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory

commit 651a9c9	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-28 16:46:39 -0300

    Tidy up

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 018b131	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-28 18:45:43 +0300

    We don't need to require erb here.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit a53ef97	refs/heads/master
Author: thedarkone 
Date:   2011-07-28 20:02:21 +0200

    Make use of the inherited initializer.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 37b30d4	refs/heads/master
Author: thedarkone 
Date:   2011-07-28 20:00:48 +0200

    There is no need to be destructive with the passed-in options.
    
    This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/resources_test.rb

commit c4cf907	refs/heads/master
Author: Grant Hutchins 
Date:   2011-07-28 13:38:28 -0300

    Give attribution to Peter Jaros for the patch we paired on.

M	activemodel/CHANGELOG

commit b50dfce	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-28 21:14:29 +0530

    pluging generator test fix

M	railties/test/generators/plugin_new_generator_test.rb

commit 60f593d	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-28 11:48:21 -0300

    Tidy up a bit plugin new gemspec

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit 47cc214	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 21:54:45 -0400

    Moved dependencies from Gemfile to gemspec to eliminate redundant declarations.

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile

commit f9eadb8	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 18:51:44 -0400

    Extracted version from gemspec and placed it in its own file. This is consistent with the approach taken by "bundle gem", and is expected by gems such as svenfuchs/gem-release which can be used to bump / tag versions of gems.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
A	railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb

commit b82e226	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 17:25:32 -0400

    Expanded meta-data in gemspec to include author, email, etc.; Defaults include "TODO" to prevent gems from being built without review.

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit bec5977	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-28 13:14:11 +0100

    Revert "Merge pull request #2309 from smasry/master"
    
    This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing
    changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d.
    
    Reason: the change broke the build.

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 66fdfbc	refs/heads/master
Author: José Valim 
Date:   2011-07-28 10:05:17 +0200

    Update CHANGELOG.

M	activemodel/CHANGELOG

commit 554ea3c	refs/heads/master
Author: José Valim 
Date:   2011-07-28 10:01:55 +0200

    Move the cache to a nested hash which performs better than a hash with array as keys.

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 91ca214	refs/heads/master
Author: José Valim 
Date:   2011-07-28 09:56:42 +0200

    Rename class method to_path to _to_path and make it explicit that it is an internal method.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	activemodel/lib/active_model/conversion.rb

commit 6e671a8	refs/heads/master
Author: Grant Hutchins & Peter Jaros 
Date:   2011-07-08 17:54:15 -0400

    Let ActiveModel instances define partial paths.
    
    Deprecate ActiveModel::Name#partial_path. Now you
    should call #to_path directly on ActiveModel
    instances.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/render_test.rb
M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/lint.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/conversion_test.rb
M	activemodel/test/cases/naming_test.rb
A	activemodel/test/models/helicopter.rb

commit a636a93	refs/heads/master
Author: Joshua Peek 
Date:   2011-07-27 15:09:42 -0500

    Make Rails.application.assets available in initializers

M	actionpack/lib/sprockets/railtie.rb

commit f76e689	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-27 13:21:59 -0700

    contrib app minor tweak

M	actionpack/CHANGELOG

commit c751bb1	refs/heads/master
Author: Samer Masry 
Date:   2011-07-27 10:17:25 -0700

    Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 45f9c2b	refs/heads/master
Author: thedarkone 
Date:   2011-07-27 18:07:47 +0200

    Handle the empty array correctly.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 035d31b	refs/heads/master
Author: Christos Zisopoulos 
Date:   2011-07-27 16:12:22 +0200

    Improve performance and memory usage for options_for_select with Ruby 1.8.7

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 4c873cb	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-07-05 13:17:39 +0300

    Fixed failing query when performing calculation with having based on select.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit 05f1a9b	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-27 12:36:00 +0100

    Add a proxy_association method to association proxies, which can be called by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations_test.rb

commit 924975a	refs/heads/master
Author: Lachlan Sylvester 
Date:   2011-07-27 16:59:11 +1000

    fix some types in schema_test.rb

M	activeresource/test/cases/base/schema_test.rb

commit ed09aef	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 17:49:19 -0700

    simplify conditionals by assuming hash values will never be `false`

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit a704fd4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 17:45:34 -0700

    use regular ruby rather than clever ruby

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit f445bb2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 17:33:22 -0700

    fixing wildcard path matching when wildcard is inside parenthesis

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/mapper_test.rb

commit ab422b0	refs/heads/master
Author: Jonathan del Strother 
Date:   2011-07-27 00:06:19 +0100

    Replace unnecessary regexp in Dependencies#load_missing_constant

M	activesupport/lib/active_support/dependencies.rb

commit f1403f9	refs/heads/master
Author: Jonathan del Strother 
Date:   2011-07-26 16:10:55 +0100

    Constantize a regexp in Dependencies#load_missing_constant

M	activesupport/lib/active_support/dependencies.rb

commit 1d64041	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 19:20:45 -0300

    Remove blank line

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 39183f4	refs/heads/master
Author: thoefer 
Date:   2011-07-26 11:42:53 +0200

    refactored 'assert_redirected_to': local call to validate_request! will be called in assert_response already. changed names of local variables in order to recognize the semantics a bit easier.

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit b36a710	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 18:11:03 -0300

    Remove cruise files

D	ci/ci_build.rb
D	ci/ci_setup_notes.txt
D	ci/cruise_config.rb
D	ci/site.css
D	ci/site_config.rb

commit 28daa8b	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-16 08:22:43 -0400

    added test case for fix to issue #2094

M	actionpack/test/template/form_helper_test.rb

commit f87b33d	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-15 18:22:31 -0400

    fixed problem in which options[:html][:remote] would be overridden in form_for() - fixes #2094

M	actionpack/lib/action_view/helpers/form_helper.rb

commit d13b5d4	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-26 23:53:54 +0530

    remove unused variables warnings removed

M	activesupport/test/safe_buffer_test.rb

commit 7b2d5e0	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-07-26 18:17:58 +0000

    enable Travis CI irc notifications to #rails-contrib on irc.freenode.org

M	.travis.yml

commit 745d90b	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-26 23:39:17 +0530

    remove deprication warning: ambiguous first argument; put parentheses or even spaces

M	activerecord/test/cases/base_test.rb

commit 797d225	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 11:02:41 -0700

    fixing tests on ruby trunk

M	activesupport/test/xml_mini_test.rb

commit 7934ffe	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 10:58:16 -0700

    fixing whitespace errors

M	activesupport/test/xml_mini_test.rb

commit 5a92c66	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-26 22:33:23 +0530

    remove deprication warning for ruby 1.9.3-head for unused variables

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 838ec4b	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-26 16:58:24 +0200

    use sprocket's append_path and assert_match

M	actionpack/test/template/sprockets_helper_test.rb

commit 182a428	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-07-26 16:12:17 +0200

    Revert "allow select to have multiple arguments"
    
    This reverts commit 04cc446d178653d362510e79a22db5300d463161.
    
    I reverted it because apparently we want to use: select([:a, :b])
    instead of select(:a, :b), but there was no tests for that form.

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/base_test.rb

commit e7f7439	refs/heads/master
Author: Sławosz Sławiński 
Date:   2011-07-23 21:35:16 +0200

    allow select to have multiple arguments

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/base_test.rb

commit 5004aaf	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-26 11:36:18 +0200

    Simplify the test by using id and name. `id` will be the only real sort criteria in any case as it's unique.

M	activerecord/test/cases/relations_test.rb

commit 16e3c40	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 01:00:00 -0300

    use_sprockets is not used anymore

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit 33ee389	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 00:42:31 -0300

    Bump sprockets up

M	actionpack/actionpack.gemspec

commit 34ca9c1	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 00:18:56 -0300

    Check that Rack::Sendfile is not included unless config.action_dispatch.x_sendfile_header is set

M	railties/test/application/middleware_test.rb

commit cd5f54c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-25 23:02:12 -0300

    Bump rack up. Closes #2107

M	actionpack/actionpack.gemspec

commit 6d4f916	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-07-25 14:13:26 -0700

    Add documentation for :format => true

M	railties/guides/source/routing.textile

commit 710c5ea	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-07-25 11:37:25 -0700

    Allow a route to have :format => true
    
    When format is true, it is mandatory (as opposed to :format => false).
    This is currently not possible with resource routes, which automatically
    make format optional by default.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/mapper_test.rb

commit 5b5b22a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-25 19:06:30 -0300

    Remove unused use_sprockets config

M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/sprockets/railtie.rb

commit 19ac034	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-25 18:54:25 -0300

    Don't use Rack::Sendfile middleware if x_sendfile_header is not present

M	railties/lib/rails/application.rb

commit b537595	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-04 15:14:06 -0700

    Revert "Explicitly included hashes in sentence regarding SQL-injection-safe forms"
    
    Reason: The hash form is secure, and preferred over the array form if possible.
    
    This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783.

M	activerecord/lib/active_record/base.rb

commit 19122e7	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-04 15:02:13 -0700

    Revert "grammatical changes"
    
    Reason: As discussed in GitHub, it is debatable, and present tense
    is fine (and simple, and preferred).
    
    This reverts commit 54ccda9f0a5e4a5e72a4c159dc8787faaf65e8a2.

M	railties/guides/source/form_helpers.textile

commit 111347f	refs/heads/master
Author: Rashmi Yadav 
Date:   2011-08-04 12:33:56 +0530

    The trailing '/' isn't being picked up by Github anyway, and the link works as is.

M	actionpack/README.rdoc
M	activemodel/README.rdoc
M	activeresource/README.rdoc
M	activesupport/README.rdoc

commit 0012a9e	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-03 21:43:55 -0700

    The trailing '/' isn't being picked up by Github anyway, and the link works as is.

M	actionmailer/README.rdoc

commit fbd3e38	refs/heads/master
Author: JudeArasu 
Date:   2011-08-03 23:00:24 +0530

    grammatical changes

M	railties/guides/source/form_helpers.textile

commit e4d8a95	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-03 19:34:23 +0530

    typo fix

M	railties/guides/source/initialization.textile

commit 688b0c3	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-03 19:13:12 +0530

    minor changes in migrations guide

M	railties/guides/source/migrations.textile

commit 5adb90a	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-03 19:11:22 +0530

    fixed incorrect tags

M	railties/guides/source/migrations.textile

commit ff0b1a3	refs/heads/master
Author: pbflinn 
Date:   2011-08-01 12:53:43 -0300

    Fix typo 'console' -> 'constant'

M	railties/guides/source/initialization.textile

commit 1ea8d9c	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 21:02:48 +0530

    Active Resource - guide for destroy

M	railties/guides/source/active_resource_basics.textile

commit 212654b	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 20:57:57 +0530

    Active Resource - guide for update/save

M	railties/guides/source/active_resource_basics.textile

commit aa9da1f	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 20:48:45 +0530

    Active Resource - guide for create

M	railties/guides/source/active_resource_basics.textile

commit 61899bf	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 20:37:42 +0530

    Active Resource - guide for reading and writing data

M	railties/guides/source/active_resource_basics.textile

commit 55296ec	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-31 11:56:47 -0700

    typo in "wont"

M	actionmailer/README.rdoc

commit 8f6959d	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 23:23:25 +0530

    3.1 release notes Active Record changes, Architectural changes and
    organizing sections.

M	railties/guides/source/3_1_release_notes.textile

commit 8015acf	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-31 21:58:59 +0530

    Adding more info as rake about is fixed

M	railties/guides/source/command_line.textile

commit 0e715d0	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-31 16:56:40 +0530

    Rack::Sendfile is no more default middleware.

M	railties/guides/source/command_line.textile

commit a98eca8	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-30 18:27:08 -0700

    "blog" is more common than "weblog" these days.

M	actionmailer/README.rdoc

commit f407239	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 03:05:24 +0530

    3.1 release notes - added AP and Railties sections

M	railties/guides/source/3_1_release_notes.textile

commit ebbf010	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 01:32:20 +0530

    3.1 release notes draft

A	railties/guides/source/3_1_release_notes.textile

commit ad9e52f	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-30 23:53:11 +0530

    prefer to use if..end unless the condition is simple/compact

M	railties/guides/source/active_record_validations_callbacks.textile

commit 225a248	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-30 23:50:31 +0530

    remove some parts of the section on shortcut helpers, document custom validators

M	railties/guides/source/active_record_validations_callbacks.textile

commit 7372e9a	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-30 23:16:07 +0530

    make the warning clear about the effect of using validates_associated on both sides on an association.

M	activerecord/lib/active_record/validations/associated.rb

commit ad55b1a	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:24:18 +0530

    usages of active resouce

M	railties/guides/source/active_resource_basics.textile

commit 95c2230	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:23:05 +0530

    configuration for active resource

M	railties/guides/source/active_resource_basics.textile

commit 5da1ddb	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:21:21 +0530

    Introduction for active resource

M	railties/guides/source/active_resource_basics.textile

commit 2177282	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:19:43 +0530

    Active Resouce guide initial load

A	railties/guides/source/active_resource_basics.textile

commit 186e7dd	refs/heads/master
Author: Bratish Goswami 
Date:   2011-07-30 12:53:21 +0530

    '/' was outside of anchor tag.

M	README.rdoc

commit 086339a	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-29 16:01:20 -0700

    Superfluous "the".

M	README.rdoc

commit bf3649a	refs/heads/master
Author: Bratish Goswami 
Date:   2011-07-29 21:49:43 +0530

    extra '/' removed from url, which was not linked

M	activeresource/README.rdoc

commit acfdb18	refs/heads/master
Merge: 9ecc443 c3bd6bb
Author: Xavier Noria 
Date:   2011-08-13 10:52:12 -0700

    Merge pull request #2519 from vijaydev/readme_fixes
    
    Fixes the README links in README.rdoc on GitHub

commit c3bd6bb	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-13 22:14:18 +0530

    Fixes readme links better - earlier links broke when the current page is anything other than github.com/rails/rails/. Even github.com/rails/rails (without the trailing slash) broke the readme links. Also change the rakefile that generates the rdoc readme accordingly

M	README.rdoc
M	Rakefile

commit 41ce161	refs/tags/v3.1.0.rc6
Merge: cf013a6 fea7359
Author: Santiago Pastorino 
Date:   2011-08-13 09:15:42 -0700

    Merge pull request #2518 from myronmarston/fix_active_record_observer_disabling_3-1
    
    Fix active record observer disabling for 3-1-stable

commit fea7359	refs/tags/v3.1.0.rc6
Author: Myron Marston 
Date:   2011-08-12 19:58:37 -0700

    Allow ActiveRecord observers to be disabled.
    
    We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.

M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observing_test.rb
M	activerecord/lib/active_record/observer.rb
M	activerecord/test/cases/lifecycle_test.rb

commit cf013a6	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-13 16:50:03 +0100

    Perf: don't mess around with thread local vars unless we actually need to

M	activerecord/lib/active_record/base.rb

commit af96a91	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-13 16:37:44 +0100

    Fix default scope thread safety. Thanks @thedarkone for reporting.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit 9ecc443	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-13 16:50:03 +0100

    Perf: don't mess around with thread local vars unless we actually need to

M	activerecord/lib/active_record/base.rb

commit 24f902b	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-13 16:37:44 +0100

    Fix default scope thread safety. Thanks @thedarkone for reporting.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit 291072a	refs/heads/master
Merge: 34689c4 d3c15a1
Author: José Valim 
Date:   2011-08-13 08:40:13 -0700

    Merge pull request #2514 from myronmarston/fix_active_record_observer_disabling
    
    Allow ActiveRecord observers to be disabled.

commit 2db0455	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-13 13:54:54 +0100

    Work around for lolruby bug. (Read on for explanation.)
    
    We were experiencing CI test failures, for example:
    
    * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407
    * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80
    
    These failures only happened on 1.8.7-p352, and we were only able to
    reproduce on the Travis CI VM worker. We even tried creating a new 32
    bit Ubuntu VM and running the tests on that, and it all worked fine.
    
    After some epic trial and error, we discovered that replacing the
    following:
    
      fuu = Marshal.load(Marshal.dump(fuu))
    
    with:
    
      marshalled = Marshal.dump(fuu)
      fuu = Marshal.load(marshalled)
    
    seemed to prevent the failure.
    
    We have NO IDEA why this is. If anyone has some great insight to
    contribute then that is welcome. Otherwise, hopefully this will just
    help us get the CI green again.
    
    Many thanks to @joshk for help with sorting this out.

M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/base_test.rb

commit 34689c4	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-13 13:54:54 +0100

    Work around for lolruby bug. (Read on for explanation.)
    
    We were experiencing CI test failures, for example:
    
    * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407
    * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80
    
    These failures only happened on 1.8.7-p352, and we were only able to
    reproduce on the Travis CI VM worker. We even tried creating a new 32
    bit Ubuntu VM and running the tests on that, and it all worked fine.
    
    After some epic trial and error, we discovered that replacing the
    following:
    
      fuu = Marshal.load(Marshal.dump(fuu))
    
    with:
    
      marshalled = Marshal.dump(fuu)
      fuu = Marshal.load(marshalled)
    
    seemed to prevent the failure.
    
    We have NO IDEA why this is. If anyone has some great insight to
    contribute then that is welcome. Otherwise, hopefully this will just
    help us get the CI green again.
    
    Many thanks to @joshk for help with sorting this out.

M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/base_test.rb

commit 6b56f05	refs/heads/master
Merge: 943a373 5bc87cc
Author: Jon Leighton 
Date:   2011-08-13 03:31:43 -0700

    Merge pull request #2516 from arunagw/path_set_fix
    
    We need [] method here. previously it's an array.

commit 5bc87cc	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-13 13:13:05 +0530

    We need [] method here. previously it's an array.

M	actionpack/lib/action_view/path_set.rb

commit 5b6ac34	refs/tags/v3.1.0.rc6
Merge: d9d78d4 d761ec4
Author: Santiago Pastorino 
Date:   2011-08-12 23:38:35 -0700

    Merge pull request #2512 from arunagw/cant_dup_on_nil_3-1-stable
    
    Cant dup on nil 3 1 stable

commit d3c15a1	refs/heads/master
Author: Myron Marston 
Date:   2011-08-12 19:58:37 -0700

    Allow ActiveRecord observers to be disabled.
    
    We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.

M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observing_test.rb
M	activerecord/lib/active_record/observer.rb
M	activerecord/test/cases/lifecycle_test.rb

commit d761ec4	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-08-13 08:26:30 +0530

    We actually don't need a reverse_merge! here. dup removed was giving error with nil class.

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit 943a373	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-12 15:53:14 -0700

    moving test_generate to an integration test with one assert per test

M	actionpack/test/controller/routing_test.rb
A	actionpack/test/controller/url_for_integration_test.rb

commit c420ebf	refs/heads/master
Merge: d1f1b04 8196c84
Author: Aaron Patterson 
Date:   2011-08-12 15:54:33 -0700

    Merge pull request #2503 from arunagw/cant_dup_on_nil
    
    We cannot dup on nil.

commit 8196c84	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-12 16:44:31 +0530

    We actually don't need a reverse_merge! here. dup removed was giving error with nil class.

M	actionpack/lib/action_dispatch/routing/url_for.rb

commit d9d78d4	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-11 15:55:14 -0700

    Merge pull request #2497 from akaspick/url_for_fix
    
    When calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/dispatch/routing_test.rb

commit d1f1b04	refs/heads/master
Merge: e6fdfd0 61579b7
Author: Santiago Pastorino 
Date:   2011-08-11 15:55:14 -0700

    Merge pull request #2497 from akaspick/url_for_fix
    
    When calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash

commit 60d358b	refs/heads/master
Author: Andrew Kaspick 
Date:   2011-08-11 17:49:31 -0500

    fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/controller/assert_select_test.rb

commit 61579b7	refs/heads/master
Author: Andrew Kaspick 
Date:   2011-08-11 13:28:31 -0500

    when calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash... calling #dup on the hash prevents this

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/test/dispatch/routing_test.rb

commit f45c372	refs/tags/v3.0.14
Merge: 1f63606 11f6531
Author: Santiago Pastorino 
Date:   2011-08-11 09:05:07 -0700

    Merge pull request #2494 from grzuy/3-0-stable
    
    Porting changes on form_tag method signature to 3-0-stable

commit 11f6531	refs/tags/v3.0.14
Author: Gonzalo Rodriguez and Leonardo Capillera 
Date:   2011-08-11 12:00:03 -0300

    Remove 'parameters_for_url' from 'form_tag' method signature

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 83d9398	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-11 06:38:57 -0700

    Merge pull request #2489 from grzuy/master
    
    Remove parameters_for_url from form_tag method header

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit e6fdfd0	refs/heads/master
Merge: d00e164 9e81bfd
Author: Santiago Pastorino 
Date:   2011-08-11 06:38:57 -0700

    Merge pull request #2489 from grzuy/master
    
    Remove parameters_for_url from form_tag method header

commit 895d645	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-11 00:30:45 -0700

    fix destructive stringify_keys for label_tag

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit 9e81bfd	refs/heads/master
Author: Gonzalo Rodriguez and Leonardo Capillera 
Date:   2011-08-10 23:07:38 -0300

    Remove 'parameters_for_url' parameter from 'form_tag' method signature
    
    If you use that parameter it will end calling to url_for with two
    arguments, which fails because url_for expects only one

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit cdf6251	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-10 14:37:56 -0700

    Revert "Ensure original exception message is present in both Template::Error#message and Template::Error#inspect."
    
    This reverts commit 403b06e98ee88b96b6fbd8692f072fdfa7857639.
    
    The call to `message` calls `inspect` on our exception.  The exception
    holds a reference to the environment, and the controller.  This string
    becomes very large, and the call to `super` dups the string (in tern
    doubling the memory used).  I'm reverting this for 3.1 but leaving the
    commit on master.  We should stop holding references to so many objects
    and reduce the size of our inspect.

M	actionpack/lib/action_view/template/error.rb
D	actionpack/test/template/template_error_test.rb

commit 47c6a77	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-10 11:39:48 -0700

    add the gem requirement for sqlite3

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit d00e164	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-10 11:39:48 -0700

    add the gem requirement for sqlite3

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

commit d48dd18	refs/heads/master
Author: Andrew Kaspick 
Date:   2011-08-10 12:55:29 -0500

    fix exists? to return false if passed nil (which may come from a missing URL param)

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit bb4f687	refs/heads/master
Author: José Valim 
Date:   2011-08-09 16:49:38 -0700

    Remove lame comment.

M	actionpack/lib/sprockets/assets.rake

commit 004bb66	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-09 20:40:52 -0300

    rake assets:precompile defaults to production env

M	actionpack/lib/sprockets/assets.rake

commit d9b690f	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-09 20:40:52 -0300

    rake assets:precompile defaults to production env

M	actionpack/lib/sprockets/assets.rake

commit 5f56db4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 14:54:39 -0700

    adding missing require to fist railties tests

M	actionpack/lib/abstract_controller/view_paths.rb

commit 4f88019	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-09 22:05:23 +0100

    Okay, the new incompatible arel is now called 2.2 and the sun shines upon thee once more

M	activerecord/activerecord.gemspec

commit 561e8a7	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-09 22:05:23 +0100

    Okay, the new incompatible arel is now called 2.2 and the sun shines upon thee once more

M	activerecord/activerecord.gemspec

commit ae3ab0c	refs/heads/master
Merge: f9f423f 396e121
Author: Aaron Patterson 
Date:   2011-08-09 13:33:24 -0700

    Merge pull request #2465 from pivotal-casebook/patch-3
    
    Further monkey-patching to avoid deprecation warnings

commit f9f423f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 12:10:25 -0700

    deprecating process_view_paths

M	actionpack/lib/abstract_controller/view_paths.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/test/template/compiled_templates_test.rb
M	actionpack/test/template/render_test.rb

commit 3ad26c8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 11:41:06 -0700

    avoid object creation via useless duping and freezing

M	actionpack/lib/abstract_controller/view_paths.rb

commit 26e53a1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 11:30:43 -0700

    just use map and case / when rather than modifying the iterating array

M	actionpack/lib/action_view/path_set.rb

commit 7cd3772	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 11:26:44 -0700

    only typecast what we need to typecast

M	actionpack/lib/action_view/path_set.rb

commit b14f1c3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 11:23:02 -0700

    Favor composition over inheritance.

M	actionpack/lib/action_view/path_set.rb

commit 88de343	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 10:54:05 -0700

    Array#+ automatically dups, no double duping

M	actionpack/lib/abstract_controller/view_paths.rb

commit 14a8fd1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 10:13:02 -0700

    Just remove the sort_locals method

M	actionpack/lib/action_view/template/resolver.rb

commit 1fbc470	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 10:09:46 -0700

    the freeze trick does nothing on arrays used as hash keys.

M	actionpack/lib/action_view/template/resolver.rb

commit 233696a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-09 09:32:16 -0700

    use functional style to build a list of template objects

M	actionpack/lib/action_view/template/resolver.rb

commit 37b77c6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-08 22:16:52 -0700

    refactor the optimized build_query a bit

M	actionpack/lib/action_view/template/resolver.rb

commit 4c49286	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-08 21:42:45 -0700

    reduce file stats by improving our dir glob pattern

M	actionpack/lib/action_view/template/resolver.rb

commit 128467e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-08 21:42:45 -0700

    reduce file stats by improving our dir glob pattern

M	actionpack/lib/action_view/template/resolver.rb

commit 295a7fd	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-08 21:03:40 -0700

    hash on the template directory in order to improve cache hits

M	actionpack/lib/action_view/template/resolver.rb

commit 9404040	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-08 21:01:19 -0700

    use meaningful names with our variables

M	actionpack/lib/action_view/template/resolver.rb

commit 0155bf4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-08 19:51:41 -0700

    use binread to read the files

M	actionpack/lib/action_view/template/resolver.rb

commit 681bf1f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-08 19:48:12 -0700

    backporting IO#binread for 1.8 users

A	activesupport/lib/active_support/core_ext/io.rb
A	activesupport/test/core_ext/io_test.rb

commit 0b21211	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-08 19:29:12 -0700

    be explicit about arguments passed around

M	actionpack/lib/action_view/path_set.rb

commit 6e2e060	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-09 00:00:52 +0100

    Remove TODO comment I didn't mean to commit

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit 5680a51	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-09 00:00:52 +0100

    Remove TODO comment I didn't mean to commit

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit f1c90ce	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-08 23:51:07 +0100

    Bump arel version
    
    Conflicts:
    
    	activerecord/activerecord.gemspec

M	activerecord/activerecord.gemspec

commit 5870291	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-08 23:51:07 +0100

    Bump arel version

M	activerecord/activerecord.gemspec

commit c202c10	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-08 14:41:23 +0100

    Fully marshal AR::Base objects. Fixes #2431.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit dd944cb	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-08 23:27:54 +0100

    Make it the responsibility of the connection to hold onto an ARel visitor for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.
    
    Conflicts:
    
    	activerecord/lib/active_record/relation/finder_methods.rb
    	activerecord/test/cases/adapter_test.rb

M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/relation_scoping_test.rb

commit 9062b75	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-08 14:41:23 +0100

    Fully marshal AR::Base objects. Fixes #2431.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 7db90aa	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-08 23:27:54 +0100

    Make it the responsibility of the connection to hold onto an ARel visitor for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.

M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/migration.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/relation_scoping_test.rb

commit ff9a2e6	refs/heads/master
Merge: 11fbeb7 343daf3
Author: Aaron Patterson 
Date:   2011-08-08 14:17:02 -0700

    Merge pull request #2426 from pivotal-casebook/fix-build
    
    Make rails gem build directory consistent with actionpack, etc.

commit 11fbeb7	refs/heads/master
Merge: 8360d71 58af0d4
Author: Aaron Patterson 
Date:   2011-08-08 12:40:28 -0700

    Merge pull request #2466 from rsim/fix_test_disable_referential_integrity
    
    Fixed test_disable_referential_integrity on Oracle

commit 58af0d4	refs/heads/master
Author: Raimonds Simanovskis 
Date:   2011-08-08 22:32:26 +0300

    Fixed test_disable_referential_integrity on Oracle
    
    On Oracle disable_referential_integrity before execution of block will disable foreign key constraints and after block will enable them but when constraints are enabled then they are validated. Therefore created record with invalid foreign key should be deleted before enabling foreign key constraints.

M	activerecord/test/cases/adapter_test.rb

commit 396e121	refs/heads/master
Author: Pivotal Casebook 
Date:   2011-08-08 13:47:24 -0300

    Further monkey-patching to avoid deprecation warnings

M	railties/lib/rails/tasks/documentation.rake

commit d008c99	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-08 12:49:10 -0300

    Initialize config.assets.version the same way it's done in Sprockets

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb

commit 8360d71	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-08 12:49:10 -0300

    Initialize config.assets.version the same way it's done in Sprockets

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb

commit 509a98a	refs/tags/v3.1.0.rc6
Author: Joshua Peek 
Date:   2011-08-08 07:42:49 -0700

    Merge pull request #2448 from igrigorik/master
    
    Asset pipeline fixes: clear out tmp cache and use environment in digest generation
    Conflicts:
    
    	railties/test/application/assets_test.rb

M	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb
M	railties/test/application/assets_test.rb

commit eabc036	refs/heads/master
Merge: 9e51400 c0bfb5a
Author: Joshua Peek 
Date:   2011-08-08 07:42:49 -0700

    Merge pull request #2448 from igrigorik/master
    
    Asset pipeline fixes: clear out tmp cache and use environment in digest generation

commit 1f63606	refs/tags/v3.0.14
Author: Jason Weathered 
Date:   2011-04-17 21:10:02 +1000

    Fix marshal round-tripping of fractional seconds (Time#subsec).

M	activesupport/lib/active_support/core_ext/time/marshal.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit 9e51400	refs/heads/master
Merge: e746980 cdb49fc
Author: Aaron Patterson 
Date:   2011-08-07 18:22:32 -0700

    Merge pull request #2451 from gdelfino/master
    
    sqlite transactions in log files

commit e746980	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-07 16:20:31 -0700

    guides generation: apparently this workaround for RedCloth is not needed anymore

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit ed85772	refs/tags/v3.1.0.rc6
Author: Xavier Noria 
Date:   2011-08-07 16:20:31 -0700

    guides generation: apparently this workaround for RedCloth is not needed anymore

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit dfcecde	refs/tags/v3.1.0.rc6
Author: Gregg Pollack 
Date:   2011-08-07 14:19:25 -0400

    Added irregular zombie inflection, so zombies no longer gets singularized into zomby

M	activesupport/lib/active_support/inflections.rb

commit e06db72	refs/heads/master
Merge: 9c20562 554232e
Author: Xavier Noria 
Date:   2011-08-07 11:34:10 -0700

    Merge pull request #2457 from Gregg/zombie_singular_fix
    
    Added irregular zombie inflection, so zombies != zomby

commit 554232e	refs/heads/master
Author: Gregg Pollack 
Date:   2011-08-07 14:19:25 -0400

    Added irregular zombie inflection, so zombies no longer gets singularized into zomby

M	activesupport/lib/active_support/inflections.rb

commit 5435787	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-07 11:01:29 -0700

    Merge pull request #2455 from vijaydev/patch-7
    
    Edit changelog to mention about x_sendfile_header default change

M	actionpack/CHANGELOG

commit 9c20562	refs/heads/master
Merge: 8845ae6 4cf9497
Author: Santiago Pastorino 
Date:   2011-08-07 11:01:29 -0700

    Merge pull request #2455 from vijaydev/patch-7
    
    Edit changelog to mention about x_sendfile_header default change

commit 4cf9497	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-29 06:50:23 +51800

    edit changelog to mention about x_sendfile_header default change

M	actionpack/CHANGELOG

commit eff7fdd	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-07 12:34:49 -0300

    x_sendfile_header now defaults to nil and production.rb env file doesn't
    set a particular value for it. This allows servers to set it through
    X-Sendfile-Type, read
    https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more
    info. Anyways you can force this value in your production.rb

M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/application/middleware/sendfile_test.rb
M	railties/test/application/middleware_test.rb

commit 8845ae6	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-07 12:34:49 -0300

    x_sendfile_header now defaults to nil and production.rb env file doesn't
    set a particular value for it. This allows servers to set it through
    X-Sendfile-Type, read
    https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more
    info. Anyways you can force this value in your production.rb

M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/lib/action_dispatch/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/test/application/middleware/sendfile_test.rb
M	railties/test/application/middleware_test.rb

commit 33d02f1	refs/tags/v3.1.0.rc6
Author: José Valim 
Date:   2011-08-07 14:48:44 +0300

    Test against 1.9.3 as well.

M	.travis.yml

commit 888539c	refs/heads/master
Author: José Valim 
Date:   2011-08-07 13:18:10 +0300

    Test against 1.9.3 as well.

M	.travis.yml

commit cdb49fc	refs/heads/master
Author: Gustavo Delfino 
Date:   2011-08-06 16:05:45 -0430

    sqlite transactions now logged
    
    motivation: http://stackoverflow.com/questions/6892630/sqlite-transactions-not-showing-in-test-log

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 65a648b	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-08-06 13:18:51 -0700

    Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8
    
    Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416

M	activesupport/lib/active_support/gzip.rb

commit 704e9c8	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-06 13:18:51 -0700

    Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8
    
    Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416

M	activesupport/lib/active_support/gzip.rb

commit 7ba95bf	refs/heads/master
Merge: 81eb5b3 aed9917
Author: Santiago Pastorino 
Date:   2011-08-06 13:18:51 -0700

    Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8
    
    Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416

commit aed9917	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-06 11:33:18 -0500

    Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416

M	activesupport/lib/active_support/gzip.rb

commit 81eb5b3	refs/heads/master
Merge: 43e581e b642922
Author: Santiago Pastorino 
Date:   2011-08-06 05:27:40 -0700

    Merge pull request #2444 from elight/master
    
    Minor refactor to delegate

commit 741151c	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-06 09:15:32 -0300

    Use rake >= 0.9.3.beta.1 in Ruby 1.9.3

M	Gemfile

commit 43e581e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-06 09:15:32 -0300

    Use rake >= 0.9.3.beta.1 in Ruby 1.9.3

M	Gemfile

commit c0bfb5a	refs/heads/master
Author: Ilya Grigorik 
Date:   2011-08-05 22:55:56 -0700

    use assets.version in asset checksum to allow user to easily override

M	actionpack/lib/sprockets/railtie.rb

commit b642922	refs/heads/master
Author: Evan Light 
Date:   2011-08-05 22:06:47 -0400

    Refactored to more closely resemble idiom applied for on_nil

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 201e41e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-05 21:28:14 -0300

    Avoid generating app/views/layouts/application.html.erb on mountable engines, just generate the namespaced one

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
D	railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt

commit 7af63a9	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-05 21:28:14 -0300

    Avoid generating app/views/layouts/application.html.erb on mountable engines, just generate the namespaced one

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
D	railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt

commit 5bc6285	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-05 15:51:33 -0700

    Revert "Test against Rubinius"
    
    This reverts commit 3cfbb3824436b2f8a37544b8ffe2f3a4605bc7c8.

M	.travis.yml

commit cec805f	refs/heads/master
Merge: 1b676fc 3cfbb38
Author: Aaron Patterson 
Date:   2011-08-05 15:47:23 -0700

    Merge pull request #2442 from sferik/test_on_rubinius
    
    Test against Rubinius

commit 3cfbb38	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-08-05 15:44:28 -0700

    Test against Rubinius
    
    Happy Rubinius Day!

M	.travis.yml

commit 216d79e	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-05 18:42:41 -0300

    Revert "to_key on a destroyed model should return nil". Closes #2440
    
    This reverts commit c5448721b5054b8a467958d60427fdee15eac604.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 1b676fc	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-05 18:42:41 -0300

    Revert "to_key on a destroyed model should return nil". Closes #2440
    
    This reverts commit c5448721b5054b8a467958d60427fdee15eac604.

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 8118e41	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-05 16:48:46 -0300

    Fix test for Rubinius

M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit e0a6ec2	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-05 16:48:46 -0300

    Fix test for Rubinius

M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit b1be622	refs/tags/v3.1.0.rc6
Author: Guillermo Iguaran 
Date:   2011-08-05 13:19:05 -0500

    Fix AR test suite error under Rubinius 2.0

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit ab2582f	refs/heads/master
Merge: 5a05207 780ee36
Author: Aaron Patterson 
Date:   2011-08-05 11:28:53 -0700

    Merge pull request #2439 from guilleiguaran/fix-error-on-ar-tests-rbxday
    
    Fix AR test suite error under Rubinius 2.0 #rbxday

commit 780ee36	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-08-05 13:19:05 -0500

    Fix AR test suite error under Rubinius 2.0

M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit 5a05207	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-05 11:20:15 -0700

    pg does not allow aliases in the having clause, but functions are fine

M	activerecord/test/cases/calculations_test.rb

commit fe55f5e	refs/heads/master
Merge: 050c151 ed5c6d2
Author: Ilya Grigorik 
Date:   2011-08-04 23:55:31 -0400

    Merge branch 'asset_hash_should_depend_on_env'

commit 050c151	refs/heads/master
Author: Ilya Grigorik 
Date:   2011-08-04 19:17:03 -0400

    Clear out tmp/cache when assets:clean is invoked.
    
    Otherwise, if bad data is cached in tmp/clear then the next invocation
    of assets:precompile (or a regular incoming request) will pickup files from
    tmp without regenerating them from source.

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit ed5c6d2	refs/heads/master
Author: Ilya Grigorik 
Date:   2011-08-04 23:48:40 -0400

    generate environment dependent asset digests
    
    If two different environments are configured to use the pipeline, but
    one has an extra step (such as compression) then without taking the
    environment into account you may end up serving wrong assets

M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit e44efac	refs/heads/master
Author: Ilya Grigorik 
Date:   2011-08-04 19:17:03 -0400

    Clear out tmp/cache when assets:clean is invoked.
    
    Otherwise, if bad data is cached in tmp/clear then the next invocation
    of assets:precompile (or a regular incoming request) will pickup files from
    tmp without regenerating them from source.

M	actionpack/lib/sprockets/assets.rake
M	railties/test/application/assets_test.rb

commit 521c9aa	refs/tags/v3.0.10.rc1 (tag: v3.0.10.rc1)
Author: Aaron Patterson 
Date:   2011-08-04 17:09:46 -0700

    bumping to 3.0.10.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 9d17458	refs/tags/v3.0.10.rc1
Author: Aaron Patterson 
Date:   2011-08-04 17:08:11 -0700

    more changelog updates

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activeresource/CHANGELOG
M	railties/CHANGELOG

commit e0b0da2	refs/tags/v3.0.14
Author: Xavier Noria 
Date:   2011-08-05 02:06:21 +0200

    backports doc fix 9f9446f

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 9efc57f	refs/tags/v3.1.0.rc6
Author: Xavier Noria 
Date:   2011-08-04 15:14:06 -0700

    Revert "Explicitly included hashes in sentence regarding SQL-injection-safe forms"
    
    Reason: The hash form is secure, and preferred over the array form if possible.
    
    This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783.

M	activerecord/lib/active_record/base.rb

commit ab87475	refs/tags/v3.1.0.rc6
Author: Xavier Noria 
Date:   2011-08-04 15:02:13 -0700

    Revert "grammatical changes"
    
    Reason: As discussed in GitHub, it is debatable, and present tense
    is fine (and simple, and preferred).
    
    This reverts commit 54ccda9f0a5e4a5e72a4c159dc8787faaf65e8a2.

M	railties/guides/source/form_helpers.textile

commit 34d69b3	refs/tags/v3.1.0.rc6
Author: Rashmi Yadav 
Date:   2011-08-04 12:33:56 +0530

    The trailing '/' isn't being picked up by Github anyway, and the link works as is.

M	actionpack/README.rdoc
M	activemodel/README.rdoc
M	activeresource/README.rdoc
M	activesupport/README.rdoc

commit 3694a6c	refs/tags/v3.1.0.rc6
Author: Waynn Lue 
Date:   2011-08-03 21:43:55 -0700

    The trailing '/' isn't being picked up by Github anyway, and the link works as is.

M	actionmailer/README.rdoc

commit 346cd04	refs/tags/v3.1.0.rc6
Author: JudeArasu 
Date:   2011-08-03 23:00:24 +0530

    grammatical changes

M	railties/guides/source/form_helpers.textile

commit b0cf7ea	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-03 19:34:23 +0530

    typo fix

M	railties/guides/source/initialization.textile

commit 19eb720	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-03 19:13:12 +0530

    minor changes in migrations guide

M	railties/guides/source/migrations.textile

commit 8207d0c	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-08-03 19:11:22 +0530

    fixed incorrect tags

M	railties/guides/source/migrations.textile

commit 690eae7	refs/tags/v3.1.0.rc6
Author: pbflinn 
Date:   2011-08-01 12:53:43 -0300

    Fix typo 'console' -> 'constant'

M	railties/guides/source/initialization.textile

commit 6b361aa	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-08-01 21:02:48 +0530

    Active Resource - guide for destroy

M	railties/guides/source/active_resource_basics.textile

commit f54d0cf	refs/tags/v3.0.10.rc1
Author: Aaron Patterson 
Date:   2011-08-04 16:53:26 -0700

    updating CHANGELOGs

M	actionpack/CHANGELOG
M	activerecord/CHANGELOG

commit 566d2b9	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-08-01 20:57:57 +0530

    Active Resource - guide for update/save

M	railties/guides/source/active_resource_basics.textile

commit 814e05e	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-08-01 20:48:45 +0530

    Active Resource - guide for create

M	railties/guides/source/active_resource_basics.textile

commit 35eb96f	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-08-01 20:37:42 +0530

    Active Resource - guide for reading and writing data

M	railties/guides/source/active_resource_basics.textile

commit 20251c8	refs/tags/v3.1.0.rc6
Author: Waynn Lue 
Date:   2011-07-31 11:56:47 -0700

    typo in "wont"

M	actionmailer/README.rdoc

commit ed246f5	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-31 23:23:25 +0530

    3.1 release notes Active Record changes, Architectural changes and
    organizing sections.

M	railties/guides/source/3_1_release_notes.textile

commit e3e1109	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-07-31 21:58:59 +0530

    Adding more info as rake about is fixed

M	railties/guides/source/command_line.textile

commit 9232033	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-07-31 16:56:40 +0530

    Rack::Sendfile is no more default middleware.

M	railties/guides/source/command_line.textile

commit 478dc71	refs/tags/v3.1.0.rc6
Author: Waynn Lue 
Date:   2011-07-30 18:27:08 -0700

    "blog" is more common than "weblog" these days.

M	actionmailer/README.rdoc

commit 08f4a8c	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-31 03:05:24 +0530

    3.1 release notes - added AP and Railties sections

M	railties/guides/source/3_1_release_notes.textile

commit d016102	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-31 01:32:20 +0530

    3.1 release notes draft

A	railties/guides/source/3_1_release_notes.textile

commit 2fb540e	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-30 23:53:11 +0530

    prefer to use if..end unless the condition is simple/compact

M	railties/guides/source/active_record_validations_callbacks.textile

commit bac54a0	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-30 23:50:31 +0530

    remove some parts of the section on shortcut helpers, document custom validators

M	railties/guides/source/active_record_validations_callbacks.textile

commit c93adf8	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-30 23:16:07 +0530

    make the warning clear about the effect of using validates_associated on both sides on an association.

M	activerecord/lib/active_record/validations/associated.rb

commit 88c101b	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-07-30 18:24:18 +0530

    usages of active resouce

M	railties/guides/source/active_resource_basics.textile

commit d240ce8	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-07-30 18:23:05 +0530

    configuration for active resource

M	railties/guides/source/active_resource_basics.textile

commit 35a028d	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-07-30 18:21:21 +0530

    Introduction for active resource

M	railties/guides/source/active_resource_basics.textile

commit dcb965b	refs/tags/v3.1.0.rc6
Author: Vishnu Atrai 
Date:   2011-07-30 18:19:43 +0530

    Active Resouce guide initial load

A	railties/guides/source/active_resource_basics.textile

commit e231c49	refs/tags/v3.1.0.rc6
Author: Bratish Goswami 
Date:   2011-07-30 12:53:21 +0530

    '/' was outside of anchor tag.

M	README.rdoc

commit f21e8e0	refs/tags/v3.1.0.rc6
Author: Waynn Lue 
Date:   2011-07-29 16:01:20 -0700

    Superfluous "the".

M	README.rdoc

commit 8cefafb	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-08-19 09:47:46 +0000

    Extra "l" removed before h2.

M	railties/guides/source/i18n.textile

commit 7e494f0	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-29 01:13:58 +0530

    document meta method

M	actionpack/lib/action_dispatch/http/request.rb

commit 740e531	refs/tags/v3.1.0.rc6
Author: ejy 
Date:   2011-07-28 18:40:35 +0200

    Removed trailing slash of 'Download and installation' Github URL as per convention

M	activerecord/README.rdoc

commit f9bd8b2	refs/tags/v3.1.0.rc6
Author: Pete Campbell 
Date:   2011-07-28 09:44:51 -0400

    Explicitly included hashes in sentence regarding SQL-injection-safe forms

M	activerecord/lib/active_record/base.rb

commit d836413	refs/tags/v3.1.0.rc6
Author: Alberto Perdomo 
Date:   2011-07-28 00:51:14 +0100

    Association and Callbacks guide: Added section on shortcut syntax 'validates'.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 5b51e58	refs/tags/v3.1.0.rc6
Author: Hendy Tanata 
Date:   2011-07-27 17:30:35 +0700

    Fix two spaces between sententes on README.rdoc.

M	README.rdoc

commit d2c9c9e	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-26 19:35:16 +0530

    move the note after the scaffold files listing

M	railties/guides/source/getting_started.textile

commit 04f88d1	refs/heads/master
Merge: 9e18380 c7af6cf
Author: Xavier Noria 
Date:   2011-08-04 16:42:14 -0700

    Merge branch 'master' of github.com:rails/rails

commit 9e18380	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-04 15:14:06 -0700

    Revert "Explicitly included hashes in sentence regarding SQL-injection-safe forms"
    
    Reason: The hash form is secure, and preferred over the array form if possible.
    
    This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783.

M	activerecord/lib/active_record/base.rb

commit e82b490	refs/heads/master
Author: Xavier Noria 
Date:   2011-08-04 15:02:13 -0700

    Revert "grammatical changes"
    
    Reason: As discussed in GitHub, it is debatable, and present tense
    is fine (and simple, and preferred).
    
    This reverts commit 54ccda9f0a5e4a5e72a4c159dc8787faaf65e8a2.

M	railties/guides/source/form_helpers.textile

commit 681d919	refs/heads/master
Author: Rashmi Yadav 
Date:   2011-08-04 12:33:56 +0530

    The trailing '/' isn't being picked up by Github anyway, and the link works as is.

M	actionpack/README.rdoc
M	activemodel/README.rdoc
M	activeresource/README.rdoc
M	activesupport/README.rdoc

commit 5f2c790	refs/heads/master
Author: Waynn Lue 
Date:   2011-08-03 21:43:55 -0700

    The trailing '/' isn't being picked up by Github anyway, and the link works as is.

M	actionmailer/README.rdoc

commit 2e764c5	refs/heads/master
Author: JudeArasu 
Date:   2011-08-03 23:00:24 +0530

    grammatical changes

M	railties/guides/source/form_helpers.textile

commit 25845b3	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-03 19:34:23 +0530

    typo fix

M	railties/guides/source/initialization.textile

commit febdd6c	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-03 19:13:12 +0530

    minor changes in migrations guide

M	railties/guides/source/migrations.textile

commit b3719ee	refs/heads/master
Author: Vijay Dev 
Date:   2011-08-03 19:11:22 +0530

    fixed incorrect tags

M	railties/guides/source/migrations.textile

commit 9e1a27a	refs/heads/master
Author: pbflinn 
Date:   2011-08-01 12:53:43 -0300

    Fix typo 'console' -> 'constant'

M	railties/guides/source/initialization.textile

commit f3564b9	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 21:02:48 +0530

    Active Resource - guide for destroy

M	railties/guides/source/active_resource_basics.textile

commit eed1026	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 20:57:57 +0530

    Active Resource - guide for update/save

M	railties/guides/source/active_resource_basics.textile

commit 163533b	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 20:48:45 +0530

    Active Resource - guide for create

M	railties/guides/source/active_resource_basics.textile

commit abfbab2	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-08-01 20:37:42 +0530

    Active Resource - guide for reading and writing data

M	railties/guides/source/active_resource_basics.textile

commit dbc10a0	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-31 11:56:47 -0700

    typo in "wont"

M	actionmailer/README.rdoc

commit 05f6135	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 23:23:25 +0530

    3.1 release notes Active Record changes, Architectural changes and
    organizing sections.

M	railties/guides/source/3_1_release_notes.textile

commit f635998	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-31 21:58:59 +0530

    Adding more info as rake about is fixed

M	railties/guides/source/command_line.textile

commit 8362b07	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-31 16:56:40 +0530

    Rack::Sendfile is no more default middleware.

M	railties/guides/source/command_line.textile

commit 384ac3e	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-30 18:27:08 -0700

    "blog" is more common than "weblog" these days.

M	actionmailer/README.rdoc

commit fe6b967	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 03:05:24 +0530

    3.1 release notes - added AP and Railties sections

M	railties/guides/source/3_1_release_notes.textile

commit 4e28c40	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 01:32:20 +0530

    3.1 release notes draft

A	railties/guides/source/3_1_release_notes.textile

commit 54e7694	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-30 23:53:11 +0530

    prefer to use if..end unless the condition is simple/compact

M	railties/guides/source/active_record_validations_callbacks.textile

commit 29772a1	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-30 23:50:31 +0530

    remove some parts of the section on shortcut helpers, document custom validators

M	railties/guides/source/active_record_validations_callbacks.textile

commit 38bfcff	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-30 23:16:07 +0530

    make the warning clear about the effect of using validates_associated on both sides on an association.

M	activerecord/lib/active_record/validations/associated.rb

commit c62cb2f	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:24:18 +0530

    usages of active resouce

M	railties/guides/source/active_resource_basics.textile

commit 8d1c642	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:23:05 +0530

    configuration for active resource

M	railties/guides/source/active_resource_basics.textile

commit e898556	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:21:21 +0530

    Introduction for active resource

M	railties/guides/source/active_resource_basics.textile

commit f56c2b8	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-30 18:19:43 +0530

    Active Resouce guide initial load

A	railties/guides/source/active_resource_basics.textile

commit 2350185	refs/heads/master
Author: Bratish Goswami 
Date:   2011-07-30 12:53:21 +0530

    '/' was outside of anchor tag.

M	README.rdoc

commit b15cc2e	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-29 16:01:20 -0700

    Superfluous "the".

M	README.rdoc

commit e23bc8a	refs/heads/master
Author: Bratish Goswami 
Date:   2011-07-29 21:49:43 +0530

    extra '/' removed from url, which was not linked

M	activeresource/README.rdoc

commit 60af023	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-19 09:47:46 +0000

    Extra "l" removed before h2.

M	railties/guides/source/i18n.textile

commit d8c77fa	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-29 01:13:58 +0530

    document meta method

M	actionpack/lib/action_dispatch/http/request.rb

commit 07f172f	refs/heads/master
Author: ejy 
Date:   2011-07-28 18:40:35 +0200

    Removed trailing slash of 'Download and installation' Github URL as per convention

M	activerecord/README.rdoc

commit 3c3f808	refs/heads/master
Author: Pete Campbell 
Date:   2011-07-28 09:44:51 -0400

    Explicitly included hashes in sentence regarding SQL-injection-safe forms

M	activerecord/lib/active_record/base.rb

commit e84ea65	refs/heads/master
Author: Alberto Perdomo 
Date:   2011-07-28 00:51:14 +0100

    Association and Callbacks guide: Added section on shortcut syntax 'validates'.

M	railties/guides/source/active_record_validations_callbacks.textile

commit a45c2d5	refs/heads/master
Author: Hendy Tanata 
Date:   2011-07-27 17:30:35 +0700

    Fix two spaces between sententes on README.rdoc.

M	README.rdoc

commit 2dc6cca	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-26 19:35:16 +0530

    move the note after the scaffold files listing

M	railties/guides/source/getting_started.textile

commit 4265f2e	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-25 15:10:13 -0700

    sync the getting started guide with master

M	railties/guides/source/getting_started.textile

commit b132992	refs/tags/v2.3.13
Author: Aaron Patterson 
Date:   2011-08-04 16:31:57 -0700

    we should not ignore all gems in here

M	.gitignore

commit df6b1e2	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-08-04 16:31:57 -0700

    we should not ignore all gems in here

M	.gitignore

commit b0b7070	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-04 16:31:57 -0700

    we should not ignore all gems in here

M	.gitignore

commit c7af6cf	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 16:31:57 -0700

    we should not ignore all gems in here

M	.gitignore

commit d338e89	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-04 18:43:13 -0300

    Add git push and git push --tags to RELEASING_RAILS.rdoc

M	RELEASING_RAILS.rdoc

commit 343daf3	refs/heads/master
Author: Andrew Marshall & Sean Moon 
Date:   2011-08-04 17:29:37 -0400

    Make rails gem build directory consistent with actionpack, etc.

M	tasks/release.rb

commit cb6a082	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 14:15:45 -0700

    moving CI and Sam Ruby to the top of the list.  I :heart: CI and Sam

M	RELEASING_RAILS.rdoc

commit 879dcad	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 14:13:41 -0700

    add section about notifying implementors

M	RELEASING_RAILS.rdoc

commit 3727232	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-04 14:07:23 -0700

    fixing assert_difference issues on ruby 1.8

M	activesupport/lib/active_support/testing/assertions.rb

commit 2d2c917	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 14:07:23 -0700

    fixing assert_difference issues on ruby 1.8

M	activesupport/lib/active_support/testing/assertions.rb

commit 19ab8e4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 12:00:06 -0700

    fixing wrong words.  thanks @jbrown

M	RELEASING_RAILS.rdoc

commit d7e55c3	refs/heads/master
Merge: bf5b4c0 f0034c7
Author: Santiago Pastorino 
Date:   2011-08-04 11:49:43 -0700

    Merge pull request #2421 from pivotal-casebook/master
    
    Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980)

commit bf5b4c0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-04 11:27:26 -0700

    adding my brain dump of the release process

A	RELEASING_RAILS.rdoc

commit f0034c7	refs/heads/master
Author: Casebook Developer 
Date:   2011-08-04 13:34:47 -0400

    ActionView::Helpers::TextHelper#simple_format should not change the text in place. Now it duplicates it.

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit cf96649	refs/heads/master
Merge: f000d4e 54b8356
Author: Santiago Pastorino 
Date:   2011-08-04 09:29:18 -0700

    Merge pull request #2356 from waynn/fix_symbol
    
    fix stringify_keys destructive behavior for most FormTagHelper functions

commit 54b8356	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-29 17:43:05 -0700

    fix stringify_keys destructive behavior for most FormTagHelper functions
    add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit e42c544	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-08-04 00:23:58 +0100

    Quote these dates to prevent intermittent test failure. Suppose local time is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.

M	activerecord/test/fixtures/pirates.yml

commit 26c410e	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-08-04 00:23:58 +0100

    Quote these dates to prevent intermittent test failure. Suppose local time is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.
    
    Conflicts:
    
    	activerecord/test/fixtures/pirates.yml

M	activerecord/test/fixtures/pirates.yml

commit 5f05642	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-03 21:04:32 -0300

    Fix a bit precompile and lazy compile comments

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit e63d3f7	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-03 16:55:00 -0700

    make assert_difference error message not suck

M	activesupport/lib/active_support/testing/assertions.rb

commit f000d4e	refs/heads/master
Author: Jon Leighton 
Date:   2011-08-04 00:23:58 +0100

    Quote these dates to prevent intermittent test failure. Suppose local time is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.

M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/fixtures/pirates.yml

commit 7d43217	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-03 21:04:32 -0300

    Fix a bit precompile and lazy compile comments

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 171881f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-03 16:55:00 -0700

    make assert_difference error message not suck

M	activesupport/lib/active_support/testing/assertions.rb

commit cc9ed15	refs/heads/master
Merge: bf5d1d4 b386951
Author: Santiago Pastorino 
Date:   2011-08-03 15:34:11 -0700

    Merge pull request #2413 from artemk/master
    
    accept hash of options to recreate database for postgres adapter

commit c1b85ed	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-03 15:29:15 -0700

    fixing deprecation notice for dynamic finders that use hashes. fixes #2404

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/finder_test.rb

commit bf5d1d4	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-03 19:18:34 -0300

    Don't require assets group in production by default, you can change this default in the application.rb anyways

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 0c57ae1	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-03 19:18:34 -0300

    Don't require assets group in production by default, you can change this default in the application.rb anyways

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit b386951	refs/heads/master
Author: artemk 
Date:   2011-08-04 00:34:13 +0300

    accept option for recreate db for postgres (same as mysql now)

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 8962e96	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-03 18:14:11 -0300

    This dep is already defined in activerecord.gemspec

M	Gemfile

commit 1f1bfaf	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-03 18:14:11 -0300

    This dep is already defined in activerecord.gemspec

M	Gemfile

commit 86b7d83	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-03 08:57:52 -0700

    initializing @open_transactions in the initialize method

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit 3c7b29d	refs/heads/master
Author: Arun Agrawal 
Date:   2011-08-01 20:31:19 +0530

    Test added to check mass_assignment_sanitizer is not present if --skip-active-record provided.

M	railties/test/generators/app_generator_test.rb

commit 3e56758	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-02 20:01:38 -0700

    add a migrate class method and delegate to the new instance

M	activerecord/lib/active_record/migration.rb

commit 96fc074	refs/tags/v3.1.0.rc6
Author: Christopher Meiklejohn 
Date:   2011-07-29 23:17:12 -0400

    Ensure that .up and .down work as well.

M	activerecord/test/cases/invertible_migration_test.rb

commit 55eadcc	refs/tags/v3.1.0.rc6
Author: Christopher Meiklejohn 
Date:   2011-07-29 21:26:21 -0400

    Support backwards compatible interface for migration down/up with rails 3.0.x.

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/invertible_migration_test.rb

commit 3a29cc3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-02 20:01:38 -0700

    add a migrate class method and delegate to the new instance

M	activerecord/lib/active_record/migration.rb

commit 43fc814	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-07-29 23:17:12 -0400

    Ensure that .up and .down work as well.

M	activerecord/test/cases/invertible_migration_test.rb

commit 74d7bfb	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-07-29 21:26:21 -0400

    Support backwards compatible interface for migration down/up with rails 3.0.x.

M	activerecord/lib/active_record/migration.rb
M	activerecord/test/cases/invertible_migration_test.rb

commit ebfad37	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-08-01 17:29:03 -0700

    use File.directory? as Dir.exists? is only 1.9.2+

M	railties/lib/rails/paths.rb

commit 3a4dc9d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-08-01 17:29:03 -0700

    use File.directory? as Dir.exists? is only 1.9.2+

M	railties/lib/rails/paths.rb

commit 6dda216	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-08-01 12:32:17 -0700

    Merge pull request #2324 from zenapsis/3-1-stable
    
    Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories

M	railties/lib/rails/engine.rb
M	railties/lib/rails/paths.rb
M	railties/test/application/assets_test.rb

commit 1711731	refs/tags/v3.1.0.rc6
Merge: 17b0d2c b4ca7d3
Author: Santiago Pastorino 
Date:   2011-08-01 12:32:17 -0700

    Merge pull request #2324 from zenapsis/3-1-stable
    
    Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories

commit a173bb3	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-08-01 10:58:48 -0700

    Merge pull request #2393 from bdurand/fix_cache_read_multi
    
    Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 17b0d2c	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-08-01 10:58:48 -0700

    Merge pull request #2393 from bdurand/fix_cache_read_multi
    
    Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 6e701e8	refs/heads/master
Merge: 5c26f56 fec4c5a
Author: Santiago Pastorino 
Date:   2011-08-01 10:58:48 -0700

    Merge pull request #2393 from bdurand/fix_cache_read_multi
    
    Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi

commit fec4c5a	refs/heads/master
Author: Brian Durand 
Date:   2011-08-01 12:05:29 -0500

    Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the delete_entry call.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 5c26f56	refs/heads/master
Merge: 6b3af02 6244a53
Author: Santiago Pastorino 
Date:   2011-08-01 08:32:06 -0700

    Merge pull request #2389 from dmitriy-kiriyenko/remove_unnecessary_require_in_delegation
    
    Remove unnecessary require (happened after fcbde454f6)

commit 6244a53	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-08-01 18:00:41 +0300

    Remove unnecessary require (happened after fcbde454f6)

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 6b3af02	refs/heads/master
Merge: 860202e b93a918
Author: José Valim 
Date:   2011-08-01 04:50:06 -0700

    Merge pull request #2385 from bogdan/test_default_sanitizer2
    
    MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer

commit 860202e	refs/heads/master
Author: thoefer 
Date:   2011-08-01 11:28:31 +0200

    Fix the issue where default_url_options is being cached on test cases. Closes #1872. Closes #2031.
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb
A	actionpack/test/controller/default_url_options_with_filter_test.rb

commit 86b792d	refs/tags/v3.1.0.rc6
Merge: 7ee15e8 7b39dda
Author: José Valim 
Date:   2011-08-01 02:44:06 -0700

    Merge pull request #2307 from thoefer/3-1-stable-fix1872
    
    Fix the issue where default_url_options is being cached on test cases. Closes #1872. Closes #2031.

commit dc8773b	refs/heads/master
Author: José Valim 
Date:   2011-08-01 11:42:00 +0200

    Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/render_test.rb
M	activemodel/CHANGELOG
M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/lint.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/conversion_test.rb
M	activemodel/test/cases/naming_test.rb

commit 7b39dda	refs/tags/v3.1.0.rc6
Author: thoefer 
Date:   2011-08-01 11:28:31 +0200

    modified fix #1872 according to jose valim´s suggestions

M	actionpack/lib/action_controller/metal/testing.rb
M	actionpack/lib/action_controller/test_case.rb
A	actionpack/test/controller/default_url_options_with_filter_test.rb

commit 7ee15e8	refs/tags/v3.1.0.rc6
Merge: 030bb71 c05ceac
Author: Santiago Pastorino 
Date:   2011-07-31 12:55:06 -0700

    Merge pull request #2382 from vijaydev/rakeaboutfix3.1
    
    Fix #2368 (3-1-stable)

commit 564d39e	refs/tags/v3.0.14
Merge: cb36585 773d219
Author: Santiago Pastorino 
Date:   2011-07-31 12:54:51 -0700

    Merge pull request #2381 from vijaydev/rakeaboutfix3.0
    
    Fix #2368 (3-0-stable)

commit 773d219	refs/tags/v3.0.14
Author: Vijay Dev 
Date:   2011-07-31 21:39:10 +0530

    fixes #2368. rake about not showing the middleware, db adapter and db schema version

M	railties/lib/rails/tasks/misc.rake

commit c05ceac	refs/tags/v3.1.0.rc6
Author: Vijay Dev 
Date:   2011-07-31 21:39:10 +0530

    fixes #2368. rake about not showing the middleware, db adapter and db schema version

M	railties/lib/rails/tasks/misc.rake

commit d701b3f	refs/heads/master
Merge: 0fd7857 ec7457e
Author: Santiago Pastorino 
Date:   2011-07-31 11:50:52 -0700

    Merge pull request #2379 from arunagw/extra_require_removal
    
    Removing extra requires from the test. Already loaded in abstract_unit.

commit 0fd7857	refs/heads/master
Merge: 8206167 0705130
Author: Santiago Pastorino 
Date:   2011-07-31 11:49:22 -0700

    Merge pull request #2377 from castlerock/remove_require
    
    remove extra require for 'active_support/dependencies' as it is required

commit ec7457e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-31 23:36:21 +0530

    Removing extra requires from the test. Already loaded in abstract_unit.

M	actionpack/test/controller/helper_test.rb
M	activesupport/test/core_ext/string_ext_test.rb
M	activesupport/test/dependencies_test.rb
M	activesupport/test/json/decoding_test.rb
M	activesupport/test/multibyte_utils_test.rb
M	activesupport/test/test_test.rb

commit 325fdfc	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-31 20:05:58 +0200

    Remove warnings by calling remove_method

M	activemodel/test/cases/serializers/xml_serialization_test.rb

commit 0705130	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-31 23:12:28 +0530

    remove extra require for 'active_support/dependencies' as it is required in abstract_unit.rb

M	actionpack/test/controller/routing_test.rb

commit cb36585	refs/tags/v3.0.14
Merge: 553d9ea b0334db
Author: Santiago Pastorino 
Date:   2011-07-31 09:59:48 -0700

    Merge pull request #2374 from arunagw/30_schema_dumper_test_fix
    
    3-0-stable schema dumper test fix

commit 8206167	refs/heads/master
Merge: 3c4c281 624c457
Author: Santiago Pastorino 
Date:   2011-07-31 09:51:43 -0700

    Merge pull request #2370 from castlerock/remove_duplicate_require
    
    remove extra require for 'stringio' as it is required in helper.rb

commit 3c4c281	refs/heads/master
Merge: e022c95 040f65b
Author: José Valim 
Date:   2011-07-31 09:23:04 -0700

    Merge pull request #2375 from vijaydev/rakeaboutfix
    
    Fixes #2368. rake about not showing a few properties

commit b0334db	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-07-31 21:39:49 +0530

    skiping magic comment test. checking encoding_aware?
    Loading AS encoding.

M	activerecord/test/cases/schema_dumper_test.rb

commit 030bb71	refs/tags/v3.1.0.rc6
Merge: 3c8d805 3248c5d
Author: José Valim 
Date:   2011-07-31 09:10:30 -0700

    Merge pull request #2373 from arunagw/31_schema_dumper_test_fix
    
    3-1-stable schema dumper test fix

commit 040f65b	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-31 21:39:10 +0530

    fixes #2368. rake about not showing the middleware, db adapter and db schema version

M	railties/lib/rails/tasks/misc.rake

commit 3248c5d	refs/tags/v3.1.0.rc6
Author: Arun Agrawal 
Date:   2011-07-31 21:17:51 +0530

    skiping magic comment test. checking encoding_aware?
    Loading AS encoding.

M	activerecord/test/cases/schema_dumper_test.rb

commit 3c8d805	refs/tags/v3.1.0.rc6
Merge: 048215a f2657b0
Author: Jon Leighton 
Date:   2011-07-31 07:29:17 -0700

    Merge pull request #2372 from bradediger/issue-2346-3-1-stable
    
    Issue 2346 3-1-stable port

commit e022c95	refs/heads/master
Merge: 779d78d 7f88539
Author: Jon Leighton 
Date:   2011-07-31 07:28:50 -0700

    Merge pull request #2371 from bradediger/issue-2346
    
    remove_possible_method: test if method exists

commit f2657b0	refs/tags/v3.1.0.rc6
Author: Brad Ediger 
Date:   2011-07-31 07:38:38 -0500

    remove_possible_method: test if method exists
    
    This speeds up remove_possible_method substantially since it doesn't
    have to rescue a NameError in the common case.
    
    Closes #2346.

M	activesupport/lib/active_support/core_ext/module/remove_method.rb

commit 7f88539	refs/heads/master
Author: Brad Ediger 
Date:   2011-07-31 07:38:38 -0500

    remove_possible_method: test if method exists
    
    This speeds up remove_possible_method substantially since it doesn't
    have to rescue a NameError in the common case.
    
    Closes #2346.

M	activesupport/lib/active_support/core_ext/module/remove_method.rb

commit 624c457	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-31 18:05:05 +0530

    remove extra require for 'stringio' as it is required in helper.rb

M	activerecord/test/cases/schema_dumper_test.rb

commit 779d78d	refs/heads/master
Merge: 853ca2e 329409d
Author: José Valim 
Date:   2011-07-31 04:25:25 -0700

    Merge pull request #2358 from arunagw/test_fix_187_skip
    
    skiping magic comment test for < 1.9

commit 853ca2e	refs/heads/master
Merge: 4c85c4e 6969638
Author: Santiago Pastorino 
Date:   2011-07-30 16:01:59 -0700

    Merge pull request #2345 from castlerock/plugin_new_generator_more_default_file
    
    Covering more files in test for plugin new generator.

commit 048215a	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-07-30 23:02:52 +0100

    Revert "Replace inline lambdas with named methods" and "Don't wrap operations on collection associations in transactions when they are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database."
    
    This reverts commits df63c99f0602b1854870e6176a144358021b5014 and b17fd25a2d554a9b126fc185dc7609f7846ee267.
    
    The change had unintended side effects, please see #2337.
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 329409d	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-30 09:19:58 +0530

    magic comment test only if encoding_aware?.

M	activerecord/test/cases/schema_dumper_test.rb

commit 4c85c4e	refs/heads/master
Merge: 2b925e8 e7330f3
Author: José Valim 
Date:   2011-07-30 09:11:19 -0700

    Merge pull request #2364 from bcardarella/resolve_undefined_instance_attributes_instance_variable
    
    Resolve warnings by instantizing @attrubtes as nil

commit e7330f3	refs/heads/master
Author: Brian Cardarella 
Date:   2011-07-30 12:08:26 -0400

    Resolve warnings by instantizing @attrubtes as nil

M	activerecord/test/cases/attribute_methods_test.rb

commit 2b925e8	refs/heads/master
Merge: ae1e70c 1f270e8
Author: Santiago Pastorino 
Date:   2011-07-29 17:39:20 -0700

    Merge pull request #2354 from waynn/patch-1
    
    remove redundant calls to stringify_keys

commit 1f270e8	refs/heads/master
Author: Waynn Lue 
Date:   2011-07-29 17:07:27 -0700

    remove redundant calls to stringify_keys

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit ae1e70c	refs/heads/master
Merge: ea7f508 a263f37
Author: Aaron Patterson 
Date:   2011-07-29 16:20:21 -0700

    Merge pull request #2353 from bdurand/no_freeze_cache_entries
    
    Change ActiveSupport::Cache behavior to not return frozen objects

commit a263f37	refs/heads/master
Author: Brian Durand 
Date:   2011-07-29 17:27:45 -0500

    Change ActiveSupport::Cache behavior to always return duplicate objects instead of frozen objects.

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit 553d9ea	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-07-29 14:47:41 -0700

    updating the CHANGELOG

M	activesupport/CHANGELOG

commit b9f6798	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-07-29 14:38:57 -0700

    delay backtrace scrubbing until we actually raise an exception. fixes #1936

M	activesupport/lib/active_support/dependencies.rb

commit 61c5c3d	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-29 14:38:57 -0700

    delay backtrace scrubbing until we actually raise an exception. fixes #1936

M	activesupport/lib/active_support/dependencies.rb

commit ea7f508	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-29 14:38:57 -0700

    delay backtrace scrubbing until we actually raise an exception. fixes #1936

M	activesupport/lib/active_support/dependencies.rb

commit 6631abd	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-07-29 12:31:00 -0700

    updating changelog with schema.rb changes

M	activerecord/CHANGELOG

commit 3676af4	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-07-29 12:28:12 -0700

    default writing the schema file as utf-8

M	activerecord/lib/active_record/railties/databases.rake

commit d13df74	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-29 12:28:12 -0700

    default writing the schema file as utf-8

M	activerecord/lib/active_record/railties/databases.rake

commit cea06a8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-29 12:28:12 -0700

    default writing the schema file as utf-8

M	activerecord/lib/active_record/railties/databases.rake

commit 5d7ed7a	refs/tags/v3.0.14
Author: Bhavin Kamani 
Date:   2011-05-21 15:50:25 +0530

    fix connection not established error while running rake task
    db:schema:dump

M	activerecord/lib/active_record/railties/databases.rake

commit 6c0beb5	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-07-29 12:23:37 -0700

    dump IO encoding value along with schema.rb so the file can be reloaded. fixes #1592

M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit 4e1f6ab	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-29 12:23:37 -0700

    dump IO encoding value along with schema.rb so the file can be reloaded. fixes #1592

M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit 3d6e187	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-29 12:23:37 -0700

    dump IO encoding value along with schema.rb so the file can be reloaded. fixes #1592

M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/test/cases/schema_dumper_test.rb

commit 455e9e7	refs/heads/master
Merge: 3e8fe1d 1c94ba0
Author: Santiago Pastorino 
Date:   2011-07-29 10:48:27 -0700

    Merge pull request #2342 from bcardarella/remove_controller_instance_variable_warnings_from_sprocket_helper_test
    
    Resolve "instance variable @controller not initialized" warnings for sprocket_helper_test

commit 6969638	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-29 23:05:40 +0530

    Covering more files in test for plugin new generator.

M	railties/test/generators/plugin_new_generator_test.rb

commit 3e8fe1d	refs/heads/master
Merge: bbe1b1a 6ef1079
Author: Aaron Patterson 
Date:   2011-07-29 10:32:24 -0700

    Merge pull request #2344 from bcardarella/resolve_warning_for_capture_helper_test
    
    Reset @dirty to false when slicing an instance of SafeBuffer

commit bbe1b1a	refs/heads/master
Merge: 270fa63 4fe2c99
Author: José Valim 
Date:   2011-07-29 10:11:43 -0700

    Merge pull request #2343 from arunagw/test_add_for_plugin_new_gen
    
    Test add for plugin new generator generate mailer

commit 6ef1079	refs/heads/master
Author: Brian Cardarella 
Date:   2011-07-29 13:06:45 -0400

    Reset @dirty to false when slicing an instance of SafeBuffer

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 4fe2c99	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-29 22:06:36 +0530

    Test add for plugin new generator generate mailer

M	railties/test/generators/plugin_new_generator_test.rb

commit 1c94ba0	refs/heads/master
Author: Brian Cardarella 
Date:   2011-07-29 12:08:35 -0400

    Instead of removing the instance variable just set it to nil, resolves the warnings because of a missing instance variable

M	actionpack/test/template/sprockets_helper_test.rb

commit 270fa63	refs/heads/master
Merge: 5446359 d8e62a9
Author: José Valim 
Date:   2011-07-29 07:21:16 -0700

    Merge pull request #2339 from dgeb/mailers-in-plugins
    
    Ensure that app/mailers gets created in new plugins (#2287 brought into master)

commit d8e62a9	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 15:41:08 -0400

    Include empty app/mailers directory in mountable and full plugins

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory

commit 5446359	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-28 16:46:39 -0300

    Tidy up

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit f2ade6f	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-28 16:46:39 -0300

    Generated apps with --dev or --edge flags depend on git versions of sass-rails and coffee-rails

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit b57773c	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-29 01:13:58 +0530

    document meta method

M	actionpack/lib/action_dispatch/http/request.rb

commit caacf85	refs/heads/master
Merge: b295ea1 ad0772f
Author: José Valim 
Date:   2011-07-28 11:24:08 -0700

    Merge pull request #2327 from cesario/patch-1
    
    We don't need to require erb here.

commit 7f5dc98	refs/tags/v3.1.0.rc6
Merge: b4cf291 34c5089
Author: José Valim 
Date:   2011-07-28 11:21:53 -0700

    Merge pull request #2332 from thedarkone/resources-router-fix-3-1
    
    Backport #2330 into 3-1-stable

commit 34c5089	refs/tags/v3.1.0.rc6
Author: thedarkone 
Date:   2011-07-28 20:02:21 +0200

    Make use of the inherited initializer.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 0753d0b	refs/tags/v3.1.0.rc6
Author: thedarkone 
Date:   2011-07-28 20:00:48 +0200

    There is no need to be destructive with the passed-in options.
    
    This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/resources_test.rb

commit b295ea1	refs/heads/master
Merge: adce9b4 a5f57a7
Author: José Valim 
Date:   2011-07-28 11:10:23 -0700

    Merge pull request #2330 from thedarkone/resources-router-fix
    
    Inline resources router fix

commit a5f57a7	refs/heads/master
Author: thedarkone 
Date:   2011-07-28 20:02:21 +0200

    Make use of the inherited initializer.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 4d4d217	refs/heads/master
Author: thedarkone 
Date:   2011-07-28 20:00:48 +0200

    There is no need to be destructive with the passed-in options.
    
    This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/resources_test.rb

commit adce9b4	refs/heads/master
Merge: 8476304 b407034
Author: Xavier Noria 
Date:   2011-07-28 10:12:51 -0700

    Merge pull request #2329 from nertzy/master
    
    Give attribution to Peter Jaros for the patch we paired on

commit 9e39fd9	refs/heads/master
Author: ejy 
Date:   2011-07-28 18:40:35 +0200

    Removed trailing slash of 'Download and installation' Github URL as per convention

M	activerecord/README.rdoc

commit b407034	refs/heads/master
Author: Grant Hutchins 
Date:   2011-07-28 13:38:28 -0300

    Give attribution to Peter Jaros for the patch we paired on.

M	activemodel/CHANGELOG

commit b4cf291	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-28 08:47:04 -0700

    Merge pull request #2326 from castlerock/plugin_generator_fix
    
    pluging generator test fix

M	railties/test/generators/plugin_new_generator_test.rb

commit 8476304	refs/heads/master
Merge: d10f268 5a4e8f5
Author: Santiago Pastorino 
Date:   2011-07-28 08:47:04 -0700

    Merge pull request #2326 from castlerock/plugin_generator_fix
    
    pluging generator test fix

commit ad0772f	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-28 18:45:43 +0300

    We don't need to require erb here.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 5a4e8f5	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-28 21:14:29 +0530

    pluging generator test fix

M	railties/test/generators/plugin_new_generator_test.rb

commit b4ca7d3	refs/tags/v3.1.0.rc6
Author: Tasveer Singh 
Date:   2011-07-24 16:59:49 -0400

    Do not add files in assets/ directories to Sprockets

M	railties/lib/rails/engine.rb
M	railties/lib/rails/paths.rb
M	railties/test/application/assets_test.rb

commit f2c8309	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-28 11:48:21 -0300

    Tidy up a bit plugin new gemspec

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit bba9c8d	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-28 07:44:10 -0700

    Merge pull request #2295 from dgeb/mo-better-plugins
    
    Improve dependency management and gemspec file for plugins

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
A	railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb

commit d10f268	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-28 11:48:21 -0300

    Tidy up a bit plugin new gemspec

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit 5ab9132	refs/heads/master
Merge: 971a74b a74e473
Author: Santiago Pastorino 
Date:   2011-07-28 07:44:10 -0700

    Merge pull request #2295 from dgeb/mo-better-plugins
    
    Improve dependency management and gemspec file for plugins

commit a74e473	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 21:54:45 -0400

    Moved dependencies from Gemfile to gemspec to eliminate redundant declarations.

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile

commit d9b59c3	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 18:51:44 -0400

    Extracted version from gemspec and placed it in its own file. This is consistent with the approach taken by "bundle gem", and is expected by gems such as svenfuchs/gem-release which can be used to bump / tag versions of gems.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
A	railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb

commit 5515a18	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-26 17:25:32 -0400

    Expanded meta-data in gemspec to include author, email, etc.; Defaults include "TODO" to prevent gems from being built without review.

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit 6dc7495	refs/heads/master
Author: Pete Campbell 
Date:   2011-07-28 09:44:51 -0400

    Explicitly included hashes in sentence regarding SQL-injection-safe forms

M	activerecord/lib/active_record/base.rb

commit a33fe79	refs/tags/v3.0.14
Merge: e93cff8 a8aa666
Author: Santiago Pastorino 
Date:   2011-07-28 05:57:00 -0700

    Merge pull request #2320 from amatsuda/callback_deprecation_message
    
    callback methods are Class methods

commit ac24a53	refs/tags/v3.1.0.rc6
Merge: 6f745f4 09dd71c
Author: Santiago Pastorino 
Date:   2011-07-28 05:50:06 -0700

    Merge pull request #2319 from thedarkone/errors-include-3-1
    
    Backport #2305 into 3-1-stable

commit fae9ad9	refs/heads/master
Author: Olli Jokinen 
Date:   2011-07-28 15:39:04 +0300

    fixed test case test_render_json_with_callback to use content_type application/javascript

M	actionpack/test/controller/render_json_test.rb

commit 971a74b	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-28 13:14:11 +0100

    Revert "Merge pull request #2309 from smasry/master"
    
    This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing
    changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d.
    
    Reason: the change broke the build.

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 6b15a45	refs/heads/master
Author: Olli Jokinen 
Date:   2011-07-28 14:42:20 +0300

    Change mimetype to Mime::JS if JSONP is used

M	actionpack/lib/action_controller/metal/renderers.rb

commit a8aa666	refs/tags/v3.0.14
Author: Akira Matsuda 
Date:   2011-07-28 19:31:54 +0900

    callback methods are Class methods

M	activerecord/lib/active_record/callbacks.rb

commit 09dd71c	refs/tags/v3.1.0.rc6
Author: thedarkone 
Date:   2011-07-27 18:07:47 +0200

    Handle the empty array correctly.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit b93a918	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-07-28 11:56:08 +0300

    MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer
    
    In order to use StrictSanitizer in test mode
    Consider :id as not sensetive attribute that can be filtered from
    mass assignement without exception.

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 30dae27	refs/heads/master
Author: José Valim 
Date:   2011-07-28 10:05:17 +0200

    Update CHANGELOG.

M	activemodel/CHANGELOG

commit d5eeacc	refs/heads/master
Author: José Valim 
Date:   2011-07-28 10:01:55 +0200

    Move the cache to a nested hash which performs better than a hash with array as keys.

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit dee8115	refs/heads/master
Author: José Valim 
Date:   2011-07-28 09:56:42 +0200

    Rename class method to_path to _to_path and make it explicit that it is an internal method.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	activemodel/lib/active_model/conversion.rb

commit 1b7db58	refs/heads/master
Merge: 8248052 bf81207
Author: José Valim 
Date:   2011-07-28 00:50:07 -0700

    Merge pull request #2034 from Casecommons/to_path
    
    Allow ActiveModel-compatible instances to define their own partial paths

commit 5a22f05	refs/heads/master
Author: Alberto Perdomo 
Date:   2011-07-28 00:51:14 +0100

    Association and Callbacks guide: Added section on shortcut syntax 'validates'.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 8248052	refs/heads/master
Author: Joshua Peek 
Date:   2011-07-27 15:09:42 -0500

    Make Rails.application.assets available in initializers

M	actionpack/lib/sprockets/railtie.rb

commit 5eeae68	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-27 13:21:59 -0700

    contrib app minor tweak

M	actionpack/CHANGELOG

commit 78a1fda	refs/tags/v2.3.13
Author: Xavier Noria 
Date:   2011-07-27 13:21:59 -0700

    contrib app minor tweak

M	actionpack/CHANGELOG

commit 6f745f4	refs/tags/v3.1.0.rc6
Author: Xavier Noria 
Date:   2011-07-27 13:21:59 -0700

    contrib app minor tweak

M	actionpack/CHANGELOG

commit e93cff8	refs/tags/v3.0.14
Author: Xavier Noria 
Date:   2011-07-27 13:21:59 -0700

    contrib app minor tweak

M	actionpack/CHANGELOG

commit 1edfadf	refs/tags/v3.1.0.rc6
Author: Joshua Peek 
Date:   2011-07-27 15:09:42 -0500

    Make Rails.application.assets available in initializers

M	actionpack/lib/sprockets/railtie.rb

commit a9dea60	refs/tags/v3.1.0.rc6
Merge: 348cd23 9d93a44
Author: José Valim 
Date:   2011-07-27 11:37:33 -0700

    Merge pull request #2287 from dgeb/3-1-mailers-in-plugins
    
    Ensure that app/mailers gets created in new plugins

commit 9d396ee	refs/heads/master
Merge: fa2bfd8 18d307e
Author: Aaron Patterson 
Date:   2011-07-27 10:26:39 -0700

    Merge pull request #2309 from smasry/master
    
    Unmangaling reverse_sql_order when function is used

commit 18d307e	refs/heads/master
Author: Samer Masry 
Date:   2011-07-27 10:17:25 -0700

    Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit fa2bfd8	refs/heads/master
Merge: 8faeed1 efe4cbe
Author: Santiago Pastorino 
Date:   2011-07-27 09:44:15 -0700

    Merge pull request #2305 from thedarkone/errors-include
    
    Improve AM::Errors#include?

commit efe4cbe	refs/heads/master
Author: thedarkone 
Date:   2011-07-27 18:07:47 +0200

    Handle the empty array correctly.

M	activemodel/lib/active_model/errors.rb
M	activemodel/test/cases/errors_test.rb

commit 8faeed1	refs/heads/master
Author: Christos Zisopoulos 
Date:   2011-07-27 16:12:22 +0200

    Improve performance and memory usage for options_for_select with Ruby 1.8.7

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 348cd23	refs/tags/v3.1.0.rc6
Merge: e13e25d 74a450d
Author: Xavier Noria 
Date:   2011-07-27 08:02:59 -0700

    Merge pull request #2302 from christos/performant_options_for_select
    
    Improve performance and memory usage for options_for_select with Ruby 1.8

commit 74a450d	refs/tags/v3.1.0.rc6
Author: Christos Zisopoulos 
Date:   2011-07-27 16:12:22 +0200

    Improve performance and memory usage for options_for_select with Ruby 1.8.7

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 091e767	refs/heads/master
Merge: 24f0a87 9a298a1
Author: Jon Leighton 
Date:   2011-07-27 07:02:04 -0700

    Merge pull request #1969 from dmitriy-kiriyenko/calculations_with_having_on_select
    
    ActiveRecord calculation fail when having contains conditions based on select values

commit 9a298a1	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-07-05 13:17:39 +0300

    Fixed failing query when performing calculation with having based on select.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit e13e25d	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-07-27 12:44:17 +0100

    Update deprecation messages to point out the availability of proxy_association. Fixes #1148.

M	activerecord/lib/active_record/associations/collection_proxy.rb

commit 7bf9b9a	refs/tags/v3.1.0.rc6
Author: Jon Leighton 
Date:   2011-07-27 12:36:00 +0100

    Add a proxy_association method to association proxies, which can be called by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner.
    
    Conflicts:
    
    	activerecord/lib/active_record/associations/collection_proxy.rb
    	activerecord/test/cases/associations_test.rb

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations_test.rb

commit 24f0a87	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-27 12:36:00 +0100

    Add a proxy_association method to association proxies, which can be called by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations_test.rb

commit b0a91f2	refs/heads/master
Author: Hendy Tanata 
Date:   2011-07-27 17:30:35 +0700

    Fix two spaces between sententes on README.rdoc.

M	README.rdoc

commit 8dade49	refs/tags/v3.1.0.rc6
Author: Lachlan Sylvester 
Date:   2011-07-27 16:59:11 +1000

    fix some types in schema_test.rb

M	activeresource/test/cases/base/schema_test.rb

commit 46b8261	refs/heads/master
Merge: 0b98704 7e13284
Author: Xavier Noria 
Date:   2011-07-27 01:11:31 -0700

    Merge pull request #2296 from lsylvester/typo
    
    fix some typos

commit 7e13284	refs/heads/master
Author: Lachlan Sylvester 
Date:   2011-07-27 16:59:11 +1000

    fix some types in schema_test.rb

M	activeresource/test/cases/base/schema_test.rb

commit 0b98704	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 17:49:19 -0700

    simplify conditionals by assuming hash values will never be `false`

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 7868cf8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 17:45:34 -0700

    use regular ruby rather than clever ruby

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit ba43b9b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 17:33:22 -0700

    fixing wildcard path matching when wildcard is inside parenthesis

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/mapper_test.rb

commit 626798a	refs/tags/v3.1.0.rc6
Author: Jonathan del Strother 
Date:   2011-07-27 00:06:19 +0100

    Replace unnecessary regexp in Dependencies#load_missing_constant

M	activesupport/lib/active_support/dependencies.rb

commit e4a7b23	refs/heads/master
Merge: 6089ecf 43ef635
Author: Aaron Patterson 
Date:   2011-07-26 16:19:48 -0700

    Merge pull request #2291 from jdelStrother/load_missing_constant
    
    Replace unnecessary regexp in Dependencies#load_missing_constant

commit 43ef635	refs/heads/master
Author: Jonathan del Strother 
Date:   2011-07-27 00:06:19 +0100

    Replace unnecessary regexp in Dependencies#load_missing_constant

M	activesupport/lib/active_support/dependencies.rb

commit 8220777	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-26 15:23:11 -0700

    Merge pull request #2279 from jdelStrother/load_missing_constant
    
    Constantize a regexp in Dependencies#load_missing_constant

M	activesupport/lib/active_support/dependencies.rb

commit 6089ecf	refs/heads/master
Merge: b4efff4 f17ea60
Author: Santiago Pastorino 
Date:   2011-07-26 15:23:11 -0700

    Merge pull request #2279 from jdelStrother/load_missing_constant
    
    Constantize a regexp in Dependencies#load_missing_constant

commit b4efff4	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 19:20:45 -0300

    Remove blank line

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 77e67f4	refs/heads/master
Merge: 17d0efb 3bfcf5f
Author: Santiago Pastorino 
Date:   2011-07-26 15:18:39 -0700

    Merge pull request #2273 from thoefer/refactor
    
    refactored 'assert_redirected_to'

commit b589f0c	refs/tags/v3.1.0.rc6
Author: Dan Gebhardt 
Date:   2011-07-16 08:22:43 -0400

    added test case for fix to issue #2094

M	actionpack/test/template/form_helper_test.rb

commit 75366cb	refs/tags/v3.1.0.rc6
Author: Dan Gebhardt 
Date:   2011-07-15 18:22:31 -0400

    fixed problem in which options[:html][:remote] would be overridden in form_for() - fixes #2094

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 43e6f82	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-07-26 18:11:55 -0300

    Remove cruise files

D	ci/ci_build.rb
D	ci/ci_setup_notes.txt
D	ci/cruise_config.rb
D	ci/site.css
D	ci/site_config.rb

commit 17d0efb	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 18:11:03 -0300

    Remove cruise files

D	ci/ci_build.rb
D	ci/ci_setup_notes.txt
D	ci/cruise_config.rb
D	ci/site.css
D	ci/site_config.rb

commit 8f67029	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-26 18:10:15 -0300

    Remove cruise files

D	ci/ci_build.rb
D	ci/ci_setup_notes.txt
D	ci/cruise_config.rb
D	ci/site.css
D	ci/site_config.rb

commit e18e896	refs/tags/v3.0.14
Merge: 56c663b 64c269a
Author: Santiago Pastorino 
Date:   2011-07-26 14:08:14 -0700

    Merge pull request #2289 from joshk/3-0-stable
    
    More Irc notifications (from Travis with love, again)

commit 8aa49ad	refs/tags/v3.1.0.rc6
Merge: 1768b6c 0094cab
Author: Santiago Pastorino 
Date:   2011-07-26 14:08:11 -0700

    Merge pull request #2288 from joshk/3-1-stable
    
    Irc notifications (from Travis with love)

commit ef89a70	refs/heads/master
Merge: d482cf8 455e321
Author: Aaron Patterson 
Date:   2011-07-26 13:50:20 -0700

    Merge pull request #2095 from dgeb/issue-2094
    
    Fixes overriding of options[:html][:remote] in form_for() (Issue #2094)

commit 64c269a	refs/tags/v3.0.14
Author: Josh Kalderimis 
Date:   2011-07-26 18:17:58 +0000

    enable Travis CI irc notifications to #rails-contrib on irc.freenode.org

M	.travis.yml

commit 0094cab	refs/tags/v3.1.0.rc6
Author: Josh Kalderimis 
Date:   2011-07-26 18:17:58 +0000

    enable Travis CI irc notifications to #rails-contrib on irc.freenode.org

M	.travis.yml

commit 9d93a44	refs/tags/v3.1.0.rc6
Author: Dan Gebhardt 
Date:   2011-07-26 15:41:08 -0400

    Include empty app/mailers directory in mountable and full plugins

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory

commit d482cf8	refs/heads/master
Merge: 49ebd01 db34a65
Author: Santiago Pastorino 
Date:   2011-07-26 12:33:34 -0700

    Merge pull request #2285 from castlerock/remove_warnings_ruby193
    
    remove unused variables warnings removed

commit 49ebd01	refs/heads/master
Merge: 0868461 5a5d7ba
Author: Santiago Pastorino 
Date:   2011-07-26 12:32:39 -0700

    Merge pull request #2284 from joshk/patch-6
    
    enable Travis CI irc notifications to #rails-contrib on irc.freenode.org

commit db34a65	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-26 23:53:54 +0530

    remove unused variables warnings removed

M	activesupport/test/safe_buffer_test.rb

commit 5a5d7ba	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-07-26 18:17:58 +0000

    enable Travis CI irc notifications to #rails-contrib on irc.freenode.org

M	.travis.yml

commit 0868461	refs/heads/master
Merge: 64807b9 1e69f0b
Author: Aaron Patterson 
Date:   2011-07-26 11:14:23 -0700

    Merge pull request #2283 from castlerock/remove_warnings_ruby193
    
    remove deprication warning: ambiguous first argument; put parentheses or

commit 1e69f0b	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-26 23:39:17 +0530

    remove deprication warning: ambiguous first argument; put parentheses or even spaces

M	activerecord/test/cases/base_test.rb

commit 1768b6c	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-26 11:02:41 -0700

    fixing tests on ruby trunk

M	activesupport/test/xml_mini_test.rb

commit 5f6accf	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-26 10:58:16 -0700

    fixing whitespace errors

M	activesupport/test/xml_mini_test.rb

commit 64807b9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 11:02:41 -0700

    fixing tests on ruby trunk

M	activesupport/test/xml_mini_test.rb

commit d4246e5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-26 10:58:16 -0700

    fixing whitespace errors

M	activesupport/test/xml_mini_test.rb

commit af6abc6	refs/heads/master
Merge: bdbf97c cf3f1c9
Author: Santiago Pastorino 
Date:   2011-07-26 10:42:15 -0700

    Merge pull request #2281 from castlerock/remove_warnings_ruby193
    
    remove deprication warning for ruby 1.9.3-head for unused variable

commit cf3f1c9	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-26 22:33:23 +0530

    remove deprication warning for ruby 1.9.3-head for unused variables

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit f17ea60	refs/heads/master
Author: Jonathan del Strother 
Date:   2011-07-26 16:10:55 +0100

    Constantize a regexp in Dependencies#load_missing_constant

M	activesupport/lib/active_support/dependencies.rb

commit bfc0b32	refs/tags/v3.1.0.rc6
Merge: e83250a f44f412
Author: Santiago Pastorino 
Date:   2011-07-26 08:08:12 -0700

    Merge pull request #2278 from dmathieu/fix_actionpack_3-1
    
    Fix actionpack 3 1

commit f44f412	refs/tags/v3.1.0.rc6
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-26 16:58:24 +0200

    use sprocket's append_path and assert_match

M	actionpack/test/template/sprockets_helper_test.rb

commit bdbf97c	refs/heads/master
Merge: 14c6fca 945f0c8
Author: José Valim 
Date:   2011-07-26 08:02:45 -0700

    Merge pull request #2277 from dmathieu/fix_actionpack_tests
    
    Fix actionpack's test suite

commit 945f0c8	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-26 16:58:24 +0200

    use sprocket's append_path and assert_match

M	actionpack/test/template/sprockets_helper_test.rb

commit 14c6fca	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-07-26 16:12:17 +0200

    Revert "allow select to have multiple arguments"
    
    This reverts commit 04cc446d178653d362510e79a22db5300d463161.
    
    I reverted it because apparently we want to use: select([:a, :b])
    instead of select(:a, :b), but there was no tests for that form.

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/base_test.rb

commit fa159d3	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-26 19:35:16 +0530

    move the note after the scaffold files listing

M	railties/guides/source/getting_started.textile

commit 89f3d8a	refs/heads/master
Merge: cfd086a 04cc446
Author: Piotr Sarnacki 
Date:   2011-07-26 06:33:54 -0700

    Merge pull request #2271 from slawosz/enhance_select_method_api
    
    allow select to have multiple arguments ie. Post.select(:id,:name,:author)

commit cfd086a	refs/heads/master
Merge: b4e5779 41902e6
Author: Santiago Pastorino 
Date:   2011-07-26 06:25:05 -0700

    Merge pull request #2272 from cesario/fix_relations_test
    
    Simplify the test by using id and name.

commit 04cc446	refs/heads/master
Author: Sławosz Sławiński 
Date:   2011-07-23 21:35:16 +0200

    allow select to have multiple arguments

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/base_test.rb

commit 3bfcf5f	refs/heads/master
Author: thoefer 
Date:   2011-07-26 11:42:53 +0200

    refactored 'assert_redirected_to': local call to validate_request! will be called in assert_response already. changed names of local variables in order to recognize the semantics a bit easier.

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 41902e6	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-26 11:36:18 +0200

    Simplify the test by using id and name. `id` will be the only real sort criteria in any case as it's unique.

M	activerecord/test/cases/relations_test.rb

commit b4e5779	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 01:00:00 -0300

    use_sprockets is not used anymore

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit 155bb7c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 00:42:31 -0300

    Bump sprockets up

M	actionpack/actionpack.gemspec

commit 4d13e90	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-26 00:18:56 -0300

    Check that Rack::Sendfile is not included unless config.action_dispatch.x_sendfile_header is set

M	railties/test/application/middleware_test.rb

commit e83250a	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-26 00:18:56 -0300

    Check that Rack::Sendfile is not included unless config.action_dispatch.x_sendfile_header is set

M	railties/test/application/middleware_test.rb

commit 36ab1cd	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-25 23:02:12 -0300

    Bump rack up. Closes #2107

M	actionpack/actionpack.gemspec

commit ec2cac2	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-25 23:02:12 -0300

    Bump rack up. Closes #2107

M	actionpack/actionpack.gemspec

commit a518833	refs/tags/v3.1.0.rc5 (tag: v3.1.0.rc5)
Author: Aaron Patterson 
Date:   2011-07-25 16:03:01 -0700

    bumping to rc5

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 6dcdcdc	refs/tags/v3.1.0.rc5
Author: Aaron Patterson 
Date:   2011-07-25 16:00:54 -0700

    bumping up arel version

M	activerecord/activerecord.gemspec

commit 647eeb1	refs/heads/master
Merge: cb85d70 c172543
Author: José Valim 
Date:   2011-07-25 15:51:43 -0700

    Merge pull request #2262 from sferik/format_true
    
    Allow a route to have :format => true

commit 64cb34d	refs/tags/v3.1.0.rc5
Author: Aaron Patterson 
Date:   2011-07-25 10:53:58 -0700

    updating sprockets to beta 12

M	actionpack/actionpack.gemspec

commit cb02d10	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-25 15:10:13 -0700

    sync the getting started guide with master

M	railties/guides/source/getting_started.textile

commit cb85d70	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-25 19:06:30 -0300

    Remove unused use_sprockets config

M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/sprockets/railtie.rb

commit 0018402	refs/tags/v3.1.0.rc5
Author: Santiago Pastorino 
Date:   2011-07-25 19:06:30 -0300

    Remove unused use_sprockets config

M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/sprockets/railtie.rb

commit ecd4f0b	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-25 18:54:25 -0300

    Don't use Rack::Sendfile middleware if x_sendfile_header is not present

M	railties/lib/rails/application.rb

commit e10dd20	refs/tags/v3.1.0.rc5
Author: Santiago Pastorino 
Date:   2011-07-25 18:54:25 -0300

    Don't use Rack::Sendfile middleware if x_sendfile_header is not present

M	railties/lib/rails/application.rb

commit 81789b7	refs/tags/v3.1.0.rc5
Author: Xavier Noria 
Date:   2011-07-25 14:12:12 -0700

    let TIP and friends handle a multiline paragraph
    
    Normally I would have done this in master, but there was already
    a guide with wrapped content, so worked here. I am going to
    cross-merge now.

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit ba19ddf	refs/tags/v3.1.0.rc5
Author: Vijay Dev 
Date:   2011-07-25 17:39:17 +0530

    Revert "Add in a tip about opening two command prompt windows"
    
    This reverts commit 1e5fa59d132562399536a3ca06295b60558bc258.
    
    Reason: It's somewhat a grey area. We don't really want to tell the
    users how they want to use the terminal.

M	railties/guides/source/getting_started.textile

commit ebb4540	refs/tags/v3.1.0.rc5
Author: Vijay Dev 
Date:   2011-07-25 17:37:01 +0530

    Revert "Update the TIP formatter to handle multiline tips"
    
    This reverts commit e3dbe66e196069fde7d3ff118bd25a03184915fa.
    
    Reason: Code changes are not allowed in docrails.

M	railties/guides/rails_guides/textile_extensions.rb
D	railties/test/guides/textile_extionsions_test.rb

commit b3c06a2	refs/tags/v3.1.0.rc5
Author: Elliot Winkler 
Date:   2011-07-24 17:08:09 -0600

    Improve ch. 1 of the Form Helpers guide

M	railties/guides/source/form_helpers.textile

commit d4e8479	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:37:18 -0600

    Add in a tip about opening two command prompt windows

M	railties/guides/source/getting_started.textile

commit 4eb030e	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:36:50 -0600

    Fix two spaces after end of sentence.

M	railties/guides/source/getting_started.textile

commit 0405394	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:28:57 -0600

    Extend description of rails generate scaffold and what it's options accomplish

M	railties/guides/source/getting_started.textile

commit 75e0406	refs/tags/v3.1.0.rc5
Author: Michael Lavrisha 
Date:   2011-07-24 16:17:40 -0600

    Update the TIP formatter to handle multiline tips
    
    - includes 3 tests

M	railties/guides/rails_guides/textile_extensions.rb
A	railties/test/guides/textile_extionsions_test.rb

commit 8fe7fda	refs/tags/v3.1.0.rc5
Author: Mike Howard 
Date:   2011-07-24 16:09:38 -0600

    Updated migrations.textile to clarify Using Models in Your Migrations
    
    Rewrote entire section including example code, error message, and work
    around.

M	railties/guides/source/migrations.textile

commit 9e34a41	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:07:41 -0600

    Make the rails not found tip more explanatory.

M	railties/guides/source/getting_started.textile

commit e737b76	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:01:51 -0600

    Updated rails_welcome.png to latest Rails welcome page.

M	railties/guides/assets/images/rails_welcome.png

commit b2fc1e8	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 15:39:22 -0600

    Update wording of TIP about --database option for rails new

M	railties/guides/source/getting_started.textile

commit 41c024d	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 15:33:59 -0600

    Remove "bundle install" section, as rails new ______ runs bundle install for you

M	railties/guides/source/getting_started.textile

commit 12faf80	refs/tags/v3.1.0.rc5
Author: John 
Date:   2011-07-24 17:04:52 -0400

    Fixed Typo

M	activerecord/lib/active_record/persistence.rb

commit 290849c	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 15:04:12 -0600

    Fix TIP formatting issue

M	railties/guides/source/getting_started.textile

commit d80ac95	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 14:51:48 -0600

    Add a note about the fact that the Windows prompt will look different than the linux/osx prompt

M	railties/guides/source/getting_started.textile

commit be584c4	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 14:37:24 -0600

    Reformatted to 80 chars.

M	railties/guides/source/getting_started.textile

commit ceee7ce	refs/tags/v3.1.0.rc5
Author: Michael Lavrisha 
Date:   2011-07-24 14:34:34 -0600

    Rewrite apart of the REST section to be in the present tense
    
    Conflicts:
    
    	railties/guides/source/getting_started.textile

M	railties/guides/source/getting_started.textile

commit 5d7343f	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 14:04:43 -0600

    Wrapped text content to 120 chars

M	railties/guides/source/getting_started.textile

commit 3cbf9a6	refs/tags/v3.1.0.rc5
Author: Michael Lavrisha 
Date:   2011-07-24 13:59:52 -0600

    Provide consistant indentation for the example code

M	railties/guides/source/api_documentation_guidelines.textile

commit d4832f1	refs/tags/v3.1.0.rc5
Author: Ben Marini 
Date:   2011-07-24 12:13:23 -0700

    Fix example code for #validates_with instance method

M	activemodel/lib/active_model/validations/with.rb

commit 703d0e0	refs/heads/master
Merge: 8e00611 598eab9
Author: Xavier Noria 
Date:   2011-07-25 14:20:01 -0700

    Merge branch 'master' of git://github.com/lifo/docrails

commit c172543	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-07-25 14:13:26 -0700

    Add documentation for :format => true

M	railties/guides/source/routing.textile

commit 598eab9	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-25 14:12:12 -0700

    let TIP and friends handle a multiline paragraph
    
    Normally I would have done this in master, but there was already
    a guide with wrapped content, so worked here. I am going to
    cross-merge now.

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit 19a3c9b	refs/tags/v3.1.0.rc5
Merge: 05503f1 78d151d
Author: José Valim 
Date:   2011-07-25 13:44:59 -0700

    Merge pull request #2263 from sferik/format_true
    
    Allow a route to have :format => true

commit bf81207	refs/heads/master
Author: Grant Hutchins & Peter Jaros 
Date:   2011-07-08 17:54:15 -0400

    Let ActiveModel instances define partial paths.
    
    Deprecate ActiveModel::Name#partial_path. Now you
    should call #to_path directly on ActiveModel
    instances.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/render_test.rb
M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/lint.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/conversion_test.rb
M	activemodel/test/cases/naming_test.rb
A	activemodel/test/models/helicopter.rb

commit 78d151d	refs/tags/v3.1.0.rc5
Author: Erik Michaels-Ober 
Date:   2011-07-25 12:28:44 -0700

    Add documentation for :format => true

M	railties/guides/source/routing.textile

commit c41ecd7	refs/tags/v3.1.0.rc5
Author: Erik Michaels-Ober 
Date:   2011-07-25 11:46:52 -0700

    Allow a route to have :format => true
    
    When format is true, it is mandatory (as opposed to :format => false).
    This is currently not possible with resource routes, which automatically
    make format optional by default.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/mapper_test.rb

commit b9c9142	refs/heads/master
Author: Erik Michaels-Ober 
Date:   2011-07-25 11:37:25 -0700

    Allow a route to have :format => true
    
    When format is true, it is mandatory (as opposed to :format => false).
    This is currently not possible with resource routes, which automatically
    make format optional by default.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/mapper_test.rb

commit 50ca6f0	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-25 23:41:28 +0530

    Revert "aligment issues fixed"
    
    This reverts commit 6f29b356c1e8cb73d8a696a393450a9ce4eeda57.
    
    Reason: Changelogs are not meant to be changed in docrails.

M	activesupport/CHANGELOG

commit 6f29b35	refs/heads/master
Author: JudeArasu 
Date:   2011-07-25 23:26:36 +0530

    aligment issues fixed

M	activesupport/CHANGELOG

commit 05503f1	refs/tags/v3.1.0.rc5
Merge: 5bc0020 8a55108
Author: Santiago Pastorino 
Date:   2011-07-25 10:50:16 -0700

    Merge pull request #2260 from davidtrogers/3-1-stable
    
    3 1 stable

commit 8a55108	refs/tags/v3.1.0.rc5
Author: Dave Rogers 
Date:   2011-07-24 17:21:26 -0700

    Ensure the constraints block is only applied to the correct route
    addresses issue #1907 - any routes that follow a route with a constraints
      block are inheriting the previous route's constraints.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 8e00611	refs/heads/master
Merge: 4605b56 4dc42f5
Author: Santiago Pastorino 
Date:   2011-07-25 10:32:31 -0700

    Merge pull request #2245 from davidtrogers/constraints_block_passed_to_following_routes_in_same_scope
    
    Memoizing @blocks & disposing of constraints options properly

commit 4dc42f5	refs/heads/master
Author: Dave Rogers 
Date:   2011-07-24 17:21:26 -0700

    Ensure the constraints block is only applied to the correct route
    addresses issue #1907 - any routes that follow a route with a constraints
      block are inheriting the previous route's constraints.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 4605b56	refs/heads/master
Author: Glenn Gillen 
Date:   2011-07-25 10:21:56 +0100

    Simplify the way default DATABASE_URL works.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

commit 36fd3fd	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-23 20:59:54 -0700

    no need for an anonymous class on every setup call

M	actionpack/test/template/sprockets_helper_test.rb

commit b033a24	refs/heads/master
Merge: 64affc9 624b118
Author: José Valim 
Date:   2011-07-25 08:13:21 -0700

    Merge pull request #2258 from thedarkone/no-file-stat
    
    Use shorter class-level File methods instead of going through File.stat

commit 624b118	refs/heads/master
Author: thedarkone 
Date:   2011-07-25 17:01:30 +0200

    Use shorter class-level File methods instead of going through File.stat.

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	activesupport/lib/active_support/file_update_checker.rb
M	railties/lib/rails/code_statistics.rb

commit 5bc0020	refs/tags/v3.1.0.rc5
Merge: 1d97a7c 787194e
Author: Santiago Pastorino 
Date:   2011-07-25 07:21:08 -0700

    Merge pull request #2257 from thedarkone/udpate-all-order-3-1
    
    Backport #2251 into 3-1-stable

commit 64affc9	refs/heads/master
Merge: 14c0f0e f5e4d13
Author: Santiago Pastorino 
Date:   2011-07-25 07:20:38 -0700

    Merge pull request #2236 from cldwalker/after_initialize
    
    Fix after_initialize and Base.create edge case

commit 787194e	refs/tags/v3.1.0.rc5
Author: thedarkone 
Date:   2011-07-25 13:30:43 +0200

    Bring back the ability to provide :order for update_all.

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/persistence_test.rb

commit 1d97a7c	refs/tags/v3.1.0.rc5
Merge: 46141eb 9395e89
Author: José Valim 
Date:   2011-07-25 06:56:41 -0700

    Merge pull request #2256 from thedarkone/polymorphic-url-helper-3-1
    
    Backport #2252 into 3-1-stable

commit 14c0f0e	refs/heads/master
Merge: 451f63b 3348ea6
Author: José Valim 
Date:   2011-07-25 06:52:40 -0700

    Merge pull request #2254 from dmathieu/test_name
    
    provide more explicit test names

commit 56c663b	refs/tags/v3.0.14
Merge: eead13f edfcf47
Author: Santiago Pastorino 
Date:   2011-07-25 06:52:18 -0700

    Merge pull request #2249 from arunagw/rake_template_path_fix
    
    Rake template path fix

commit 9395e89	refs/tags/v3.1.0.rc5
Author: thedarkone 
Date:   2011-06-06 14:13:06 +0200

    Make polymorphic_url calls go through application helpers again.
    
    This brings back the ability to overwrite/extend url generating methods in application heleprs.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/dispatch/prefix_generation_test.rb
M	actionpack/test/template/test_test.rb
M	railties/test/railties/mounted_engine_test.rb

commit 3348ea6	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-25 15:25:22 +0200

    provide more explicit test names

M	railties/test/application/assets_test.rb

commit 451f63b	refs/heads/master
Merge: a850cf7 07c9ff0
Author: José Valim 
Date:   2011-07-25 05:36:00 -0700

    Merge pull request #2247 from dmathieu/test_precompile_caching
    
    Add test checking that precompiling assets performs caching

commit 46141eb	refs/tags/v3.1.0.rc5
Merge: 4b1b9ac 7fd726d
Author: José Valim 
Date:   2011-07-25 05:32:06 -0700

    Merge pull request #2253 from dchelimsky/stringify-parameter-values-in-tests-branched-off-3-1-stable
    
    Stringify parameter values in tests branched off 3-1-stable

commit 7fd726d	refs/tags/v3.1.0.rc5
Author: David Chelimsky 
Date:   2011-07-25 07:19:17 -0500

    Paramify param values in controller tests.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit 203a85f	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-25 17:39:17 +0530

    Revert "Add in a tip about opening two command prompt windows"
    
    This reverts commit 1e5fa59d132562399536a3ca06295b60558bc258.
    
    Reason: It's somewhat a grey area. We don't really want to tell the
    users how they want to use the terminal.

M	railties/guides/source/getting_started.textile

commit 60c505d	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-25 17:37:01 +0530

    Revert "Update the TIP formatter to handle multiline tips"
    
    This reverts commit e3dbe66e196069fde7d3ff118bd25a03184915fa.
    
    Reason: Code changes are not allowed in docrails.

M	railties/guides/rails_guides/textile_extensions.rb
D	railties/test/guides/textile_extionsions_test.rb

commit a850cf7	refs/heads/master
Merge: dffd920 1086358
Author: José Valim 
Date:   2011-07-25 05:03:28 -0700

    Merge pull request #2251 from thedarkone/update-all-order
    
    Bring back the ability to provide :order for update_all

commit dffd920	refs/heads/master
Merge: 02691d3 036f775
Author: José Valim 
Date:   2011-07-25 05:02:00 -0700

    Merge pull request #2252 from thedarkone/polymorphic-url-helpers
    
    Make polymorphic_url calls go through application helpers again.

commit 036f775	refs/heads/master
Author: thedarkone 
Date:   2011-06-06 14:13:06 +0200

    Make polymorphic_url calls go through application helpers again.
    
    This brings back the ability to overwrite/extend url generating methods in application heleprs.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/dispatch/prefix_generation_test.rb
M	actionpack/test/template/test_test.rb
M	railties/test/railties/mounted_engine_test.rb

commit 1086358	refs/heads/master
Author: thedarkone 
Date:   2011-07-25 13:30:43 +0200

    Bring back the ability to provide :order for update_all.

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/persistence_test.rb

commit edfcf47	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-07-25 16:13:10 +0530

    Fix rake rails:template to tell user to pass LOCATION variable.

M	railties/lib/rails/tasks/framework.rake

commit 07c9ff0	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-25 10:32:03 +0200

    add test checking that precompiling assets performs caching

M	railties/test/application/assets_test.rb

commit f330e6a	refs/heads/master
Author: Elliot Winkler 
Date:   2011-07-24 17:08:09 -0600

    Improve ch. 1 of the Form Helpers guide

M	railties/guides/source/form_helpers.textile

commit 1e5fa59	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:37:18 -0600

    Add in a tip about opening two command prompt windows

M	railties/guides/source/getting_started.textile

commit 0076a6f	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:36:50 -0600

    Fix two spaces after end of sentence.

M	railties/guides/source/getting_started.textile

commit 1ca4990	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:28:57 -0600

    Extend description of rails generate scaffold and what it's options accomplish

M	railties/guides/source/getting_started.textile

commit 62f865d	refs/heads/master
Merge: 5cece57 6734bc9
Author: Michael Lavrisha 
Date:   2011-07-24 16:36:52 -0600

    Merge branch 'master' of github.com:lifo/docrails

commit 5cece57	refs/heads/master
Author: Michael Lavrisha 
Date:   2011-07-24 16:36:23 -0600

    Simpler brief explanation of Rails and REST

M	railties/guides/source/getting_started.textile

commit e3dbe66	refs/heads/master
Author: Michael Lavrisha 
Date:   2011-07-24 16:17:40 -0600

    Update the TIP formatter to handle multiline tips
    
    - includes 3 tests

M	railties/guides/rails_guides/textile_extensions.rb
A	railties/test/guides/textile_extionsions_test.rb

commit 6734bc9	refs/heads/master
Author: Mike Howard 
Date:   2011-07-24 16:09:38 -0600

    Updated migrations.textile to clarify Using Models in Your Migrations
    
    Rewrote entire section including example code, error message, and work
    around.

M	railties/guides/source/migrations.textile

commit 2f7ea19	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:07:41 -0600

    Make the rails not found tip more explanatory.

M	railties/guides/source/getting_started.textile

commit 5ee349c	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 16:01:51 -0600

    Updated rails_welcome.png to latest Rails welcome page.

M	railties/guides/assets/images/rails_welcome.png

commit 02691d3	refs/heads/master
Merge: 1203451 77bb0b7
Author: Aaron Patterson 
Date:   2011-07-24 14:40:15 -0700

    Merge pull request #2238 from cesario/order-with-extra-spaces
    
    Ordering with extra spaces was raising a SQL exception

commit fe5cb7c	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 15:39:22 -0600

    Update wording of TIP about --database option for rails new

M	railties/guides/source/getting_started.textile

commit 715c128	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 15:33:59 -0600

    Remove "bundle install" section, as rails new ______ runs bundle install for you

M	railties/guides/source/getting_started.textile

commit dd8a485	refs/heads/master
Author: John 
Date:   2011-07-24 17:04:52 -0400

    Fixed Typo

M	activerecord/lib/active_record/persistence.rb

commit 72e06dc	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 15:04:12 -0600

    Fix TIP formatting issue

M	railties/guides/source/getting_started.textile

commit 1203451	refs/heads/master
Merge: 0599e16 ee56f7b
Author: Xavier Noria 
Date:   2011-07-24 14:02:36 -0700

    Merge pull request #2243 from dmathieu/comment
    
    Help the next guy with explanations - See bb3b3e306

commit e99a0b6	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 14:51:48 -0600

    Add a note about the fact that the Windows prompt will look different than the linux/osx prompt

M	railties/guides/source/getting_started.textile

commit 0599e16	refs/heads/master
Author: Andrew White 
Date:   2011-07-24 21:48:56 +0100

    Use top level Rails constant

M	actionpack/lib/sprockets/railtie.rb

commit 4b1b9ac	refs/tags/v3.1.0.rc5
Author: Andrew White 
Date:   2011-07-24 21:48:22 +0100

    Use top level Rails constant

M	actionpack/lib/sprockets/railtie.rb

commit 4b189bd	refs/heads/master
Merge: 073609f b084836
Author: Michael Lavrisha 
Date:   2011-07-24 14:40:18 -0600

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	railties/guides/source/getting_started.textile

commit b084836	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 14:37:24 -0600

    Reformatted to 80 chars.

M	railties/guides/source/getting_started.textile

commit 073609f	refs/heads/master
Merge: 06b59e3 3ba30e6
Author: Michael Lavrisha 
Date:   2011-07-24 14:37:22 -0600

    Merge branch 'master' of github.com:lifo/docrails
    
    Conflicts:
    	railties/guides/source/getting_started.textile

commit f5e4d13	refs/heads/master
Author: Gabriel Horner 
Date:   2011-07-24 16:36:06 -0400

    use existing model for testing Base.create with #after_initialize

M	activerecord/test/cases/base_test.rb
M	activerecord/test/models/bulb.rb
D	activerecord/test/models/wholesale_product.rb
M	activerecord/test/schema/schema.rb

commit 06b59e3	refs/heads/master
Author: Michael Lavrisha 
Date:   2011-07-24 14:34:34 -0600

    Rewrite apart of the REST section to be in the present tense

M	railties/guides/source/getting_started.textile

commit 3ba30e6	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 14:04:43 -0600

    Wrapped text content to 120 chars

M	railties/guides/source/getting_started.textile

commit 941fae2	refs/heads/master
Author: Michael Lavrisha 
Date:   2011-07-24 13:59:52 -0600

    Provide consistant indentation for the example code

M	railties/guides/source/api_documentation_guidelines.textile

commit c02288e	refs/heads/master
Author: Ben Marini 
Date:   2011-07-24 12:13:23 -0700

    Fix example code for #validates_with instance method

M	activemodel/lib/active_model/validations/with.rb

commit eea9ca8	refs/tags/v3.1.0.rc5
Author: Xavier Noria 
Date:   2011-07-24 21:01:53 +0200

    little details seen while reviewing

M	railties/guides/source/getting_started.textile

commit 6950561	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:50:23 -0600

    Moved ActionController, ActionView and ActionDispatch sections under ActionPack

M	railties/guides/source/getting_started.textile

commit 24cbee0	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:29:15 -0600

    Add link to the Layouts and Rendering guide to explain more on view templates

M	railties/guides/source/getting_started.textile

commit 27f4d73	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:24:00 -0600

    Modified the content based on vijaydev's comment
    
    https://github.com/lifo/docrails/commit/3eb99aab77c04dbd95dfc9f73e03a667f114914f#commitcomment-493737

M	railties/guides/source/getting_started.textile

commit 75f0298	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:14:06 -0600

    Update guide to be based on Rails 3.1.

M	railties/guides/source/getting_started.textile

commit 2d689d5	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:12:08 -0600

    Added link to the RubyGems User's Guide

M	railties/guides/source/getting_started.textile

commit d62e846	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:04:21 -0600

    Added explanation to Components of Rails to help users not get hung up on details

M	railties/guides/source/getting_started.textile

commit b14b643	refs/tags/v3.1.0.rc5
Author: Ken Ip 
Date:   2011-07-24 14:12:15 -0400

    Update "Getting Started" for Rails 3.1
    
    Add additional files generated by rails 3.1 generator.

M	railties/guides/source/getting_started.textile

commit fa0751a	refs/tags/v3.1.0.rc5
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 11:42:15 -0600

    Added some context for rack apps, linked to the Rails on Rack guide.

M	railties/guides/source/getting_started.textile

commit f53c7fb	refs/tags/v3.1.0.rc5
Author: Mike Howard 
Date:   2011-07-24 11:35:51 -0600

    Clarified notes in 3.2 Creating the Blog Application
    
    Changed descriptino of Gemfile to add reference to Bundler
    Changed description of README to add 'You should edit ...'
    Changed description of Rakefile to reflect dynamic nature of Rakefile
    and point to app/lib/tasks/ as the place to add app-specific rake tasks.

M	railties/guides/source/getting_started.textile

commit 998a3ef	refs/tags/v3.1.0.rc5
Author: Mike Howard 
Date:   2011-07-24 10:54:19 -0600

    Changed wording of paragraph 2.1.1 Models to clarify table/model
    relationship.
    
    changed wording 'one table ... corresponds to one model' to 'each table
    ...'

M	railties/guides/source/getting_started.textile

commit d9b6f89	refs/tags/v3.1.0.rc5
Author: Xavier Noria 
Date:   2011-07-24 11:40:06 +0200

    Revert "Tests now require MySQL2 adapter in order to run"
    
    Reason: Setting up MySQL and Postgres needs installing servers
    and libraries that perhaps you don't need in your machine. We
    think fixing a bug in Active Support without running the suite
    of Active Record for all possible drivers is OK. That's why
    we explain first --without db, and after that we cover AR
    specifically. mysql2 is no different than mysql or pg in that
    sense.
    
    This reverts commit 50d5e0f7e8ab01f3e7b5cf806eb4f9348eeff363.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 2793bcd	refs/tags/v3.1.0.rc5
Author: Oemuer Oezkir 
Date:   2011-07-24 10:40:40 +0000

    Missed a few instances of British English spelling in the last commit
    oh and obviously I meant according to Webster, not Weber

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb

commit 8b30f1d	refs/tags/v3.1.0.rc5
Author: Oemuer Oezkir 
Date:   2011-07-24 10:21:42 +0000

    Changed a few instances of of words in the API docs written in British English to
    American English(according to Weber)
    
    Conflicts:
    
    	actionpack/lib/action_controller/metal/request_forgery_protection.rb
    	railties/lib/rails/engine.rb

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/http_mock.rb
M	activesupport/lib/active_support/core_ext/string/multibyte.rb
M	activesupport/lib/active_support/deprecation/behaviors.rb
M	railties/lib/rails.rb
M	railties/lib/rails/engine.rb

commit 582a621	refs/tags/v3.1.0.rc5
Author: Carol Nichols 
Date:   2011-07-23 15:20:39 -0400

    Changing Textile emphasis underscores to em tags; the link with underscores that follows is causing the emphasis underscores to be parsed incorrectly.
    
    This appears to be a bug with RedCloth; parsing with official Textile creates the HTML that I expect. I have filed ticket # 226 on RedCloth's lighthouse project and I will attempt to fix the problem with RedCloth.
    
    This commit is a workaround for the RedCloth bug that will give this guide the right formatting.

M	railties/guides/source/api_documentation_guidelines.textile

commit e593f8c	refs/tags/v3.1.0.rc5
Author: Evan Farrar 
Date:   2011-07-23 13:57:56 -0400

    Changed several instances of British English to be American English

M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/association_basics.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/layouts_and_rendering.textile

commit 505a43b	refs/tags/v3.1.0.rc5
Author: Evan Farrar 
Date:   2011-07-23 12:23:44 -0400

    Replaced ‘ with ' in the guides.

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/security.textile

commit 9a16cc0	refs/tags/v3.1.0.rc5
Author: Joe Fiorini 
Date:   2011-07-23 11:28:49 -0400

    Tests now require MySQL2 adapter in order to run

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit fdc0468	refs/tags/v3.1.0.rc5
Author: gnagno 
Date:   2011-07-23 08:26:18 -0700

    now the documentation reflects the actual returned value for a missing translation

M	actionpack/lib/action_view/helpers/translation_helper.rb

commit 4bb0a8b	refs/heads/master
Merge: 97716e6 0626668
Author: Xavier Noria 
Date:   2011-07-24 21:02:51 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 0626668	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-24 21:01:53 +0200

    little details seen while reviewing

M	railties/guides/source/getting_started.textile

commit ee56f7b	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-24 20:52:08 +0200

    help the next guy with explanations - See bb3b3e306

M	actionpack/lib/sprockets/assets.rake

commit 48e85d8	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:50:23 -0600

    Moved ActionController, ActionView and ActionDispatch sections under ActionPack

M	railties/guides/source/getting_started.textile

commit 5e8263b	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:29:15 -0600

    Add link to the Layouts and Rendering guide to explain more on view templates

M	railties/guides/source/getting_started.textile

commit f04725f	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:24:00 -0600

    Modified the content based on vijaydev's comment
    
    https://github.com/lifo/docrails/commit/3eb99aab77c04dbd95dfc9f73e03a667f114914f#commitcomment-493737

M	railties/guides/source/getting_started.textile

commit 8e44ff6	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:14:06 -0600

    Update guide to be based on Rails 3.1.

M	railties/guides/source/getting_started.textile

commit 25bcca1	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:12:08 -0600

    Added link to the RubyGems User's Guide

M	railties/guides/source/getting_started.textile

commit bb746e3	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 12:04:21 -0600

    Added explanation to Components of Rails to help users not get hung up on details

M	railties/guides/source/getting_started.textile

commit 12955a3	refs/heads/master
Merge: ce66fc0 3eb99aa
Author: Ken Ip 
Date:   2011-07-24 14:13:06 -0400

    Merge branch 'master' of https://github.com/lifo/docrails

commit ce66fc0	refs/heads/master
Author: Ken Ip 
Date:   2011-07-24 14:12:15 -0400

    Update "Getting Started" for Rails 3.1
    
    Add additional files generated by rails 3.1 generator.

M	railties/guides/source/getting_started.textile

commit 3eb99aa	refs/heads/master
Author: Jason Noble & Ralph Shnelvar 
Date:   2011-07-24 11:42:15 -0600

    Added some context for rack apps, linked to the Rails on Rack guide.

M	railties/guides/source/getting_started.textile

commit 5712e7a	refs/heads/master
Author: Mike Howard 
Date:   2011-07-24 11:35:51 -0600

    Clarified notes in 3.2 Creating the Blog Application
    
    Changed descriptino of Gemfile to add reference to Bundler
    Changed description of README to add 'You should edit ...'
    Changed description of Rakefile to reflect dynamic nature of Rakefile
    and point to app/lib/tasks/ as the place to add app-specific rake tasks.

M	railties/guides/source/getting_started.textile

commit 25850d1	refs/heads/master
Author: Mike Howard 
Date:   2011-07-24 10:54:19 -0600

    Changed wording of paragraph 2.1.1 Models to clarify table/model
    relationship.
    
    changed wording 'one table ... corresponds to one model' to 'each table
    ...'

M	railties/guides/source/getting_started.textile

commit 97716e6	refs/heads/master
Merge: 8a9cacb 2c90568
Author: Santiago Pastorino 
Date:   2011-07-24 08:20:17 -0700

    Merge pull request #1186 from mitijain123/duplicable_test
    
    Duplicable test is looking fine now.

commit 2c90568	refs/heads/master
Author: Mitesh Jain 
Date:   2011-05-21 17:57:48 +0530

    Duplicable test is looking fine now.

M	activesupport/test/core_ext/duplicable_test.rb

commit 8a9cacb	refs/heads/master
Merge: d33eb07 fe37b48
Author: Santiago Pastorino 
Date:   2011-07-24 06:55:25 -0700

    Merge pull request #2239 from castlerock/scaffold_jquery
    
    fixing broken test as jquery-rails is included in application.js

commit fe37b48	refs/heads/master
Author: Mitesh Jain 
Date:   2011-07-24 14:27:59 +0530

    Bringing back the jquery-rails. One test is dependent.

M	Gemfile

commit 3665ffd	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-24 11:40:06 +0200

    Revert "Tests now require MySQL2 adapter in order to run"
    
    Reason: Setting up MySQL and Postgres needs installing servers
    and libraries that perhaps you don't need in your machine. We
    think fixing a bug in Active Support without running the suite
    of Active Record for all possible drivers is OK. That's why
    we explain first --without db, and after that we cover AR
    specifically. mysql2 is no different than mysql or pg in that
    sense.
    
    This reverts commit 50d5e0f7e8ab01f3e7b5cf806eb4f9348eeff363.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit ee5cfdf	refs/heads/master
Author: Oemuer Oezkir 
Date:   2011-07-24 10:40:40 +0000

    Missed a few instances of British English spelling in the last commit
    oh and obviously I meant according to Webster, not Weber

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb

commit 71d18ce	refs/heads/master
Author: Oemuer Oezkir 
Date:   2011-07-24 10:21:42 +0000

    Changed a few instances of of words in the API docs written in British English to
    American English(according to Weber)

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/http_mock.rb
M	activesupport/lib/active_support/core_ext/string/multibyte.rb
M	activesupport/lib/active_support/deprecation/behaviors.rb
M	railties/lib/rails.rb
M	railties/lib/rails/engine.rb

commit eead13f	refs/tags/v3.0.14
Merge: 19d9689 39a4f67
Author: Santiago Pastorino 
Date:   2011-07-23 23:40:54 -0700

    Merge pull request #2080 from lhahne/3-0-stable
    
    Fix improper detection and handling of html_safe buffer in CacheHelper

commit b2eaf96	refs/tags/v3.1.0.rc6
Merge: 5b88219 fb6a76c
Author: Santiago Pastorino 
Date:   2011-07-23 23:30:47 -0700

    Merge pull request #2235 from arunagw/location_var_fix_cherry-pick
    
    Location var fix cherry pick from master to 3-1-stable

commit 77bb0b7	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-24 08:17:36 +0200

    Ordering with extra spaces was raising a SQL exception

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit fb6a76c	refs/tags/v3.1.0.rc6
Author: Raghunadh 
Date:   2011-07-23 14:37:25 +0530

    Improve rails:template undefined LOCATION variable error message fixed

M	railties/lib/rails/tasks/framework.rake

commit 6e3c0a5	refs/heads/master
Author: Gabriel Horner 
Date:   2011-07-22 18:43:27 -0400

    simplify and be more explicit about create and after_initialize tests

M	activerecord/test/cases/base_test.rb
M	activerecord/test/models/wholesale_product.rb

commit f956759	refs/heads/master
Author: Les Fletcher 
Date:   2011-07-21 01:36:02 -0700

    fix after_initialize edge case (close #2074 and close #2175)
    
    fix behavior when after_initialize is defined and a block is passed to Base.create

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
A	activerecord/test/models/wholesale_product.rb
M	activerecord/test/schema/schema.rb

commit d33eb07	refs/heads/master
Merge: d89a33d dc1b0fd
Author: Aaron Patterson 
Date:   2011-07-23 21:00:11 -0700

    Merge pull request #2233 from gramos/fix-issue-1951-master
    
    Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers

commit 5b88219	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-23 20:55:22 -0700

    just use normal ruby for stubbing

M	actionpack/test/template/sprockets_helper_test.rb

commit d89a33d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-23 20:55:22 -0700

    just use normal ruby for stubbing

M	actionpack/test/template/sprockets_helper_test.rb

commit dc1b0fd	refs/heads/master
Author: Gaston Ramos 
Date:   2011-07-23 20:49:16 -0300

    - added ActionView::PartialRenderer#merge_path_into_partial(path, partial)
      fix issues/1951

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/controller/render_test.rb

commit 7621d13	refs/heads/master
Author: Gaston Ramos 
Date:   2011-07-23 20:46:06 -0300

    - added test case for issue:
      https://github.com/rails/rails/issues/1951
      Namespaced model partial_path is wrong in namespaced controllers

M	actionpack/test/controller/render_test.rb

commit a14f456	refs/heads/master
Merge: 9327b4d 1efd882
Author: Aaron Patterson 
Date:   2011-07-23 20:51:43 -0700

    Merge pull request #2185 from castlerock/lazy_load_abstract_adapter
    
    lazy load ConnectionAdapters remove require.

commit 7f7ed15	refs/tags/v3.1.0.rc6
Merge: dbca49b 8d0e3c9
Author: Aaron Patterson 
Date:   2011-07-23 20:48:54 -0700

    Merge pull request #2229 from gramos/fix-issue-1951
    
    Fix issue 1951 Namespaced model partial_path is wrong in namespaced controllers

commit dbca49b	refs/tags/v3.1.0.rc6
Author: Ben Woosley 
Date:   2011-07-23 17:31:48 -0700

    Simple fix to the NoMethodError noted in #2177.
    
    Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 9327b4d	refs/heads/master
Merge: cdc4274 1f89898
Author: Aaron Patterson 
Date:   2011-07-23 20:40:12 -0700

    Merge pull request #2228 from Empact/helper_tags_in_mailers
    
    Simple fix to the NoMethodError noted in #2177.

commit 8d0e3c9	refs/tags/v3.1.0.rc6
Author: Gaston Ramos 
Date:   2011-07-23 20:49:16 -0300

    - added ActionView::PartialRenderer#merge_path_into_partial(path, partial)
      fix issues/1951

M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/test/controller/render_test.rb

commit be48abb	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-23 20:02:03 -0700

    simplify singleton_class? method

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit cdc4274	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-23 20:02:03 -0700

    simplify singleton_class? method

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 038e493	refs/tags/v3.1.0.rc6
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-24 01:32:14 +0200

    rake assets:precompile should always perform caching - Closes #2199

M	actionpack/lib/sprockets/assets.rake

commit 06c52d6	refs/heads/master
Merge: 410e754 bb3b3e3
Author: Aaron Patterson 
Date:   2011-07-23 17:50:43 -0700

    Merge pull request #2226 from dmathieu/perform_caching
    
    rake assets:precompile should always perform caching - Closes #2199

commit 1f89898	refs/heads/master
Author: Ben Woosley 
Date:   2011-07-23 17:31:48 -0700

    Simple fix to the NoMethodError noted in #2177.
    
    Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 434bbb0	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-23 20:49:42 -0300

    Revert "Merge pull request #2194 from cldwalker/after_initialize"
    
    This reverts commit 198300727de9cfae0e6b027c75aefc2488e19460, reversing
    changes made to ae65c0b7a41e011b1d808b547a3d2b6486eb44c5.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
D	activerecord/test/models/wholesale_product.rb
M	activerecord/test/schema/schema.rb

commit 1f3f9f1	refs/tags/v3.1.0.rc6
Author: Gaston Ramos 
Date:   2011-07-23 20:46:06 -0300

    - added test case for issue:
      https://github.com/rails/rails/issues/1951
      Namespaced model partial_path is wrong in namespaced controllers

M	actionpack/test/controller/render_test.rb

commit bb3b3e3	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-24 01:32:14 +0200

    rake assets:precompile should always perform caching - Closes #2199

M	actionpack/lib/sprockets/assets.rake

commit 1983007	refs/tags/v3.1.0.rc6
Merge: ae65c0b 06c6252
Author: Santiago Pastorino 
Date:   2011-07-23 16:19:33 -0700

    Merge pull request #2194 from cldwalker/after_initialize
    
    Fix after_initialize and Base.create edge case

commit 8ae7008	refs/heads/master
Author: Dieter Komendera 
Date:   2011-07-19 17:02:22 +0200

    Fix fragment cache helper regression on cache miss introduced with 03d01ec7.
    
    Contains following patches cherry-picked from @lhahne's 3-0-stable branch:
    
    * Added tests for the output_buffer returned by CacheHelper (c476a6b)
    The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.
    
    * made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)

M	actionpack/lib/action_view/helpers/cache_helper.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/fixtures/functional_caching/fragment_cached.html.erb

commit 410e754	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-23 18:38:42 -0300

    Remove unused gems from Gemfile

M	Gemfile

commit ae65c0b	refs/tags/v3.1.0.rc6
Author: Santiago Pastorino 
Date:   2011-07-23 18:35:17 -0300

    Remove jquery-rails from Gemfile

M	Gemfile

commit e178fcb	refs/heads/master
Merge: c3346b3 49b0f9e
Author: Santiago Pastorino 
Date:   2011-07-23 14:05:15 -0700

    Merge pull request #2221 from grzuy/master
    
    Fix ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname

commit 49b0f9e	refs/heads/master
Author: Gonzalo Rodriguez 
Date:   2011-07-23 17:57:04 -0300

    Fix ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname
    
    Port from 3-1-stable

M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/test/caching_test.rb

commit f41a98e	refs/tags/v3.1.0.rc6
Merge: b2285ba 15c8bf1
Author: Santiago Pastorino 
Date:   2011-07-23 13:50:34 -0700

    Merge pull request #2219 from kommen/fix_fragment_caching_squashed
    
    Fix fragment caching (squashed commits)

commit 15c8bf1	refs/tags/v3.1.0.rc6
Author: Dieter Komendera 
Date:   2011-07-19 17:02:22 +0200

    Fix fragment cache helper regression on cache miss introduced with 03d01ec7.
    
    Contains following patches cherry-picked from @lhahne's 3-0-stable branch:
    
    * Added tests for the output_buffer returned by CacheHelper (c476a6b)
    The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.
    
    * made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)

M	actionpack/lib/action_view/helpers/cache_helper.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/fixtures/functional_caching/fragment_cached.html.erb

commit c3346b3	refs/heads/master
Merge: abe6105 3fe32c3
Author: Aaron Patterson 
Date:   2011-07-23 13:24:24 -0700

    Merge pull request #2218 from guilleiguaran/avoid-map-chaining
    
    Remove unneccesary map chaining

commit 3fe32c3	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-07-23 15:21:39 -0500

    Remove unneccesary map chaining

M	activesupport/lib/active_support/ordered_hash.rb

commit b2285ba	refs/tags/v3.1.0.rc6
Author: Aaron Patterson 
Date:   2011-07-23 13:10:25 -0700

    remove unused gems from Gemfile

M	Gemfile

commit abe6105	refs/heads/master
Merge: 2115068 f061ffd
Author: Aaron Patterson 
Date:   2011-07-23 13:05:12 -0700

    Merge pull request #2217 from marcandre/fix_enumerable
    
    Fix enumerable

commit f061ffd	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-07-23 15:41:55 -0400

    Trivial optimization for Enumerable#each_with_object

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit 816abec	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-07-23 15:41:36 -0400

    Insure that Enumerable#index_by, group_by, ... return Enumerators

M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/test/core_ext/enumerable_test.rb

commit c785038	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-07-23 15:40:58 -0400

    Make Enumerable#many? iterate only over what is necessary

M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/test/core_ext/enumerable_test.rb

commit a96e824	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-07-23 15:38:55 -0400

    Make Enumerable#many? not rely on #size

M	activesupport/lib/active_support/core_ext/enumerable.rb
M	activesupport/test/core_ext/enumerable_test.rb

commit f6ac022	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-07-23 15:32:24 -0400

    Test using generic Enumerables instead of arrays.

M	activesupport/test/core_ext/enumerable_test.rb

commit 0b5386f	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-07-23 15:31:56 -0400

    Make tests more precise

M	activesupport/test/core_ext/enumerable_test.rb

commit c4ba1af	refs/tags/v3.1.1.rc1
Author: Aaron Kalin 
Date:   2011-07-23 14:49:33 -0500

    Remove leading whitespace for optional requires

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 9b9cf92	refs/heads/master
Author: Carol Nichols 
Date:   2011-07-23 15:20:39 -0400

    Changing Textile emphasis underscores to em tags; the link with underscores that follows is causing the emphasis underscores to be parsed incorrectly.
    
    This appears to be a bug with RedCloth; parsing with official Textile creates the HTML that I expect. I have filed ticket # 226 on RedCloth's lighthouse project and I will attempt to fix the problem with RedCloth.
    
    This commit is a workaround for the RedCloth bug that will give this guide the right formatting.

M	railties/guides/source/api_documentation_guidelines.textile

commit 66610db	refs/tags/v3.1.0.rc6
Merge: 0988da6 48e134b
Author: Santiago Pastorino 
Date:   2011-07-23 11:38:45 -0700

    Merge pull request #2213 from grzuy/3-1-stable
    
    ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname

commit 2115068	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-23 20:31:41 +0200

    registers the recent change to date multiparameter handling in the CHANGELOG

M	activerecord/CHANGELOG

commit a62f450	refs/heads/master
Merge: 35c87a1 9cd1f75
Author: Xavier Noria 
Date:   2011-07-23 11:20:12 -0700

    Merge pull request #2086 from amatsuda/date_multiparameter_nil
    
    convert multiple Date parameters into a nil if any of its bits were blank

commit 48e134b	refs/tags/v3.1.0.rc6
Author: Gonzalo Rodriguez 
Date:   2011-07-23 15:15:53 -0300

    Fix ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname

M	activesupport/lib/active_support/cache/file_store.rb

commit 66b4d11	refs/heads/master
Author: Evan Farrar 
Date:   2011-07-23 13:57:56 -0400

    Changed several instances of British English to be American English

M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/association_basics.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/layouts_and_rendering.textile

commit 662a71b	refs/heads/master
Author: Evan Farrar 
Date:   2011-07-23 12:23:44 -0400

    Replaced ‘ with ' in the guides.

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/security.textile

commit 3534791	refs/tags/v3.1.0.rc6
Author: Sam Umbach, Zachary Porter and Michael Pell 
Date:   2011-07-23 12:21:20 -0400

    Add failing test: ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname

M	activesupport/test/caching_test.rb

commit 50d5e0f	refs/heads/master
Author: Joe Fiorini 
Date:   2011-07-23 11:28:49 -0400

    Tests now require MySQL2 adapter in order to run

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 72df64b	refs/heads/master
Author: gnagno 
Date:   2011-07-23 08:26:18 -0700

    now the documentation reflects the actual returned value for a missing translation

M	actionpack/lib/action_view/helpers/translation_helper.rb

commit 35c87a1	refs/heads/master
Merge: 7dadb6a e9f1625
Author: Santiago Pastorino 
Date:   2011-07-23 08:26:16 -0700

    Merge pull request #2198 from Karunakar/fixing_2168
    
    Improve rails:template undefined LOCATION variable error message fixed

commit e9f1625	refs/heads/master
Author: Raghunadh 
Date:   2011-07-23 14:37:25 +0530

    Improve rails:template undefined LOCATION variable error message fixed

M	railties/lib/rails/tasks/framework.rake

commit 19d9689	refs/tags/v3.0.14
Merge: c39bd5f b490fd8
Author: Santiago Pastorino 
Date:   2011-07-23 07:59:34 -0700

    Merge pull request #2205 from arunagw/test_un_3_0_stable
    
    rake test:uncommitted for 3-0-stable

commit 0988da6	refs/tags/v3.1.1.rc1
Merge: 36bd8eb 8dc4745
Author: Santiago Pastorino 
Date:   2011-07-23 07:59:02 -0700

    Merge pull request #2172 from arunagw/database-rake-1.9.2_3-1-stable
    
    Database rake 1.9.2 3 1 stable

commit 7dadb6a	refs/heads/master
Merge: 25ec3c8 fbf4bee
Author: Santiago Pastorino 
Date:   2011-07-23 07:58:59 -0700

    Merge pull request #2171 from arunagw/database-rake-1.9.2
    
    This conditions is required to work with database create task. 1.9.2 is h

commit b490fd8	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-07-23 20:17:13 +0530

    fixed task for rake test:uncommitted

M	railties/lib/rails/test_unit/testing.rake

commit 36bd8eb	refs/tags/v3.1.1.rc1
Merge: 9154c35 52ec151
Author: Santiago Pastorino 
Date:   2011-07-23 07:34:24 -0700

    Merge pull request #2204 from castlerock/3-1-stable
    
    Backport from 3-0-stable for 3-1-stable

commit 9154c35	refs/tags/v3.1.1.rc1
Merge: a9fc988 e414d4f
Author: Santiago Pastorino 
Date:   2011-07-23 07:23:15 -0700

    Merge pull request #2203 from arunagw/3-1-stable
    
    3 1 stable fixes #713

commit 52ec151	refs/tags/v3.1.1.rc1
Author: Vishnu Atrai 
Date:   2011-07-23 19:51:58 +0530

    remove ruby-prof for rubinius in Gemfile cherry-pick

M	Gemfile

commit e414d4f	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-07-23 19:49:40 +0530

    Backporting from master fixes #713

M	railties/lib/rails/test_unit/testing.rake

commit 25ec3c8	refs/heads/master
Merge: 7e4cedf 74eb848
Author: Santiago Pastorino 
Date:   2011-07-23 07:12:51 -0700

    Merge pull request #2193 from zhengjia/remove_ruby_prof_for_rubinius
    
    only install ruby-prof for mri ruby

commit 7e4cedf	refs/heads/master
Merge: fb36f3d 0fb0973
Author: Santiago Pastorino 
Date:   2011-07-23 07:06:14 -0700

    Merge pull request #2196 from arunagw/issue_713
    
    Spliting the ouput of git ls-files for running tasks Fixes #713

commit fb36f3d	refs/heads/master
Merge: d352e0d 611fd79
Author: Santiago Pastorino 
Date:   2011-07-23 07:04:00 -0700

    Merge pull request #2195 from castlerock/command_line_information
    
    Small missing information added to command description. --help also works

commit a9fc988	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-07-23 14:41:30 +0200

    checked all .rb files in the project tree for missing magic comments, one was missing
    
    Came with this one-liner for this:
    
        find . -name '*.rb' | \
        xargs chardet | \
        grep -v ascii | \
        cut -d: -f1 -s | \
        xargs -n1 ruby -0777 -ne 'puts $FILENAME if $_ !~ /#.*coding:\s*utf/i'
    
    Welcome $_.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	activesupport/test/json/decoding_test.rb

commit d352e0d	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-23 14:41:30 +0200

    checked all .rb files in the project tree for missing magic comments, one was missing
    
    Came with this one-liner for this:
    
        find . -name '*.rb' | \
        xargs chardet | \
        grep -v ascii | \
        cut -d: -f1 -s | \
        xargs -n1 ruby -0777 -ne 'puts $FILENAME if $_ !~ /#.*coding:\s*utf/i'
    
    Welcome $_.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	activesupport/test/json/decoding_test.rb

commit 50203b3	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-07-23 14:15:00 +0200

    adds a couple of missing magic comments [fixes #1374]

M	activesupport/lib/active_support/core_ext/string/conversions.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit 4d8aaff	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-23 14:15:00 +0200

    adds a couple of missing magic comments [fixes #1374]

M	activesupport/lib/active_support/core_ext/string/conversions.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit c300e13	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-23 12:51:02 +0200

    Revert "notextile tag has been placed with ascii quotes"
    
    Reason:  is an internal tag
    
    This reverts commit 01040b5dc990e79052627451603feea0f149fe41.

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit ed90144	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-23 02:21:05 +0530

    minor refactor in the template guide

M	railties/guides/source/rails_application_templates.textile

commit 53f2a56	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-23 01:59:46 +0530

    document the change in edge rails which makes a more strict check on the arity of the dynamic finders

M	railties/guides/source/active_record_querying.textile

commit a7027db	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-23 01:19:24 +0530

    corrected sentences to make them consistent in command line guide

M	railties/guides/source/command_line.textile

commit ba4fe8f	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-23 01:18:28 +0530

    minor corrections in caching guide

M	railties/guides/source/caching_with_rails.textile

commit 4a84461	refs/tags/v3.1.1.rc1
Author: JudeArasu 
Date:   2011-07-22 00:28:24 +0530

    grammatical changes

M	railties/guides/source/caching_with_rails.textile

commit a6daf4c	refs/tags/v3.1.1.rc1
Author: Vishnu Atrai 
Date:   2011-07-21 23:55:31 +0530

    alias added for rails generate guide

M	railties/guides/source/command_line.textile

commit 20f1f6c	refs/tags/v3.1.1.rc1
Author: Vishnu Atrai 
Date:   2011-07-21 23:46:42 +0530

    alias added for rails runner guide

M	railties/guides/source/command_line.textile

commit 9747758	refs/tags/v3.1.1.rc1
Author: JudeArasu 
Date:   2011-07-21 23:52:10 +0530

    grammatical changes

M	railties/guides/source/caching_with_rails.textile

commit cdb44c3	refs/tags/v3.1.1.rc1
Author: JudeArasu 
Date:   2011-07-21 22:57:41 +0530

    typo change

M	railties/guides/source/caching_with_rails.textile

commit daeff45	refs/tags/v3.1.1.rc1
Author: Vishnu Atrai 
Date:   2011-07-21 10:12:29 -0700

    fixed type

M	activemodel/README.rdoc

commit 3290b6a	refs/tags/v3.1.1.rc1
Author: Igor Zubkov 
Date:   2011-07-21 14:58:20 +0300

    Fix typo

M	railties/guides/source/asset_pipeline.textile

commit 27a9f19	refs/tags/v3.1.1.rc1
Author: Bratish Goswami 
Date:   2011-07-21 13:03:45 +0530

    Download and installation, License and Support sections added for activemodel

M	activemodel/README.rdoc

commit 94a8e35	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-20 23:33:42 -0700

    use the doc conventions for arguments in all cases
    
    See https://github.com/lifo/docrails/commit/5c71a4e76897844ab6aeabb581549d981d9768c9#commitcomment-485675

M	actionpack/lib/action_view/helpers/date_helper.rb

commit f4558c6	refs/tags/v3.1.1.rc1
Author: Sebastian Gassner 
Date:   2011-07-20 10:31:57 +0200

    Documentation fix: adding missing equal sign in code sample for ActiveModel::Dirty.

M	activemodel/lib/active_model/dirty.rb

commit 3a82a92	refs/tags/v3.1.1.rc1
Author: Paul Battley 
Date:   2011-07-19 18:17:03 +0100

    Update form helper documentation to match code.
    
    Change d3cfee11 removed the automatically generated object_name_submit id attributes on form submit elements. This makes the documentation match.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 6e09ea9	refs/tags/v3.1.1.rc1
Author: Evan Machnic 
Date:   2011-07-19 14:59:06 -0400

    Fixed asset_url in asset_pipeline doc

M	railties/guides/source/asset_pipeline.textile

commit 5632541	refs/tags/v3.1.1.rc1
Author: Evan Machnic 
Date:   2011-07-19 14:46:19 -0400

    image_url documentation in asset_pipelin doc

M	railties/guides/source/asset_pipeline.textile

commit 63efe07	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-19 23:54:48 +0530

    spacing fix

M	railties/lib/rails/engine.rb

commit 8392b78	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-19 23:44:06 +0530

    Fixing the incorrect change made in bae54c5

M	railties/guides/source/asset_pipeline.textile

commit 8a3f4c2	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-19 23:34:24 +0530

    reword select_date's behaviour clearly when an incomplete options array is passed

M	actionpack/lib/action_view/helpers/date_helper.rb

commit cc505e1	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-19 23:19:40 +0530

    minor corrections in form helpers guide and api docs

M	actionpack/lib/action_view/helpers/form_helper.rb
M	railties/guides/source/form_helpers.textile

commit 5bafead	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-19 23:12:31 +0530

    some corrections in assets pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 26476d9	refs/tags/v3.1.1.rc1
Author: Evan Machnic 
Date:   2011-07-19 13:36:50 -0400

    Capitalization compliance for asset_pipeline doc

M	railties/guides/source/asset_pipeline.textile

commit 7cf4fd9	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-19 12:18:23 +0530

    Revert "notextile tag has been placed with ascii quotes"
    
    This reverts commit 3e6052a430912b096056ae3d9a685b04767a4d19.
    
    Reason: Code changes are not allowed in docrails (even if they are related to guides generation)

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit 28ff4e5	refs/tags/v3.1.1.rc1
Author: Ryan Bigg 
Date:   2011-07-18 16:26:15 +1000

    Complete another review of asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit f4d827b	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-18 11:02:46 +1200

    [asset pipeline] update capistrano task code
    
    This code actually works.

M	railties/guides/source/asset_pipeline.textile

commit 9f888b0	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 13:22:15 -0700

    Add seach, tel, url and email inputs as 'Other Helpers of Interest'

M	railties/guides/source/form_helpers.textile

commit b9ac90d	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 13:10:17 -0700

    examples for telephone_field, url_field and email_field

M	actionpack/lib/action_view/helpers/form_helper.rb

commit c7be43a	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 12:51:03 -0700

    document options to search_field

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 38efb95	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 09:07:18 -0700

    use correct in description

M	actionpack/lib/action_view/helpers/form_helper.rb

commit f86f8fc	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-17 20:22:01 +1200

    [asset pipeline] Correct CSS section and include Gem details
    
    Also added note about compress option, which was
    not mentioned anywhere and is required

M	railties/guides/source/asset_pipeline.textile

commit 56a8997	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-17 20:12:30 +1200

    [configuring] add doc for missing assets attribute
    
    .compress turns on the compression using the types
    specified in other config options

M	railties/guides/source/configuring.textile

commit a957300	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 00:31:28 -0700

    we're talking about days here, not hours

M	actionpack/lib/action_view/helpers/date_helper.rb

commit cb62ea9	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 00:31:09 -0700

    wording between select_second, select_minute and
    select_hour should be consistent and correct

M	actionpack/lib/action_view/helpers/date_helper.rb

commit e4ab021	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 00:24:31 -0700

    fix typo

M	actionpack/lib/action_view/helpers/date_helper.rb

commit a7d4008	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-17 00:06:46 -0700

    make documentation agree with test expectations and
    behaviour
    
    See: test_select_date_with_incomplete_order in
    actionpack/test/template/date_helper_test.rb

M	actionpack/lib/action_view/helpers/date_helper.rb

commit e6caf3c	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:54:40 -0700

    document that second tags are also returned by default

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 28237d6	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:47:06 -0700

    there is no Time.today method, use Time.now

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 8ff3ebf	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:44:01 -0700

    remove stray character

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 36f0386	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:42:35 -0700

    disambiguate uses of post/POST by using "article"
    for the related variable passed to  date_select,
    time_select and datetime_select

M	actionpack/lib/action_view/helpers/date_helper.rb

commit a3e5492	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:29:51 -0700

    clarify that classes that include DateHelper can
    also manipulate times

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 9831d7b	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:27:26 -0700

    clarify that DateTime objects are allowed arguments
    to distance_of_time_in_words

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 5c7cb8a	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:11:48 -0700

    use minute instead of second in description of select_minute

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 2f5a15e	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:09:59 -0700

    show correct helper in description

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 044aa0a	refs/tags/v3.1.1.rc1
Author: Ray Baxter 
Date:   2011-07-16 23:08:30 -0700

    use 'hour' instead of 'minutes' and 'second' for select_hour

M	actionpack/lib/action_view/helpers/date_helper.rb

commit c2c7f65	refs/tags/v3.1.1.rc1
Author: Sam Umbach 
Date:   2011-07-16 21:08:14 -0700

    Switch Tilt link to Textile format

M	railties/guides/source/asset_pipeline.textile

commit dc58a7b	refs/tags/v3.1.1.rc1
Author: Sam Umbach 
Date:   2011-07-16 21:02:36 -0700

    Fix typo

M	railties/guides/source/asset_pipeline.textile

commit a64748b	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-17 14:19:04 +1200

    [asset pipeline] A few corrections and some new material
    
    Add notes about capistrano task being added to that project
    and correction to information about precompilation.

M	railties/guides/source/asset_pipeline.textile

commit 0d30929	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-16 19:02:40 +1200

    [asset pipeline] Add section on sendfile option
    
    This option has caught a few people out, so it
    is a good idea to include an explanation and
    a Gotcha.
    
    See Rails bug 1822
    See 1822 comment 1585926 for resolution

M	railties/guides/source/asset_pipeline.textile

commit 06636c5	refs/tags/v3.1.1.rc1
Author: John Warwick 
Date:   2011-07-15 22:40:17 -0400

    Fixing typo in plugins.textile

M	railties/guides/source/plugins.textile

commit de2cc31	refs/tags/v3.1.1.rc1
Author: Vishnu Atrai 
Date:   2011-07-15 23:56:58 +0530

    Should be "match" instead of "map"

M	railties/guides/source/routing.textile

commit 80fc12f	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-15 23:06:37 +0530

    Revert "Fix wildcard route code examples."
    
    This reverts commit 0894d73c7552a4c7d576b7d3692c6a18faadd273.
    
    Reason: CHANGELOGs should not be changed in docrails.

M	actionpack/CHANGELOG
M	railties/guides/source/routing.textile

commit 86908ee	refs/tags/v3.1.1.rc1
Author: Hendy Tanata 
Date:   2011-07-15 21:56:03 +0800

    Fix wildcard route code examples.
    
    Should be "match" instead of "map".

M	railties/guides/source/routing.textile

commit f619bcc	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-15 16:19:11 +1200

    [asset pipeline] Added information about data uri helper
    
    See Sprockets issue 111
    and Sprockets commit cd38a1670a

M	railties/guides/source/asset_pipeline.textile

commit 8e0f49e	refs/tags/v3.1.1.rc1
Author: joeellis 
Date:   2011-07-14 09:17:29 -0700

    Minor grammar mistake

M	railties/guides/source/asset_pipeline.textile

commit cf122fc	refs/tags/v3.1.1.rc1
Author: Daniel Dyba 
Date:   2011-06-29 23:04:02 -0700

    Modified Migrations file

M	railties/guides/source/migrations.textile

commit 48a013d	refs/tags/v3.1.1.rc1
Author: Akira Matsuda 
Date:   2011-07-13 18:27:14 +0900

    documentation fix: wrong result

M	activesupport/lib/active_support/multibyte/chars.rb

commit 2a4e204	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-13 21:20:53 +1200

    [asset pipeline] add capistrano task
    
    Task still needs to symlink default rails default
    filestore location, but code may still be settling

M	railties/guides/source/asset_pipeline.textile

commit 2fdb88e	refs/tags/v3.1.1.rc1
Author: Aslam Najeebdeen 
Date:   2011-07-13 13:33:32 +0530

    Replaced appropriate word.

M	railties/guides/source/migrations.textile

commit 170bc98	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-07-12 10:20:42 -0400

    grammar correction for rails/paths #add method arguments

M	railties/lib/rails/paths.rb

commit 79df11b	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-07-12 09:54:43 -0400

    misc grammar and clarity changes for rails/engine docs

M	railties/lib/rails/engine.rb

commit 3b5679f	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-07-12 09:37:55 -0400

    grammar/tense correction to rails application doc

M	railties/lib/rails/application.rb

commit ef0b1e7	refs/tags/v3.1.1.rc1
Author: Hrvoje Šimić 
Date:   2011-07-11 14:45:47 +0200

    fixed paths, more consistent helpers and paths examples

M	railties/guides/source/routing.textile

commit 43e6910	refs/tags/v3.1.1.rc1
Author: Richard Hulse 
Date:   2011-07-11 19:52:36 +1200

    [asset pipeline] more updates to docs

M	railties/guides/source/asset_pipeline.textile

commit ed611fc	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-10 21:44:06 +0530

    use simpler words in docs

M	activerecord/lib/active_record/base.rb

commit 6a4d54b	refs/tags/v3.1.1.rc1
Author: Olek Janiszewski 
Date:   2011-07-07 23:01:27 +0300

    Documentation fixes for rendering partials

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit ace3723	refs/heads/master
Merge: 94978b9 38310ab
Author: Xavier Noria 
Date:   2011-07-23 12:15:41 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 38310ab	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-23 12:14:10 +0200

    little details seen while doing a pass through what's new in docrails

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	railties/guides/source/asset_pipeline.textile
M	railties/lib/rails/engine.rb
M	railties/lib/rails/paths.rb

commit 0fb0973	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-23 13:58:23 +0530

    For svn files also spilt required

M	railties/lib/rails/test_unit/testing.rake

commit 7d9cf9a	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-23 13:20:10 +0530

    Spliting the ouput of git ls-files for running tasks Fixes #713

M	railties/lib/rails/test_unit/testing.rake

commit 611fd79	refs/heads/master
Author: Bratish Goswami 
Date:   2011-07-23 10:41:49 +0530

    Small missing information added to command description. --help also works like -h.

M	railties/lib/rails/commands.rb

commit 06c6252	refs/tags/v3.1.0.rc6
Author: Gabriel Horner 
Date:   2011-07-22 18:43:27 -0400

    simplify and be more explicit about create and after_initialize tests

M	activerecord/test/cases/base_test.rb
M	activerecord/test/models/wholesale_product.rb

commit 3dc5f71	refs/tags/v3.1.0.rc6
Author: Les Fletcher 
Date:   2011-07-21 01:36:02 -0700

    fix after_initialize edge case (close #2074 and close #2175)
    
    fix behavior when after_initialize is defined and a block is passed to Base.create

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
A	activerecord/test/models/wholesale_product.rb
M	activerecord/test/schema/schema.rb

commit 2db9a7e	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-23 02:21:05 +0530

    minor refactor in the template guide

M	railties/guides/source/rails_application_templates.textile

commit 573c6e6	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-23 01:59:46 +0530

    document the change in edge rails which makes a more strict check on the arity of the dynamic finders

M	railties/guides/source/active_record_querying.textile

commit ccb3af4	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-23 01:19:24 +0530

    corrected sentences to make them consistent in command line guide

M	railties/guides/source/command_line.textile

commit 14b9726	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-23 01:18:28 +0530

    minor corrections in caching guide

M	railties/guides/source/caching_with_rails.textile

commit 94978b9	refs/heads/master
Merge: 253b472 a277886
Author: Xavier Noria 
Date:   2011-07-22 10:06:35 -0700

    Merge pull request #2188 from vijaydev/patch-6
    
    Fixes typo

commit 6f917ad	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-22 09:12:22 -0700

    forgot to add this test case

A	activerecord/test/cases/adapters/postgresql/connection_test.rb

commit 253b472	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-22 09:12:22 -0700

    forgot to add this test case

A	activerecord/test/cases/adapters/postgresql/connection_test.rb

commit a277886	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-22 08:41:00 -0700

    Fixes typo

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

commit 56a995b	refs/tags/v3.1.1.rc1
Merge: 787f1f3 39a9938
Author: Santiago Pastorino 
Date:   2011-07-22 08:04:43 -0700

    Merge pull request #2186 from loz/3-1-stable
    
    Fixed engine rake tasks

commit c39bd5f	refs/tags/v3.0.14
Merge: 80b1f9e bd804d7
Author: Santiago Pastorino 
Date:   2011-07-22 07:53:27 -0700

    Merge pull request #2183 from castlerock/3-0-stable-duplicate_test
    
    3 0 stable duplicate test

commit 39a9938	refs/tags/v3.1.1.rc1
Author: Jonathan Lozinski 
Date:   2011-07-22 14:43:44 +0100

    Added missing runner to engine rake to ensure that engine can run the app rake tasks (as per master)

M	railties/lib/rails/tasks/engine.rake

commit 74eb848	refs/heads/master
Author: zhengjia 
Date:   2011-07-22 07:55:48 -0500

    remove ruby-prof for rubinius in Gemfile

M	Gemfile

commit 1efd882	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-22 17:43:30 +0530

    lazy load ConnectionAdapters remove require.

M	activerecord/lib/active_record.rb
M	activerecord/lib/active_record/base.rb

commit bd804d7	refs/tags/v3.0.14
Author: Karunakar (Ruby) 
Date:   2011-07-22 16:20:49 +0530

    Duplicate tests removed.

M	activerecord/test/cases/nested_attributes_test.rb

commit 787f1f3	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-21 15:30:28 -0700

    use rake tasks to set the default environment variables. fixes #2126

M	actionpack/lib/sprockets/assets.rake

commit 5b6121a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-21 15:30:28 -0700

    use rake tasks to set the default environment variables. fixes #2126

M	actionpack/lib/sprockets/assets.rake

commit 80b1f9e	refs/tags/v3.0.14
Author: Xavier Noria 
Date:   2011-07-21 23:03:04 +0200

    I actually love well-formed Gemfiles

M	Gemfile

commit b146477	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-21 13:49:36 -0700

    removing inline source option from rdoc task. fixes #2169

M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake

commit bb7e355	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-21 13:49:36 -0700

    removing inline source option from rdoc task. fixes #2169

M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake

commit b744c84	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-21 13:09:42 -0700

    adding changelog entry for connection urls

M	activerecord/CHANGELOG

commit 1a0b7ea	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-21 12:57:05 -0700

    adding more tests around database uri parsing

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_management_test.rb

commit 3cafe04	refs/heads/master
Author: JudeArasu 
Date:   2011-07-22 00:28:24 +0530

    grammatical changes

M	railties/guides/source/caching_with_rails.textile

commit 238550f	refs/heads/master
Merge: 6dfed66 dc1b207
Author: JudeArasu 
Date:   2011-07-22 00:26:31 +0530

    Merge branch 'master' of git@github.com:lifo/docrails

commit f4ed975	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-21 11:54:29 -0700

    move around tests

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb

commit dc1b207	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-21 23:55:31 +0530

    alias added for rails generate guide

M	railties/guides/source/command_line.textile

commit 444e01e	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-21 23:46:42 +0530

    alias added for rails runner guide

M	railties/guides/source/command_line.textile

commit 6dfed66	refs/heads/master
Author: JudeArasu 
Date:   2011-07-21 23:52:10 +0530

    grammatical changes

M	railties/guides/source/caching_with_rails.textile

commit 9c7a55c	refs/heads/master
Author: JudeArasu 
Date:   2011-07-21 22:57:41 +0530

    typo change

M	railties/guides/source/caching_with_rails.textile

commit 5801f42	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-21 10:12:29 -0700

    fixed type

M	activemodel/README.rdoc

commit dcb838e	refs/heads/master
Merge: 840ca47 e7a7591
Author: Igor Zubkov 
Date:   2011-07-21 05:04:40 -0700

    Merge pull request #54 from biow0lf/fix_typo
    
    Fix typo

commit e7a7591	refs/heads/master
Author: Igor Zubkov 
Date:   2011-07-21 14:58:20 +0300

    Fix typo

M	railties/guides/source/asset_pipeline.textile

commit 840ca47	refs/heads/master
Author: Bratish Goswami 
Date:   2011-07-21 13:03:45 +0530

    Download and installation, License and Support sections added for activemodel

M	activemodel/README.rdoc

commit 1879206	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-20 23:33:42 -0700

    use the doc conventions for arguments in all cases
    
    See https://github.com/lifo/docrails/commit/5c71a4e76897844ab6aeabb581549d981d9768c9#commitcomment-485675

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 8dc4745	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-07-21 09:53:44 +0530

    This conditions is required to work with database create task. 1.9.2 is having a bug with "Calling return within begin still executes else".

M	activerecord/lib/active_record/railties/databases.rake

commit fbf4bee	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-21 09:47:42 +0530

    This conditions is required to work with database create task. 1.9.2 is having a bug with "Calling return within begin still executes else".

M	activerecord/lib/active_record/railties/databases.rake

commit 1692143	refs/heads/master
Author: Terence Lee 
Date:   2011-07-13 16:51:46 -0500

    fix postgres connection url test

M	activerecord/test/cases/adapter_test.rb

commit 1f427b5	refs/heads/master
Author: Glenn Gillen 
Date:   2011-06-28 19:49:31 +0100

    Add documentation for URL connection strings.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

commit 16249fe	refs/heads/master
Author: Glenn Gillen 
Date:   2011-06-28 19:47:54 +0100

    Added test for postgres connections as URL. Fixed query param parsing.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/adapter_test.rb

commit 89357c8	refs/heads/master
Author: Glenn Gillen 
Date:   2011-06-28 19:10:57 +0100

    Provide database connection settings as a URL.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/adapter_test.rb

commit 9a6b96a	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-20 15:52:53 -0700

    no need to sort the values

M	activerecord/lib/active_record/nested_attributes.rb

commit 1d674d5	refs/tags/v3.1.1.rc1
Author: Franck Verrot 
Date:   2011-07-19 17:32:16 +0200

    assign_nested_attributes_for_collection_association should work with Ruby 1.9 [Closes #2106]
    
    Children attributes can be either String's or Symbol's, so let's check if the object responds to to_i.

M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit 22e4727	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-20 15:52:53 -0700

    no need to sort the values

M	activerecord/lib/active_record/nested_attributes.rb

commit 8bc314b	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-19 17:32:16 +0200

    assign_nested_attributes_for_collection_association should work with Ruby 1.9 [Closes #2106]
    
    Children attributes can be either String's or Symbol's, so let's check if the object responds to to_i.

M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit d8736b2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-20 15:37:52 -0700

    Revert "this fixes a brittle test in fixtures_test.rb which fails when you are in a timezone which is ahead of UTC but UTC is in the previous day still."
    
    This reverts commit f92cefa95f44bcd550c402a7f5ba914f3bd783cc.

M	activerecord/test/fixtures/pirates.yml

commit 09a4884	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-20 10:44:36 -0700

    bigdecimal should be typecast to a float on sqlite3. fixes #2162

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/base_test.rb

commit 56fb7fc	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-20 10:44:36 -0700

    bigdecimal should be typecast to a float on sqlite3. fixes #2162

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/base_test.rb

commit 993d0f6	refs/heads/master
Merge: 64268c5 1ac802f
Author: Santiago Pastorino 
Date:   2011-07-20 10:29:28 -0700

    Merge pull request #2159 from ogeidix/master
    
    Fixed issue #2119: XHR without Accept and Content-Type header gets 500 error

commit ff05736	refs/tags/v3.1.1.rc1
Author: Josh Kalderimis 
Date:   2011-07-20 01:00:35 +0200

    this fixes a brittle test in fixtures_test.rb which fails when you are in a timezone which is ahead of UTC but UTC is in the previous day still.

M	activerecord/test/fixtures/pirates.yml

commit db20780	refs/tags/v3.1.1.rc1
Author: JudeArasu 
Date:   2011-07-19 01:33:45 +0530

    notextile tag has been placed with ascii quotes

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit 64268c5	refs/heads/master
Merge: 4636638 f92cefa
Author: Xavier Noria 
Date:   2011-07-20 04:04:47 -0700

    Merge pull request #2165 from joshk/fixtures_test_fix
    
    Timezone fixtures test correction

commit 4636638	refs/heads/master
Merge: 0e6f19c 01040b5
Author: Xavier Noria 
Date:   2011-07-20 04:04:07 -0700

    Merge pull request #2136 from judearasu/guides_branch
    
    notextile tag in rails guides generator has been placed with ascii quotes

commit 0e6f19c	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-20 12:17:01 +0200

    documents the changes to String#blank? in the AS guide

M	railties/guides/source/active_support_core_extensions.textile

commit e175117	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-20 12:10:45 +0200

    registers the changes to String#blank? in the CHANGELOG

M	activesupport/CHANGELOG

commit 82b5ebb	refs/heads/master
Merge: af56190 2a37136
Author: Xavier Noria 
Date:   2011-07-20 03:09:49 -0700

    Merge pull request #2164 from dmathieu/missing_require
    
    missing require of string/encoding to have access to encoding_aware?

commit 2a37136	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-20 11:45:59 +0200

    missing require of string/encoding to have access to encoding_aware?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit af56190	refs/heads/master
Merge: b8a4e9f 0c58f39
Author: Xavier Noria 
Date:   2011-07-20 02:38:26 -0700

    Merge pull request #2146 from dmathieu/blank_binary_encoding
    
    fix String#blank? on binary strings

commit 0c58f39	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-19 12:22:31 +0200

    fix String#blank? on binary strings.

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit de20e7c	refs/heads/master
Merge: 01c2a98 9714d86
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-20 01:46:36 -0700

    Merge pull request #53 from sepastian/master
    
    Documentation fix ActiveModel::Dirty

commit 9714d86	refs/heads/master
Author: Sebastian Gassner 
Date:   2011-07-20 10:31:57 +0200

    Documentation fix: adding missing equal sign in code sample for ActiveModel::Dirty.

M	activemodel/lib/active_model/dirty.rb

commit f92cefa	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-07-20 01:00:35 +0200

    this fixes a brittle test in fixtures_test.rb which fails when you are in a timezone which is ahead of UTC but UTC is in the previous day still.

M	activerecord/test/fixtures/pirates.yml

commit b8a4e9f	refs/heads/master
Merge: 37418e5 322393f
Author: Jeremy Kemper 
Date:   2011-07-19 14:11:03 -0700

    Merge pull request #2160 from joshk/patch-5
    
    Changed the year of a date used in a test which fails when using 1.8.7

commit 322393f	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-07-19 13:52:32 -0700

    Changed the year of a date used in a test which fails when using 1.8.7 on a 32bit machine (ArgumentError: time out of range)

M	activesupport/test/core_ext/string_ext_test.rb

commit f3e4dc2	refs/tags/v3.1.1.rc1
Merge: 8d7f270 4792b88
Author: Santiago Pastorino 
Date:   2011-07-19 13:36:15 -0700

    Merge pull request #2156 from vijaydev/changelogs31
    
    Adding changelog entry for submit helper change (3-1-stable)

commit 1ac802f	refs/heads/master
Author: ogeidix 
Date:   2011-07-19 22:05:16 +0200

    Check Accept and Content-Type headers before evaluating them in xhr requests. Closes #2119
    
    An xhr request must have an "Accept" or "Content-type" header in order to be considered a request with valid_accept_header.

M	actionpack/lib/action_dispatch/http/mime_negotiation.rb
M	actionpack/test/dispatch/request_test.rb

commit 8d7f270	refs/tags/v3.1.1.rc1
Merge: b6cf638 f78a4e8
Author: Xavier Noria 
Date:   2011-07-19 12:49:45 -0700

    Merge pull request #2157 from vijaydev/3-1-stable
    
    Avoid Symbol#to_proc (3-1-stable)

commit f78a4e8	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-20 01:07:06 +0530

    avoid Symbol#to_proc

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 01c2a98	refs/heads/master
Author: Paul Battley 
Date:   2011-07-19 18:17:03 +0100

    Update form helper documentation to match code.
    
    Change d3cfee11 removed the automatically generated object_name_submit id attributes on form submit elements. This makes the documentation match.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 4792b88	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-20 00:57:29 +0530

    add entry for submit helper change removing object_name_id

M	actionpack/CHANGELOG

commit 37418e5	refs/heads/master
Merge: ee6be60 d275a98
Author: Santiago Pastorino 
Date:   2011-07-19 12:20:36 -0700

    Merge pull request #2155 from vijaydev/changelogs
    
    Adding changelog entry for submit helper change which removed object_name_id generation

commit ee6be60	refs/heads/master
Merge: 30289c7 02cbaf0
Author: Santiago Pastorino 
Date:   2011-07-19 12:18:46 -0700

    Merge pull request #2154 from vijaydev/better_map
    
    Avoid Symbol#to_proc

commit d275a98	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-20 00:39:23 +0530

    add entry for submit helper change removing object_name_id

M	actionpack/CHANGELOG

commit 51df7ca	refs/heads/master
Author: Evan Machnic 
Date:   2011-07-19 14:59:06 -0400

    Fixed asset_url in asset_pipeline doc

M	railties/guides/source/asset_pipeline.textile

commit 02cbaf0	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-20 00:28:51 +0530

    avoid Symbol#to_proc

M	activerecord/lib/active_record/relation/finder_methods.rb

commit f1a239f	refs/heads/master
Merge: 2f4d9ef 46be69a
Author: Evan Machnic 
Date:   2011-07-19 14:46:24 -0400

    Merge branch 'master' of github.com:lifo/docrails

commit 2f4d9ef	refs/heads/master
Author: Evan Machnic 
Date:   2011-07-19 14:46:19 -0400

    image_url documentation in asset_pipelin doc

M	railties/guides/source/asset_pipeline.textile

commit 46be69a	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-19 23:54:48 +0530

    spacing fix

M	railties/lib/rails/engine.rb

commit 4a54e40	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-19 23:44:06 +0530

    Fixing the incorrect change made in bae54c5

M	railties/guides/source/asset_pipeline.textile

commit 4719543	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-19 23:34:24 +0530

    reword select_date's behaviour clearly when an incomplete options array is passed

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 4885e5d	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-19 23:19:40 +0530

    minor corrections in form helpers guide and api docs

M	actionpack/lib/action_view/helpers/form_helper.rb
M	railties/guides/source/form_helpers.textile

commit 09dd0309	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-19 23:12:31 +0530

    some corrections in assets pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 0cf5160	refs/heads/master
Author: Evan Machnic 
Date:   2011-07-19 13:36:50 -0400

    Capitalization compliance for asset_pipeline doc

M	railties/guides/source/asset_pipeline.textile

commit b6cf638	refs/tags/v3.1.1.rc1
Merge: a719ec0 b8e26e6
Author: Santiago Pastorino 
Date:   2011-07-19 06:38:40 -0700

    Merge pull request #2147 from norman/3-1-stable
    
    Explicitly require Active Support dependencies (3-1-stable)

commit 30289c7	refs/heads/master
Merge: 73efb68 9db2d10
Author: Santiago Pastorino 
Date:   2011-07-19 06:38:20 -0700

    Merge pull request #2148 from norman/master
    
    Explicitly require Active Support dependencies (master)

commit b8e26e6	refs/tags/v3.1.1.rc1
Author: Norman Clarke 
Date:   2011-07-19 09:47:13 -0300

    Explicitly require Active Support dependencies
    
    This fixes errors when using Active Record outside of Rails. In Rails,
    these files are required by other classes that are always loaded, so
    this error does not happen.
    
    Without core_ext/module/delegation, a NoMethodError is raised because
    `delegate` remains undefined.
    
    Without core_ext/class/attribute_acessors, an ArgumentError is raised because
    `delegate` does not receive a value for its :to option.

M	activerecord/lib/active_record/migration.rb

commit 9db2d10	refs/heads/master
Author: Norman Clarke 
Date:   2011-07-19 09:47:13 -0300

    Explicitly require Active Support dependencies
    
    This fixes errors when using Active Record outside of Rails. In Rails,
    these files are required by other classes that are always loaded, so
    this error does not happen.
    
    Without core_ext/module/delegation, a NoMethodError is raised because
    `delegate` remains undefined.
    
    Without core_ext/class/attribute_acessors, an ArgumentError is raised because
    `delegate` does not receive a value for its :to option.

M	activerecord/lib/active_record/migration.rb

commit db655ec	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-19 12:18:23 +0530

    Revert "notextile tag has been placed with ascii quotes"
    
    This reverts commit 3e6052a430912b096056ae3d9a685b04767a4d19.
    
    Reason: Code changes are not allowed in docrails (even if they are related to guides generation)

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit 3e6052a	refs/heads/master
Author: JudeArasu 
Date:   2011-07-19 06:41:20 +0530

    notextile tag has been placed with ascii quotes

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit a719ec0	refs/tags/v3.1.1.rc1
Merge: 7deac1f 8ebd841
Author: Santiago Pastorino 
Date:   2011-07-18 17:27:46 -0700

    Merge pull request #2140 from mcmire/issue_2078_3-1-stable
    
    Fix for #2078 (against 3-1-stable)

commit 73efb68	refs/heads/master
Merge: aaff90a 0e1d617
Author: Santiago Pastorino 
Date:   2011-07-18 17:27:21 -0700

    Merge pull request #2139 from mcmire/issue_2078_master
    
    Fix for #2078 (against master)

commit 047b979	refs/tags/v3.0.14
Author: Josh Kalderimis 
Date:   2011-07-15 09:48:10 +0200

    Added a .travis.yml config and travis specific ci script.
    
    Don't install ruby-debug if running the test suite on Travis,
    linecache19 is the main offender, very very slow.
    
    And do not install pg if Travis is bundling the gems, pg will be setup
    on Travis soon.
    
    Conflicts:
    
    	Gemfile

A	.travis.yml
M	Gemfile
A	ci/travis.rb

commit 9ade587	refs/tags/v3.0.14
Author: Josh Kalderimis 
Date:   2011-07-17 15:21:19 +0200

    This fixes an issue when bundling to a local path (eg. /vendor/bundle).
    
    If you bundle to a local path bundler is not included in it, so
    calling "gem 'bundler'" will fail.
    
    Conflicts:
    
    	load_paths.rb

M	load_paths.rb

commit 7deac1f	refs/tags/v3.1.1.rc1
Author: Josh Kalderimis 
Date:   2011-07-15 09:48:10 +0200

    Added a .travis.yml config and travis specific ci script.
    
    Don't install ruby-debug if running the test suite on Travis,
    linecache19 is the main offender, very very slow.
    
    And do not install pg if Travis is bundling the gems, pg will be setup
    on Travis soon.

A	.travis.yml
M	Gemfile
A	ci/travis.rb

commit 20aff01	refs/tags/v3.1.1.rc1
Author: Josh Kalderimis 
Date:   2011-07-17 15:21:19 +0200

    This fixes an issue when bundling to a local path (eg. /vendor/bundle).
    
    If you bundle to a local path bundler is not included in it, so
    calling "gem 'bundler'" will fail.
    
    Conflicts:
    
    	load_paths.rb

M	load_paths.rb

commit aaff90a	refs/heads/master
Merge: b475f74 e6f0c24
Author: Xavier Noria 
Date:   2011-07-18 14:34:18 -0700

    Merge pull request #2141 from joshk/master
    
    Config files to get Rails on Travis-CI

commit 0e1d617	refs/heads/master
Author: Elliot Winkler 
Date:   2011-07-18 14:56:07 -0600

    ActiveRecord: Fix eager loading so that giving a blank order clause generates valid SQL

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 8ebd841	refs/tags/v3.1.1.rc1
Author: Elliot Winkler 
Date:   2011-07-18 14:56:07 -0600

    ActiveRecord: Fix eager loading so that giving a blank order clause generates valid SQL

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 01040b5	refs/heads/master
Author: JudeArasu 
Date:   2011-07-19 01:33:45 +0530

    notextile tag has been placed with ascii quotes

M	railties/guides/rails_guides/generator.rb
M	railties/guides/rails_guides/textile_extensions.rb

commit d963ef9	refs/tags/v3.1.1.rc1
Merge: 48379df c24966f
Author: Santiago Pastorino 
Date:   2011-07-18 12:45:09 -0700

    Merge pull request #2135 from jstorimer/ensure-status-codes-are-logged-properly-3-1-stable
    
    Ensure status codes are logged properly (3-1-stable)

commit c24966f	refs/tags/v3.1.1.rc1
Author: Jesse Storimer 
Date:   2011-07-18 13:37:23 -0400

    Ensure that status codes are logged properly
    
    Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
    so that status codes rendered from rescue_from blocks are logged
    properly.

M	actionpack/lib/action_controller/base.rb
M	actionpack/test/controller/log_subscriber_test.rb

commit a6139b9	refs/tags/v3.0.14
Merge: 1220b16 5e64538
Author: Santiago Pastorino 
Date:   2011-07-18 12:30:36 -0700

    Merge pull request #2134 from jstorimer/ensure-status-codes-are-logged-properly-3-0-stable
    
    Ensure status codes are logged properly (for 3-0-stable)

commit 5e64538	refs/tags/v3.0.14
Author: Jesse Storimer 
Date:   2011-07-18 13:37:23 -0400

    Ensure that status codes are logged properly
    
    Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
    so that status codes rendered from rescue_from blocks are logged
    properly.

M	actionpack/lib/action_controller/base.rb
M	actionpack/test/controller/log_subscriber_test.rb

commit b475f74	refs/heads/master
Merge: 8efc0f1 ac81af4
Author: José Valim 
Date:   2011-07-18 11:05:37 -0700

    Merge pull request #2133 from jstorimer/ensure-status-codes-are-logged-properly
    
    Ensure that status codes are logged properly

commit ac81af4	refs/heads/master
Author: Jesse Storimer 
Date:   2011-07-18 13:37:23 -0400

    Ensure that status codes are logged properly
    
    Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
    so that status codes rendered from rescue_from blocks are logged
    properly.

M	actionpack/lib/action_controller/base.rb
M	actionpack/test/controller/log_subscriber_test.rb

commit 8efc0f1	refs/heads/master
Merge: da14489 fcdcc87
Author: Santiago Pastorino 
Date:   2011-07-18 10:00:08 -0700

    Merge pull request #2116 from guilleiguaran/fix-environment-generator-action
    
    Fix Rails::Generators::Actions#environment when env is passed

commit fcdcc87	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-07-17 01:47:21 -0500

    Fix Rails::Generators::Actions#environment when env is passed. Closes #2110

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit da14489	refs/heads/master
Merge: 44e83ac 4860143
Author: José Valim 
Date:   2011-07-18 06:50:43 -0700

    Merge pull request #195 from bigfix/active_model_include_serialization
    
    ActiveModel support for the :include serialization option

commit 44e83ac	refs/heads/master
Merge: 50941ec 52a0962
Author: José Valim 
Date:   2011-07-18 06:46:31 -0700

    Merge pull request #2075 from lawrencepit/match_attribute_method
    
    Optimization of ActiveModel's match_attribute_method?

commit 48379df	refs/tags/v3.1.1.rc1
Merge: 312ee12 09f5780
Author: José Valim 
Date:   2011-07-18 06:38:05 -0700

    Merge pull request #2121 from arunagw/3-1-plugin_new_gen_test
    
    3 1 plugin new gen test

commit 312ee12	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-07-18 11:58:56 +0100

    Add autoload declaration for deprecated AssociationCollection

M	activerecord/lib/active_record/associations.rb

commit 3d7ed11	refs/tags/v3.1.1.rc1
Merge: 1b97f6c fa7dd34
Author: Jon Leighton 
Date:   2011-07-18 01:26:27 -0700

    Merge pull request #2129 from sikachu/3-1-stable-dynamic_finder
    
    Show a deprecation warning if user passing less number of argument in the

commit 50941ec	refs/heads/master
Merge: 1e452f1 4443905
Author: Jon Leighton 
Date:   2011-07-18 01:24:33 -0700

    Merge pull request #2128 from sikachu/master-dynamic_finder
    
    Raise an ArgumentError if user passing less number of argument in the dynamic finder

commit 2f69469	refs/heads/master
Author: Ryan Bigg 
Date:   2011-07-18 16:26:15 +1000

    Complete another review of asset pipeline guide

M	railties/guides/source/asset_pipeline.textile

commit 71c010d	refs/tags/v3.0.14
Author: Daniel Dyba 
Date:   2011-07-17 23:09:51 -0700

    Substituted RailsCommands for Rails::Commands

M	railties/lib/rails/commands/plugin.rb

commit 1b97f6c	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-18 14:28:14 +0900

    make tzinfo a development dependency

M	actionpack/actionpack.gemspec

commit 1e452f1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-18 14:28:14 +0900

    make tzinfo a development dependency

M	actionpack/actionpack.gemspec

commit 4443905	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-07-17 22:49:04 -0400

    Refactor test case to use anonymous class - Thank you @tenderlove

M	activerecord/test/cases/named_scope_test.rb

commit fa7dd34	refs/tags/v3.1.1.rc1
Author: Prem Sichanugrist 
Date:   2011-07-17 22:49:04 -0400

    Refactor test case to use anonymous class - Thank you @tenderlove

M	activerecord/test/cases/named_scope_test.rb

commit adc7097	refs/heads/master
Merge: fcbde45 d4f4626
Author: Santiago Pastorino 
Date:   2011-07-17 20:14:12 -0700

    Merge pull request #2124 from arunagw/render_partial_invalid_check_fix
    
    Checking with to_s. As regexp fail with 1.8.7

commit b2cd66f	refs/tags/v3.1.1.rc1
Author: Prem Sichanugrist 
Date:   2011-07-17 19:30:11 -0400

    Show a deprecation warning if user passing less number of argument in the dynamic finder
    
    The previous behavior was unintentional, and some people was relying on it. In the next version of Rails, the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.) It will raise the ArgumentError otherwise.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit 2b33d05	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-07-18 00:22:12 +0100

    Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937.

M	actionpack/lib/abstract_controller/layouts.rb
M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit fcbde45	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-18 00:22:12 +0100

    Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937.

M	actionpack/lib/abstract_controller/layouts.rb
M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit 27b1bf3	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-18 11:02:46 +1200

    [asset pipeline] update capistrano task code
    
    This code actually works.

M	railties/guides/source/asset_pipeline.textile

commit 1ccca1b	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-07-17 18:53:15 -0400

    Refactor the code a bit to reduce the duplication

M	activerecord/lib/active_record/base.rb

commit 6e69949	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-07-17 18:41:02 -0400

    Raise an ArgumentError if user passing less number of argument in the dynamic finder
    
    The previous behavior was unintentional, and some people was relying on it. Now the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.)
    
    So if you were doing this and expecting the second argument to be nil:
    
        User.find_by_username_and_group("sikachu")
    
    You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:
    
        User.find_by_username_and_group("sikachu", nil)

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/named_scope_test.rb

commit 98df498	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 13:22:15 -0700

    Add seach, tel, url and email inputs as 'Other Helpers of Interest'

M	railties/guides/source/form_helpers.textile

commit 82569b3	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 13:10:17 -0700

    examples for telephone_field, url_field and email_field

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 65b19c3	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 12:51:03 -0700

    document options to search_field

M	actionpack/lib/action_view/helpers/form_helper.rb

commit d4f4626	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-18 01:27:38 +0530

    Checking with to_s. As regexp fail with 1.8.7

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 5679308	refs/tags/v3.1.1.rc1
Merge: b6675d8 79fa146
Author: Santiago Pastorino 
Date:   2011-07-17 12:49:18 -0700

    Merge pull request #2048 from sikachu/3-1-stable-test_fix
    
    Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a

commit 1220b16	refs/tags/v3.0.14
Merge: 247a50b 2cb29fa
Author: Santiago Pastorino 
Date:   2011-07-17 12:49:04 -0700

    Merge pull request #2047 from sikachu/3-0-stable-test_fix
    
    Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a

commit e9bd834	refs/heads/master
Merge: 7669c33 edfb81d
Author: Santiago Pastorino 
Date:   2011-07-17 12:48:49 -0700

    Merge pull request #2046 from sikachu/master-test_fix
    
    Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a

commit 79fa146	refs/tags/v3.1.1.rc1
Author: Prem Sichanugrist 
Date:   2011-07-12 19:41:46 -0400

    Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to be in its method

M	actionpack/test/template/url_helper_test.rb

commit 2cb29fa	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-07-12 19:41:46 -0400

    Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to be in its method

M	actionpack/test/template/url_helper_test.rb

commit edfb81d	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-07-12 19:41:46 -0400

    Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to be in its method

M	actionpack/test/template/url_helper_test.rb

commit 7669c33	refs/heads/master
Merge: ac97e25 2668dce
Author: Santiago Pastorino 
Date:   2011-07-17 12:28:03 -0700

    Merge pull request #2018 from bhus/render_partial_invalid_check
    
    Render partial invalid check

commit ac97e25	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-17 19:44:47 +0100

    Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_test.rb when UTC and local time occur on different dates." I am pretty sure this was an incorrect fix, and it still failed in certain circumstances anyway. I am now unable to reproduce the original failure I was experiencing so will leave it for now and see if this pops up again.
    
    This reverts commit e4479b2f1bc54edf155408d51dd3236955150ce1.

M	activerecord/test/fixtures/pirates.yml

commit 09f5780	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-07-18 00:20:40 +0530

    Not creating script/rails in full mode. from master.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit 4860143	refs/heads/master
Author: John Firebaugh 
Date:   2011-02-21 22:55:49 -0800

    ActiveModel support for the :include serialization option
    
    This commit moves support for the :include serialization option for
    serializing associated objects out of ActiveRecord in into ActiveModel.
    The following methods support the :include option:
    
      * serializable_hash
      * to_json
      * to_xml
    
    Instances must respond to methods named by the values of the :includes
    array (or keys of the :includes hash). If an association method returns
    an object that is_a?(Enumerable) (which AR has_many associations do), it
    is assumed to be a collection association, and its elements must respond
    to :serializable_hash. Otherwise it must respond to :serializable_hash
    itself.
    
    While here, fix #858, XmlSerializer should not singularize already
    singular association names.

M	activemodel/lib/active_model/serialization.rb
M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/test/cases/serialization_test.rb
M	activemodel/test/cases/serializers/xml_serialization_test.rb
M	activerecord/lib/active_record/serialization.rb
M	activerecord/lib/active_record/serializers/xml_serializer.rb

commit 1723a7a	refs/heads/master
Author: John Firebaugh 
Date:   2011-02-21 22:50:28 -0800

    Move to_xml tests to xml_serialization_test.rb
    
    One duplicate was eliminated: test_to_xml_including_methods/
    test_methods_are_called_on_object.

M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/xml_serialization_test.rb

commit 0933b6d	refs/heads/master
Author: John Firebaugh 
Date:   2011-02-21 18:51:21 -0800

    We already have the record; no need to retrieve it again

M	activerecord/lib/active_record/serializers/xml_serializer.rb

commit cbf924e	refs/heads/master
Author: John Firebaugh 
Date:   2011-02-21 16:30:33 -0800

    Replace map+compact with select

M	activemodel/lib/active_model/serialization.rb

commit 2a9a10f	refs/heads/master
Author: John Firebaugh 
Date:   2011-02-21 16:29:10 -0800

    Add a test

M	activemodel/test/cases/serialization_test.rb

commit da4e1fa	refs/heads/master
Author: John Firebaugh 
Date:   2011-02-21 16:17:30 -0800

    serializable_hash(:only => [], :methods => [:foo]) should work

M	activemodel/lib/active_model/serialization.rb
M	activemodel/test/cases/serialization_test.rb

commit 777fcc5	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-07-17 23:53:29 +0530

    More changes for plugin_new_generator.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit e35d520	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-07-17 23:08:35 +0530

    Adding tests for gemspec file creation

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
M	railties/test/generators/plugin_new_generator_test.rb

commit 2f00854	refs/heads/master
Merge: 0aec2e7 24d67cc
Author: Santiago Pastorino 
Date:   2011-07-17 10:04:53 -0700

    Merge pull request #2118 from arunagw/fix_plugin_gen_test
    
    As we are adding db folder in it. Required in test also.

commit a4a309f	refs/heads/master
Merge: a92780e 5187264
Author: Ray Baxter 
Date:   2011-07-17 09:31:23 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit a92780e	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 09:07:18 -0700

    use correct in description

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 39a4f67	refs/tags/v3.0.14
Author: Lauri Hahne 
Date:   2011-07-17 18:55:39 +0300

    made sure that the possible new output_buffer created by CacheHelper is of the same type as the original

M	actionpack/lib/action_view/helpers/cache_helper.rb
M	actionpack/test/controller/caching_test.rb

commit bc5ccd01	refs/tags/v3.0.14
Author: Lauri Hahne 
Date:   2011-07-17 18:42:34 +0300

    Added tests for the output_buffer returned by CacheHelper
    
    The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.

M	actionpack/test/controller/caching_test.rb

commit e6f0c24	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-07-17 15:21:19 +0200

    This fixes an issue when bundling to a local path (eg. /vendor/bundle).
    
    If you bundle to a local path bundler is not included in it, so
    calling "gem 'bundler'" will fail.

M	load_paths.rb

commit 24d67cc	refs/heads/master
Author: Arun Agrawal 
Date:   2011-07-17 18:39:33 +0530

    As we are adding db folder in it. Required in test also.

M	railties/test/generators/plugin_new_generator_test.rb

commit 5187264	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-17 20:22:01 +1200

    [asset pipeline] Correct CSS section and include Gem details
    
    Also added note about compress option, which was
    not mentioned anywhere and is required

M	railties/guides/source/asset_pipeline.textile

commit 602bac1	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-17 20:12:30 +1200

    [configuring] add doc for missing assets attribute
    
    .compress turns on the compression using the types
    specified in other config options

M	railties/guides/source/configuring.textile

commit 10c2132	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 00:31:28 -0700

    we're talking about days here, not hours

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 5c71a4e	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 00:31:09 -0700

    wording between select_second, select_minute and
    select_hour should be consistent and correct

M	actionpack/lib/action_view/helpers/date_helper.rb

commit f0a58db	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 00:24:31 -0700

    fix typo

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 2e6475e	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-17 00:06:46 -0700

    make documentation agree with test expectations and
    behaviour
    
    See: test_select_date_with_incomplete_order in
    actionpack/test/template/date_helper_test.rb

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 4341a5a	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:54:40 -0700

    document that second tags are also returned by default

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 6970c00	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:47:06 -0700

    there is no Time.today method, use Time.now

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 343a05a	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:44:01 -0700

    remove stray character

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 9a2b18c	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:42:35 -0700

    disambiguate uses of post/POST by using "article"
    for the related variable passed to  date_select,
    time_select and datetime_select

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 762a2f4	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:29:51 -0700

    clarify that classes that include DateHelper can
    also manipulate times

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 589ff96	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:27:26 -0700

    clarify that DateTime objects are allowed arguments
    to distance_of_time_in_words

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 4ada0a5	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:11:48 -0700

    use minute instead of second in description of select_minute

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 851275e	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:09:59 -0700

    show correct helper in description

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 5dd8277	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-16 23:08:30 -0700

    use 'hour' instead of 'minutes' and 'second' for select_hour

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 52a0962	refs/heads/master
Author: Lawrence Pit 
Date:   2011-07-17 14:51:34 +1000

    Made attribute_method_matchers_cache private + doc

M	activemodel/lib/active_model/attribute_methods.rb

commit bae54c5	refs/heads/master
Author: Sam Umbach 
Date:   2011-07-16 21:08:14 -0700

    Switch Tilt link to Textile format

M	railties/guides/source/asset_pipeline.textile

commit ade629e	refs/heads/master
Author: Sam Umbach 
Date:   2011-07-16 21:02:36 -0700

    Fix typo

M	railties/guides/source/asset_pipeline.textile

commit 86869a0	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-17 14:19:04 +1200

    [asset pipeline] A few corrections and some new material
    
    Add notes about capistrano task being added to that project
    and correction to information about precompilation.

M	railties/guides/source/asset_pipeline.textile

commit c2d3a43	refs/tags/v3.0.14
Author: Daniel Dyba 
Date:   2011-07-16 16:54:03 -0700

    Changed Commands module to RailsCommands.
    
    This is to avoid a conflict that occurs when you add Rake to
    your Gemfile. There is a Commands Object in Rake that conflicts
    with the Commands module in plugin.rb. See rails issue #1866.

M	railties/lib/rails/commands/plugin.rb

commit b6675d8	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-07-17 00:48:17 +0200

    synchronizes assets.rake with master

M	actionpack/lib/sprockets/assets.rake

commit 0aec2e7	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-17 00:44:00 +0200

    indeed, if we are going to remove everything in public/assets on assets:clean, just do that

M	actionpack/lib/sprockets/assets.rake

commit 53f6acd	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-17 00:35:21 +0200

    if we are cleaning all files, we are cleaning all gz files

M	actionpack/lib/sprockets/assets.rake

commit 296b1ee	refs/heads/master
Merge: e98d747 7b619f1
Author: Santiago Pastorino 
Date:   2011-07-16 11:22:58 -0700

    Merge pull request #2082 from htanata/rake_routes_formatting
    
    Better formatting of rake routes (issue #1991)

commit 247a50b	refs/tags/v3.0.14
Merge: 9a4d2b2 b1b5d18
Author: Santiago Pastorino 
Date:   2011-07-16 10:05:54 -0700

    Merge pull request #2064 from elight/3-0-stable
    
    Backports cache_key fix from master

commit 7b619f1	refs/heads/master
Author: Hendy Tanata 
Date:   2011-07-17 00:16:40 +0800

    Improve formatting of route to Rack application in rake routes.
    
    This route:
    
        match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
    
    is shown as:
    
        /foo/:id(.:format) RackApp {:id=>/[A-Z]\d{5}/}

M	railties/lib/rails/tasks/routes.rake
M	railties/test/application/rake_test.rb

commit b1b5d18	refs/tags/v3.0.14
Author: Evan Light 
Date:   2011-07-13 22:51:53 -0400

    Fixes #2064
    
    Backport of cache_key fix from master

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit e98d747	refs/heads/master
Merge: 3e06ec8 8b080b3
Author: Santiago Pastorino 
Date:   2011-07-16 08:43:51 -0700

    Merge pull request #2108 from loz/master
    
    Adds gem helper rake tasks to engines generator

commit b88e368	refs/tags/v3.1.1.rc1
Merge: fb95dee 1fdf6f6
Author: Santiago Pastorino 
Date:   2011-07-16 08:43:19 -0700

    Merge pull request #2103 from loz/3-1-stable
    
    Added gem helper tasks to Rakefile for engine plugins.

commit 8b080b3	refs/heads/master
Author: Jonathan Lozinski 
Date:   2011-07-16 16:06:44 +0100

    Added gem helper to rake task for engines, as per pull request from 3-1-stable, #2103

M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile

commit 1fdf6f6	refs/tags/v3.1.1.rc1
Author: Jonathan Lozinski 
Date:   2011-07-16 07:15:28 +0100

    Added gem helper tasks to Rakefile for engine plugins.  It makes sense for this to be there given they're being generated to be gemified.
    
    Altered addition to Rakefile so that it won't add GemHelper if the user specified --skip-gemspec

M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile

commit fb95dee	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-07-16 14:21:53 +0100

    Deprecated the AssociationCollection constant

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 0f37def	refs/tags/v3.1.1.rc1
Merge: 3fb7017 2cbac3c
Author: Santiago Pastorino 
Date:   2011-07-16 06:06:33 -0700

    Merge pull request #2065 from elight/3-1-stable
    
    Backport of cache_key fix from master

commit 3e06ec8	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-16 09:36:11 -0300

    Fix the output a bit

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 3fb7017	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-07-16 09:36:11 -0300

    Fix the output a bit

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 455e321	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-16 08:22:43 -0400

    added test case for fix to issue #2094

M	actionpack/test/template/form_helper_test.rb

commit 94d8e6b	refs/heads/master
Merge: c2b62ad 06c9dd1
Author: José Valim 
Date:   2011-07-16 04:02:12 -0700

    Merge pull request #2101 from loz/master
    
    Added db to gemspec so migrations are packaged

commit 5e2c1d2	refs/tags/v3.1.1.rc1
Merge: 68e2b8a 357e7bb
Author: Aaron Patterson 
Date:   2011-07-16 00:31:35 -0700

    Merge pull request #2099 from htanata/backport_2090_to_3-1-stable
    
    Backport #2090 to 3-1-stable

commit 0f78aee	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-16 19:02:40 +1200

    [asset pipeline] Add section on sendfile option
    
    This option has caught a few people out, so it
    is a good idea to include an explanation and
    a Gotcha.
    
    See Rails bug 1822
    See 1822 comment 1585926 for resolution

M	railties/guides/source/asset_pipeline.textile

commit c3dd4c6	refs/heads/master
Author: Lawrence Pit 
Date:   2011-07-16 16:40:11 +1000

    Issue #2075 Optimization of ActiveModel's match_attribute_method?

M	activemodel/lib/active_model/attribute_methods.rb

commit 06c9dd1	refs/heads/master
Author: Jonathan Lozinski 
Date:   2011-07-16 06:48:54 +0100

    Added db to gemspec files so migrations are correctly packaged

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit 357e7bb	refs/tags/v3.1.1.rc1
Author: Hendy Tanata 
Date:   2011-07-16 04:26:49 +0800

    Fix wildcard route code example in changelog.

M	actionpack/CHANGELOG

commit 765b792	refs/heads/master
Author: John Warwick 
Date:   2011-07-15 22:40:17 -0400

    Fixing typo in plugins.textile

M	railties/guides/source/plugins.textile

commit 2cbac3c	refs/tags/v3.1.1.rc1
Author: Evan Light 
Date:   2011-07-13 22:17:38 -0400

    Closes #2065
    
    Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit c6d83ab	refs/heads/master
Author: Dan Gebhardt 
Date:   2011-07-15 18:22:31 -0400

    fixed problem in which options[:html][:remote] would be overridden in form_for() - fixes #2094

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 68e2b8a	refs/tags/v3.1.1.rc1
Merge: 9441c94 4662b99
Author: Santiago Pastorino 
Date:   2011-07-15 14:38:39 -0700

    Merge pull request #2092 from loz/3-1-stable
    
    Fixed engine gemspec so that app, config, and db are packaged up

commit c2b62ad	refs/heads/master
Merge: f88e9d8 d7f4a3e
Author: Santiago Pastorino 
Date:   2011-07-15 14:24:43 -0700

    Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelog
    
    Fix wildcard route code example in changelog

commit 4662b99	refs/tags/v3.1.1.rc1
Author: Jonathan Lozinski 
Date:   2011-07-15 22:14:00 +0100

    Fixed engine gemspec so that app, config, and db are packaged up

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit d7f4a3e	refs/heads/master
Author: Hendy Tanata 
Date:   2011-07-16 04:26:49 +0800

    Fix wildcard route code example in changelog.

M	actionpack/CHANGELOG

commit 193e4de	refs/heads/master
Author: Hendy Tanata 
Date:   2011-07-15 01:54:59 +0800

    Better formatting of route requirements in rake:routes.
    
    Previously it was:
    
        {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/}
    
    Now it becomes:
    
        photos#show {:id=>/[A-Z]\d{5}/}

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	railties/guides/source/routing.textile
M	railties/lib/rails/tasks/routes.rake
M	railties/test/application/rake_test.rb

commit 88e307a	refs/heads/master
Merge: b6d5612 651cabc
Author: Vijay Dev 
Date:   2011-07-15 11:32:11 -0700

    Merge pull request #52 from dyba/651cabc69a6cd661bc33824b995c2242fb65befe
    
    Modified migrations file

commit b6d5612	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-07-15 23:56:58 +0530

    Should be "match" instead of "map"

M	railties/guides/source/routing.textile

commit ff410c4	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-15 23:06:37 +0530

    Revert "Fix wildcard route code examples."
    
    This reverts commit 0894d73c7552a4c7d576b7d3692c6a18faadd273.
    
    Reason: CHANGELOGs should not be changed in docrails.

M	actionpack/CHANGELOG
M	railties/guides/source/routing.textile

commit 0894d73	refs/heads/master
Author: Hendy Tanata 
Date:   2011-07-15 21:56:03 +0800

    Fix wildcard route code examples.
    
    Should be "match" instead of "map".

M	actionpack/CHANGELOG
M	railties/guides/source/routing.textile

commit 9cd1f75	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-15 20:30:27 +0900

    convert multiple Date parameters into a nil if any of its bits were blank

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit d664eba	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-07-15 09:48:10 +0200

    Added a .travis.yml config and travis specific ci script.
    
    Don't install ruby-debug if running the test suite on Travis,
    linecache19 is the main offender, very very slow.
    
    And do not install pg if Travis is bundling the gems, pg will be setup
    on Travis soon.

A	.travis.yml
M	Gemfile
A	ci/travis.rb

commit c476a6b	refs/tags/v3.0.14
Author: Lauri Hahne 
Date:   2011-07-15 09:12:11 +0300

    fixed CacheHelper to properly support html_safe output buffers

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 28d5d22	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-15 16:19:11 +1200

    [asset pipeline] Added information about data uri helper
    
    See Sprockets issue 111
    and Sprockets commit cd38a1670a

M	railties/guides/source/asset_pipeline.textile

commit f04c5d6	refs/heads/master
Author: Lawrence Pit 
Date:   2011-07-15 09:58:46 +1000

    Optimization of ActiveModel's match_attribute_method?

M	activemodel/lib/active_model/attribute_methods.rb

commit f88e9d8	refs/heads/master
Merge: 31ea027 4755930
Author: Santiago Pastorino 
Date:   2011-07-14 12:19:21 -0700

    Merge pull request #2073 from bfolkens/master
    
    ported test from pull request #2071 to master

commit 4755930	refs/heads/master
Author: Bradford Folkens 
Date:   2011-07-14 14:01:39 -0500

    assert nothing raised for setting a cookie value to nil in ActionDispatch

M	actionpack/test/dispatch/test_request_test.rb

commit 9441c94	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-07-14 15:25:07 -0300

    Fix indentation

M	actionpack/test/dispatch/test_request_test.rb

commit 13b2153	refs/tags/v3.1.1.rc1
Merge: 0820283 36836f1
Author: Santiago Pastorino 
Date:   2011-07-14 11:23:14 -0700

    Merge pull request #2071 from bfolkens/3-1-stable
    
    write_cookies! nil exception in ActionDispatch::TestRequest

commit 31ea027	refs/heads/master
Merge: d632e92 f13dea8
Author: Santiago Pastorino 
Date:   2011-07-14 11:14:27 -0700

    Merge pull request #2063 from elight/master
    
    Patch for https://github.com/rails/rails/issues/2059

commit f13dea8	refs/heads/master
Author: Evan Light 
Date:   2011-07-13 22:17:38 -0400

    Fix and unit test for https://github.com/rails/rails/issues/2059
    
    Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key
    
    Minor refactoring to cache_key timezone test
    
    Closes #2059
    
    Adds a test to validate the format of the cache_key for nil and present updated_at values
    
    Correctly handles updated_at == nil

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 36836f1	refs/tags/v3.1.1.rc1
Author: Bradford Folkens 
Date:   2011-07-14 13:03:03 -0500

    write_cookies! in ActionDispatch::TestRequest won't write nil value when  == 'u' on 1.8.7

M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/dispatch/test_request_test.rb

commit cd8530d	refs/heads/master
Author: joeellis 
Date:   2011-07-14 09:17:29 -0700

    Minor grammar mistake

M	railties/guides/source/asset_pipeline.textile

commit d632e92	refs/heads/master
Merge: db0a65c 96be08d
Author: Santiago Pastorino 
Date:   2011-07-14 07:57:04 -0700

    Merge pull request #1807 from caius/find_in_batches_id_bug
    
    Bugfix by stopping find_in_batches using the records after yielding.

commit db0a65c	refs/heads/master
Merge: 003c651 99d598a
Author: Aaron Patterson 
Date:   2011-07-14 01:30:53 -0700

    Merge pull request #2066 from amatsuda/magicome
    
    missing magic comments

commit 99d598a	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-14 12:39:34 +0900

    need magic comments

M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/test/core_ext/blank_test.rb

commit 651cabc	refs/heads/master
Author: Daniel Dyba 
Date:   2011-06-29 23:04:02 -0700

    Modified Migrations file

M	railties/guides/source/migrations.textile

commit 003c651	refs/heads/master
Merge: 54ab63e 9c60860
Author: Aaron Patterson 
Date:   2011-07-13 19:04:28 -0700

    Merge pull request #2052 from amatsuda/fullwidth_blank
    
    treat fullwidth whitespace as a blank character

commit 0820283	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-07-13 21:40:46 -0300

    Bump rack up

M	actionpack/actionpack.gemspec

commit 54ab63e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-13 21:40:46 -0300

    Bump rack up

M	actionpack/actionpack.gemspec

commit 9c60860	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-13 20:30:34 +0900

    treat fullwidth whitespace as a blank character

M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/test/core_ext/blank_test.rb

commit 2668dce	refs/heads/master
Author: huskins 
Date:   2011-07-13 13:06:03 -0400

    Added view template invalid name check, along with tests. No merges in commit.

M	actionpack/lib/action_view/renderer/partial_renderer.rb
A	actionpack/test/fixtures/test/_200.html.erb
M	actionpack/test/template/render_test.rb

commit c7359e3	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-13 18:27:14 +0900

    documentation fix: wrong result

M	activesupport/lib/active_support/multibyte/chars.rb

commit 5dcebd7	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-13 21:20:53 +1200

    [asset pipeline] add capistrano task
    
    Task still needs to symlink default rails default
    filestore location, but code may still be settling

M	railties/guides/source/asset_pipeline.textile

commit 991678c	refs/heads/master
Author: Aslam Najeebdeen 
Date:   2011-07-13 13:33:32 +0530

    Replaced appropriate word.

M	railties/guides/source/migrations.textile

commit 675c20e	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-12 22:55:34 -0300

    Use cache/assets instead.

M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/tasks/tmp.rake
M	railties/test/generators/app_generator_test.rb

commit 704ee0d	refs/heads/master
Author: José Valim 
Date:   2011-07-12 22:55:34 -0300

    Use cache/assets instead.

M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/tasks/tmp.rake
M	railties/test/generators/app_generator_test.rb

commit d0f05a6	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-12 22:30:11 -0300

    assets.cache_store now defaults to filesystem. You will want to share tmp/assets_cache between deploys.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/tasks/tmp.rake
M	railties/test/application/paths_test.rb
M	railties/test/generators/app_generator_test.rb

commit 8f0e0b6	refs/heads/master
Author: José Valim 
Date:   2011-07-12 22:30:11 -0300

    assets.cache_store now defaults to filesystem. You will want to share tmp/assets_cache between deploys.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/tasks/tmp.rake
M	railties/test/application/paths_test.rb
M	railties/test/generators/app_generator_test.rb

commit 8cf4515	refs/heads/master
Merge: 4735e2e 88e6c06
Author: Santiago Pastorino 
Date:   2011-07-12 15:06:00 -0700

    Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patch
    
    Fix for SqlBypass session store (for master)

commit 4735e2e	refs/heads/master
Merge: 8f58bd4 66dee26
Author: Santiago Pastorino 
Date:   2011-07-12 15:05:29 -0700

    Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-test
    
    Fixed session ID fixation for ActiveRecord::SessionStore (for master)

commit a91afeb	refs/tags/v3.1.1.rc1
Merge: 926ef07 b87f8d8
Author: Santiago Pastorino 
Date:   2011-07-12 15:05:05 -0700

    Merge pull request #2040 from SAP-Oxygen/3-1-stable-sqlbypass-patch
    
    Fix for SqlBypass session store

commit 926ef07	refs/tags/v3.1.1.rc1
Merge: 5c591e5 63fdd2c
Author: Santiago Pastorino 
Date:   2011-07-12 15:04:47 -0700

    Merge pull request #2039 from SAP-Oxygen/3-1-stable-session-id-patch-with-test
    
    Fix for session ID fixation issue in ActiveRecord::SessionStore (squashed commits)

commit 8f58bd4	refs/heads/master
Merge: e4479b2 5e73a2f
Author: José Valim 
Date:   2011-07-12 11:49:32 -0700

    Merge pull request #2038 from FLOChip/extra_space
    
    remove extra space since comment_if already returns the space.

commit 88e6c06	refs/heads/master
Author: Joseph Wong 
Date:   2011-07-08 13:21:38 -0700

    Fix for SqlBypass session store
    
    Two issues fixed:
    1) connection_pool is not defined - needed by SessionStore#drop_table!
    and create_table! since c94651f
    
    2) initialization of connection to the default of AR::Base.connection
    only occurred at the singleton level - the instance level method defined
    by cattr_accessor did not have this logic

M	activerecord/lib/active_record/session_store.rb

commit 66dee26	refs/heads/master
Author: Joseph Wong 
Date:   2011-07-08 10:39:10 -0700

    Fixed session ID fixation for ActiveRecord::SessionStore
    
    I have found that Rails will take an invalid session ID specified by the
    client and materialize a session based on that session ID. This means
    that it is possible, among other things, for a client to use an
    arbitrarily weak session ID or for a client to resurrect a previous used
    session ID. In other words, we cannot guarantee that all session IDs are
    generated by the server and that they are (statistically) unique through
    time.
    
    The fix is to always generate a new session ID in #get_session if an
    existing session cannot be found under the incoming session ID.
    
    Also added new tests that make sure that an invalid session ID is never
    materialized into a new session, regardless of whether it comes in via a
    cookie or a URL parameter (when :cookie_only => false).

M	actionpack/test/activerecord/active_record_store_test.rb
M	activerecord/lib/active_record/session_store.rb

commit b87f8d8	refs/tags/v3.1.1.rc1
Author: Joseph Wong 
Date:   2011-07-08 13:21:38 -0700

    Fix for SqlBypass session store
    
    Two issues fixed:
    1) connection_pool is not defined - needed by SessionStore#drop_table!
    and create_table! since c94651f
    
    2) initialization of connection to the default of AR::Base.connection
    only occurred at the singleton level - the instance level method defined
    by cattr_accessor did not have this logic

M	activerecord/lib/active_record/session_store.rb

commit 63fdd2c	refs/tags/v3.1.1.rc1
Author: Joseph Wong 
Date:   2011-07-08 10:39:10 -0700

    Fixed session ID fixation for ActiveRecord::SessionStore
    
    I have found that Rails will take an invalid session ID specified by the
    client and materialize a session based on that session ID. This means
    that it is possible, among other things, for a client to use an
    arbitrarily weak session ID or for a client to resurrect a previous used
    session ID. In other words, we cannot guarantee that all session IDs are
    generated by the server and that they are (statistically) unique through
    time.
    
    The fix is to always generate a new session ID in #get_session if an
    existing session cannot be found under the incoming session ID.
    
    Also added new tests that make sure that an invalid session ID is never
    materialized into a new session, regardless of whether it comes in via a
    cookie or a URL parameter (when :cookie_only => false).

M	actionpack/test/activerecord/active_record_store_test.rb
M	activerecord/lib/active_record/session_store.rb

commit 5e73a2f	refs/heads/master
Author: Teng Siong Ong 
Date:   2011-07-13 00:59:30 +0800

    remove extra space since comment_if already returns the space.

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb

commit 85dd1dd	refs/heads/master
Author: Matt Jankowski 
Date:   2011-07-12 10:20:42 -0400

    grammar correction for rails/paths #add method arguments

M	railties/lib/rails/paths.rb

commit 2f30fb0	refs/heads/master
Author: Matt Jankowski 
Date:   2011-07-12 09:54:43 -0400

    misc grammar and clarity changes for rails/engine docs

M	railties/lib/rails/engine.rb

commit eb716f6	refs/heads/master
Author: Matt Jankowski 
Date:   2011-07-12 09:37:55 -0400

    grammar/tense correction to rails application doc

M	railties/lib/rails/application.rb

commit 9a4d2b2	refs/tags/v3.0.14
Merge: fc4bce1 0252376
Author: Aaron Patterson 
Date:   2011-07-11 17:28:31 -0700

    Merge pull request #1607 from bradrobertson/pg_adapter
    
    fix table_exists? in postgresql adapter to always use current search_path

commit fc4bce1	refs/tags/v3.0.14
Merge: 28f057c caec639
Author: Jon Leighton 
Date:   2011-07-11 16:32:49 -0700

    Merge pull request #1797 from kuahyeow/3-0-stable
    
    Through association condition clobbers join condition

commit 5c591e5	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-07-12 00:04:01 +0100

    Fix exception if old and new targets are both nil. Fixes #1471.
    
    Conflicts:
    
    	activerecord/test/models/comment.rb

M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/schema/schema.rb

commit e4479b2	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-12 00:14:26 +0100

    Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_test.rb when UTC and local time occur on different dates.

M	activerecord/test/fixtures/pirates.yml

commit 1712d90	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-12 00:04:01 +0100

    Fix exception if old and new targets are both nil. Fixes #1471.

M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/schema/schema.rb

commit 5c8be9e	refs/heads/master
Author: Joshua Peek 
Date:   2011-07-11 16:09:46 -0700

    Ensure Dir.glob is sorted

M	railties/lib/rails/paths.rb

commit 15438c4	refs/tags/v3.1.1.rc1
Author: Joshua Peek 
Date:   2011-07-11 16:08:15 -0700

    Ensure Dir.glob is sorted

M	railties/lib/rails/paths.rb

commit eeb58b0	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-03-05 16:25:20 -0500

    Generate valid default fixtures for models with a type column
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/generated_attribute_test.rb

commit f4858e4	refs/tags/v3.1.1.rc1
Author: Marc-Andre Lafortune 
Date:   2011-03-05 16:25:20 -0500

    Generate valid default fixtures for models with a type column
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/generated_attribute_test.rb

commit caec639	refs/tags/v3.0.14
Author: kuahyeow 
Date:   2011-06-21 17:45:00 +1200

    Fix for 3-0-stable - Conditions specified on through association shouldn't clobber asssociation join condition.
    
    This fix refactors processing of association join conditions so that both the join condition and the custom condition will be used when called by query_methods.rb, which expects a 1 or 2-sized array (depending on the type of association). Previously, a custom condition specified would create a 2 or 3-sized array which will clobber the association join condition.

M	activerecord/lib/active_record/associations.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb

commit a9980d1	refs/tags/v3.1.1.rc1
Author: Joshua Peek 
Date:   2011-07-11 13:10:02 -0500

    Float sprockets again

M	actionpack/actionpack.gemspec

commit 1939fa3	refs/heads/master
Merge: 133a203 587dd7d
Author: José Valim 
Date:   2011-07-11 10:25:04 -0700

    Merge pull request #1722 from AndrewRadev/grouped-select
    
    Make "select" helper handle nested collections

commit 133a203	refs/heads/master
Merge: 91bba21 c2b79c0
Author: José Valim 
Date:   2011-07-11 10:00:28 -0700

    Merge pull request #1756 from shtirlic/xmlschema_fix
    
    Fix xmlschema output with fraction_digits >0

commit 587dd7d	refs/heads/master
Author: Andrew Radev 
Date:   2011-06-14 22:45:22 +0300

    Grouped select helper
    
    FormBuilder#select now works with a nested data structure.

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit a239973	refs/tags/v3.1.1.rc1
Author: Julius Markūnas 
Date:   2011-07-11 14:59:51 +0300

    #many? uses count instead of select - a bit faster

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit 91bba21	refs/heads/master
Merge: 1fdbd47 ea0eb02
Author: Xavier Noria 
Date:   2011-07-11 08:36:15 -0700

    Merge pull request #2032 from dziulius/master
    
    #many? - uses count instead of select

commit c2b79c0	refs/heads/master
Author: shtirlic 
Date:   2011-07-11 18:41:04 +0400

    Fix xmlschema output with fraction_digits >0
    
    Current implementation produce incorrect output when Time#usec returns
    integer < 100000, because to_s doesn't add leading zeros.

M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 1fdbd47	refs/heads/master
Merge: 3da3df8 525fd3a
Author: José Valim 
Date:   2011-07-11 07:35:43 -0700

    Merge pull request #2009 from vatrai/autoload-todo-new
    
    TODO fix explicitly loading exceptations, autoload removed

commit 33f76e1	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-11 11:19:03 -0300

    Require assets in all environments by default and provide a way to opt-out from uglifier.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 3da3df8	refs/heads/master
Author: José Valim 
Date:   2011-07-11 11:19:03 -0300

    Require assets in all environments by default and provide a way to opt-out from uglifier.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit d5e8722	refs/heads/master
Merge: 539d684 75cfd03
Author: José Valim 
Date:   2011-07-11 06:51:24 -0700

    Merge pull request #2029 from sikachu/acronym_mention
    
    Mention about acronym inflection in config/initializers/inflections.rb

commit 75cfd03	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-07-10 22:21:44 -0400

    Mention about acronym inflection in config/initializers/inflections.rb
    
    Closes #1366

M	railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb

commit 539d684	refs/heads/master
Merge: 8f2e321 5399471
Author: Santiago Pastorino 
Date:   2011-07-11 06:00:59 -0700

    Merge pull request #1929 from sobrinho/master
    
    Create a test case for disable_referential_integrity

commit 812950e	refs/heads/master
Author: Hrvoje Šimić 
Date:   2011-07-11 14:45:47 +0200

    fixed paths, more consistent helpers and paths examples

M	railties/guides/source/routing.textile

commit ea0eb02	refs/heads/master
Author: Julius Markūnas 
Date:   2011-07-11 14:59:51 +0300

    #many? uses count instead of select - a bit faster

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit 8f2e321	refs/heads/master
Merge: e9f9ce9 c2aacdf
Author: José Valim 
Date:   2011-07-11 04:54:28 -0700

    Merge pull request #1608 from sishen/sishen
    
    MemcacheStore: deserialize the entry reading from local_cache when using

commit e9f9ce9	refs/heads/master
Merge: 871d7fa 83555a5
Author: José Valim 
Date:   2011-07-11 04:28:00 -0700

    Merge pull request #1296 from c42engineering/issue636
    
    Resubmitting issue #636 as a pull request

commit 871d7fa	refs/heads/master
Merge: c3732bf ea649de
Author: José Valim 
Date:   2011-07-11 04:20:48 -0700

    Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env-default
    
    Put back Rails.application#env_default and deprecate it [Closes #1922]

commit ea649de	refs/heads/master
Author: Franck Verrot 
Date:   2011-07-11 11:05:26 +0200

    Rails.application#env_config is now public API. [Closes #1924]

M	railties/lib/rails/application.rb
M	railties/test/application/configuration_test.rb

commit 826820f	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-11 19:52:36 +1200

    [asset pipeline] more updates to docs

M	railties/guides/source/asset_pipeline.textile

commit 525fd3a	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-06-29 19:08:09 +0530

    TODO fix explicitly loading exceptations, autoload removed

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
M	actionpack/lib/action_view/asset_paths.rb

commit 83555a5	refs/heads/master
Author: Sidu Ponnappa 
Date:   2011-05-25 17:25:32 +0530

    Issue #636 - Parsing an xml file with multiple records and extra attributes (besides type) fails

M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit c3732bf	refs/heads/master
Merge: 60076de 618300f
Author: Santiago Pastorino 
Date:   2011-07-10 18:02:31 -0700

    Merge pull request #1823 from gnarg/master
    
    Log instrumentation name for exists? queries

commit d2ff099	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-10 21:44:06 +0530

    use simpler words in docs

M	activerecord/lib/active_record/base.rb

commit 60076de	refs/heads/master
Author: José Valim 
Date:   2011-07-10 08:35:06 -0300

    Make Rails.groups accept arrays.

M	railties/lib/rails.rb
M	railties/test/application/configuration_test.rb

commit 4c76991	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-10 08:35:06 -0300

    Make Rails.groups accept arrays.

M	railties/lib/rails.rb
M	railties/test/application/configuration_test.rb

commit e249dd9	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-07-10 12:37:32 +0930

    Include TagHelper within AssetTagHelper

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit 3a611cb	refs/heads/master
Merge: c544872 0ac79d0
Author: José Valim 
Date:   2011-07-10 03:58:57 -0700

    Merge pull request #2026 from spohlenz/asset-tag-fix
    
    Include TagHelper within AssetTagHelper

commit 0ac79d0	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-07-10 12:37:32 +0930

    Include TagHelper within AssetTagHelper

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit a7319a9	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-07-09 15:34:44 -0300

    to_key on a destroyed model should return nil

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/primary_keys_test.rb

commit c544872	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-09 15:34:44 -0300

    to_key on a destroyed model should return nil

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/test/cases/primary_keys_test.rb

commit ea16e0f	refs/heads/master
Author: Pol Llovet 
Date:   2011-07-09 12:35:16 -0600

    Add more examples to #titleize

M	activesupport/lib/active_support/inflector/methods.rb

commit de44f41	refs/tags/v3.1.1.rc1
Merge: ca94acf 8a4fdbb
Author: Santiago Pastorino 
Date:   2011-07-09 08:44:34 -0700

    Merge pull request #2022 from amatsuda/having_vargs_nomethoderror_fix_3-1-stable
    
    having() raises NoMethodError (3-1-stable)

commit 8a4fdbb	refs/tags/v3.1.1.rc1
Author: Akira Matsuda 
Date:   2011-07-08 12:20:10 +0900

    formats

M	activerecord/test/cases/finder_test.rb

commit 7f37ed0	refs/tags/v3.1.1.rc1
Author: Akira Matsuda 
Date:   2011-07-08 12:16:32 +0900

    fix AR having() not to raise NoMethodError when the given argument does not respond to empty?
    
    having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/finder_test.rb

commit a982443	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-07-09 14:24:28 +0200

    Make #extract_schema_and_table an instance method in Utils
    
    Also, move the utils test into its own test case.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
A	activerecord/test/cases/adapters/postgresql/utils_test.rb

commit bc364af	refs/heads/master
Merge: 111968d 7c921fb
Author: Santiago Pastorino 
Date:   2011-07-09 05:20:42 -0700

    Merge pull request #2007 from amatsuda/having_vargs_nomethoderror_fix
    
    having() raises NoMethodError: undefined method `empty?' when the given argument does not respond to empty?

commit 7c921fb	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 12:20:10 +0900

    formats

M	activerecord/test/cases/finder_test.rb

commit d1545bc	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 12:16:32 +0900

    fix AR having() not to raise NoMethodError when the given argument does not respond to empty?
    
    having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/finder_test.rb

commit ca94acf	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-07-09 11:37:48 +0100

    Foo.joins(:bar).includes(:bar) should result in a single query with :bar as a join. Related: #1873.

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 111968d	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-09 11:37:48 +0100

    Foo.joins(:bar).includes(:bar) should result in a single query with :bar as a join. Related: #1873.

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 2beea3b	refs/heads/master
Author: Olek Janiszewski 
Date:   2011-07-07 23:01:27 +0300

    Documentation fixes for rendering partials

M	actionpack/lib/action_view/renderer/partial_renderer.rb

commit 7a8b0ec	refs/tags/v3.1.1.rc1
Author: Ryan Bigg 
Date:   2011-07-08 12:45:32 +1000

    Add section about debugging assets

M	railties/guides/source/asset_pipeline.textile

commit d0f9a31	refs/tags/v3.1.1.rc1
Author: Ryan Bigg 
Date:   2011-07-08 12:41:00 +1000

    Clarify that per-controller asset files are not 'magically' loaded by the controller, but rather need to be required

M	railties/guides/source/asset_pipeline.textile

commit d17d455	refs/tags/v3.1.1.rc1
Author: Christopher Scott Hernandez 
Date:   2011-07-08 10:02:01 -0700

    Updated active_record_querying.textile: intro paragraph of 'Conditions' to change 'find method' to 'where method'

M	railties/guides/source/active_record_querying.textile

commit 6dad5b2	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-08 20:51:09 +0530

    update Rails version. (rails console didn't exist in 2.1)

M	railties/guides/source/debugging_rails_applications.textile

commit 2f5ebd9	refs/tags/v3.1.1.rc1
Author: Oge Nnadi 
Date:   2011-07-08 07:57:16 -0700

    Changed the value that log_level takes to match the examples in the paragraph above

M	railties/guides/source/debugging_rails_applications.textile

commit 3cb67e4	refs/tags/v3.1.1.rc1
Author: Akira Matsuda 
Date:   2011-07-08 01:24:00 +0900

    find(:first) => first

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb

commit a9f4d7b	refs/tags/v3.1.1.rc1
Author: Shawn Drost 
Date:   2011-07-07 03:52:48 -0700

    document HashWithIndifferentAccess#extractable_options?

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit 4f36daf	refs/tags/v3.1.1.rc1
Author: JudeArasu 
Date:   2011-07-05 22:49:44 +0530

    rails text been added before version

M	railties/guides/source/asset_pipeline.textile

commit bd13a68	refs/tags/v3.1.1.rc1
Author: James Miller 
Date:   2011-07-05 08:40:09 -0700

    Remove attachment_fu, add CarrierWave to suggested uploader libraries

M	railties/guides/source/form_helpers.textile

commit b65bd01	refs/heads/master
Merge: 6917c65 1835aba
Author: Xavier Noria 
Date:   2011-07-09 12:20:24 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 6917c65	refs/heads/master
Merge: d9182c0 6b9c38c
Author: José Valim 
Date:   2011-07-08 18:34:02 -0700

    Merge pull request #2017 from Casecommons/active_record_lint
    
    ActiveRecord::Base subclasses should pass ActiveModel::Lint.

commit 1835aba	refs/heads/master
Author: Ryan Bigg 
Date:   2011-07-08 12:45:32 +1000

    Add section about debugging assets

M	railties/guides/source/asset_pipeline.textile

commit 678dd6f	refs/heads/master
Author: Ryan Bigg 
Date:   2011-07-08 12:41:00 +1000

    Clarify that per-controller asset files are not 'magically' loaded by the controller, but rather need to be required

M	railties/guides/source/asset_pipeline.textile

commit d9182c0	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-07-08 21:44:31 -0300

    config should always be an AS::InheritableOptions object. Closes #1992

M	actionpack/lib/action_view/base.rb
M	actionpack/test/template/test_case_test.rb

commit 2aefff8	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-07-08 21:44:31 -0300

    config should always be an AS::InheritableOptions object. Closes #1992

M	actionpack/lib/action_view/base.rb
M	actionpack/test/template/test_case_test.rb

commit 7cef8ad	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-07-09 00:10:50 +0200

    backports f6a6b51 and ad912c0

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 6b9c38c	refs/heads/master
Author: Grant Hutchins & Peter Jaros 
Date:   2011-07-08 17:51:40 -0400

    ActiveRecord::Base should pass ActiveModel::Lint.

M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit 15f5c3b	refs/tags/v3.1.1.rc1
Author: Tomas D'Stefano 
Date:   2011-05-31 11:43:19 -0300

    Destroy association habtm record before destroying the record itself. Fixes issue #402.

M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/schema/schema.rb

commit ea4b94a	refs/heads/master
Author: Tomas D'Stefano 
Date:   2011-05-31 11:43:19 -0300

    Destroy association habtm record before destroying the record itself. Fixes issue #402.

M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/schema/schema.rb

commit 28f057c	refs/tags/v3.0.14
Author: Tomas D'Stefano 
Date:   2011-05-31 11:43:19 -0300

    Destroy association habtm record before destroying the record itself. Fixes issue #402.

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/schema/schema.rb

commit dfec373	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-08 20:59:25 +0100

    Ensure that the foreign key gets set when doing record.create_association or record.create_association. Fixes #1960.

M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 6d2acc1	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-07-08 20:59:25 +0100

    Ensure that the foreign key gets set when doing record.create_association or record.create_association. Fixes #1960.

M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 5f6c6a7	refs/heads/master
Merge: 5724625 2423aca
Author: Christopher Scott Hernandez 
Date:   2011-07-08 10:05:05 -0700

    Merge pull request #51 from christopherscott/master
    
    Single word change (find -> where) on active record query page

commit 2423aca	refs/heads/master
Author: Christopher Scott Hernandez 
Date:   2011-07-08 10:02:01 -0700

    Updated active_record_querying.textile: intro paragraph of 'Conditions' to change 'find method' to 'where method'

M	railties/guides/source/active_record_querying.textile

commit c1c886a	refs/heads/master
Merge: 4f7ca00 9991f0f
Author: Aaron Patterson 
Date:   2011-07-08 09:12:06 -0700

    Merge pull request #2012 from dasch/refactor_postgres_adapter
    
    Refactor PostgreSQLAdapter a bit

commit 5724625	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-08 20:51:09 +0530

    update Rails version. (rails console didn't exist in 2.1)

M	railties/guides/source/debugging_rails_applications.textile

commit 2b8c874	refs/heads/master
Author: Oge Nnadi 
Date:   2011-07-08 07:57:16 -0700

    Changed the value that log_level takes to match the examples in the paragraph above

M	railties/guides/source/debugging_rails_applications.textile

commit 9991f0f	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-07-08 15:59:46 +0200

    Refactor PostgreSQLAdapter a bit
    
    Move the private method #extract_schema_and_table into a separate
    Utils module so that it can be tested without resorting to #send.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 4f7ca00	refs/heads/master
Merge: 3a1ec9b 9e63f9f
Author: Santiago Pastorino 
Date:   2011-07-08 06:10:55 -0700

    Merge pull request #2010 from hasclass/cache_false_values
    
    Properly cache value when it is "false"

commit 3a1ec9b	refs/heads/master
Merge: ad912c0 dab0de4
Author: Santiago Pastorino 
Date:   2011-07-08 06:05:20 -0700

    Merge pull request #2011 from amatsuda/with_index
    
    replaced some "i += 1" sort of codes with Enumerable#with_index

commit dab0de4	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 21:45:41 +0900

    Use Enumerable#with_index. We're on Ruby > 1.8.7 (part II)

M	activerecord/test/cases/fixtures_test.rb

commit 49bf859	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 21:38:02 +0900

    Use Enumerable#with_index. We're on Ruby > 1.8.7

M	activerecord/lib/active_record/relation.rb

commit 9e63f9f	refs/heads/master
Author: Sebi Burkhard 
Date:   2011-07-08 18:08:37 +0700

    Properly cache value when it is "false"

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit d02726c	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 18:44:42 +0900

    minor document edit
    
    the sample model has only 9 lines: https://github.com/lifo/docrails/commit/4d4819fb279386570466b2f99254cd77fb71e05c#commitcomment-467295

M	railties/guides/source/debugging_rails_applications.textile

commit ad912c0	refs/heads/master
Author: Xavier Noria 
Date:   2011-07-08 00:58:14 +0200

    use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion
    
    That integer is rather irrelevant, the only thing that matters is that
    it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times
    faster than bytes.sum, so use that.

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 9370855	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-07 19:13:10 -0300

    Move config.default_asset_host_protocol to the railtie.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb

commit e01aba1	refs/heads/master
Author: José Valim 
Date:   2011-07-07 19:13:10 -0300

    Move config.default_asset_host_protocol to the railtie.

M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb

commit 2a24bcc	refs/heads/master
Author: José Valim 
Date:   2011-07-07 18:58:04 -0300

    Don't raise on mass assignment for test

M	Gemfile
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
M	railties/test/application/rake_test.rb

commit 4d4819f	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 06:05:48 +0900

    :conditions => where

M	activerecord/lib/active_record/errors.rb
M	railties/guides/source/debugging_rails_applications.textile
M	railties/guides/source/security.textile

commit b2816ae	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 05:47:14 +0900

    :joins => joins

M	activerecord/lib/active_record/associations.rb

commit c4bd477	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 01:49:34 +0900

    :include => includes

M	activerecord/lib/active_record/associations.rb

commit 6c94f69	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 01:24:00 +0900

    find(:first) => first

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb

commit a3683fd	refs/heads/master
Author: Akira Matsuda 
Date:   2011-07-08 01:12:09 +0900

    find(:all) => all

M	actionpack/lib/action_controller/caching/fragments.rb
M	actionpack/lib/action_controller/metal/helpers.rb
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/lib/action_view/helpers/atom_feed_helper.rb
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/errors.rb
M	activerecord/lib/active_record/fixtures.rb

commit 215193d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-07 13:12:28 -0700

    removing brittle assertion

M	actionpack/test/template/asset_tag_helper_test.rb

commit 453f222	refs/heads/master
Merge: 99c20aa f6a6b51
Author: José Valim 
Date:   2011-07-07 12:15:36 -0700

    Merge pull request #2005 from acroca/master
    
    Fixing asset number for asset_path with %d to be consistent in ruby 1.9

commit 8226dfc	refs/tags/v3.0.14
Author: Guillermo Iguaran 
Date:   2011-07-07 01:40:30 -0500

    Update to latest rails.js for fix some bugs under IE

M	railties/lib/rails/generators/rails/app/templates/public/javascripts/rails.js

commit d7be017	refs/tags/v3.1.1.rc1
Merge: 0b62aa0 7c051ab
Author: Santiago Pastorino 
Date:   2011-07-07 09:30:16 -0700

    Merge pull request #2002 from knapo/3-1-stable
    
    Backport of #1997

commit e9f2c67	refs/tags/v3.0.14
Merge: 9e4d156 e2d90bf
Author: Santiago Pastorino 
Date:   2011-07-07 09:29:01 -0700

    Merge pull request #2004 from knapo/3-0-stable
    
    Backport of #1997

commit 0b62aa0	refs/tags/v3.1.1.rc1
Merge: fd8dbfa 5641396
Author: Santiago Pastorino 
Date:   2011-07-07 09:23:13 -0700

    Merge pull request #2001 from tobsch/3-1-stable
    
    Now accepting css/js files in deeper directory structures by default.

commit e2d90bf	refs/tags/v3.0.14
Author: knapo 
Date:   2011-07-07 11:40:11 +0200

    Make `ActiveRecord::Batches#find_each` to not return `self`.
    
    This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.

M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb

commit 7c051ab	refs/tags/v3.1.1.rc1
Author: knapo 
Date:   2011-07-07 11:40:11 +0200

    Make `ActiveRecord::Batches#find_each` to not return `self`.
    
    This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.

M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb

commit f6a6b51	refs/heads/master
Author: Albert Callarisa Roca 
Date:   2011-07-08 00:10:20 +0800

    Using the sum of bytes instead the hash of the path when replacing the wildcard of the assets path because in ruby 1.9 is not consistent

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 99c20aa	refs/heads/master
Merge: 63861e0 a85caaa
Author: Santiago Pastorino 
Date:   2011-07-07 09:03:43 -0700

    Merge pull request #1767 from jwarwick/rake_notes_dirs
    
    Updated rake:notes to search additional directories

commit 63861e0	refs/heads/master
Merge: 6469560 2ca9b6d
Author: Santiago Pastorino 
Date:   2011-07-07 09:00:35 -0700

    Merge pull request #1997 from knapo/master
    
    Make `ActiveRecord::Batches#find_each` to not return `self`.

commit 5641396	refs/tags/v3.1.1.rc1
Author: Tobias Schlottke 
Date:   2011-07-07 17:56:48 +0200

    Now accepting css/js files in deeper directory structures by default.
    This is useful for engines with own application.{js|css}-files.
    See: https://github.com/rails/rails/issues/1520

M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit fd8dbfa	refs/tags/v3.1.1.rc1
Author: Dmitriy Kiriyenko 
Date:   2011-07-07 17:32:18 +0300

    Add require ActiveSupport delegation to ActiveRecord::Relation class.

M	activerecord/lib/active_record/relation.rb

commit 6469560	refs/heads/master
Merge: 298a083 f155373
Author: Xavier Noria 
Date:   2011-07-07 08:07:59 -0700

    Merge pull request #1999 from dmitriy-kiriyenko/add_require_active_support_delegation_to_relation
    
    Add require ActiveSupport delegation to ActiveRecord::Relation class.

commit 298a083	refs/heads/master
Author: José Valim 
Date:   2011-07-07 11:52:20 -0300

    Just generate AR options if AR is enabled

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit f155373	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-07-07 17:32:18 +0300

    Add require ActiveSupport delegation to ActiveRecord::Relation class.

M	activerecord/lib/active_record/relation.rb

commit 4b6232e	refs/heads/master
Merge: 03a016c 0fab8c3
Author: José Valim 
Date:   2011-07-07 03:59:34 -0700

    Merge pull request #1996 from bogdan/default_sanitizer_squashed
    
    Rails app template: setup different mass assignment sanitizer for envs

commit 03a016c	refs/heads/master
Merge: 1bad08f e722fbb
Author: José Valim 
Date:   2011-07-07 03:59:01 -0700

    Merge pull request #1406 from dmathieu/fix_test_warnings
    
    Fix test warnings

commit 1d3f833	refs/heads/master
Author: Shawn Drost 
Date:   2011-07-07 03:52:48 -0700

    document HashWithIndifferentAccess#extractable_options?

M	activesupport/lib/active_support/hash_with_indifferent_access.rb

commit 2ca9b6d	refs/heads/master
Author: knapo 
Date:   2011-07-07 11:40:11 +0200

    Make `ActiveRecord::Batches#find_each` to not return `self`.
    
    This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.

M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb

commit e722fbb	refs/heads/master
Author: dmathieu <42@dmathieu.com>
Date:   2011-05-30 16:49:56 +0200

    remove the warning when testing whiny_nil

M	activesupport/test/whiny_nil_test.rb

commit 0fab8c3	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-06-17 14:42:16 +0300

    Rails app template: setup different mass assignment sanitizer for envs
    
    For production - leave the default
    For test and dev: :strict.

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 1bad08f	refs/heads/master
Merge: c6578d6 66dd2d3
Author: Santiago Pastorino 
Date:   2011-07-06 20:13:24 -0700

    Merge pull request #1120 from lysenko/collection_singular_ids
    
    collection_singular_ids ignores association :include option

commit ec27814	refs/tags/v3.1.1.rc1
Merge: 8d0f039 f44c3ea
Author: Santiago Pastorino 
Date:   2011-07-06 20:10:17 -0700

    Merge pull request #1990 from simonbaird/3-1-stable
    
    rake db:test:purge creates mysql database with wrong charset & collation (3-1-stable)

commit c6578d6	refs/heads/master
Merge: 35597e3 ecd3708
Author: Santiago Pastorino 
Date:   2011-07-06 20:10:14 -0700

    Merge pull request #1989 from simonbaird/master
    
    rake db:test:purge creates mysql database with wrong charset & collation (master branch)

commit 35597e3	refs/heads/master
Author: José Valim 
Date:   2011-07-06 22:59:18 -0300

    Ensure the engine_path is there (it may make CI happy).

M	railties/test/railties/generators_test.rb

commit a85caaa	refs/heads/master
Author: jwarwick 
Date:   2011-06-18 23:15:51 -0400

    Updated rake:notes to search app, config, lib, script and test dirs

M	railties/lib/rails/source_annotation_extractor.rb

commit 8d0f039	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-06 18:00:39 -0700

    Give higher priority to assets.cache_store.

M	actionpack/lib/sprockets/railtie.rb

commit 86e2f88	refs/heads/master
Author: José Valim 
Date:   2011-07-06 17:59:56 -0700

    Give higher priority to assets.cache_store.

M	actionpack/lib/sprockets/railtie.rb

commit d8e2a1f	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-06 21:38:54 -0300

    Make compressors lazily load.

M	Gemfile
A	actionpack/lib/sprockets/compressors.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit 2f6e389	refs/heads/master
Author: José Valim 
Date:   2011-07-06 21:38:54 -0300

    Make compressors lazily load.

M	Gemfile
A	actionpack/lib/sprockets/compressors.rb
M	actionpack/lib/sprockets/railtie.rb
M	railties/test/application/assets_test.rb

commit fe2167f	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-07-07 01:07:20 +0100

    Don't construct association scope in initializer. This yields a big performance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/autosave_association.rb

commit 86390c3	refs/heads/master
Author: Jon Leighton 
Date:   2011-07-07 01:07:20 +0100

    Don't construct association scope in initializer. This yields a big performance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/autosave_association.rb

commit f44c3ea	refs/tags/v3.1.1.rc1
Author: Simon Baird 
Date:   2011-07-07 09:43:16 +1000

    Fix charset/collate in mysql recreate_database
    
    See new method mysql_creation_options. It is used by both
    create_database and recreate_database so they are consistent.
    
    (Manual cherry pick of 3ba3125b24b532876c95c8d9d00c9b69faab5a60)

M	activerecord/lib/active_record/railties/databases.rake

commit a05d59f	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-06 20:24:15 -0300

    Deprecate stream at the class level.
    
    This is because only template rendering works with streaming.
    Setting it at the class level was also changing the behavior
    of JSON and XML responses, closes #1337.

M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb

commit ecd3708	refs/heads/master
Author: Simon Baird 
Date:   2011-07-07 09:27:51 +1000

    Fix charset/collate in mysql recreate_database
    
    See new method mysql_creation_options. It is used by both
    create_database and recreate_database so they are consistent.
    
    (Cherry pick of 3ba3125b24b532876c95c8d9d00c9b69faab5a60)

M	activerecord/lib/active_record/railties/databases.rake

commit 7da88c5	refs/heads/master
Author: José Valim 
Date:   2011-07-06 20:24:15 -0300

    Remove stream at the class level.
    
    This is because only template rendering works with streaming.
    Setting it at the class level was also changing the behavior
    of JSON and XML responses, closes #1337.

M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb

commit 689c3d6	refs/heads/master
Merge: c713cf9 2bdad76
Author: Jon Leighton 
Date:   2011-07-06 14:33:14 -0700

    Merge pull request #1987 from ernie/fix_fix_to_reverse_sql_order
    
    Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.

commit 66dd2d3	refs/heads/master
Author: Anatoliy Lysenko 
Date:   2011-03-27 16:40:37 +0300

    Fix bug in collection_singular_ids on has many through association with conditions and includes,
    when condtions references tables from includes.
    Test fail because of invalid sql:
    ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id:
    SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id"
    WHERE "readers"."person_id" = 1 AND (comments.id is null)
    
    Bug described in github#925
    
    This commit will revert fix from https://github.com/rails/rails/commit/3436fdfc12d58925e3d981e0afa61084ea34736c , but tests is ok.
    
    Bug described in #6569 ticket.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 2bdad76	refs/heads/master
Author: Ernie Miller 
Date:   2011-07-06 16:13:57 -0400

    Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.

M	activerecord/lib/active_record/relation/query_methods.rb

commit c713cf9	refs/heads/master
Merge: d10d932 f2a0dfc
Author: Santiago Pastorino 
Date:   2011-07-06 13:05:58 -0700

    Merge pull request #1273 from jeremyf/feature-association-proxy-send
    
    Addresses an inconsistency in the ActiveRecord::Base.method_missing handl

commit d10d932	refs/heads/master
Merge: d5bd703 f449da5
Author: Santiago Pastorino 
Date:   2011-07-06 12:36:47 -0700

    Merge pull request #1463 from psanford/master
    
    Fix timezone handling in String.to_time

commit d5bd703	refs/heads/master
Merge: 6191368 3fc53e5
Author: Santiago Pastorino 
Date:   2011-07-06 12:23:19 -0700

    Merge pull request #1494 from anildigital/master
    
    Fix failing test because of Timezone difference.

commit 3a92bc7	refs/tags/v3.1.1.rc1
Merge: e7ac539 88aa2efd
Author: Santiago Pastorino 
Date:   2011-07-06 12:00:35 -0700

    Merge pull request #1789 from grantneufeld/schema_column_exists_options_hash_3_1
    
    Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?

commit e7ac539	refs/tags/v3.1.1.rc1
Merge: d5bc701 7c6a840
Author: Santiago Pastorino 
Date:   2011-07-06 11:57:36 -0700

    Merge pull request #1904 from oriolgual/1571_fix_for_3_1_stable
    
    Fix #1571 for 3-1-stable

commit 9e4d156	refs/tags/v3.0.14
Merge: 2f3eb7a 5a44c70
Author: Santiago Pastorino 
Date:   2011-07-06 11:53:38 -0700

    Merge pull request #1837 from msgehard/3-0-stable
    
    Fix for empty string assigned to _type column of polymorphic association

commit 7c6a840	refs/tags/v3.1.1.rc1
Author: Oriol Gual 
Date:   2011-06-08 20:54:27 +0200

    Fix reverse order with new Arel Nodes (#1571)

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb

commit 6191368	refs/heads/master
Merge: 2c72830 139971d
Author: Santiago Pastorino 
Date:   2011-07-06 11:42:29 -0700

    Merge pull request #1926 from tobsch/master
    
    Accept application.js/.css to exist in a deeper directory depth by default

commit 2f3eb7a	refs/tags/v3.0.14
Merge: 7ff32e2 3ba3125
Author: Santiago Pastorino 
Date:   2011-07-06 11:41:04 -0700

    Merge pull request #1952 from simonbaird/3-0-stable
    
    rake db:test:purge creates mysql database with wrong charset & collation

commit d5bc701	refs/tags/v3.1.1.rc1
Merge: 01d881c 7f3e45c
Author: Santiago Pastorino 
Date:   2011-07-06 11:36:05 -0700

    Merge pull request #1982 from spohlenz/backport-1778
    
    Backport of #1778 (fix nested fields_for when Hash-based model is passed)

commit 7ff32e2	refs/tags/v3.0.14
Merge: 1b03f7f 557d788
Author: Santiago Pastorino 
Date:   2011-07-06 11:16:17 -0700

    Merge pull request #1894 from arunagw/fix_test_for_jruby_db-3-0-stable
    
    Fix test for jruby db 3 0 stable

commit 01d881c	refs/tags/v3.1.1.rc1
Merge: afe8eb5 df5971d
Author: Santiago Pastorino 
Date:   2011-07-06 11:15:55 -0700

    Merge pull request #1895 from arunagw/fix_test_for_jruby_db-3-1-stable
    
    Fix test for jruby db 3 1 stable

commit afe8eb5	refs/tags/v3.1.1.rc1
Merge: 07ea84a 53903f4
Author: Xavier Noria 
Date:   2011-07-06 05:37:19 -0700

    Merge pull request #1983 from vijaydev/cherrypicks-validator-gem
    
    Cherrypick for 3-1-stable - adding w3c_validators gem

commit 53903f4	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-04 17:12:25 +0530

    add w3c_validators gem to the doc group to fix failing validation of guides

M	Gemfile

commit 7f3e45c	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-06-20 11:27:04 +0930

    Test for extractable_options? within nested fields_for.
    
    This fixes an error when a record object that is a subclass of Hash is
    passed to fields_for, which is incorrectly interpreted as field options.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/lib/controller/fake_models.rb
M	actionpack/test/template/form_helper_test.rb

commit 2c72830	refs/heads/master
Merge: a990b12 e7bec4e
Author: Jon Leighton 
Date:   2011-07-06 00:49:05 -0700

    Merge pull request #1979 from bogdan/association_sum_array_compatibility
    
    Fixed AR::Relation#sum compatibility with Array#sum

commit a990b12	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-05 10:43:34 -0700

    updating pg supported versions docco. fixes #1959

M	railties/guides/source/command_line.textile
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

commit a95d7d8	refs/heads/master
Author: JudeArasu 
Date:   2011-07-05 22:49:44 +0530

    rails text been added before version

M	railties/guides/source/asset_pipeline.textile

commit b27871a	refs/heads/master
Merge: eb2e109 8ba0c1a
Author: Santiago Pastorino 
Date:   2011-07-05 09:41:09 -0700

    Merge pull request #1968 from bogdan/associations_find_array_compatibility2
    
    Fixed CollectionAssociation#find to be compatible with Array#find

commit 9fec798	refs/heads/master
Author: James Miller 
Date:   2011-07-05 08:40:09 -0700

    Remove attachment_fu, add CarrierWave to suggested uploader libraries

M	railties/guides/source/form_helpers.textile

commit e7bec4e	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-07-05 14:36:20 +0300

    Fixed AR::Relation#sum compatibility with Array#sum
    
    In order make Relation behavior closer to Array
    Made Relation#sum to accept block and delegate it to Array#sum

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb

commit eb2e109	refs/heads/master
Merge: 289b525 467c9b6
Author: José Valim 
Date:   2011-07-05 03:41:54 -0700

    Merge pull request #1963 from jake3030/fix_engine_rake_task
    
    Fix engine rake task

commit 8ba0c1a	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-07-05 10:51:40 +0300

    Fixed CollectionAssociation#find to be compatible with Array#find
    
    In order to make CollectionAssociation behave closer to Array
    Add the ability to pass block to #find method just like Array#find does.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 07ea84a	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-07-05 01:49:25 +0200

    syncs guides with master

M	railties/guides/source/3_0_release_notes.textile
M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_record_querying.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/api_documentation_guidelines.textile
A	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/contribute.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/layouts_and_rendering.textile
M	railties/guides/source/migrations.textile
M	railties/guides/source/performance_testing.textile
M	railties/guides/source/plugins.textile
M	railties/guides/source/routing.textile
M	railties/guides/source/ruby_on_rails_guides_guidelines.textile
M	railties/guides/source/security.textile

commit 289b525	refs/heads/master
Merge: 892c99c 254a1e5
Author: Xavier Noria 
Date:   2011-07-05 01:42:13 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 5a7c8e2	refs/tags/v3.1.1.rc1
Author: Dieter Komendera 
Date:   2011-07-04 18:39:25 +0200

    Only call set_owner_attributes for has_one association if target exists.

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 892c99c	refs/heads/master
Merge: 718542b 7d3aa24
Author: Jon Leighton 
Date:   2011-07-04 16:14:56 -0700

    Merge pull request #1964 from kommen/has_one_fix
    
    Only call set_owner_attributes for has_one association if target exists. [3.1.0rc4]

commit 467c9b6	refs/heads/master
Author: Jake Varghese 
Date:   2011-07-04 15:48:15 -0500

    fix engines rake tasks

M	railties/lib/rails/tasks/engine.rake
M	railties/test/generators/plugin_new_generator_test.rb

commit 254a1e5	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-05 00:10:59 +0530

    minor edit in 7896ac3

M	activesupport/lib/active_support/cache.rb

commit 7d3aa24	refs/heads/master
Author: Dieter Komendera 
Date:   2011-07-04 18:39:25 +0200

    Only call set_owner_attributes for has_one association if target exists.

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 718542b	refs/heads/master
Author: Andrew White 
Date:   2011-07-04 16:56:47 +0100

    Revert "The rails gem doesn't have a lib directory - closes #1958."
    
    RubyGems requires at least one require_path.
    
    This reverts commit e7fc5d1cad27e47d3d0149a2b9a61d074c30f225.

M	rails.gemspec

commit 1b03f7f	refs/tags/v3.0.14
Author: Andrew White 
Date:   2011-07-04 16:58:59 +0100

    Revert "The rails gem doesn't have a lib directory."
    
    RubyGems requires at least one require_path.
    
    This reverts commit 3001728325d3bbde44f12a7b76dffdc0112dbed6.

M	rails.gemspec

commit 5bb37ab	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-04 16:57:13 +0100

    Revert "The rails gem doesn't have a lib directory."
    
    RubyGems requires at least one require_path.
    
    This reverts commit 92c852f7e229e27ed7a1c1e8d3ec001f14983b63.

M	rails.gemspec

commit 3001728	refs/tags/v3.0.14
Author: Andrew White 
Date:   2011-07-04 14:55:51 +0100

    The rails gem doesn't have a lib directory.

M	rails.gemspec

commit 92c852f	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-04 14:54:29 +0100

    The rails gem doesn't have a lib directory.

M	rails.gemspec

commit e7fc5d1	refs/heads/master
Author: Andrew White 
Date:   2011-07-04 14:51:40 +0100

    The rails gem doesn't have a lib directory - closes #1958.

M	rails.gemspec

commit 8c1bd05	refs/heads/master
Merge: 9f7442a 8b25b55
Author: Xavier Noria 
Date:   2011-07-04 04:44:54 -0700

    Merge pull request #1957 from vijaydev/add-validator-gem
    
    Add w3c_validators gem to the doc group to fix failing validation of guides

commit 8b25b55	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-04 17:12:25 +0530

    add w3c_validators gem to the doc group to fix failing validation of guides

M	Gemfile

commit cee27be	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-04 06:47:42 +0100

    Use an instance variable to store the current masss assignment options
    (cherry picked from commit 9f7442a3abf1242a2348bfdd0c700f707ee04c52)

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/nested_attributes.rb

commit 9f7442a	refs/heads/master
Author: Andrew White 
Date:   2011-07-04 06:47:42 +0100

    Use an instance variable to store the current masss assignment options

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/nested_attributes.rb

commit 3ba3125	refs/tags/v3.0.14
Author: Simon Baird 
Date:   2011-07-04 12:00:26 +1000

    Fix charset/collate in mysql recreate_database
    
    See new method mysql_creation_options. It is used by both
    create_database and recreate_database so they are consistent.

M	activerecord/lib/active_record/railties/databases.rake

commit 78ff00d	refs/heads/master
Merge: 3adb24a dc2d8af
Author: José Valim 
Date:   2011-07-03 15:45:39 -0700

    Merge pull request #1950 from dmathieu/require_railties
    
    Add railties to the load path if it's not already there

commit dc2d8af	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-03 17:08:39 +0200

    Load the generators test helper and properly load it's test case

M	railties/test/railties/generators_test.rb

commit d764378	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-07-02 23:43:13 +0530

    Reversing the changes done in c278a2c while still resolving #1857.
    The changes broke bulk migration tests and were fixed in 4d256bc6;
    however that brought back the issue of #1857 and so this commit goes
    back to the original scenario and just adds change_table to the list
    of methods which are to be recorded in the CommandRecorder. The
    method_missing now delegates all calls to the underlying connection as
    before.

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 3adb24a	refs/heads/master
Merge: 17693a9 15f35c0
Author: Jon Leighton 
Date:   2011-07-03 09:23:43 -0700

    Merge pull request #1941 from vijaydev/command-recorder-fix
    
    Reversing the changes related to CommandRecorder

commit 9ed0632	refs/tags/v3.1.1.rc1
Merge: 91718c8 a96d77a
Author: José Valim 
Date:   2011-07-03 07:17:18 -0700

    Merge pull request #1949 from dmathieu/cherry-picks
    
    Cherry picks for 3-1-stable

commit 47139b8	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-07-03 07:13:20 -0700

    Edited railties/guides/source/asset_pipeline.textile via GitHub

M	railties/guides/source/asset_pipeline.textile

commit a96d77a	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-03 13:09:28 +0200

    all numerics should be html_safe - Closes #1935

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 01c1a86	refs/tags/v3.1.1.rc1
Author: Prem Sichanugrist 
Date:   2011-06-08 02:27:48 -0400

    Fix failing test on uninitialized `Rails.config.assets.prefix`
    
    This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] :bomb:

M	actionpack/test/abstract_unit.rb

commit caab9f4	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-03 18:15:47 +0530

    document meta methods

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 17693a9	refs/heads/master
Merge: a1d85a0 b732724
Author: José Valim 
Date:   2011-07-03 05:18:57 -0700

    Merge pull request #1948 from dmathieu/html_safe_numeric
    
    All numerics should be html_safe

commit b732724	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-03 13:09:28 +0200

    all numerics should be html_safe - Closes #1935

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit a715c37	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-03 17:20:04 +1200

    [asset pipeline] expand section on configuration

M	railties/guides/source/asset_pipeline.textile

commit 91718c8	refs/tags/v3.1.1.rc1
Merge: 108210c b494b5c
Author: José Valim 
Date:   2011-07-02 21:15:09 -0700

    Merge pull request #1947 from spohlenz/refactor-asset-paths-3-1
    
    Refactor sprockets asset paths to allow for alternate asset environments

commit b494b5c	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-07-03 10:29:04 +0930

    Add documentation for asset_prefix and asset_environment
    (cherry picked from commit 21344bc33bb732c9c938881ec13bd7fd44d7e9d8)

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit add63ee	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-07-01 21:56:41 +0930

    Add tests for alternate asset prefix/environment
    (cherry picked from commit 0613f3bcdbd077c3d961f274c390f39f1cd19a31)

A	actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css
M	actionpack/test/template/sprockets_helper_test.rb

commit b8fa5f6	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-07-01 17:08:58 +0930

    Refactor sprockets asset paths to allow for alternate asset environments

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 108210c	refs/tags/v3.1.1.rc1
Merge: 986e193 55d93f3
Author: José Valim 
Date:   2011-07-02 21:08:41 -0700

    Merge pull request #1946 from spohlenz/fix-engine-migrations-check-3-1
    
    Fix engine migrations check

commit 55d93f3	refs/tags/v3.1.1.rc1
Author: Sam Pohlenz 
Date:   2011-07-03 13:02:58 +0930

    Fix has_migrations? check in Rails::Engine
    (cherry picked from commit a7a58af244412f507048d3e2118eeca4992b705e)

M	railties/lib/rails/engine.rb
M	railties/test/railties/shared_tests.rb

commit a1d85a0	refs/heads/master
Merge: 3875e44 a7a58af
Author: José Valim 
Date:   2011-07-02 20:42:08 -0700

    Merge pull request #1945 from spohlenz/fix-engine-migrations-check
    
    Fix has_migrations? check in Rails::Engine

commit a7a58af	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-07-03 13:02:58 +0930

    Fix has_migrations? check in Rails::Engine

M	railties/lib/rails/engine.rb
M	railties/test/railties/shared_tests.rb

commit 3875e44	refs/heads/master
Merge: 9d6e5e6 21344bc
Author: José Valim 
Date:   2011-07-02 20:23:47 -0700

    Merge pull request #1925 from spohlenz/refactor-asset-paths
    
    Refactor sprockets asset paths to allow for alternate asset environments

commit c7dec17	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-03 14:11:41 +1200

    [asset pipeline] More updates
    
    resources for fingerprinting, grammar,CSS

M	railties/guides/source/asset_pipeline.textile

commit 0dc2c57	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-03 13:47:24 +1200

    [asset pipeline] Add resources to fingerprinting

M	railties/guides/source/asset_pipeline.textile

commit 986e193	refs/tags/v3.1.1.rc1
Merge: 8966382 827e8a5
Author: Santiago Pastorino 
Date:   2011-07-02 18:17:56 -0700

    Merge pull request #1942 from dmathieu/url_for
    
    Cherry Pick for 1940

commit 21344bc	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-07-03 10:29:04 +0930

    Add documentation for asset_prefix and asset_environment

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit cfbed13	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-03 12:30:09 +1200

    [asset pipeline] what is fingerprinting section

M	railties/guides/source/asset_pipeline.textile

commit 827e8a5	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-02 18:02:43 +0200

    provide a more explicit message when using url_for with nil
    
    This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb
M	actionpack/test/controller/mime_responds_test.rb

commit 870d070	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-03 09:44:50 +1200

    [asset pipeline] spelling !

M	railties/guides/source/asset_pipeline.textile

commit 2a06de8	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-03 08:30:28 +1200

    [asset pipeline] Add new rationale section
    
    This will contain details about fingerprinting.

M	railties/guides/source/asset_pipeline.textile

commit 9d6e5e6	refs/heads/master
Merge: 908be47 ac15bce
Author: Santiago Pastorino 
Date:   2011-07-02 12:51:59 -0700

    Merge pull request #1940 from dmathieu/missing_location
    
    Provide a more explicit message when we try to redirect to a missing location

commit 2d022f0	refs/heads/master
Merge: 2949e30 dfabd90
Author: Vijay Dev 
Date:   2011-07-02 12:44:17 -0700

    Merge pull request #50 from wader/master
    
    Fix arguments to get plugin help

commit 15f35c0	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-02 23:43:13 +0530

    Reversing the changes done in c278a2c while still resolving #1857.
    The changes broke bulk migration tests and were fixed in 4d256bc6;
    however that brought back the issue of #1857 and so this commit goes
    back to the original scenario and just adds change_table to the list
    of methods which are to be recorded in the CommandRecorder. The
    method_missing now delegates all calls to the underlying connection as
    before.

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit ac15bce	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-07-02 18:02:43 +0200

    provide a more explicit message when using url_for with nil
    
    This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.

M	actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M	actionpack/test/activerecord/polymorphic_routes_test.rb
M	actionpack/test/controller/mime_responds_test.rb

commit 2949e30	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-02 21:18:46 +0530

    document handle_unverified_request method

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 007214c	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-02 13:58:26 +0530

    Revert "fix a typo"
    
    Reason: Changelogs are not to be changed in docrails.
    
    This reverts commit 0b8cdc16e0b7c3404a0e3470b580235023c53542.

M	activerecord/CHANGELOG

commit 908be47	refs/heads/master
Merge: 36d289a ac5e691
Author: José Valim 
Date:   2011-07-01 20:20:33 -0700

    Merge pull request #1938 from joefiorini/master
    
    Make to_json take a parameter to exclude root

commit ac5e691	refs/heads/master
Author: Joe Fiorini 
Date:   2011-07-01 22:48:11 -0400

    Enable passing root: false to #to_json

M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/test/cases/serializers/json_serialization_test.rb

commit 8966382	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-01 15:19:53 -0700

    a few minor performance improvements: fewer strings, fewer range objects, fewer method calls

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/associations/join_helper.rb

commit 36d289a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-01 15:19:53 -0700

    a few minor performance improvements: fewer strings, fewer range objects, fewer method calls

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/associations/join_helper.rb

commit b6315d5	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-07-01 14:52:28 -0700

    require 'thread' before using Mutex

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb

commit 13990d5	refs/heads/master
Author: José Valim 
Date:   2011-07-01 14:52:07 -0700

    require 'thread' before using mutex

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb

commit 37eef89	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-01 14:37:31 -0700

    calling super is super. if the other object is exactly equal, we can return early

M	activerecord/lib/active_record/reflection.rb

commit d5de496	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-01 14:37:04 -0700

    remove unused codes

M	activerecord/lib/active_record/associations/alias_tracker.rb

commit 2ed8097	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-01 14:37:31 -0700

    calling super is super. if the other object is exactly equal, we can return early

M	activerecord/lib/active_record/reflection.rb

commit 06c72c4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-01 14:37:04 -0700

    remove unused codes

M	activerecord/lib/active_record/associations/alias_tracker.rb

commit 7467df7	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-01 21:44:16 +0100

    It's autoload all the way down
    (cherry picked from commit 2d16515e52a061c94ea0e472ca4f3a80e4b4ce6a)

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 2d16515	refs/heads/master
Author: Andrew White 
Date:   2011-07-01 21:44:16 +0100

    It's autoload all the way down

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 0b8cdc1	refs/heads/master
Author: Ray Baxter 
Date:   2011-07-01 13:35:00 -0700

    fix a typo

M	activerecord/CHANGELOG

commit a8410a2	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-01 20:36:16 +0100

    Don't require ActionView::Context as it's autoloaded
    (cherry picked from commit 79924c637d82584acd75c79d8ca8ab016e35f836)

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 0155e10	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-01 20:37:37 +0100

    Revert "Add missing require for ActionView::AssetPaths"
    
    This reverts commit ad1d3db9837a3f81800308df992a02908a2313dc.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 79924c6	refs/heads/master
Author: Andrew White 
Date:   2011-07-01 20:36:16 +0100

    Don't require ActionView::Context as it's autoloaded

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 505b6a4	refs/heads/master
Author: Andrew White 
Date:   2011-07-01 20:34:15 +0100

    Revert "Add missing require for ActionView::AssetPaths"
    
    This reverts commit 987eb7d4236513978e3cfcd5c3c159d95d2a84c8.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 1e56ada	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-01 20:17:21 +0100

    Add missing requires for ActionView::Context and Module#instance_method_names
    (cherry picked from commit fdaecbed84af426213cbb77568e25128cf01484c)

M	actionpack/lib/action_view/helpers/form_helper.rb

commit ad1d3db	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-07-01 20:14:33 +0100

    Add missing require for ActionView::AssetPaths
    (cherry picked from commit 987eb7d4236513978e3cfcd5c3c159d95d2a84c8)

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 280b657	refs/tags/v3.1.1.rc1
Author: Ernie Miller 
Date:   2011-06-01 10:28:24 -0400

    Require attr_internal before using in ActionView::Helpers
    (cherry picked from commit 3a2ef52ad6cede6a4bab48e4689f2466c10cb6b8)
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/controller_helper.rb

commit fdaecbe	refs/heads/master
Author: Andrew White 
Date:   2011-07-01 20:17:21 +0100

    Add missing requires for ActionView::Context and Module#instance_method_names

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 987eb7d	refs/heads/master
Author: Andrew White 
Date:   2011-07-01 20:14:33 +0100

    Add missing require for ActionView::AssetPaths

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit d74e1b1	refs/heads/master
Author: José Valim 
Date:   2011-07-01 15:21:08 -0300

    Add assets_gemfile_entry.

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 3da608e	refs/heads/master
Author: José Valim 
Date:   2011-07-01 14:51:34 -0300

    Revert "Add method fields_for_with_index to FormHelper"
    
    This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920.
    
    Conflicts:
    
    	actionpack/lib/action_view/helpers/form_helper.rb

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 2d459d2	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-07-01 09:55:31 -0700

    reduce calls to owners_by_key and to read_attribute, respond_to? etc

M	activerecord/lib/active_record/associations/preloader/association.rb

commit 441d8ec	refs/heads/master
Author: Aaron Patterson 
Date:   2011-07-01 09:55:31 -0700

    reduce calls to owners_by_key and to read_attribute, respond_to? etc

M	activerecord/lib/active_record/associations/preloader/association.rb

commit dfabd90	refs/heads/master
Author: Mattias Wadman 
Date:   2011-07-01 07:58:04 -0700

    Fix arguments to get plugin help. Otherwise a plugin named "new" is created.

M	railties/guides/source/plugins.textile

commit 7896ac3	refs/heads/master
Author: Matt Jankowski 
Date:   2011-07-01 10:18:23 -0400

    general grammar cleanup of cache docs

M	activesupport/lib/active_support/cache.rb

commit 894cca5	refs/heads/master
Author: Matt Jankowski 
Date:   2011-07-01 10:05:45 -0400

    general formatting cleanup, and clarify that passing true as third option for benchmarking will stop output OTHER THAN the timing output itself

M	activesupport/lib/active_support/benchmarkable.rb

commit 5399471	refs/heads/master
Author: Gabriel Sobrinho 
Date:   2011-06-30 20:29:53 -0300

    Create a test case for disable_referential_integrity

M	activerecord/test/cases/adapter_test.rb

commit 0613f3b	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-07-01 21:56:41 +0930

    Add tests for alternate asset prefix/environment

A	actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css
M	actionpack/test/template/sprockets_helper_test.rb

commit c314203	refs/tags/v3.0.14
Author: Bogdan Gusiev 
Date:   2011-06-30 16:27:01 +0300

    Fixed ActionView::FormOptionsHelper#select with :multiple => false
    (cherry picked from commit 0fdac01876c37c692e9107b6120e03aec692663d)
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 337a446	refs/tags/v3.1.1.rc1
Author: Bogdan Gusiev 
Date:   2011-06-30 16:27:01 +0300

    Fixed ActionView::FormOptionsHelper#select with :multiple => false
    (cherry picked from commit 0fdac01876c37c692e9107b6120e03aec692663d)
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit b31ce90	refs/heads/master
Merge: cb99c85 0fdac01
Author: José Valim 
Date:   2011-07-01 04:31:48 -0700

    Merge pull request #1927 from bogdan/select_multiple_index
    
    Fixed ActionView::FormOptionsHelper#select with :multiple => false

commit 8de6ded	refs/heads/master
Author: Richard Hulse 
Date:   2011-07-01 22:31:58 +1200

    [asset pipeline] refactor docs and add new content
    
    This changes the document around and adds more details about
    the rationale behind the pipeline. Still a WIP.

M	railties/guides/source/asset_pipeline.textile

commit 139971d	refs/heads/master
Author: Tobias Schlottke 
Date:   2011-07-01 09:53:48 +0200

    Now accepting css/js files in deeper directory structures by default.
    This is useful for engines with own application.{js|css}-files.
    See: https://github.com/rails/rails/issues/1520

M	railties/lib/rails/application/configuration.rb
M	railties/test/application/assets_test.rb

commit d5f7253	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-07-01 17:08:58 +0930

    Refactor sprockets asset paths to allow for alternate asset environments

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit cb99c85	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-30 22:47:01 +0100

    Remove AssociationReflection#create_association and AssociationReflection#create_association! - they are not called from anywhere.

M	activerecord/lib/active_record/reflection.rb

commit 0e225ec	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-30 22:41:18 +0100

    Assign the association attributes to the associated record before the before_initialize callback of the record runs. Fixes #1842.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/models/bulb.rb

commit 92c68da	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-30 23:37:45 +0100

    Add an extremely lulzy deprecation warning which tries to detect if AssociationReflection#build_association has been overridden, but ignores the block argument.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 65813a6	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-30 22:41:18 +0100

    Assign the association attributes to the associated record before the before_initialize callback of the record runs. Fixes #1842.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/models/bulb.rb

commit da9c79b	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-30 22:47:01 +0100

    Remove AssociationReflection#create_association and AssociationReflection#create_association! - they are not called from anywhere.

M	activerecord/lib/active_record/reflection.rb

commit ef787cf	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-30 14:33:37 -0700

    match method signature of the superclass

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/attribute_methods.rb

commit 19f5576	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-30 11:54:22 -0700

    call super rather than delegating to the other objects equal? method

M	activerecord/lib/active_record/base.rb

commit 94d2b0b	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-30 11:53:58 -0700

    just alias eql? to == for frewer method calls

M	activerecord/lib/active_record/base.rb

commit 83005cf	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-30 11:53:06 -0700

    only calculate method name once

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 68b8710	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-30 11:24:39 -0700

    cache the plural name on the reflection so we do not pay pluralize costs on joins

M	activerecord/lib/active_record/associations/join_helper.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit 6a283d5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-30 14:33:37 -0700

    match method signature of the superclass

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/attribute_methods.rb

commit 8e19a5d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-30 11:54:22 -0700

    call super rather than delegating to the other objects equal? method

M	activerecord/lib/active_record/base.rb

commit 2545da6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-30 11:53:58 -0700

    just alias eql? to == for frewer method calls

M	activerecord/lib/active_record/base.rb

commit f7bd07b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-30 11:53:06 -0700

    only calculate method name once

M	activerecord/lib/active_record/attribute_methods/read.rb

commit f261ef4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-30 11:24:39 -0700

    cache the plural name on the reflection so we do not pay pluralize costs on joins

M	activerecord/lib/active_record/associations/join_helper.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit 2ebc564	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-30 18:27:02 -0300

    Depend on edge version of sass-rails

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit fb44101	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-30 18:12:37 -0300

    Depend on edge version of coffee-rails

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 5fe67fa	refs/heads/master
Author: Vijay Dev 
Date:   2011-07-01 00:00:38 +0530

    update doc about resetting the session in case of authenticity token mismatch

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 9eabbab	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-30 18:18:07 +0100

    Document the change to Array.wrap's behaviour that was made in b4d8c7d148c6b44eea6701687ca2a97df9088747

M	railties/guides/source/active_support_core_extensions.textile

commit e495ad8	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-30 11:47:14 -0300

    Make sure respond_with with :js tries to render a template in all cases

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/test/controller/mime_responds_test.rb
A	actionpack/test/fixtures/respond_with/using_resource.js.erb

commit 9c9ec21	refs/heads/master
Author: José Valim 
Date:   2011-06-30 11:47:14 -0300

    Make sure respond_with with :js tries to render a template in all cases

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/test/controller/mime_responds_test.rb
A	actionpack/test/fixtures/respond_with/using_resource.js.erb

commit 0fdac01	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-06-30 16:27:01 +0300

    Fixed ActionView::FormOptionsHelper#select with :multiple => false

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit 35cdd25	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-30 10:18:36 -0300

    Master version is 3.2.0.beta

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 185ba01	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-06-30 10:07:26 -0300

    Bump up rack-cache and tzinfo

M	actionpack/actionpack.gemspec
M	activerecord/activerecord.gemspec

commit a2a7a19	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-30 10:07:26 -0300

    Bump up rack-cache and tzinfo

M	actionpack/actionpack.gemspec
M	activerecord/activerecord.gemspec

commit 9663fad	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-06-30 08:32:53 -0300

    Allow CI to use the latest rubygems version

M	ci/cruise_config.rb

commit 3d0fde5	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-06-30 08:26:25 -0300

    Update CI config

M	ci/cruise_config.rb
M	ci/site_config.rb

commit ba09937	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-06-30 08:32:53 -0300

    Allow CI to use the latest rubygems version

M	ci/cruise_config.rb

commit 314d40a	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-06-30 08:26:25 -0300

    Update CI config

M	ci/cruise_config.rb
M	ci/site_config.rb

commit 20ffd43	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-30 08:32:53 -0300

    Allow CI to use the latest rubygems version

M	ci/cruise_config.rb

commit 452922a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-30 08:26:25 -0300

    Update CI config

M	ci/cruise_config.rb
M	ci/site_config.rb

commit cb307d1	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-30 08:01:26 -0300

    Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit f34f0b7	refs/heads/master
Author: José Valim 
Date:   2011-06-30 08:01:26 -0300

    Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit d1b6188	refs/heads/master
Merge: 539752a bf526c2
Author: José Valim 
Date:   2011-06-30 03:50:47 -0700

    Merge pull request #1690 from vijaydev/mattr_accessor_changes
    
    Added instance_accessor: false to Module#mattr_accessor

commit 8471d43	refs/tags/v3.1.1.rc1
Merge: a6d8fef ae94305
Author: José Valim 
Date:   2011-06-30 02:11:17 -0700

    Merge pull request #1912 from arunagw/new_plugin_g_test
    
    Fix plugin_new_generator_test.rb

commit 7744177	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-30 12:50:05 +0530

    Revert "Included w3c_validators gem and modified Migrations file"
    
    This reverts commit 1028226b00a3671a465b510880bd186ae26b2e3d.
    
    Reason: No code changes can be done in docrails.

M	Gemfile
M	railties/guides/source/migrations.textile

commit b367f96	refs/heads/master
Merge: 7d3a61a 1028226
Author: Daniel Dyba 
Date:   2011-06-29 23:21:09 -0700

    Merge pull request #49 from dyba/master
    
    Separated the ActiveRecord Supported Types in a separate section

commit 1028226	refs/heads/master
Author: Daniel Dyba 
Date:   2011-06-29 23:04:02 -0700

    Included w3c_validators gem and modified Migrations file

M	Gemfile
M	railties/guides/source/migrations.textile

commit ae94305	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-30 08:40:50 +0530

    Fix test for plugin_new_generator_test.rb

M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb

commit 39d5350	refs/tags/v3.0.14
Merge: a657a4b a13317d
Author: Santiago Pastorino 
Date:   2011-06-29 18:37:43 -0700

    Merge pull request #1901 from arunagw/json_parse
    
    It should be in Json format to work with JsonGem

commit a6d8fef	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino 
Date:   2011-06-27 21:54:03 -0300

    Move Coffee generators and templates to Coffee Railtie and create javascript_engine ("js") for apps that remove Coffee gem

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators.rb
A	railties/lib/rails/generators/js/assets/assets_generator.rb
A	railties/lib/rails/generators/js/assets/templates/javascript.js
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/assets/assets_generator.rb
D	railties/lib/rails/generators/rails/assets/templates/javascript.js.coffee
M	railties/test/generators/assets_generator_test.rb
M	railties/test/generators/controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 539752a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-27 21:54:03 -0300

    Move Coffee generators and templates to Coffee Railtie and create javascript_engine ("js") for apps that remove Coffee gem

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators.rb
A	railties/lib/rails/generators/js/assets/assets_generator.rb
A	railties/lib/rails/generators/js/assets/templates/javascript.js
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/assets/assets_generator.rb
D	railties/lib/rails/generators/rails/assets/templates/javascript.js.coffee
M	railties/test/generators/assets_generator_test.rb
M	railties/test/generators/controller_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 22bcb4e	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-30 00:47:35 +0100

    CommandRecorder should delegate in method_missing where possible. Fixes some tests in migration_test.rb under mysql. The problem was introduced in c278a2c5e109204ec8a47fcbfdfc327aad7996ce.

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 4d256bc	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-30 00:47:35 +0100

    CommandRecorder should delegate in method_missing where possible. Fixes some tests in migration_test.rb under mysql. The problem was introduced in c278a2c5e109204ec8a47fcbfdfc327aad7996ce.

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit b4d8c7d	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-30 00:08:43 +0100

    Array.wrap should follow Kernel#Array semantics when the object's to_ary is nil. In this case, the object should be wrapped.

M	activesupport/lib/active_support/core_ext/array/wrap.rb
M	activesupport/test/core_ext/array_ext_test.rb

commit e9fa602	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-30 00:19:16 +0100

    Define to_ary on ActiveRecord::Base to return nil. Improve performance of Array#flatten under 1.9, see comment for details.

M	activerecord/lib/active_record/base.rb

commit b09ef6d	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-30 00:19:16 +0100

    Define to_ary on ActiveRecord::Base to return nil. Improve performance of Array#flatten under 1.9, see comment for details.

M	activerecord/lib/active_record/base.rb

commit dc921ff	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-29 23:46:58 +0200

    sub suffices here

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit 9378d7e	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-29 23:46:58 +0200

    sub suffices here

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit 1d43409	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-29 13:52:44 -0700

    Revert "Delegate to @flashes with 'delegate' instead of manually."
    
    This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b.

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 3dedf5f	refs/heads/master
Merge: c49d1f2 701e855
Author: José Valim 
Date:   2011-06-29 12:34:16 -0700

    Merge pull request #1909 from r00k/master
    
    Use 'delegate' macro instead of writing out methods by hand

commit 701e855	refs/heads/master
Author: Ben Orenstein 
Date:   2011-06-29 15:16:57 -0400

    Delegate to @flashes with 'delegate' instead of manually.

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit c49d1f2	refs/heads/master
Merge: d677097 db87e48
Author: José Valim 
Date:   2011-06-29 10:01:13 -0700

    Merge pull request #1899 from ihower/patch_rake_test
    
    Make "rake test" display not only task name but also exception message.

commit c093ea9	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-29 13:57:59 -0300

    Fix configurable cristalization and tests.

M	activesupport/lib/active_support/configurable.rb
M	activesupport/test/configurable_test.rb

commit d677097	refs/heads/master
Author: José Valim 
Date:   2011-06-29 13:57:59 -0300

    Fix configurable cristalization and tests.

M	activesupport/lib/active_support/configurable.rb
M	activesupport/test/configurable_test.rb

commit db87e48	refs/heads/master
Author: Wen-Tien Chang 
Date:   2011-06-30 00:09:00 +0800

    Add test to rake test for error messages

M	railties/lib/rails/test_unit/testing.rake
M	railties/test/application/rake_test.rb

commit fe6e890	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-29 09:39:41 -0300

    [IMPORTANT] Make "sprockets/railtie" require explicit.
    
    This makes "sprockets/railtie" explicit. This means that sprockets will
    be loaded when you require "rails/all". If you are not using requiring
    "rails/all", you need to manually load it with all other framework
    railties.
    
    In order to be complete, this commit also adds --skip-sprockets to
    the rails generator.

M	actionpack/lib/action_controller/railtie.rb
A	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
M	railties/CHANGELOG
M	railties/bin/rails
M	railties/lib/rails/all.rb
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
M	railties/lib/rails/tasks.rb
D	railties/lib/rails/tasks/assets.rake
M	railties/test/generators/app_generator_test.rb

commit c690b71	refs/heads/master
Author: José Valim 
Date:   2011-06-29 09:39:41 -0300

    [IMPORTANT] Make "sprockets/railtie" require explicit.
    
    This makes "sprockets/railtie" explicit. This means that sprockets will
    be loaded when you require "rails/all". If you are not using requiring
    "rails/all", you need to manually load it with all other framework
    railties.
    
    In order to be complete, this commit also adds --skip-sprockets to
    the rails generator.

M	actionpack/lib/action_controller/railtie.rb
A	actionpack/lib/sprockets/assets.rake
M	actionpack/lib/sprockets/railtie.rb
M	railties/CHANGELOG
M	railties/bin/rails
M	railties/lib/rails/all.rb
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
M	railties/lib/rails/tasks.rb
D	railties/lib/rails/tasks/assets.rake
M	railties/test/generators/app_generator_test.rb

commit a13317d	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-29 15:26:25 +0530

    It should be in Json format to work with JsonGem

M	activesupport/test/json/decoding_test.rb

commit 4106245	refs/heads/master
Merge: 3153685 eafa174
Author: José Valim 
Date:   2011-06-29 02:48:55 -0700

    Merge pull request #1897 from istewart/active_model_dirty_patch
    
    ActiveModel::Dirty patch for multiple assignments to the same attribute

commit 89ad062	refs/heads/master
Author: Wen-Tien Chang 
Date:   2011-06-29 17:15:55 +0800

    Make "rake test" display not only task name but also exception message.

M	railties/lib/rails/test_unit/testing.rake

commit eafa174	refs/heads/master
Author: Ian Stewart 
Date:   2011-06-28 22:18:24 -0700

    changing an attribute multiple times retains the correct original value

M	activemodel/lib/active_model/dirty.rb
M	activemodel/test/cases/dirty_test.rb

commit a657a4b	refs/tags/v3.0.14
Merge: 0ed8dea e54d9c1
Author: Aaron Patterson 
Date:   2011-06-28 20:32:07 -0700

    Merge pull request #1896 from guilleiguaran/issue-1893
    
    Avoid extra call to Cache#read in case of a fragment cache hit (3-0-stable)

commit e54d9c1	refs/tags/v3.0.14
Author: Guillermo Iguaran 
Date:   2011-06-28 22:24:05 -0500

    Avoid extra call to Cache#read in case of a fragment cache hit

M	actionpack/lib/action_view/helpers/cache_helper.rb
M	actionpack/test/controller/log_subscriber_test.rb

commit df5971d	refs/tags/v3.1.1.rc1
Author: Rashmi Yadav 
Date:   2011-06-29 08:18:13 +0530

    3-1-stable fix test when running Jruby. If Jruby Platform is available the gem will change.

M	railties/test/generators/app_generator_test.rb

commit 557d788	refs/tags/v3.0.14
Author: Vishnu Atrai 
Date:   2011-06-29 08:12:20 +0530

    3-0-stable fix test when running Jruby. If Jruby Platform is available the gem will change.

M	railties/test/generators/app_generator_test.rb

commit 0b794f9	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-28 09:35:46 -0300

    Update railties.gemspec

M	railties/railties.gemspec

commit 20db687	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-28 09:09:34 -0300

    Copy the bin to railties so it also works if you don't have the rails gem.

A	railties/bin/rails

commit 0ed8dea	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-29 01:47:56 +0530

    Using not effected timezone in tests.

M	activesupport/test/time_zone_test.rb

commit 23f7dad	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-29 01:47:56 +0530

    Using not effected timezone in tests.

M	activesupport/test/time_zone_test.rb

commit 3153685	refs/heads/master
Merge: ff9566c cd48bd2
Author: Aaron Patterson 
Date:   2011-06-28 16:53:33 -0700

    Merge pull request #1883 from arunagw/time_zone_fix
    
    Using not effected timezone in tests.

commit 7d3a61a	refs/heads/master
Author: Akira Matsuda 
Date:   2011-06-29 08:29:34 +0900

    correct invalid HAVING query
    
    * GROUP BY value must appear in SELECT clause
    * ("created_at < ?", 1.month.ago) wasn't a very good example for HAVING. you'd better use WHERE for such a simple condition

M	railties/guides/source/active_record_querying.textile

commit cfab51c	refs/heads/master
Author: Akira Matsuda 
Date:   2011-06-29 08:04:11 +0900

    correct invalid GROUP BY query
    
    GROUP BY value must appear in SELECT clause

M	railties/guides/source/active_record_querying.textile

commit ff9566c	refs/heads/master
Merge: 59e3880 2b046e7
Author: Santiago Pastorino 
Date:   2011-06-28 14:59:38 -0700

    Merge pull request #1886 from arunagw/fix_test_for_jruby_db
    
    fix test when running Jruby. If Jruby Platform is available the gem will

commit 4cee360	refs/tags/v3.1.1.rc1
Merge: cbf3e33 4b12d7f
Author: Santiago Pastorino 
Date:   2011-06-28 14:59:10 -0700

    Merge pull request #1885 from guilleiguaran/3-1-stable
    
    Bump ARel to 2.1.3 (3-1-stable)

commit 59e3880	refs/heads/master
Merge: 931cf17 56ac32a
Author: Aaron Patterson 
Date:   2011-06-28 14:55:15 -0700

    Merge pull request #1574 from oriolgual/1571_ar_relation_order_no_longer_works_with_arel_nodes
    
    Fix #1571 ActiveRecord::Relation#order no longer works with arel ordering nodes

commit 2b046e7	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-29 02:41:52 +0530

    fix test when running Jruby. If Jruby Platform is available the gem will change.

M	railties/test/generators/app_generator_test.rb

commit 4b12d7f	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-06-27 15:58:40 -0500

    Bump ARel to 2.1.3

M	Gemfile
M	activerecord/activerecord.gemspec

commit cbf3e33	refs/tags/v3.1.1.rc1
Author: Raimonds Simanovskis 
Date:   2011-06-28 23:04:42 +0300

    Fix test_finding_with_cross_table_order_and_limit for Oracle
    
    Use latest Arel syntax and pass each order by expression as separate argument to order method as otherwise invalid Oracle SQL is generated.

M	activerecord/test/cases/relations_test.rb

commit 931cf17	refs/heads/master
Merge: 941d5c1 f838b47
Author: Aaron Patterson 
Date:   2011-06-28 13:48:53 -0700

    Merge pull request #1882 from rsim/fix_test_finding_with_cross_table_order_and_limit
    
    Fix test_finding_with_cross_table_order_and_limit for Oracle

commit 56ac32a	refs/heads/master
Author: Oriol Gual 
Date:   2011-06-28 22:31:24 +0200

    Fix case

M	activerecord/lib/active_record/relation/query_methods.rb

commit 2e0840d	refs/heads/master
Author: Oriol Gual 
Date:   2011-06-28 22:22:26 +0200

    Update reverse order with new Arel Nodes

M	activerecord/lib/active_record/relation/query_methods.rb

commit cd48bd2	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-29 01:47:56 +0530

    Using not effected timezone in tests.

M	activesupport/test/time_zone_test.rb

commit c26c273	refs/tags/v3.1.1.rc1
Author: Ernie Miller 
Date:   2011-06-20 14:15:19 -0400

    Support reversal of ARel orderings in reverse_sql_order

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit eb933f0	refs/heads/master
Author: Oriol Gual 
Date:   2011-06-08 21:08:29 +0200

    Add more test cases

M	activerecord/test/cases/relation_scoping_test.rb

commit e174923	refs/heads/master
Author: Oriol Gual 
Date:   2011-06-08 20:54:27 +0200

    Add failing test

M	activerecord/test/cases/relation_scoping_test.rb

commit f838b47	refs/heads/master
Author: Raimonds Simanovskis 
Date:   2011-06-28 23:04:42 +0300

    Fix test_finding_with_cross_table_order_and_limit for Oracle
    
    Use latest Arel syntax and pass each order by expression as separate argument to order method as otherwise invalid Oracle SQL is generated.

M	activerecord/test/cases/relations_test.rb

commit eb3e523	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-25 00:01:59 +0530

    record unsupported methods in CommandRecorder instead of letting the unsupported methods go through to the underlying db causing errors like duplicate columns to occur when rolling back migrations

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 941d5c1	refs/heads/master
Merge: a5cb5a5 c278a2c
Author: Aaron Patterson 
Date:   2011-06-28 12:05:19 -0700

    Merge pull request #1857 from vijaydev/irreversible-migration
    
    IrreversibleMigration is not raised when a method not supported by reversible migrations is called in the change method of a migration

commit b3e3c50	refs/tags/v3.0.14
Author: Maxime RETY 
Date:   2010-06-14 16:05:49 +0200

    Fix JSON decoding of newline character with Yaml backend [#3479 state:resolved]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/json/backends/yaml.rb
M	activesupport/test/json/decoding_test.rb

commit f170045	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-26 09:41:30 +0200

    comparing different classes returns nil

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit c5b43af	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-25 16:35:59 +0200

    allow comparison on model objects - Closes #1858

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit a5cb5a5	refs/heads/master
Merge: 26caf32 eb22c51
Author: Aaron Patterson 
Date:   2011-06-28 11:46:25 -0700

    Merge pull request #1860 from dmathieu/comparison
    
    Allow comparison on model objects - Closes #1858

commit a6495af	refs/tags/v3.0.14
Merge: 59f19a9 2771b91
Author: Aaron Patterson 
Date:   2011-06-28 11:40:30 -0700

    Merge pull request #1649 from arunagw/jruby_3_0_stable
    
    Jruby 3 0 stable

commit e0fae72	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-28 10:57:56 -0700

    remove useless assignment

M	activerecord/lib/active_record/base.rb

commit 26caf32	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-28 10:57:56 -0700

    remove useless assignment

M	activerecord/lib/active_record/base.rb

commit d864616	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-28 10:51:23 -0700

    lock_optimistically is typically true, so evaluate the common failure case first

M	activerecord/lib/active_record/locking/optimistic.rb

commit 13e79eb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-28 10:51:23 -0700

    lock_optimistically is typically true, so evaluate the common failure case first

M	activerecord/lib/active_record/locking/optimistic.rb

commit 558b5bb	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-28 10:22:39 -0700

    reduce object allocation during AR instantiation

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb

commit 02f45d6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-28 10:22:39 -0700

    reduce object allocation during AR instantiation

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb

commit c290900	refs/heads/master
Merge: 71d7c52 8c1f62a
Author: José Valim 
Date:   2011-06-28 05:55:50 -0700

    Merge pull request #1878 from arunagw/mime_test_fix
    
    Removing image/gif from this test.

commit 8c1f62a	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-28 17:48:29 +0530

    No need to register again. As it's default now.
    Removing gif from here because when it got unregister it start failing other places.

M	actionpack/test/dispatch/mime_type_test.rb

commit 71d7c52	refs/heads/master
Author: José Valim 
Date:   2011-06-28 09:35:46 -0300

    Update railties.gemspec

M	railties/railties.gemspec

commit e3053ee	refs/heads/master
Author: José Valim 
Date:   2011-06-28 09:09:34 -0300

    Copy the bin to railties so it also works if you don't have the rails gem.

A	railties/bin/rails

commit 0a87362	refs/heads/master
Merge: 76581d0 1b95717
Author: José Valim 
Date:   2011-06-28 04:58:29 -0700

    Merge pull request #1877 from arunagw/fix_mime
    
    Fix test to use Mime::Zip

commit 1b95717	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-28 16:51:19 +0530

    Fix test to use Mime::Zip

M	actionpack/lib/action_dispatch/http/mime_types.rb
M	actionpack/test/dispatch/mime_type_test.rb

commit 76581d0	refs/heads/master
Author: José Valim 
Date:   2011-06-28 02:45:27 -0700

    Edited actionpack/CHANGELOG via GitHub

M	actionpack/CHANGELOG

commit 4f372cf	refs/heads/master
Merge: 9921eca 2a61d47
Author: José Valim 
Date:   2011-06-28 02:44:04 -0700

    Merge pull request #1875 from esad/master
    
    Fixed issue #1847

commit 2a61d47	refs/heads/master
Author: Esad Hajdarevic 
Date:   2011-06-28 06:57:41 +0200

    Make send_file guess content-type from file extension, if type wasn't supplied (Issue #1847). Update tests & documentation.

M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/test/controller/send_file_test.rb

commit d73269b	refs/heads/master
Author: Esad Hajdarevic 
Date:   2011-06-28 06:56:28 +0200

    Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default

M	actionpack/lib/action_dispatch/http/mime_types.rb

commit 196f92f	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 20:44:39 -0700

    remove the check for needs_type_condition? because ensure_proper_type will pick up the type column

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb

commit 9921eca	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 20:44:39 -0700

    remove the check for needs_type_condition? because ensure_proper_type will pick up the type column

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb

commit 992b3b5	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 18:16:01 -0700

    stop using && for the short circuit side effect

M	activerecord/lib/active_record/base.rb

commit 5d954b4	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 18:15:28 -0700

    let strings be converted to symbols inside the interpreter

M	activerecord/lib/active_record/base.rb

commit 4006e73	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 18:16:01 -0700

    stop using && for the short circuit side effect

M	activerecord/lib/active_record/base.rb

commit 4ec47ca	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 18:15:28 -0700

    let strings be converted to symbols inside the interpreter

M	activerecord/lib/active_record/base.rb

commit 9fd0d91	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 17:46:56 -0700

    avoice paying hash cost if there are no serialized attributes

M	activerecord/lib/active_record/base.rb

commit 2fe088a	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 17:45:34 -0700

    cache column defaults for AR object instantiation

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/persistence.rb

commit 9152126	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 17:46:56 -0700

    avoice paying hash cost if there are no serialized attributes

M	activerecord/lib/active_record/base.rb

commit 45b7209	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 17:45:34 -0700

    cache column defaults for AR object instantiation

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/persistence.rb

commit b927f0a	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 16:15:34 -0700

    AR object instantiation is ~30% faster in the simple case

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb

commit 06d4247	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 16:15:34 -0700

    AR object instantiation is ~30% faster in the simple case

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb

commit 6a1803a	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-28 08:25:14 +1000

    [asset pipeline] Add production assets section

M	railties/guides/source/asset_pipeline.textile

commit 9959fa2	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-28 08:24:59 +1000

    [asset pipeline] Add examples of javascript_include_tag and stylesheet_link_tag

M	railties/guides/source/asset_pipeline.textile

commit 703b009	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-28 08:22:38 +1000

    [Asset pipeline] Move external assets section down to 'Adding assets to your gems' section

M	railties/guides/source/asset_pipeline.textile

commit 49bb053	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-28 08:15:41 +1000

    [asset pipeline] production assets covered later in the guide

M	railties/guides/source/asset_pipeline.textile

commit 87a7098	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-28 08:15:04 +1000

    [asset pipeline] sections at the bottom of the asset pipeline guide should all be toplevel

M	railties/guides/source/asset_pipeline.textile

commit fb7ea76	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-28 08:09:04 +1000

    [asset pipeline] Mention that hashed files are also picked up by Sprockets

M	railties/guides/source/asset_pipeline.textile

commit 22b508d	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-28 07:55:14 +1000

    [asset pipeline] Cascade -> Cascading

M	railties/guides/source/asset_pipeline.textile

commit 0de56aa	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 14:47:11 -0700

    initialize instance variables

M	activerecord/lib/active_record/base.rb

commit 3a14e6f	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 14:46:56 -0700

    oops! remove debugging codes

M	activerecord/test/cases/relation_test.rb

commit 5ddb60f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 14:47:11 -0700

    initialize instance variables

M	activerecord/lib/active_record/base.rb

commit 6054c09	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 14:46:56 -0700

    oops! remove debugging codes

M	activerecord/test/cases/relation_test.rb

commit 0abb7b8	refs/tags/v3.1.1.rc1
Author: Aaron Patterson 
Date:   2011-06-27 14:18:49 -0700

    default create_with_value to a hash so we can eliminate conditionals, add test surrounding create_with(nil) behavior

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb

commit 997aed2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-27 14:18:49 -0700

    default create_with_value to a hash so we can eliminate conditionals, add test surrounding create_with(nil) behavior

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb

commit 506b2da	refs/heads/master
Merge: 4bcb05d 1c23887
Author: Aaron Patterson 
Date:   2011-06-27 14:06:00 -0700

    Merge pull request #1871 from guilleiguaran/arel-2-1-3
    
    Bump ARel to 2.1.3

commit 4bcb05d	refs/heads/master
Merge: a0960ec 024bed3
Author: Santiago Pastorino 
Date:   2011-06-27 14:01:34 -0700

    Merge pull request #1870 from chriseppstein/asset_urls_master
    
    Asset urls master

commit 3f759bf	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-27 23:00:05 +0200

    the generated ALT attribute for images no longer contains the digest, if any

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit a0960ec	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-27 23:00:05 +0200

    the generated ALT attribute for images no longer contains the digest, if any

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 024bed3	refs/heads/master
Author: Chris Eppstein 
Date:   2011-06-27 13:58:51 -0700

    Added a configuration setting:
    
      config.action_controller.default_asset_host_protocol
    
    It's best to leave this unset.
    
    When unset the :request protocol is used whenever it can be and
    :relative is used in the other situations.
    
    When set to :request then assets hosts will be disabled when there
    is no request in scope and will use the request protocol whenever a
    request is in scope.
    
    If set to :relative, then a relative protocol is always used except
    for stylesheet link tags which must use the :request protocol to
    avoid double downloads in IE6&7.
    
    Conflicts:
    
    	actionpack/lib/sprockets/helpers/rails_helper.rb
    	actionpack/test/template/sprockets_helper_test.rb

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 1c23887	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-27 15:58:40 -0500

    Bump ARel to 2.1.3

M	Gemfile
M	activerecord/activerecord.gemspec

commit 2cc1bc3	refs/heads/master
Author: Chris Eppstein 
Date:   2011-06-18 12:10:09 -0700

    Move the config bootstrapping to initialization to minimize access to the Rails.application global.

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 6c64e1e	refs/heads/master
Author: Chris Eppstein 
Date:   2011-06-27 13:54:54 -0700

    Stylesheet link tags should use the request protocol to avoid duplicate download of stylesheets in IE7 and IE8.
    
    Conflicts:
    
    	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
    	actionpack/lib/sprockets/helpers/rails_helper.rb

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 96137e8	refs/heads/master
Author: Chris Eppstein 
Date:   2011-06-27 13:48:36 -0700

    Add asset_url helper and refactor the asset paths so that asset hosts can be used during asset precompilation.
    
    Conflicts:
    
    	actionpack/lib/action_view/asset_paths.rb
    	actionpack/lib/sprockets/helpers/rails_helper.rb
    	actionpack/test/template/sprockets_helper_test.rb

M	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit adf3348	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-28 02:16:56 +0530

    fix javascript case

M	railties/guides/source/asset_pipeline.textile

commit 266b80c	refs/heads/master
Author: Chris Eppstein 
Date:   2011-06-13 22:45:34 -0700

    OrderedOptions must implement respond_to? if it implements method_missing.

M	activesupport/lib/active_support/ordered_options.rb
M	railties/lib/rails/engine.rb

commit 7d0c725	refs/tags/v3.1.1.rc1
Merge: 0f128b1 4b8bd7a
Author: David Heinemeier Hansson 
Date:   2011-06-27 12:19:56 -0700

    Merge pull request #1699 from chriseppstein/asset_urls
    
    asset_path will now use asset_host definition

commit 0f128b1	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-27 11:27:39 -0700

    Skip if it is actually a pluralize scheme.

M	activerecord/lib/active_record/railtie.rb

commit 14cfc45	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-27 09:55:28 -0700

    Edited railties/lib/rails/paths.rb via GitHub

M	railties/lib/rails/paths.rb

commit 4b8bd7a	refs/tags/v3.1.1.rc1
Merge: 0e5891a 94c08a6
Author: Chris Eppstein 
Date:   2011-06-27 08:56:37 -0700

    Merge remote-tracking branch 'rails/3-1-stable' into asset_urls
    
    * rails/3-1-stable: (49 commits)
      Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)
      Merge pull request #1481 from arunagw/lib_assets
      Improve ordering of multiple columns on postgresql
      judgement -> judgment, according to guidelines
      Follow rails convention by using Array.wrap
      Allow to specify mass-assignment roles as array
      Apply the default scope earlier when doing calculations. Fixes #1682.
      updated rspec link
      grammar changes in named routes description and clarity around possibilities for options
      font style changes in perf guide
      grammar changes to log subscriber docs
      move example code to be above reconfiguring discussion; add clarity about silencers and filters; misc grammar changes - for backtrace cleaners
      Fixed typo
      use present tense on examples
      more detail on how the flow between redirect and show works, and minor grammar
      remove extra space and clarify how an exception is made for controller wide layouts
      reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made
      singularize module and be explicit about what is delivered
      grammar (missing "a") and formatting
      elaborate details on why to use _url instead of _path in mailers
      ...
    
    Conflicts:
    	actionpack/lib/action_view/helpers/asset_paths.rb
    	actionpack/lib/sprockets/helpers/rails_helper.rb

commit f63f0ba	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-06-27 11:59:23 +0200

    Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)

M	railties/lib/rails/info.rb

commit 94c08a6	refs/tags/v3.1.1.rc1
Author: David Heinemeier Hansson 
Date:   2011-06-27 11:59:23 +0200

    Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)

M	railties/lib/rails/info.rb

commit 7423e22	refs/tags/v3.1.1.rc1
Author: David Heinemeier Hansson 
Date:   2011-06-27 02:16:24 -0700

    Merge pull request #1481 from arunagw/lib_assets
    
    Generating /lib/assets  for assets

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/app_generator_test.rb

commit 449cc3e	refs/heads/master
Merge: 095f046 13f8b28
Author: David Heinemeier Hansson 
Date:   2011-06-27 02:16:24 -0700

    Merge pull request #1481 from arunagw/lib_assets
    
    Generating /lib/assets  for assets

commit 2fd1f2e	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-26 19:44:55 -0400

    clarify which url would be used to cache a page when options are not provided to #cache_page to determine that url

M	actionpack/lib/action_controller/caching/pages.rb

commit eccd5cb	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-26 19:41:49 -0400

    elaborate on how web server configuration to check for static files on disk enables page caching to work without hitting the app server stack

M	actionpack/lib/action_controller/caching/pages.rb

commit 8c11038	refs/heads/master
Author: Ray Baxter 
Date:   2011-06-26 15:16:29 -0700

    correct error message for failed creation

M	activesupport/lib/active_support/testing/assertions.rb

commit 7326905	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-27 00:12:39 +0530

    minor changes

M	activerecord/lib/active_record/migration.rb
M	railties/guides/source/action_controller_overview.textile

commit 798aa88	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-26 17:06:19 +0530

    minor indentation fixes on a6293ff

M	railties/guides/source/active_record_querying.textile

commit eb22c51	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-26 09:41:30 +0200

    comparing different classes returns nil

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit bc743dc	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-25 16:35:59 +0200

    allow comparison on model objects - Closes #1858

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 5f5feb2	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-26 15:54:12 +1000

    Update changelog for querying guide

M	railties/guides/source/active_record_querying.textile

commit a6293ff	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-26 15:39:12 +1000

    Querying guide: add mention of scoped, unscoped and default_scope to querying guide

M	railties/guides/source/active_record_querying.textile

commit 1b089a0	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-18 22:07:19 +1000

    Refer to sprockets + jammit as libraries, not gems

M	railties/guides/source/asset_pipeline.textile

commit 532c294	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-26 02:24:35 +0530

    replace find(all) with all

M	activerecord/lib/active_record/migration.rb

commit 095f046	refs/heads/master
Merge: 211fa2d a7af1e0
Author: Santiago Pastorino 
Date:   2011-06-25 12:12:49 -0700

    Merge pull request #1861 from dchelimsky/fixture_path
    
    Get the fixture_path from self.class instead of ActiveSupport::TestCase.

commit a7af1e0	refs/heads/master
Author: David Chelimsky 
Date:   2011-06-25 12:41:06 -0500

    Get the fixture_path from self.class instead of ActiveSupport::TestCase.
    
    This allows test classes that are not subclasses of
    ActiveSupport::TestCase (like those in rspec-rails) to interact with
    with this variable without having to reference ActiveSupport::TestCase.

M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/test/controller/test_test.rb

commit 5a79ca6	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-25 18:47:51 +0530

    fix typo in method name

M	activerecord/lib/active_record/migration/command_recorder.rb
M	railties/guides/source/migrations.textile

commit 2332aa6	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-25 18:45:41 +0530

    Revert "add missing methods supported by reversible migrations using the change method"
    
    This reverts commit 7f91eebae361f2f3a1558f6d899b372524509a2d.
    
    Reason: Incorrect documenting. The newly added methods to the list are
    not actually supported by reversible migrations.

M	activerecord/lib/active_record/migration/command_recorder.rb
M	railties/guides/source/migrations.textile

commit 211fa2d	refs/heads/master
Merge: 7e56bf7 4700e1f
Author: Xavier Noria 
Date:   2011-06-25 06:05:11 -0700

    Merge pull request #1853 from arunagw/string_parameterize
    
    StringToParameterizeWithNoSeparator: dashed parameter will not change.

commit c278a2c	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-25 00:01:59 +0530

    record unsupported methods in CommandRecorder instead of letting the unsupported methods go through to the underlying db causing errors like duplicate columns to occur when rolling back migrations

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit 4700e1f	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-25 06:16:00 +0530

    StringToParameterizeWithNoSeparator: dashed parameter will not
    change.

M	activesupport/test/inflector_test_cases.rb

commit 54531b8	refs/tags/v3.1.1.rc1
Merge: e65f114 975ff5d
Author: Santiago Pastorino 
Date:   2011-06-24 15:05:44 -0700

    Merge pull request #1849 from raviolicode/postgresql-fix-3-1
    
    [3-1-stable] Fix for complex ordering of multiple columns on postgresql

commit 7e56bf7	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-24 23:27:40 +0200

    registers support for acronyms in the CHANGELOG of Active Support

M	activesupport/CHANGELOG

commit 370b380	refs/heads/master
Merge: d446c79 d38ca78
Author: Xavier Noria 
Date:   2011-06-24 14:19:42 -0700

    Merge pull request #1648 from dlee/acronyms
    
    Inflector support for acronyms (Issue #1366)

commit 975ff5d	refs/tags/v3.1.1.rc1
Author: Lucia Escanellas 
Date:   2011-06-23 22:32:22 -0300

    Improve ordering of multiple columns on postgresql
    
    * Only on postgresql, order("first asc, second asc") was invalid
    * Closes #1720

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/relations_test.rb

commit d446c79	refs/heads/master
Author: James Cox 
Date:   2011-06-24 15:01:57 -0400

    make the logs a little simpler to view, put the render message inline with other events, pull processing to char[0] and add a new line to the completed. looks more like a block now, which is useful for serial actions like test/dev

M	actionpack/lib/action_controller/log_subscriber.rb
M	actionpack/lib/action_view/log_subscriber.rb

commit d6413f0	refs/heads/master
Merge: 7ca1a3d 9734a41
Author: Santiago Pastorino 
Date:   2011-06-24 13:09:33 -0700

    Merge pull request #1848 from raviolicode/postgresql_order_multiple_params
    
    Fix for complex ordering of multiple columns on postgresql

commit 9734a41	refs/heads/master
Author: Lucia Escanellas 
Date:   2011-06-23 22:32:22 -0300

    Improve ordering of multiple columns on postgresql
    
    * Only on postgresql, order("first asc, second asc") was invalid
    * Closes #1720

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/relations_test.rb

commit e65f114	refs/tags/v3.1.1.rc1
Merge: 2bdc381 2b72bb9
Author: Santiago Pastorino 
Date:   2011-06-24 08:44:42 -0700

    Merge pull request #1844 from jeroenj/cachesweeper-fix-3-1
    
    Fixes an issue where cache sweepers

commit 59f19a9	refs/tags/v3.0.14
Author: Xavier Noria 
Date:   2011-06-24 17:20:29 +0200

    updates the contributing guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 2bdc381	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-24 17:19:42 +0200

    judgement -> judgment, according to guidelines

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 837a74bc	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-24 06:33:59 -0700

    Edited railties/guides/source/asset_pipeline.textile via GitHub

M	railties/guides/source/asset_pipeline.textile

commit 7f91eeb	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-24 12:31:14 +0530

    add missing methods supported by reversible migrations using the change method

M	activerecord/lib/active_record/migration/command_recorder.rb
M	railties/guides/source/migrations.textile

commit c8ff12c	refs/tags/v3.1.1.rc1
Merge: 03580e0 79956db
Author: José Valim 
Date:   2011-06-23 18:34:06 -0700

    Merge pull request #1839 from wildchild/3-1-stable
    
    Allow to specify roles for mass-assignment as array

commit 7ca1a3d	refs/heads/master
Merge: 4389fc9 e945497
Author: Santiago Pastorino 
Date:   2011-06-23 16:47:56 -0700

    Merge pull request #1840 from wildchild/master
    
    Minor formatting fix

commit e945497	refs/heads/master
Author: Alexander Uvarov 
Date:   2011-06-24 03:52:39 +0600

    Minor formating fix

M	activemodel/lib/active_model/mass_assignment_security.rb

commit 79956db	refs/tags/v3.1.1.rc1
Author: Alexander Uvarov 
Date:   2011-06-23 23:06:52 +0600

    Follow rails convention by using Array.wrap

M	activemodel/lib/active_model/mass_assignment_security.rb

commit 52302f0	refs/tags/v3.1.1.rc1
Author: Alexander Uvarov 
Date:   2011-06-23 12:56:39 +0600

    Allow to specify mass-assignment roles as array

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/test/cases/mass_assignment_security_test.rb
M	activemodel/test/models/mass_assignment_specific.rb

commit 4389fc9	refs/heads/master
Merge: 87d6865 ee044ea
Author: José Valim 
Date:   2011-06-23 13:37:39 -0700

    Merge pull request #1829 from wildchild/master
    
    Allow to specify roles for mass-assignment as array

commit 19392cf	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-06-23 16:29:28 -0300

    Add CHANGELOG entry

M	actionpack/CHANGELOG

commit 3add2ea	refs/tags/v3.0.14
Merge: 8467ea3 2f9bd25
Author: Santiago Pastorino 
Date:   2011-06-23 12:24:30 -0700

    Merge pull request #1834 from jeroenj/cachesweeper-fix-3-0
    
    Fixes an issue where cache sweepers

commit 5a44c70	refs/tags/v3.0.14
Author: Mike Gehard 
Date:   2011-06-23 12:59:25 -0600

    Fix issue where assigning a empty string to the _type column of a polymorphic association throws an error.  Now it returns nil for the association as one would expect.
    
    [Fixes #1824]

M	activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 03580e0	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-23 19:57:49 +0100

    Apply the default scope earlier when doing calculations. Fixes #1682.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit 87d6865	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-23 19:57:49 +0100

    Apply the default scope earlier when doing calculations. Fixes #1682.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit ee044ea	refs/heads/master
Author: Alexander Uvarov 
Date:   2011-06-23 23:06:52 +0600

    Follow rails convention by using Array.wrap

M	activemodel/lib/active_model/mass_assignment_security.rb

commit f1d77ba	refs/heads/master
Author: Alberto Perdomo 
Date:   2011-06-23 17:57:48 +0100

    Action Mailer Basics Guide: Added example on using mail(:template_path => ..., :template_name => ...) to specify custom template files.

M	railties/guides/source/action_mailer_basics.textile

commit 8a1319d	refs/heads/master
Merge: 1f505a8 b9bfb91
Author: Aaron Patterson 
Date:   2011-06-23 09:45:59 -0700

    Merge pull request #1835 from metaskills/ss_rake_master
    
    Update SQL Server DB Rake Tasks

commit b9bfb91	refs/heads/master
Author: Ken Collins 
Date:   2011-06-20 22:08:31 -0400

    Update SQL Server db related rake tasks.
    
      * Uses open source smoscript since scptxfr came out in 2000.
      * Uses sqlcmd which replaces osql.
      * Takes advantage of host/user/pass passed down by TinyTDS.

M	activerecord/lib/active_record/railties/databases.rake

commit 43141e9	refs/tags/v3.1.1.rc1
Author: Mikhail Dieterle 
Date:   2011-06-23 03:08:32 -0700

    updated rspec link

M	railties/guides/source/testing.textile

commit bad16df	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-22 11:00:56 -0400

    grammar changes in named routes description and clarity around possibilities for options

M	actionpack/lib/action_view/helpers/url_helper.rb

commit e002cf2	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-22 19:40:51 +0530

    font style changes in perf guide

M	railties/guides/source/performance_testing.textile

commit 3cebef7	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-22 09:27:22 -0400

    grammar changes to log subscriber docs

M	activesupport/lib/active_support/log_subscriber.rb

commit eaee931	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-22 09:06:05 -0400

    move example code to be above reconfiguring discussion; add clarity about silencers and filters; misc grammar changes - for backtrace cleaners

M	activesupport/lib/active_support/backtrace_cleaner.rb

commit 6d4e3f3	refs/tags/v3.1.1.rc1
Author: Mikhail Dieterle 
Date:   2011-06-22 03:04:28 -0700

    Fixed typo

M	railties/guides/source/form_helpers.textile

commit 8771538	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-21 15:12:11 -0400

    use present tense on examples

M	actionpack/lib/abstract_controller/layouts.rb

commit 56cf974	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-21 10:47:37 -0400

    more detail on how the flow between redirect and show works, and minor grammar

M	actionpack/lib/action_controller/base.rb

commit 26284ad	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-21 10:34:31 -0400

    remove extra space and clarify how an exception is made for controller wide layouts

M	actionpack/lib/abstract_controller/layouts.rb

commit cf1341f	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-21 10:31:16 -0400

    reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made

M	actionpack/lib/abstract_controller/layouts.rb

commit b3d8e50	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-21 10:20:01 -0400

    singularize module and be explicit about what is delivered

M	actionmailer/lib/action_mailer/delivery_methods.rb

commit 30ac5ff	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-21 09:12:34 -0400

    grammar (missing "a") and formatting

M	actionmailer/lib/action_mailer/base.rb

commit bb679d2	refs/tags/v3.1.1.rc1
Author: Matt Jankowski 
Date:   2011-06-21 09:04:28 -0400

    elaborate details on why to use _url instead of _path in mailers

M	actionmailer/lib/action_mailer/base.rb

commit 57bdf7e	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-20 15:24:41 +0530

    Closing 

M	railties/guides/source/getting_started.textile

commit ae8d53e	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-20 02:12:21 +0530

    document Active Record's reverse_order method

M	railties/guides/source/active_record_querying.textile

commit 741a417	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-20 01:42:43 +0530

    AR: use where in place of find

M	railties/guides/source/association_basics.textile

commit 421841d	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-20 01:24:04 +0530

    minor changes in getting started guide

M	railties/guides/source/getting_started.textile

commit f2d18b8	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-20 00:36:52 +0530

    document the instance_reader option for class_attribute

M	railties/guides/source/active_support_core_extensions.textile

commit 98ae482	refs/tags/v3.1.1.rc1
Merge: 90b47bd e5cf2ad
Author: Aaron Patterson 
Date:   2011-06-23 09:09:25 -0700

    Merge pull request #1795 from metaskills/ss_db_tasks
    
    Update SQL Server DB Rake Tasks

commit 1f505a8	refs/heads/master
Merge: d49622a 06fe01a
Author: Xavier Noria 
Date:   2011-06-23 18:08:11 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 2f9bd25	refs/tags/v3.0.14
Author: Jeroen Jacobs 
Date:   2011-06-21 12:34:00 +0200

    Fixes an issue where cache sweepers with only after filters would have no controller object
    
    It would raise undefined method controller_name for nil

M	actionpack/lib/action_controller/caching/sweeping.rb

commit 8ebc17f	refs/tags/v3.0.14
Author: Jeroen Jacobs 
Date:   2011-06-22 18:00:46 +0200

    Tests only after filters in cache sweepers

M	actionpack/test/controller/filters_test.rb

commit 2b72bb9	refs/tags/v3.1.1.rc1
Author: Jeroen Jacobs 
Date:   2011-06-22 18:00:46 +0200

    Tests only after filters in cache sweepers

M	actionpack/test/controller/filters_test.rb

commit a46d231	refs/tags/v3.1.1.rc1
Author: Jeroen Jacobs 
Date:   2011-06-21 12:34:00 +0200

    Fixes an issue where cache sweepers with only after filters would have no controller object
    
    It would raise undefined method controller_name for nil

M	actionpack/lib/action_controller/caching/sweeping.rb

commit 90b47bd	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-23 07:39:45 -0700

    Edited actionpack/actionpack.gemspec via GitHub

M	actionpack/actionpack.gemspec

commit d49622a	refs/heads/master
Author: José Valim 
Date:   2011-06-23 07:38:41 -0700

    Edited actionpack/actionpack.gemspec via GitHub

M	actionpack/actionpack.gemspec

commit 5839122	refs/heads/master
Merge: 87b548c deb60a7
Author: José Valim 
Date:   2011-06-23 05:51:00 -0700

    Merge pull request #1830 from arunagw/enum_fixes
    
    Fixed Failing test : It should be Enumerable::Enumerator

commit deb60a7	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-23 12:59:56 +0530

    Using slice for instead of gsub to pass with 1.8.7

M	activesupport/test/safe_buffer_test.rb

commit 06fe01a	refs/heads/master
Author: Mikhail Dieterle 
Date:   2011-06-23 03:08:32 -0700

    updated rspec link

M	railties/guides/source/testing.textile

commit 528f405	refs/heads/master
Author: Alexander Uvarov 
Date:   2011-06-23 12:56:39 +0600

    Allow to specify mass-assignment roles as array

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/test/cases/mass_assignment_security_test.rb
M	activemodel/test/models/mass_assignment_specific.rb

commit 87b548c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-23 00:35:54 -0300

    Minor refactor

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 22e86c1	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-22 16:19:06 -0300

    fixtures :all is already included in test_helper.rb

M	railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb

commit 7f6eed0	refs/heads/master
Merge: 6b3342d 9c1d0d8
Author: Santiago Pastorino 
Date:   2011-06-22 20:34:33 -0700

    Merge pull request #1796 from jdeseno/master
    
    link_to doesn't allow rel attribute when also specifying method

commit 618300f	refs/heads/master
Author: Jon Guymon 
Date:   2011-06-22 13:41:34 -0700

    Log instrumentation name for exists? queries

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/log_subscriber_test.rb

commit 6b3342d	refs/heads/master
Merge: a1f8421 93ff522
Author: Santiago Pastorino 
Date:   2011-06-22 10:48:19 -0700

    Merge pull request #1798 from jeroenj/cachesweeper-fix
    
    Fixes an issue where cache sweepers with only after filters would have no controller object

commit a1f8421	refs/heads/master
Author: Joshua Peek 
Date:   2011-06-22 11:29:11 -0500

    Revert "Bump sprockets requirement"
    
    This reverts commit 458512c8fa31196816dd2372fddecd0e0237c4c0.

M	actionpack/actionpack.gemspec

commit a70f65c	refs/tags/v3.1.1.rc1
Author: Joshua Peek 
Date:   2011-06-22 11:28:29 -0500

    Revert "Bump sprockets requirement"
    
    This reverts commit 5a7465c2d77afd081a49ec5cedce799634068687.

M	actionpack/actionpack.gemspec

commit 93ff522	refs/heads/master
Author: Jeroen Jacobs 
Date:   2011-06-22 18:00:46 +0200

    Tests only after filters in cache sweepers

M	actionpack/test/controller/filters_test.rb

commit 1689498	refs/heads/master
Author: José Valim 
Date:   2011-06-22 12:52:46 -0300

    Update CHANGELOG.

M	railties/CHANGELOG

commit 5e7efbf	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-22 12:51:22 -0300

    Update CHANGELOG.

M	railties/CHANGELOG

commit 09866ce	refs/heads/master
Merge: 5654f68 08f3f30
Author: Aaron Patterson 
Date:   2011-06-22 08:30:52 -0700

    Merge pull request #1790 from ernie/reverse_sql_order_fix
    
    Support reversal of ARel orderings in reverse_sql_order

commit 3eaed28	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-22 11:00:56 -0400

    grammar changes in named routes description and clarity around possibilities for options

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 95f827f	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-22 19:40:51 +0530

    font style changes in perf guide

M	railties/guides/source/performance_testing.textile

commit 5654f68	refs/heads/master
Merge: 53444b8 9fadf38
Author: Xavier Noria 
Date:   2011-06-22 06:30:56 -0700

    Merge pull request #1750 from dmathieu/non_string_methods
    
    Calling unsafe methods which don't return a string shouldn't fail

commit 3cfbf54	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-22 09:27:22 -0400

    grammar changes to log subscriber docs

M	activesupport/lib/active_support/log_subscriber.rb

commit 9fadf38	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-17 18:17:28 +0200

    calling unsafe methods which don't return a string shouldn't fail

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 32de3b8	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-22 09:06:05 -0400

    move example code to be above reconfiguring discussion; add clarity about silencers and filters; misc grammar changes - for backtrace cleaners

M	activesupport/lib/active_support/backtrace_cleaner.rb

commit 53444b8	refs/heads/master
Merge: 3c8c379 3534ea8
Author: José Valim 
Date:   2011-06-22 05:02:52 -0700

    Merge pull request #1813 from arunagw/jruby_tests
    
    Tests Added for jdbc option added for Jruby

commit 98623a0	refs/heads/master
Author: Mikhail Dieterle 
Date:   2011-06-22 03:04:28 -0700

    Fixed typo

M	railties/guides/source/form_helpers.textile

commit 3c8c379	refs/heads/master
Merge: 6404f8a 237f870
Author: José Valim 
Date:   2011-06-22 02:33:12 -0700

    Merge pull request #1778 from spohlenz/hash-models
    
    Fix nested fields_for when Hash-based model is passed.

commit 2771b91	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-22 09:22:16 +0530

    Test added to check default option with jruby. It should generate
    sqlite3 bases app

M	railties/test/generators/app_generator_test.rb

commit ecddc65	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-22 09:17:55 +0530

    Modified .yml files according to master changes. As this will also work.

M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
M	railties/test/generators/app_generator_test.rb

commit fb495cd	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-22 09:00:05 +0530

    Tests added for jdbc option

M	railties/test/generators/app_generator_test.rb

commit 3534ea8	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-22 08:43:34 +0530

    Tests added when no option is given with #jruby. It should generate
    sqlite3 based app

M	railties/test/generators/app_generator_test.rb

commit 2fc22bf	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-22 08:36:16 +0530

    Convert database names to ones appropriate for JRuby

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 2aeabdc	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-22 08:32:29 +0530

    Add generic 'jdbc' database option

M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml

commit 25e5ad2	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-22 08:28:51 +0530

    Remove superfluous pg driver install instructions

M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml

commit b2a19ad	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-22 08:15:12 +0530

    Making tests according to the changes #jruby

M	railties/test/generators/app_generator_test.rb

commit b7bce73	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-22 08:04:18 +0530

    Test added for jdbc-adapter

M	railties/test/generators/app_generator_test.rb

commit 237f870	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-06-22 10:54:45 +0930

    Use real hash model in nested fields_for with hash model test

M	actionpack/test/lib/controller/fake_models.rb
M	actionpack/test/template/form_helper_test.rb

commit 6404f8a	refs/heads/master
Merge: d6f1291 a85b9fa
Author: Aaron Patterson 
Date:   2011-06-21 13:39:18 -0700

    Merge pull request #1811 from nicksieger/more-jruby-gem-for-database-fixes-master
    
    More jruby gem for database fixes master

commit a85b9fa	refs/heads/master
Author: Nick Sieger 
Date:   2011-06-21 13:04:47 -0700

    Use non-'jdbc*' names so that db:create and db:drop work

M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml

commit 4dd2d07	refs/heads/master
Author: Nick Sieger 
Date:   2011-06-15 12:59:11 -0500

    Convert database names to ones appropriate for JRuby

M	railties/lib/rails/generators/app_base.rb

commit f12f756	refs/heads/master
Author: Nick Sieger 
Date:   2011-06-20 18:52:28 -0500

    Add generic 'jdbc' database option

M	railties/lib/rails/generators/app_base.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml

commit 2b0b726	refs/heads/master
Author: Nick Sieger 
Date:   2011-06-15 11:53:49 -0500

    Remove superfluous pg driver install instructions

M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml

commit 15f09c5	refs/tags/v3.1.1.rc1
Merge: 2d3a98d 4a5f1ce
Author: Aaron Patterson 
Date:   2011-06-21 13:21:58 -0700

    Merge pull request #1809 from nicksieger/more-jruby-gem-for-database-fixes
    
    More jruby gem for database fixes

commit 4a5f1ce	refs/tags/v3.1.1.rc1
Author: Nick Sieger 
Date:   2011-06-21 13:04:47 -0700

    Use non-'jdbc*' names so that db:create and db:drop work

M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml

commit 1cbbe06	refs/tags/v3.1.1.rc1
Author: Nick Sieger 
Date:   2011-06-15 12:59:11 -0500

    Convert database names to ones appropriate for JRuby

M	railties/lib/rails/generators/app_base.rb

commit 198cd8b	refs/tags/v3.1.1.rc1
Author: Nick Sieger 
Date:   2011-06-20 18:52:28 -0500

    Add generic 'jdbc' database option

M	railties/lib/rails/generators/app_base.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml

commit e1d6667	refs/tags/v3.1.1.rc1
Author: Nick Sieger 
Date:   2011-06-15 11:53:49 -0500

    Remove superfluous pg driver install instructions

M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml

commit db4f0ac	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 15:12:11 -0400

    use present tense on examples

M	actionpack/lib/abstract_controller/layouts.rb

commit 96be08d	refs/heads/master
Author: Caius Durling 
Date:   2011-05-31 22:48:40 +0100

    Stop find_in_batches using the records after yielding.
    
    Currently if the code that calls .find_in_batches modifies the yielded array in place then .find_in_batches can enter an infinite loop searching with ruby object ids in the database instead of the primary key of records in the database. This happens because it naively assumes the yielded array hasn't been modified before calling #id on the last object in the array. And ruby (1.8 at least) alias' #id to #object_id so an integer is still returned no matter what the last object is.
    
    By moving finding the #id of the last object before yielding the array it means the calling code can do whatever it wants to the array in terms of modifying it in place, and .find_in_batches doesn't care.

M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb

commit 2d3a98d	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-21 15:21:21 -0300

    Require helpers so autoload is properly setup.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit d6f1291	refs/heads/master
Author: José Valim 
Date:   2011-06-21 15:21:21 -0300

    Require helpers so autoload is properly setup.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit ceb5bbb	refs/heads/master
Merge: e369682 2b3d67f
Author: Aaron Patterson 
Date:   2011-06-21 10:22:20 -0700

    Merge pull request #1632 from tardate/pg_schema_fu
    
    Improving PostgreSQL adapter schema-awareness

commit 4bfbdd1	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-21 22:37:24 +0530

    Fixed for sqlite3 checking with jdbc

M	activerecord/lib/active_record/railties/databases.rake

commit 3b05231	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-21 22:30:48 +0530

    Only mysql and jdbcmysql.

M	activerecord/lib/active_record/railties/databases.rake

commit e369682	refs/heads/master
Merge: 458512c 7ca14ea
Author: José Valim 
Date:   2011-06-21 10:00:31 -0700

    Merge pull request #1793 from jamesarosen/clean_images
    
    rake assets:clean also removes directories

commit 14bfe83	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-21 22:28:21 +0530

    More specific for jdbc-sqlite

M	activerecord/lib/active_record/railties/databases.rake

commit 4d3719a	refs/tags/v3.1.1.rc1
Merge: 5a7465c ddf224c
Author: José Valim 
Date:   2011-06-21 09:51:22 -0700

    Merge pull request #1804 from guilleiguaran/3-1-stable
    
    Use uglifier from rubygems instead of git repo  (3-1-stable)

commit 7ca14ea	refs/heads/master
Author: James A. Rosen 
Date:   2011-06-21 09:35:48 -0700

    Railties: added tests for rake assets:clean

M	railties/lib/rails/tasks/assets.rake
M	railties/test/application/assets_test.rb

commit 3e7af42	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-21 22:11:25 +0530

    For more specific for jdbc postgresql databases.

M	activerecord/lib/active_record/railties/databases.rake

commit ddf224c	refs/tags/v3.1.1.rc1
Author: Guillermo Iguaran 
Date:   2011-06-21 10:59:48 -0500

    Use uglifier from rubygems instead of git repo

M	Gemfile

commit 5a7465c	refs/tags/v3.1.1.rc1
Author: Joshua Peek 
Date:   2011-06-21 11:27:06 -0500

    Bump sprockets requirement

M	actionpack/actionpack.gemspec

commit 458512c	refs/heads/master
Author: Joshua Peek 
Date:   2011-06-21 11:27:06 -0500

    Bump sprockets requirement

M	actionpack/actionpack.gemspec

commit d26cf14	refs/heads/master
Author: James A. Rosen 
Date:   2011-06-20 12:32:46 -0700

    rake assets:clean also removes directories
    
    See https://github.com/rails/rails/pull/1776#issuecomment-1402894,
    2df2bfdb4b1165dce4b5bc3fe046147d793fead4, and
    7440a254c4e724a5bbf6a0f4c8edb6d8d0432433.

M	railties/lib/rails/tasks/assets.rake

commit e1b32e7	refs/heads/master
Merge: 370b5c1 d759d19
Author: José Valim 
Date:   2011-06-21 09:17:01 -0700

    Merge pull request #1803 from guilleiguaran/uglifier-1-0
    
    Use uglifier from rubygems instead of git repo

commit 370b5c1	refs/heads/master
Author: José Valim 
Date:   2011-06-21 13:05:20 -0300

    Don't use deprecated stuff.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 36123b9	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-21 13:05:20 -0300

    Don't use deprecated stuff.

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit d759d19	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-21 10:59:48 -0500

    Use uglifier from rubygems instead of git repo

M	Gemfile

commit 9c1d0d8	refs/heads/master
Author: Josh 
Date:   2011-06-21 07:49:10 -0700

    Adds a test to check link_to with method & rel options

M	actionpack/test/template/url_helper_test.rb

commit 620bee4	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 10:47:37 -0400

    more detail on how the flow between redirect and show works, and minor grammar

M	actionpack/lib/action_controller/base.rb

commit 4a2b327	refs/heads/master
Author: Joshua Peek 
Date:   2011-06-21 09:38:25 -0500

    Assign Rails.cache to sprockets

M	actionpack/lib/sprockets/railtie.rb

commit 9324b54	refs/tags/v3.1.1.rc1
Author: Joshua Peek 
Date:   2011-06-21 09:38:25 -0500

    Assign Rails.cache to sprockets

M	actionpack/lib/sprockets/railtie.rb

commit 538d2a5	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 10:34:31 -0400

    remove extra space and clarify how an exception is made for controller wide layouts

M	actionpack/lib/abstract_controller/layouts.rb

commit 20a9bdd	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 10:31:16 -0400

    reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made

M	actionpack/lib/abstract_controller/layouts.rb

commit c4794b0	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-21 11:18:50 -0300

    Create an :assets group in the Gemfile.
    
    This group is required by default only on development and test
    (you can change it on config/application.rb).
    
    `rake assets:precompile` will automatically add the assets group
    to Rails.groups (and consequently Bundler.require) and should work
    transparently.

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
M	railties/lib/rails/tasks/assets.rake
M	railties/test/application/assets_test.rb
M	railties/test/isolation/abstract_unit.rb

commit db909f8	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-21 10:58:27 -0300

    Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess.

M	actionpack/lib/action_view.rb
A	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb

commit 77b00cb	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-21 08:02:47 -0300

    Add Rails.groups to encapsulate  available groups for require.

M	railties/lib/rails.rb
M	railties/test/application/configuration_test.rb

commit 5a26b88	refs/heads/master
Author: José Valim 
Date:   2011-06-21 11:18:50 -0300

    Create an :assets group in the Gemfile.
    
    This group is required by default only on development and test
    (you can change it on config/application.rb).
    
    `rake assets:precompile` will automatically add the assets group
    to Rails.groups (and consequently Bundler.require) and should work
    transparently.

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
M	railties/lib/rails/tasks/assets.rake
M	railties/test/application/assets_test.rb
M	railties/test/isolation/abstract_unit.rb

commit 354709f	refs/heads/master
Author: José Valim 
Date:   2011-06-21 10:58:27 -0300

    Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess.

M	actionpack/lib/action_view.rb
A	actionpack/lib/action_view/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb

commit a803aec	refs/heads/master
Author: José Valim 
Date:   2011-06-21 08:02:47 -0300

    Add Rails.groups to encapsulate  available groups for require.

M	railties/lib/rails.rb
M	railties/test/application/configuration_test.rb

commit 100b675	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 10:20:01 -0400

    singularize module and be explicit about what is delivered

M	actionmailer/lib/action_mailer/delivery_methods.rb

commit f3db04f	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 09:12:34 -0400

    grammar (missing "a") and formatting

M	actionmailer/lib/action_mailer/base.rb

commit 4f433bc	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 09:10:52 -0400

    clarify why the only_path => false option is needed when default :host has been set for mailers

M	actionmailer/lib/action_mailer/base.rb

commit 1f4fb6f	refs/heads/master
Author: Matt Jankowski 
Date:   2011-06-21 09:04:28 -0400

    elaborate details on why to use _url instead of _path in mailers

M	actionmailer/lib/action_mailer/base.rb

commit c01c954	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-21 04:23:35 -0700

    Added Gzip to Asset Pipeline via GitHub

M	railties/guides/source/asset_pipeline.textile

commit 791127e	refs/heads/master
Author: Jeroen Jacobs 
Date:   2011-06-21 12:34:00 +0200

    Fixes an issue where cache sweepers with only after filters would have no controller object
    
    It would raise undefined method controller_name for nil

M	actionpack/lib/action_controller/caching/sweeping.rb

commit fcebf9f	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-20 23:29:39 -0700

    Sprockets itself doesn't compress

M	railties/guides/source/asset_pipeline.textile

commit 2d4d9f1	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-20 23:23:55 -0700

    Edited railties/guides/source/asset_pipeline.textile via GitHub

M	railties/guides/source/asset_pipeline.textile

commit 40e6f43	refs/heads/master
Author: Josh 
Date:   2011-06-20 22:17:53 -0700

    Allow additional link relations when using method attribute with link_to

M	actionpack/lib/action_view/helpers/url_helper.rb

commit e5cf2ad	refs/tags/v3.1.1.rc1
Author: Ken Collins 
Date:   2011-06-20 22:08:31 -0400

    Update SQL Server db related rake tasks.
    
      * Uses open source smoscript since scptxfr came out in 2000.
      * Uses sqlcmd which replaces osql.
      * Takes advantage of host/user/pass passed down by TinyTDS.

M	activerecord/lib/active_record/railties/databases.rake

commit 8a889dd	refs/heads/master
Merge: ac78ff7 91bbb8e
Author: José Valim 
Date:   2011-06-20 14:35:30 -0700

    Merge pull request #1786 from gazay/3-1-stable-regexp-fix
    
    Fix regexp in generators for right catching error message

commit 7ff4aed	refs/tags/v3.1.1.rc1
Merge: f542188 03d01ec
Author: José Valim 
Date:   2011-06-20 11:32:48 -0700

    Merge pull request #1791 from cmeiklejohn/3-1-stable
    
    Cherry pick of pull #1787 into 3-1-stable

commit 91bbb8e	refs/heads/master
Author: Alexey Gaziev 
Date:   2011-06-20 22:29:30 +0400

    Removed tests for rescue branch for Rails 2.x compatibility

D	railties/test/fixtures/lib/generators/wrong_generator.rb
M	railties/test/generators_test.rb

commit 03d01ec	refs/tags/v3.1.1.rc1
Author: Christopher Meiklejohn 
Date:   2011-06-20 12:32:47 -0400

    Streamline fragment_for SafeBuffer logic to make it more concise and robust against unsafe buffers.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 08f3f30	refs/heads/master
Author: Ernie Miller 
Date:   2011-06-20 14:15:19 -0400

    Support reversal of ARel orderings in reverse_sql_order

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit ac78ff7	refs/heads/master
Merge: 81f7bf5 a52e418
Author: José Valim 
Date:   2011-06-20 11:01:33 -0700

    Merge pull request #1787 from cmeiklejohn/make_fragment_for_more_robust_for_subclasses_of_safe_buffer
    
    fragment_for assumes ActionView::OutputBuffer.

commit a52e418	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-06-20 13:47:22 -0400

    Only mark the sliced buffer as safe, if it was safe to begin with.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 88aa2efd	refs/tags/v3.1.1.rc1
Author: Grant Neufeld 
Date:   2011-06-20 11:45:20 -0600

    Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
    
    Changed the default value for the `options` argument on `ActiveRecord::ConnectionAdapters::Table#column_exists?` from `nil` to an empty Hash `{}`.
    
    That method calls through to `ActiveRecord::ConnectionAdapters::SchemaStatements#column_exists?` which expects `options` to be a Hash.
    
    When `options` was `nil`, an error would occur in cases where the column did exist because the called method attempted to perform a key lookup on options.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/test/cases/migration_test.rb

commit d12aa48	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-06-20 12:32:47 -0400

    Streamline fragment_for SafeBuffer logic to make it more concise.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 78cd3f9	refs/heads/master
Author: Alexey Gaziev 
Date:   2011-06-20 20:13:52 +0400

    Removed rescue branch for Rails 2.x compatibility

M	railties/lib/rails/generators.rb

commit ca04411	refs/heads/master
Author: Alexey Gaziev 
Date:   2011-06-20 19:54:37 +0400

    Fix regexp in generators for right catching error message

M	railties/lib/rails/generators.rb

commit 8467ea3	refs/tags/v3.0.14
Author: José Valim 
Date:   2011-06-20 11:23:19 -0300

    Removed file added by accident.

D	activesupport/test/tmp/development.log

commit 81f7bf5	refs/heads/master
Merge: 89b3293 f292f09
Author: José Valim 
Date:   2011-06-20 07:01:47 -0700

    Merge pull request #1785 from medwezys/master
    
    Do not change a frozen text passed to simple_format text helper

commit f292f09	refs/heads/master
Author: Tadas Tamosauskas 
Date:   2011-06-20 14:51:07 +0100

    Do not change a frozen text passed to simple_format text helper

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 89b3293	refs/heads/master
Merge: b7c8e0b 93f488e
Author: José Valim 
Date:   2011-06-20 06:48:17 -0700

    Merge pull request #1784 from gazay/3-1-stable-shadowing-variables
    
    Removing shadowing outer local variables warnings

commit 93f488e	refs/heads/master
Author: Alexey Gaziev 
Date:   2011-06-20 17:28:59 +0400

    Removed shadowing variable warning in activerecord railties

M	activerecord/lib/active_record/railties/databases.rake

commit 87329ef	refs/heads/master
Author: Alexey Gaziev 
Date:   2011-06-20 17:22:09 +0400

    Removed warnings about shadowing variables

M	railties/lib/rails/generators/actions.rb
M	railties/lib/rails/generators/base.rb

commit f542188	refs/tags/v3.1.1.rc1
Author: Daniel Azuma 
Date:   2011-06-20 00:24:35 -0700

    Add missing require 'set'
    
    Signed-off-by: José Valim 

M	activerecord/lib/active_record/connection_adapters/column.rb

commit bc070ba	refs/tags/v3.0.14
Author: José Valim 
Date:   2011-06-16 17:05:53 -0300

    Fix SafeBuffers by adding a dirty flag.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb
A	activesupport/test/tmp/development.log

commit b7c8e0b	refs/heads/master
Merge: 2df2bfd 140ba34
Author: José Valim 
Date:   2011-06-20 04:37:37 -0700

    Merge pull request #1780 from dazuma/fix_missing_require_set
    
    Add missing require 'set'

commit d3b7f49	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-20 15:24:41 +0530

    Closing 

M	railties/guides/source/getting_started.textile

commit 140ba34	refs/heads/master
Author: Daniel Azuma 
Date:   2011-06-20 00:24:35 -0700

    Add missing require 'set'

M	activerecord/lib/active_record/connection_adapters/column.rb

commit e69eed0	refs/heads/master
Author: Sam Pohlenz 
Date:   2011-06-20 11:27:04 +0930

    Test for extractable_options? within nested fields_for.
    
    This fixes an error when a record object that is a subclass of Hash is
    passed to fields_for, which is incorrectly interpreted as field options.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 2df2bfd	refs/heads/master
Merge: 4131fd7 7440a25
Author: Joshua Peek 
Date:   2011-06-19 19:09:50 -0700

    Merge pull request #1776 from jamesarosen/clean_images
    
    assets:clean task now cleans up images

commit 7440a25	refs/heads/master
Author: James A. Rosen 
Date:   2011-06-19 18:03:55 -0700

    assets:clean task now cleans up images

M	railties/lib/rails/tasks/assets.rake

commit 4131fd7	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-19 21:59:45 -0300

    Call super here to allow SessionHash initialize new stuff for us

M	actionpack/lib/action_controller/test_case.rb

commit 22cc1e9	refs/tags/v3.0.14
Merge: 8d9bc64 ad06ddd
Author: José Valim 
Date:   2011-06-19 16:29:50 -0700

    Merge pull request #1775 from bensie/class-attr-3-0-stable
    
    Instance reader method on class_attribute - 3-0-stable

commit 5eac40b	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-20 02:12:21 +0530

    document Active Record's reverse_order method

M	railties/guides/source/active_record_querying.textile

commit 9513474	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-20 01:42:43 +0530

    AR: use where in place of find

M	railties/guides/source/association_basics.textile

commit ad06ddd	refs/tags/v3.0.14
Author: James Miller 
Date:   2011-06-18 15:49:11 -0700

    Add option to omit creating an instance reader method on class_attribute

M	activesupport/lib/active_support/core_ext/class/attribute.rb
M	activesupport/test/core_ext/class/attribute_test.rb

commit d1b448e	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-20 01:24:04 +0530

    minor changes in getting started guide

M	railties/guides/source/getting_started.textile

commit 427b07b	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-20 00:36:52 +0530

    document the instance_reader option for class_attribute

M	railties/guides/source/active_support_core_extensions.textile

commit c533517	refs/tags/v3.1.1.rc1
Merge: e402b68 e5f6abd
Author: José Valim 
Date:   2011-06-19 09:09:04 -0700

    Merge pull request #1773 from bensie/class-attr-3-1-stable
    
    Instance reader method on class_attribute - 3-1-stable

commit e5f6abd	refs/tags/v3.1.1.rc1
Author: James Miller 
Date:   2011-06-18 15:49:11 -0700

    Add option to omit creating an instance reader method on class_attribute

M	activesupport/lib/active_support/core_ext/class/attribute.rb
M	activesupport/test/core_ext/class/attribute_test.rb

commit 8d9bc64	refs/tags/v3.0.14
Merge: fccacae 48fcd22
Author: José Valim 
Date:   2011-06-19 04:52:56 -0700

    Merge pull request #1772 from arunagw/require_rel_remove-3-0-stable
    
    Require rel remove 3 0 stable

commit e402b68	refs/tags/v3.1.1.rc1
Merge: 9dca40d 7e7ac12
Author: José Valim 
Date:   2011-06-19 04:52:44 -0700

    Merge pull request #1771 from arunagw/require_rel_remove
    
    Require rel remove from 3-1-stable

commit 93b7da4	refs/heads/master
Merge: ed4be0a 41aba82
Author: José Valim 
Date:   2011-06-19 04:51:42 -0700

    Merge pull request #1770 from arunagw/require_relative_remove
    
    Removing require_relative gem. Linecache new version 0.46 is out and it's

commit 9dca40d	refs/tags/v3.1.1.rc1
Merge: cbd6fa7 aba7a43
Author: José Valim 
Date:   2011-06-19 04:50:21 -0700

    Merge pull request #1768 from stevehodgkiss/3-1-stable
    
    3 1 stable

commit ed4be0a	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-19 11:39:52 +0200

    explains why links are gsub'ed, and changes the regexp delimiters

M	Rakefile

commit cbd6fa7	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-19 11:39:52 +0200

    explains why links are gsub'ed, and changes the regexp delimiters
    
    Conflicts:
    
    	Rakefile

M	Rakefile

commit 48fcd22	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-19 15:11:19 +0530

    Removing require_relative gem. Linecache new version 0.46 is out and
    it's loading rbx-require-relative > 0.0.4

M	Gemfile

commit 7e7ac12	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-19 15:08:35 +0530

    Removing require_relative gem. Linecache new version 0.46 is out and
    it's loading rbx-require-relative > 0.0.4

M	Gemfile

commit 41aba82	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-19 15:05:38 +0530

    Removing require_relative gem. Linecache new version 0.46 is out and it's loading rbx-require-relative > 0.0.4

M	Gemfile

commit d0c4fd7	refs/heads/master
Author: JudeArasu 
Date:   2011-06-19 12:14:00 +0530

    typo changes

M	actionmailer/lib/action_mailer/base.rb

commit aba7a43	refs/tags/v3.1.1.rc1
Author: Steve Hodgkiss 
Date:   2011-06-18 22:30:01 +0100

    Fix inconsistencies by being polite to the wrapped body. Needed for Rack::Sendfile to function properly. See issue #1761.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/query_cache_test.rb

commit e6f15f0	refs/heads/master
Author: José Valim 
Date:   2011-06-19 00:06:44 -0300

    Ugh, the class_attribute pull request broke the build. fix it.

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 7d46061	refs/heads/master
Merge: 4054435 3cc83a8
Author: José Valim 
Date:   2011-06-18 19:34:39 -0700

    Merge pull request #1763 from grantneufeld/schema_column_exists_options_hash
    
    Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?

commit 4054435	refs/heads/master
Merge: b1b42b5 5044420
Author: José Valim 
Date:   2011-06-18 19:31:17 -0700

    Merge pull request #1764 from stevehodgkiss/master
    
    Fix inconsistencies with serving images in production mode when ActiveRecord is loaded

commit b1b42b5	refs/heads/master
Merge: 6c705e3 0ce5fb8
Author: José Valim 
Date:   2011-06-18 19:29:38 -0700

    Merge pull request #1765 from bensie/class_attribute_skip_reader
    
    Add option to omit creating an instance reader method on class_attribute

commit 2b3d67f	refs/heads/master
Merge: b0d5990 6c705e3
Author: Paul Gallagher 
Date:   2011-06-19 10:21:15 +0800

    Merge remote branch 'rails/master' into pg_schema_fu

commit b0d5990	refs/heads/master
Author: Paul Gallagher 
Date:   2011-06-17 21:57:47 +0800

    Make PostgreSQL adapter view-compatible
    
    * amongst other things, allows meta_search to run against view-backed models

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
A	activerecord/test/cases/adapters/postgresql/view_test.rb

commit 0ce5fb8	refs/heads/master
Author: James Miller 
Date:   2011-06-18 15:49:11 -0700

    Add option to omit creating an instance reader method on class_attribute

M	activesupport/lib/active_support/core_ext/class/attribute.rb
M	activesupport/test/core_ext/class/attribute_test.rb

commit 8d64aaf	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-18 15:13:41 -0700

    Consistency issues with pre-processor

M	railties/guides/source/asset_pipeline.textile

commit 6c705e3	refs/heads/master
Merge: 2fbb750 96c57d4
Author: Xavier Noria 
Date:   2011-06-18 15:02:31 -0700

    Merge pull request #1762 from vijaydev/readme_links_rdoc
    
    Solving the problem of links being broken in GitHub for the sake of api site

commit 5044420	refs/heads/master
Author: Steve Hodgkiss 
Date:   2011-06-18 22:30:01 +0100

    Fix inconsistencies by being polite to the wrapped body. Needed for Rack::Sendfile to function properly. See issue #1761.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/query_cache_test.rb

commit 3cc83a8	refs/heads/master
Author: Grant Neufeld 
Date:   2011-06-18 14:38:38 -0600

    Changed the default value for the options argument on ActiveRecord::ConnectionAdapters::Table#column_exists? from nil to an empty Hash {}.
    
    That method calls through to ActiveRecord::ConnectionAdapters::SchemaStatements##column_exists? expects options to be a Hash.
    
    When options was nil, an error would occur in cases where the column did exist because the called method attempted to perform a key lookup on options.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/test/cases/migration_test.rb

commit 0e5891a	refs/tags/v3.1.1.rc1
Author: Chris Eppstein 
Date:   2011-06-18 12:12:58 -0700

    Added a configuration setting:
    
      config.action_controller.default_asset_host_protocol
    
    It's best to leave this unset.
    
    When unset the :request protocol is used whenever it can be and
    :relative is used in the other situations.
    
    When set to :request then assets hosts will be disabled when there
    is no request in scope and will use the request protocol whenever a
    request is in scope.
    
    If set to :relative, then a relative protocol is always used except
    for stylesheet link tags which must use the :request protocol to
    avoid double downloads in IE6&7.

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 9720864	refs/tags/v3.1.1.rc1
Author: Chris Eppstein 
Date:   2011-06-18 12:10:09 -0700

    Move the config bootstrapping to initialization to minimize access to the Rails.application global.

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 04daede	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-18 11:57:15 -0700

    Edited railties/guides/source/asset_pipeline.textile via GitHub

M	railties/guides/source/asset_pipeline.textile

commit 8bb7c86	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-18 11:48:00 -0700

    Let the reader know what JS and CSS stand for. Slight rewording as well.

M	railties/guides/source/asset_pipeline.textile

commit 96c57d4	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-18 23:45:59 +0530

    To solve the problem of links being broken in GitHub for the sake of api site, have them replaced at runtime during rdoc generation

M	README.rdoc
M	Rakefile

commit 5225227	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-18 22:19:32 +0530

    edit assets guide for cases & minor wording changes

M	railties/guides/source/asset_pipeline.textile

commit a223363	refs/tags/v3.1.1.rc1
Merge: ad16115 7e65b00
Author: Chris Eppstein 
Date:   2011-06-18 09:41:29 -0700

    Merge remote-tracking branch 'rails/3-1-stable' into asset_urls
    
    * rails/3-1-stable: (68 commits)
      Revert changes done in c56618ec, 51cb7459 and 030950a. The links are pointing to files/*/*.html for usage in api.rubyonrails.org and as a result are broken in GitHub blobs. This is unavoidable (at least for now).
      copy-edits 7c2db6c, cbf2af1, and f391f94
      Added 'Configuring Assets' section to configuring guide
      Update remove_index documentation
      Typo.
      minor clean up generators section
      add info that plugin installs need git or svn installed
      document doc:* rake tasks
      typo changes fixed
      fixed typo chnages
      add details on how to use specific annotations in rake:notes
      document how rake notes work
      The name for the plain text template in Rails3 appears to be method.text.erb, not, method.text.plain.erb.  Updated the doc to reflect this change.  Also fixed a reference to an example that was incorrect.
      form => form_for
      Tweak linebreak in ActionController::Redirecting doc
      Updated rails´s guides on the config.serve_static_assets and it´s settings in production mode using WEBrick. This documentation has it´s roots in #issue1657. You have to set config.serve_static_assets to true in production mode with WEBrick as only this includes ActionDispatch::Static.
      Improve documentation around status code argument of redirect_to
      minor copy edit 0bdeddb
      Jruby => JRuby, Mysql => MySQL
      Moving hint down. As required after all database examples.
      ...

commit 618802d	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-18 09:00:13 -0700

    Sprockets itself doesn't do this, it's uglifier and other gems, Sprockets is just the puppet master.

M	railties/guides/source/asset_pipeline.textile

commit 4a36817	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-18 08:58:38 -0700

    Edited railties/guides/source/asset_pipeline.textile via GitHub

M	railties/guides/source/asset_pipeline.textile

commit add8482	refs/heads/master
Merge: 38aa153 a637e1d
Author: Xavier Noria 
Date:   2011-06-18 06:53:19 -0700

    Merge pull request #48 from scott-stewart/master
    
    Fixed typos in asset_pipeline

commit a637e1d	refs/heads/master
Author: Scott Stewart 
Date:   2011-06-18 06:40:27 -0700

    Fixed typo in asset_pipeline, jquery_rails should be jquery-rails

M	railties/guides/source/asset_pipeline.textile

commit 0a45e24	refs/heads/master
Author: Scott Stewart 
Date:   2011-06-18 06:31:22 -0700

    Edited railties/guides/source/asset_pipeline.textile via GitHub

M	railties/guides/source/asset_pipeline.textile

commit 38aa153	refs/heads/master
Merge: fb9bfc2 4f301b2
Author: Leonard Garvey 
Date:   2011-06-18 21:20:19 +1000

    Merge github.com:lifo/docrails

commit fb9bfc2	refs/heads/master
Author: Leonard Garvey 
Date:   2011-06-18 21:15:49 +1000

    Fixed a typo in asset pipeline

M	railties/guides/source/asset_pipeline.textile

commit 4f301b2	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-18 21:11:15 +1000

    Fix indentation on manifest examples in assets guide

M	railties/guides/source/asset_pipeline.textile

commit d746aea	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-18 21:09:15 +1000

    File needs to be at public/assets, not public/images

M	railties/guides/source/asset_pipeline.textile

commit 7e65b00	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-18 16:02:50 +0530

    Revert changes done in c56618ec, 51cb7459 and 030950a. The links are
    pointing to files/*/*.html for usage in api.rubyonrails.org and as a
    result are broken in GitHub blobs. This is unavoidable (at least for now).
    
    Conflicts:
    
    	README.rdoc

M	README.rdoc

commit 2fbb750	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-18 16:02:50 +0530

    Revert changes done in c56618ec, 51cb7459 and 030950a. The links are
    pointing to files/*/*.html for usage in api.rubyonrails.org and as a
    result are broken in GitHub blobs. This is unavoidable (at least for now).

M	README.rdoc

commit c8f046b	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-18 19:44:55 +1000

    Flesh out the asset pipeline guide with information learned from today's research

M	railties/guides/source/asset_pipeline.textile

commit 1acc327	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-18 10:14:32 +0200

    copy-edits 7c2db6c, cbf2af1, and f391f94

M	actionmailer/lib/rails/generators/mailer/USAGE
M	railties/guides/source/command_line.textile

commit e516f2b	refs/tags/v3.1.1.rc1
Author: Ryan Bigg 
Date:   2011-06-18 11:16:10 +1000

    Added 'Configuring Assets' section to configuring guide

M	railties/guides/source/configuring.textile

commit a7813a6	refs/tags/v3.1.1.rc1
Author: Lucia Escanellas 
Date:   2011-06-17 15:55:07 -0300

    Update remove_index documentation
    
    * Changes should better reflect present code behavior
    * Related to issue: https://github.com/rails/rails/issues/1624

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/migration.rb

commit e63fd89	refs/tags/v3.1.1.rc1
Author: R.T. Lechow 
Date:   2011-06-16 15:39:22 -0400

    Typo.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 09d8c26	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-16 22:48:05 +0530

    minor clean up generators section

M	railties/guides/source/command_line.textile

commit 334f62c	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-16 22:48:47 +0530

    add info that plugin installs need git or svn installed

M	railties/guides/source/command_line.textile

commit a4f6227	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-16 12:29:47 +0530

    document doc:* rake tasks

M	railties/guides/source/command_line.textile

commit 4ad6c33	refs/tags/v3.1.1.rc1
Author: JudeAr 
Date:   2011-06-15 22:15:53 -0700

    typo changes fixed

M	railties/guides/source/command_line.textile

commit d9bea84	refs/tags/v3.1.1.rc1
Author: JudeAr 
Date:   2011-06-15 22:04:20 -0700

    fixed typo chnages

M	railties/guides/source/command_line.textile

commit 063c432	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-15 23:26:19 +0530

    add details on how to use specific annotations in rake:notes

M	railties/guides/source/command_line.textile

commit 96da5bd	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-15 22:53:26 +0530

    document how rake notes work

M	railties/guides/source/command_line.textile

commit 6a8fd87	refs/tags/v3.1.1.rc1
Author: Jason Fox 
Date:   2011-06-15 12:38:01 -0400

    The name for the plain text template in Rails3 appears to be method.text.erb, not, method.text.plain.erb.  Updated the doc to reflect this change.  Also fixed a reference to an example that was incorrect.

M	actionmailer/lib/action_mailer/base.rb

commit 96b82aa	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-15 18:56:22 +0530

    form => form_for

M	actionpack/lib/action_view/helpers/form_helper.rb

commit bb139ed	refs/tags/v3.1.1.rc1
Author: Christine Yen 
Date:   2011-06-15 03:18:28 -0700

    Tweak linebreak in ActionController::Redirecting doc

M	actionpack/lib/action_controller/metal/redirecting.rb

commit cb4fbe3	refs/tags/v3.1.1.rc1
Author: thoefer 
Date:   2011-06-15 12:14:17 +0200

    Updated rails´s guides on the config.serve_static_assets and it´s settings in production mode using WEBrick. This documentation has it´s roots in #issue1657. You have to set config.serve_static_assets to true in production mode with WEBrick as only this includes ActionDispatch::Static.

M	railties/guides/source/configuring.textile

commit 7e37db4	refs/tags/v3.1.1.rc1
Author: Christine Yen 
Date:   2011-06-15 01:55:57 -0700

    Improve documentation around status code argument of redirect_to

M	actionpack/lib/action_controller/metal/redirecting.rb

commit b676213	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-15 11:44:31 +0530

    minor copy edit 0bdeddb

M	railties/guides/source/getting_started.textile

commit 35ee51f	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-15 10:45:05 +0530

    Jruby => JRuby, Mysql => MySQL

M	railties/guides/source/getting_started.textile

commit 05648ea	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-15 07:40:49 +0530

    Moving hint down. As required after all database examples.

M	railties/guides/source/getting_started.textile

commit cf2818a	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-15 07:39:24 +0530

    Using "Finally" at the end of database section.

M	railties/guides/source/getting_started.textile

commit 0e1e615	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-15 07:38:08 +0530

    Added Doc for Postgresql database with Jruby Platform. #jruby

M	railties/guides/source/getting_started.textile

commit 739f8e9	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-15 07:36:52 +0530

    Added doc for Mysql database with Jruby platform #jruby

M	railties/guides/source/getting_started.textile

commit f43ae97	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-15 07:36:04 +0530

    Adding doc for Sqlite3 database for Jruby platform #jruby

M	railties/guides/source/getting_started.textile

commit c9c774d	refs/tags/v3.1.1.rc1
Author: JudeArasu 
Date:   2011-06-14 23:16:05 +0530

    typo changes

M	actionmailer/lib/rails/generators/mailer/USAGE

commit 899c736	refs/tags/v3.1.1.rc1
Author: Sebastian Martinez 
Date:   2011-06-14 11:01:00 -0300

    Prefer Time.current over Time.now on example code

M	railties/guides/source/active_support_core_extensions.textile

commit 9387c70	refs/tags/v3.1.1.rc1
Author: Sebastian Martinez 
Date:   2011-06-14 10:53:38 -0300

    Add Time#all_* to AS guides.

M	railties/guides/source/active_support_core_extensions.textile

commit 415f2e2	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-14 00:30:13 +0530

    fix minor errors in nested model guide

M	railties/guides/source/nested_model_forms.textile

commit 78f880f	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-13 23:14:15 +0530

    document the instance_accessor option for cattr_accessor

M	railties/guides/source/active_support_core_extensions.textile

commit 108fdba	refs/tags/v3.1.1.rc1
Author: Lukas Stejskal 
Date:   2011-06-13 14:21:17 +0200

    fix two typos: and array -> an array

M	railties/guides/source/active_support_core_extensions.textile

commit 4d3ec4c	refs/tags/v3.1.1.rc1
Author: Robert Massaioli 
Date:   2011-06-13 14:58:56 +1000

    cycle: make an odd number be marked as odd.
    
    Just a minor issue that was annoying me so I thought that I would jump in and fix it.

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 9994bd4	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-12 16:17:34 +0530

    assets are in app now and not in public

M	railties/guides/source/getting_started.textile

commit 745665d	refs/tags/v3.1.1.rc1
Author: Sebastian Martinez 
Date:   2011-06-11 19:32:01 -0300

    Add example for rails server port option.

M	railties/guides/source/command_line.textile

commit 99aca48	refs/tags/v3.1.1.rc1
Author: thoefer 
Date:   2011-06-11 23:56:29 +0200

    fixed typo for a methodname

M	railties/lib/rails/railtie.rb

commit 25d1874	refs/tags/v3.1.1.rc1
Author: Uģis Ozols 
Date:   2011-06-12 00:41:42 +0300

    with -> will

M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb

commit f73d1a6	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-12 02:16:08 +0530

    document server options

M	railties/guides/source/command_line.textile

commit d010686	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-12 01:30:40 +0530

    more command guide changes

M	railties/guides/source/command_line.textile

commit c71e78d	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-11 22:11:16 +0530

    make some changes to the command line guide

M	railties/guides/source/command_line.textile

commit 2bc8ba6	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-11 21:31:45 +0530

    minor changes in templates guide

M	railties/guides/source/rails_application_templates.textile

commit 32aa7d5	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-10 17:27:46 +0530

    add missing end in example

M	railties/guides/source/caching_with_rails.textile

commit cbeb1c1	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-10 17:18:57 +0530

    favor includes over old AR way

M	railties/guides/source/performance_testing.textile

commit 6a86a44	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-10 17:17:51 +0530

    fixed incorrect command usage. (This section needs to be updated in any case).

M	railties/guides/source/performance_testing.textile

commit ee7043b	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-10 17:06:21 +0530

    minor fixes in action view guide

M	railties/guides/source/action_view_overview.textile

commit 20d7d24	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-18 10:14:32 +0200

    copy-edits 7c2db6c, cbf2af1, and f391f94

M	actionmailer/lib/rails/generators/mailer/USAGE
M	railties/guides/source/command_line.textile

commit 146ec2d	refs/heads/master
Merge: 08983fe 0fd52bb
Author: Xavier Noria 
Date:   2011-06-18 10:11:47 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 0fd52bb	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-18 11:16:10 +1000

    Added 'Configuring Assets' section to configuring guide

M	railties/guides/source/configuring.textile

commit 030950a	refs/heads/master
Author: Jason Noble 
Date:   2011-06-17 14:13:54 -0700

    Change ActiveRecord and ActionPack links to point to the right place

M	README.rdoc

commit 51cb745	refs/heads/master
Author: Jason Noble 
Date:   2011-06-17 14:13:30 -0700

    Change ActiveRecord and ActionPack links to point to the right place

M	README.rdoc

commit c56618e	refs/heads/master
Author: Jason Noble 
Date:   2011-06-17 14:12:11 -0700

    Change ActiveRecord and ActionPack links to point to the right place

M	README.rdoc

commit fccacae	refs/tags/v3.0.14
Author: Santiago Pastorino 
Date:   2011-06-17 17:44:06 -0300

    Bump mysql2 up

M	Gemfile
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/app_generator_test.rb

commit 144a388	refs/heads/master
Author: Lucia Escanellas 
Date:   2011-06-17 15:55:07 -0300

    Update remove_index documentation
    
    * Changes should better reflect present code behavior
    * Related to issue: https://github.com/rails/rails/issues/1624

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/migration.rb

commit 08983fe	refs/heads/master
Author: José Valim 
Date:   2011-06-17 15:10:53 -0300

    Attributes on scaffold and model generators default to string.
    
    This allows the following: "rails g scaffold Post title body:text author"

M	railties/CHANGELOG
M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/generated_attribute_test.rb
M	railties/test/generators/model_generator_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 9a64c8e	refs/heads/master
Merge: 0dd32e8 301cad4
Author: Santiago Pastorino 
Date:   2011-06-17 10:22:34 -0700

    Merge pull request #1751 from guilleiguaran/mysql-0-3-6
    
    Bump to mysql2 0.3.6

commit 391b373	refs/tags/v3.1.1.rc1
Merge: 6759e67 89adadd
Author: Santiago Pastorino 
Date:   2011-06-17 10:22:05 -0700

    Merge pull request #1752 from brianmario/bump-mysql2
    
    Bump mysql2 to 0.3.6

commit 89adadd	refs/tags/v3.1.1.rc1
Author: Brian Lopez 
Date:   2011-06-17 09:32:43 -0700

    bump mysql2 to 0.3.6

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 301cad4	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-17 11:27:37 -0500

    Bump to mysql2 0.3.6

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 6759e67	refs/tags/v3.1.1.rc1
Merge: b2efd2a 0ee586d
Author: José Valim 
Date:   2011-06-17 07:39:39 -0700

    Merge pull request #1749 from dmathieu/simple_format
    
    Cherry pick changes to simple_format from master

commit 0ee586d	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-17 16:35:52 +0200

    cherry-pick changes in simple_format from master - Closes #1745

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 0dd32e8	refs/heads/master
Merge: e510c2c 69fdfab
Author: José Valim 
Date:   2011-06-17 07:09:10 -0700

    Merge pull request #1748 from bogdan/select_form_helpers_refactor
    
    Select tag helpers: remove some code dups

commit 8742a97	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-17 14:55:34 +0100

    Add require 'pathname' as it has not already been required in some circumstances

M	activerecord/test/support/config.rb

commit b2efd2a	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-17 14:55:34 +0100

    Add require 'pathname' as it has not already been required in some circumstances

M	activerecord/test/support/config.rb

commit e510c2c	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-17 14:55:34 +0100

    Add require 'pathname' as it has not already been required in some circumstances

M	activerecord/test/support/config.rb

commit 69fdfab	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-06-17 16:54:35 +0300

    Select tag helpers: remove some code dups

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 8d02083	refs/tags/v2.3.13
Merge: 1aae5e7 b1c36b7
Author: José Valim 
Date:   2011-06-17 06:25:39 -0700

    Merge pull request #1740 from Antiarchitect/2-3-stable
    
    Fix OrderedHash merging with block given.

commit 61fd398	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-17 10:57:33 +0200

    AS guide: expands safe string docs regarding destructive methods, coercion, copying, etc.

M	railties/guides/source/active_support_core_extensions.textile

commit 248552e	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-17 10:57:33 +0200

    AS guide: expands safe string docs regarding destructive methods, coercion, copying, etc.

M	railties/guides/source/active_support_core_extensions.textile

commit f960cb2	refs/tags/v3.1.1.rc1
Author: Ken Collins 
Date:   2011-06-10 13:15:58 -0400

    Allow the connection pool's #table_exists? method to give the connections #table_exists? method a chance.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit ba1b88f	refs/heads/master
Merge: da25aa5 c791e2d
Author: Aaron Patterson 
Date:   2011-06-17 00:02:45 -0700

    Merge pull request #1636 from metaskills/upstream/3-1-stable
    
    Allow the connection pool's #table_exists? method to give the connections

commit b1c36b7	refs/tags/v2.3.13
Author: Andrey Voronkov 
Date:   2011-06-16 23:56:39 -0700

    Added tests for OrderedHash merging with block.

M	activesupport/test/ordered_hash_test.rb

commit b2d4142	refs/tags/v2.3.13
Author: Andrey Voronkov 
Date:   2011-06-16 16:47:29 -0700

    Fix OrderedHash merging with block given.

M	activesupport/lib/active_support/ordered_hash.rb

commit da25aa5	refs/heads/master
Merge: a788d4e 171491b
Author: Santiago Pastorino 
Date:   2011-06-16 16:27:49 -0700

    Merge pull request #1738 from gazay/3-1-stable-change-nokogiri-version
    
    Fix several warnings: change version of nokogiri gem

commit 171491b	refs/heads/master
Author: Alexey Gaziev 
Date:   2011-06-17 01:01:49 +0400

    Change version of nokogiri gem

M	Gemfile

commit a788d4e	refs/heads/master
Merge: be99ae7 29dfe05
Author: José Valim 
Date:   2011-06-16 13:56:59 -0700

    Merge pull request #1737 from SAP-Oxygen/master-app_plugins_ordering_patch
    
    Patch for [3.1.0.rc1] App plugins initialized before engines and plugins inside engines

commit 29dfe05	refs/heads/master
Author: Joseph Wong 
Date:   2011-06-16 13:24:33 -0700

    Patch for #1458 - [3.1.0.rc1] App plugins initialized before engines
    and plugins inside engines
    
    It seems that plugins inside a Rails 3.1 application proper (i.e. in
    /vendor/plugins) are initialized before engines and plugins inside
    engines.
    
    After some debugging, I found the culprit in
    Rails::Application::Railties#all:
    
      def all(&block)
        @all ||= railties + engines + super
        @all.each(&block) if block
        @all
      end
    
    The call to super here implicitly passes the &block argument, which
    has the unfortunate side-effect of adding the plugin initializers
    first (in front of other railties and engines) in the case of
    Rails::Engine#initializers:
    
    def initializers
      initializers = []
      railties.all { |r| initializers += r.initializers }
      initializers += super
      initializers
    end
    
    The solution here is to replace the super call with a call
    to #plugins.

M	railties/lib/rails/application/railties.rb

commit 1cc0c3f	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-16 21:12:47 +0100

    Perf fix - Use an instance variable instead of a class_attribute. Thanks @josevalim and @jhawthorn for the prompting.

M	activerecord/lib/active_record/base.rb

commit f24d8fa	refs/tags/v3.1.1.rc1
Merge: 5be61ea a89dfbf
Author: José Valim 
Date:   2011-06-16 13:14:49 -0700

    Merge pull request #1735 from SAP-Oxygen/3-1-stable-app_plugins_ordering_patch
    
    Patch for #1458 - [3.1.0.rc1] App plugins initialized before engines and plugins inside engines

commit be99ae7	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-16 21:12:47 +0100

    Perf fix - Use an instance variable instead of a class_attribute. Thanks @josevalim and @jhawthorn for the prompting.

M	activerecord/lib/active_record/base.rb

commit 5be61ea	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-16 17:05:53 -0300

    Fix SafeBuffers by adding a dirty flag.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit f44db45	refs/heads/master
Author: José Valim 
Date:   2011-06-16 17:04:31 -0300

    safe_concat should not work on dirty buffers.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit a89dfbf	refs/tags/v3.1.1.rc1
Author: Joseph Wong 
Date:   2011-06-16 12:58:08 -0700

    Patch for #1458 - [3.1.0.rc1] App plugins initialized before engines
    and plugins inside engines
    
    It seems that plugins inside a Rails 3.1 application proper (i.e. in
    /vendor/plugins) are initialized before engines and plugins inside
    engines.
    
    After some debugging, I found the culprit in
    Rails::Application::Railties#all:
    
      def all(&block)
        @all ||= railties + engines + super
        @all.each(&block) if block
        @all
      end
    
    The call to super here implicitly passes the &block argument, which
    has the unfortunate side-effect of adding the plugin initializers
    first (in front of other railties and engines) in the case of
    Rails::Engine#initializers:
    
    def initializers
      initializers = []
      railties.all { |r| initializers += r.initializers }
      initializers += super
      initializers
    end
    
    The solution here is to replace the super call with a call
    to #plugins.

M	railties/lib/rails/application/railties.rb

commit 594603b	refs/heads/master
Author: José Valim 
Date:   2011-06-16 08:38:56 -0300

    Fix safe buffer by adding a dirty status.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 6ca18f9	refs/heads/master
Author: R.T. Lechow 
Date:   2011-06-16 15:39:22 -0400

    Typo.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 1844572	refs/heads/master
Author: wycats 
Date:   2011-06-16 12:08:26 -0700

    Make the API for compression consistent between JS and CSS. By default, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem.
    
    Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit f4db3d7	refs/tags/v3.1.1.rc1
Author: wycats 
Date:   2011-06-16 12:08:26 -0700

    Make the API for compression consistent between JS and CSS. By default, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem.
    
    Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit b9fa32c	refs/heads/master
Merge: 8854288 245dba0
Author: José Valim 
Date:   2011-06-16 11:03:58 -0700

    Merge pull request #1733 from SAP-Oxygen/master-plugins_in_engine_patch
    
    Cherry-picking patch for https://github.com/rails/rails/issues/1460 from 3-1-stable to master

commit 245dba0	refs/heads/master
Author: Joseph Wong 
Date:   2011-06-16 10:52:05 -0700

    Cherry-picking patch for https://github.com/rails/rails/issues/1460
    from 3-1-stable to master
    
    [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their
    rake tasks ignored
    
    Working with the new support for plugins inside engines in Rails 3.1,
    I found that certain things that work for regular plugins don't work
    for these new nested plugins. In particular, these methods in
    Rails::Engine don't seem to understand that an engine could have
    nested plugins:
    
    #load_tasks
    #load_generators
    #load_console
    #eager_load!
    
    A solution which worked out for me is to move the calls to
    railties.all { ... } from the overriding methods in Rails::Application
    into Rails::Engine.

M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb

commit 07d62ff	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-16 22:48:05 +0530

    minor clean up generators section

M	railties/guides/source/command_line.textile

commit 7c2db6c	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-16 22:48:47 +0530

    add info that plugin installs need git or svn installed

M	railties/guides/source/command_line.textile

commit 8854288	refs/heads/master
Merge: eedbe1c d92ad22
Author: Xavier Noria 
Date:   2011-06-16 09:11:18 -0700

    Merge pull request #1731 from vijaydev/plugin_name_change
    
    Replace dev.rubyonrails.com plugin url with a dummy url

commit ad16115	refs/tags/v3.1.1.rc1
Author: Chris Eppstein 
Date:   2011-06-16 09:03:05 -0700

    Stylesheet link tags should use the request protocol to avoid duplicate download of stylesheets in IE7 and IE8.

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit d92ad22	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-16 21:25:29 +0530

    replace dev.ror.com plugin url with a dummy one

M	railties/lib/rails/commands/plugin.rb

commit eedbe1c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-16 12:46:11 -0300

    Use html_safe

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 13f8b28	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-04 14:01:11 +0530

    Using lib/assets only. Javascripts/Stylesheets people can fill later.

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/test/generators/app_generator_test.rb

commit efa9695	refs/tags/v3.1.1.rc1
Merge: c5930b4 eb89729
Author: Santiago Pastorino 
Date:   2011-06-16 06:19:04 -0700

    Merge pull request #1728 from vijaydev/doc-merge-fix
    
    Doc merge fixes (3-1-stable)

commit c5930b4	refs/tags/v3.1.1.rc1
Merge: 60a3190 bf588c6
Author: José Valim 
Date:   2011-06-16 05:02:18 -0700

    Merge pull request #1726 from arunagw/mysql_bump_3-1-stable
    
    Mysql bump to 0.3.5

commit f2c0fb3	refs/heads/master
Author: José Valim 
Date:   2011-06-16 08:01:35 -0300

    Remove usage of memoizable from ActionPack.

M	actionpack/lib/action_dispatch/http/headers.rb
M	actionpack/lib/action_view/helpers/date_helper.rb

commit 8775ffa	refs/heads/master
Author: José Valim 
Date:   2011-06-16 07:46:34 -0300

    Update CHANGELOG, improve message.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/memoizable.rb

commit 60a3190	refs/tags/v3.1.1.rc1
Merge: 014008d 27d7083
Author: José Valim 
Date:   2011-06-16 03:37:40 -0700

    Merge pull request #1460 from SAP-Oxygen/27d7083addd1bc8ecf0ef258a50c5e36eb980060
    
    [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their rake tasks ignored

commit 5e61d0b	refs/tags/v3.0.14
Merge: 95905c5 15e2b58
Author: Aaron Patterson 
Date:   2011-06-16 12:06:00 +0200

    Merge branch '3-0-9' into 3-0-stable
    
    * 3-0-9:
      Preparing for 3.0.9 release
      avoid false positives caused by release candidates
      Preparing for 3.0.9.rc5 release
      bumping to rc4
      Make sure that we don't perform in-place mutation on SafeBuffer string
      Update CHANGELOG to mention the json_escape change
      Ensure number helpers can handle HTML safe strings - closes #1597.
      bumping to rc3 since syck is not playing nicely
      bumping to 3.0.9.rc2
      ensuring that json_escape returns html safe strings when passed an html safe string
      Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
      Fix issue #1598 by adding a dependency to the RDoc gem.
      bumping to 3.0.9.rc1

commit 15e2b58	refs/tags/v3.0.9 (tag: v3.0.9)
Author: Aaron Patterson 
Date:   2011-06-16 12:03:00 +0200

    Preparing for 3.0.9 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit fad08a6	refs/tags/v3.0.9
Author: Aaron Patterson 
Date:   2011-06-16 12:02:49 +0200

    avoid false positives caused by release candidates

M	tasks/release.rb

commit 43ed24e	refs/heads/master
Merge: 7de3b36 d7aac1f
Author: José Valim 
Date:   2011-06-16 02:11:35 -0700

    Merge pull request #1727 from ihower/improve_legacy_wild_controller_route
    
    Improve the legacy wild controller route in app templates

commit 7de3b36	refs/heads/master
Merge: e445a79 536e156
Author: José Valim 
Date:   2011-06-16 01:59:34 -0700

    Merge pull request #1725 from arunagw/mysql_bump
    
    Bump mysql2 to 0.3.5

commit bfb022a	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-16 12:29:47 +0530

    document doc:* rake tasks

M	railties/guides/source/command_line.textile

commit eb89729	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-16 11:37:38 +0530

    fix merge errors

M	railties/guides/source/active_record_validations_callbacks.textile

commit d7aac1f	refs/heads/master
Author: Wen-Tien Chang 
Date:   2011-06-16 14:03:41 +0800

    Also change the default route comment

M	actionpack/lib/action_dispatch/routing.rb

commit adbe7da	refs/heads/master
Author: Wen-Tien Chang 
Date:   2011-06-16 13:29:17 +0800

    Improve the legacy wild controller route in app templates

M	railties/lib/rails/generators/rails/app/templates/config/routes.rb

commit bf588c6	refs/tags/v3.1.1.rc1
Author: Arun Agrawal 
Date:   2011-06-16 10:48:28 +0530

    Mysql bump

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 536e156	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-16 10:45:58 +0530

    Bump mysql2 to 0.3.5

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit cbf2af1	refs/heads/master
Author: JudeAr 
Date:   2011-06-15 22:15:53 -0700

    typo changes fixed

M	railties/guides/source/command_line.textile

commit 0dd9db8	refs/heads/master
Author: JudeAr 
Date:   2011-06-15 22:04:20 -0700

    fixed typo chnages

M	railties/guides/source/command_line.textile

commit e445a79	refs/heads/master
Author: Santiago Pastorino and José Ignacio Costa 
Date:   2011-06-16 01:05:45 -0300

    Bump mysql2 up

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 014008d	refs/tags/v3.1.1.rc1
Merge: a7039df d2b1340
Author: Santiago Pastorino 
Date:   2011-06-15 20:23:16 -0700

    Merge pull request #1724 from brianmario/lazy-mysql2-casting
    
    re-enable eager-casting for mysql2

commit d2b1340	refs/tags/v3.1.1.rc1
Author: Brian Lopez 
Date:   2011-06-15 20:17:35 -0700

    bump mysql2 version

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 7b04e50	refs/tags/v3.1.1.rc1
Author: Brian Lopez 
Date:   2011-06-15 20:03:12 -0700

    on second thought, lets keep casting on by default. it can be disabled in database.yml by setting 'cast: false'

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 3625391	refs/heads/master
Author: José Valim 
Date:   2011-06-15 17:08:08 -0300

    Deprecate memoizable.

M	activesupport/lib/active_support/memoizable.rb
M	activesupport/test/flush_cache_on_private_memoization_test.rb
M	activesupport/test/memoizable_test.rb

commit 6c3e80a	refs/heads/master
Author: José Valim 
Date:   2011-06-15 11:52:45 -0700

    load_generators from engine should also handle self automatically.

M	railties/lib/rails/railtie.rb

commit a7039df	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-15 11:52:45 -0700

    load_generators from engine should also handle self automatically.

M	railties/lib/rails/railtie.rb

commit 677df61	refs/tags/v3.1.1.rc1
Merge: b4b27a3 7f96566
Author: Santiago Pastorino 
Date:   2011-06-15 11:21:44 -0700

    Merge pull request #1719 from ryanb/fix_generated_engine_javascript
    
    Fix generated JavaScript for mountable engine in 3-1-stable

commit 7f96566	refs/tags/v3.1.1.rc1
Author: Ryan Bates 
Date:   2011-06-15 11:16:11 -0700

    properly require javascript libraries when generating mountable engine (from baf2a9c)

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
M	railties/test/generators/plugin_new_generator_test.rb

commit 406d61e	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-15 23:26:19 +0530

    add details on how to use specific annotations in rake:notes

M	railties/guides/source/command_line.textile

commit b4b27a3	refs/tags/v3.1.1.rc1
Merge: 1f813d9 40dd641
Author: Santiago Pastorino 
Date:   2011-06-15 10:45:26 -0700

    Merge pull request #1716 from ryanb/namespace_engine_assets_3_1
    
    Namespace engine assets for 3-1-stable

commit 3e44159	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-15 22:53:26 +0530

    document how rake notes work

M	railties/guides/source/command_line.textile

commit 40dd641	refs/tags/v3.1.1.rc1
Author: Ryan Bates 
Date:   2011-06-15 09:58:38 -0700

    namespace engine assets

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt
M	railties/test/generators/plugin_new_generator_test.rb

commit 1adb38b	refs/heads/master
Merge: 77c8cd7 b62c549
Author: Jason Fox 
Date:   2011-06-15 09:39:59 -0700

    Merge pull request #47 from jasonfox/master
    
    Fixed two errors in the doc

commit b62c549	refs/heads/master
Author: Jason Fox 
Date:   2011-06-15 12:38:01 -0400

    The name for the plain text template in Rails3 appears to be method.text.erb, not, method.text.plain.erb.  Updated the doc to reflect this change.  Also fixed a reference to an example that was incorrect.

M	actionmailer/lib/action_mailer/base.rb

commit 77c8cd7	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-15 18:56:22 +0530

    form => form_for

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 95905c5	refs/tags/v3.0.14
Merge: 6cfd1c7 b869b8c
Author: José Valim 
Date:   2011-06-15 04:10:13 -0700

    Merge pull request #1714 from dmathieu/3-0-cherry
    
    Cherry picking encoding for 3.0

commit 1f813d9	refs/tags/v3.1.1.rc1
Merge: 9267a43 055a88d
Author: José Valim 
Date:   2011-06-15 04:08:45 -0700

    Merge pull request #1713 from dmathieu/3-1-cherry
    
    Cherry picking encoding for 3.1

commit 055a88d	refs/tags/v3.1.1.rc1
Author: Lukáš Konarovský 
Date:   2011-06-15 03:09:27 -0700

    Use assert_equal instead of assert in uploaded file test.

M	actionpack/test/dispatch/uploaded_file_test.rb

commit fa55293	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-14 16:58:06 +0200

    all requests are utf-8. Don't use the external encoding.

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit f6fe174	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-14 09:59:18 +0200

    encode the uploaded file's name in the default external encoding - Closes #869

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit b869b8c	refs/tags/v3.0.14
Author: Lukáš Konarovský 
Date:   2011-06-15 03:09:27 -0700

    Use assert_equal instead of assert in uploaded file test.

M	actionpack/test/dispatch/uploaded_file_test.rb

commit 71d7610	refs/tags/v3.0.14
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-14 16:58:06 +0200

    all requests are utf-8. Don't use the external encoding.

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit 991e388	refs/tags/v3.0.14
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-14 09:59:18 +0200

    encode the uploaded file's name in the default external encoding - Closes #869

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit 078bdc6	refs/heads/master
Merge: 6ab3da6 c0d82ba
Author: José Valim 
Date:   2011-06-15 03:19:21 -0700

    Merge pull request #1711 from daeltar/master
    
    Use assert_equal instead of assert in uploaded file test.

commit 0a67b74	refs/heads/master
Author: Christine Yen 
Date:   2011-06-15 03:18:28 -0700

    Tweak linebreak in ActionController::Redirecting doc

M	actionpack/lib/action_controller/metal/redirecting.rb

commit c638165	refs/heads/master
Author: Christine Yen 
Date:   2011-06-15 03:15:27 -0700

    Clarify importance of *_attributes= writer methods for nested fields

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 6d96535	refs/heads/master
Author: thoefer 
Date:   2011-06-15 12:14:17 +0200

    Updated rails´s guides on the config.serve_static_assets and it´s settings in production mode using WEBrick. This documentation has it´s roots in #issue1657. You have to set config.serve_static_assets to true in production mode with WEBrick as only this includes ActionDispatch::Static.

M	railties/guides/source/configuring.textile

commit c0d82ba	refs/heads/master
Author: Lukáš Konarovský 
Date:   2011-06-15 03:09:27 -0700

    Use assert_equal instead of assert in uploaded file test.

M	actionpack/test/dispatch/uploaded_file_test.rb

commit 6ab3da6	refs/heads/master
Merge: 0438e92 9791e3e
Author: José Valim 
Date:   2011-06-15 02:52:12 -0700

    Merge pull request #1707 from dmathieu/memoize
    
    Allow last argument to be a boolean in memoized methods

commit 28508d5	refs/heads/master
Merge: 045d9d2 8da9103
Author: Vijay Dev 
Date:   2011-06-15 02:12:12 -0700

    Merge pull request #45 from christineyen/redirect_to_docs
    
    Documentation tweak - add a helpful reminder to redirect_to

commit 8da9103	refs/heads/master
Author: Christine Yen 
Date:   2011-06-15 01:55:57 -0700

    Improve documentation around status code argument of redirect_to

M	actionpack/lib/action_controller/metal/redirecting.rb

commit 6cfd1c7	refs/tags/v3.0.14
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-15 09:56:47 +0200

    simplify to only one condition
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/translation_helper.rb

commit 9267a43	refs/tags/v3.1.1.rc1
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-15 09:56:47 +0200

    simplify to only one condition
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/translation_helper.rb

commit 0438e92	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-15 09:56:47 +0200

    simplify to only one condition
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/translation_helper.rb

commit 9791e3e	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-15 09:46:05 +0200

    allow boolean last argument in memoized methods - Closes #1704
    
    If in the memoized method, the last argument is a boolean, it's considered as the reload method.
    Don't consider it like that if that's a normal method argument.

M	activesupport/lib/active_support/memoizable.rb

commit 10cfd14	refs/heads/master
Author: Brian Underwood 
Date:   2011-06-14 19:11:09 -0400

    Failing test to show problem when last argument of a memoized method is true
    
    Signed-off-by: Damien Mathieu <42@dmathieu.com>

M	activesupport/test/memoizable_test.rb

commit 045d9d2	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-15 11:44:31 +0530

    minor copy edit 0bdeddb

M	railties/guides/source/getting_started.textile

commit 0bdeddb	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-15 10:45:05 +0530

    Jruby => JRuby, Mysql => MySQL

M	railties/guides/source/getting_started.textile

commit 57ace98	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-15 07:40:49 +0530

    Moving hint down. As required after all database examples.

M	railties/guides/source/getting_started.textile

commit 8f05a2f	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-15 07:39:24 +0530

    Using "Finally" at the end of database section.

M	railties/guides/source/getting_started.textile

commit 900dbca	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-15 07:38:08 +0530

    Added Doc for Postgresql database with Jruby Platform. #jruby

M	railties/guides/source/getting_started.textile

commit aed8537	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-15 07:36:52 +0530

    Added doc for Mysql database with Jruby platform #jruby

M	railties/guides/source/getting_started.textile

commit d5b1cf5	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-15 07:36:04 +0530

    Adding doc for Sqlite3 database for Jruby platform #jruby

M	railties/guides/source/getting_started.textile

commit 190101e	refs/tags/v3.0.14
Author: Andrew White 
Date:   2011-06-15 01:20:50 +0100

    Make MissingTranslation exception handler respect :rescue_format

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 8624996	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-06-15 01:20:50 +0100

    Make MissingTranslation exception handler respect :rescue_format

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 0ac0d7a	refs/heads/master
Author: Andrew White 
Date:   2011-06-15 01:20:50 +0100

    Make MissingTranslation exception handler respect :rescue_format

M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/test/template/translation_helper_test.rb

commit 5daef25	refs/tags/v3.1.1.rc1
Merge: 78587a5 aeb7beb
Author: José Valim 
Date:   2011-06-14 15:50:55 -0700

    Merge pull request #1702 from brianmario/lazy-mysql2-casting
    
    Turn off mysql2's eager-casting

commit aeb7beb	refs/tags/v3.1.1.rc1
Author: Brian Lopez 
Date:   2011-06-14 15:42:08 -0700

    mysql2 casting changes require mysql2 >= 0.3.3

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit e56567c	refs/tags/v3.1.1.rc1
Author: Brian Lopez 
Date:   2011-06-14 15:17:01 -0700

    Turn off eager casting for mysql2, so ActiveRecord can lazily cast values later. This should help performance for tables with complex types like DATETIME, TIMESTAMP

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 78587a5	refs/tags/v3.1.1.rc1
Author: Joshua Peek 
Date:   2011-06-14 14:39:34 -0500

    Fix appending sprockets paths

M	actionpack/lib/sprockets/railtie.rb

commit 56b301f	refs/heads/master
Author: Joshua Peek 
Date:   2011-06-14 14:39:34 -0500

    Fix appending sprockets paths

M	actionpack/lib/sprockets/railtie.rb

commit 27d7083	refs/tags/v3.1.1.rc1
Author: Joseph Wong 
Date:   2011-06-14 11:11:26 -0700

    Patch for https://github.com/rails/rails/issues/1460
    
    [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their
    rake tasks ignored
    
    Working with the new support for plugins inside engines in Rails 3.1,
    I found that certain things that work for regular plugins don't work
    for these new nested plugins. In particular, these methods in
    Rails::Engine don't seem to understand that an engine could have
    nested plugins:
    
    #load_tasks
    #load_generators
    #load_console
    #eager_load!
    
    A solution which worked out for me is to move the calls to
    railties.all { ... } from the overriding methods in Rails::Application
    into Rails::Engine.

M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb

commit f391f94	refs/heads/master
Author: JudeArasu 
Date:   2011-06-14 23:16:05 +0530

    typo changes

M	actionmailer/lib/rails/generators/mailer/USAGE

commit 411435a	refs/heads/master
Merge: deff597 c424fb2
Author: Jon Leighton 
Date:   2011-06-14 09:56:51 -0700

    Merge pull request #1698 from bagwanpankaj/master
    
    Removed warnings from while running tests in Ruby 1.9.2

commit 1380a61	refs/tags/v3.1.1.rc1
Author: Chris Eppstein 
Date:   2011-06-13 18:25:05 -0700

    Add asset_url helper and refactor the asset paths so that asset hosts can be used during asset precompilation.

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 729d868	refs/tags/v3.1.1.rc1
Author: Chris Eppstein 
Date:   2011-06-13 22:45:34 -0700

    OrderedOptions must implement respond_to? if it implements method_missing.

M	activesupport/lib/active_support/ordered_options.rb
M	railties/lib/rails/engine.rb

commit c424fb2	refs/heads/master
Author: bagwanpankaj 
Date:   2011-06-14 21:47:15 +0530

    Removed warning while running test with ruby 1.9.2

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit deff597	refs/heads/master
Merge: 954359b 383fd14
Author: José Valim 
Date:   2011-06-14 08:13:15 -0700

    Merge pull request #1689 from dmathieu/utf8-filename
    
    Encode the uploaded file's name in utf8 - Closes #869

commit 383fd14	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-14 16:58:06 +0200

    all requests are utf-8. Don't use the external encoding.

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit 0c1e630	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-06-14 11:01:00 -0300

    Prefer Time.current over Time.now on example code

M	railties/guides/source/active_support_core_extensions.textile

commit 10c2035	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-06-14 10:53:38 -0300

    Add Time#all_* to AS guides.

M	railties/guides/source/active_support_core_extensions.textile

commit 383d56b	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-14 09:59:18 +0200

    encode the uploaded file's name in the default external encoding - Closes #869

M	actionpack/lib/action_dispatch/http/upload.rb
M	actionpack/test/dispatch/uploaded_file_test.rb

commit bf526c2	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-14 14:56:58 +0530

    Added instance_accessor: false to Module#mattr_accessor

M	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
M	activesupport/test/core_ext/module/attribute_accessor_test.rb

commit 4a96ab4	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-13 22:18:31 +0100

    Add Gemfile dependency for require_relative on mri18. This is a dependency of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream.

M	Gemfile

commit 34d16e1	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-13 22:18:31 +0100

    Add Gemfile dependency for require_relative on mri18. This is a dependency of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream.

M	Gemfile

commit 954359b	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-13 22:18:31 +0100

    Add Gemfile dependency for require_relative on mri18. This is a dependency of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream.

M	Gemfile

commit 9db268d	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-14 00:30:13 +0530

    fix minor errors in nested model guide

M	railties/guides/source/nested_model_forms.textile

commit 3b4f04a	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-13 23:14:15 +0530

    document the instance_accessor option for cattr_accessor

M	railties/guides/source/active_support_core_extensions.textile

commit 271bccb	refs/tags/v3.0.14
Author: Andrew White 
Date:   2011-06-13 18:25:26 +0100

    Remove obsolete compatibility module

M	activesupport/lib/active_support/dependencies.rb

commit a52b141	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-06-13 18:25:26 +0100

    Remove obsolete compatibility module

M	activesupport/lib/active_support/dependencies.rb

commit 190677d	refs/heads/master
Author: Andrew White 
Date:   2011-06-13 18:25:26 +0100

    Remove obsolete compatibility module

M	activesupport/lib/active_support/dependencies.rb

commit a646780	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-06-13 19:09:11 +0200

    Rename Time#whole_* to Time#all_* [thanks Pratik!]

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit d6cc0e5	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-06-13 18:54:15 +0200

    Added Time#whole_day/week/quarter/year as a way of generating ranges (example: Event.where(created_at: Time.now.whole_week)) [DHH]

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit b12c2e4	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-06-13 18:47:10 +0200

    Added instance_accessor: false as an option to Class#cattr_accessor and friends [DHH]

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
M	activesupport/test/core_ext/class/attribute_accessor_test.rb

commit 276618c	refs/heads/master
Merge: 5599e3f 54c651a
Author: Santiago Pastorino 
Date:   2011-06-13 05:49:00 -0700

    Merge pull request #1676 from neerajdotname/make_test_name_meaningful
    
    Remove "is_assed" with something more meaningful

commit 5599e3f	refs/heads/master
Merge: 5d655aa 7c30946
Author: Santiago Pastorino 
Date:   2011-06-13 05:45:47 -0700

    Merge pull request #1654 from ganeshkumar/test_cases
    
    removed duplicate code in tests

commit 67a705f	refs/heads/master
Author: Lukas Stejskal 
Date:   2011-06-13 14:21:17 +0200

    fix two typos: and array -> an array

M	railties/guides/source/active_support_core_extensions.textile

commit 45509ee	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-06-13 13:02:51 +0100

    Pass mass-assignment options to nested models - closes #1673.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/models/person.rb

commit 5d655aa	refs/heads/master
Author: Andrew White 
Date:   2011-06-13 13:02:51 +0100

    Pass mass-assignment options to nested models - closes #1673.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/models/person.rb

commit 113466c	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-06-13 10:01:19 +0100

    Rename tests to reflect associations

M	activerecord/test/cases/mass_assignment_security_test.rb

commit 987afa5	refs/heads/master
Author: Andrew White 
Date:   2011-06-13 10:01:19 +0100

    Rename tests to reflect associations

M	activerecord/test/cases/mass_assignment_security_test.rb

commit 54c651a	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-13 04:34:09 -0400

    Remove "is_assed" with something more meaningful

M	railties/test/generators/plugin_new_generator_test.rb

commit 00c12ff	refs/tags/v3.1.1.rc1
Merge: fb1fd61 1863f12
Author: José Valim 
Date:   2011-06-13 01:17:28 -0700

    Merge pull request #1675 from thoefer/3-1-stable
    
    Fix for startup problems due to deprecation warning on nested models

commit c41c442	refs/heads/master
Merge: 86bbba1 4dc3bb9
Author: José Valim 
Date:   2011-06-13 00:45:32 -0700

    Merge pull request #1672 from ryanb/namespace_engine_assets
    
    Namespace engine assets

commit d7a2431	refs/heads/master
Author: Robert Massaioli 
Date:   2011-06-13 14:58:56 +1000

    cycle: make an odd number be marked as odd.
    
    Just a minor issue that was annoying me so I thought that I would jump in and fix it.

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 4dc3bb9	refs/heads/master
Author: Ryan Bates 
Date:   2011-06-12 18:29:14 -0700

    namespace engine assets

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt
M	railties/test/generators/plugin_new_generator_test.rb

commit 6824c5d	refs/tags/v3.0.9.rc5 (tag: v3.0.9.rc5)
Author: Aaron Patterson 
Date:   2011-06-12 14:28:06 -0700

    Preparing for 3.0.9.rc5 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit d958428	refs/tags/v3.0.9.rc5
Merge: f283194 f169dab
Author: Aaron Patterson 
Date:   2011-06-12 14:26:18 -0700

    Merge branch '3-0-9' of github.com:rails/rails into 3-0-9
    
    * '3-0-9' of github.com:rails/rails:
      Make sure that we don't perform in-place mutation on SafeBuffer string
      Update CHANGELOG to mention the json_escape change
      Ensure number helpers can handle HTML safe strings - closes #1597.

commit f283194	refs/tags/v3.0.9.rc4 (tag: v3.0.9.rc4)
Author: Aaron Patterson 
Date:   2011-06-12 14:21:20 -0700

    bumping to rc4

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit d5e28c3	refs/tags/v3.0.9.rc4
Merge: 66ec7e8 968816a
Author: Aaron Patterson 
Date:   2011-06-12 13:57:05 -0700

    Merge branch '3-0-stable' into 3-0-9
    
    * 3-0-stable:
      Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests
      Define ActiveSupport#to_param as to_str - closes #1663
      Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
      Make sure that we don't perform in-place mutation on SafeBuffer string
      Update CHANGELOG to mention the json_escape change
      Ensure number helpers can handle HTML safe strings - closes #1597.
      ensuring that json_escape returns html safe strings when passed an html safe string
      Fix issue #1598 by adding a dependency to the RDoc gem.
      Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
    
    Conflicts:
    	actionpack/CHANGELOG

commit 1863f12	refs/tags/v3.1.1.rc1
Author: thoefer 
Date:   2011-06-12 21:28:38 +0200

    Make sure to have a Hash under the i18n keys 'activerecord.attributes' and 'activerecord.models' as this might not always be the case. See issue #1662.

M	activerecord/lib/active_record/railtie.rb

commit 968816a	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-12 19:08:16 +0100

    Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests

M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/test/support/config.rb

commit fb1fd61	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-12 19:08:16 +0100

    Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests

M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/test/support/config.rb

commit 86bbba1	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-12 19:08:16 +0100

    Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests

M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/test/support/config.rb

commit 15e2891	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-12 19:05:29 +0100

    Oops, this should have been in the last commit :zap:

M	activerecord/test/cases/autosave_association_test.rb

commit c525201	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-12 18:50:24 +0100

    Make assert_no_queries literally enforce that there are no queries. As in, not a single line of SQL should be sent to the database, not even stuff that is ignored by assert_queries. The argument being that if you write assert_no_queries, you really do not want there to be any queries.

M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 232c66a	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-12 18:38:39 +0100

    If we're going to use a global variable, let's at least namespace it

M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/helper.rb

commit df63c99	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-12 18:18:43 +0100

    Replace inline lambdas with named methods

M	activerecord/lib/active_record/associations/collection_association.rb

commit bdd549a	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-12 18:09:09 +0100

    Refactor tests to be less brittle

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/models/company.rb

commit 5f43a2a	refs/tags/v3.1.1.rc1
Author: Jon Leighton 
Date:   2011-06-12 17:29:53 +0100

    Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a special case in assert_queries

M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/helper.rb

commit b17fd25	refs/tags/v3.1.1.rc1
Author: benedikt 
Date:   2011-06-09 13:10:20 +0200

    Don't wrap operations on collection associations in transactions when they are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit b09bbdb	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-12 18:18:43 +0100

    Replace inline lambdas with named methods

M	activerecord/lib/active_record/associations/collection_association.rb

commit 14e6bbb	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-12 18:09:09 +0100

    Refactor tests to be less brittle

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/models/company.rb

commit de01a64	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-12 17:29:53 +0100

    Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a special case in assert_queries

M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/helper.rb

commit fa8dfad	refs/heads/master
Author: benedikt 
Date:   2011-06-09 13:10:20 +0200

    Don't wrap operations on collection associations in transactions when they are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 657ba2a	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-12 10:31:21 -0500

    Remove trailing whitespaces

M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 1fa059c	refs/heads/master
Author: Andrew White 
Date:   2011-06-12 15:03:24 +0100

    Define ActiveSupport#to_param as to_str - closes #1663

M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit a64b5dd	refs/tags/v3.0.14
Author: Andrew White 
Date:   2011-06-12 15:03:24 +0100

    Define ActiveSupport#to_param as to_str - closes #1663

M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit c1938d1	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-06-12 15:03:24 +0100

    Define ActiveSupport#to_param as to_str - closes #1663

M	actionpack/test/template/url_helper_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit cd99784	refs/heads/master
Merge: caadef9 04407a7
Author: Xavier Noria 
Date:   2011-06-12 15:04:15 +0200

    Merge branch 'master' of github.com:rails/rails

commit e51b8fb	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-12 15:03:28 +0200

    backslash insertion for RDoc main page ignores code blocks, also adds comments to explain what's this hack about

M	Rakefile

commit caadef9	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-12 15:03:28 +0200

    backslash insertion for RDoc main page ignores code blocks, also adds comments to explain what's this hack about

M	Rakefile

commit 00b4756	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-12 16:17:34 +0530

    assets are in app now and not in public

M	railties/guides/source/getting_started.textile

commit 04407a7	refs/heads/master
Author: José Valim 
Date:   2011-06-12 12:44:00 +0200

    Make i18n tests more robust.

M	railties/test/application/initializers/i18n_test.rb

commit edc0b2b	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-12 12:44:00 +0200

    Make i18n tests more robust.

M	railties/test/application/initializers/i18n_test.rb

commit 7c4625a	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-12 12:09:08 +0200

    revises the pattern that excludes generator templates in API generation
    
    With the previous pattern RDoc processed
    
        railties/lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
    
    and that resulted in a spurious "<" class.

M	Rakefile

commit de757af	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-12 12:09:08 +0200

    revises the pattern that excludes generator templates in API generation
    
    With the previous pattern RDoc processed
    
        railties/lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
    
    and that resulted in a spurious "<" class.

M	Rakefile

commit d48bbc8	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-06-11 19:32:01 -0300

    Add example for rails server port option.

M	railties/guides/source/command_line.textile

commit 04c31e2	refs/heads/master
Author: thoefer 
Date:   2011-06-11 23:56:29 +0200

    fixed typo for a methodname

M	railties/lib/rails/railtie.rb

commit 70cafa2	refs/heads/master
Author: Uģis Ozols 
Date:   2011-06-12 00:41:42 +0300

    with -> will

M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb

commit 07bf608	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-12 02:16:08 +0530

    document server options

M	railties/guides/source/command_line.textile

commit d91ee6c	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-12 01:30:40 +0530

    more command guide changes

M	railties/guides/source/command_line.textile

commit 940552e	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-11 22:11:16 +0530

    make some changes to the command line guide

M	railties/guides/source/command_line.textile

commit e591d14	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-06-11 18:24:05 +0200

    Update changelog with #1552 feature: add hidden field before select[multiple=true]

M	actionpack/CHANGELOG

commit 7c30946	refs/heads/master
Author: ganesh 
Date:   2011-06-11 21:49:12 +0530

    removed duplicate code

M	activemodel/test/cases/attribute_methods_test.rb

commit 0bbc145	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-11 18:04:27 +0200

    Update CHANGELOG.

M	activemodel/CHANGELOG

commit 82568be	refs/heads/master
Author: José Valim 
Date:   2011-06-11 18:03:13 +0200

    Update CHANGELOG.

M	activemodel/CHANGELOG

commit db027aa	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-11 21:31:45 +0530

    minor changes in templates guide

M	railties/guides/source/rails_application_templates.textile

commit 410a428	refs/heads/master
Author: José Valim 
Date:   2011-06-11 17:21:22 +0200

    Get rid of the alternate namespace lookup.

M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit c19bd4f	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-11 17:56:30 +0200

    Add a deprecation for nested i18n namespace lookup.

M	activerecord/lib/active_record/railtie.rb

commit 83efad0	refs/tags/v3.1.1.rc1
Author: José Valim 
Date:   2011-06-11 17:21:22 +0200

    Get rid of the alternate namespace lookup.

M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit f5e1548	refs/heads/master
Merge: e294009 faba406
Author: Piotr Sarnacki 
Date:   2011-06-11 08:21:22 -0700

    Merge pull request #1552 from bogdan/select
    
    Fixing select[multiple] html specification problem.

commit e294009	refs/heads/master
Author: José Valim 
Date:   2011-06-11 17:10:16 +0200

    No need for a configuration option here.

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit 28f2b98	refs/heads/master
Merge: 1829dd9 9b30598
Author: José Valim 
Date:   2011-06-11 08:04:06 -0700

    Merge pull request #549 from dlee/utf8_enforcer
    
    Utf8 enforcer param customization

commit 1829dd9	refs/heads/master
Merge: 94df84a f3c9f32
Author: José Valim 
Date:   2011-06-11 08:01:52 -0700

    Merge pull request #1647 from neerajdotname/make_tests_stronger
    
    Make tests stronger, cleaner and slimmer

commit 53a9849	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-10 17:27:46 +0530

    add missing end in example

M	railties/guides/source/caching_with_rails.textile

commit 3c06d25	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-10 17:18:57 +0530

    favor includes over old AR way

M	railties/guides/source/performance_testing.textile

commit 83289be	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-10 17:17:51 +0530

    fixed incorrect command usage. (This section needs to be updated in any case).

M	railties/guides/source/performance_testing.textile

commit 94c52e8	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-10 17:06:21 +0530

    minor fixes in action view guide

M	railties/guides/source/action_view_overview.textile

commit 110de0f	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:46:59 +0530

    Using different constant.

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 2b4a7ca	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:36:07 +0530

    Modified database.rake file to run with jdbcsqlite3

M	activerecord/lib/active_record/railties/databases.rake

commit 9da2a10	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:31:45 +0530

    Allow database.rake tasks to perform opreation with jdbcpostgresql

M	activerecord/lib/active_record/railties/databases.rake

commit d5b9ea3	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:25:59 +0530

    Fixed error when running db:create with jdbcmysql

M	activerecord/lib/active_record/railties/databases.rake
A	activerecord/lib/active_record/railties/jdbcmysql_error.rb

commit 7f4bf01	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:22:12 +0530

    Adding Jruby-openssl in gemfile for 3-0-stable.

M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/test/generators/app_generator_test.rb

commit bcd9145	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:18:31 +0530

    Adding JDBCpostgresql template for Jruby in 3-0-stable.

M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/test/generators/app_generator_test.rb

commit 680e5d2	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:14:38 +0530

    Adding jdbcsqlite3 in comment

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 871a0fc	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:12:30 +0530

    Adding JDBCsqlite3 template for Jruby in 3-0-stable.

M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
M	railties/test/generators/app_generator_test.rb

commit 0e0be35	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:07:56 +0530

    Tests added for activerecord-jdbcmysql

M	railties/test/generators/app_generator_test.rb

commit 4448988	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-11 16:06:09 +0530

    Adding JDBCmysql template for Jruby in 3-0-stable.

M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml

commit f8c4b37	refs/heads/master
Author: Paul Gallagher 
Date:   2011-06-11 18:34:09 +0800

    make extract_schema_and_table a private method

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 9b30598	refs/heads/master
Author: David Lee 
Date:   2011-05-20 18:40:59 -0700

    Remove utf8_enforcer_param config option

M	actionpack/lib/action_view/railtie.rb
M	railties/guides/source/configuring.textile
M	railties/test/application/configuration_test.rb

commit 91e3046	refs/heads/master
Author: David Lee 
Date:   2011-05-13 17:54:29 -0700

    Make utf8_enforcer_tag an overrideable method

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit fa3fc52	refs/heads/master
Author: David Lee 
Date:   2011-05-09 16:16:55 -0700

    Make utf8 enforcer param customizeable

M	actionpack/lib/action_view/helpers/controller_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/railtie.rb
M	railties/guides/source/configuring.textile
M	railties/test/application/configuration_test.rb

commit 1cbe917	refs/heads/master
Author: David Lee 
Date:   2011-05-08 04:40:47 -0700

    There are no snowmen here

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit d38ca78	refs/heads/master
Author: David Lee 
Date:   2011-06-09 01:10:49 -0700

    Add acronym support to Inflector; Issue #1366

M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 51cd6bb	refs/heads/master
Author: David Lee 
Date:   2011-06-07 19:05:09 -0700

    Refactor

M	activesupport/lib/active_support/core_ext/string/inflections.rb
M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/lib/active_support/inflector/methods.rb
M	railties/guides/source/initialization.textile

commit f3e8bb8	refs/heads/master
Author: David Lee 
Date:   2011-06-03 16:07:28 -0700

    Test retain delimiter in parameterization inflector

M	activesupport/test/inflector_test.rb
M	activesupport/test/inflector_test_cases.rb

commit f3c9f32	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-11 03:06:28 -0400

    remove meaningless assert true

M	actionpack/test/controller/test_test.rb

commit 6688b63	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-11 02:52:13 -0400

    expected message should come first

M	actionpack/test/controller/url_for_test.rb

commit 5da89af	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-10 14:19:24 -0400

    try not to use assert_blank when nil will would
    be considered as failure
    
    Test for specific value to the extent possible

M	actionpack/test/controller/webservice_test.rb

commit 0019379	refs/tags/v3.0.14
Author: Santiago Pastorino and José Ignacio Costa 
Date:   2011-06-10 23:11:13 -0300

    Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
    
    This reverts commit 104e200a5e60908be144e7bba5b90725f1a115e0.

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit 41b73fe	refs/tags/v3.1.1.rc1
Author: Santiago Pastorino and José Ignacio Costa 
Date:   2011-06-10 23:08:58 -0300

    Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
    
    This reverts commit 317e7c829d4b281b4e7a96fe65960c9a2b7ba664.

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit 94df84a	refs/heads/master
Author: Santiago Pastorino and José Ignacio Costa 
Date:   2011-06-10 23:08:00 -0300

    Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
    
    This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1.

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit adef976	refs/heads/master
Merge: a4ee503 c4ddc6f
Author: Santiago Pastorino 
Date:   2011-06-10 18:35:14 -0700

    Merge pull request #1644 from smartinez87/warns
    
    Remove unused variable causing warning in 1.9.3

commit c4ddc6f	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-06-10 21:10:06 -0300

    Remove unused variable causing warning in 1.9.3

M	actionpack/test/abstract/abstract_controller_test.rb

commit a4ee503	refs/heads/master
Merge: ca312b6 115e80d
Author: Aaron Patterson 
Date:   2011-06-10 16:29:58 -0700

    Merge pull request #1642 from sikachu/master-render-inline
    
    Render inline fix for master

commit e88508e	refs/tags/v3.1.1.rc1
Merge: 0127cf6 317e7c8
Author: Aaron Patterson 
Date:   2011-06-10 16:28:06 -0700

    Merge pull request #1641 from sikachu/3-1-stable-render-inline
    
    Render inline fix for 3-1-stable

commit f169dab	refs/tags/v3.0.9.rc5
Merge: 66ec7e8 fb706c7
Author: Aaron Patterson 
Date:   2011-06-10 16:26:24 -0700

    Merge pull request #1640 from sikachu/3-0-9-render-inline
    
    Render inline fix for 3-0-9

commit 70b4ea9	refs/tags/v3.0.14
Merge: 9b80f8d 104e200
Author: Aaron Patterson 
Date:   2011-06-10 16:25:30 -0700

    Merge pull request #1639 from sikachu/3-0-stable-render-inline
    
    Render inline fix for 3-0-stable

commit 0127cf6	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-11 01:18:08 +0200

    s/Bundle/Bundler/

M	railties/lib/rails/generators/app_base.rb

commit 467772b	refs/tags/v3.1.1.rc1
Author: Xavier Noria 
Date:   2011-06-10 23:43:24 +0200

    shell out to run bundler on app generation, see rationale in the comment

M	railties/lib/rails/generators/app_base.rb

commit ca312b6	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-11 01:18:08 +0200

    s/Bundle/Bundler/

M	railties/lib/rails/generators/app_base.rb

commit dfca4d1	refs/tags/v3.1.1.rc1
Author: thoefer 
Date:   2011-06-11 00:52:11 +0200

    Fixed minor typo: 'Arraw' to 'Array'

M	activesupport/lib/active_support/core_ext/array/wrap.rb

commit b3ade0c	refs/tags/v3.1.1.rc1
Author: ganesh 
Date:   2011-06-10 15:53:55 +0530

    shallow_path example updated

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit e17d4e0	refs/tags/v3.1.1.rc1
Author: John Hinnegan 
Date:   2011-06-09 10:22:44 -0700

    update palmist link on performance_testing

M	railties/guides/source/performance_testing.textile

commit f0d7aa2	refs/tags/v3.1.1.rc1
Author: Ben Orenstein 
Date:   2011-06-08 23:20:13 -0400

    Describe the user name 'variable' in a way that doesn't confuse the textile parser.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 3e29f6a	refs/tags/v3.1.1.rc1
Author: Bratish Goswami 
Date:   2011-06-08 22:47:25 +0530

    Added acronym and reference link for Model–view–controller
    
    Conflicts:
    
    	README.rdoc

M	README.rdoc

commit 0ac6f8a	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-08 19:42:18 +0530

    minor corrections in configuring guide

M	railties/guides/source/configuring.textile

commit 9ce59ac	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-08 15:01:19 +0530

    remove generators section from command line guide in favor of the separate generator guide

M	railties/guides/source/command_line.textile

commit cc1e983	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-08 06:47:22 +0530

    fix generators guide url

M	railties/guides/source/command_line.textile

commit ed863a0	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-08 05:06:58 +0530

    use git: rather than https: in git remote urls; else, github asks for passwords everytime we push

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit a1a1d62	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-08 04:53:09 +0530

    minor fixes from 5acf76d

M	railties/guides/source/configuring.textile

commit 290708c	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-08 04:48:03 +0530

    fix incorrect validation examples
    
    Conflicts:
    
    	railties/guides/source/active_record_validations_callbacks.textile

M	railties/guides/source/active_record_validations_callbacks.textile

commit 3de9d6b	refs/tags/v3.1.1.rc1
Author: Vijay Dev 
Date:   2011-06-08 03:52:33 +0530

    fix typo
    
    Conflicts:
    
    	actionmailer/lib/action_mailer/base.rb

M	actionmailer/lib/action_mailer/base.rb

commit 4699c93	refs/heads/master
Merge: 6c58585 029290f
Author: Xavier Noria 
Date:   2011-06-11 00:59:46 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 029290f	refs/heads/master
Author: thoefer 
Date:   2011-06-11 00:52:11 +0200

    Fixed minor typo: 'Arraw' to 'Array'

M	activesupport/lib/active_support/core_ext/array/wrap.rb

commit 115e80d	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-10 18:22:42 -0400

    Make sure that we don't perform in-place mutation on SafeBuffer string
    
    This will make sure `render :inline` is working.
    
    Closes #1633

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit 3757798	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-10 18:29:52 -0400

    Update CHANGELOG to mention the json_escape change, and rearrange stuff a bit.

M	actionpack/CHANGELOG

commit 317e7c8	refs/tags/v3.1.1.rc1
Author: Prem Sichanugrist 
Date:   2011-06-10 18:22:42 -0400

    Make sure that we don't perform in-place mutation on SafeBuffer string
    
    This will make sure `render :inline` is working.
    
    Closes #1633

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit ff48edd	refs/tags/v3.1.1.rc1
Author: Prem Sichanugrist 
Date:   2011-06-10 18:29:52 -0400

    Update CHANGELOG to mention the json_escape change

M	actionpack/CHANGELOG

commit fb706c7	refs/tags/v3.0.9.rc5
Author: Prem Sichanugrist 
Date:   2011-06-10 18:22:42 -0400

    Make sure that we don't perform in-place mutation on SafeBuffer string
    
    This will make sure `render :inline` is working.
    
    Closes #1633

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit 564a655	refs/tags/v3.0.9.rc5
Author: Prem Sichanugrist 
Date:   2011-06-10 18:29:52 -0400

    Update CHANGELOG to mention the json_escape change

M	actionpack/CHANGELOG

commit 60d4dc1	refs/tags/v3.0.9.rc5
Author: Andrew White 
Date:   2011-06-10 11:19:26 +0100

    Ensure number helpers can handle HTML safe strings - closes #1597.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit 104e200	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-10 18:22:42 -0400

    Make sure that we don't perform in-place mutation on SafeBuffer string
    
    This will make sure `render :inline` is working.
    
    Closes #1633

M	actionpack/lib/action_view/template.rb
M	actionpack/test/template/template_test.rb

commit c4fbb21	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-10 18:29:52 -0400

    Update CHANGELOG to mention the json_escape change

M	actionpack/CHANGELOG

commit 6c58585	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-10 23:43:24 +0200

    shell out to run bundler on app generation, see rationale in the comment

M	railties/lib/rails/generators/app_base.rb

commit 1d7c751	refs/heads/master
Author: Paul Gallagher 
Date:   2011-06-11 02:07:08 +0800

    remove table quoting in primary_key method
    
    * add/cleanup tests

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit c791e2d	refs/heads/master
Author: Ken Collins 
Date:   2011-06-10 13:15:58 -0400

    Allow the connection pool's #table_exists? method to give the connections #table_exists? method a chance.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit 019c263	refs/heads/master
Author: Paul Gallagher 
Date:   2011-06-10 22:48:58 +0800

    apply private method indentation convention
    
    * tidy test code and fix my typo

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 5c7f8c9	refs/heads/master
Author: Paul Gallagher 
Date:   2011-06-09 09:47:01 +0800

    Improve PostgreSQL adapter schema-awareness
    
    * table_exists? scoped by schema search path unless schema is explicitly named. Added tests and doc to clarify the behaviour
    * extract_schema_and_table tests and implementation extended to cover all cases
    * primary_key does not ignore schema information
    * add current_schema and schema_exists? methods
    * more robust table referencing in insert_sql and sql_for_insert methods

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 8eb2b51	refs/heads/master
Merge: 78acd17 880371e
Author: José Valim 
Date:   2011-06-10 06:45:52 -0700

    Merge pull request #1631 from vijaydev/runner-help
    
    rails runner without any options should show usage information

commit 880371e	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-10 18:46:27 +0530

    make 'rails runner' show usage when run without any options

M	railties/lib/rails/commands/runner.rb
M	railties/test/application/runner_test.rb

commit 55fd92f	refs/tags/v3.1.1.rc1
Merge: 21a8dc7 b48f809
Author: José Valim 
Date:   2011-06-10 05:48:06 -0700

    Merge pull request #1630 from BDQ/engine_migrations_3_1
    
    Ensure engine migrations are copied in correct sequence for 3.1

commit b48f809	refs/tags/v3.1.1.rc1
Author: Brian Quinn 
Date:   2011-06-10 11:03:28 +0100

    Updated test to ensure correct sequence when copying engine/plugin migrations.

M	railties/test/railties/shared_tests.rb

commit 0fab87f	refs/tags/v3.1.1.rc1
Author: Stefan Sprenger 
Date:   2011-06-07 14:07:32 +0200

    Prepend bundle exec to get the correct Rake version

M	railties/test/railties/shared_tests.rb

commit 2d4d7cc	refs/tags/v3.1.1.rc1
Author: Brian Quinn 
Date:   2011-06-08 16:51:10 +0100

    Ensure engine migrations are copied in the same sequence that they are required.

M	activerecord/lib/active_record/railties/databases.rake

commit 78acd17	refs/heads/master
Merge: 0bcbcdf 25ad430
Author: José Valim 
Date:   2011-06-10 04:43:43 -0700

    Merge pull request #1567 from BDQ/engine_migrations
    
    Ensure engine migrations are copied in correct sequence

commit 25ad430	refs/heads/master
Author: Brian Quinn 
Date:   2011-06-10 11:03:28 +0100

    Updated test to ensure correct sequence when copying engine/plugin migrations.

M	railties/test/railties/shared_tests.rb

commit 9f2e914	refs/heads/master
Author: Brian Quinn 
Date:   2011-06-08 16:51:10 +0100

    Ensure engine migrations are copied in the same sequence that they are required.

M	activerecord/lib/active_record/railties/databases.rake

commit 0bcbcdf	refs/heads/master
Author: Andrew White 
Date:   2011-06-10 11:19:26 +0100

    Ensure number helpers can handle HTML safe strings - closes #1597.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit 90c4885	refs/heads/master
Merge: 2bda229 46ecb53
Author: Xavier Noria 
Date:   2011-06-10 03:27:45 -0700

    Merge pull request #1523 from raghunadhd/refactor_regex
    
    rafactored the regex related code in the mapper class

commit 9b80f8d	refs/tags/v3.0.14
Author: Andrew White 
Date:   2011-06-10 11:19:26 +0100

    Ensure number helpers can handle HTML safe strings - closes #1597.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit 262a42b	refs/heads/master
Author: ganesh 
Date:   2011-06-10 15:53:55 +0530

    shallow_path example updated

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 21a8dc7	refs/tags/v3.1.1.rc1
Author: Andrew White 
Date:   2011-06-10 11:19:26 +0100

    Ensure number helpers can handle HTML safe strings - closes #1597.

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit 46ecb53	refs/heads/master
Author: Raghunadh 
Date:   2011-06-10 13:37:49 +0530

    removed the unnecessary back slashes from the regular expression

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 2bda229	refs/heads/master
Merge: 0b02284 06d772c
Author: José Valim 
Date:   2011-06-10 00:29:50 -0700

    Merge pull request #1625 from neerajdotname/page_caching
    
    Three minor fixes to tests

commit 06d772c	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-10 02:48:44 -0400

    add missing ensure

M	actionpack/test/controller/content_type_test.rb

commit fdbe8eb	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-10 02:27:57 -0400

    replaced and with && as per coding guidelines

M	actionpack/test/controller/caching_test.rb

commit 49d0329	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-10 02:24:37 -0400

    The test name is misleading. It says
    test_should_cache_with_trailing_slash_on_url
    
    A trailing slash is removed when a page is cached.
    
    What the test meant to say was : a url with trailing slash
    should be cached and the cached page should not have any
    trailing slash.
    
    This patch clarifies the name a bit.

M	actionpack/test/controller/caching_test.rb

commit 279781f	refs/tags/v3.1.0.rc4 (tag: v3.1.0.rc4)
Author: Aaron Patterson 
Date:   2011-06-09 15:53:49 -0700

    bumping to 3.1.0.rc4

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 66ec7e8	refs/tags/v3.0.9.rc3 (tag: v3.0.9.rc3)
Author: Aaron Patterson 
Date:   2011-06-09 15:48:19 -0700

    bumping to rc3 since syck is not playing nicely

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 0e1ecb2	refs/tags/v3.0.9.rc2 (tag: v3.0.9.rc2)
Author: Aaron Patterson 
Date:   2011-06-09 15:36:44 -0700

    bumping to 3.0.9.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit cce7085	refs/tags/v3.0.9.rc2
Author: Aaron Patterson 
Date:   2011-06-09 15:29:17 -0700

    ensuring that json_escape returns html safe strings when passed an html safe string

M	actionpack/test/template/erb_util_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 88413ef	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-09 15:29:17 -0700

    ensuring that json_escape returns html safe strings when passed an html safe string

M	actionpack/test/template/erb_util_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 58ac641	refs/tags/v3.1.0.rc4
Author: Aaron Patterson 
Date:   2011-06-09 15:29:17 -0700

    ensuring that json_escape returns html safe strings when passed an html safe string

M	actionpack/test/template/erb_util_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 0b02284	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-09 15:29:17 -0700

    ensuring that json_escape returns html safe strings when passed an html safe string

M	actionpack/test/template/erb_util_test.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 1aae5e7	refs/tags/v2.3.13
Author: Brian Cardarella 
Date:   2011-06-09 14:46:44 -0700

    Remove deprecation warning for ActiveRecord::Errors#generate_message. This is the same API that ActiveModel ended up using and that won't be changing.

M	activerecord/lib/active_record/validations.rb

commit 84f71e4	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-09 09:01:50 +0200

    don't reinitialize the arel_table unless the table_name changes

M	activerecord/lib/active_record/base.rb

commit dc73c2c	refs/tags/v3.1.0.rc4
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-09 09:01:50 +0200

    don't reinitialize the arel_table unless the table_name changes

M	activerecord/lib/active_record/base.rb

commit 7cca6a2	refs/tags/v3.1.0.rc4
Author: Jacob Poulsgaard Tjoernholm 
Date:   2011-06-09 21:18:22 +0200

    Fix issue #1598 by adding a dependency to the RDoc gem.

M	railties/railties.gemspec

commit 35ae29f	refs/heads/master
Author: Jacob Poulsgaard Tjoernholm 
Date:   2011-06-09 21:18:22 +0200

    Fix issue #1598 by adding a dependency to the RDoc gem.

M	railties/railties.gemspec

commit 8fcdc15	refs/tags/v3.0.9.rc2
Author: Prem Sichanugrist 
Date:   2011-06-09 14:00:10 -0400

    Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit b002181	refs/tags/v3.0.9.rc2
Author: Jacob Poulsgaard Tjoernholm 
Date:   2011-06-09 21:18:22 +0200

    Fix issue #1598 by adding a dependency to the RDoc gem.

M	railties/railties.gemspec

commit caa9779	refs/tags/v3.0.14
Author: Jacob Poulsgaard Tjoernholm 
Date:   2011-06-09 21:18:22 +0200

    Fix issue #1598 by adding a dependency to the RDoc gem.

M	railties/railties.gemspec

commit 4b371b6	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-09 20:15:34 +0100

    Print out information about whether the identity map is on or off when running unit tests

M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/test/cases/helper.rb
M	activerecord/test/support/connection.rb

commit e488299	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-09 09:11:26 +0100

    Update the RUNNING_UNIT_TESTS file

M	activerecord/RUNNING_UNIT_TESTS

commit b6a2157	refs/tags/v3.0.14
Merge: 1ae9b29 3d82d81
Author: Aaron Patterson 
Date:   2011-06-09 11:43:10 -0700

    Merge pull request #1611 from sikachu/3-0-stable-javascript
    
    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen

commit 9e71825	refs/tags/v3.1.0.rc4
Merge: fa6b12a 66dbef6
Author: Aaron Patterson 
Date:   2011-06-09 11:39:09 -0700

    Merge pull request #1610 from sikachu/3-1-stable-javascript
    
    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen

commit d0a1e37	refs/heads/master
Merge: 834bebf 8c8652c
Author: Aaron Patterson 
Date:   2011-06-09 11:37:06 -0700

    Merge pull request #1609 from sikachu/master-javascript
    
    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen

commit 8c8652c	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-09 14:00:10 -0400

    Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 66dbef6	refs/tags/v3.1.0.rc4
Author: Prem Sichanugrist 
Date:   2011-06-09 14:00:10 -0400

    Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 3d82d81	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-09 14:00:10 -0400

    Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 1395b30	refs/heads/master
Author: John Hinnegan 
Date:   2011-06-09 10:22:44 -0700

    update palmist link on performance_testing

M	railties/guides/source/performance_testing.textile

commit c2aacdf	refs/heads/master
Author: Dingding Ye 
Date:   2011-06-10 01:15:37 +0800

    MemcacheStore: deserialize the entry reading from local_cache when using raw

M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/test/caching_test.rb

commit 0252376	refs/tags/v3.0.14
Author: bradrobertson 
Date:   2011-06-08 17:38:47 -0400

    modified table_exists? to always use current search_path or schema if explicitly set

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb

commit 834bebf	refs/heads/master
Merge: eb8c0a7 fa5b34e
Author: José Valim 
Date:   2011-06-09 08:30:45 -0700

    Merge pull request #1606 from neerajdotname/remove_users_controller_from_test
    
    remove unused UserController from test

commit 79647c6	refs/heads/master
Merge: 45a5201 4f9e242
Author: Mohammad Typaldos 
Date:   2011-06-09 03:58:22 -0400

    Merge branch 'master' of github.com:lifo/docrails

commit 45a5201	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-09 03:57:55 -0400

    Match tone already established

M	railties/guides/source/asset_pipeline.textile

commit eb8c0a7	refs/heads/master
Merge: af3f0b6 331d58f
Author: José Valim 
Date:   2011-06-09 00:01:00 -0700

    Merge pull request #1356 from flippingbits/fix_engine_generator
    
    Fix engine's generator

commit af3f0b6	refs/heads/master
Merge: 077f65c 9af4e80
Author: José Valim 
Date:   2011-06-08 23:36:49 -0700

    Merge pull request #1591 from smartinez87/unused
    
    Fix "warning: assigned but unused variable" on AR tests

commit 077f65c	refs/heads/master
Merge: 0ad2280 277eb05
Author: José Valim 
Date:   2011-06-08 23:35:46 -0700

    Merge pull request #1588 from neerajdotname/remove_unused_class_with_symbol_returning
    
    class WithSymbolReturningString is not used anywhere in the test.

commit 0ad2280	refs/heads/master
Merge: 12245a3 dd3e7a6
Author: José Valim 
Date:   2011-06-08 23:34:30 -0700

    Merge pull request #1579 from bradleybuda/master
    
    Date#freeze fails when called more than once in 1.8

commit 12245a3	refs/heads/master
Merge: 9295053 8166e4b
Author: José Valim 
Date:   2011-06-08 23:33:42 -0700

    Merge pull request #1577 from reu/useless-variable-set
    
    Instance variable not used.

commit 9295053	refs/heads/master
Merge: 54b0aeb f878880
Author: Aaron Patterson 
Date:   2011-06-08 20:29:12 -0700

    Merge pull request #1593 from r00k/master
    
    Simplify boolean logic into ternary

commit 4f9e242	refs/heads/master
Author: Ben Orenstein 
Date:   2011-06-08 23:20:13 -0400

    Describe the user name 'variable' in a way that doesn't confuse the textile parser.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit f878880	refs/heads/master
Author: Ben Orenstein 
Date:   2011-06-08 23:05:43 -0400

    Simplify boolean logic into ternary.

M	activesupport/lib/active_support/core_ext/module/delegation.rb

commit fa5b34e	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-08 22:49:38 -0400

    remove unused user_controller from test

M	actionpack/test/controller/action_pack_assertions_test.rb

commit 9af4e80	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-06-08 23:13:59 -0300

    Remove unused 'y' variable.

M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb

commit 0b86ac2	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-06-08 23:13:43 -0300

    Remove unused 'quoted_column_names' variable.

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 277eb05	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-08 20:22:13 -0400

    class WithSymbolReturningString is not used anywhere in the test.
    
    Secondly it seemed from the method that the intent was to test a case
    where layout was declared in a symbol and the method named mention in
    layout returns nil.
    
    That case is already covered with class     class WithSymbolReturningNil .
    
    Also the case of SymbolReturningString is covered with the class
    WithSymbol.

M	actionpack/test/abstract/layouts_test.rb

commit 54b0aeb	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-06-09 01:29:25 +0200

    Indention style + whitespace for readability

M	actionpack/lib/sprockets/railtie.rb

commit 93f30f0	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-06-09 01:28:56 +0200

    If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on

M	actionpack/lib/sprockets/railtie.rb

commit fa6b12a	refs/tags/v3.1.0.rc4
Author: David Heinemeier Hansson 
Date:   2011-06-09 01:29:25 +0200

    Indention style + whitespace for readability

M	actionpack/lib/sprockets/railtie.rb

commit da8ba39	refs/tags/v3.1.0.rc4
Author: David Heinemeier Hansson 
Date:   2011-06-09 01:28:56 +0200

    If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on

M	actionpack/lib/sprockets/railtie.rb

commit fe2482e	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-08 18:50:55 -0400

    require_tree is pretty simple

M	railties/guides/source/asset_pipeline.textile

commit aefd703	refs/tags/v3.1.0.rc3 (tag: v3.1.0.rc3)
Author: Aaron Patterson 
Date:   2011-06-08 14:34:20 -0700

    bumping to 3.1.0.rc3

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 0c1608c	refs/tags/v3.0.9.rc1 (tag: v3.0.9.rc1)
Author: Aaron Patterson 
Date:   2011-06-08 14:17:03 -0700

    bumping to 3.0.9.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 31023da	refs/tags/v3.1.0.rc3
Author: Marian Rudzynski 
Date:   2011-05-26 11:00:27 +0200

    use association_primary_key in AssociationScope#add_constraints
    (cherry picked from commit 1f7c3d02645c6b72e5d1428bc7da6668cdee5fa8)

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb

commit dd3e7a6	refs/heads/master
Author: Bradley Buda 
Date:   2011-06-08 13:54:48 -0700

    Allow a Date to be frozen more than once without an error in Ruby 1.8.x

M	activesupport/lib/active_support/core_ext/date/freeze.rb
M	activesupport/test/core_ext/date_ext_test.rb

commit 8166e4b	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-06-08 16:56:01 -0300

    No need to create a new Arel::Table, as the arel_table method already creates a new one

M	activerecord/lib/active_record/base.rb

commit 266b1bd	refs/heads/master
Author: Bratish Goswami 
Date:   2011-06-08 22:47:25 +0530

    Added acronym and reference link for Model–view–controller

M	README.rdoc

commit 1ae9b29	refs/tags/v3.0.14
Merge: 02e65ef 4b1309e
Author: Aaron Patterson 
Date:   2011-06-08 09:22:37 -0700

    Merge pull request #1568 from sikachu/3-0-stable-mailto
    
    Add proper fix to mail_to helper

commit 5c498fa	refs/tags/v3.1.0.rc3
Merge: 696a94b d2b0605
Author: Aaron Patterson 
Date:   2011-06-08 09:21:39 -0700

    Merge pull request #1566 from sikachu/3-1-stable-changelog
    
    Update CHANGELOG to mention the new SafeBuffer change

commit 4b1309e	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-08 01:51:48 -0400

    Add proper fix to `mail_to` helper.
    
    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`

M	actionpack/lib/action_view/helpers/url_helper.rb

commit f57c707	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-08 12:13:24 -0400

    Revert "Fixed mailto for SafeBuffer#gsub"
    
    It was fixing it in a bad way by changing test.
    
    This reverts commit cdf617e9aaf26f741bcae275ae675d9522d14496.

M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit 696a94b	refs/tags/v3.1.0.rc3
Author: Bhavin Kamani 
Date:   2011-05-21 15:50:25 +0530

    fix connection not established error while running rake task
    db:schema:dump
    (cherry picked from commit e9a2ff8bb7fbc81c35bc6c725d7cf6cb52c53f5a)

M	activerecord/lib/active_record/railties/databases.rake

commit 02e65ef	refs/tags/v3.0.14
Merge: 910b34d 4252a35
Author: Aaron Patterson 
Date:   2011-06-08 09:01:50 -0700

    Merge pull request #1565 from sikachu/3-0-stable-changelog
    
    Update CHANGELOG to mention the new SafeBuffer change

commit 7d537b2	refs/heads/master
Merge: 8bc4771 7ab0600
Author: Aaron Patterson 
Date:   2011-06-08 09:01:45 -0700

    Merge pull request #1564 from sikachu/master-changelog
    
    Update CHANGELOG to mention the new SafeBuffer change

commit d2b0605	refs/tags/v3.1.0.rc3
Author: Prem Sichanugrist 
Date:   2011-06-08 11:47:27 -0400

    Update CHANGELOG to mention the new SafeBuffer change

M	actionpack/CHANGELOG

commit 4252a35	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-08 11:55:12 -0400

    Update CHANGELOG to mention the new SafeBuffer change

M	actionpack/CHANGELOG

commit 7ab0600	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-08 11:47:27 -0400

    Update CHANGELOG to mention the new SafeBuffer change

M	actionpack/CHANGELOG

commit a40833c	refs/tags/v3.1.0.rc3
Merge: abc029d 3451bcb
Author: José Valim 
Date:   2011-06-08 08:14:03 -0700

    Merge pull request #1562 from sikachu/3-1-i18n-convention
    
    Brought back alternative convention for namespaced models in i18n.

commit 3451bcb	refs/tags/v3.1.0.rc3
Author: thoefer 
Date:   2011-06-08 13:40:17 +0200

    Brought back alternative convention for namespaced models in i18n.

M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit abc029d	refs/tags/v3.1.0.rc3
Merge: caa0b1d 4663893
Author: José Valim 
Date:   2011-06-08 08:10:24 -0700

    Merge pull request #1561 from sikachu/3-1-escapejs
    
    Make escape_javascript happy to handle SafeBuffers

commit 8bc4771	refs/heads/master
Merge: b937c76 bf2f039
Author: José Valim 
Date:   2011-06-08 08:08:59 -0700

    Merge pull request #1560 from sikachu/master-escapejs
    
    Make escape_javascript happy to handle SafeBuffers

commit 4663893	refs/tags/v3.1.0.rc3
Author: Paul Gallagher 
Date:   2011-06-08 22:46:15 +0800

    Make escape_javascript happy to handle SafeBuffers
    
    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit bf2f039	refs/heads/master
Author: Paul Gallagher 
Date:   2011-06-08 22:46:15 +0800

    Make escape_javascript happy to handle SafeBuffers
    
    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit b937c76	refs/heads/master
Merge: b64524d 7fff2f9
Author: José Valim 
Date:   2011-06-08 08:05:04 -0700

    Merge pull request #1559 from neerajdotname/before_filter_test
    
    Make test meaningful

commit 910b34d	refs/tags/v3.0.14
Merge: eff72b2 75ecdfb
Author: José Valim 
Date:   2011-06-08 08:01:28 -0700

    Merge pull request #1558 from tardate/3-0-stable
    
    Fix for issue 1553 - escape_javascript to support SafeBuffer strings

commit 7fff2f9	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-08 03:36:45 -0400

    Make test meaningful
    
    If before_filter list was being called mistakenly then
    the test should fail. However test will not fail because
    second filter is assigning new values to @list. To truly
    test that first before_filter is not called when it should
    not be called then @list should not assigned value unconditionally.
    
    This patch will make the test fail if first filter is called.

M	actionpack/test/abstract/callbacks_test.rb

commit 75ecdfb	refs/tags/v3.0.14
Author: Paul Gallagher 
Date:   2011-06-08 22:46:15 +0800

    Make escape_javascript happy to handle SafeBuffers
    
    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 3dacc85	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 19:42:18 +0530

    minor corrections in configuring guide

M	railties/guides/source/configuring.textile

commit caa0b1d	refs/tags/v3.1.0.rc3
Merge: 64a5865 6e9714c
Author: José Valim 
Date:   2011-06-08 06:26:18 -0700

    Merge pull request #1557 from guilleiguaran/multiple-sources-sprockets-3-1
    
    Multiple sources in sprockets helpers (backported from master)

commit 6e9714c	refs/tags/v3.1.0.rc3
Author: Guillermo Iguaran 
Date:   2011-06-05 00:58:37 -0500

    Allow multiple sources in Sprockets helpers

M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/fixtures/sprockets/app/javascripts/extra.js
A	actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
M	actionpack/test/template/sprockets_helper_test.rb

commit b64524d	refs/heads/master
Merge: 8c1762f 0831b7e
Author: José Valim 
Date:   2011-06-08 05:01:24 -0700

    Merge pull request #1556 from thoefer/master
    
    Brought back alternative convention for namespaced models in i18n

commit 0831b7e	refs/heads/master
Author: thoefer 
Date:   2011-06-08 13:40:17 +0200

    Brought back alternative convention for namespaced models in i18n.

M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit eff72b2	refs/tags/v3.0.14
Merge: 2111509 d909693
Author: Jon Leighton 
Date:   2011-06-08 04:40:07 -0700

    Merge pull request #1554 from rsim/assert_queries_oracle_fix_for_3_0
    
    Assert queries oracle fix for 3 0

commit d909693	refs/tags/v3.0.14
Author: Raimonds Simanovskis 
Date:   2011-06-08 13:23:43 +0300

    Fix for Oracle adapter to count SELECT queries for assert_queries assertion
    
    Needed just in 3-0-stable branch, query counting is refactored in 3-1-stable and master branches and do not need this patch anymore.

M	activerecord/test/cases/helper.rb

commit faba406	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-06-08 12:59:54 +0300

    Fixing select[multiple] html specification problem.
    
    Generating hidden input with same name before each multiple select

M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/test/template/form_options_helper_test.rb

commit def4a53	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 15:01:19 +0530

    remove generators section from command line guide in favor of the separate generator guide

M	railties/guides/source/command_line.textile

commit 64a5865	refs/tags/v3.1.0.rc3
Author: Raimonds Simanovskis 
Date:   2011-06-08 11:56:23 +0300

    Do not hardcode :id as it was ignored by mass assignment filter
    
    As a result test was failing on Oracle where ids are assigned by default from 1000

M	activerecord/test/cases/associations/join_model_test.rb

commit 8c1762f	refs/heads/master
Merge: 47ac896 e58ee1d
Author: Xavier Noria 
Date:   2011-06-08 02:13:52 -0700

    Merge pull request #1550 from rsim/fix_test_has_many_with_pluralize_table_names_false
    
    Do not hardcode :id as it was ignored by mass assignment filter

commit e58ee1d	refs/heads/master
Author: Raimonds Simanovskis 
Date:   2011-06-08 11:56:23 +0300

    Do not hardcode :id as it was ignored by mass assignment filter
    
    As a result test was failing on Oracle where ids are assigned by default from 1000

M	activerecord/test/cases/associations/join_model_test.rb

commit 47ac896	refs/heads/master
Merge: 2bf686f 8f3c9e8
Author: José Valim 
Date:   2011-06-08 00:41:55 -0700

    Merge pull request #1549 from neerajdotname/rename_to_method_for_action
    
    test name should reflect the name of the method

commit 2bf686f	refs/heads/master
Merge: c6503f4 cbfdd0d
Author: José Valim 
Date:   2011-06-08 00:30:11 -0700

    Merge pull request #1548 from neerajdotname/remove_class_me5
    
    remove unused class from test

commit 8f3c9e8	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-08 03:05:25 -0400

    test name should reflect the name of the method
    that is actually being called

M	actionpack/test/abstract/abstract_controller_test.rb

commit cbfdd0d	refs/heads/master
Author: Neeraj Singh 
Date:   2011-06-08 02:54:19 -0400

    remove unused class from test

M	actionpack/test/abstract/abstract_controller_test.rb

commit c6503f4	refs/heads/master
Merge: 1852353 1bbc51e
Author: José Valim 
Date:   2011-06-07 23:39:49 -0700

    Merge pull request #1547 from sikachu/safebuffer
    
    Fix ActionPack tests on `master`

commit 1852353	refs/heads/master
Merge: fcccfd7 ef8b12a
Author: José Valim 
Date:   2011-06-07 23:32:03 -0700

    Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer
    
    Don't operate on the safebuffer, operate on a string and convert.

commit 1bbc51e	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-08 02:27:48 -0400

    Fix failing test on uninitialized `Rails.config.assets.prefix`
    
    This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] :bomb:

M	actionpack/test/abstract_unit.rb

commit 9e2e242	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-08 01:51:48 -0400

    Add proper fix to `mail_to` helper.
    
    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
    * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 07f2481	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-08 01:07:39 -0400

    Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform cloning before manipulation only on `OutputBuffer`.
    
    After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 623c16f	refs/tags/v3.1.0.rc3
Merge: 2664897 719e05d
Author: José Valim 
Date:   2011-06-07 23:19:45 -0700

    Merge pull request #1546 from sikachu/31safebuffer
    
    Fix failing ActionPack tests on 3-1-stable

commit fcccfd7	refs/heads/master
Merge: 1d3618a 49dcc4f
Author: José Valim 
Date:   2011-06-07 23:13:10 -0700

    Merge pull request #1535 from smartinez87/each
    
    Prefer 'each' over 'for in' syntax.

commit 719e05d	refs/tags/v3.1.0.rc3
Author: Prem Sichanugrist 
Date:   2011-06-08 01:51:48 -0400

    Add proper fix to `mail_to` helper.
    
    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
    * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.

M	actionpack/lib/action_view/helpers/url_helper.rb

commit 2111509	refs/tags/v3.0.14
Merge: bdc80dd 114b5e4
Author: Aaron Patterson 
Date:   2011-06-07 22:36:08 -0700

    Merge pull request #1545 from sikachu/30testbuffer
    
    Fix test on 3-0-stable regarding SafeBuffer

commit 114b5e4	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-08 01:17:19 -0400

    Adapt [059692a74692917cf1d6bbe4fafe19211f363fe2] to make sure we perform correct cloning before manipulation on `OutputBuffer`.
    
    This has been adapted from [823aa223efbac6ad4d31ea33402892267bb77cb4]. However, after the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit d1a7475	refs/tags/v3.1.0.rc3
Author: Prem Sichanugrist 
Date:   2011-06-08 01:07:39 -0400

    Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform cloning before manipulation only on `OutputBuffer`.
    
    After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 509aa66	refs/tags/v3.1.0.rc3
Author: Prem Sichanugrist 
Date:   2011-06-08 00:25:56 -0400

    Fix `simple_format` helper to work correctly with the new SafeBuffer rule.
    
    This has been ported from `3-0-stable` [ed3796434af6069ced6a641293cf88eef3b284da]

M	actionpack/lib/action_view/helpers/text_helper.rb

commit eb85169	refs/tags/v3.1.0.rc3
Author: Christopher Meiklejohn 
Date:   2011-06-07 22:36:51 -0400

    Fragment caching needs to operate on the pure output, not the
    safebuffer.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 1d3618a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-07 21:39:55 -0300

    remove warning: assigned but unused variable

M	actionpack/lib/action_controller/caching/fragments.rb
M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/lib/action_dispatch/middleware/head.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/lib/action_view/helpers/debug_helper.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/lib/action_view/template/error.rb
M	actionpack/test/dispatch/session/test_session_test.rb
M	actionpack/test/template/html-scanner/document_test.rb
M	actionpack/test/template/record_tag_helper_test.rb
M	actionpack/test/template/render_test.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/text_helper_test.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/base.rb
M	activeresource/test/cases/base/load_test.rb
M	activeresource/test/cases/finder_test.rb
M	activeresource/test/cases/log_subscriber_test.rb
M	activeresource/test/cases/observing_test.rb
M	activesupport/test/test_test.rb

commit f2f63bf	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-06-07 21:35:47 -0300

    ruby-prof doesn't work in 1.9.3

M	Gemfile

commit bdc80dd	refs/tags/v3.0.14
Merge: 54d262f 059692a
Author: Aaron Patterson 
Date:   2011-06-07 20:25:47 -0700

    Merge pull request #1541 from arunagw/3-0-stable
    
    Fixed for SafeBuffer

commit 80edbad	refs/heads/master
Merge: 1300c03 823aa22
Author: Aaron Patterson 
Date:   2011-06-07 20:25:11 -0700

    Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_caching
    
    Fragment caching needs to operate on the pure output, not the safebuffer.

commit ef8b12a	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-06-07 23:07:07 -0400

    Don't operate on the safebuffer, operate on a string and convert.

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 059692a	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-08 08:21:36 +0530

    Cache helper fixed for SafeBuffer

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit cdf617e	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-08 08:16:59 +0530

    Fixed mailto for SafeBuffer#gsub

M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/url_helper_test.rb

commit 823aa22	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-06-07 22:36:51 -0400

    Fragment caching needs to operate on the pure output, not the
    safebuffer.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit 5c53754	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 06:47:22 +0530

    fix generators guide url

M	railties/guides/source/command_line.textile

commit 49dcc4f	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-06-07 21:45:14 -0300

    Prefer 'each' over 'for in' syntax.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 1300c03	refs/heads/master
Author: Michael Koziarski 
Date:   2011-06-08 09:31:03 +1200

    Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
    
    Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.
    
    Conflicts:
    
    	activesupport/test/safe_buffer_test.rb

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 2664897	refs/tags/v3.1.0.rc3
Author: Aaron Patterson 
Date:   2011-06-07 16:48:15 -0700

    bumping to rails 3.1.0.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit a06fec6	refs/tags/v3.1.0.rc3
Author: Michael Koziarski 
Date:   2011-06-08 09:31:03 +1200

    Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
    
    Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.
    
    Conflicts:
    
    	activesupport/test/safe_buffer_test.rb

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 54d262f	refs/tags/v3.0.14
Merge: b3b747d b341e45
Author: Aaron Patterson 
Date:   2011-06-07 16:57:31 -0700

    Merge branch '3-0-8' into 3-0-stable
    
    * 3-0-8:
      bumping to 3.0.8
      Do not modify a safe buffer in helpers
      Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?

commit b341e45	refs/tags/v3.0.8 (tag: v3.0.8)
Author: Aaron Patterson 
Date:   2011-06-07 16:51:58 -0700

    bumping to 3.0.8

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit ed37964	refs/tags/v3.0.8
Author: Bruno Michel 
Date:   2011-05-25 02:42:13 +0200

    Do not modify a safe buffer in helpers
    
    Signed-off-by: Michael Koziarski 

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 53a2c0b	refs/tags/v3.0.8
Author: Michael Koziarski 
Date:   2011-05-16 12:07:20 -0400

    Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
    
    Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit d846f4b	refs/tags/v3.1.0.rc2 (tag: v3.1.0.rc2)
Author: Aaron Patterson 
Date:   2011-06-07 16:48:15 -0700

    bumping to rails 3.1.0.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 6766caf	refs/tags/v3.1.0.rc2
Author: Michael Koziarski 
Date:   2011-06-08 09:31:03 +1200

    Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
    
    Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.
    
    Conflicts:
    
    	activesupport/test/safe_buffer_test.rb

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/safe_buffer_test.rb

commit 18d84e5	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 05:06:58 +0530

    use git: rather than https: in git remote urls; else, github asks for passwords everytime we push

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit e149861	refs/tags/v3.1.0.rc3
Author: Jon Leighton 
Date:   2011-06-08 00:14:27 +0100

    When you add a record to a polymorphic has_one, you should be able to access the owner from the associated record

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/test/cases/associations/join_model_test.rb

commit f5f020b	refs/tags/v3.1.0.rc3
Author: Jon Leighton 
Date:   2011-06-08 00:32:40 +0100

    Allow polymorphic has_one to work when the association is set before the owner has been saved. Fixes #1524.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/associations/join_model_test.rb

commit 7d1782a	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-08 00:32:40 +0100

    Allow polymorphic has_one to work when the association is set before the owner has been saved. Fixes #1524.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/test/cases/associations/join_model_test.rb

commit 4f5f6a3	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-08 00:14:27 +0100

    When you add a record to a polymorphic has_one, you should be able to access the owner from the associated record

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/test/cases/associations/join_model_test.rb

commit e89a253	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 04:53:09 +0530

    minor fixes from 5acf76d

M	railties/guides/source/configuring.textile

commit 7fd8f71	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 04:48:03 +0530

    fix incorrect validation examples

M	railties/guides/source/active_record_validations_callbacks.textile

commit f8cfa7a	refs/heads/master
Merge: a1e78cf a467983
Author: Xavier Noria 
Date:   2011-06-08 00:30:07 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit b7ea35d	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-08 03:43:53 +0530

    fix spacing
    
    Conflicts:
    
    	railties/guides/source/configuring.textile

M	railties/guides/source/configuring.textile

commit f8f00cc	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-08 01:59:21 +0530

    add missing generator configs

M	railties/guides/source/configuring.textile

commit 2cbd024	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-08 00:57:58 +0530

    proof reading and fixes in configuring guide

M	railties/guides/source/configuring.textile

commit da5122e	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-08 01:11:29 +0530

    fix indents and a code error in caching guide

M	railties/guides/source/caching_with_rails.textile

commit a1e78cf	refs/heads/master
Merge: 97036eb 645f003
Author: Xavier Noria 
Date:   2011-06-08 00:22:36 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit a467983	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 03:52:33 +0530

    fix typo

M	actionmailer/lib/action_mailer/base.rb

commit 645f003	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 03:43:53 +0530

    fix spacing

M	railties/guides/source/configuring.textile

commit 97036eb	refs/heads/master
Merge: 2684f17 4c3ec98
Author: Xavier Noria 
Date:   2011-06-07 14:45:36 -0700

    Merge pull request #1533 from alexandrz/master
    
    Fix typo

commit 4c3ec98	refs/heads/master
Author: Alexandr Zykov 
Date:   2011-06-08 03:21:05 +0600

    fix typo

M	activerecord/test/cases/timestamp_test.rb

commit 2684f17	refs/heads/master
Author: Joshua Peek 
Date:   2011-06-07 14:27:57 -0700

    Update asset helpers to use `config.assets.prefix`
    
    Fixes #1489

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 5acf76d	refs/heads/master
Author: Paco Guzman 
Date:   2011-06-07 23:27:09 +0200

    Add action_mailer observer and interceptors configuration options

M	actionmailer/lib/action_mailer/base.rb
M	railties/guides/source/configuring.textile

commit 366ffd8	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 01:59:21 +0530

    add missing generator configs

M	railties/guides/source/configuring.textile

commit dc15a0f	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 00:57:58 +0530

    proof reading and fixes in configuring guide

M	railties/guides/source/configuring.textile

commit 0b09f84	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-08 01:11:29 +0530

    fix indents and a code error in caching guide

M	railties/guides/source/caching_with_rails.textile

commit c00da25	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-07 22:02:36 +0200

    mention assets:clean in railties CHANGELOG

M	railties/CHANGELOG

commit 296ca01	refs/tags/v3.1.0.rc2
Author: Xavier Noria 
Date:   2011-06-07 22:02:36 +0200

    mention assets:clean in railties CHANGELOG

M	railties/CHANGELOG

commit ea8b05c	refs/tags/v3.1.0.rc2
Author: Xavier Noria 
Date:   2011-06-07 21:58:40 +0200

    sprockets gzips assets now
    
    Conflicts:
    
    	railties/lib/rails/tasks/assets.rake

M	railties/lib/rails/tasks/assets.rake

commit 2d41155	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-07 21:58:40 +0200

    sprockets gzips assets now

M	railties/lib/rails/tasks/assets.rake

commit 54f5fb5	refs/tags/v3.1.0.rc2
Author: Dmitriy Kiriyenko 
Date:   2011-06-06 10:30:05 +0300

    Do not use default_scope in ActiveRecord::Persistence#touch.

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/timestamp_test.rb

commit 96711aa	refs/tags/v3.1.0.rc2
Author: Dmitriy Kiriyenko 
Date:   2011-06-06 10:30:34 +0300

    This way asserting that updated_at was changed in touch look more obvious.

M	activerecord/test/cases/timestamp_test.rb

commit 8aabefb	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-06-06 10:30:34 +0300

    This way asserting that updated_at was changed in touch look more obvious.

M	activerecord/test/cases/timestamp_test.rb

commit 7c1f73c	refs/heads/master
Author: Dmitriy Kiriyenko 
Date:   2011-06-06 10:30:05 +0300

    Do not use default_scope in ActiveRecord::Persistence#touch.

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/timestamp_test.rb

commit a995911	refs/tags/v3.1.0.rc2
Merge: 69b25eb 654514a
Author: Aaron Patterson 
Date:   2011-06-07 10:11:26 -0700

    Merge pull request #1528 from chriseppstein/3-1-stable
    
    Update project Gemfile to use the sass-rails rc

commit 654514a	refs/tags/v3.1.0.rc2
Author: Chris Eppstein 
Date:   2011-06-07 10:08:19 -0700

    Use the sass-rails release candidate until full release.

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 69b25eb	refs/tags/v3.1.0.rc2
Merge: 645f138 8d758d8
Author: José Valim 
Date:   2011-06-07 09:41:57 -0700

    Merge pull request #1527 from guilleiguaran/3-1-stable
    
    Rails::Server#app should be nice with Rack::URLMap (3.1 stable)

commit 8d758d8	refs/tags/v3.1.0.rc2
Author: Guillermo Iguaran 
Date:   2011-06-06 15:56:41 -0500

    Fixing Rails::Server#app under Rack::URLMap

M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/server.rb

commit 050d6ef	refs/heads/master
Merge: 72cca79 8496be7
Author: José Valim 
Date:   2011-06-07 09:08:51 -0700

    Merge pull request #1516 from guilleiguaran/rack-urlmap-fix
    
    Rails::Server#app should be nice with Rack::URLMap

commit 8496be7	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-06 15:56:41 -0500

    Fixing Rails::Server#app under Rack::URLMap

M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/server.rb

commit 2e07c71	refs/heads/master
Author: Raghunadh 
Date:   2011-06-07 19:00:36 +0530

    rafactored the regex related code in the mapper class

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 331d58f	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 14:07:32 +0200

    Prepend bundle exec to get the correct Rake version

M	railties/test/railties/shared_tests.rb

commit 246c367	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 12:16:05 +0200

    Use RAILS_ISOLATED_ENGINE and fix namespaced generators tests

M	railties/test/abstract_unit.rb
M	railties/test/generators/namespaced_generators_test.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/generators_test.rb

commit 645f138	refs/tags/v3.1.0.rc2
Author: Xavier Noria 
Date:   2011-06-07 12:06:02 +0200

    adds missing require

M	railties/lib/rails/railtie/configurable.rb

commit 72cca79	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-07 12:06:02 +0200

    adds missing require

M	railties/lib/rails/railtie/configurable.rb

commit 8ea90ff	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 11:36:11 +0200

    Use mattr_accessor :namespace

M	railties/lib/rails/generators.rb
M	railties/test/railties/generators_test.rb

commit 64f337e	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 11:26:38 +0200

    Don't create full Rails application if RAILS_ISOLATION_COMMAND equals engine

M	railties/test/isolation/abstract_unit.rb

commit f182831	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 11:21:38 +0200

    Use namespace if it's a mountable engine

M	railties/lib/rails/engine/commands.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/railtie.rb
M	railties/test/railties/generators_test.rb

commit 1a06530	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 10:23:45 +0200

    Added regression tests

M	railties/test/railties/generators_test.rb

commit ad9586b	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-07 08:35:08 +0100

    Fix a couple of helper requires that were missed. This was causing the tests to fail to run on 1.8.7.

M	activerecord/test/cases/adapters/postgresql/timestamp_test.rb
M	activerecord/test/cases/fixtures/file_test.rb

commit 4021639	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 09:33:17 +0200

    Move test/engine/generators_test.rb to test/railties/generators_test.rb

D	railties/test/engine/generators_test.rb
A	railties/test/railties/generators_test.rb

commit 5afd83c	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 09:31:07 +0200

    Add test for helper generator

M	railties/test/engine/generators_test.rb

commit a60624d	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-06-07 09:16:15 +0200

    Clean up engine's generator test and use bundle exec for invoking generators

M	railties/test/engine/generators_test.rb

commit e32e8ed	refs/heads/master
Merge: 80451a1 5f66f7a
Author: José Valim 
Date:   2011-06-07 00:14:42 -0700

    Merge pull request #1474 from ganeshkumar/update_column_changes
    
    added  tests for update_column

commit 7761670	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-06 17:23:11 +1000

    Clean up engine generators_test code and add test for models correctly namespaced

M	railties/test/engine/generators_test.rb

commit 32d35ba	refs/heads/master
Author: Ryan Bigg 
Date:   2011-06-06 17:17:37 +1000

    Add beginnings of test for generators within the context of an engine

A	railties/test/engine/generators_test.rb

commit a2a3413	refs/tags/v2.3.12 (tag: v2.3.12)
Author: Aaron Patterson 
Date:   2011-06-06 20:22:47 -0700

    find the spec from the source index, then activate it

M	railties/lib/rails/gem_dependency.rb

commit 80451a1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 18:01:11 -0700

    make sure AR isolated tests set the environment variable

M	activerecord/Rakefile

commit 377b15a	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 18:01:11 -0700

    make sure AR isolated tests set the environment variable

M	activerecord/Rakefile

commit b3b747d	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 18:01:11 -0700

    make sure AR isolated tests set the environment variable

M	activerecord/Rakefile

commit a6c5cc2	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-06-07 02:39:44 +0200

    Added missing assert to test checking form with namespaced isolated model and fixed helpers to work correctly in such case

M	actionpack/lib/action_controller/record_identifier.rb
M	actionpack/test/template/form_helper_test.rb

commit cd27cd5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 16:59:51 -0700

    oops! add parens so the block is properly bound

M	activerecord/Rakefile

commit 1f02e3e	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 16:59:51 -0700

    oops! add parens so the block is properly bound

M	activerecord/Rakefile

commit 75fb26a	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 16:59:51 -0700

    oops! add parens so the block is properly bound

M	activerecord/Rakefile

commit f8301eb	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 16:51:28 -0700

    set the environment variable from the rake file

M	activerecord/Rakefile
D	activerecord/test/connections/db2.rb
D	activerecord/test/connections/firebird.rb
D	activerecord/test/connections/frontbase.rb
D	activerecord/test/connections/jdbcderby.rb
D	activerecord/test/connections/jdbch2.rb
D	activerecord/test/connections/jdbchsqldb.rb
D	activerecord/test/connections/jdbcmysql.rb
D	activerecord/test/connections/jdbcpostgresql.rb
D	activerecord/test/connections/jdbcsqlite3.rb
D	activerecord/test/connections/mysql.rb
D	activerecord/test/connections/mysql2.rb
D	activerecord/test/connections/openbase.rb
D	activerecord/test/connections/oracle.rb
D	activerecord/test/connections/postgresql.rb
D	activerecord/test/connections/sqlite3.rb
D	activerecord/test/connections/sqlite3_mem.rb
D	activerecord/test/connections/sybase.rb

commit 8392f10	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 16:51:28 -0700

    set the environment variable from the rake file

M	activerecord/Rakefile
D	activerecord/test/connections/db2.rb
D	activerecord/test/connections/firebird.rb
D	activerecord/test/connections/frontbase.rb
D	activerecord/test/connections/jdbcderby.rb
D	activerecord/test/connections/jdbch2.rb
D	activerecord/test/connections/jdbchsqldb.rb
D	activerecord/test/connections/jdbcmysql.rb
D	activerecord/test/connections/jdbcpostgresql.rb
D	activerecord/test/connections/jdbcsqlite3.rb
D	activerecord/test/connections/mysql.rb
D	activerecord/test/connections/mysql2.rb
D	activerecord/test/connections/openbase.rb
D	activerecord/test/connections/oracle.rb
D	activerecord/test/connections/postgresql.rb
D	activerecord/test/connections/sqlite3.rb
D	activerecord/test/connections/sqlite3_mem.rb
D	activerecord/test/connections/sybase.rb

commit 945b131	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 16:51:28 -0700

    set the environment variable from the rake file

M	activerecord/Rakefile
D	activerecord/test/connections/db2.rb
D	activerecord/test/connections/firebird.rb
D	activerecord/test/connections/frontbase.rb
D	activerecord/test/connections/jdbcderby.rb
D	activerecord/test/connections/jdbch2.rb
D	activerecord/test/connections/jdbchsqldb.rb
D	activerecord/test/connections/jdbcmysql.rb
D	activerecord/test/connections/jdbcpostgresql.rb
D	activerecord/test/connections/jdbcsqlite3.rb
D	activerecord/test/connections/mysql.rb
D	activerecord/test/connections/mysql2.rb
D	activerecord/test/connections/openbase.rb
D	activerecord/test/connections/oracle.rb
D	activerecord/test/connections/postgresql.rb
D	activerecord/test/connections/sqlite3.rb
D	activerecord/test/connections/sqlite3_mem.rb
D	activerecord/test/connections/sybase.rb

commit f0cb0ed	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 15:35:35 -0700

    more oracle fixes

M	activerecord/test/config.example.yml

commit 3f3648c	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 15:35:30 -0700

    do not muck with the load path, that is the test task responsibility

M	activerecord/test/cases/helper.rb

commit e6c2d54	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 15:16:52 -0700

    updating configs for oracle

M	activerecord/test/config.example.yml
M	activerecord/test/connections/oracle.rb

commit 29c7258	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 11:43:50 -0700

    add test to the include path

M	activerecord/Rakefile

commit 1241997	refs/tags/v3.0.14
Author: Aaron Patterson 
Date:   2011-06-06 15:50:50 -0700

    please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/firebird/connection_test.rb
M	activerecord/test/cases/adapters/firebird/default_test.rb
M	activerecord/test/cases/adapters/firebird/migration_test.rb
M	activerecord/test/cases/adapters/mysql/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql/sp_test.rb
M	activerecord/test/cases/adapters/mysql2/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/adapters/oracle/synonym_test.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/adapters/sqlite/sqlite_adapter_test.rb
M	activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/ar_schema_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/callbacks_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/column_alias_test.rb
M	activerecord/test/cases/column_definition_test.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/counter_cache_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/database_statements_test.rb
M	activerecord/test/cases/date_time_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activerecord/test/cases/deprecated_finder_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/cases/i18n_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/lifecycle_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/mixin_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/multiple_db_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/reload_models_test.rb
M	activerecord/test/cases/sanitize_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/session_store/session_test.rb
M	activerecord/test/cases/session_store/sql_bypass.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/transaction_callbacks_test.rb
M	activerecord/test/cases/transactions_test.rb
M	activerecord/test/cases/unconnected_test.rb
M	activerecord/test/cases/validations/association_validation_test.rb
M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb

commit 424cf3b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 15:35:35 -0700

    more oracle fixes

M	activerecord/test/config.example.yml

commit 517ca87	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 15:35:30 -0700

    do not muck with the load path, that is the test task responsibility

M	activerecord/test/cases/helper.rb

commit 841d296	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 15:16:52 -0700

    updating configs for oracle

M	activerecord/test/config.example.yml
M	activerecord/test/connections/oracle.rb

commit c8d124c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 11:43:50 -0700

    add test to the include path

M	activerecord/Rakefile

commit 61774e0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 11:17:44 -0700

    please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/firebird/connection_test.rb
M	activerecord/test/cases/adapters/firebird/default_test.rb
M	activerecord/test/cases/adapters/firebird/migration_test.rb
M	activerecord/test/cases/adapters/mysql/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql/quoting_test.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql/sp_test.rb
M	activerecord/test/cases/adapters/mysql2/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb
M	activerecord/test/cases/adapters/oracle/synonym_test.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/quoting_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/ar_schema_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/callbacks_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/identity_map_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/cases/bind_parameter_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/clone_test.rb
M	activerecord/test/cases/coders/yaml_column_test.rb
M	activerecord/test/cases/column_alias_test.rb
M	activerecord/test/cases/column_definition_test.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/counter_cache_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/database_statements_test.rb
M	activerecord/test/cases/date_time_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activerecord/test/cases/deprecated_finder_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/dup_test.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/cases/i18n_test.rb
M	activerecord/test/cases/identity_map/middleware_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activerecord/test/cases/invertible_migration_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/lifecycle_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/migration/command_recorder_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/mixin_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/multiple_db_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/quoting_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/reload_models_test.rb
M	activerecord/test/cases/sanitize_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/session_store/session_test.rb
M	activerecord/test/cases/session_store/sql_bypass.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/transaction_callbacks_test.rb
M	activerecord/test/cases/transactions_test.rb
M	activerecord/test/cases/unconnected_test.rb
M	activerecord/test/cases/validations/association_validation_test.rb
M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb

commit 606108a	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 15:35:35 -0700

    more oracle fixes

M	activerecord/test/config.example.yml

commit 50d331d	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 15:35:30 -0700

    do not muck with the load path, that is the test task responsibility

M	activerecord/test/cases/helper.rb

commit 10eb479	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 15:16:52 -0700

    updating configs for oracle

M	activerecord/test/config.example.yml
M	activerecord/test/connections/oracle.rb

commit b8714ed	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 11:43:50 -0700

    add test to the include path

M	activerecord/Rakefile

commit e504101	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-06-06 11:17:44 -0700

    please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/firebird/connection_test.rb
M	activerecord/test/cases/adapters/firebird/default_test.rb
M	activerecord/test/cases/adapters/firebird/migration_test.rb
M	activerecord/test/cases/adapters/mysql/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql/quoting_test.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql/sp_test.rb
M	activerecord/test/cases/adapters/mysql2/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb
M	activerecord/test/cases/adapters/oracle/synonym_test.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/quoting_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/ar_schema_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/callbacks_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/identity_map_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/cases/bind_parameter_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/clone_test.rb
M	activerecord/test/cases/coders/yaml_column_test.rb
M	activerecord/test/cases/column_alias_test.rb
M	activerecord/test/cases/column_definition_test.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/counter_cache_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/database_statements_test.rb
M	activerecord/test/cases/date_time_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activerecord/test/cases/deprecated_finder_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/dup_test.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/cases/i18n_test.rb
M	activerecord/test/cases/identity_map/middleware_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activerecord/test/cases/invertible_migration_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/lifecycle_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/migration/command_recorder_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/mixin_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/multiple_db_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/quoting_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/reload_models_test.rb
M	activerecord/test/cases/sanitize_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/session_store/session_test.rb
M	activerecord/test/cases/session_store/sql_bypass.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/transaction_callbacks_test.rb
M	activerecord/test/cases/transactions_test.rb
M	activerecord/test/cases/unconnected_test.rb
M	activerecord/test/cases/validations/association_validation_test.rb
M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb

commit 95f3046	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-07 02:03:23 +0530

    add info about docrails policy on changelogs

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 6cf4588	refs/heads/master
Merge: 445c060 1f27253
Author: Xavier Noria 
Date:   2011-06-06 22:50:09 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit fa1aad7	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-07 01:38:03 +0530

    comment the recorder methods

M	activerecord/lib/active_record/migration/command_recorder.rb

commit 59016b9	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-07 01:23:08 +0530

    up and down are no longer class methods in a migration

M	activerecord/lib/active_record/migration.rb

commit 7262d92	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-07 01:00:07 +0530

    rearrange sections of the commandline guide giving more importance to rake tasks

M	railties/guides/source/command_line.textile

commit 3962d94	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-07 00:16:43 +0530

    document assets related rake tasks

M	railties/guides/source/command_line.textile

commit b6826be	refs/tags/v3.1.0.rc2
Author: Mariusz Pękala 
Date:   2011-06-06 11:51:18 +0200

    Validations guide: order of :after_save callback was incorrect.
    
    The guide was contracting itself. First it stated that 'there is a list
    of callbacks in order of execution', on the list 'after_save' was placed
    before 'after_create', and then there was a warning that 'after_save'
    runs after them. I am not sure about 'around_' callbacks, but let's
    leave that for another patch.

M	railties/guides/source/active_record_validations_callbacks.textile

commit c1ce168	refs/tags/v3.1.0.rc2
Author: Guillermo Iguaran 
Date:   2011-06-05 20:36:09 -0700

    Change http://api.rubyonrails.com to http://api.rubyonrails.org

M	railties/guides/source/active_record_basics.textile

commit 5d4b73a	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-06 02:10:31 +0530

    minor edits in migrations guide

M	railties/guides/source/migrations.textile

commit 47670a5	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-05 21:44:04 +0530

    annotate class_eval method for active resource schema attributes

M	activeresource/lib/active_resource/schema.rb

commit 527499c	refs/tags/v3.1.0.rc2
Author: Guillermo Iguaran 
Date:   2011-06-05 10:34:40 -0500

    Remove trailing white-spaces

M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_view/buffers.rb
M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/testing/resolvers.rb
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activesupport/lib/active_support/core_ext/kernel/reporting.rb
M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/mri.rb
M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/profiler.rb
M	railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
M	railties/lib/rails/generators/rails/assets/USAGE
M	railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb

commit 670ae12	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-05 00:58:21 +0530

    correct code indendation in the initialization guide

M	railties/guides/source/initialization.textile

commit 3432775	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-04 23:51:00 +0530

    s/ActiveRecord/Active Record according to api guidelines

M	railties/guides/source/caching_with_rails.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/i18n.textile

commit b1919b1	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-04 20:44:11 +0530

    minor corrections in generators guide

M	railties/guides/source/generators.textile

commit 2974869	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-04 20:28:16 +0530

    fix incorrect module name for wrap parameters

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit dff7c62	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-04 20:11:44 +0530

    some grammatical corrections

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit 0e8857b	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-04 19:56:40 +0530

    fix incorrect output

M	activemodel/lib/active_model/errors.rb

commit f9087ee	refs/tags/v3.1.0.rc2
Author: Alberto Perdomo 
Date:   2011-06-04 14:26:40 +0100

    Fixed order of parameters in assert_equal call examples, first expected, then actual object.

M	railties/guides/source/testing.textile

commit 9726ed8	refs/tags/v3.1.0.rc2
Author: Rohit Arondekar 
Date:   2011-06-03 21:54:33 -0700

    Upcoming version of Rails is upon us so no need to refer to it. [API DOCS]

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 424d725	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-04 02:11:43 +0530

    use clearer variable name in examples

M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/serializers/xml.rb

commit d57cfc1	refs/tags/v3.1.0.rc2
Author: Waynn Lue 
Date:   2011-06-03 12:26:53 -0700

    add a missing "the" and normalize the use of periods.

M	activerecord/README.rdoc

commit eade591	refs/tags/v3.1.0.rc2
Author: Prem Sichanugrist 
Date:   2011-06-03 15:06:03 -0400

    Revise documentation indentation from [79990505e5080804b53d81fec059136afa2237d7]

M	activerecord/CHANGELOG

commit 5e44184	refs/tags/v3.1.0.rc2
Author: ganesh 
Date:   2011-06-04 00:31:45 +0530

    updated Changelog

M	activerecord/CHANGELOG

commit f7ac354	refs/tags/v3.1.0.rc2
Author: Linux on Rails 
Date:   2011-06-03 03:01:41 -0700

    FIXED: error with url_for & link_to when we have nested resources.

M	railties/guides/source/routing.textile

commit 69b3c9c	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-03 14:25:13 +0530

    remove stray (

M	activemodel/lib/active_model/validations/length.rb

commit 40e7682	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-03 14:13:04 +0530

    fix indentation, fixed-width for nils

M	railties/guides/source/configuring.textile

commit 50a7391	refs/tags/v3.1.0.rc2
Author: brianp 
Date:   2011-06-02 15:03:36 -0700

    Fixed sections regarding validations and callbacks to mention the touch method does not fire either validations or callbacks as stated in the docs.

M	railties/guides/source/active_record_validations_callbacks.textile

commit f4a4d5f	refs/tags/v3.1.0.rc2
Author: Ben Orenstein 
Date:   2011-06-02 17:33:48 -0400

    Change hashrocket spacing to match conventions.

M	activemodel/lib/active_model/validations/length.rb

commit f51cea6	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-06-02 01:10:11 +0530

    add alias info for runner command

M	railties/lib/rails/commands.rb

commit 6ad8f6e	refs/tags/v3.1.0.rc2
Author: Ayose 
Date:   2011-06-01 12:36:16 -0700

    Edited activerecord/lib/active_record/transactions.rb via GitHub

M	activerecord/lib/active_record/transactions.rb

commit 700fd6d	refs/tags/v3.1.0.rc2
Author: Ayose 
Date:   2011-06-01 08:47:06 -0700

    The URL http://dev.mysql.com/doc/refman/5.0/en/savepoints.html is no longer available

M	activerecord/lib/active_record/transactions.rb

commit 6f3d997	refs/tags/v3.1.0.rc2
Author: Akira Matsuda 
Date:   2011-06-01 17:48:09 +0900

    s/a/an/

M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/getting_started.textile

commit 4c716e6	refs/tags/v3.1.0.rc2
Author: Akira Matsuda 
Date:   2011-06-01 17:19:23 +0900

    s/an/a/

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 48b9096	refs/tags/v3.1.0.rc2
Author: Guillermo Iguaran 
Date:   2011-05-31 20:55:50 -0700

    Removing trailing white-spaces

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 8ac4e4d	refs/tags/v3.1.0.rc2
Author: Mark Roghelia 
Date:   2011-05-31 18:41:20 -0400

    The example in the API docs incorrectly indicated that form_for would use the same default route for both new and previously persisted records.  The default path given in the example would have generated a routing error for new records.  form_for actually uses polymorphic_path to determine which route to use based on the state of the record.  The example has been updated to reflect the method's actual behavior.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 7ff491c	refs/tags/v3.1.0.rc2
Author: Hendy Tanata 
Date:   2011-05-31 17:04:16 +0800

    Fix punctuation.

M	railties/guides/source/api_documentation_guidelines.textile

commit 2e7a039	refs/tags/v3.1.0.rc2
Author: Hendy Tanata 
Date:   2011-05-31 16:51:55 +0800

    Update Rails coding conventions link.

M	railties/guides/source/api_documentation_guidelines.textile

commit 3a22027	refs/tags/v3.1.0.rc2
Author: Evan Farrar 
Date:   2011-05-29 11:25:37 -0400

    Typo and sentence restructuring

M	railties/guides/source/active_support_core_extensions.textile

commit 5ab4b9e	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-05-29 18:35:42 +0530

    removed references to old remote_* helpers; add info about 3.1 adding multipart option to a form with file_field automatically

M	railties/guides/source/action_view_overview.textile

commit 39e5cbc	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-05-29 01:33:30 +0530

    fix typo

M	railties/guides/source/command_line.textile

commit 1d654cc	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-05-28 23:18:08 +0530

    document aliases for commands and update rails versions

M	railties/guides/source/command_line.textile

commit 8b72166	refs/tags/v3.1.0.rc2
Author: Ben Orenstein 
Date:   2011-05-27 22:05:22 -0400

    Fix incorrect description of the returned results.

M	railties/guides/source/active_record_querying.textile

commit 97fd8c0	refs/tags/v3.1.0.rc2
Author: Ben Orenstein 
Date:   2011-05-26 22:22:10 -0400

    Copy edits 64148ab96b47a9904fdd839bc69971b4e156bb04 (previous commit). Please squash at will.

M	railties/guides/source/active_record_querying.textile

commit 5eaf012	refs/tags/v3.1.0.rc2
Author: Ben Orenstein 
Date:   2011-05-26 22:19:10 -0400

    Improve 'Joining Tables' section with additional examples and explanation.

M	railties/guides/source/active_record_querying.textile

commit 7dcbbae	refs/tags/v3.1.0.rc2
Author: Ben Orenstein 
Date:   2011-05-26 20:52:22 -0400

    Don't you lie to me!

M	railties/guides/source/active_record_querying.textile

commit c32ba39	refs/tags/v3.1.0.rc2
Author: Sebastian Martinez 
Date:   2011-05-26 17:51:20 -0300

    Fix font styling on associations.rb

M	activerecord/lib/active_record/associations.rb

commit 9d275a8	refs/tags/v3.1.0.rc2
Author: diego 
Date:   2011-05-26 15:24:33 +0200

    Added missing quote in grouped_options_for_select example

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 64db0ee	refs/tags/v3.1.0.rc2
Author: Thais Camilo 
Date:   2011-05-25 20:45:44 -0400

    Stop linking Rails guidelines to GitHub wiki

M	railties/guides/source/contribute.textile

commit e856157	refs/tags/v3.1.0.rc2
Author: Thais Camilo 
Date:   2011-05-25 20:27:17 -0400

    Stop linking API Guidelines to GitHub wiki

M	railties/guides/source/contribute.textile

commit 8c358d0	refs/tags/v3.1.0.rc2
Author: Thais Camilo 
Date:   2011-05-25 20:18:58 -0400

    On "contribute" guide: remove mention of LH

M	railties/guides/source/contribute.textile

commit 20f1f9e	refs/tags/v3.1.0.rc2
Author: Sebastian Martinez 
Date:   2011-05-25 20:13:49 -0300

    Revert this, commited by mistake.

M	railties/guides/source/initialization.textile

commit 815dd81	refs/tags/v3.1.0.rc2
Author: Sebastian Martinez 
Date:   2011-05-25 20:09:06 -0300

    Fix grammar mistake. Lets vs let's.

M	railties/guides/source/configuring.textile

commit e5fb901	refs/tags/v3.1.0.rc2
Author: Sebastian Martinez 
Date:   2011-05-25 20:03:06 -0300

    Fix fixed-fonts stlye on rails_on_rack guide.

M	railties/guides/source/initialization.textile
M	railties/guides/source/rails_on_rack.textile

commit 1f27253	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-07 02:03:23 +0530

    add info about docrails policy on changelogs

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 445c060	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-06 20:45:28 +0100

    Don't ensure all keys in build_results are only written once, otherwise we get false positive builds reported.

M	ci/ci_build.rb

commit 499dec0	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-06 20:37:23 +0100

    Make sure that the build/drop database rake tasks take account of the test/config.yml config

M	activerecord/Rakefile

commit 0a4eb26	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-06 20:37:23 +0100

    Make sure that the build/drop database rake tasks take account of the test/config.yml config

M	activerecord/Rakefile

commit d7edce2	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-06 20:45:28 +0100

    Don't ensure all keys in build_results are only written once, otherwise we get false positive builds reported.

M	ci/ci_build.rb

commit dc4da12	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-06 20:37:23 +0100

    Make sure that the build/drop database rake tasks take account of the test/config.yml config

M	activerecord/Rakefile

commit 5e21247	refs/heads/master
Merge: 38ad6bb 689e12b
Author: Xavier Noria 
Date:   2011-06-06 22:23:30 +0200

    Merge branch 'master' of git://github.com/lifo/docrails
    
    Conflicts:
    	activerecord/RUNNING_UNIT_TESTS

commit 689e12b	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-06 22:12:34 +0200

    Revert "updated Changelog "
    
    This reverts commit 79990505e5080804b53d81fec059136afa2237d7.
    
    Conflicts:
    
    	activerecord/CHANGELOG
    
    Reason: Sorry, CHANGELOGs can't be edited via docrails.

M	activerecord/CHANGELOG

commit 5d8df14	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-07 01:38:03 +0530

    comment the recorder methods

M	activerecord/lib/active_record/migration/command_recorder.rb

commit 428883b	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-07 01:23:08 +0530

    up and down are no longer class methods in a migration

M	activerecord/lib/active_record/migration.rb

commit c5786a9	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-07 01:00:07 +0530

    rearrange sections of the commandline guide giving more importance to rake tasks

M	railties/guides/source/command_line.textile

commit 660fb14	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-07 00:16:43 +0530

    document assets related rake tasks

M	railties/guides/source/command_line.textile

commit 7497d27	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-06 17:47:34 +0100

    Fix double definition of #teardown. Thanks @mike-burns :+1:

M	railties/test/application/configuration_test.rb

commit 5ffd03f	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-06 17:46:30 +0100

    Fix another CIfail :zap: :fire: Deleting RAILS_ENV from ENV doesn't produce the desired result if RACK_ENV is still defined. And in any case it's better to be explicit here, so just set RALS_ENV=development.

M	railties/test/isolation/abstract_unit.rb

commit 4a39581	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-06 17:47:34 +0100

    Fix double definition of #teardown. Thanks @mike-burns :+1:

M	railties/test/application/configuration_test.rb

commit fe2b411	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-06 17:46:30 +0100

    Fix another CIfail :zap: :fire: Deleting RAILS_ENV from ENV doesn't produce the desired result if RACK_ENV is still defined. And in any case it's better to be explicit here, so just set RALS_ENV=development.

M	railties/test/isolation/abstract_unit.rb

commit 38ad6bb	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-06 17:47:34 +0100

    Fix double definition of #teardown. Thanks @mike-burns :+1:

M	railties/test/application/configuration_test.rb

commit afe1911	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-06 17:46:30 +0100

    Fix another CIfail :zap: :fire: Deleting RAILS_ENV from ENV doesn't produce the desired result if RACK_ENV is still defined. And in any case it's better to be explicit here, so just set RALS_ENV=development.

M	railties/test/isolation/abstract_unit.rb

commit fe5a6ec	refs/heads/master
Author: Aaron Patterson 
Date:   2011-06-06 09:52:34 -0700

    remove call to source index

M	load_paths.rb

commit 73b64bc	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-06-06 18:37:35 +0200

    Use Latest Sprockets beta

M	actionpack/actionpack.gemspec

commit 50a7e8e	refs/tags/v3.1.0.rc2
Author: David Heinemeier Hansson 
Date:   2011-06-06 18:29:07 +0200

    Depend on latest Sprockets beta

M	actionpack/actionpack.gemspec

commit d55cf30	refs/tags/v3.0.14
Merge: 6512af2 bbfd652
Author: Aaron Patterson 
Date:   2011-06-06 08:44:54 -0700

    Merge pull request #1511 from vijaydev/rake_rdoc_fixes_cherry_picks_3_0
    
    Rake rdoc fixes cherry picks for 3-0-stable

commit bbfd652	refs/tags/v3.0.14
Author: Vijay Dev 
Date:   2011-06-06 20:59:38 +0530

    cherry picked 05adf524 for 3-0-stable. Original Author: amatsuda

M	Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit 81b01b7	refs/tags/v3.0.14
Author: Vijay Dev 
Date:   2011-06-06 20:37:44 +0530

    cherry picked 24b28a2 for 3-0-stable. Original Author: amatsuda

M	Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit 91bdd36	refs/tags/v3.0.14
Author: Vijay Dev 
Date:   2011-06-06 20:31:05 +0530

    fixes Rake::RDocTask deprecation warnings from rake 0.9.0 (cherry picked
    b921679 for 3-0-stable)

M	railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit 13c8ed3	refs/tags/v3.0.14
Author: Vijay Dev 
Date:   2011-05-24 23:38:11 +0530

    fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0

M	actionmailer/Rakefile
M	actionpack/Rakefile
M	activemodel/Rakefile
M	activerecord/Rakefile
M	activeresource/Rakefile
M	activesupport/Rakefile
M	railties/Rakefile

commit 6512af2	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-06 13:54:05 +0100

    Solve the RAILS_ENV problem in the railties tests in a more generic way

M	railties/test/application/configuration_test.rb
M	railties/test/application/console_test.rb
M	railties/test/application/generators_test.rb
M	railties/test/application/initializers/boot_test.rb
M	railties/test/application/initializers/check_ruby_version_test.rb
M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/initializers/hooks_test.rb
M	railties/test/application/initializers/i18n_test.rb
M	railties/test/application/initializers/load_path_test.rb
M	railties/test/application/initializers/notifications_test.rb
M	railties/test/application/loading_test.rb
M	railties/test/application/middleware_test.rb
M	railties/test/application/paths_test.rb
M	railties/test/application/rackup_test.rb
M	railties/test/application/rake_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/application/runner_test.rb
M	railties/test/application/test_test.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/plugin_ordering_test.rb
M	railties/test/railties/plugin_test.rb
M	railties/test/railties/railtie_test.rb

commit 1f59c57	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-06 13:54:05 +0100

    Solve the RAILS_ENV problem in the railties tests in a more generic way

M	railties/test/application/assets_test.rb
M	railties/test/application/configuration_test.rb
M	railties/test/application/console_test.rb
M	railties/test/application/generators_test.rb
M	railties/test/application/initializers/boot_test.rb
M	railties/test/application/initializers/check_ruby_version_test.rb
M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/initializers/hooks_test.rb
M	railties/test/application/initializers/i18n_test.rb
M	railties/test/application/initializers/load_path_test.rb
M	railties/test/application/initializers/notifications_test.rb
M	railties/test/application/loading_test.rb
M	railties/test/application/middleware/best_practices_test.rb
M	railties/test/application/middleware/cache_test.rb
M	railties/test/application/middleware/remote_ip_test.rb
M	railties/test/application/middleware/sendfile_test.rb
M	railties/test/application/middleware/show_exceptions_test.rb
M	railties/test/application/middleware_test.rb
M	railties/test/application/paths_test.rb
M	railties/test/application/rack/logger_test.rb
M	railties/test/application/rackup_test.rb
M	railties/test/application/rake_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/application/runner_test.rb
M	railties/test/application/test_test.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/mounted_engine_test.rb
M	railties/test/railties/plugin_ordering_test.rb
M	railties/test/railties/plugin_test.rb
M	railties/test/railties/railtie_test.rb

commit 62570e8	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-06 13:54:05 +0100

    Solve the RAILS_ENV problem in the railties tests in a more generic way

M	railties/test/application/assets_test.rb
M	railties/test/application/configuration_test.rb
M	railties/test/application/console_test.rb
M	railties/test/application/generators_test.rb
M	railties/test/application/initializers/boot_test.rb
M	railties/test/application/initializers/check_ruby_version_test.rb
M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/initializers/hooks_test.rb
M	railties/test/application/initializers/i18n_test.rb
M	railties/test/application/initializers/load_path_test.rb
M	railties/test/application/initializers/notifications_test.rb
M	railties/test/application/loading_test.rb
M	railties/test/application/middleware/best_practices_test.rb
M	railties/test/application/middleware/cache_test.rb
M	railties/test/application/middleware/remote_ip_test.rb
M	railties/test/application/middleware/sendfile_test.rb
M	railties/test/application/middleware/show_exceptions_test.rb
M	railties/test/application/middleware_test.rb
M	railties/test/application/paths_test.rb
M	railties/test/application/rack/logger_test.rb
M	railties/test/application/rackup_test.rb
M	railties/test/application/rake_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/application/runner_test.rb
M	railties/test/application/test_test.rb
M	railties/test/isolation/abstract_unit.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/mounted_engine_test.rb
M	railties/test/railties/plugin_ordering_test.rb
M	railties/test/railties/plugin_test.rb
M	railties/test/railties/railtie_test.rb

commit 1bc159f	refs/tags/v3.1.0.rc2
Merge: ae534f2 f3fa66f
Author: José Valim 
Date:   2011-06-06 05:27:51 -0700

    Merge pull request #1508 from vijaydev/rake_rdoc_fixes_cherry_picks
    
    Rake deprecation fixes - cherry picks

commit f3fa66f	refs/tags/v3.1.0.rc2
Author: Akira Matsuda 
Date:   2011-05-26 01:37:34 +0900

    Ensure RDoc::Task exists even if 'rdoc/task' was not required

M	Rakefile
M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit 84fac20	refs/tags/v3.1.0.rc2
Author: Akira Matsuda 
Date:   2011-05-26 00:15:23 +0900

    require 'rake/rdoctask' if failed to require 'rdoc/task'
    
    fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5
    require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)

M	Rakefile
M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit e9b025e	refs/tags/v3.0.14
Merge: 1debebc 101f0a6
Author: José Valim 
Date:   2011-06-06 04:00:53 -0700

    Merge pull request #1506 from arunagw/3-0-stable
    
    Cherry-picked from master to fix the build

commit ae534f2	refs/tags/v3.1.0.rc2
Merge: 0c4fd88 e909fa4
Author: José Valim 
Date:   2011-06-06 03:53:01 -0700

    Merge pull request #1505 from arunagw/3-1-stable
    
    Cherry-picked from master to fix the build

commit 2d3ba54	refs/heads/master
Merge: 38b97d2 5d78d81
Author: José Valim 
Date:   2011-06-06 03:52:34 -0700

    Merge pull request #1504 from arunagw/console_test_for_ci_server
    
    Fix for CI server. Dependent on RAILS_ENV=development

commit e909fa4	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-06 16:13:22 +0530

    Fix for CI server. Dependent on RAILS_ENV=development

M	railties/test/application/console_test.rb

commit 077ffe0	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-06 00:55:24 +0530

    loading_test.rb with RAILS_ENV=development

M	railties/test/application/loading_test.rb

commit 710dfff	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-05 23:40:30 +0530

    framework_test.rb also dependent on RAILS_ENV=development

M	railties/test/application/initializers/frameworks_test.rb

commit 101f0a6	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-06 16:17:53 +0530

    Fix for CI server. Dependent on RAILS_ENV=development

M	railties/test/application/console_test.rb

commit db9ad5e	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-06 00:55:24 +0530

    loading_test.rb with RAILS_ENV=development

M	railties/test/application/loading_test.rb

commit 55b52ee	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-05 23:40:30 +0530

    framework_test.rb also dependent on RAILS_ENV=development

M	railties/test/application/initializers/frameworks_test.rb

commit 5d78d81	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-06 16:13:22 +0530

    Fix for CI server. Dependent on RAILS_ENV=development

M	railties/test/application/console_test.rb

commit c0c0a64	refs/heads/master
Author: Mariusz Pękala 
Date:   2011-06-06 11:51:18 +0200

    Validations guide: order of :after_save callback was incorrect.
    
    The guide was contracting itself. First it stated that 'there is a list
    of callbacks in order of execution', on the list 'after_save' was placed
    before 'after_create', and then there was a warning that 'after_save'
    runs after them. I am not sure about 'around_' callbacks, but let's
    leave that for another patch.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 0c4fd88	refs/tags/v3.1.0.rc2
Merge: 3ac805b b6040f4
Author: José Valim 
Date:   2011-06-06 02:43:44 -0700

    Merge pull request #1478 from arunagw/warning_cherry-picks
    
    Some Cherry-picks for 1.9.2 warning removal

commit 38b97d2	refs/heads/master
Merge: f9b4123 8e51383
Author: José Valim 
Date:   2011-06-06 02:43:32 -0700

    Merge pull request #1497 from arunagw/framework_test
    
    framework_test.rb also dependent on RAILS_ENV=development

commit d3d5b04	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-05 20:36:09 -0700

    Change http://api.rubyonrails.com to http://api.rubyonrails.org

M	railties/guides/source/active_record_basics.textile

commit a620e65	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-06-05 14:49:50 -0700

    Edited railties/guides/source/asset_pipeline.textile via GitHub

M	railties/guides/source/asset_pipeline.textile

commit a2cf91a	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-06 02:10:31 +0530

    minor edits in migrations guide

M	railties/guides/source/migrations.textile

commit 8e51383	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-06 00:55:24 +0530

    loading_test.rb with RAILS_ENV=development

M	railties/test/application/loading_test.rb

commit 11d41e8	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-05 23:40:30 +0530

    framework_test.rb also dependent on RAILS_ENV=development

M	railties/test/application/initializers/frameworks_test.rb

commit 1debebc	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-05 18:27:52 +0100

    load_path_test.rb is also dependent on RAILS_ENV=development

M	railties/test/application/initializers/load_path_test.rb

commit 3ac805b	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-05 18:27:52 +0100

    load_path_test.rb is also dependent on RAILS_ENV=development

M	railties/test/application/initializers/load_path_test.rb

commit f9b4123	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-05 18:27:52 +0100

    load_path_test.rb is also dependent on RAILS_ENV=development

M	railties/test/application/initializers/load_path_test.rb

commit e1b202f	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-05 21:44:04 +0530

    annotate class_eval method for active resource schema attributes

M	activeresource/lib/active_resource/schema.rb

commit c2c8ef5	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-05 10:34:40 -0500

    Remove trailing white-spaces

M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_view/buffers.rb
M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/testing/resolvers.rb
M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activesupport/lib/active_support/core_ext/kernel/reporting.rb
M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/mri.rb
M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/profiler.rb
M	railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
M	railties/lib/rails/generators/rails/assets/USAGE
M	railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb

commit af1c020	refs/tags/v3.1.0.rc2
Merge: 04d238b 596f6ec
Author: José Valim 
Date:   2011-06-05 08:30:09 -0700

    Merge pull request #1495 from arunagw/fixed_failing_isolated_test
    
    Fixed failing isolated test

commit 596f6ec	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-05 20:39:59 +0530

    Loading multi_json instead of i18n gem.
    Don't know why it's giving error with i18n gem.
    Changing this as it dosn't matter with specific gem.

M	activesupport/test/core_ext/kernel_test.rb

commit 3fc53e5	refs/heads/master
Author: Anil Wadghule 
Date:   2011-06-05 19:36:37 +0530

    Fix failing test because of Timezone difference.

M	activerecord/test/cases/fixtures_test.rb

commit 4ecca0f	refs/heads/master
Author: Andrew White 
Date:   2011-06-05 12:52:14 +0100

    Move CHANGELOG entry to future version

M	actionpack/CHANGELOG

commit e864ff7	refs/heads/master
Author: Andrew White 
Date:   2011-06-05 12:34:27 +0100

    Add backward compatibility for testing cookies
    
    This commit restores the ability to assign cookies for testing via
    @request.env['HTTP_COOKIE'] and @request.cookies, e.g:
    
        @request.env['HTTP_COOKIE'] = 'user_name=david'
        get :index
        assert_equal 'david', cookies[:user_name]
    
    and
    
        @request.cookies[:user_name] = 'david'
        get :index
        assert_equal 'david', cookies[:user_name]
    
    Assigning via cookies[] is the preferred method and will take precedence
    over the other two methods. This is so that cookies set in controller
    actions have precedence and are carried over between calls to get, post, etc.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 0a92704	refs/heads/master
Author: Andrew White 
Date:   2011-06-05 12:03:04 +0100

    Ensure cookie keys are strings

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/test_request_test.rb

commit 6c1b7dc	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-05 11:28:02 +0100

    Fix adapter_test.rb to make no assumptions about the database name

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/support/connection.rb

commit 6764449	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-05 11:20:06 +0100

    Fix typo

M	activerecord/test/support/config.rb

commit 04d238b	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-05 11:28:02 +0100

    Fix adapter_test.rb to make no assumptions about the database name

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/support/connection.rb

commit 6925423	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-05 11:20:06 +0100

    Fix typo

M	activerecord/test/support/config.rb

commit 523c7c2	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-05 11:28:02 +0100

    Fix adapter_test.rb to make no assumptions about the database name

M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/support/connection.rb

commit 3b7d100	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-05 11:20:06 +0100

    Fix typo

M	activerecord/test/support/config.rb

commit cc2851b	refs/heads/master
Merge: b5b3165 85f9a5c
Author: José Valim 
Date:   2011-06-05 01:55:24 -0700

    Merge pull request #1426 from arunagw/sprockets_gem_update
    
     sprockets gem update to beta9

commit b5b3165	refs/heads/master
Merge: 9cdd606 0695eb6
Author: José Valim 
Date:   2011-06-05 00:12:05 -0700

    Merge pull request #1462 from arunagw/test_added_for_namedscope
    
    Test added for namedscope target.

commit 9cdd606	refs/heads/master
Merge: 75e5610 db8eeaf
Author: José Valim 
Date:   2011-06-05 00:10:18 -0700

    Merge pull request #1488 from guilleiguaran/multiple_sources_in_sprocket_helpers
    
    Allow multiple sources in Sprockets helpers

commit db8eeaf	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-06-05 00:58:37 -0500

    Allow multiple sources in Sprockets helpers

M	actionpack/lib/sprockets/helpers/rails_helper.rb
A	actionpack/test/fixtures/sprockets/app/javascripts/extra.js
A	actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
M	actionpack/test/template/sprockets_helper_test.rb

commit 9675ad6	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-04 23:49:54 +0100

    Bring back oracle specific crap

M	activerecord/test/connections/oracle.rb

commit 93447be	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-04 23:19:17 +0100

    Refactor Active Record test connection setup. Please see the RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.

M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/Rakefile
A	activerecord/test/.gitignore
M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/firebird/connection_test.rb
M	activerecord/test/cases/adapters/firebird/default_test.rb
M	activerecord/test/cases/adapters/firebird/migration_test.rb
M	activerecord/test/cases/adapters/mysql/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql/sp_test.rb
M	activerecord/test/cases/adapters/mysql2/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/adapters/oracle/synonym_test.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/adapters/sqlite/sqlite_adapter_test.rb
M	activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/ar_schema_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/callbacks_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/column_alias_test.rb
M	activerecord/test/cases/column_definition_test.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/counter_cache_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/database_statements_test.rb
M	activerecord/test/cases/date_time_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activerecord/test/cases/deprecated_finder_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/cases/i18n_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/lifecycle_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/mixin_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/multiple_db_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/reload_models_test.rb
M	activerecord/test/cases/sanitize_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/session_store/session_test.rb
M	activerecord/test/cases/session_store/sql_bypass.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/transaction_callbacks_test.rb
M	activerecord/test/cases/transactions_test.rb
M	activerecord/test/cases/unconnected_test.rb
M	activerecord/test/cases/validations/association_validation_test.rb
M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb
A	activerecord/test/config.example.yml
A	activerecord/test/connections/db2.rb
A	activerecord/test/connections/firebird.rb
A	activerecord/test/connections/frontbase.rb
D	activerecord/test/connections/jdbc_jdbcderby/connection.rb
D	activerecord/test/connections/jdbc_jdbch2/connection.rb
D	activerecord/test/connections/jdbc_jdbchsqldb/connection.rb
D	activerecord/test/connections/jdbc_jdbcmysql/connection.rb
D	activerecord/test/connections/jdbc_jdbcpostgresql/connection.rb
D	activerecord/test/connections/jdbc_jdbcsqlite3/connection.rb
A	activerecord/test/connections/jdbcderby.rb
A	activerecord/test/connections/jdbch2.rb
A	activerecord/test/connections/jdbchsqldb.rb
A	activerecord/test/connections/jdbcmysql.rb
A	activerecord/test/connections/jdbcpostgresql.rb
A	activerecord/test/connections/jdbcsqlite3.rb
A	activerecord/test/connections/mysql.rb
A	activerecord/test/connections/mysql2.rb
D	activerecord/test/connections/native_db2/connection.rb
D	activerecord/test/connections/native_firebird/connection.rb
D	activerecord/test/connections/native_frontbase/connection.rb
D	activerecord/test/connections/native_mysql/connection.rb
D	activerecord/test/connections/native_mysql2/connection.rb
D	activerecord/test/connections/native_openbase/connection.rb
D	activerecord/test/connections/native_oracle/connection.rb
D	activerecord/test/connections/native_postgresql/connection.rb
D	activerecord/test/connections/native_sqlite3/connection.rb
D	activerecord/test/connections/native_sqlite3/in_memory_connection.rb
D	activerecord/test/connections/native_sybase/connection.rb
A	activerecord/test/connections/openbase.rb
A	activerecord/test/connections/oracle.rb
A	activerecord/test/connections/postgresql.rb
A	activerecord/test/connections/sqlite3.rb
A	activerecord/test/connections/sqlite3_mem.rb
A	activerecord/test/connections/sybase.rb
A	activerecord/test/support/config.rb
A	activerecord/test/support/connection.rb

commit 550064c	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-04 23:49:54 +0100

    Bring back oracle specific crap

M	activerecord/test/connections/oracle.rb

commit 75e5610	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-04 23:49:54 +0100

    Bring back oracle specific crap

M	activerecord/test/connections/oracle.rb

commit 253bb6b	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-04 23:19:17 +0100

    Refactor Active Record test connection setup. Please see the RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.

M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/Rakefile
A	activerecord/test/.gitignore
M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/firebird/connection_test.rb
M	activerecord/test/cases/adapters/firebird/default_test.rb
M	activerecord/test/cases/adapters/firebird/migration_test.rb
M	activerecord/test/cases/adapters/mysql/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql/quoting_test.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql/sp_test.rb
M	activerecord/test/cases/adapters/mysql2/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb
M	activerecord/test/cases/adapters/oracle/synonym_test.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/quoting_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/adapters/postgresql/timestamp_test.rb
M	activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/ar_schema_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/callbacks_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/identity_map_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/cases/bind_parameter_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/clone_test.rb
M	activerecord/test/cases/coders/yaml_column_test.rb
M	activerecord/test/cases/column_alias_test.rb
M	activerecord/test/cases/column_definition_test.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/counter_cache_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/database_statements_test.rb
M	activerecord/test/cases/date_time_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activerecord/test/cases/deprecated_finder_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/dup_test.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/fixtures/file_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/cases/i18n_test.rb
M	activerecord/test/cases/identity_map/middleware_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activerecord/test/cases/invertible_migration_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/lifecycle_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/migration/command_recorder_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/mixin_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/multiple_db_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/quoting_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/reload_models_test.rb
M	activerecord/test/cases/sanitize_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/session_store/session_test.rb
M	activerecord/test/cases/session_store/sql_bypass.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/transaction_callbacks_test.rb
M	activerecord/test/cases/transactions_test.rb
M	activerecord/test/cases/unconnected_test.rb
M	activerecord/test/cases/validations/association_validation_test.rb
M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb
A	activerecord/test/config.example.yml
A	activerecord/test/connections/db2.rb
A	activerecord/test/connections/firebird.rb
A	activerecord/test/connections/frontbase.rb
D	activerecord/test/connections/jdbc_jdbcderby/connection.rb
D	activerecord/test/connections/jdbc_jdbch2/connection.rb
D	activerecord/test/connections/jdbc_jdbchsqldb/connection.rb
D	activerecord/test/connections/jdbc_jdbcmysql/connection.rb
D	activerecord/test/connections/jdbc_jdbcpostgresql/connection.rb
D	activerecord/test/connections/jdbc_jdbcsqlite3/connection.rb
A	activerecord/test/connections/jdbcderby.rb
A	activerecord/test/connections/jdbch2.rb
A	activerecord/test/connections/jdbchsqldb.rb
A	activerecord/test/connections/jdbcmysql.rb
A	activerecord/test/connections/jdbcpostgresql.rb
A	activerecord/test/connections/jdbcsqlite3.rb
A	activerecord/test/connections/mysql.rb
A	activerecord/test/connections/mysql2.rb
D	activerecord/test/connections/native_db2/connection.rb
D	activerecord/test/connections/native_firebird/connection.rb
D	activerecord/test/connections/native_frontbase/connection.rb
D	activerecord/test/connections/native_mysql/connection.rb
D	activerecord/test/connections/native_mysql2/connection.rb
D	activerecord/test/connections/native_openbase/connection.rb
D	activerecord/test/connections/native_oracle/connection.rb
D	activerecord/test/connections/native_postgresql/connection.rb
D	activerecord/test/connections/native_sqlite3/connection.rb
D	activerecord/test/connections/native_sqlite3_mem/connection.rb
D	activerecord/test/connections/native_sybase/connection.rb
A	activerecord/test/connections/openbase.rb
A	activerecord/test/connections/oracle.rb
A	activerecord/test/connections/postgresql.rb
A	activerecord/test/connections/sqlite3.rb
A	activerecord/test/connections/sqlite3_mem.rb
A	activerecord/test/connections/sybase.rb
A	activerecord/test/support/config.rb
A	activerecord/test/support/connection.rb

commit cdce7ff	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-04 20:15:52 +0100

    Force RAILS_ENV=development in rackup_test.rb. This fixes a problem on the CI server. For some reason the RAILS_ENV on the CI server is production, which means that the ActionDispatch::Static middleware is not used, and so the request in 'config.ru can be racked up' returns a 404 rather than a 200.

M	railties/test/application/rackup_test.rb

commit 11da7d3	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-04 20:15:52 +0100

    Force RAILS_ENV=development in rackup_test.rb. This fixes a problem on the CI server. For some reason the RAILS_ENV on the CI server is production, which means that the ActionDispatch::Static middleware is not used, and so the request in 'config.ru can be racked up' returns a 404 rather than a 200.

M	railties/test/application/rackup_test.rb

commit f9e3d4b	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-04 23:19:17 +0100

    Refactor Active Record test connection setup. Please see the RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.

M	activerecord/RUNNING_UNIT_TESTS
M	activerecord/Rakefile
A	activerecord/test/.gitignore
M	activerecord/test/cases/adapter_test.rb
M	activerecord/test/cases/adapters/firebird/connection_test.rb
M	activerecord/test/cases/adapters/firebird/default_test.rb
M	activerecord/test/cases/adapters/firebird/migration_test.rb
M	activerecord/test/cases/adapters/mysql/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
M	activerecord/test/cases/adapters/mysql/quoting_test.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
M	activerecord/test/cases/adapters/mysql/sp_test.rb
M	activerecord/test/cases/adapters/mysql2/active_schema_test.rb
M	activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
M	activerecord/test/cases/adapters/mysql2/connection_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/schema_test.rb
M	activerecord/test/cases/adapters/oracle/synonym_test.rb
M	activerecord/test/cases/adapters/postgresql/active_schema_test.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/postgresql/quoting_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
M	activerecord/test/cases/adapters/postgresql/schema_test.rb
M	activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/aggregations_test.rb
M	activerecord/test/cases/ar_schema_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/callbacks_test.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
M	activerecord/test/cases/associations/eager_load_nested_include_test.rb
M	activerecord/test/cases/associations/eager_singularization_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/identity_map_test.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/cases/bind_parameter_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/callbacks_test.rb
M	activerecord/test/cases/clone_test.rb
M	activerecord/test/cases/coders/yaml_column_test.rb
M	activerecord/test/cases/column_alias_test.rb
M	activerecord/test/cases/column_definition_test.rb
M	activerecord/test/cases/connection_adapters/connection_handler_test.rb
M	activerecord/test/cases/connection_management_test.rb
M	activerecord/test/cases/connection_pool_test.rb
M	activerecord/test/cases/counter_cache_test.rb
M	activerecord/test/cases/custom_locking_test.rb
M	activerecord/test/cases/database_statements_test.rb
M	activerecord/test/cases/date_time_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activerecord/test/cases/deprecated_finder_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/dup_test.rb
M	activerecord/test/cases/dynamic_finder_match_test.rb
M	activerecord/test/cases/finder_respond_to_test.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/habtm_destroy_order_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/cases/i18n_test.rb
M	activerecord/test/cases/identity_map/middleware_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/cases/invalid_date_test.rb
M	activerecord/test/cases/invertible_migration_test.rb
M	activerecord/test/cases/json_serialization_test.rb
M	activerecord/test/cases/lifecycle_test.rb
M	activerecord/test/cases/locking_test.rb
M	activerecord/test/cases/log_subscriber_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/migration/command_recorder_test.rb
M	activerecord/test/cases/migration_test.rb
M	activerecord/test/cases/mixin_test.rb
M	activerecord/test/cases/modules_test.rb
M	activerecord/test/cases/multiple_db_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/nested_attributes_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/pooled_connections_test.rb
M	activerecord/test/cases/primary_keys_test.rb
M	activerecord/test/cases/query_cache_test.rb
M	activerecord/test/cases/quoting_test.rb
M	activerecord/test/cases/readonly_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/cases/relations_test.rb
M	activerecord/test/cases/reload_models_test.rb
M	activerecord/test/cases/sanitize_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/cases/serialization_test.rb
M	activerecord/test/cases/session_store/session_test.rb
M	activerecord/test/cases/session_store/sql_bypass.rb
M	activerecord/test/cases/timestamp_test.rb
M	activerecord/test/cases/transaction_callbacks_test.rb
M	activerecord/test/cases/transactions_test.rb
M	activerecord/test/cases/unconnected_test.rb
M	activerecord/test/cases/validations/association_validation_test.rb
M	activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
M	activerecord/test/cases/validations/i18n_validation_test.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb
M	activerecord/test/cases/validations_test.rb
M	activerecord/test/cases/xml_serialization_test.rb
M	activerecord/test/cases/yaml_serialization_test.rb
A	activerecord/test/config.example.yml
A	activerecord/test/connections/db2.rb
A	activerecord/test/connections/firebird.rb
A	activerecord/test/connections/frontbase.rb
D	activerecord/test/connections/jdbc_jdbcderby/connection.rb
D	activerecord/test/connections/jdbc_jdbch2/connection.rb
D	activerecord/test/connections/jdbc_jdbchsqldb/connection.rb
D	activerecord/test/connections/jdbc_jdbcmysql/connection.rb
D	activerecord/test/connections/jdbc_jdbcpostgresql/connection.rb
D	activerecord/test/connections/jdbc_jdbcsqlite3/connection.rb
A	activerecord/test/connections/jdbcderby.rb
A	activerecord/test/connections/jdbch2.rb
A	activerecord/test/connections/jdbchsqldb.rb
A	activerecord/test/connections/jdbcmysql.rb
A	activerecord/test/connections/jdbcpostgresql.rb
A	activerecord/test/connections/jdbcsqlite3.rb
A	activerecord/test/connections/mysql.rb
A	activerecord/test/connections/mysql2.rb
D	activerecord/test/connections/native_db2/connection.rb
D	activerecord/test/connections/native_firebird/connection.rb
D	activerecord/test/connections/native_frontbase/connection.rb
D	activerecord/test/connections/native_mysql/connection.rb
D	activerecord/test/connections/native_mysql2/connection.rb
D	activerecord/test/connections/native_openbase/connection.rb
D	activerecord/test/connections/native_oracle/connection.rb
D	activerecord/test/connections/native_postgresql/connection.rb
D	activerecord/test/connections/native_sqlite3/connection.rb
D	activerecord/test/connections/native_sqlite3_mem/connection.rb
D	activerecord/test/connections/native_sybase/connection.rb
A	activerecord/test/connections/openbase.rb
A	activerecord/test/connections/oracle.rb
A	activerecord/test/connections/postgresql.rb
A	activerecord/test/connections/sqlite3.rb
A	activerecord/test/connections/sqlite3_mem.rb
A	activerecord/test/connections/sybase.rb
A	activerecord/test/support/config.rb
A	activerecord/test/support/connection.rb

commit f9464a2	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-04 20:15:52 +0100

    Force RAILS_ENV=development in rackup_test.rb. This fixes a problem on the CI server. For some reason the RAILS_ENV on the CI server is production, which means that the ActionDispatch::Static middleware is not used, and so the request in 'config.ru can be racked up' returns a 404 rather than a 200.

M	railties/test/application/rackup_test.rb

commit 3939fbd	refs/tags/v3.1.0.rc2
Author: Xavier Noria 
Date:   2011-06-05 00:07:31 +0200

    adds Vijay Dev to the new Rails Guides Reviewers team
    
    See http://weblog.rubyonrails.org/2011/6/2/news-from-the-documentation-front

A	railties/guides/assets/images/vijaydev.jpg
M	railties/guides/source/credits.html.erb

commit 1c527af	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-05 00:07:31 +0200

    adds Vijay Dev to the new Rails Guides Reviewers team
    
    See http://weblog.rubyonrails.org/2011/6/2/news-from-the-documentation-front

A	railties/guides/assets/images/vijaydev.jpg
M	railties/guides/source/credits.html.erb

commit 9f19322	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-05 00:58:21 +0530

    correct code indendation in the initialization guide

M	railties/guides/source/initialization.textile

commit 087f8e1	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-04 23:51:00 +0530

    s/ActiveRecord/Active Record according to api guidelines

M	railties/guides/source/caching_with_rails.textile
M	railties/guides/source/configuring.textile
M	railties/guides/source/i18n.textile

commit 9d15a35	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-04 20:44:11 +0530

    minor corrections in generators guide

M	railties/guides/source/generators.textile

commit 50487bd	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-04 20:28:16 +0530

    fix incorrect module name for wrap parameters

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit fc9ff8c	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-04 20:11:44 +0530

    some grammatical corrections

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit 82aedbb	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-04 19:56:40 +0530

    fix incorrect output

M	activemodel/lib/active_model/errors.rb

commit 2eac4e2	refs/heads/master
Author: Alberto Perdomo 
Date:   2011-06-04 14:26:40 +0100

    Fixed order of parameters in assert_equal call examples, first expected, then actual object.

M	railties/guides/source/testing.textile

commit 63eab0b	refs/tags/v3.1.0.rc2
Author: Xavier Noria 
Date:   2011-06-04 14:35:12 +0200

    move Ryan up, since the list is ordered by surname

M	railties/guides/source/credits.html.erb

commit bcc0a29	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-04 14:35:12 +0200

    move Ryan up, since the list is ordered by surname

M	railties/guides/source/credits.html.erb

commit 7bbcf53	refs/tags/v3.1.0.rc2
Author: Xavier Noria 
Date:   2011-06-04 14:26:39 +0200

    adds Ryan Bigg to the credits page of the guides, he is the author of the new configuring guide

A	railties/guides/assets/images/radar.png
M	railties/guides/source/credits.html.erb

commit aedc627	refs/tags/v3.1.0.rc2
Author: Xavier Noria 
Date:   2011-06-04 14:25:54 +0200

    specify image dimensions for pictures in the guides credits page

M	railties/guides/rails_guides/helpers.rb

commit 6a2863e	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-04 14:26:39 +0200

    adds Ryan Bigg to the credits page of the guides, he is the author of the new configuring guide

A	railties/guides/assets/images/radar.png
M	railties/guides/source/credits.html.erb

commit cd8ecec	refs/heads/master
Author: Xavier Noria 
Date:   2011-06-04 14:25:54 +0200

    specify image dimensions for pictures in the guides credits page

M	railties/guides/rails_guides/helpers.rb

commit a50865c	refs/heads/master
Author: Andrew White 
Date:   2011-06-04 09:35:48 +0100

    Add missing require for cookies middleware

M	actionpack/lib/action_dispatch/testing/test_process.rb

commit d4658d8	refs/heads/master
Author: Andrew White 
Date:   2011-03-30 00:46:27 +0100

    Refactor ActionController::TestCase cookies
    
    Assigning cookies for test cases should now use cookies[], e.g:
    
      cookies[:email] = 'user@example.com'
      get :index
      assert_equal 'user@example.com', cookies[:email]
    
    To clear the cookies, use clear, e.g:
    
      cookies.clear
      get :index
      assert_nil cookies[:email]
    
    We now no longer write out HTTP_COOKIE and the cookie jar is
    persistent between requests so if you need to manipulate the environment
    for your test you need to do it before the cookie jar is created.

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/controller/test_test.rb
M	actionpack/test/dispatch/cookies_test.rb
M	actionpack/test/dispatch/test_request_test.rb

commit 3035f72	refs/heads/master
Author: Rohit Arondekar 
Date:   2011-06-03 21:54:33 -0700

    Upcoming version of Rails is upon us so no need to refer to it. [API DOCS]

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit b6040f4	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-05-25 00:09:49 +0530

    fixes Rake::RDocTask deprecation warnings from rake 0.9.0

M	railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit a81c2ec	refs/tags/v3.1.0.rc2
Author: Vijay Dev 
Date:   2011-05-24 23:38:11 +0530

    fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0

M	actionmailer/Rakefile
M	actionpack/Rakefile
M	activemodel/Rakefile
M	activerecord/Rakefile
M	activeresource/Rakefile
M	activesupport/Rakefile
M	railties/Rakefile

commit 63467a4	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-22 23:13:44 -0700

    Restructure TemplateAssertions-related code to eliminate circular requires.
    
    Also, no need to include dependencies in AS::Concerns inside included blocks.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_dispatch/testing/assertions.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 639dca4	refs/tags/v3.1.0.rc2
Merge: 80745f1 3b75ec9
Author: Yehuda Katz 
Date:   2011-06-03 18:31:50 -0700

    Merge pull request #1473 from lardawge/fix_broken_asset_pipeline_paths
    
    Fix broken asset pipeline paths

commit ced2b25	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-04 02:11:43 +0530

    use clearer variable name in examples

M	activemodel/lib/active_model/serializers/json.rb
M	activemodel/lib/active_model/serializers/xml.rb

commit 6fbd548	refs/heads/master
Author: Waynn Lue 
Date:   2011-06-03 12:26:53 -0700

    add a missing "the" and normalize the use of periods.

M	activerecord/README.rdoc

commit 74f9a46	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-06-03 15:06:03 -0400

    Revise documentation indentation from [79990505e5080804b53d81fec059136afa2237d7]

M	activerecord/CHANGELOG

commit 7999050	refs/heads/master
Author: ganesh 
Date:   2011-06-04 00:31:45 +0530

    updated Changelog

M	activerecord/CHANGELOG

commit 5f66f7a	refs/heads/master
Author: ganesh 
Date:   2011-06-04 00:04:59 +0530

    added more tests for update_column

M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 3b75ec9	refs/tags/v3.1.0.rc2
Author: Larry Sprock 
Date:   2011-06-03 10:55:10 -0700

    Bring inline with master

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 8b8e181	refs/tags/v3.1.0.rc2
Author: Larry Sprock 
Date:   2011-06-03 10:54:35 -0700

    Don't need asset_path twice

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit 9b55007	refs/tags/v3.1.0.rc2
Author: Larry Sprock 
Date:   2011-06-03 09:59:22 -0700

    Generate correct asset paths when using asset pipeline

M	actionpack/lib/sprockets/railtie.rb

commit 80745f1	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-06-03 09:01:12 -0700

    Another missed piece of the merge. I screwed up this merge. I am sorry :(

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

commit 64325a8	refs/heads/master
Merge: 5488368 7ef2f6f
Author: José Valim 
Date:   2011-06-03 06:22:35 -0700

    Merge pull request #1468 from castlerock/fix_issue_1467
    
    Double assignment of attributes on a collection association occurs fixed #1467

commit 7ef2f6f	refs/heads/master
Author: Raghunadh 
Date:   2011-06-03 18:52:43 +0530

    Double assignment of attributes on a collection association occurs fixed for the issue issue #1467

M	activerecord/lib/active_record/associations/collection_association.rb

commit 67f5c07	refs/tags/v3.1.0.rc2
Author: Andrew White 
Date:   2011-06-03 13:53:18 +0100

    Don't double assign attributes - closes #1467.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 5488368	refs/heads/master
Author: Andrew White 
Date:   2011-06-03 13:52:46 +0100

    Don't double assign attributes - closes #1467.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 72f5199	refs/heads/master
Author: Linux on Rails 
Date:   2011-06-03 03:01:41 -0700

    FIXED: error with url_for & link_to when we have nested resources.

M	railties/guides/source/routing.textile

commit caa8ab0	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-03 14:25:13 +0530

    remove stray (

M	activemodel/lib/active_model/validations/length.rb

commit b688f44	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-03 14:14:23 +0530

    use 'bundle exec rake'

M	railties/guides/source/ruby_on_rails_guides_guidelines.textile

commit b4af5b9	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-03 14:13:04 +0530

    fix indentation, fixed-width for nils

M	railties/guides/source/configuring.textile

commit f449da5	refs/heads/master
Author: Nate Mueller 
Date:   2011-06-02 20:43:23 -0700

    Make String.to_time respect timezones

M	activesupport/lib/active_support/core_ext/string/conversions.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 0695eb6	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-03 08:28:00 +0530

    Test added for namedscope target.

M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/models/post.rb

commit de63942	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-06-02 17:06:34 -0700

    Remove explicit sprockets usage. This should have come over in the merge, but for some reason it didn't.

M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

commit 5b300a9	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-06-02 16:10:38 -0700

    Pull back in asset_path

M	actionpack/lib/sprockets/helpers/rails_helper.rb

commit a632746	refs/heads/master
Author: brianp 
Date:   2011-06-02 15:03:36 -0700

    Fixed sections regarding validations and callbacks to mention the touch method does not fire either validations or callbacks as stated in the docs.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 8e071bc	refs/heads/master
Author: Ben Orenstein 
Date:   2011-06-02 17:33:48 -0400

    Change hashrocket spacing to match conventions.

M	activemodel/lib/active_model/validations/length.rb

commit b5ac04a	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-25 11:35:18 -0700

    Renaming helper in the Rake task, but why is this needed in the first place? (paging JP)

M	railties/lib/rails/tasks/assets.rake

commit af83304	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-24 16:03:15 -0700

    Update generator config to support hiding namespaces and pass the app into generator blocks

M	railties/lib/rails/application.rb

commit 7a8d3d7	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-23 17:26:13 -0700

    Make sure that Sprockets::Helpers::RailsHelper can be found

A	actionpack/lib/sprockets/helpers.rb
M	actionpack/lib/sprockets/railtie.rb

commit ee018be	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-23 16:43:58 -0700

    Move the last pockets of Sprockets stuff into the Sprockets directory

M	actionpack/lib/action_view/helpers.rb
D	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 476d679	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-23 16:29:20 -0700

    Move javascript/css helpers into the Sprockets helper and just have them override the old behavior

M	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 866889c	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-23 16:07:16 -0700

    Start moving some logic from being embedded in AV into the Rails Sprockets extensions

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/sprockets_helper.rb
A	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 2c6127f	refs/tags/v3.1.0.rc2
Author: David Heinemeier Hansson 
Date:   2011-06-02 12:39:31 -0500

    Revert "Renaming helper in the Rake task, but why is this needed in the first place? (paging JP)" -- Waiting on YK to fix.
    
    This reverts commit e144b3e3cf9b4d3e4d4669fce5a13b8a19811bc8.

M	railties/lib/rails/tasks/assets.rake

commit 9f50123	refs/tags/v3.0.14
Merge: 4c0bed0 4b8b16b
Author: Michael Koziarski 
Date:   2011-06-01 21:05:06 -0700

    Merge pull request #1454 from sikachu/revert_failing_commit
    
    Revert failing commit

commit 4b8b16b	refs/tags/v3.0.14
Author: Prem Sichanugrist 
Date:   2011-06-01 23:20:16 -0400

    Revert "Fix broken test. You know, the merge button will be the end of us..."
    
    The fix was intentionaly for this branch, but was applied to another
    branches by mistake. This should fix the CI.
    
    This reverts commit 4c0bed0cf0b01c4f063f39fc8e503e97d4661832.

M	activerecord/test/cases/attribute_methods_test.rb

commit 4c0bed0	refs/tags/v3.0.14
Author: Jon Leighton 
Date:   2011-06-01 23:13:40 +0100

    Fix broken test. You know, the merge button will be the end of us...

M	activerecord/test/cases/attribute_methods_test.rb

commit 03d087d	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-06-01 23:13:40 +0100

    Fix broken test. You know, the merge button will be the end of us...

M	activerecord/test/cases/attribute_methods_test.rb

commit f064664	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-01 23:13:40 +0100

    Fix broken test. You know, the merge button will be the end of us...

M	activerecord/test/cases/attribute_methods_test.rb

commit 0459374	refs/heads/master
Merge: 63665f6 8a0ffa7
Author: Piotr Sarnacki 
Date:   2011-06-01 12:47:19 -0700

    Merge pull request #1447 from dmathieu/empty_route
    
    Fix creating an empty route on 1.8. Closes #1210

commit 1243683	refs/tags/v3.1.0.rc2
Merge: df0e2db 42b8fb1
Author: Jon Leighton 
Date:   2011-06-01 12:42:33 -0700

    Merge pull request #1451 from arunagw/3-1-stable
    
    3-1-stable import to java_import

commit d0355ed	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-02 01:10:11 +0530

    add alias info for runner command

M	railties/lib/rails/commands.rb

commit 6e02164	refs/heads/master
Author: Vijay Dev 
Date:   2011-06-02 01:07:07 +0530

    styling changes

M	activerecord/lib/active_record/migration/command_recorder.rb

commit 196c8f1	refs/heads/master
Author: Ayose 
Date:   2011-06-01 12:36:16 -0700

    Edited activerecord/lib/active_record/transactions.rb via GitHub

M	activerecord/lib/active_record/transactions.rb

commit 42b8fb1	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-02 00:55:15 +0530

    Import => java_import performance test #jruby

M	activesupport/lib/active_support/testing/performance/jruby.rb

commit df0e2db	refs/tags/v3.1.0.rc2
Merge: 7f34d5b 68fc6ba
Author: Jon Leighton 
Date:   2011-06-01 11:39:00 -0700

    Merge pull request #1444 from arunagw/3-1-stable
    
    Jruby fixes for 3 1 stable

commit 68fc6ba	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-01 23:39:35 +0530

    Indented as required.

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 425c892	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-01 14:42:09 +0530

    Fixed tests for JDOM. File From Xml is working now

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 88813e1	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-01 14:41:37 +0530

    Fixing  XMLMini_JDOM

M	activesupport/lib/active_support/xml_mini/jdom.rb

commit 60c9b7b	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-01 14:39:06 +0530

    Using java_import instead of import. Need with rake 0.9.0

M	activesupport/lib/active_support/xml_mini/jdom.rb

commit 98cd7ca	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-01 14:38:21 +0530

    Loading files if PLATFORM available.

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 63665f6	refs/heads/master
Merge: 7d447c4 802555a
Author: Aaron Patterson 
Date:   2011-06-01 10:52:41 -0700

    Merge pull request #1385 from smartinez87/drop
    
    #drop_table accepts no options now.

commit 7f34d5b	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-06-01 10:25:23 +0000

    Adding comment

M	activerecord/test/cases/attribute_methods_test.rb

commit 26d0f42	refs/tags/v3.1.0.rc2
Author: Vishnu Atrai 
Date:   2011-06-01 00:23:14 +0530

    AttributeMethodTest test fix #jruby

M	activerecord/test/cases/attribute_methods_test.rb

commit 7d447c4	refs/heads/master
Author: Arun Agrawal 
Date:   2011-06-01 10:25:23 +0000

    Adding comment

M	activerecord/test/cases/attribute_methods_test.rb

commit 230f788	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-06-01 00:23:14 +0530

    AttributeMethodTest test fix #jruby

M	activerecord/test/cases/attribute_methods_test.rb

commit 7bd8012	refs/tags/v3.0.14
Merge: 91f6fba bddf9ad
Author: Jon Leighton 
Date:   2011-06-01 10:41:31 -0700

    Merge pull request #1430 from vatrai/jruby_test_fix
    
    test fixes for jruby

commit 8a4013d	refs/tags/v3.1.0.rc2
Author: Brian Mathiyakom 
Date:   2011-05-27 13:59:18 -0700

    Fix issue #1272
    
    Set reverse_order_value when asked to reverse_order().
    Do the actual reversal in build_arel.

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb

commit 1e43bd9	refs/heads/master
Author: Brian Mathiyakom 
Date:   2011-05-27 13:59:18 -0700

    Fix issue #1272
    
    Set reverse_order_value when asked to reverse_order().
    Do the actual reversal in build_arel.

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb

commit 3523144	refs/heads/master
Author: Ayose 
Date:   2011-06-01 08:47:06 -0700

    The URL http://dev.mysql.com/doc/refman/5.0/en/savepoints.html is no longer available

M	activerecord/lib/active_record/transactions.rb

commit fba977d	refs/heads/master
Merge: 1ff4bfc 3a2ef52
Author: José Valim 
Date:   2011-06-01 07:49:25 -0700

    Merge pull request #1448 from ernie/attr_internal_require
    
    Require attr_internal before using in ActionView::Helpers

commit 3a2ef52	refs/heads/master
Author: Ernie Miller 
Date:   2011-06-01 10:28:24 -0400

    Require attr_internal before using in ActionView::Helpers

M	actionpack/lib/action_view/helpers/controller_helper.rb

commit 8a0ffa7	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-06-01 15:50:49 +0200

    fix creating an empty route on 1.8. Closes #1210

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/controller/integration_test.rb

commit bddf9ad	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-06-01 10:25:23 +0000

    Adding comment

M	activerecord/test/cases/attribute_methods_test.rb

commit 90887cb	refs/heads/master
Author: Akira Matsuda 
Date:   2011-06-01 17:48:09 +0900

    s/a/an/

M	railties/guides/source/active_support_core_extensions.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/getting_started.textile

commit 6014e1d	refs/heads/master
Author: Akira Matsuda 
Date:   2011-06-01 17:19:23 +0900

    s/an/a/

M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 1ff4bfc	refs/heads/master
Merge: 69c52b0 698b600
Author: José Valim 
Date:   2011-06-01 01:13:26 -0700

    Merge pull request #1441 from guilleiguaran/no_rb_require
    
    Don't add .rb in requires

commit 69c52b0	refs/heads/master
Author: Jon Leighton 
Date:   2011-06-01 08:58:50 +0100

    Add missing require to fix the CI

M	activerecord/test/cases/adapters/postgresql/timestamp_test.rb

commit 529d2de	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-31 20:55:50 -0700

    Removing trailing white-spaces

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 698b600	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-31 21:43:04 -0500

    Don't add .rb in requires

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb

commit a48b0e5	refs/heads/master
Merge: cf3364a 2aaeac9
Author: Aaron Patterson 
Date:   2011-05-31 19:29:30 -0700

    Merge pull request #1439 from sikachu/isolated_pg_test
    
    Isolated PostgreSQL test into PostgreSQL folder

commit 2aaeac9	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-31 20:56:07 -0400

    Isolated PostgreSQL test into PostgreSQL folder

A	activerecord/test/cases/adapters/postgresql/timestamp_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit cf3364a	refs/heads/master
Author: Andrew White 
Date:   2011-06-01 01:05:17 +0100

    Raise NameError instead of ArgumentError in ActiveSupport::Dependencies
    
    ActiveSupport::Dependencies now raises NameError if it finds an existing
    constant in load_missing_constant. This better reflects the nature of
    the error which is usually caused by calling constantize on a nested constant.
    
    Closes #1423

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
M	activesupport/CHANGELOG
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/dependencies_test.rb

commit f1fe3c2	refs/tags/v3.1.0.rc2
Author: Andrew White 
Date:   2011-06-01 01:05:17 +0100

    Raise NameError instead of ArgumentError in ActiveSupport::Dependencies
    
    ActiveSupport::Dependencies now raises NameError if it finds an existing
    constant in load_missing_constant. This better reflects the nature of
    the error which is usually caused by calling constantize on a nested constant.
    
    Closes #1423

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
M	activesupport/CHANGELOG
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/dependencies_test.rb

commit eb7ef2c	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-06-01 00:42:02 +0200

    added an alias for new to build to the AR collection proxy, this corrects an issue where the collection proxies were not consistent

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 5ca2e57	refs/tags/v3.1.0.rc2
Merge: 3c09ae7 22b02cb
Author: Jon Leighton 
Date:   2011-05-31 15:53:49 -0700

    Merge pull request #1437 from joshk/ar_collection_new_alias
    
    Ar collection new alias

commit 3c09ae7	refs/tags/v3.1.0.rc2
Merge: 6687670 22b02cb
Author: Jon Leighton 
Date:   2011-05-31 15:49:46 -0700

    Merge pull request #1437 from joshk/ar_collection_new_alias
    
    Ar collection new alias

commit 6687670	refs/tags/v3.1.0.rc2
Merge: de7fecb 22b02cb
Author: Jon Leighton 
Date:   2011-05-31 15:48:13 -0700

    Merge pull request #1437 from joshk/ar_collection_new_alias
    
    Ar collection new alias

commit 22b02cb	refs/tags/v3.1.0.rc2
Author: Josh Kalderimis 
Date:   2011-06-01 00:42:02 +0200

    added an alias for new to build to the AR collection proxy, this corrects an issue where the collection proxies were not consistent

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit cd03204	refs/heads/master
Author: Mark Roghelia 
Date:   2011-05-31 18:41:20 -0400

    The example in the API docs incorrectly indicated that form_for would use the same default route for both new and previously persisted records.  The default path given in the example would have generated a routing error for new records.  form_for actually uses polymorphic_path to determine which route to use based on the state of the record.  The example has been updated to reflect the method's actual behavior.

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 1f34a79	refs/heads/master
Author: Andrew White 
Date:   2011-05-31 23:17:20 +0100

    Make MemCacheStore work with Ruby 1.9 and -Ku

M	activesupport/lib/active_support/cache/mem_cache_store.rb

commit 91f6fba	refs/tags/v3.0.14
Author: Andrew White 
Date:   2011-05-31 23:25:43 +0100

    Make MemCacheStore work with Ruby 1.9 and -Ku

M	activesupport/lib/active_support/cache/mem_cache_store.rb

commit de7fecb	refs/tags/v3.1.0.rc2
Author: Andrew White 
Date:   2011-05-31 23:20:54 +0100

    Make MemCacheStore work with Ruby 1.9 and -Ku

M	activesupport/lib/active_support/cache/mem_cache_store.rb

commit 8776224	refs/heads/master
Merge: 4067d88 70381cf
Author: José Valim 
Date:   2011-05-31 14:52:20 -0700

    Merge pull request #1434 from dmathieu/mass_assignment
    
    Mass assignment

commit 4067d88	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-31 22:43:44 +0100

    Revert "[activerecord][postgresql] verify if table has a schema(not public)". This caused a test breakage. See #1410 for details.
    
    This reverts commit c44418ea4e09cc81da47edbc9ac5f31c7e32c1b4.

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 70381cf	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-05-31 23:38:51 +0200

    no need for .rb

M	activemodel/lib/active_model/mass_assignment_security.rb

commit bb82899	refs/heads/master
Author: Damien Mathieu <42@dmathieu.com>
Date:   2011-05-31 23:38:39 +0200

    string inflections are needed for running tests in isolation

M	activemodel/lib/active_model/mass_assignment_security.rb

commit 576f712	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-31 22:56:31 +0200

    standarize documentation (and indirectly code) to use American English as discussed in 4f234bf
    
    Please do not perform monster patches for this until 3.1 is out.
    Also, no existing API should be affected by this. New code, local
    variables, etc. would follow this guideline to have a consistent
    project tree in this regard.

M	railties/guides/source/api_documentation_guidelines.textile

commit 5888507	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-31 22:45:22 +0200

    revises commit from pull request 1408

M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit daf4a4f	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-31 22:20:31 +0200

    revises commit from pull request 1409

M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

commit 7b4cd4b	refs/heads/master
Author: Noel Gomez 
Date:   2011-05-30 12:58:21 -0700

    Modified generated text to explain where .js and .coffee files can be located and that there shouldn't be blank lines in manifest per this issue  http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/effb868290c2c0b8

M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

commit 2183f05	refs/heads/master
Author: Noel Gomez 
Date:   2011-05-30 12:59:16 -0700

    changed text to be more explicit about where stylesheets can be located

M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit f4e3b70	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-31 21:09:25 +0100

    Ensure that calculations properly override the select value even if it's set in the default scope. Fixes #1395.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/relation_scoping_test.rb

commit c22364b	refs/tags/v3.1.0.rc2
Author: Erik Fonselius 
Date:   2011-05-29 17:38:01 +0200

    Failing test for aggregating on default_scope with select

M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit fbe012e	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-31 21:09:25 +0100

    Ensure that calculations properly override the select value even if it's set in the default scope. Fixes #1395.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/relation_scoping_test.rb

commit a5806fa	refs/heads/master
Author: Erik Fonselius 
Date:   2011-05-29 17:38:01 +0200

    Failing test for aggregating on default_scope with select

M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit 64d7348	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-31 20:32:09 +0100

    Only save the record once when calling create! on a collection association. Fixes #1360.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb

commit 842043e	refs/tags/v3.1.0.rc2
Author: Farley Knight 
Date:   2011-05-31 06:08:11 -0400

    Tests for issue #1360

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/contract.rb

commit dfaad4f	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-31 20:32:09 +0100

    Only save the record once when calling create! on a collection association. Fixes #1360.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb

commit bd64cc9	refs/tags/v3.0.14
Author: Vishnu Atrai 
Date:   2011-06-01 00:23:14 +0530

    AttributeMethodTest test fix #jruby

M	activerecord/test/cases/attribute_methods_test.rb

commit aa316e2	refs/heads/master
Author: Farley Knight 
Date:   2011-05-31 06:08:11 -0400

    Tests for issue #1360

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/contract.rb

commit 9d17913	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-31 18:34:27 +0100

    Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted the branch so I cannot just merge it.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 60cb96a	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-31 18:34:27 +0100

    Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted the branch so I cannot just merge it.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 0bb8429	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-31 18:18:14 +0100

    Reduce test noise

M	activerecord/test/cases/timestamp_test.rb

commit 85f9a5c	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-31 21:41:22 +0530

    sprockets gem update to beta9

M	actionpack/actionpack.gemspec

commit 021e4f1	refs/heads/master
Merge: 1278651 e04f2c1
Author: Aaron Patterson 
Date:   2011-05-31 08:46:27 -0700

    Merge pull request #1417 from arunagw/nested_attributes_fix
    
    Fix nested attribute for memory record.

commit 1278651	refs/heads/master
Author: José Valim 
Date:   2011-05-31 12:26:32 +0200

    Update CHANGELOG.

M	activemodel/CHANGELOG

commit 139a9f7	refs/heads/master
Author: José Valim 
Date:   2011-05-31 12:24:30 +0200

    Transform the symbol into a constant lookup.

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb

commit 1638435	refs/heads/master
Merge: 752dec9 aa2639e
Author: José Valim 
Date:   2011-05-31 03:09:23 -0700

    Merge pull request #1403 from bogdan/config
    
    ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method

commit b13a0ce	refs/heads/master
Author: Hendy Tanata 
Date:   2011-05-31 17:04:16 +0800

    Fix punctuation.

M	railties/guides/source/api_documentation_guidelines.textile

commit bdd7ecb	refs/heads/master
Author: Hendy Tanata 
Date:   2011-05-31 16:51:55 +0800

    Update Rails coding conventions link.

M	railties/guides/source/api_documentation_guidelines.textile

commit e04f2c1	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-31 12:35:37 +0530

    Opening class CascadedEagerLoadingTest at once.

M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb

commit 752dec9	refs/heads/master
Merge: 7278547 c2687c3
Author: José Valim 
Date:   2011-05-30 23:56:49 -0700

    Merge pull request #1415 from brainopia/master
    
    Remove autoload for non-existing constants

commit 2e57b66	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-31 12:12:19 +0530

    Adding comment to work with 1.8.7. Nested Attribute fix.

M	activerecord/lib/active_record/associations/collection_association.rb

commit cfb5f1b	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-31 11:31:10 +0530

    Fix nested attribute for memory record.

M	activerecord/lib/active_record/associations/collection_association.rb

commit c2687c3	refs/heads/master
Author: brainopia 
Date:   2011-05-31 06:22:09 +0400

    Remove autoload for a couple of constants which don't exist anymore

M	actionpack/lib/action_view.rb

commit 56f13a3	refs/tags/v3.0.14
Merge: ce23c6e fe99a81
Author: Aaron Patterson 
Date:   2011-05-30 18:45:15 -0700

    Merge pull request #1400 from arunagw/query_cache_test
    
    Query cache test

commit ce23c6e	refs/tags/v3.0.8.rc4 (tag: v3.0.8.rc4)
Author: Aaron Patterson 
Date:   2011-05-30 17:06:37 -0700

    rebuilding rc because of syck. :'(

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 7278547	refs/heads/master
Merge: 65858a4 c44418e
Author: Aaron Patterson 
Date:   2011-05-30 13:30:07 -0700

    Merge pull request #1410 from lucasts/pg_schema
    
    a little step to better postgresql schema support in rails

commit f4073d5	refs/tags/v3.0.8.rc3 (tag: v3.0.8.rc3)
Author: Aaron Patterson 
Date:   2011-05-30 12:54:16 -0700

    bumping to rc3

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 636124e	refs/tags/v3.0.8.rc3
Merge: 60a7c34 3332b49
Author: Aaron Patterson 
Date:   2011-05-30 12:49:52 -0700

    Merge branch '3-0-stable' into 3-0-8
    
    * 3-0-stable:
      File From Xml is working now. #3-0-stable
      Fixing  XMLMini_JDOM #3-0-stable
      fixing test for mysql2

commit 65858a4	refs/heads/master
Merge: 8623905 baf2a9c
Author: José Valim 
Date:   2011-05-30 08:17:13 -0700

    Merge pull request #1404 from commuter/plugin_new_generator_should_properly_require_js
    
    properly require javascript libraries when generating mountable engine

commit 8623905	refs/heads/master
Merge: 96525d6 f4a2b9e
Author: Joshua Peek 
Date:   2011-05-30 06:46:50 -0700

    Merge pull request #1355 from gnufied/master
    
    Adds rake task to cleanup compiled assets

commit 910ebe1	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-05-30 08:38:11 -0400

    Stubbing and some content addition and changes

M	railties/guides/source/asset_pipeline.textile

commit d0082bf	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-05-30 08:12:27 -0400

    What is the asset pipeline?

M	railties/guides/source/asset_pipeline.textile

commit baf2a9c	refs/heads/master
Author: J. Edward Dewyea 
Date:   2011-05-30 05:58:39 -0400

    properly require javascript libraries when generating mountable engine

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
M	railties/test/generators/plugin_new_generator_test.rb

commit aa2639e	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-05-30 11:34:00 +0300

    ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method
    
    In order to specify your own sanitize method
    Implemented .mass_assignment_sanitizer configuration option

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb

commit f4a2b9e	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-30 11:26:11 +0530

    refectored assets:clean task

M	railties/lib/rails/tasks/assets.rake

commit fe99a81	refs/tags/v3.0.14
Author: Arun Agrawal 
Date:   2011-05-29 23:12:18 +0530

    Fixed tests for #jruby

M	activerecord/test/cases/query_cache_test.rb

commit 91b1918	refs/heads/master
Author: Evan Farrar 
Date:   2011-05-29 22:06:15 -0400

    Spelling corrections in the guides.

M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/asset_pipeline.textile
M	railties/guides/source/contribute.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/layouts_and_rendering.textile
M	railties/guides/source/performance_testing.textile

commit ace7508	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-05-29 20:39:33 -0400

    Adding assets to a gem

M	railties/guides/source/asset_pipeline.textile

commit 96525d6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-29 13:37:42 -0700

    avoid creating range objects

M	activesupport/lib/active_support/core_ext/array/access.rb

commit eb3f81f	refs/heads/master
Merge: 18b153d 4f234bf
Author: Aaron Patterson 
Date:   2011-05-29 12:46:35 -0700

    Merge pull request #1398 from leereilly/my_new_branch
    
    Corrected some typos and American vs. Queen's English issues

commit 4f234bf	refs/heads/master
Author: Lee Reilly 
Date:   2011-05-29 12:40:24 -0700

    Corrected some typos and American vs. Queen's English issues

M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/test/controller/new_base/base_test.rb
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/named_scope.rb
M	activerecord/lib/active_record/schema_dumper.rb
M	activeresource/lib/active_resource/base.rb

commit 60a7c34	refs/tags/v3.0.8.rc3
Merge: f07fd69 d92b22f
Author: Aaron Patterson 
Date:   2011-05-29 12:08:40 -0700

    Merge pull request #1397 from sirlantis/3-0-8
    
    Really fix #1322 (Rake::DSL issue)

commit d92b22f	refs/tags/v3.0.8.rc3
Author: Marcel Jackwerth 
Date:   2011-05-29 18:40:49 +0200

    Really fix #1322 (Rake::DSL issue)

M	railties/lib/rails/railtie.rb

commit bfce2a4	refs/heads/master
Author: Evan Farrar 
Date:   2011-05-29 11:25:37 -0400

    Typo and sentence restructuring

M	railties/guides/source/active_support_core_extensions.textile

commit 8314c8e	refs/heads/master
Author: Evan Farrar 
Date:   2011-05-29 10:37:07 -0400

    Typo in the asset pipeline guide.

M	railties/guides/source/asset_pipeline.textile

commit 1962217	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-29 18:35:42 +0530

    removed references to old remote_* helpers; add info about 3.1 adding multipart option to a form with file_field automatically

M	railties/guides/source/action_view_overview.textile

commit 07dcae0	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-05-29 06:45:57 -0400

    Fixes spelling mistakes pointed out by @vijaydev

M	railties/guides/source/asset_pipeline.textile

commit 9342ad6	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-05-29 06:43:35 -0400

    Changes wording to make it a bit eaiser to understand

M	railties/guides/source/asset_pipeline.textile

commit 4967b35	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-05-29 06:37:08 -0400

    Why should you use the asset pipeline?

M	railties/guides/source/asset_pipeline.textile

commit f07fd69	refs/tags/v3.0.8.rc3
Merge: d756525 d3cfb93
Author: Aaron Patterson 
Date:   2011-05-28 20:34:25 -0700

    Merge pull request #1362 from sirlantis/patch-1
    
    Unquoted query generated by through-association scope

commit 802555a	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-28 18:19:32 -0300

    #drop_table accepts no options now.

M	activerecord/test/cases/adapters/firebird/migration_test.rb

commit 18b153d	refs/heads/master
Merge: a1b1f91 bcb466c
Author: Aaron Patterson 
Date:   2011-05-28 13:36:40 -0700

    Merge pull request #1384 from amatsuda/simplify_drop_table
    
    Remove unused options from drop_table

commit fc381a3	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-29 01:33:30 +0530

    fix typo

M	railties/guides/source/command_line.textile

commit a1b1f91	refs/heads/master
Merge: a46b03e 995ea00
Author: José Valim 
Date:   2011-05-28 12:45:14 -0700

    Merge pull request #1380 from vijaydev/session_migration
    
    Use 3.1 style migration for sessions table

commit a46b03e	refs/heads/master
Merge: 2fd7ea9 3f0c71c
Author: José Valim 
Date:   2011-05-28 12:43:13 -0700

    Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests
    
    Stringify param values in controller tests.

commit bcb466c	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-29 04:30:22 +0900

    No need to pass options which is never used

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit d8f4988	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-29 04:29:19 +0900

    No need to override for just calling super

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 7d7b200	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-28 23:18:08 +0530

    document aliases for commands and update rails versions

M	railties/guides/source/command_line.textile

commit 1c42bd5	refs/tags/v3.1.0.rc2
Merge: db05478 37304e3
Author: Aaron Patterson 
Date:   2011-05-28 10:39:11 -0700

    Merge pull request #1375 from amatsuda/disable_im_by_default_on_test_31
    
    Disable IdentityMap by default for ActiveRecord testing on 3-1-stable

commit 995ea00	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-28 21:59:54 +0530

    Use change in place of up and down in sessions table migration

M	activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb

commit 2fd7ea9	refs/heads/master
Merge: 429a1f2 1cd235e
Author: José Valim 
Date:   2011-05-28 07:51:43 -0700

    Merge pull request #1378 from AndrewRadev/master
    
    Add changelog entry for pull request #1359

commit 1cd235e	refs/heads/master
Author: Andrew Radev 
Date:   2011-05-28 17:23:45 +0300

    ActiveSupport CHANGELOG entry moved to correct place

M	activesupport/CHANGELOG

commit 07a353d	refs/heads/master
Author: Andrew Radev 
Date:   2011-05-28 16:21:16 +0300

    Update CHANGELOG for ActiveSupport::OrderedHash change

M	activesupport/CHANGELOG

commit 37304e3	refs/tags/v3.1.0.rc2
Author: Akira Matsuda 
Date:   2011-05-28 09:08:13 +0900

    Disable IdentityMap by default for ActiveRecord testing
    
    because enabling IM by default will possibly hide some bugs on 3.1 default behavior

M	activerecord/test/cases/helper.rb

commit 429a1f2	refs/heads/master
Merge: f07ff6b 5a5736d
Author: José Valim 
Date:   2011-05-28 00:53:50 -0700

    Merge pull request #1373 from anbotero/master
    
    Minor typo corrected

commit 5a5736d	refs/heads/master
Author: Andrés Botero 
Date:   2011-05-28 00:51:00 -0700

    Fix typo in test.

M	actionpack/test/template/sprockets_helper_test.rb

commit db05478	refs/tags/v3.1.0.rc2
Author: jacott 
Date:   2011-05-28 18:19:11 +1200

    fixed asset_paths when called from sprockets for relative_url_root

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit f07ff6b	refs/heads/master
Merge: 6a3eabe db5adf2
Author: José Valim 
Date:   2011-05-27 23:46:39 -0700

    Merge pull request #1372 from jacott/master
    
    Fix for relative_url_root when used with sprockets

commit db5adf2	refs/heads/master
Author: jacott 
Date:   2011-05-28 18:19:11 +1200

    fixed asset_paths when called from sprockets for relative_url_root

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 6a3eabe	refs/heads/master
Merge: b7baf12 9a67a11
Author: Xavier Noria 
Date:   2011-05-27 23:14:45 -0700

    Merge pull request #1371 from FLOChip/typo
    
    Typo in ActionMailer::Base

commit 9a67a11	refs/heads/master
Author: Teng Siong Ong 
Date:   2011-05-28 13:58:47 +0800

    minor typo in the rdoc about Interceptor.

M	actionmailer/lib/action_mailer/base.rb

commit 0f0213f	refs/heads/master
Author: Teng Siong Ong 
Date:   2011-05-28 13:58:02 +0800

    minor spacing fix in code example in ActionMailer::Base.

M	actionmailer/lib/action_mailer/base.rb

commit 4a376e4	refs/heads/master
Author: Ben Orenstein 
Date:   2011-05-27 22:05:22 -0400

    Fix incorrect description of the returned results.

M	railties/guides/source/active_record_querying.textile

commit 3332b49	refs/tags/v3.0.8.rc3
Merge: c3cbd2c d8b6fcb
Author: Aaron Patterson 
Date:   2011-05-27 19:01:23 -0700

    Merge pull request #1369 from arunagw/3-0-stable
    
    File From Xml is working now. #3-0-stable

commit d8b6fcb	refs/tags/v3.0.8.rc3
Author: Arun Agrawal 
Date:   2011-05-28 07:01:51 +0530

    File From Xml is working now. #3-0-stable

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 6431087	refs/tags/v3.0.8.rc3
Author: Arun Agrawal 
Date:   2011-05-28 06:55:50 +0530

    Fixing  XMLMini_JDOM #3-0-stable

M	activesupport/lib/active_support/xml_mini/jdom.rb

commit b7baf12	refs/heads/master
Merge: c122c7b 9fb51e7
Author: Aaron Patterson 
Date:   2011-05-27 18:07:50 -0700

    Merge pull request #1368 from amatsuda/disable_im_by_default_on_test
    
    Disable IdentityMap by default for ActiveRecord testing

commit 9fb51e7	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-28 09:08:13 +0900

    Disable IdentityMap by default for ActiveRecord testing
    
    because enabling IM by default will possibly hide some bugs on 3.1 default behavior

M	activerecord/test/cases/helper.rb

commit c122c7b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-27 14:53:20 -0700

    stop using boolean expressions because of the side effects

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit d3cfb93	refs/tags/v3.0.8.rc3
Author: Marcel Jackwerth 
Date:   2011-05-27 23:48:24 +0200

    call .quote_value with column-parameter in patch #1362

M	activerecord/lib/active_record/associations/through_association_scope.rb

commit 4b536f7	refs/heads/master
Merge: 2a9b3ab ed1a067
Author: Aaron Patterson 
Date:   2011-05-27 14:40:32 -0700

    Merge pull request #1365 from gnufied/sqlite3
    
    close statment only if its not closed

commit 2a9b3ab	refs/heads/master
Merge: 985ace4 06436b2
Author: Aaron Patterson 
Date:   2011-05-27 14:34:05 -0700

    Merge pull request #1229 from workmad3/master
    
    Fix for Issue #1205

commit ed1a067	refs/heads/master
Author: Hemant Kumar 
Date:   2011-05-28 03:00:11 +0530

    delegate connection and column_hash calls directly to model

M	activerecord/lib/active_record/relation.rb

commit d48add7	refs/heads/master
Author: Hemant Kumar 
Date:   2011-05-28 02:55:33 +0530

    close statment only if its not closed

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 985ace4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-27 14:11:58 -0700

    work around bug in the sqlite3 bindings.  fixes #1289

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 18a2dfb	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-05-27 14:11:58 -0700

    work around bug in the sqlite3 bindings.  fixes #1289

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 1df2286	refs/tags/v3.0.8.rc3
Author: Marcel Jackwerth 
Date:   2011-05-27 23:05:46 +0200

    added regression test

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit c44418e	refs/heads/master
Author: Lucas Stephanou 
Date:   2011-05-27 17:48:34 -0300

    [activerecord][postgresql] verify if table has a schema(not public)

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 152c41d	refs/tags/v3.0.8.rc3
Author: Marcel Jackwerth 
Date:   2011-05-27 12:57:05 -0700

    Through-association owner's primary key wasn't quoted. Generates invalid SQL (id = ) if the record wasn't saved yet (i.e. the primary key's value is nil).

M	activerecord/lib/active_record/associations/through_association_scope.rb

commit 055c6fb	refs/heads/master
Author: Lucas Stephanou 
Date:   2011-05-27 16:39:19 -0300

    find sequences with pg schemas properly

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 62d5ef0	refs/heads/master
Merge: 8628948 0094351
Author: Aaron Patterson 
Date:   2011-05-27 11:52:43 -0700

    Merge pull request #1346 from arunagw/jdom_file_from_xml_fix
    
    Jdom file from xml fix

commit c0c9a33	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-05-27 11:44:00 -0700

    fixing test for mysql2

M	activerecord/test/cases/associations/eager_test.rb

commit 37b2104	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-05-26 16:10:57 -0700

    adding a test for #1322

M	activerecord/test/cases/associations/eager_test.rb

commit 8628948	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-27 11:44:00 -0700

    fixing test for mysql2

M	activerecord/test/cases/associations/eager_test.rb

commit c3cbd2c	refs/tags/v3.0.8.rc3
Author: Aaron Patterson 
Date:   2011-05-27 11:44:00 -0700

    fixing test for mysql2

M	activerecord/test/cases/associations/eager_test.rb

commit 4ae8381	refs/heads/master
Merge: d1c7470 c9cc36b
Author: José Valim 
Date:   2011-05-27 09:43:09 -0700

    Merge pull request #1359 from AndrewRadev/master
    
    Fix for ruby 1.8 bug with ActiveSupport::OrderedHash

commit d756525	refs/tags/v3.0.8.rc2 (tag: v3.0.8.rc2)
Author: Aaron Patterson 
Date:   2011-05-27 09:08:06 -0700

    bumping to 3.0.8.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 57958cb	refs/tags/v3.0.8.rc3
Author: Aaron Patterson 
Date:   2011-05-27 09:01:57 -0700

    extend with Rake::DSL in case of rake 0.9.0. fixes #1322

M	railties/lib/rails/railtie.rb

commit 008a0ec	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-27 20:12:11 +0530

    rename task and Rake::FileList used

M	railties/lib/rails/tasks/assets.rake

commit 2ca0ae9	refs/tags/v3.0.8.rc3
Merge: 179a8a4 4c330d6
Author: José Valim 
Date:   2011-05-27 05:33:13 -0700

    Merge pull request #1351 from arunagw/3-0-stable-jruby-jdom-fixes
    
    3 0 stable jruby jdom fixes

commit fd59a3a	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 13:56:39 +0200

    We moved engine commands to rails/engine/commands

M	railties/lib/rails/commands.rb

commit 0ac5c03	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 13:50:42 +0200

    Add destroy to engine's commands

M	railties/lib/rails/engine/commands.rb

commit e38d375	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 13:44:10 +0200

    Generate script/rails only if --full is given

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit 5f00592	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 13:25:35 +0200

    Refactor identifying generator's destination root

M	railties/lib/rails/commands/generate.rb

commit a0ee227	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 12:12:59 +0200

    Fix appending '

M	railties/test/generators/plugin_new_generator_test.rb

commit c9cc36b	refs/heads/master
Author: Andrew Radev 
Date:   2011-05-27 14:04:39 +0300

    Fixes minor ruby 1.8 inconsistency
    
    ActiveSupport::OrderedHash did not behave identically to Hash when given
    a block with a splat.

M	activesupport/lib/active_support/ordered_hash.rb
M	activesupport/test/ordered_hash_test.rb

commit d111de8	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 11:52:45 +0200

    We're using module not class for namespacing

M	railties/test/railties/engine_test.rb

commit 9d10c2a	refs/heads/master
Author: Bhavin Kamani 
Date:   2011-05-27 12:59:54 +0530

    Add rake task to implement assets:cleanup, fixes Github Issues # 1284

M	railties/lib/rails/tasks/assets.rake

commit b747676	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 08:46:32 +0200

    Move requiring engine out of the switch case

M	railties/lib/rails/engine/commands.rb

commit 9935c30	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-27 08:25:56 +0200

    Fix and test ENGINE_PATH and ENGINE_ROOT

M	railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt
M	railties/test/generators/plugin_new_generator_test.rb

commit 9cb8a18	refs/tags/v3.1.0.rc2
Author: dmathieu <42@dmathieu.com>
Date:   2011-05-26 08:09:38 +0200

    don't raise an exception if the format isn't recognized
    
    Fixed while traveling to heuruko

M	actionpack/lib/action_controller/metal/instrumentation.rb
M	actionpack/test/controller/mime_responds_test.rb

commit 4c330d6	refs/tags/v3.0.8.rc3
Author: Arun Agrawal 
Date:   2011-05-27 08:25:41 +0530

    Loading files if PLATFORM available. #jruby

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 993bd32	refs/tags/v3.0.8.rc3
Author: Arun Agrawal 
Date:   2011-05-27 08:24:36 +0530

    Using java_import instead of import. Need with rake 0.9.0 #jruby

M	activesupport/lib/active_support/xml_mini/jdom.rb

commit 56097c0	refs/tags/v3.0.8.rc3
Author: Arun Agrawal 
Date:   2011-05-27 08:23:05 +0530

    Loading active_support/core_ext/hash/conversions fixed Undefined method from_xml

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 5b6a423	refs/heads/master
Author: Ben Orenstein 
Date:   2011-05-26 22:22:10 -0400

    Copy edits 64148ab96b47a9904fdd839bc69971b4e156bb04 (previous commit). Please squash at will.

M	railties/guides/source/active_record_querying.textile

commit 64148ab	refs/heads/master
Author: Ben Orenstein 
Date:   2011-05-26 22:19:10 -0400

    Improve 'Joining Tables' section with additional examples and explanation.

M	railties/guides/source/active_record_querying.textile

commit 4807088	refs/heads/master
Author: Ben Orenstein 
Date:   2011-05-26 20:52:22 -0400

    Don't you lie to me!

M	railties/guides/source/active_record_querying.textile

commit d1c7470	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-26 16:10:57 -0700

    adding a test for #1322

M	activerecord/test/cases/associations/eager_test.rb

commit 179a8a4	refs/tags/v3.0.8.rc3
Author: Aaron Patterson 
Date:   2011-05-26 16:11:57 -0700

    quoting id columns when doing hm:t joins. fixes #1322

M	activerecord/lib/active_record/associations/through_association_scope.rb

commit 579d044	refs/tags/v3.0.8.rc3
Author: Aaron Patterson 
Date:   2011-05-26 16:10:57 -0700

    adding a test for #1322

M	activerecord/test/cases/associations/eager_test.rb

commit dfba8f5	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-26 17:51:20 -0300

    Fix font styling on associations.rb

M	activerecord/lib/active_record/associations.rb

commit 602fff1	refs/heads/master
Merge: 09e431a f4ed56d
Author: Jon Leighton 
Date:   2011-05-26 13:08:10 -0700

    Merge pull request #1323 from fx/association_primary_key
    
    use association_primary_key in AssociationScope#add_constraints

commit 09e431a	refs/heads/master
Merge: 0731945 ded7e35
Author: Jon Leighton 
Date:   2011-05-26 12:54:38 -0700

    Merge pull request #1318 from TheEmpty/master
    
    Resolve issue #534

commit 0094351	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-27 00:48:59 +0530

    Adding tests for file_from_xml for XmlMini_JDOM #jruby

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit d164663	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-27 00:47:57 +0530

    Adding __content__ into XmlMini_JDOM

M	activesupport/lib/active_support/xml_mini/jdom.rb

commit ded7e35	refs/heads/master
Author: Mohammad Typaldos 
Date:   2011-05-26 12:17:20 -0700

    Removes a now needless test - via Github

M	activerecord/test/cases/associations/habtm_join_table_test.rb

commit 0731945	refs/heads/master
Merge: d341d16 c7567c9
Author: José Valim 
Date:   2011-05-26 11:47:35 -0700

    Merge pull request #1334 from bogdan/callback
    
    MassAssignmentSecurity: add ability to specify your own sanitizer

commit d341d16	refs/heads/master
Merge: 5083d70 043b624
Author: José Valim 
Date:   2011-05-26 11:21:05 -0700

    Merge pull request #1344 from jmileham/serialization_includes
    
    AR Serialization shouldn't fall back to base opts for includes

commit 835c9ce	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-26 17:59:00 +0200

    Introducing engine commands

M	railties/lib/rails/commands/generate.rb
A	railties/lib/rails/engine/commands.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt

commit 60281af	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-26 17:57:46 +0200

    Move load_generators from Rails::Application to Rails::Engine

M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb

commit 6ee4612	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-26 17:54:31 +0200

    We're now using generators directly

M	railties/test/generators/plugin_new_generator_test.rb

commit 043b624	refs/heads/master
Author: John Mileham 
Date:   2011-05-26 11:40:57 -0400

    Don't merge base opts into includes when serializing ARs
    
    Conflicts:
    
    	activerecord/lib/active_record/serialization.rb

M	activerecord/lib/active_record/serialization.rb

commit 52f0437	refs/heads/master
Author: Tekin 
Date:   2011-05-26 16:24:44 +0100

    Correct TESTOPTS specification in activerecord/RUNNING_UNIT_TESTS

M	activerecord/RUNNING_UNIT_TESTS

commit 294e2a8	refs/heads/master
Author: John Mileham 
Date:   2011-05-26 10:44:49 -0400

    Failing test - JSON serialization shouldn't merge base opts into include opts.

M	activerecord/test/cases/json_serialization_test.rb

commit 3ffe1cd	refs/heads/master
Author: diego 
Date:   2011-05-26 15:24:33 +0200

    Added missing quote in grouped_options_for_select example

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit c7567c9	refs/heads/master
Author: Bogdan Gusiev 
Date:   2011-05-26 15:58:43 +0300

    MassAssignmentSecurity: add ability to specify your own sanitizer
    
    Added an ability to specify your own behavior on mass assingment
    protection, controlled by option:
    ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/mass_assignment_security/permission_set.rb
M	activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
M	activemodel/test/cases/mass_assignment_security/black_list_test.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
M	activemodel/test/cases/mass_assignment_security/white_list_test.rb
M	activemodel/test/cases/mass_assignment_security_test.rb

commit 5083d70	refs/heads/master
Merge: ec08bfc 4686ace
Author: José Valim 
Date:   2011-05-26 03:44:14 -0700

    Merge pull request #1328 from flippingbits/cleanup_engine_generator
    
    Cleanup engine generator

commit f4ed56d	refs/heads/master
Author: Marian Rudzynski 
Date:   2011-05-26 12:40:09 +0200

    added assertion for non-standard primary_key on models used in the primary_key test

M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb

commit 4686ace	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-26 12:06:17 +0200

    Use global namespace Rails

M	railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 1186293	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-26 12:01:59 +0200

    Use plugin name consistently

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit ec08bfc	refs/heads/master
Merge: badc72f 16571f9
Author: José Valim 
Date:   2011-05-26 02:29:23 -0700

    Merge pull request #1324 from dmathieu/no_error_on_invalid_format
    
    Don't raise an exception if the format isn't recognized

commit 16571f9	refs/heads/master
Author: dmathieu <42@dmathieu.com>
Date:   2011-05-26 08:09:38 +0200

    don't raise an exception if the format isn't recognized
    
    Fixed while traveling to heuruko

M	actionpack/lib/action_controller/metal/instrumentation.rb
M	actionpack/test/controller/mime_responds_test.rb

commit 1f7c3d0	refs/heads/master
Author: Marian Rudzynski 
Date:   2011-05-26 11:00:27 +0200

    use association_primary_key in AssociationScope#add_constraints

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb

commit badc72f	refs/heads/master
Merge: bf9272b 60ca8d9
Author: José Valim 
Date:   2011-05-25 22:46:53 -0700

    Merge pull request #1315 from ardavis/master
    
    Removed unnecessary space in application.rb

commit ec44763	refs/heads/master
Author: Mohammad El-Abid 
Date:   2011-05-26 00:54:51 -0400

    Removes the restriction on primary key when joining in a habtm && test that it was properly removed

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
M	activerecord/test/cases/associations/habtm_join_table_test.rb

commit 072e1ca	refs/tags/v3.0.8.rc3
Merge: 8b0806e 9e88b87
Author: Aaron Patterson 
Date:   2011-05-25 18:11:38 -0700

    Merge pull request #1317 from parndt/3-0-stable
    
    This fixes rake for me in RefineryCMS.

commit 9e88b87	refs/tags/v3.0.8.rc3
Author: Philip Arndt 
Date:   2011-05-26 13:07:29 +1200

    This fixes rake for me in RefineryCMS. Otherwise, I get: undefined method 'prerequisites' for nil:NilClass (from rspec)

M	railties/lib/rails/application.rb
M	railties/lib/rails/railtie.rb

commit ec080f9	refs/heads/master
Author: Thais Camilo 
Date:   2011-05-25 20:45:44 -0400

    Stop linking Rails guidelines to GitHub wiki

M	railties/guides/source/contribute.textile

commit 4da4856	refs/heads/master
Author: Thais Camilo 
Date:   2011-05-25 20:27:17 -0400

    Stop linking API Guidelines to GitHub wiki

M	railties/guides/source/contribute.textile

commit bf9272b	refs/heads/master
Merge: 9b67918 433390d
Author: Aaron Patterson 
Date:   2011-05-25 17:32:40 -0700

    Merge pull request #1316 from guilleiguaran/railties-changelog
    
    Updating Railties changelog

commit 2cd26b7	refs/heads/master
Author: Thais Camilo 
Date:   2011-05-25 20:18:58 -0400

    On "contribute" guide: remove mention of LH

M	railties/guides/source/contribute.textile

commit 433390d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-25 18:49:17 -0500

    Updating Railties changelog

M	railties/CHANGELOG

commit 8b0806e	refs/tags/v3.0.8.rc1 (tag: v3.0.8.rc1)
Author: Aaron Patterson 
Date:   2011-05-25 16:44:35 -0700

    bumping to 3.0.8.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit eecbc10	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-25 16:35:51 -0700

    updating changelogs

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 60ca8d9	refs/heads/master
Author: Andrew Davis 
Date:   2011-05-25 19:18:29 -0400

    Added a space to the comment_if helper for formatting purposes

M	railties/lib/rails/generators/app_base.rb

commit ab3c87a	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-25 20:13:49 -0300

    Revert this, commited by mistake.

M	railties/guides/source/initialization.textile

commit 4c56694	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-25 20:09:06 -0300

    Fix grammar mistake. Lets vs let's.

M	railties/guides/source/configuring.textile

commit 0632295	refs/heads/master
Author: Andrew Davis 
Date:   2011-05-25 19:04:15 -0400

    Accidentally added extra IDE files, removed them.

D	.idea/.name
D	.idea/.rakeTasks
D	.idea/encodings.xml
D	.idea/misc.xml
D	.idea/modules.xml
D	.idea/rails.iml
D	.idea/vcs.xml
D	.idea/workspace.xml

commit 3b23759	refs/heads/master
Author: Andrew Davis 
Date:   2011-05-25 19:03:29 -0400

    Removed unnecessary space in application.rb for formatting

A	.idea/.name
A	.idea/.rakeTasks
A	.idea/encodings.xml
A	.idea/misc.xml
A	.idea/modules.xml
A	.idea/rails.iml
A	.idea/vcs.xml
A	.idea/workspace.xml
M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 0f7a52d	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-25 20:03:06 -0300

    Fix fixed-fonts stlye on rails_on_rack guide.

M	railties/guides/source/initialization.textile
M	railties/guides/source/rails_on_rack.textile

commit cae1d46	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-01-04 16:52:47 -0800

    add Psych::SyntaxError to the list of rescued YAML exceptions

M	activesupport/lib/active_support/json/backends/yaml.rb

commit 5856fc5	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-01-21 14:09:59 -0800

    use ! " " YAML string literal syntax rather than removing both quotes

M	activesupport/lib/active_support/json/backends/yaml.rb
M	activesupport/test/json/decoding_test.rb

commit 3868624	refs/tags/v3.1.0.rc2
Merge: 9701014 a1936b4
Author: José Valim 
Date:   2011-05-25 14:56:10 -0700

    Merge pull request #1313 from joshk/deprecation_message_correction
    
    Deprecation message correction

commit 9b67918	refs/heads/master
Merge: 7fd0a6d 9cafc28
Author: José Valim 
Date:   2011-05-25 14:55:04 -0700

    Merge pull request #1312 from joshk/remove_active_support_deprecations
    
    Removed deprecated methods and related tests from ActiveSupport

commit e4594f7	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-01-21 17:53:28 -0800

    load and prefer psych as the YAML parser when it is available

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/fixtures.rb
M	railties/lib/rails/commands/dbconsole.rb

commit 03f0f3c	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-01-04 14:09:35 -0800

    require Psych if possible, use Psych output when enabled

M	activesupport/lib/active_support/ordered_hash.rb

commit 8e6b757	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-01-28 14:24:11 -0800

    load psych by default if possible

M	activesupport/lib/active_support/ordered_hash.rb

commit f55a171	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-01-19 15:19:57 -0800

    prefering psych as the yaml parser if possible, fixing assertions for YAML 1.1 compatibility

M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 929e5c4	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-01-19 14:31:22 -0800

    fixing psych support in big decimal, fixing tests to support YAML 1.1

M	activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
M	activesupport/test/core_ext/bigdecimal_test.rb

commit a1936b4	refs/tags/v3.1.0.rc2
Author: Josh Kalderimis 
Date:   2011-05-25 23:44:52 +0200

    correction to the AR::Base#attributes= guard_protected_attributes deprecation message

M	activerecord/lib/active_record/base.rb

commit 9cafc28	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-25 23:34:53 +0200

    Removed deprecated methods and related tests from ActiveSupport

M	activesupport/lib/active_support/benchmarkable.rb
D	activesupport/lib/active_support/cache/compressed_mem_cache_store.rb
M	activesupport/lib/active_support/cache/file_store.rb
D	activesupport/lib/active_support/cache/synchronized_memory_store.rb
M	activesupport/lib/active_support/core_ext/class.rb
D	activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
M	activesupport/lib/active_support/core_ext/module.rb
D	activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/benchmarkable_test.rb
M	activesupport/test/caching_test.rb
M	activesupport/test/class_cache_test.rb
D	activesupport/test/core_ext/class/class_inheritable_attributes_test.rb
D	activesupport/test/core_ext/module/attr_accessor_with_default_test.rb

commit 7fd0a6d	refs/heads/master
Merge: b7921f5 9a68333
Author: José Valim 
Date:   2011-05-25 14:15:00 -0700

    Merge pull request #1311 from kuldarkrabbi/master
    
    action_view/template/handler.rb has been removed

commit 9a68333	refs/heads/master
Author: Kuldar Krabbi 
Date:   2011-05-25 16:59:04 -0400

    action_view/template/handler has been removed

M	actionpack/lib/action_view/template.rb

commit b7921f5	refs/heads/master
Merge: 00e1d08 6b436c2
Author: Xavier Noria 
Date:   2011-05-25 22:49:23 +0200

    Merge branch 'master' of github.com:rails/rails

commit 00e1d08	refs/heads/master
Merge: d25b7c2 03f4183
Author: Xavier Noria 
Date:   2011-05-25 22:48:47 +0200

    Merge branch 'master' of git://github.com/lifo/docrails
    
    Conflicts:
    	actionmailer/lib/action_mailer/base.rb
    	activesupport/lib/active_support/core_ext/kernel/requires.rb

commit 6b436c2	refs/heads/master
Merge: d25b7c2 542114e
Author: Aaron Patterson 
Date:   2011-05-25 13:48:35 -0700

    Merge pull request #1285 from joshk/remove_active_record_deprecations
    
    removed deprecated methods, and related tests, from ActiveRecord

commit d25b7c2	refs/heads/master
Merge: 89d06ea 05adf52
Author: José Valim 
Date:   2011-05-25 13:43:55 -0700

    Merge pull request #1305 from amatsuda/require_rdoc_task_fail2
    
    Ensure RDoc::Task exists even if 'rdoc/task' was not required

commit 89d06ea	refs/heads/master
Merge: e144b3e 548e5ba
Author: José Valim 
Date:   2011-05-25 13:38:37 -0700

    Merge pull request #1308 from vijaydev/fix-codestat-indent
    
    Minor indentation fix in code_statistics

commit 03f4183	refs/heads/master
Author: Lee Reilly 
Date:   2011-05-25 13:15:59 -0700

    Typo; changed 'Febuary' to 'February'

M	railties/guides/source/routing.textile

commit 1d637d2	refs/heads/master
Author: Lee Reilly 
Date:   2011-05-25 13:15:18 -0700

    Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed'

M	railties/guides/source/security.textile

commit 29ff12b	refs/heads/master
Author: Lee Reilly 
Date:   2011-05-25 13:14:00 -0700

    Typo; changed 'enviroment' to 'environment'

M	railties/guides/source/configuring.textile

commit 2c29c40	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-26 00:31:29 +0530

    prefer validates :x in place of validates_x_of

M	railties/guides/source/active_record_validations_callbacks.textile

commit ffaefe2	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-26 00:16:09 +0530

    fixed minor errors

M	railties/guides/source/active_record_validations_callbacks.textile

commit 9701014	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-25 11:35:18 -0700

    Renaming helper in the Rake task, but why is this needed in the first place? (paging JP)

M	railties/lib/rails/tasks/assets.rake

commit e144b3e	refs/heads/master
Author: wycats 
Date:   2011-05-25 11:35:18 -0700

    Renaming helper in the Rake task, but why is this needed in the first place? (paging JP)

M	railties/lib/rails/tasks/assets.rake

commit 548e5ba	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 23:47:31 +0530

    fix indentation

M	railties/lib/rails/code_statistics.rb

commit 492f606	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 22:08:14 +0530

    changes validates_format & numericality to newer syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit f69d5cd	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 22:04:35 +0530

    changes validates_inclusion & exclusion to newer syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit 34a05a7	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 21:54:23 +0530

    changes validates_length_of to newer syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit cc10dff	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 21:44:38 +0530

    changes validates_confirmation_of to newer syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit 084750c	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 16:23:16 +0530

    changes validates_acceptance_of to newer syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit deffc9d	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 16:19:06 +0530

    changes validates_uniqueness_of to newer syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit 45989b8	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 16:11:31 +0530

    changes validates_presence_of to newer syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit 542cee3	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 16:05:57 +0530

    fix incorrect textile syntax

M	railties/guides/source/active_record_validations_callbacks.textile

commit 05adf52	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-26 01:37:34 +0900

    Ensure RDoc::Task exists even if 'rdoc/task' was not required

M	Rakefile
M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit ee46bb7	refs/heads/master
Merge: f116a48 24b28a2
Author: Xavier Noria 
Date:   2011-05-25 08:26:09 -0700

    Merge pull request #1301 from amatsuda/require_rdoc_task_fail
    
    require 'rake/rdoctask' if failed to require 'rdoc/task'

commit 24b28a2	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-26 00:15:23 +0900

    require 'rake/rdoctask' if failed to require 'rdoc/task'
    
    fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5
    require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)

M	Rakefile
M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit f116a48	refs/heads/master
Merge: 903f1f9 4633772
Author: José Valim 
Date:   2011-05-25 06:42:46 -0700

    Merge pull request #1299 from cesario/mit-license
    
    Ensure MIT-LICENSE is included in all the gemspec's

commit 4633772	refs/heads/master
Author: Franck Verrot 
Date:   2011-05-25 15:28:04 +0200

    Add the MIT-LICENSE to the Active Support gemspec

M	activesupport/activesupport.gemspec

commit 85283f0	refs/heads/master
Author: Franck Verrot 
Date:   2011-05-25 15:27:58 +0200

    Add the MIT-LICENSE to the Active Resource gemspec

M	activeresource/activeresource.gemspec

commit 64d9773	refs/heads/master
Author: Franck Verrot 
Date:   2011-05-25 15:27:49 +0200

    Add the MIT-LICENSE to the Active Record gemspec

M	activerecord/activerecord.gemspec

commit 903f1f9	refs/heads/master
Merge: 41eac9b 22be5ca
Author: José Valim 
Date:   2011-05-25 06:29:00 -0700

    Merge pull request #1298 from flippingbits/add_test_files_to_gemspec
    
    Add test files to engine's gemspec

commit 22be5ca	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-25 15:12:54 +0200

    Improve test assertion

M	railties/test/generators/plugin_new_generator_test.rb

commit 360b98f	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-25 15:03:42 +0200

    Remove whitespaces from empty line

M	railties/test/generators/plugin_new_generator_test.rb

commit 5cf934e	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-25 15:03:07 +0200

    Add test files to engine's gemspec

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
M	railties/test/generators/plugin_new_generator_test.rb

commit 41eac9b	refs/heads/master
Merge: b145a72 e2a0a94
Author: José Valim 
Date:   2011-05-25 05:40:31 -0700

    Merge pull request #1260 from flippingbits/master
    
    Remove shebang from the template

commit 727a5a7	refs/heads/master
Author: Jeff Cohen 
Date:   2011-05-25 07:31:45 -0500

    Replace old wording about http requests

M	README.rdoc

commit b145a72	refs/heads/master
Merge: b1bb9d1 b2db874
Author: José Valim 
Date:   2011-05-25 05:02:15 -0700

    Merge pull request #1297 from cesario/1294-allocated-object-cant-be-inspected
    
    #1294 : allocated object cant be inspected [closes #1294]

commit b2db874	refs/heads/master
Author: Franck Verrot 
Date:   2011-05-25 13:52:25 +0200

    Fix the AR::Base#inspect method [closes #1294]

M	activerecord/lib/active_record/base.rb

commit bf159aa	refs/heads/master
Author: Franck Verrot 
Date:   2011-05-25 13:52:11 +0200

    Test AR::Base#inspect on an allocated object not yet initialized

M	activerecord/test/cases/attribute_methods_test.rb

commit b1bb9d1	refs/heads/master
Merge: 9562c0f a984050
Author: José Valim 
Date:   2011-05-25 02:17:10 -0700

    Merge pull request #1293 from janx/master
    
    Fix Rails::Paths::Root documentation

commit 9562c0f	refs/heads/master
Merge: 144d1b8 5d89675
Author: José Valim 
Date:   2011-05-25 02:12:54 -0700

    Merge pull request #1292 from arunagw/database_generators
    
    Database.rake file fixed for load_generators

commit 79aa54d	refs/tags/v2.3.12
Author: Ryan Davis 
Date:   2011-05-25 01:49:15 -0700

    + Switched to newer rdoc and gem package tasks (and their requires).
    + Fixed deprecated usage in gemspecs.
    
    Bumped the version to 2.3.12 so I could test locally with actual
    installs. If this is bad form for this project, please beat me up and
    I'll split them out.

M	Rakefile
M	actionmailer/Rakefile
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/Rakefile
M	actionpack/lib/action_pack/version.rb
M	activemodel/Rakefile
M	activerecord/Rakefile
M	activerecord/lib/active_record/version.rb
M	activeresource/Rakefile
M	activeresource/lib/active_resource/version.rb
M	activesupport/Rakefile
M	activesupport/lib/active_support/version.rb
M	railties/Rakefile
M	railties/lib/rails/version.rb
M	railties/lib/rails_generator/generators/components/plugin/templates/Rakefile
M	railties/lib/tasks/documentation.rake

commit a984050	refs/heads/master
Author: Jan Xie 
Date:   2011-05-25 16:38:51 +0800

    fix Rails::Paths::Root document

M	railties/lib/rails/paths.rb

commit 5d89675	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-25 13:57:44 +0530

    Database.rake file fixed for load_generators

M	activerecord/lib/active_record/railties/databases.rake

commit 144d1b8	refs/heads/master
Merge: 460ce7d d9204c1
Author: José Valim 
Date:   2011-05-25 00:58:37 -0700

    Merge pull request #1290 from arunagw/load_generators_use
    
    Using load_generators

commit d9204c1	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-25 13:13:24 +0530

    Using load_generators

M	railties/test/generators/generators_test_helper.rb

commit 460ce7d	refs/heads/master
Author: José Valim 
Date:   2011-05-25 09:30:41 +0200

    Use load_generators instead.

M	railties/test/application/generators_test.rb

commit 31bb347	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 12:51:56 +0530

    update language env variable name

M	railties/guides/source/ruby_on_rails_guides_guidelines.textile

commit 3b2ee3b	refs/heads/master
Merge: a5ee94f 944aee7
Author: José Valim 
Date:   2011-05-25 00:10:47 -0700

    Merge pull request #1288 from guilleiguaran/railties-deprecations
    
    Remove Railties deprecated methods

commit a5ee94f	refs/heads/master
Merge: c29ce8a ce4afa2
Author: José Valim 
Date:   2011-05-25 00:05:32 -0700

    Merge pull request #1287 from guilleiguaran/removing-test_load_generators_from_railties
    
    load_generators_from_railties was removed, remove test with error about it

commit 99dd117	refs/heads/master
Author: Mohammad El-Abid 
Date:   2011-05-25 02:10:14 -0400

    Adds outline draft#1 for the Asset Pipeline, please comment if you have thoughts about it!

A	railties/guides/source/asset_pipeline.textile

commit 944aee7	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-25 00:11:56 -0500

    Removing deprecated config.generators in Rails::Railtie

M	railties/lib/rails/railtie/configuration.rb

commit 6e1dbb8	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-24 22:35:05 -0500

    Remove deprecated plugin generator

D	railties/lib/rails/generators/rails/plugin/USAGE
D	railties/lib/rails/generators/rails/plugin/plugin_generator.rb
D	railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE.tt
D	railties/lib/rails/generators/rails/plugin/templates/README.tt
D	railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
D	railties/lib/rails/generators/rails/plugin/templates/init.rb
D	railties/lib/rails/generators/rails/plugin/templates/install.rb
D	railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt
D	railties/lib/rails/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
D	railties/lib/rails/generators/rails/plugin/templates/uninstall.rb
D	railties/test/generators/plugin_generator_test.rb

commit ce350de	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-24 22:24:09 -0500

    Removing Deprecated Path API tests

M	railties/test/paths_test.rb

commit 685a919	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-24 20:52:38 -0500

    Removing deprecated config.paths.app.controller API

M	railties/lib/rails/paths.rb
M	railties/test/application/paths_test.rb

commit ce4afa2	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-24 22:03:10 -0500

    load_generators_from_railties was removed, remove failing test_load_generators_from_railties

M	railties/test/generators_test.rb

commit c29ce8a	refs/heads/master
Merge: 52e01fc c302670
Author: Aaron Patterson 
Date:   2011-05-24 19:52:24 -0700

    Merge pull request #1286 from arunagw/fixed_failing_generators_test
    
    Fixed failing tests for generators_test

commit c302670	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-25 08:01:56 +0530

    fixed test_deliver_is_notified need base_mailer

M	actionmailer/test/log_subscriber_test.rb

commit 8e55d3e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-25 07:55:20 +0530

    Fixed failing tests for generators_test

M	railties/test/application/generators_test.rb

commit 542114e	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-25 02:28:41 +0200

    removed deprecated methods, and related tests, from ActiveRecord

M	activerecord/lib/active_record/associations/builder/singular_association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/reflection_test.rb

commit 79ed700	refs/tags/v3.0.8.rc1
Author: Santiago Pastorino 
Date:   2011-04-01 23:58:37 -0300

    default_executable is deprecated since rubygems 1.7.0

M	rails.gemspec

commit 289f9ce	refs/tags/v3.1.0.rc2
Author: José Valim 
Date:   2011-05-25 01:37:55 +0200

    Everyone receives app as argument for consistency.
    
    Conflicts:
    
    	railties/lib/rails/application.rb

M	activerecord/lib/active_record/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie.rb
M	railties/test/application/console_test.rb

commit 352daff	refs/tags/v3.0.8.rc1
Author: Santiago Pastorino 
Date:   2011-04-02 00:35:33 -0300

    Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0

M	actionmailer/actionmailer.gemspec
M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activerecord/activerecord.gemspec
M	activeresource/activeresource.gemspec
M	activesupport/activesupport.gemspec
M	railties/railties.gemspec

commit 52e01fc	refs/heads/master
Author: José Valim 
Date:   2011-05-25 01:37:55 +0200

    Everyone receives app as argument for consistency.

M	activerecord/lib/active_record/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/railtie.rb
M	railties/test/application/console_test.rb

commit 2649db7	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-24 16:35:49 -0700

    make open_log private

M	activesupport/lib/active_support/buffered_logger.rb

commit 76cebf2	refs/heads/master
Author: José Valim 
Date:   2011-05-25 01:26:25 +0200

    Actually this file may be invoked directly as well with --dev.

M	railties/lib/rails/commands/application.rb
M	railties/lib/rails/commands/plugin_new.rb

commit b519b0c	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-25 00:07:38 +0100

    Fix infinite recursion where a lazy default scope references a scope. Fixes #1264.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit 8a4263c	refs/tags/v3.1.0.rc2
Author: Andrew White 
Date:   2011-05-24 07:21:32 +0100

    Ignore :includes on through associations

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/post.rb

commit 63a6598	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-24 23:22:01 +0100

    Ensure that the surrounding code in Relation#to_a respects the default_scope (as well as having Relation#arel respect the default scope). Fixes #1233.

M	activerecord/lib/active_record/relation.rb

commit 0daf574	refs/tags/v3.1.0.rc2
Author: Andrew White 
Date:   2011-05-24 03:05:06 +0100

    Failing tests for #1233.

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/developer.rb

commit 594b749	refs/heads/master
Author: José Valim 
Date:   2011-05-25 01:16:32 +0200

    Streamline generators initialization flow.

M	railties/lib/rails/application.rb
M	railties/lib/rails/commands.rb
M	railties/lib/rails/commands/destroy.rb
M	railties/lib/rails/commands/generate.rb
M	railties/lib/rails/commands/plugin_new.rb
M	railties/lib/rails/generators.rb
M	railties/test/generators/generators_test_helper.rb

commit c08f845	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-24 16:12:14 -0700

    Update default Gemfile to point to sass-rails, not sass

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 23820a2	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-24 16:03:41 -0700

    Hide css:* and the default stylesheet from rails g

M	railties/lib/rails/generators.rb

commit 5d9eb1a	refs/tags/v3.1.0.rc2
Author: wycats 
Date:   2011-05-24 16:03:15 -0700

    Update generator config to support hiding namespaces and pass the app into generator blocks

M	railties/lib/rails/application.rb
M	railties/lib/rails/configuration.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/railtie.rb

commit e1043cc	refs/tags/v3.1.0.rc2
Author: tomhuda 
Date:   2011-05-23 23:39:04 -0700

    Move SCSS generators and default templates from Rails to the Sass Railtie (d435726312601edb3ba6f97b34f562221f72c1f8).
    
    * Sass gem registers a compressor
    * Sass gem registers generators for assets and scaffold
    * Create a default stylesheet_engine ("css") for apps that remove the Sass gem

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators.rb
A	railties/lib/rails/generators/css/assets/assets_generator.rb
A	railties/lib/rails/generators/css/assets/templates/stylesheet.css
A	railties/lib/rails/generators/css/scaffold/scaffold_generator.rb
M	railties/lib/rails/generators/rails/assets/assets_generator.rb
D	railties/lib/rails/generators/rails/assets/templates/stylesheet.css.scss
M	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
D	railties/lib/rails/generators/rails/scaffold/templates/scaffold.css.scss
M	railties/test/generators/assets_generator_test.rb
M	railties/test/generators/controller_generator_test.rb
M	railties/test/generators/namespaced_generators_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 7eed5c0	refs/tags/v3.1.0.rc2
Author: tomhuda 
Date:   2011-05-23 23:32:34 -0700

    Change compressor API so that plugins can register default compressors for their stylesheet or JS engines and still allow the user to turn off compression

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit d1d34ce	refs/heads/master
Author: wycats 
Date:   2011-05-24 16:12:14 -0700

    Update default Gemfile to point to sass-rails, not sass

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit c69111b	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-25 00:07:38 +0100

    Fix infinite recursion where a lazy default scope references a scope. Fixes #1264.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit d21fef3	refs/heads/master
Author: wycats 
Date:   2011-05-24 16:03:41 -0700

    Hide css:* and the default stylesheet from rails g

M	railties/lib/rails/generators.rb

commit c1df442	refs/heads/master
Author: wycats 
Date:   2011-05-24 16:03:15 -0700

    Update generator config to support hiding namespaces and pass the app into generator blocks

M	railties/lib/rails/application.rb
M	railties/lib/rails/configuration.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/railtie.rb

commit 74ade51	refs/heads/master
Author: tomhuda 
Date:   2011-05-23 23:39:04 -0700

    Move SCSS generators and default templates from Rails to the Sass Railtie (d435726312601edb3ba6f97b34f562221f72c1f8).
    
    * Sass gem registers a compressor
    * Sass gem registers generators for assets and scaffold
    * Create a default stylesheet_engine ("css") for apps that remove the Sass gem

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators.rb
A	railties/lib/rails/generators/css/assets/assets_generator.rb
A	railties/lib/rails/generators/css/assets/templates/stylesheet.css
A	railties/lib/rails/generators/css/scaffold/scaffold_generator.rb
M	railties/lib/rails/generators/rails/assets/assets_generator.rb
D	railties/lib/rails/generators/rails/assets/templates/stylesheet.css.scss
M	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
D	railties/lib/rails/generators/rails/scaffold/templates/scaffold.css.scss
M	railties/test/generators/assets_generator_test.rb
M	railties/test/generators/controller_generator_test.rb
M	railties/test/generators/namespaced_generators_test.rb
M	railties/test/generators/scaffold_generator_test.rb

commit 88cb890	refs/heads/master
Author: tomhuda 
Date:   2011-05-23 23:32:34 -0700

    Change compressor API so that plugins can register default compressors for their stylesheet or JS engines and still allow the user to turn off compression

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 4b86e7b	refs/heads/master
Merge: 6f413d8 21317d8
Author: José Valim 
Date:   2011-05-24 16:01:25 -0700

    Merge pull request #1283 from joshk/actiom_mailer_tests_fixed
    
    corrected/fixed the ActionMailer tests

commit 21317d8	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-25 00:57:50 +0200

    corrected the ActionMailer tests which broke due to some code removed from ActionPack

M	actionpack/lib/action_view/template/handlers/erb.rb

commit 6f413d8	refs/heads/master
Merge: ce37f74 d182b6e
Author: José Valim 
Date:   2011-05-24 15:40:08 -0700

    Merge pull request #1281 from joshk/removed_action_pack_deprecations
    
    removed deprecated methods, and related tests, from ActionPack

commit ce37f74	refs/heads/master
Merge: a000ff7 d8bd19f
Author: Jon Leighton 
Date:   2011-05-24 15:34:28 -0700

    Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope
    
    Ignore :includes on through associations

commit a000ff7	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-24 23:22:01 +0100

    Ensure that the surrounding code in Relation#to_a respects the default_scope (as well as having Relation#arel respect the default scope). Fixes #1233.

M	activerecord/lib/active_record/relation.rb

commit f1f1ab7	refs/heads/master
Author: Andrew White 
Date:   2011-05-24 03:05:06 +0100

    Failing tests for #1233.

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/developer.rb

commit d182b6e	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-24 23:38:59 +0200

    removed deprecated methods, and related tests, from ActionPack

M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/lib/action_dispatch/middleware/callbacks.rb
M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/lib/action_dispatch/routing/route.rb
D	actionpack/lib/action_view/template/handler.rb
M	actionpack/lib/action_view/template/handlers.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
M	actionpack/lib/action_view/test_case.rb
D	actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
M	actionpack/test/controller/helper_test.rb
M	actionpack/test/controller/render_test.rb
M	actionpack/test/controller/view_paths_test.rb
D	actionpack/test/dispatch/response_body_is_proc_test.rb
D	actionpack/test/fixtures/test/deprecated_nested_layout.erb
M	actionpack/test/template/number_helper_test.rb
M	actionpack/test/template/test_case_test.rb

commit 90f59b2	refs/heads/master
Merge: eff0fdf ef8c2a8
Author: José Valim 
Date:   2011-05-24 13:32:37 -0700

    Merge pull request #1279 from dasch/patch-2
    
    Use quotes consistently in Gemfile

commit eff0fdf	refs/heads/master
Merge: b3f51e3 962936c
Author: José Valim 
Date:   2011-05-24 13:29:48 -0700

    Merge pull request #1279 from dasch/patch-2
    
    Use quotes consistently in Gemfile

commit ef8c2a8	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-05-24 13:29:29 -0700

    Also use double quotes for #source

M	Gemfile

commit 962936c	refs/heads/master
Author: Daniel Schierbeck 
Date:   2011-05-24 13:27:43 -0700

    Use quotes consistently in Gemfile

M	Gemfile

commit b3f51e3	refs/heads/master
Merge: 806d600 2213479
Author: José Valim 
Date:   2011-05-24 12:59:06 -0700

    Merge pull request #1239 from alindeman/master
    
    Use set data structure to speed up circular reference checks on large/deeply nested objects

commit 806d600	refs/heads/master
Merge: 36991f1 b921679
Author: José Valim 
Date:   2011-05-24 12:28:14 -0700

    Merge pull request #1278 from vijaydev/rake-doctask-warning-fix
    
    Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0

commit b921679	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-25 00:09:49 +0530

    fixes Rake::RDocTask deprecation warnings from rake 0.9.0

M	railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
M	railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
M	railties/lib/rails/tasks/documentation.rake
M	railties/test/railties/railtie_test.rb
M	railties/test/railties/shared_tests.rb

commit 36991f1	refs/heads/master
Merge: 176883a 79e9a29
Author: José Valim 
Date:   2011-05-24 12:14:30 -0700

    Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix
    
    Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0

commit 79abb70	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-24 11:22:11 -0700

    rescue record invalid exceptions and return false from the save method. fixes #796

M	activerecord/lib/active_record/persistence.rb

commit 1c079c5	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-24 11:21:24 -0700

    add tests surrounding behavior of save and save! for associations that have validation errors

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit f0c09f7	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-24 11:06:36 -0700

    adding a test for create! with invalid associations

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 99cfdba	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-24 11:05:36 -0700

    do not bother with assert_nothing_raised, the test will fail and we get a better trace without it

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit d387a59	refs/tags/v3.0.8.rc1
Author: Joey Butler 
Date:   2011-05-18 14:32:18 -0400

    Add failing test case for issue 796

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 656e7b0	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-05-24 11:22:11 -0700

    rescue record invalid exceptions and return false from the save method. fixes #796

M	activerecord/lib/active_record/persistence.rb

commit 1d864e8	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-05-24 11:21:24 -0700

    add tests surrounding behavior of save and save! for associations that have validation errors

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit b102e60	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-05-24 11:06:36 -0700

    adding a test for create! with invalid associations

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit d485633	refs/tags/v3.1.0.rc2
Author: Aaron Patterson 
Date:   2011-05-24 11:05:36 -0700

    do not bother with assert_nothing_raised, the test will fail and we get a better trace without it

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 177666e	refs/tags/v3.1.0.rc2
Author: Joey Butler 
Date:   2011-05-18 14:32:18 -0400

    Add failing test case for issue 796

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 176883a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-24 11:22:11 -0700

    rescue record invalid exceptions and return false from the save method. fixes #796

M	activerecord/lib/active_record/persistence.rb

commit 559d809	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-24 11:21:24 -0700

    add tests surrounding behavior of save and save! for associations that have validation errors

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 79e9a29	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-24 23:38:11 +0530

    fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0

M	actionmailer/Rakefile
M	actionpack/Rakefile
M	activemodel/Rakefile
M	activerecord/Rakefile
M	activeresource/Rakefile
M	activesupport/Rakefile
M	railties/Rakefile

commit 9643387	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-24 11:06:36 -0700

    adding a test for create! with invalid associations

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 0df8830	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-24 11:05:36 -0700

    do not bother with assert_nothing_raised, the test will fail and we get a better trace without it

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit e106dbf	refs/heads/master
Author: Joey Butler 
Date:   2011-05-18 14:32:18 -0400

    Add failing test case for issue 796

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit f2a0dfc	refs/heads/master
Author: Jeremy Friesen 
Date:   2011-05-16 11:55:24 -0400

    Addresses an inconsistency in the ActiveRecord::Base.method_missing handling of dynamic finder methods and the passing of the &block parameter for :find_by_attributes.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/relations_test.rb

commit c4a9467	refs/heads/master
Merge: ae323a5 d500ad3
Author: José Valim 
Date:   2011-05-24 10:35:46 -0700

    Merge pull request #1271 from joshk/remove_am_deprecated_methods
    
    Removed deprecated ActionMailer API and related tests

commit d500ad3	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-24 18:52:11 +0200

    Removed deprecated ActionMailer API and related tests

M	actionmailer/lib/action_mailer.rb
D	actionmailer/lib/action_mailer/adv_attr_accessor.rb
M	actionmailer/lib/action_mailer/base.rb
D	actionmailer/lib/action_mailer/old_api.rb
D	actionmailer/lib/action_mailer/tmail_compat.rb
M	actionmailer/test/log_subscriber_test.rb
D	actionmailer/test/old_base/adv_attr_test.rb
D	actionmailer/test/old_base/mail_render_test.rb
D	actionmailer/test/old_base/mail_service_test.rb
D	actionmailer/test/old_base/tmail_compat_test.rb

commit ae323a5	refs/heads/master
Merge: 4d3c30a f75df05
Author: Aaron Patterson 
Date:   2011-05-24 09:08:38 -0700

    Merge pull request #1247 from arunagw/loading-file
    
    Not loading file if PLATFORM not available.

commit 4d3c30a	refs/heads/master
Merge: 68d5abe ed4f2b9
Author: Aaron Patterson 
Date:   2011-05-24 09:07:32 -0700

    Merge pull request #1253 from arunagw/preformance_java_import
    
    import to java_import.

commit 68d5abe	refs/heads/master
Merge: dea4035 89da0d3
Author: Aaron Patterson 
Date:   2011-05-24 09:06:44 -0700

    Merge pull request #1251 from arunagw/java_import
    
    Using java_import instead of import. Need to do this with rake 0.9.0 #jruby

commit 06436b2	refs/heads/master
Author: David Workman 
Date:   2011-05-24 17:06:40 +0100

    Added a test to check for correct behaviour with no options in add_index command recorder

M	activerecord/test/cases/migration/command_recorder_test.rb

commit bfb9f75	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-05-24 21:12:01 +0530

    changed http://api.rubyonrails.com to  http://api.rubyonrails.org in readme files

M	actionmailer/README.rdoc
M	actionpack/README.rdoc
M	activerecord/README.rdoc
M	activeresource/README.rdoc
M	activesupport/README.rdoc

commit f236dbf	refs/tags/v3.0.8.rc1
Merge: f505565 17c9efb
Author: José Valim 
Date:   2011-05-24 08:38:55 -0700

    Merge pull request #1269 from arunagw/fix_load_path_test_3_0
    
    Fix load path test 3 0

commit 17c9efb	refs/tags/v3.0.8.rc1
Author: Arun Agrawal 
Date:   2011-05-24 20:56:37 +0530

    Fixed failing tests.

M	activesupport/test/dependencies_test.rb
M	activesupport/test/load_paths_test.rb

commit c77bdc0	refs/tags/v3.1.0.rc2
Author: David Heinemeier Hansson 
Date:   2011-05-24 10:22:06 -0500

    Remove asserts for js ext stuff thats not used any more

M	railties/test/generators/app_generator_test.rb

commit dea4035	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-24 10:22:06 -0500

    Remove asserts for js ext stuff thats not used any more

M	railties/test/generators/app_generator_test.rb

commit b865576	refs/heads/master
Merge: 408bbdc 15baa49
Author: José Valim 
Date:   2011-05-24 08:15:25 -0700

    Merge pull request #1268 from ernie/compute_asset_host_fix
    
    Redundant condition in compute_asset_host is redundant.

commit 15baa49	refs/heads/master
Author: Ernie Miller 
Date:   2011-05-24 11:09:59 -0400

    Redundant condition in compute_asset_host is redundant.

M	actionpack/lib/action_view/helpers/asset_paths.rb

commit 408bbdc	refs/heads/master
Merge: 67e12eb f4d100b
Author: José Valim 
Date:   2011-05-24 08:07:49 -0700

    Merge pull request #1267 from guilleiguaran/prefer-each-syntax
    
    Prefer 'each' syntax instead of 'for in'

commit f505565	refs/tags/v3.0.8.rc1
Merge: 83f257f 89252c4
Author: José Valim 
Date:   2011-05-24 07:48:43 -0700

    Merge pull request #1266 from arunagw/deprecation_warning_3_0_fix
    
    Deprecation warning 3 0 fix

commit 89252c4	refs/tags/v3.0.8.rc1
Author: Arun Agrawal 
Date:   2011-05-24 19:33:58 +0530

    Fixed failing test against with 3-0-stable branch.

M	activesupport/test/deprecation_test.rb

commit da1ee0e	refs/tags/v3.1.0.rc2
Author: David Heinemeier Hansson 
Date:   2011-05-24 07:45:54 -0500

    The asset pipeline is always on for new apps, dont need the legacy js ext stuff

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 67e12eb	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-24 07:45:54 -0500

    The asset pipeline is always on for new apps, dont need the legacy js ext stuff

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit dac68cb	refs/heads/master
Merge: cedadad 79dc275
Author: David Heinemeier Hansson 
Date:   2011-05-24 05:40:05 -0700

    Merge pull request #1257 from dmathieu/yml_alias
    
    Properly reference yml alias nodes

commit cedadad	refs/heads/master
Merge: b8118ef 3d9d9f8
Author: José Valim 
Date:   2011-05-24 04:59:28 -0700

    Merge pull request #1262 from dmathieu/dummy_without_tests
    
    Create the dummy app if there's no test_unit but there's a dummy_path

commit e2a0a94	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-24 13:57:36 +0200

    Add test for shebang in engine's script/rails file

M	railties/test/generators/plugin_new_generator_test.rb

commit 3d9d9f8	refs/heads/master
Author: dmathieu <42@dmathieu.com>
Date:   2011-05-24 13:18:27 +0200

    create the dummy app if there's no test_unit but there's a dummy_path

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit e366cd7	refs/heads/master
Merge: ab0d2f2 b8118ef
Author: Stefan Sprenger 
Date:   2011-05-24 12:43:55 +0200

    Merge branch 'master' of https://github.com/rails/rails

commit b8118ef	refs/heads/master
Author: José Valim 
Date:   2011-05-24 12:37:57 +0200

    Fix failing test suite (please run tests before sending pull requests :S)

M	railties/test/generators/plugin_new_generator_test.rb

commit ab0d2f2	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-24 12:34:05 +0200

    Remove shebang from the template since it's already added by the
    generator

M	railties/lib/rails/generators/rails/plugin_new/templates/script/rails.tt

commit 79dc275	refs/heads/master
Author: dmathieu <42@dmathieu.com>
Date:   2011-05-24 11:18:28 +0200

    properly reference yml alias nodes
    
    as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/test/fixtures/parrots.yml

commit 00be5bd	refs/heads/master
Author: tomhuda 
Date:   2011-05-23 23:30:06 -0700

    Remaining cleanup from changes to AssetTagHelper

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb

commit 72c7160	refs/heads/master
Merge: a47a65f 855d14d
Author: José Valim 
Date:   2011-05-24 00:37:57 -0700

    Merge pull request #1255 from flippingbits/master
    
    Fix gemspec of full or mountable engines

commit 855d14d	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-24 09:30:23 +0200

    Add test for gemspec of the generated engine

M	railties/test/generators/plugin_new_generator_test.rb

commit e3d7751	refs/heads/master
Author: Stefan Sprenger 
Date:   2011-05-24 08:22:25 +0200

    Add folders app and config to the engine's gemspec if they're available

M	railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

commit d8bd19f	refs/heads/master
Author: Andrew White 
Date:   2011-05-24 07:21:32 +0100

    Ignore :includes on through associations

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/post.rb

commit f4d100b	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-23 23:49:05 -0500

    Prefer each instead of for on activesupport

M	activesupport/lib/active_support/buffered_logger.rb

commit 8f003de	refs/heads/master
Author: Dmytrii Nagirniak 
Date:   2011-05-23 22:40:29 -0700

    fix minor spelling mistakes in comments

M	actionpack/lib/action_controller/metal/force_ssl.rb

commit 505e115	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-23 22:38:02 -0700

    Removed extra white-spaces on config/environment/test.rb template

M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit e9f9bf0	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-23 22:35:47 -0700

    Removing extra white-spaces on config/environment/development.rb template

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit a47a65f	refs/heads/master
Merge: 9dabbd0 130c9b7
Author: José Valim 
Date:   2011-05-23 22:32:15 -0700

    Merge pull request #1243 from smartinez87/warnings
    
    Fix 'warning: ambiguous first argument; put parentheses or even spaces'.

commit ed4f2b9	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-24 10:13:27 +0530

    import to java_import.

M	activesupport/lib/active_support/testing/performance/jruby.rb

commit 89da0d3	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-24 10:06:09 +0530

    Using java_import instead of import. Need to do this with rake 0.9.0 #jruby

M	activesupport/lib/active_support/xml_mini/jdom.rb

commit 647c55a	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-23 23:08:48 -0500

    Prefer each instead of for in activeresource

M	activeresource/lib/active_resource/http_mock.rb

commit f75df05	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-24 09:16:50 +0530

    Not loading file if PLATFORM not available.

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 3540579	refs/heads/master
Author: Jeff Cohen 
Date:   2011-05-23 21:09:05 -0500

    Update the MVC explanation in the main README.rdoc file

M	README.rdoc

commit 130c9b7	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 21:45:00 -0300

    Parenthesize arguments when the first one is a Regexp literal.
    This fixes 'warning: ambiguous first argument; put parentheses or even spaces'.

M	railties/test/application/initializers/notifications_test.rb
M	railties/test/application/rack/logger_test.rb
M	railties/test/application/rake_test.rb

commit 9dabbd0	refs/heads/master
Author: wycats 
Date:   2011-05-23 17:26:13 -0700

    Make sure that Sprockets::Helpers::RailsHelper can be found

A	actionpack/lib/sprockets/helpers.rb
M	actionpack/lib/sprockets/railtie.rb

commit 8e7590c	refs/heads/master
Merge: a9f22dc 05f29ca
Author: Santiago Pastorino 
Date:   2011-05-23 17:09:35 -0700

    Merge pull request #1241 from smartinez87/extra-space
    
    Remove extra white-space on exception message.

commit dd6c367	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 21:00:45 -0300

    Remove extra white spaces on ActiveSupport docs.

M	activesupport/lib/active_support/benchmarkable.rb
M	activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/file/atomic.rb
M	activesupport/lib/active_support/core_ext/kernel/agnostics.rb
M	activesupport/lib/active_support/core_ext/kernel/requires.rb
M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/lib/active_support/dependencies.rb

commit 0034b78	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 20:58:25 -0300

    Remove extra white spaces on ActiveRecord docs.

M	activerecord/lib/active_record/aggregations.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/counter_cache.rb
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/result.rb
M	activerecord/lib/active_record/schema_dumper.rb
M	activerecord/lib/active_record/serializers/xml_serializer.rb
M	activerecord/lib/active_record/session_store.rb
M	activerecord/lib/active_record/test_case.rb
M	activerecord/lib/active_record/validations.rb
M	activerecord/lib/active_record/validations/associated.rb
M	activerecord/lib/active_record/validations/uniqueness.rb

commit 05f29ca	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 20:53:18 -0300

    Remove extra white-space on some exception messages.

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/railties/databases.rake

commit a9f22dc	refs/heads/master
Author: wycats 
Date:   2011-05-23 16:43:58 -0700

    Move the last pockets of Sprockets stuff into the Sprockets directory

M	actionpack/lib/action_view/helpers.rb
D	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 76f947e	refs/heads/master
Author: wycats 
Date:   2011-05-23 16:29:20 -0700

    Move javascript/css helpers into the Sprockets helper and just have them override the old behavior

M	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 4b79029	refs/heads/master
Author: wycats 
Date:   2011-05-23 16:07:16 -0700

    Start moving some logic from being embedded in AV into the Rails Sprockets extensions

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/sprockets_helper.rb
A	actionpack/lib/sprockets/helpers/rails_helper.rb
M	actionpack/lib/sprockets/railtie.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 2a4b780	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 20:39:10 -0300

    Remove extra white spaces on ActiveModel docs.

M	activemodel/lib/active_model/callbacks.rb
M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/serialization.rb
M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb

commit 5d0d4d8	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 20:24:04 -0300

    Remove extra white spaces on ActionMailer docs.

M	actionmailer/lib/action_mailer/base.rb

commit fcdb5dc	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 20:22:33 -0300

    Remove extra white spaces on ActionPack docs.

M	actionpack/lib/abstract_controller/base.rb
M	actionpack/lib/abstract_controller/helpers.rb
M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/lib/action_controller/metal/data_streaming.rb
M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
M	actionpack/lib/action_dispatch/http/mime_type.rb
M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/sanitize_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb

commit c6ec7e8	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 20:09:58 -0300

    Fix styling error on plugins guide.

M	railties/guides/source/plugins.textile

commit 83f257f	refs/tags/v3.0.8.rc1
Author: Patrick Quinn 
Date:   2011-05-20 20:02:20 -0400

    Make Rake::DSL methods available within Railtie rake_tasks block
    
    Fixes incompatibility introduced by Rake 0.9.0

M	railties/lib/rails/application.rb
M	railties/lib/rails/railtie.rb

commit 5ec23b9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-23 14:02:33 -0700

    fixing 1.8 support for new fixture tests

M	activerecord/lib/active_record/fixtures/file.rb
M	activerecord/test/cases/fixtures/file_test.rb
M	activerecord/test/fixtures/categories_ordered.yml

commit 1716da0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 11:01:23 -0700

    removing CSV fixture support

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 081b36c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 10:42:03 -0700

    fixture file will validate fixture format

M	activerecord/lib/active_record/fixtures/file.rb
M	activerecord/test/cases/fixtures/file_test.rb

commit 5278af3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 10:31:52 -0700

    return an empty array for empty yaml files

M	activerecord/lib/active_record/fixtures/file.rb
M	activerecord/test/cases/fixtures/file_test.rb

commit 74c5f65	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 10:31:34 -0700

    use top level file constant for join, etc

M	activerecord/lib/active_record/fixtures.rb

commit ad3f0ee	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 10:21:40 -0700

    adding AR::Fixtures::File class to wrap a fixture file

M	activerecord/lib/active_record/fixtures.rb
A	activerecord/lib/active_record/fixtures/file.rb
A	activerecord/test/cases/fixtures/file_test.rb

commit 2213479	refs/heads/master
Author: Andy Lindeman 
Date:   2011-05-23 17:50:48 -0400

    Use set data structure to speed up circular reference checks on large/deeply nested objects

M	activesupport/lib/active_support/json/encoding.rb

commit 86afbf7	refs/heads/master
Author: David Workman 
Date:   2011-05-23 22:33:03 +0100

    Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat

M	activerecord/lib/active_record/migration/command_recorder.rb

commit 12ab165	refs/heads/master
Author: Matthew McEachen 
Date:   2011-05-23 14:13:57 -0700

    NOTE: doesn't handle newlines.

M	railties/guides/source/plugins.textile

commit 872a9c1	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-16 17:07:21 +0100

    Fix problem with loading polymorphic associations which have been defined in an abstract superclass. Fixes #552.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/reflection_test.rb

commit 1170cce	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-23 19:45:49 +0100

    Removed ActiveSupport::SecureRandom in favour of SecureRandom from the standard library. (It has been deprecated in the 3-1-stable branch.)

M	activesupport/CHANGELOG
M	activesupport/lib/active_support.rb
M	activesupport/lib/active_support/notifications/instrumenter.rb
D	activesupport/lib/active_support/secure_random.rb
D	activesupport/test/secure_random_test.rb
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/tasks/misc.rake

commit d411c85	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-23 12:02:06 +0100

    Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required.

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	actionpack/test/dispatch/session/cookie_store_test.rb
M	activesupport/lib/active_support.rb
M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/notifications_test.rb
M	activesupport/test/secure_random_test.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/tasks/misc.rake
M	railties/test/application/middleware/cache_test.rb

commit 3cbfc8c	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-23 19:33:55 +0100

    Deprecate ActiveSupport::SecureRandom. Just use SecureRandom which is provided by the standard library.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/notifications/instrumenter.rb
M	activesupport/lib/active_support/secure_random.rb
M	activesupport/test/secure_random_test.rb

commit 5a6927e	refs/tags/v3.1.0.rc2
Author: Jon Leighton 
Date:   2011-05-23 12:02:06 +0100

    Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required.

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M	actionpack/test/controller/request_forgery_protection_test.rb
M	actionpack/test/dispatch/session/cookie_store_test.rb
M	activesupport/lib/active_support.rb
M	activesupport/test/message_encryptor_test.rb
M	activesupport/test/notifications_test.rb
M	activesupport/test/secure_random_test.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/tasks/misc.rake
M	railties/test/application/middleware/cache_test.rb

commit b648286	refs/tags/v3.1.0.rc2
Merge: 65f54a6 d79e284
Author: José Valim 
Date:   2011-05-23 12:20:30 -0700

    Merge pull request #1235 from joshk/deprecate_kernel_requires
    
    Deprecate kernel requires

commit 424eff5	refs/heads/master
Author: Karunakar (Ruby) 
Date:   2011-05-24 00:11:29 +0530

    active resource instalation instructions and Licence

M	activeresource/README.rdoc

commit d79e284	refs/tags/v3.1.0.rc2
Author: Josh Kalderimis 
Date:   2011-05-23 19:54:00 +0200

    deprecate AS core_ext/kernel/requires in 3.1

M	activesupport/lib/active_support/core_ext/kernel/requires.rb
M	activesupport/test/core_ext/kernel_test.rb

commit c76c4f6	refs/heads/master
Author: JudeArasu 
Date:   2011-05-23 22:43:22 +0530

    rails request has been moved from Lighthouse to Github, contribution link has been changed

M	README.rdoc

commit 09314f2	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-23 16:38:51 +0200

    removed require_library_or_gem from the AS core extensions guide

M	railties/guides/source/active_support_core_extensions.textile

commit 8588dd4	refs/heads/master
Author: David Workman 
Date:   2011-05-23 15:03:42 +0100

    Neatened up the invert_add_index method as per suggeston

M	activerecord/lib/active_record/migration/command_recorder.rb

commit a5fb1c6	refs/heads/master
Merge: 5c3f3f1 2514d65
Author: José Valim 
Date:   2011-05-23 06:48:05 -0700

    Merge pull request #1231 from joshk/ruby-debugger
    
    Ruby debugger corrections

commit 5c3f3f1	refs/heads/master
Merge: a8b2a89 b4951b5
Author: José Valim 
Date:   2011-05-23 06:46:32 -0700

    Merge pull request #1230 from smartinez87/changelog
    
    Add entry to AP changelog

commit 2514d65	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-23 15:44:48 +0200

    Removed the AS core_ext/kernel/debugger breakpoint method as this method is added by ruby-debug and should be left as is. Missing tests added.

M	activesupport/lib/active_support/core_ext/kernel/debugger.rb
M	activesupport/test/core_ext/kernel_test.rb

commit eff5d9a	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-23 15:31:33 +0200

    Removed AS core_ext/kernel/requires as it's not used and is bad practice.

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activesupport/lib/active_support/core_ext/kernel.rb
D	activesupport/lib/active_support/core_ext/kernel/requires.rb
M	railties/lib/rails/rack/debugger.rb
M	railties/lib/rails/test_help.rb

commit b4951b5	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-23 10:03:52 -0300

    Add entry to AP changelog

M	actionpack/CHANGELOG

commit a7fad65	refs/heads/master
Author: David Workman 
Date:   2011-05-23 13:54:38 +0100

    Simple fix for correctly inverting an add_index migration when a name has been provided

M	activerecord/lib/active_record/migration/command_recorder.rb
M	activerecord/test/cases/migration/command_recorder_test.rb

commit a8b2a89	refs/heads/master
Merge: 6e5eede 8a722e0
Author: José Valim 
Date:   2011-05-23 03:11:15 -0700

    Merge pull request #1228 from fcheung/db_time_fix2
    
    Take into account time spent in AR even if a redirect occurs or if it is after the render

commit 8a722e0	refs/heads/master
Author: Frederick Cheung 
Date:   2011-05-22 19:49:31 +0100

    Take into account time spent in AR even if a redirect occurs or if it is after the render

M	actionpack/test/activerecord/controller_runtime_test.rb
M	activerecord/lib/active_record/railties/controller_runtime.rb

commit 65f54a6	refs/tags/v3.1.0.rc2
Author: José Valim 
Date:   2011-05-23 10:27:46 +0200

    Move content length to the server, this brings the same behavior as in rack 1.2.

M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/server.rb
M	railties/test/application/middleware_test.rb

commit 6e5eede	refs/heads/master
Author: José Valim 
Date:   2011-05-23 10:27:46 +0200

    Move content length to the server, this brings the same behavior as in rack 1.2.

M	railties/lib/rails/application.rb
M	railties/lib/rails/commands/server.rb
M	railties/test/application/middleware_test.rb

commit c944cab	refs/heads/master
Author: José Valim 
Date:   2011-05-23 10:25:18 +0200

    Require rubygems (chill out, just for rails internal tests).

M	railties/test/isolation/abstract_unit.rb

commit 7236861	refs/tags/v3.1.0.rc2
Author: José Valim 
Date:   2011-05-23 00:33:48 -0700

    Use Rack 1.3.0.

M	actionpack/actionpack.gemspec

commit 7817298	refs/heads/master
Merge: dd8ab4f e9a2ff8
Author: Aaron Patterson 
Date:   2011-05-23 00:21:13 -0700

    Merge pull request #1184 from gnufied/master
    
    Fixes connection_not established error while running db:schema:dump

commit dd8ab4f	refs/heads/master
Author: wycats 
Date:   2011-05-22 23:55:08 -0700

    Bump Rack version

M	actionpack/actionpack.gemspec

commit 72c7aec	refs/heads/master
Author: wycats 
Date:   2011-05-22 23:39:51 -0700

    Eliminate uninitialized instance variable warning

M	actionpack/test/template/streaming_render_test.rb

commit 0a587ee	refs/heads/master
Author: wycats 
Date:   2011-05-22 23:38:10 -0700

    Prepare the context in URLHelperTest so that there are no required uninitialized instance variables

M	actionpack/test/template/url_helper_test.rb

commit 7501943	refs/heads/master
Merge: 7b9f3eb 531095e
Author: José Valim 
Date:   2011-05-22 23:35:55 -0700

    Merge pull request #1222 from arunagw/sprockets-fixes
    
    We don't need to load version any more as Sprockets.beta8 is included.

commit 7b9f3eb	refs/heads/master
Author: wycats 
Date:   2011-05-22 23:14:52 -0700

    Always initialize @title in caching test to avoid uninitialized instance variable warning

M	actionpack/test/controller/caching_test.rb

commit ddc584e	refs/heads/master
Author: wycats 
Date:   2011-05-22 23:13:44 -0700

    Restructure TemplateAssertions-related code to eliminate circular requires.
    
    Also, no need to include dependencies in AS::Concerns inside included blocks.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_dispatch/testing/assertions.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 0afefa9	refs/heads/master
Author: wycats 
Date:   2011-05-22 22:34:06 -0700

    Make :status an attr_reader to avoid unnecessary warning when replacing status=

M	actionpack/lib/action_dispatch/http/response.rb

commit 531095e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-23 07:09:09 +0530

    We don't need to load version any more as Sprockets.beta8 is included.

M	actionpack/test/abstract_unit.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit cb76771	refs/heads/master
Author: Matthew Daubert 
Date:   2011-05-22 21:17:38 -0400

    Minor typo describing engine helpers

M	railties/lib/rails/engine.rb

commit 5e519fb	refs/heads/master
Merge: ba3ea9c 7ad24a7
Author: Joshua Peek 
Date:   2011-05-22 20:11:36 -0500

    Merge branch '3-1-stable'
    
    Conflicts:
    	actionpack/actionpack.gemspec
    	activemodel/activemodel.gemspec

commit 7ad24a7	refs/tags/v3.1.0.rc2
Author: Joshua Peek 
Date:   2011-05-22 20:10:13 -0500

    Require sprockets beta 8

M	actionpack/actionpack.gemspec

commit ba3ea9c	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-22 18:10:52 -0500

    Revert "Take into account time spent in AR even if a redirect occurs or if it is after the render" because it's causing test failures about missing db_during_render.
    
    This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4.

M	actionpack/test/activerecord/controller_runtime_test.rb
M	activerecord/lib/active_record/railties/controller_runtime.rb

commit 3789685	refs/heads/master
Merge: 330fc8c e4f6e6a
Author: Matthew McEachen 
Date:   2011-05-22 16:08:47 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit 330fc8c	refs/heads/master
Author: Matthew McEachen 
Date:   2011-05-22 16:07:47 -0700

    Following proper naming conventions while referring to Rails, Bundler

M	railties/guides/source/plugins.textile

commit 7124659	refs/heads/master
Merge: d7a910e 90f028a
Author: David Heinemeier Hansson 
Date:   2011-05-22 16:05:36 -0700

    Merge pull request #1221 from sikachu/fix_tests
    
    Make sure that we're able to run Action Pack test standalone.

commit 90f028a	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-22 19:02:54 -0400

    Make sure that we're able to run Action Pack test standalone.
    
    Sprocket was trying to look for these two things:
    
    * `Rails::VERSION::STRING`
    * `.initializer(str)` in `Rails::Engine`
    
    This commit added require to version.rb into Abstract Unit, and mocking the `Rails::Engine.initializer` in `sprockets_helper_test.rb`

M	actionpack/test/abstract_unit.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit d7a910e	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-16 17:07:21 +0100

    Fix problem with loading polymorphic associations which have been defined in an abstract superclass. Fixes #552.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/reflection_test.rb

commit 27159df	refs/tags/v3.1.0.rc2
Author: Joshua Peek 
Date:   2011-05-22 15:10:53 -0500

    Add debug_asset support

M	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/test/fixtures/sprockets/app/javascripts/application.js
M	actionpack/test/fixtures/sprockets/app/stylesheets/application.css
M	actionpack/test/template/sprockets_helper_test.rb

commit cdc9c3c	refs/tags/v3.1.0.rc2
Author: Joshua Peek 
Date:   2011-05-22 14:50:11 -0500

    Lock to stable sprockets beta

M	actionpack/actionpack.gemspec

commit 8c19ebe	refs/heads/master
Merge: 4ee7d92 60b55ba
Author: José Valim 
Date:   2011-05-22 12:08:07 -0700

    Merge pull request #1219 from fcheung/db_time_fix
    
    Take into account time spent in AR even if a redirect occurs or if it is

commit 60b55ba	refs/heads/master
Author: Frederick Cheung 
Date:   2011-05-22 19:49:31 +0100

    Take into account time spent in AR even if a redirect occurs or if it is after the render

M	actionpack/test/activerecord/controller_runtime_test.rb
M	activerecord/lib/active_record/railties/controller_runtime.rb

commit 4ee7d92	refs/heads/master
Merge: 06474c1 ab4dbb1
Author: José Valim 
Date:   2011-05-22 09:51:54 -0700

    Merge pull request #1215 from vatrai/remove_require_tzinfo
    
    remove require active_support/tzinfo as file dosent exists #TODO fix

commit ab4dbb1	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-22 22:08:05 +0530

    remove require active_support/tzinfo as file dosent exists #TODO fix

M	activesupport/lib/active_support/values/time_zone.rb

commit 06474c1	refs/heads/master
Merge: ff55924 4c99f32
Author: José Valim 
Date:   2011-05-22 09:12:27 -0700

    Merge pull request #1192 from arunagw/removal_extra
    
    No more need rubygems here.

commit ff55924	refs/heads/master
Merge: 09fa80d 9c9f450
Author: José Valim 
Date:   2011-05-22 06:05:52 -0700

    Merge pull request #1202 from vatrai/todo_fix
    
    Fix todo Time.xmlschema used instead of Time.parse

commit 3f0c71c	refs/heads/master
Author: David Chelimsky 
Date:   2011-05-22 08:11:54 -0400

    use to_param (and change method to name accordingly)
    
    - exclude Rack::Test::UploadedFile to pass existing tests. Are there any
      other types we're missing?

M	actionpack/lib/action_controller/test_case.rb

commit e4f6e6a	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-22 04:47:04 -0700

    has_many :dependent => :restrict raises an exception but is not documented appropriately. has_one also has :dependent => :restrict but is not documented at all.

M	activerecord/lib/active_record/associations.rb

commit 9c9f450	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-22 17:16:23 +0530

    require 'time'

M	activesupport/lib/active_support/xml_mini.rb

commit 09fa80d	refs/heads/master
Merge: 62d9c83 b85694f
Author: José Valim 
Date:   2011-05-22 04:40:34 -0700

    Merge pull request #1193 from arunagw/railties_tests
    
    Loading action_controller twice removed.

commit 9164dda	refs/tags/v3.1.0.rc2
Author: José Valim 
Date:   2011-05-22 13:39:13 +0200

    Fix I18n dependency as final is out.

M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec

commit 62d9c83	refs/heads/master
Author: José Valim 
Date:   2011-05-22 13:38:00 +0200

    Depend on I18n ~> 0.6

M	activesupport/activesupport.gemspec

commit d5646e8	refs/heads/master
Author: José Valim 
Date:   2011-05-22 13:30:55 +0200

    Move I18n dependency back to ActiveSupport.

M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activesupport/activesupport.gemspec
M	activesupport/lib/active_support/i18n.rb

commit 99b5020	refs/heads/master
Author: José Valim 
Date:   2011-05-22 04:27:28 -0700

    Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 2cd2f51	refs/heads/master
Merge: a6e9455 7c562d5
Author: José Valim 
Date:   2011-05-22 04:26:31 -0700

    Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920
    
    Add method FormHelper#fields_for_with_index

commit a6e9455	refs/tags/v3.1.0.rc2
Author: José Valim 
Date:   2011-05-22 13:20:59 +0200

    Fix failing tests.

M	activesupport/test/dependencies_test.rb
M	activesupport/test/load_paths_test.rb

commit a0eee5f	refs/tags/v3.1.0.rc2
Merge: 1ab556f 93659a3
Author: José Valim 
Date:   2011-05-22 04:11:29 -0700

    Merge pull request #1208 from dasch/patch-1
    
    Remove superfluous whitespace from ActiveModel::SecurePassword

commit 93659a3	refs/tags/v3.1.0.rc2
Author: Daniel Schierbeck 
Date:   2011-05-22 04:02:47 -0700

    Remove superfluous whitespace from ActiveModel::SecurePassword
    
    Only one space is needed, yo!

M	activemodel/lib/active_model/secure_password.rb

commit 1ab556f	refs/tags/v3.1.0.rc2
Merge: f924dbe 69bad8f
Author: José Valim 
Date:   2011-05-22 03:57:51 -0700

    Merge pull request #1206 from arunagw/jruby_openssl_load
    
    Let's load jruby-openssl now for all. #jruby

commit f924dbe	refs/tags/v3.1.0.rc2
Merge: c932539 7bf9d6f
Author: José Valim 
Date:   2011-05-22 03:48:55 -0700

    Merge pull request #1199 from vatrai/jdon_engine_test_fix
    
    test fix jdom_engine_test

commit c932539	refs/tags/v3.1.0.rc2
Merge: 82857ad 6e5419a
Author: José Valim 
Date:   2011-05-22 03:46:32 -0700

    Merge pull request #1198 from guilleiguaran/changelog_pluralize_table_names
    
    Adding pluralize_table_names change to CHANGELOG

commit 023ca4f	refs/heads/master
Author: Anuj Dutta 
Date:   2011-05-22 11:27:02 +0100

    Fixed documentation for scope with path.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 69bad8f	refs/tags/v3.1.0.rc2
Author: Arun Agrawal 
Date:   2011-05-22 15:49:30 +0530

    Let's load jruby-openssl now for all. #jruby

M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/test/generators/app_generator_test.rb

commit 9277e72	refs/heads/master
Author: David Chelimsky 
Date:   2011-05-22 02:47:54 -0400

    Stringify param values in controller tests.
    
    This reduces false positives that come from using ints in params in
    tests, which do not get converted to strings in the tests. In
    implementations going through rack, they do get converted to strings.
    
    - David Chelimsky and Sam Umbach

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit 4fe6d01	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-22 11:17:32 +0530

    Fix todo Time.xmlschema used instead of Time.parse

M	activesupport/lib/active_support/xml_mini.rb

commit 7bf9d6f	refs/tags/v3.1.0.rc2
Author: Vishnu Atrai 
Date:   2011-05-22 09:29:31 +0530

    test fix jdom_engine_test

M	activesupport/test/xml_mini/jdom_engine_test.rb

commit 6e5419a	refs/tags/v3.1.0.rc2
Author: Guillermo Iguaran 
Date:   2011-05-21 22:02:28 -0500

    Adding pluralize_table_names change to CHANGELOG

M	activerecord/CHANGELOG

commit 82857ad	refs/tags/v3.1.0.rc1 (tag: v3.1.0.rc1)
Author: David Heinemeier Hansson 
Date:   2011-05-21 20:56:52 -0500

    Bump versions for rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 073f80e	refs/tags/v3.1.0.rc1
Merge: f674aed a85e00c
Author: David Heinemeier Hansson 
Date:   2011-05-21 17:56:44 -0700

    Merge pull request #1195 from dmathieu/try_undefined_method
    
    Don't raise NoMethodError the tried method doesn't exists

commit e368a34	refs/heads/master
Author: Matthew McEachen 
Date:   2011-05-21 17:33:28 -0700

    Removed the `enginex` plugin reference which is broken -- rails 3.1.0.beta1 has that functionality now.

M	railties/guides/source/plugins.textile

commit a85e00c	refs/tags/v3.1.0.rc1
Author: dmathieu <42@dmathieu.com>
Date:   2011-05-22 00:32:58 +0200

    make sure missing method does not fail with arguments

M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 29a5aea	refs/tags/v3.1.0.rc1
Author: dmathieu <42@dmathieu.com>
Date:   2011-05-21 23:43:12 +0200

    don't raise NoMethodError the tried method doesn't exists

M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/test/core_ext/object_and_class_ext_test.rb

commit 4c99f32	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-22 03:12:47 +0530

    Not loading ruby-debug specially.

M	activeresource/test/abstract_unit.rb

commit b85694f	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-22 02:14:17 +0530

    Loading action_controller twice removed.

M	railties/test/rails_info_controller_test.rb

commit 1ffc306	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-22 02:02:56 +0530

    No more need rubygems here.

M	activemodel/test/cases/helper.rb
M	activeresource/test/abstract_unit.rb
M	railties/test/isolation/abstract_unit.rb

commit 31f09a2	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-21 17:10:59 -0300

    Remove extra white spaces on guides.

M	railties/guides/source/3_0_release_notes.textile
M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/plugins.textile

commit f674aed	refs/tags/v3.1.0.rc1
Merge: f007885 40e3377
Author: José Valim 
Date:   2011-05-21 13:08:13 -0700

    Merge pull request #1191 from arunagw/removal_extra
    
    Removal require again from tests.

commit 0087ef9	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-21 16:51:05 -0300

    Remove extra white spaces.

M	railties/guides/source/security.textile

commit 40e3377	refs/tags/v3.1.0.rc1
Author: Arun Agrawal 
Date:   2011-05-22 00:55:12 +0530

    Removal require again from tests.

M	activesupport/test/callback_inheritance_test.rb
M	activesupport/test/callbacks_test.rb
M	activesupport/test/file_update_checker_test.rb
M	activesupport/test/flush_cache_on_private_memoization_test.rb

commit f007885	refs/tags/v3.1.0.rc1
Merge: eb02579 03cd88a
Author: José Valim 
Date:   2011-05-21 10:42:01 -0700

    Merge pull request #1188 from thedarkone/duplicable-duration
    
    Fix AS::Duration#duplicable? on 1.8

commit eb02579	refs/tags/v3.1.0.rc1
Merge: f62aba7 0a15928
Author: Xavier Noria 
Date:   2011-05-21 10:39:28 -0700

    Merge pull request #1180 from Karunakar/documentation_change
    
    Documentation Error Fixed for ticket #839

commit f62aba7	refs/tags/v3.1.0.rc1
Author: David Heinemeier Hansson 
Date:   2011-05-21 12:04:41 -0500

    Now that we are compatible with Rake 0.9.0, lets allow it back in

M	railties/railties.gemspec

commit 8b719cf	refs/tags/v3.1.0.rc1
Merge: da8469f e290835
Author: David Heinemeier Hansson 
Date:   2011-05-21 09:57:37 -0700

    Merge pull request #1174 from bilts/fix-rake-dsl
    
    Make Rake::DSL methods available within Railtie rake_tasks block (so we're compatible with Rake 0.9.0).

commit da8469f	refs/tags/v3.1.0.rc1
Merge: eba978c 1c614bc
Author: Santiago Pastorino 
Date:   2011-05-21 09:43:42 -0700

    Merge pull request #1187 from thedarkone/polymorphic-class-fix
    
    Handle polymorphic_type NOT NULL columns

commit eba978c	refs/tags/v3.1.0.rc1
Author: David Heinemeier Hansson 
Date:   2011-05-21 11:23:54 -0500

    Uglifier works properly now with 0.5.4

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit f3c3a78	refs/tags/v3.1.0.rc1
Author: David Heinemeier Hansson 
Date:   2011-05-21 10:55:11 -0500

    Bind to Rake 0.8.7 until a fix for Rake 0.9.0 is released

M	railties/railties.gemspec

commit 09daaaa	refs/tags/v3.1.0.rc1
Author: Andrew White 
Date:   2011-05-21 16:28:11 +0100

    Add support for passing mass assignment roles to dynamic finders. Closes #1170.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/mass_assignment_security_test.rb

commit 7c562d5	refs/heads/master
Author: Jorge Bejar 
Date:   2011-05-21 12:06:04 -0300

    Add method fields_for_with_index to FormHelper

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 03cd88a	refs/tags/v3.1.0.rc1
Author: thedarkone 
Date:   2011-05-21 15:32:20 +0200

    Fix AS::Duration#duplicable? on 1.8

M	activesupport/lib/active_support/duration.rb
M	activesupport/test/core_ext/duplicable_test.rb

commit 1c614bc	refs/tags/v3.1.0.rc1
Author: thedarkone 
Date:   2011-05-21 15:18:09 +0200

    Handle polymorphic_type NOT NULL-able columns as well.

M	activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb

commit 1a959ad	refs/tags/v3.1.0.rc1
Merge: 26703f4 6b0dc80
Author: José Valim 
Date:   2011-05-21 04:57:36 -0700

    Merge pull request #1182 from prakashmurthy/patch-1
    
    Enhanced test for duplicable in  active_support/core_ext/object/duplicable.rb

commit 26703f4	refs/tags/v3.1.0.rc1
Merge: d62a39a f72f591
Author: José Valim 
Date:   2011-05-21 04:55:37 -0700

    Merge pull request #1165 from arunagw/rubyforge_remove
    
    Not updating rubyforge for new versions.

commit e9a2ff8	refs/heads/master
Author: Bhavin Kamani 
Date:   2011-05-21 15:50:25 +0530

    fix connection not established error while running rake task
    db:schema:dump

M	activerecord/lib/active_record/railties/databases.rake

commit 6b0dc80	refs/tags/v3.1.0.rc1
Author: Prakash Murthy 
Date:   2011-05-21 02:19:52 -0700

    Check for Module.new.dup as well in https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/object/duplicable.rb

M	activesupport/test/core_ext/duplicable_test.rb

commit d62a39a	refs/tags/v3.1.0.rc1
Merge: 7288682 e0e8918
Author: Jon Leighton 
Date:   2011-05-21 01:30:00 -0700

    Merge pull request #1162 from guilleiguaran/singularize_individual_table_name
    
    Singularize individual table name

commit 0a15928	refs/tags/v3.1.0.rc1
Merge: 3d789ea 7288682
Author: Ganesh Kumar 
Date:   2011-05-21 13:56:24 +0530

    Merge remote branch 'upstream/master' into documentation_change

commit 3d789ea	refs/tags/v3.1.0.rc1
Author: Ganesh Kumar 
Date:   2011-05-21 13:55:52 +0530

    ActionMailer deliver method Documentation corrected Ticket #761

M	activemodel/lib/active_model/observing.rb
M	activerecord/lib/active_record/observer.rb

commit 7288682	refs/tags/v3.1.0.rc1
Merge: 89d7133 cd6ae26
Author: José Valim 
Date:   2011-05-21 00:37:17 -0700

    Merge pull request #1179 from castlerock/activesupport_test
    
    fixed failing tests of ActiveSupport for deprecation test

commit b134e0f	refs/tags/v3.1.0.rc1
Author: Karunakar (Ruby) 
Date:   2011-05-21 13:01:53 +0530

    Documentation Error Fixed for ticket #839

M	activerecord/lib/active_record/base.rb

commit cd6ae26	refs/tags/v3.1.0.rc1
Author: Raghunadh 
Date:   2011-05-21 00:29:30 -0700

    fixed failing tests of ActiveSupport for deprecation test

M	activesupport/test/deprecation_test.rb

commit 89d7133	refs/tags/v3.1.0.rc1
Author: Andrew White 
Date:   2011-05-21 07:11:21 +0100

    Correct example and expand on description of :shallow option for resources

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit ea548c8	refs/tags/v3.1.0.rc1
Merge: e4bcd5e c9b5d64
Author: José Valim 
Date:   2011-05-20 22:31:44 -0700

    Merge pull request #1178 from joshk/ruby19_warning
    
    Corrected a minor ruby19 variable name reuse warning

commit c9b5d64	refs/tags/v3.1.0.rc1
Author: Josh Kalderimis 
Date:   2011-05-21 01:27:35 -0400

    corrected a minor ruby19 variable name reuse warning

M	activesupport/lib/active_support/buffered_logger.rb

commit e4bcd5e	refs/heads/master
Merge: fa3f273 c659505
Author: José Valim 
Date:   2011-05-20 22:24:49 -0700

    Merge pull request #1177 from joshk/ruby19_warnings
    
    Fixed some ruby 19 warnings

commit c659505	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-21 01:23:17 -0400

    fixed some ruby 19 warnings, including circular requires and variable name reuse

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/template/handlers/erb.rb

commit fa3f273	refs/heads/master
Merge: 5eadb4d 1bfe9ec
Author: José Valim 
Date:   2011-05-20 22:21:21 -0700

    Merge pull request #1175 from joshk/active_resource_correction
    
    attr_accessor_with_default removed from ActiveResource

commit 1bfe9ec	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-21 01:05:35 -0400

    attr_accessor_with_default is deprecated, so lets not use it in ActiveResource

M	activeresource/lib/active_resource/base.rb

commit e0e8918	refs/tags/v3.1.0.rc1
Author: Guillermo Iguaran 
Date:   2011-05-20 22:53:02 -0500

    AliasTracker.pluralize use pluralize_table_names of model

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/associations/join_helper.rb

commit e290835	refs/tags/v3.1.0.rc1
Author: Patrick Quinn 
Date:   2011-05-20 20:02:20 -0400

    Make Rake::DSL methods available within Railtie rake_tasks block
    
    Fixes incompatibility introduced by Rake 0.9.0

M	railties/lib/rails/application.rb
M	railties/lib/rails/railtie.rb

commit bf50935	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-20 21:56:08 -0300

    Add more doc to #update_column.

M	activerecord/lib/active_record/persistence.rb

commit 5eadb4d	refs/heads/master
Author: José Valim 
Date:   2011-05-20 22:20:51 +0200

    Temporarily ship with ContentLength middleware.

M	Gemfile
M	actionpack/actionpack.gemspec
M	railties/lib/rails/application.rb
M	railties/lib/rails/rack.rb
A	railties/lib/rails/rack/content_length.rb
D	railties/lib/rails/rack/static.rb
M	railties/test/application/middleware_test.rb

commit ad3e057	refs/heads/master
Author: Uģis Ozols 
Date:   2011-05-20 20:26:20 +0300

    Remove duplicate words.

M	railties/lib/rails/engine.rb

commit 19ee841	refs/heads/master
Merge: 499825e e5429b7
Author: José Valim 
Date:   2011-05-20 08:17:11 -0700

    Merge pull request #1169 from senny/specify_a_custom_active_model_name
    
    Specify the name to be used for ActiveModel::Name fixes #1168

commit e5429b7	refs/heads/master
Author: Yves Senn 
Date:   2011-05-20 16:48:51 +0200

    Specify the name to be used for ActiveModel::Name fixes #1168
    
    This patch allows to specify the name of your models independent of the class name.

M	activemodel/lib/active_model/naming.rb
M	activemodel/test/cases/naming_test.rb

commit 499825e	refs/heads/master
Merge: 5b8bc46 b91c907
Author: Xavier Noria 
Date:   2011-05-20 06:03:12 -0700

    Merge pull request #1157 from smartinez87/extra_whitespaces
    
    Remove extra white spaces.

commit f72f591	refs/tags/v3.1.0.rc1
Author: Arun Agrawal 
Date:   2011-05-20 17:39:33 +0530

    Not updating rubyforge for new versions. Result of "gem list -d rails" is not useful.

M	actionmailer/actionmailer.gemspec
M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activerecord/activerecord.gemspec
M	activeresource/activeresource.gemspec
M	activesupport/activesupport.gemspec
M	rails.gemspec
M	railties/railties.gemspec

commit 5b8bc46	refs/heads/master
Merge: 54823fe 1592130
Author: Xavier Noria 
Date:   2011-05-20 03:19:13 -0700

    Merge pull request #1161 from guilleiguaran/each_syntax_in_activerecord
    
    Syntax cleanup:  for in => each on ActiveRecord

commit 23e94a6	refs/tags/v3.1.0.rc1
Author: Guillermo Iguaran 
Date:   2011-05-20 01:53:13 -0500

    Refactoring test_has_many_with_pluralize_table_names_false test

M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/models/aircraft.rb

commit 6a3b3fb	refs/tags/v3.1.0.rc1
Author: Guillermo Iguaran 
Date:   2011-05-20 01:44:13 -0500

    Allow pluralize_table_names for individual model

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 93570bb	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-19 22:33:43 -0700

    Changin 'for' with 'each' on FormHelpers guide

M	railties/guides/source/form_helpers.textile

commit d037350	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-19 22:30:51 -0700

    Using each instead of for in actionview guide

M	railties/guides/source/action_view_overview.textile

commit 22abbb8	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-19 22:26:34 -0700

    Replacing 'for' with 'each' in actionmailer guide

M	railties/guides/source/action_mailer_basics.textile

commit 1592130	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-20 00:22:17 -0500

    for => each in model migration template

M	activerecord/lib/rails/generators/active_record/model/templates/migration.rb

commit 696c2ea	refs/remotes/origin/serializers
Author: Akira Matsuda 
Date:   2011-05-20 13:17:16 +0900

    Tests for new create_table DSL

M	activerecord/test/cases/migration_test.rb

commit 0cb812a	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-19 21:12:11 -0700

    Changing examples: use 'each' instead of 'for in'

M	activerecord/lib/active_record/associations.rb

commit 993e8c5	refs/remotes/origin/serializers
Author: Akira Matsuda 
Date:   2011-05-20 13:09:32 +0900

    No "t." for the migration DSL!
    
    Now you can omit |t| block parameter and all the t. from your migration code, that means, the syntax looks more Rails-3-ish, like the routes DSL and ActionMailer DSL.
    Also, this change won't break any of your existing migration files, since the traditional syntax is still available.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/session_store.rb

commit e7d600d	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-19 22:55:37 -0500

    Syntax cleanup:  for in => each

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/serialization.rb

commit 54823fe	refs/heads/master
Author: Joshua Peek 
Date:   2011-05-19 21:49:50 -0500

    Use sprockets prepend_path if its available

M	railties/lib/rails/engine.rb

commit 0d310d5	refs/heads/master
Author: Diego Plentz 
Date:   2011-05-19 17:38:15 -0700

    fixes code highlight in shallow_path example

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit b91c907	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-19 20:51:33 -0300

    Remove extra white spaces.

M	activerecord/lib/active_record/associations.rb

commit 223f311	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-19 20:46:43 -0300

    Remove extra white-spaces.

M	activerecord/lib/active_record/associations.rb

commit 0afd585	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-19 23:28:44 +0100

    Implement proxy_owner, proxy_target and proxy_reflection methods on CollectionProxy with deprecations. Fixes #1148.

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations_test.rb

commit c037499	refs/heads/master
Merge: e4ebded 36e330b
Author: Santiago Pastorino 
Date:   2011-05-19 12:49:01 -0700

    Merge pull request #1153 from arunagw/sprockets_update
    
    Sprockets version update.

commit 36e330b	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-19 23:46:26 +0530

    Sprockets version update.

M	actionpack/actionpack.gemspec

commit e4ebded	refs/remotes/origin/serializers
Author: José Valim 
Date:   2011-05-19 09:34:01 -0400

    Use Rack::ContentLength.

M	railties/lib/rails/application.rb
M	railties/test/application/middleware_test.rb

commit 2c08a74	refs/remotes/origin/serializers
Merge: feddf31 6f0ebe0
Author: Michael Koziarski 
Date:   2011-05-19 09:13:54 -0700

    Merge pull request #1097 from kirillrdy/master
    
    Improved "treat  0000-00-00 00:00:00 as nil Date"

commit feddf31	refs/remotes/origin/serializers
Merge: bcdb681 d54c778
Author: Michael Koziarski 
Date:   2011-05-19 09:05:08 -0700

    Merge pull request #1118 from amatsuda/pp_console
    
    always enable `pp` on the Rails console

commit bcdb681	refs/remotes/origin/serializers
Merge: 4cf4c7f 968596f
Author: José Valim 
Date:   2011-05-19 07:51:11 -0700

    Merge pull request #1151 from joshk/wrap_params_options_change
    
    renamed the wrap_parameters :only and :except options to :include and :ex

commit 4cf4c7f	refs/remotes/origin/serializers
Merge: 95bd199 2d50887
Author: Joshua Peek 
Date:   2011-05-19 07:34:52 -0700

    Merge pull request #1150 from stevenbristol/master
    
    The cookie jar does not to_s cookie names (keys)

commit 968596f	refs/remotes/origin/serializers
Author: Josh Kalderimis 
Date:   2011-05-19 10:33:25 -0400

    renamed the wrap_parameters :only and :except options to :include and :exclude to make it consistent with controller filters

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/log_subscriber_test.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 2d50887	refs/remotes/origin/serializers
Author: steve 
Date:   2011-05-19 10:33:18 -0400

    adding test

M	actionpack/test/dispatch/cookies_test.rb

commit 7c000af	refs/remotes/origin/serializers
Author: steve 
Date:   2011-05-19 09:49:16 -0400

    fixing sym and string cookie name, two cookies to browser bug.

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 95bd199	refs/heads/master
Merge: 5281c29 ec1993c
Author: José Valim 
Date:   2011-05-19 05:02:06 -0700

    Merge pull request #1137 from guilleiguaran/each_syntax_in_activemodel
    
    Prefer 'each' instead of 'for in'

commit 5281c29	refs/heads/master
Merge: b5fec0f e3eaeb4
Author: José Valim 
Date:   2011-05-19 04:51:08 -0700

    Merge pull request #1136 from arunagw/actionmailer_readme
    
    Actionmailer readme

commit b5fec0f	refs/heads/master
Merge: a921cab 8630cd4
Author: José Valim 
Date:   2011-05-19 04:48:06 -0700

    Merge pull request #1135 from arunagw/for_to_each
    
    README updated for for => each

commit ec1993c	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-19 01:23:14 -0500

    Prefer each instead of for in

M	activemodel/lib/active_model/observing.rb

commit 3b18e90	refs/heads/master
Author: John Paul Ashenfelter 
Date:   2011-05-19 01:20:26 -0400

    Closes GH #1032
    
    Fixed what looks like minor cut/paste error in documentation for ActiveRecord::Locking:Pessimistic

M	activerecord/lib/active_record/locking/pessimistic.rb

commit e3eaeb4	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-19 09:17:49 +0530

    Example Usage updated for actionpack and actionmailer.

M	actionmailer/README.rdoc
M	actionmailer/lib/rails/generators/mailer/templates/mailer.rb
M	actionpack/lib/action_view/helpers/atom_feed_helper.rb
M	actionpack/test/template/atom_feed_helper_test.rb

commit 8630cd4	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-19 08:59:57 +0530

    README updated for for => each

M	actionpack/README.rdoc

commit a921cab	refs/heads/master
Merge: b13d24e 96acdfb
Author: José Valim 
Date:   2011-05-18 15:04:37 -0700

    Merge pull request #1109 from dlee/optimize_indifferent_access
    
    Use dup to preserve previous behavior

commit b13d24e	refs/heads/master
Merge: ab42f9c 1c9a9d9
Author: Xavier Noria 
Date:   2011-05-18 22:50:44 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit ab42f9c	refs/heads/master
Merge: 0ab2153 8649147
Author: José Valim 
Date:   2011-05-18 13:03:30 -0700

    Merge pull request #1133 from joshk/options_merger_test
    
    Fix misspelling of 'lambda'. Closes #987

commit 8649147	refs/heads/master
Author: Ben Orenstein 
Date:   2011-05-18 15:59:08 -0400

    Fix misspelling of 'lambda'. Closes #987

M	activesupport/test/option_merger_test.rb

commit 0ab2153	refs/heads/master
Merge: 200708e c88f7e8
Author: José Valim 
Date:   2011-05-18 12:56:09 -0700

    Merge pull request #1132 from joshk/ares_changelog
    
    Updated the ActiveResource changelog

commit 200708e	refs/heads/master
Merge: 3a5a378 fbf9965
Author: José Valim 
Date:   2011-05-18 12:55:28 -0700

    Merge pull request #1131 from joshk/active_model_xml_fix
    
    Attributes with :string type should not be given the type passed in model. Closes #1058.

commit fbf9965	refs/heads/master
Author: Jim Herzberg 
Date:   2011-05-18 15:52:55 -0400

    Attributes with :string type should not be given the type passed in model serialization options. Closes #1058

M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/test/cases/serializers/xml_serialization_test.rb

commit c88f7e8	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-18 14:40:35 -0400

    updated the ActiveResource changelog

M	activeresource/CHANGELOG

commit 3a5a378	refs/heads/master
Merge: 66afefd 0cd38a4
Author: Santiago Pastorino 
Date:   2011-05-18 09:34:50 -0700

    Merge pull request #1129 from amatsuda/pgsql_schema_query_format
    
    on.upcase!

commit 0cd38a4	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-19 01:29:34 +0900

    on.upcase!

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 66afefd	refs/heads/master
Merge: 77b70c7 486a890
Author: Aaron Patterson 
Date:   2011-05-18 09:05:18 -0700

    Merge pull request #1122 from amatsuda/postgres_schema_queries
    
    improvements on PostgreSQL schema queries

commit 77b70c7	refs/heads/master
Merge: f7df1f8 6d3b89b
Author: José Valim 
Date:   2011-05-18 08:53:38 -0700

    Merge pull request #1126 from sikachu/bump_rack_mount
    
    Update Rack::Mount to 0.8.1

commit 6d3b89b	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-18 11:32:34 -0400

    Update Rack::Mount to 0.8.1

M	actionpack/actionpack.gemspec

commit f7df1f8	refs/heads/master
Merge: 505defc cce4615
Author: José Valim 
Date:   2011-05-18 07:27:19 -0700

    Merge pull request #1124 from amatsuda/fix_railties_warnings
    
    Fix railties warnings

commit cce4615	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-18 20:37:57 +0900

    be sure to parenthesize the arguments when the first one is a RegExp literal
    
    this fixes: "warning: ambiguous first argument; put parentheses or even spaces"
    because: you need this to tell the parser that you're not calling :/ method (division)
    details (Japanese!): http://blade.nagaokaut.ac.jp/cgi-bin/vframe.rb/ruby/ruby-dev/42445?42370-43277

M	railties/test/generators/actions_test.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/controller_generator_test.rb
M	railties/test/generators/helper_generator_test.rb
M	railties/test/generators/mailer_generator_test.rb
M	railties/test/generators/migration_generator_test.rb
M	railties/test/generators/model_generator_test.rb
M	railties/test/generators/namespaced_generators_test.rb
M	railties/test/generators/observer_generator_test.rb
M	railties/test/generators/plugin_generator_test.rb
M	railties/test/generators/resource_generator_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb
M	railties/test/generators/session_migration_generator_test.rb
M	railties/test/generators_test.rb

commit 32b9cef	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-18 20:53:39 +0900

    parenthesize the arguments with splat
    
    to make sure we're not calling the :* operator

M	railties/lib/rails/engine.rb
M	railties/lib/rails/generators/actions.rb

commit 9aa10a7	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-18 20:48:54 +0900

    initialize @inside_template
    
    fixes: "warning: instance variable @inside_template not initialized"

M	railties/lib/rails/generators/named_base.rb

commit 505defc	refs/heads/master
Merge: 22ab231 0095869
Author: José Valim 
Date:   2011-05-18 06:13:44 -0700

    Merge pull request #1115 from joshk/active_resource_json_updates
    
    ActiveResource json updates

commit 22ab231	refs/heads/master
Merge: 9968b95 22ed6cb
Author: José Valim 
Date:   2011-05-18 06:10:11 -0700

    Merge pull request #1123 from amatsuda/generator_for_to_each
    
    change `for ... in` in the generator templates to Enumerator#each

commit 9968b95	refs/heads/master
Merge: 1ccacd4 3018f47
Author: José Valim 
Date:   2011-05-18 06:08:06 -0700

    Merge pull request #1117 from joshk/as_numeric_time
    
    Add some missing requires for AS core_ext/numeric/time. Closes #1038

commit 1ccacd4	refs/heads/master
Merge: 9d8e2fb d52fc25
Author: José Valim 
Date:   2011-05-18 06:04:30 -0700

    Merge pull request #1116 from guilleiguaran/typo_in_app_generator_test
    
    Fixing typo in test for turn gem

commit 22ed6cb	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-18 20:36:25 +0900

    for ... in => .each
    
    I believe this is more modern way

M	railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
M	railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
M	railties/lib/rails/generators/rails/controller/templates/controller.rb
M	railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
M	railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
M	railties/lib/rails/generators/test_unit/model/templates/fixtures.yml

commit a37ae63	refs/tags/v3.0.8.rc1
Author: Xavier Noria 
Date:   2011-05-18 12:43:29 +0200

    set log encoding to BINARY, but still use text mode to output portable newlines

M	activesupport/lib/active_support/buffered_logger.rb

commit 9d8e2fb	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-18 12:43:29 +0200

    set log encoding to BINARY, but still use text mode to output portable newlines

M	activesupport/lib/active_support/buffered_logger.rb

commit 486a890	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-18 18:31:34 +0900

    why not use JOIN statement for joining tables? (vol. 2)

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit df13f55	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-18 18:03:57 +0900

    remove unused table from FROM clause
    
    pg_namespace has not been used since this commit 29b0707f07f148d98515125dab44b73cfdc0a3d4

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit a615563	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-18 18:01:01 +0900

    why not use JOIN statement for joining tables?

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit d54c778	refs/remotes/origin/serializers
Author: Akira Matsuda 
Date:   2011-05-18 16:51:42 +0900

    always enable `pp` on the Rails console

M	railties/lib/rails/application.rb

commit 1c9a9d9	refs/heads/master
Author: Malcolm Locke 
Date:   2011-05-18 19:22:05 +1200

    Explicitly use ActiveRecord::IrreversibleMigration

M	railties/guides/source/migrations.textile

commit 96acdfb	refs/heads/master
Author: David Lee 
Date:   2011-05-17 22:56:28 -0700

    Test that HWIA.with_indifferent_access does not return self

M	activesupport/test/core_ext/hash_ext_test.rb

commit 3018f47	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-18 01:32:26 -0400

    add some missing requires for AS core_ext/numeric/time. Closes #1038

M	activesupport/lib/active_support/core_ext/numeric/time.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit d52fc25	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-18 00:31:01 -0500

    Fixing typo in test for turn gem

M	railties/test/generators/app_generator_test.rb

commit 2692d32	refs/heads/master
Merge: c2105d3 da29e0b
Author: José Valim 
Date:   2011-05-17 21:44:21 -0700

    Merge pull request #1112 from FLOChip/turn
    
    add test case for turn gem for testunit.

commit c2105d3	refs/heads/master
Merge: 9773f6e 28cf893
Author: José Valim 
Date:   2011-05-17 21:42:50 -0700

    Merge pull request #1114 from arunagw/databaseyml_doc
    
    Putting back mysql2 and sqlite3 in database.yml docs. In case people use

commit 0095869	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-17 19:50:34 -0400

    corrected some further tests and docs for the ARes change to json change

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/custom_methods.rb
M	activeresource/lib/active_resource/http_mock.rb
M	activeresource/test/cases/authorization_test.rb
M	activeresource/test/cases/connection_test.rb
M	activeresource/test/cases/finder_test.rb
M	activeresource/test/cases/http_mock_test.rb

commit b641ab5	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-17 19:32:31 -0400

    removed a contrived ARes example

D	activeresource/examples/simple.rb

commit 6b4bbb4	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-17 19:30:43 -0400

    updated all the tests in ARes to work with json

M	activeresource/lib/active_resource/base.rb
M	activeresource/lib/active_resource/connection.rb
M	activeresource/lib/active_resource/custom_methods.rb
M	activeresource/lib/active_resource/formats.rb
M	activeresource/lib/active_resource/formats/json_format.rb
M	activeresource/lib/active_resource/formats/xml_format.rb
M	activeresource/test/abstract_unit.rb
M	activeresource/test/cases/authorization_test.rb
M	activeresource/test/cases/base/custom_methods_test.rb
M	activeresource/test/cases/base/load_test.rb
M	activeresource/test/cases/base/schema_test.rb
M	activeresource/test/cases/base_test.rb
M	activeresource/test/cases/connection_test.rb
M	activeresource/test/cases/finder_test.rb
M	activeresource/test/cases/format_test.rb
M	activeresource/test/cases/log_subscriber_test.rb
M	activeresource/test/cases/observing_test.rb
M	activeresource/test/cases/validations_test.rb

commit 4a9365e	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-17 15:31:06 -0400

    move the ARes conn test to the correct location

A	activeresource/test/cases/connection_test.rb
D	activeresource/test/connection_test.rb

commit 6062017	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-17 15:00:29 -0400

    remove a circular dependency

M	activeresource/test/setter_trap.rb

commit 28cf893	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-18 10:00:27 +0530

    Putting back mysql2 and sqlite3 in database.yml docs. In case people use "--skip-gemfile"

M	railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml

commit 45faaee	refs/heads/master
Author: Evan Farrar 
Date:   2011-05-18 00:26:35 -0400

    Prevent duplicable comments from being the opening paragraph for Object docs

M	activesupport/lib/active_support/core_ext/object/duplicable.rb

commit da29e0b	refs/heads/master
Author: Teng Siong Ong 
Date:   2011-05-18 10:21:45 +0800

    don't include 'turn' gem in Gemfile if test unit is skipped.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit ea306da	refs/heads/master
Author: Teng Siong Ong 
Date:   2011-05-18 10:08:34 +0800

    add tests for ruby-debug gem in Gemfile and make sure that ruby-debug19 is used as long as RUBY_VERSION > '1.9'.

M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/app_generator_test.rb

commit 5df9d00	refs/heads/master
Author: siong1987 
Date:   2011-05-18 09:54:24 +0800

    add test case for turn gem for testunit.

M	railties/test/generators/app_generator_test.rb

commit 9773f6e	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-05-17 19:50:17 -0400

    Add missing require

M	activerecord/lib/active_record/railties/controller_runtime.rb

commit 84e541e	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-17 20:21:35 -0300

    Better doc styling in ActiveRecord::Locking

M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/locking/pessimistic.rb

commit fb3ea8b	refs/heads/master
Author: David Lee 
Date:   2011-05-17 15:53:54 -0700

    Use dup to preserve previous behavior

M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 0a070a2	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-05-17 18:29:20 -0400

    Run bundle install once when using plugin_new --full --mountable. Closes #555

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 78f855c	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-17 18:10:33 -0400

    bumping gem dependency for arel on 3.0.x

M	activerecord/activerecord.gemspec

commit a898df6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-17 18:05:27 -0400

    bumping arel requirement

M	activerecord/activerecord.gemspec

commit 6d31224	refs/heads/master
Author: José Valim 
Date:   2011-05-17 17:43:44 -0400

    Ensure Set-Cookie is not set on assets.

M	Gemfile
M	railties/test/application/assets_test.rb

commit f3b0be8	refs/heads/master
Author: Andrew White 
Date:   2011-05-17 22:30:19 +0100

    Don't pass a block as we are yielding

M	activerecord/lib/active_record/associations/singular_association.rb

commit 324f145	refs/heads/master
Author: José Valim 
Date:   2011-05-17 17:32:52 -0400

    Dump and load rack-cache stuff.

M	actionpack/lib/action_dispatch/http/rack_cache.rb
A	actionpack/test/dispatch/rack_cache_test.rb

commit b77e032	refs/heads/master
Merge: 1d8d799 7fcf0ca
Author: Jeremy Kemper 
Date:   2011-05-17 14:28:40 -0700

    Merge pull request #247 from goncalossilva/performance_test
    
    Performance tests improved

commit 1d8d799	refs/heads/master
Author: Joshua Peek 
Date:   2011-05-17 17:20:27 -0400

    Bump sprockets dependency

M	actionpack/actionpack.gemspec

commit 59baf2f	refs/heads/master
Author: Joshua Peek 
Date:   2011-05-17 17:19:33 -0400

    Remove old call to sprockets context

M	actionpack/lib/sprockets/railtie.rb

commit 3773aa4	refs/heads/master
Author: Andrew White 
Date:   2011-05-17 22:15:47 +0100

    Add block setting of attributes to singular associations

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations/builder/singular_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit be199a1	refs/heads/master
Author: José Valim 
Date:   2011-05-17 16:51:14 -0400

    Add a test case for issue #476.

M	railties/test/application/assets_test.rb

commit 42f1ad6	refs/heads/master
Author: Andrew White 
Date:   2011-05-17 20:37:11 +0100

    Pass the attribute and option hashes to build_association
    
    The build_association method was added as an API for plugins
    to hook into in 1398db0. This commit restores this API and the
    ability to override class.new to return a subclass based on
    a virtual attribute in the attributes hash.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/models/bulb.rb

commit b03da24	refs/tags/v3.0.8.rc1
Author: Michael Koziarski 
Date:   2011-05-17 15:33:19 -0400

    Add a deprecation warning about config.action_view.debug_rjs.
    
    Upgrading to 3.1 removes debug_rjs and upgraded apps will fail to start up.

M	actionpack/lib/action_view/base.rb
M	actionpack/test/template/prototype_helper_test.rb

commit b81f77e	refs/heads/master
Merge: 760dec1 79249f5
Author: José Valim 
Date:   2011-05-17 11:58:19 -0700

    Merge pull request #1093 from lucasmazza/patch-1
    
    Using the correct CSS compressor for the yui-compressor gem.

commit 760dec1	refs/heads/master
Author: José Valim 
Date:   2011-05-17 14:51:44 -0400

    Use anonymous? that works on both Ruby 1.8 and 1.9.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_controller/test_case.rb

commit 1d71c93	refs/heads/master
Merge: 442ed8c 5f19c42
Author: José Valim 
Date:   2011-05-17 11:29:56 -0700

    Merge pull request #1104 from colinyoung/master
    
    Update Chicago mayor

commit 442ed8c	refs/heads/master
Merge: f1e1e76 0e1e831
Author: José Valim 
Date:   2011-05-17 11:13:50 -0700

    Merge pull request #1106 from vatrai/user_instruct
    
    instruct user to install using Gem file in database.yml template

commit 0e1e831	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-17 23:16:33 +0530

    instruct user to install using Gem file in database.yml templete issue #1103

M	railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

commit f1e1e76	refs/heads/master
Merge: f627da1 13950a8
Author: José Valim 
Date:   2011-05-17 10:58:06 -0700

    Merge pull request #1090 from dchelimsky/issue-1089
    
    3.1: params_wrapper raises error on anynomous controllers

commit f627da1	refs/heads/master
Merge: 2b786ba 523bac6
Author: José Valim 
Date:   2011-05-17 10:49:15 -0700

    Merge pull request #1105 from kevmoo/b1103
    
    For Issue #1103 - Fix for sqlite3.yml, mysql.yml

commit 523bac6	refs/heads/master
Author: Kevin Moore 
Date:   2011-05-17 10:29:01 -0700

    Fix for sqlite3.yml, mysql.yml

M	railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
M	railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml

commit 5f19c42	refs/heads/master
Author: Colin Young 
Date:   2011-05-17 12:30:04 -0500

    Updated seeds.rb file.

M	railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt

commit 2b786ba	refs/heads/master
Merge: fbab6f9 ed119aa
Author: Jon Leighton 
Date:   2011-05-17 10:04:56 -0700

    Merge pull request #1100 from arunagw/innerjoin_test
    
    Fixed InnerJoinAssociationTest. Need to load essays fixture.

commit fbab6f9	refs/heads/master
Author: Michael Koziarski 
Date:   2011-05-17 12:03:58 -0400

    Don't print deprecation warnings every time the user reads or writes an inheritable attribute.  The warnings on declaration is enough.

M	activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb

commit 2004fb9	refs/tags/v3.0.8.rc1
Author: Michael Koziarski 
Date:   2011-05-17 11:23:12 -0400

    Make sure that 3.0.x apps generated reference a compatible mysql2 release.

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/test/generators/app_generator_test.rb

commit ed119aa	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-17 20:29:28 +0530

    Fixed InnerJoinAssociationTest. Need to load essays fixture.

M	activerecord/test/cases/associations/inner_join_association_test.rb

commit ab9639f	refs/heads/master
Merge: a52dc0d 94617d7
Author: José Valim 
Date:   2011-05-17 05:33:48 -0700

    Merge pull request #1099 from dlee/optimize_indifferent_access
    
    Optimize parts of HashWithIndifferentAccess

commit a52dc0d	refs/heads/master
Author: José Valim 
Date:   2011-05-17 05:32:14 -0700

    Fixes failing test, closes #1098.

M	railties/test/application/configuration_test.rb

commit 110a066	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-17 17:52:40 +0530

    fix coding error in readme reported in rails GH #980

M	actionpack/README.rdoc

commit 13950a8	refs/heads/master
Author: David Chelimsky 
Date:   2011-05-17 06:55:03 -0400

    add more robust test for wrapping params with anonymous class

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit ee82e1c	refs/heads/master
Author: Andy Lindeman 
Date:   2011-05-16 23:10:21 -0400

    Add fix for error when an anonymous controller subclasses ApplicationController

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit 14d5e3e	refs/heads/master
Author: David Chelimsky 
Date:   2011-05-16 12:37:30 -0500

    better test name

M	actionpack/test/controller/params_wrapper_test.rb

commit 29e8ca3	refs/heads/master
Author: David Chelimsky 
Date:   2011-05-16 12:30:36 -0500

    add failing test for https://github.com/rails/rails/issues/1089

M	actionpack/test/controller/params_wrapper_test.rb

commit 94617d7	refs/heads/master
Author: David Lee 
Date:   2011-05-17 03:01:31 -0700

    Optimize parts of HashWithIndifferentAccess

M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit b0385fe	refs/heads/master
Merge: 2033ff8 2c89ed9
Author: Jon Leighton 
Date:   2011-05-17 00:09:16 -0700

    Merge pull request #1095 from guilleiguaran/fix_join_model_test
    
    Adding missing require to join_model_test

commit 6f0ebe0	refs/remotes/origin/serializers
Author: Kirill Radzikhovskyy 
Date:   2011-05-17 16:31:09 +1000

    Year 0 should fall to nil only if month and day are also 0

M	activerecord/lib/active_record/connection_adapters/column.rb

commit 2c89ed9	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-16 22:22:27 -0500

    Adding missing require

M	activerecord/test/cases/associations/join_model_test.rb

commit 2033ff8	refs/heads/master
Merge: bf5e4b4 ecbde46
Author: Jon Leighton 
Date:   2011-05-16 15:40:12 -0700

    Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false
    
    Fixing has_many when ActiveRecord::Base.pluralize_table_names is false

commit 79249f5	refs/heads/master
Author: Lucas Mazza 
Date:   2011-05-16 15:19:44 -0700

    Using the correct CSS compressor for the yui-compressor gem.

M	actionpack/lib/sprockets/railtie.rb

commit bf5e4b4	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-16 23:55:19 +0200

    configuratin guide: finished a pass to the "Rails General Configuration" section

M	railties/guides/source/configuring.textile

commit 565865e	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-16 21:24:57 +0530

    Link changes lighthouse to github

M	railties/guides/source/layout.html.erb

commit 6733721	refs/heads/master
Author: José Valim 
Date:   2011-05-16 11:19:11 -0400

    Deprecate attr_accessor_with_default.

M	activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
M	activesupport/test/core_ext/module/attr_accessor_with_default_test.rb

commit 40fa511	refs/heads/master
Merge: 12a4376 4d1752b
Author: José Valim 
Date:   2011-05-16 07:54:02 -0700

    Merge pull request #1087 from amatsuda/generate_number_field_tag
    
    generate HTML5 number_field tag for integer fields

commit 4d1752b	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-16 23:43:05 +0900

    generate HTML5 number_field tag for integer fields

M	railties/lib/rails/generators/generated_attribute.rb
M	railties/test/generators/generated_attribute_test.rb

commit f2c6f04	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-10 13:21:58 -0700

    make sure log file is written in binary mode. fixes #497

M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/test/buffered_logger_test.rb

commit a2b1be2	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-04-26 10:41:59 -0700

    simplifying buffered logger for easier and slightly more performant codes. pumpkin

M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/lib/active_support/log_subscriber.rb

commit 12a4376	refs/heads/master
Merge: 8b0262f 35c5ccb
Author: José Valim 
Date:   2011-05-16 04:23:44 -0700

    Merge pull request #1085 from amatsuda/amo_validator_initializer_cleanup
    
    cleanups on AMo validator initializers

commit 35c5ccb	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-16 14:53:30 +0900

    Remove unneeded merge with default false options

M	activemodel/lib/active_model/validations/numericality.rb

commit cbe1d24	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-16 14:31:00 +0900

    Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use it only when needed.

M	activemodel/lib/active_model/validations/length.rb

commit 23ad13e	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-15 21:19:15 -0700

    Mailer example has more sense calling to deliver method

M	activerecord/README.rdoc

commit 8b0262f	refs/heads/master
Merge: d043d65 2470392
Author: José Valim 
Date:   2011-05-15 19:48:03 -0700

    Merge pull request #573 from smartinez87/attr
    
    Add doc to #attribute_names

commit 2470392	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-15 21:33:49 -0300

    Add doc to #attribute_names

M	activerecord/lib/active_record/base.rb

commit d043d65	refs/heads/master
Merge: 6e581cc d77b306
Author: José Valim 
Date:   2011-05-15 16:13:29 -0700

    Merge pull request #570 from sikachu/decouple_actionpack
    
    Make ParamsWrapper use a well-defined API and not rely on AR methods

commit d77b306	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-15 14:25:00 -0400

    Make ParamsWrapper calling newly introduced `Model.attribute_names` instead of `.column_names`

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 5ca67ec	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-15 14:19:09 -0400

    Add ActiveRecord::attribute_names to retrieve a list of attribute names. This method will also return an empty array on an abstract class or a model that the table doesn't exists.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 6e581cc	refs/heads/master
Merge: dde82a4 82f33dc
Author: José Valim 
Date:   2011-05-15 15:51:20 -0700

    Merge pull request #568 from carlosantoniodasilva/fields_for_fixes
    
    Fields for fixes for non nested attributes and without object

commit dde82a4	refs/heads/master
Merge: 3448288 6bd99ec
Author: Xavier Noria 
Date:   2011-05-15 22:23:40 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 3448288	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-15 22:22:31 +0200

    reviewed the first ~70 lines of the configuration guide

M	railties/guides/source/configuring.textile

commit 6bd99ec	refs/heads/master
Author: Pirogov Evgenij 
Date:   2011-05-15 10:25:33 -0700

    Use more English language

M	railties/guides/source/getting_started.textile

commit 6a408f3	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-15 08:19:36 -0700

    Fixing Changelog link

M	railties/guides/source/getting_started.textile

commit ecbde46	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-14 14:15:53 -0500

    Fixing has_many association when ActiveRecord::Base.pluralize_table_names is false. fixes #557

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/test/cases/associations/join_model_test.rb
A	activerecord/test/models/aircraft.rb
M	activerecord/test/schema/schema.rb

commit 5d24c3c	refs/heads/master
Merge: 7e6145b 3bed43c
Author: Aaron Patterson 
Date:   2011-05-14 21:52:31 -0700

    Merge pull request #564 from sikachu/fix_wrapper
    
    Do not try to call `column_names` on the abstract class.

commit 3bed43c	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-15 00:41:20 -0400

    Do not try to call `column_names` on the abstract class.
    
    Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 82f33dc	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2011-05-14 22:18:36 -0300

    Use record_name to make fields for methods more consistent

M	actionpack/lib/action_view/helpers/form_helper.rb

commit f0479cb	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2011-05-14 20:58:02 -0300

    Refactor fields_for to make the api more clear, and fix usage with non nested attributes and without object

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 4b10585	refs/heads/master
Author: Pirogov Evgenij 
Date:   2011-05-14 15:40:32 -0700

    Clean up redundant backslashes

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 6871cda	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2011-05-14 17:23:34 -0300

    Cleanup instantiate builder method definition

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 7e6145b	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-14 19:45:26 +0100

    These extra array operations appear to be unnecessary. Reasoning:
    
     * It is not necessary to subtract 'id' from the list of copied attributes because record and mem_record are equal, so therefore their id attributes are also equal (so there is no harm in copying it, and this reduces the complexity of the code)
     * It is not necessary to intersect the attribute names, since record and mem_record are equal, so they have the same id and class, so they have the same columns in the database. If record has non-column attributes then it seems reasonable to also copy them onto mem_record (though I am not sure what situation this would ever happen in)

M	activerecord/lib/active_record/associations/collection_association.rb

commit 60b23ea	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-14 19:40:24 +0100

    CollectionAssociation#merge_target_lists should write to the underlying attributes when copying, rather than using the assignment method

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/bulb.rb
M	activerecord/test/schema/schema.rb

commit 6660bee	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-14 18:45:11 +0100

    An attempt to make CollectionAssociation#merge_target_lists make more sense.

M	activerecord/lib/active_record/associations/collection_association.rb

commit e7e1d83	refs/heads/master
Author: José Valim 
Date:   2011-05-14 03:59:14 -0700

    Added some docs to controller runtime.

M	activerecord/lib/active_record/railties/controller_runtime.rb

commit c4837f6	refs/heads/master
Merge: d491130 6d96124
Author: José Valim 
Date:   2011-05-14 03:57:24 -0700

    Merge pull request #554 from tomafro/reset-activerecord-runtime-before-each-request
    
    ActiveRecord::LogSubscriber.runtime should be reset at the start of each request

commit 6d96124	refs/heads/master
Author: Tom Ward 
Date:   2011-05-14 10:31:00 +0100

    Reset ActiveRecord::LogSubscriber runtime at the start of each request
    
    Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called.  Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect.  Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously.

M	actionpack/test/activerecord/controller_runtime_test.rb
M	activerecord/lib/active_record/railties/controller_runtime.rb

commit 518ffcd	refs/heads/master
Author: Tom Ward 
Date:   2011-05-14 10:25:08 +0100

    Escape regex in controller_runtime_test to actually check that the ActiveRecord message appears

M	actionpack/test/activerecord/controller_runtime_test.rb

commit d491130	refs/heads/master
Merge: db886c8 e5524d5
Author: Xavier Noria 
Date:   2011-05-14 11:21:27 +0200

    Merge branch 'master' of git://github.com/lifo/docrails
    
    Conflicts:
    	actionpack/lib/action_view/helpers/date_helper.rb
    	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit e5524d5	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-14 11:15:43 +0200

    minor edits after going through what's new in docrails

M	actionpack/lib/abstract_controller/url_for.rb
M	actionpack/lib/action_controller/metal/url_for.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb

commit db886c8	refs/heads/master
Merge: 1fac9c7 546db69
Author: Piotr Sarnacki 
Date:   2011-05-14 01:54:16 -0700

    Merge pull request #553 from arunagw/namespaced_generators
    
    Fixed failing tests for namespaced_generators_test. in 1.9.2

commit 546db69	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-14 14:05:54 +0530

    Fixed failing tests for namespaced_generators_test. in 1.9.2

M	railties/test/generators/namespaced_generators_test.rb

commit 47003f8	refs/heads/master
Author: Karel Minarik 
Date:   2011-05-14 09:03:30 +0200

    [GUIDES] Changed the `LANGUAGE` variable to `GUIDES_LANGUAGE` to minimize conflicts with regular environment variables (eg. in Ubuntu)

M	railties/guides/rails_guides/generator.rb

commit 1fac9c7	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-13 23:22:13 -0700

    securerandom ships with 1.8.7+, so just use it

M	activesupport/lib/active_support/secure_random.rb

commit cbe6e09	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-14 03:25:06 +0200

    asking the user whether he is "offline" rather than "online" seems more natural as reaction to a potential missing network connection

M	railties/lib/rails/generators/app_base.rb

commit 959b7b0	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-14 02:49:20 +0200

    removes now unused method Rails::Generators::AppBase#dev_or_edge?

M	railties/lib/rails/generators/app_base.rb

commit 26cfd1f	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-14 02:36:29 +0200

    application and plugin generation run bundle install unless --skip-gemfile or --skip-bundle

M	railties/CHANGELOG
M	railties/lib/rails/generators/app_base.rb
M	railties/test/generators/shared_generator_tests.rb

commit 345beb8	refs/heads/master
Merge: 8a1de9b 6b07d7f
Author: José Valim 
Date:   2011-05-13 17:19:30 -0700

    Merge pull request #550 from jasondew/patch-1
    
    typo

commit 6b07d7f	refs/heads/master
Author: Jason Dew 
Date:   2011-05-13 17:15:29 -0700

    typo

M	actionpack/lib/action_dispatch/testing/test_process.rb

commit 8a1de9b	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-13 23:40:56 +0100

    Instead of doing find(:all) which does scoped.find(:all) which does scoped.all, just do scoped.all.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 5d4799d	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-13 23:38:32 +0100

    Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't see a way that it would happen ever)

M	activerecord/lib/active_record/associations/collection_association.rb

commit 0307fc7	refs/heads/master
Merge: a4a3381 f2769eb
Author: José Valim 
Date:   2011-05-13 15:29:36 -0700

    Merge pull request #540 from sikachu/mailer_generator_1_9_style
    
    Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9

commit f2769eb	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-13 00:28:38 -0400

    Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9
    
    As always, you can run `--old-style-hash` to override that.

M	actionmailer/lib/rails/generators/mailer/templates/mailer.rb
M	railties/CHANGELOG
M	railties/test/generators/mailer_generator_test.rb

commit 849007f	refs/tags/v3.0.8.rc1
Author: Bradley Harris 
Date:   2011-04-29 14:47:49 -0400

    Fix bug with empty CDATA not being handled in Hash.from_xml
    
    Signed-off-by: José Valim 

M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit a4a3381	refs/heads/master
Merge: 308ea60 e987bc5
Author: José Valim 
Date:   2011-05-13 15:01:07 -0700

    Merge pull request #542 from guilleiguaran/1_9_hash_style
    
    Use new hash syntax in wrap_parameters initializer under Ruby 1.9

commit 308ea60	refs/heads/master
Merge: c55d7ab a4041c5
Author: José Valim 
Date:   2011-05-13 14:51:46 -0700

    Merge pull request #547 from vatrai/patch-1
    
    rack_mount upgrade to new version 0.8.0

commit c55d7ab	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 22:22:26 +0200

    move bundler loading down to #bundle_command

M	railties/lib/rails/generators/app_base.rb

commit a44f228	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-13 10:28:47 -0700

    backport skip to the AR base class

M	activerecord/lib/active_record/test_case.rb

commit ce1a1b4	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-13 11:49:39 -0700

    supporting infinity and -infinity for timestamps in PG. fixes #544

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/timestamp_test.rb

commit b1ceffd	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 21:34:11 +0200

    run bundler programmatically rather than shelling out

M	railties/lib/rails/generators/app_base.rb

commit 159e605	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-14 00:51:54 +0530

    minor corrections

M	railties/guides/source/action_controller_overview.textile

commit 4ef4d57	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-13 15:13:40 -0400

    Link the API documentation to non-edge instead

M	railties/guides/source/action_controller_overview.textile

commit dc2b999	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-13 11:49:39 -0700

    supporting infinity and -infinity for timestamps in PG. fixes #544

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/timestamp_test.rb

commit 50639c9	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-05-13 14:31:09 -0400

    Adding guide for wrapping JSON/XML parameters, which also links to the API documentation.
    
    Note that it currently links to http://edgeapi.rubyonrails.org because it's Rails 3.1 feature.

M	railties/guides/source/action_controller_overview.textile

commit a4041c5	refs/heads/master
Author: Vishnu K. Sharma 
Date:   2011-05-13 10:44:08 -0700

    rack_mount upgrade to new version 0.8.0

M	actionpack/actionpack.gemspec

commit e4f48b9	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-13 10:28:47 -0700

    backport skip to the AR base class

M	activerecord/lib/active_record/test_case.rb

commit 7775670	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-03-08 14:09:44 -0800

    test/unit in ruby trunk adds a new instance variable. YAY!

M	actionpack/lib/action_view/test_case.rb

commit 81535fa	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-13 09:39:23 -0700

    use encoding name since SJIS is Windows-31J on 1.9.3

M	actionpack/test/template/render_test.rb

commit 00da7bc	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-13 09:30:14 -0700

    use valid yaml in tests

M	actionpack/test/controller/webservice_test.rb

commit ea9ef39	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-13 09:30:06 -0700

    RedCloth will not install on 1.9.3

M	Gemfile

commit 56b6d7d	refs/tags/v3.0.8.rc1
Author: Doug Fales 
Date:   2011-01-18 15:36:08 -0700

    A patch so that http status codes are still included in logs even during an exception [#6333 state:resolved]
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/log_subscriber.rb
M	actionpack/test/controller/log_subscriber_test.rb

commit 2a98fd9	refs/heads/master
Merge: e2c4282 e72a6f8
Author: Piotr Sarnacki 
Date:   2011-05-13 02:55:22 -0700

    Merge pull request #538 from arunagw/update_rack_mount
    
    Update rack mount

commit e987bc5	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-13 00:44:48 -0500

    Using new hash syntax in wrap_parameters initializer under Ruby 1.9

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit e2c4282	refs/heads/master
Author: Joshua Peek 
Date:   2011-05-12 22:05:46 -0500

    Update for sprockets/master context class api

M	actionpack/lib/sprockets/railtie.rb

commit e72a6f8	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-13 08:12:06 +0530

    Test added for getting route segment values

M	railties/test/railties/engine_test.rb

commit 975fd56	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-13 08:01:16 +0530

    rack-mount gem updated.

M	actionpack/actionpack.gemspec

commit deea8ca	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-12 19:58:05 -0500

    Prefer topic branches instead of master branch for users contributions

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 2e5d312	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 02:11:47 +0200

    use #quietly in a few places, and s/silence/capture/ where intention is capture

M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit ceeab61	refs/heads/master
Merge: bdbb15e acb3dbb
Author: Xavier Noria 
Date:   2011-05-12 17:06:05 -0700

    Merge pull request #537 from amatsuda/update_scripts2
    
    eliminating the noise

commit acb3dbb	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-13 08:59:09 +0900

    eliminating the noise

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit bdbb15e	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 01:41:52 +0200

    new reporting method Kernel#quietly

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/kernel/reporting.rb
M	railties/guides/source/active_support_core_extensions.textile
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit b0062ee	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 01:03:01 +0200

    silences stderr to prevent an expected error message in the test suite from being echoed

M	railties/test/generators/app_generator_test.rb

commit 2561a1f	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 00:57:16 +0200

    say something when running bundle commands
    
    This is convenient because we buffer stdout. In particular
    bundle install takes a while and generation just hangs there
    with no indication of what's going on otherwise.

M	railties/lib/rails/generators/app_base.rb

commit ead9e4e	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 00:46:45 +0200

    say silence when you mean silence

M	railties/test/generators/shared_generator_tests.rb

commit c88dddb	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 00:43:43 +0200

    application and plugin generation run bundle check unless --skip-gemfile
    
    The purpose of this feature is that the user knows whether
    dependencies are satisfied. In particular, if they are not
    he will be warned upfront, rather than finding out himself
    in an abrupt way by trying to run something.

M	railties/CHANGELOG
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit 55d87d2	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-13 00:06:38 +0200

    removes duplicate tests

M	railties/test/generators/shared_generator_tests.rb

commit 3ad5fd1	refs/tags/v2.3.12
Author: Ryan Davis 
Date:   2011-05-12 16:02:41 -0700

    Removed the bulk of the deprecations by simply not calling refresh.
    This may cause problems. I dunno.
    The real solution is to get rid of all of this mess and use gem paths properly.

M	railties/lib/rails/vendor_gem_source_index.rb

commit 4c37257	refs/tags/v2.3.12
Author: Ryan Davis 
Date:   2011-05-12 16:01:56 -0700

    Fixed buggy gem activation. Don't pass a dependency to gem, pass the
    name and requirement. Better, just activate the spec for the
    dependency (1.8 only)

M	railties/lib/rails/gem_dependency.rb

commit c20a4d1	refs/tags/v2.3.12
Author: Ryan Davis 
Date:   2011-05-12 16:01:10 -0700

    Removed buggy GemDependency#requirement override. Overrides should NEVER change the semantics of the parent (returning nil if default).

M	railties/lib/rails/gem_dependency.rb

commit 01a9fbb	refs/tags/v2.3.12
Author: Ryan Davis 
Date:   2011-05-12 16:00:28 -0700

    Fix broken GemDependency#==. You should ALWAYS check the class!

M	railties/lib/rails/gem_dependency.rb

commit 8d4ca9e	refs/tags/v2.3.12
Author: Ryan Davis 
Date:   2011-05-12 16:00:03 -0700

    Fix stupid emacsisms. Just makes things more readable.

M	railties/lib/rails/gem_dependency.rb

commit 6e466f1	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-12 23:29:07 +0100

    Don't use mass-assignment protection when setting foreign keys or association conditions on singular associations. Fixes #481 (again).

M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/models/car.rb

commit b210d9e	refs/heads/master
Merge: 2bff301 00379ee
Author: José Valim 
Date:   2011-05-12 13:15:05 -0700

    Merge pull request #532 from amatsuda/update_script
    
    Revert "Delegate everything to the generator"

commit 2bff301	refs/heads/master
Merge: 27a61f4 9d8ce55
Author: José Valim 
Date:   2011-05-12 12:44:39 -0700

    Merge pull request #531 from amatsuda/update_javascripts
    
    remove update:javascripts rake task

commit 00379ee	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-13 04:05:44 +0900

    Revert "Delegate everything to the generator"
    
    This reverts commit 0904e8256864239f673bf91fce1cfffb9345ee61.
    
    reason: rake rails:update:scripts fails due to this change

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 9d8ce55	refs/heads/master
Author: Akira Matsuda 
Date:   2011-05-13 03:12:08 +0900

    remove update:javascripts rake task
    
    because javascript libraries are not bundled anymore, and create_javascript_files generator was already removed

M	railties/lib/rails/tasks/framework.rake

commit 27a61f4	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-12 12:48:57 -0500

    The new release supposedly fixed things, but it is still b0rked -- comment out for now pending JPs investigation into whats up

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 2cf191b	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-12 10:57:55 -0500

    Proper fix

M	railties/lib/rails/application/configuration.rb

commit 244e460	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-12 10:30:58 -0500

    Fix the assets regexp for non-js/css files

M	railties/lib/rails/application/configuration.rb

commit 85662c0	refs/heads/master
Merge: 987f79c 3d03c79
Author: Santiago Pastorino 
Date:   2011-05-12 06:48:04 -0700

    Merge pull request #527 from joshk/deprecation_circular_dependency
    
    Remove a circular require in AS deprecations.

commit 3d03c79	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-12 15:24:10 +0200

    Remove a circular require in AS deprecations. This is safe as AS deprecations is autoloaded as needed.

M	activesupport/lib/active_support/core_ext/module/deprecation.rb

commit e1ceae5	refs/heads/master
Author: Nick Sutterer 
Date:   2011-05-12 09:58:26 +0200

    added an example for AC::UrlFor usage to make usage simpler.

M	actionpack/lib/action_controller/metal/url_for.rb

commit 987f79c	refs/heads/master
Merge: 8cf4725 a0000d0
Author: José Valim 
Date:   2011-05-12 00:34:40 -0700

    Merge pull request #524 from joshk/ar_create_mas_correction
    
    AR#create! allows for :as => role, and AR changelog update

commit e3b3f41	refs/heads/master
Author: Nick Sutterer 
Date:   2011-05-12 09:31:36 +0200

    added docs for AbC::UrlFor and AC::UrlFor.

M	actionpack/lib/abstract_controller/url_for.rb
M	actionpack/lib/action_controller/metal/url_for.rb

commit a0000d0	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-12 09:24:42 +0200

    updated AR#create! to accept an options hash so the mass-assignment security role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/session_store.rb
M	activerecord/lib/active_record/validations.rb
M	activerecord/test/cases/mass_assignment_security_test.rb

commit 8cf4725	refs/heads/master
Merge: f5fcfc2 377bd69
Author: Santiago Pastorino 
Date:   2011-05-11 17:10:44 -0700

    Merge pull request #227 from farski/master
    
    Unnecessary redundancy in Time/Date calculations

commit f5fcfc2	refs/heads/master
Merge: 0979a7e 8a2f6f7
Author: Santiago Pastorino 
Date:   2011-05-11 17:03:57 -0700

    Merge pull request #521 from seanmccann/patch-1
    
    Removed extra newline at end of development config file. (There were 2)

commit 0979a7e	refs/heads/master
Merge: b89f269 9870afb
Author: Santiago Pastorino 
Date:   2011-05-11 17:01:36 -0700

    Merge pull request #491 from arunagw/readme_changes
    
    Some readme fixes as required.

commit b89f269	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-05-11 19:12:30 -0300

    Depend on master uglifier for now

M	Gemfile
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit d192d85	refs/heads/master
Merge: c53d392 1db49ce
Author: Jon Leighton 
Date:   2011-05-11 13:32:04 -0700

    Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations
    
    Bug fixes for calculations with includes

commit 1db49ce	refs/heads/master
Author: Fadzril Muhamad & Joseph Palermo 
Date:   2011-05-11 17:19:06 +0800

    Bug fixes:
    - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not.
    - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count.  Looks like it was broken here:
    https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/associations/cascaded_eager_loading_test.rb
M	activerecord/test/cases/calculations_test.rb

commit 8a2f6f7	refs/heads/master
Author: Sean McCann 
Date:   2011-05-11 12:44:18 -0700

    Remove extra line at end of development config file.

M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit a117ac4	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-11 23:10:20 +0530

    fix spellings

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit e80e36c	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-11 22:50:10 +0530

    indentation fixes

M	railties/guides/source/generators.textile

commit b2d6f8e	refs/heads/master
Merge: 8ce2844 d10a1b5
Author: Vijay Dev 
Date:   2011-05-11 21:53:39 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit c53d392	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-05-11 13:03:08 -0300

    Add missing requires

M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activesupport/test/ordered_hash_test.rb

commit 9823c17	refs/heads/master
Merge: 55cfbd4 49cd41f
Author: José Valim 
Date:   2011-05-11 09:04:41 -0700

    Merge pull request #515 from joshk/patch-3
    
    updated the ActiveSupport changelog

commit 55cfbd4	refs/heads/master
Merge: 8ec1f30 bb498a5
Author: José Valim 
Date:   2011-05-11 09:02:22 -0700

    Merge pull request #519 from knapo/master
    
    `guard_protected_attributes` has invalid assignment to be always true in attributes=

commit bb498a5	refs/heads/master
Author: knapo 
Date:   2011-05-11 17:17:42 +0200

    Fix assigning protected attributes by attributes=

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 8ec1f30	refs/heads/master
Merge: 0fde84c 295bf41
Author: Xavier Noria 
Date:   2011-05-11 07:27:41 -0700

    Merge pull request #516 from gucki/master
    
    add missing require for ordered_hash dependency

commit 295bf41	refs/heads/master
Author: Corin Langosch 
Date:   2011-05-11 16:22:27 +0200

    add missing require for ordered_hash dependency

M	activesupport/lib/active_support/json/encoding.rb

commit 0fde84c	refs/heads/master
Author: Andrew White 
Date:   2011-05-11 14:22:22 +0100

    Don't remove the target if it has already been destroyed

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 49cd41f	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-11 04:45:19 -0700

    updated the ActiveSupport changelog

M	activesupport/CHANGELOG

commit b3f4519	refs/heads/master
Merge: 1dd90f8 940c31f
Author: Xavier Noria 
Date:   2011-05-11 03:43:09 -0700

    Merge pull request #513 from BlackBulletIV/patch-1
    
    Modified CollectionAssociation documentation to refer to the new class name

commit 940c31f	refs/heads/master
Author: Michael Ebens 
Date:   2011-05-11 03:37:35 -0700

    Modified NamedScopeTest to use CollectionAssociation.

M	activerecord/test/cases/named_scope_test.rb

commit ad99180	refs/heads/master
Author: Michael Ebens 
Date:   2011-05-11 03:27:38 -0700

    Modified CollectionAssociation to refer to the new class name.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 1dd90f8	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-11 08:55:36 +0100

    Don't use select() values from the join model of a through association. Fixes #508.

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/fixtures/memberships.yml
M	activerecord/test/models/member.rb
M	activerecord/test/models/membership.rb

commit aa1fc1c	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-11 08:11:17 +0100

    Bring back obj.association_loaded? as a deprecated method. Fixes #472.

M	activerecord/lib/active_record/associations/builder/singular_association.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb

commit 6d51f9b	refs/heads/master
Merge: 4a6855e 2bfeda3
Author: Jon Leighton 
Date:   2011-05-11 00:31:43 -0700

    Merge pull request #509 from gucki/master
    
    fix bug in usage example of #unscoped

commit 2bfeda3	refs/heads/master
Author: Corin Langosch 
Date:   2011-05-11 09:19:12 +0200

    fix bug in usage example of #unscoped

M	activerecord/lib/active_record/base.rb

commit 4a6855e	refs/heads/master
Merge: a792ad6 828f171
Author: José Valim 
Date:   2011-05-10 23:30:53 -0700

    Merge pull request #507 from dlee/fix_identity_map_tests
    
    Fix tests to reflect IdentityMap no longer default

commit a792ad6	refs/heads/master
Merge: af88dae 8366cab
Author: José Valim 
Date:   2011-05-10 23:30:32 -0700

    Merge pull request #506 from dlee/custom_csrf_token_tests
    
    Test csrf token param name customization

commit af88dae	refs/heads/master
Merge: fa187ec 21b61a8
Author: José Valim 
Date:   2011-05-10 23:26:12 -0700

    Merge pull request #503 from smartinez87/conventions
    
    Follow code conventions on some tests

commit 828f171	refs/heads/master
Author: David Lee 
Date:   2011-05-10 19:00:16 -0700

    Fix tests to reflect IdentityMap no longer default
    
    Broke in 0e1dcae1857db4f6721561caff38d8be748d0b40

M	railties/test/application/initializers/frameworks_test.rb
M	railties/test/application/middleware_test.rb

commit 8366cab	refs/heads/master
Author: David Lee 
Date:   2011-05-09 16:17:38 -0700

    Test csrf token param name customization

M	actionpack/test/controller/request_forgery_protection_test.rb
M	railties/test/application/configuration_test.rb

commit d10a1b5	refs/heads/master
Author: Dan Pickett 
Date:   2011-05-10 20:55:59 -0400

    fix bad encoding on contributing to RoR page

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 21b61a8	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 20:58:36 -0300

    Follow code conventions on some tests

M	activemodel/test/cases/validations/conditional_validation_test.rb
M	activemodel/test/cases/validations/format_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb
M	activemodel/test/cases/validations/length_validation_test.rb
M	activeresource/test/cases/format_test.rb

commit ab880b9	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 20:55:31 -0300

    Follow code conventions on docs

M	actionpack/lib/action_dispatch/routing/url_for.rb
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/form_options_helper.rb
M	activesupport/lib/active_support/core_ext/hash/slice.rb

commit 71d6b08	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 20:19:47 -0300

    Fix styiling issues on DateHelper docs

M	actionpack/lib/action_view/helpers/date_helper.rb

commit f156258	refs/tags/v3.0.8.rc1
Merge: 840f0a9 0525306
Author: Jon Leighton 
Date:   2011-05-10 15:57:20 -0700

    Merge pull request #352 from daphonz/polymorphic-join-sql-patch
    
    Fixes for incorrect INNER JOIN through two polymorphic resources (NoMethodError: undefined method `to_sym' for nil:NilClass)

commit fa187ec	refs/heads/master
Merge: a8c1fa4 e78221f
Author: José Valim 
Date:   2011-05-10 15:52:07 -0700

    Merge pull request #501 from guilleiguaran/patch-2
    
    Adding .sass-cache to gitignore template

commit e78221f	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-10 15:46:03 -0700

    Adding .sass-cache to gitignore template

M	railties/lib/rails/generators/rails/app/templates/gitignore

commit 17a7943	refs/heads/master
Author: Cyril Wack 
Date:   2011-05-10 15:42:28 -0700

    Use quotes for command substitution

M	activerecord/lib/active_record/railties/databases.rake

commit 956a0f4	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 19:39:34 -0300

    Fix styiling issues on AtomFeedHelper docs

M	actionpack/lib/action_view/helpers/atom_feed_helper.rb

commit 1ca3ae5	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 19:36:00 -0300

    Remove extra whitespace.

M	actionpack/lib/action_view/helpers/cache_helper.rb

commit a8c1fa4	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-10 23:35:01 +0100

    Add test to specify that attributes from an association's conditions should be assigned without mass-assignment protection when a record is built on the association.

M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/models/bulb.rb
M	activerecord/test/models/car.rb
M	activerecord/test/schema/schema.rb

commit 93a85ce	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-10 23:21:17 +0100

    Remove unnecessary '|| {}'

M	activerecord/lib/active_record/associations/collection_association.rb

commit 350b977	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 19:34:59 -0300

    Fix styiling issue on TranslationHelper docs

M	actionpack/lib/action_view/helpers/translation_helper.rb

commit 1f7d55e	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 19:28:37 -0300

    Fix styiling issue on ActionView::Template docs

M	actionpack/lib/action_view/template.rb

commit a87894a	refs/heads/master
Author: José Valim 
Date:   2011-05-11 00:08:18 +0200

    Get around weird missing constant error caused by AS instead of simply raising NameError, closes #477.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 9a7dbe2	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-10 22:47:54 +0100

    Don't use mass-assignment protection when applying the scoped.scope_for_create. Fixes #481.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 8f999a3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 13:21:58 -0700

    make sure log file is written in binary mode. fixes #497

M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/test/buffered_logger_test.rb

commit 7b6819f	refs/heads/master
Merge: 8567ab9 177f7fa
Author: José Valim 
Date:   2011-05-10 13:09:25 -0700

    Merge pull request #499 from smartinez87/csv
    
    impact guides with no CSV fixture support

commit 177f7fa	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-10 16:55:32 -0300

    impact guides with no CSV fixture support

M	railties/guides/source/testing.textile

commit 8567ab9	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-10 14:30:02 -0500

    Need it declared too

M	railties/lib/rails/engine/configuration.rb

commit de28620	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-10 14:23:18 -0500

    Include lib/assets for sprocket paths

M	railties/lib/rails/engine.rb

commit 1a84465	refs/heads/master
Merge: 558334a 9a0e3d4
Author: José Valim 
Date:   2011-05-10 12:12:19 -0700

    Merge pull request #498 from vatrai/minor_cleaning
    
    minor cleaning with new api method all

commit 9a0e3d4	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-11 00:15:16 +0530

    minor cleaning with new api method

M	activerecord/test/cases/method_scoping_test.rb

commit 558334a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 11:08:10 -0700

    deprecating CSV fixture support

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb
D	activerecord/test/fixtures/all/people.csv
A	activerecord/test/fixtures/all/people.yml

commit 714fea8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-10 10:59:35 -0700

    deprecating read_csv_fixture_files method

M	activerecord/lib/active_record/fixtures.rb

commit 2ea33d6	refs/heads/master
Merge: 9f0af6d 8265c45
Author: Piotr Sarnacki 
Date:   2011-05-10 10:58:12 -0700

    Merge pull request #490 from vijaydev/patch-4
    
    Replace LH with GitHub url for filing issues

commit 9f0af6d	refs/heads/master
Merge: 8660433 33f0b6b
Author: Piotr Sarnacki 
Date:   2011-05-10 10:57:15 -0700

    Merge pull request #495 from vatrai/minor_fixes
    
    minor cleaning

commit 33f0b6b	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-10 22:51:54 +0530

    minor cleaning

M	actionpack/test/activerecord/render_partial_with_record_identification_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/base_test.rb

commit 8660433	refs/heads/master
Merge: 134a05a e2390c0
Author: José Valim 
Date:   2011-05-10 10:13:23 -0700

    Merge pull request #494 from vijaydev/patch-5
    
    Use all in place of find(:all)

commit e2390c0	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-10 10:08:31 -0700

    Use all in place of find(:all)

M	railties/lib/rails/commands/runner.rb

commit 134a05a	refs/heads/master
Merge: ceaf73a 259c749
Author: Aaron Patterson 
Date:   2011-05-10 10:04:54 -0700

    Merge pull request #493 from guilleiguaran/changelog-fixes
    
    Merging 3.0.x CHANGELOGs

commit 259c749	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-10 11:51:35 -0500

    Merging 3.0.x CHANGELOGs

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit ceaf73a	refs/heads/master
Merge: 4de9771 2cef2d4
Author: José Valim 
Date:   2011-05-10 09:41:28 -0700

    Merge pull request #492 from jaw6/master
    
    Serialized methods that return nil should not be considered YAML

commit 9870afb	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-10 22:00:06 +0530

    Some readme fixes as required.

M	actionmailer/README.rdoc
M	actionpack/README.rdoc
M	activerecord/README.rdoc
M	railties/lib/rails/generators/rails/assets/assets_generator.rb
M	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb

commit 8265c45	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-10 09:25:52 -0700

    Replace LH with GitHub url for filing issues

M	activesupport/README.rdoc

commit 4de9771	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-10 11:21:57 -0500

    Update sprocket comments

M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit 2cef2d4	refs/heads/master
Author: Joshua Wehner 
Date:   2011-03-03 15:43:42 -0500

    Methods that return nil should not be considered YAML

M	activemodel/lib/active_model/serializers/xml.rb
M	activemodel/test/cases/serializers/xml_serialization_test.rb
M	activemodel/test/models/contact.rb
M	activerecord/test/cases/xml_serialization_test.rb

commit 8e55afb	refs/heads/master
Merge: 3aa8f34 c3c852c
Author: Xavier Noria 
Date:   2011-05-10 09:00:54 -0700

    Merge pull request #487 from vijaydev/patch-3
    
    s/javascript/JavaScript

commit c3c852c	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-10 08:51:50 -0700

    s/javascript/JavaScript

M	railties/lib/rails/generators/rails/assets/assets_generator.rb

commit 840f0a9	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-05-10 08:50:00 -0700

    removing splat flatten as we no longer support 1.8.6. fixes #485.  Thanks @sztywny

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 8ce2844	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-10 21:19:47 +0530

    minor fix in assets usage

M	railties/lib/rails/generators/rails/assets/USAGE

commit 973c6e2	refs/heads/master
Author: Trent Ogren 
Date:   2011-05-10 08:08:20 -0700

    typo fix

M	railties/lib/rails/generators/rails/assets/USAGE

commit 3aa8f34	refs/heads/master
Author: José Valim 
Date:   2011-05-10 16:53:57 +0200

    Fix previous commit by allowing a proc to be given as response_body. This is deprecated and is going to be removed in future releases.

M	actionpack/lib/action_dispatch/http/cache.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/test/dispatch/response_body_is_proc_test.rb

commit 4d5ce47	refs/heads/master
Merge: fa8b0f4 2ab42dc
Author: José Valim 
Date:   2011-05-10 07:38:43 -0700

    Merge pull request #446 from danielstutzman/response_body_is_proc
    
    New test: setting response_body to a Proc should be supported.

commit a59a67d	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-10 07:37:27 -0700

    Explain the implication of using :ignore_date on time_select

M	actionpack/lib/action_view/helpers/date_helper.rb

commit fa8b0f4	refs/heads/master
Merge: 8c05293 95b4989
Author: José Valim 
Date:   2011-05-10 07:23:26 -0700

    Merge pull request #484 from slainer68/master
    
    Puts ActiveRecord::SessionStore attributes in white list, fixes #483

commit 95b4989	refs/heads/master
Author: slainer68 
Date:   2011-05-10 16:11:28 +0200

    Puts ActiveRecord::SessionStore attributes in white list, fixes #483

M	activerecord/lib/active_record/session_store.rb
M	activerecord/test/cases/session_store/session_test.rb

commit 8c05293	refs/heads/master
Merge: 302c912 a4765f7
Author: José Valim 
Date:   2011-05-10 04:06:10 -0700

    Merge pull request #482 from vijaydev/patch-2
    
    Fix typos in IM documentation

commit a4765f7	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-10 03:44:57 -0700

    Fix typos in IM documentation

M	activerecord/lib/active_record/identity_map.rb

commit 302c912	refs/heads/master
Author: José Valim 
Date:   2011-05-10 11:33:39 +0200

    Document identity map inconsistency with associations, closes #474.

M	activerecord/lib/active_record/identity_map.rb

commit 5fc3564	refs/heads/master
Author: José Valim 
Date:   2011-05-10 11:18:16 +0200

    Fix #480. Passing nil to create association works.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 0ceb21e	refs/heads/master
Author: José Valim 
Date:   2011-05-10 11:14:39 +0200

    Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".
    
    Wrapping each Record.associations.build in a transaction is going to
    make several unneeded queries. Reverting this commit also fixes #479.

M	activerecord/lib/active_record/associations/collection_association.rb

commit 7c353d5	refs/heads/master
Author: José Valim 
Date:   2011-05-10 11:11:30 +0200

    Add failing tests according to #479.

M	activerecord/test/cases/associations/has_many_associations_test.rb

commit b6a2113	refs/heads/master
Author: José Valim 
Date:   2011-05-10 11:02:34 +0200

    Add failing tests, according to #480.

M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 85a40f6	refs/heads/master
Author: Bruno Michel 
Date:   2011-05-10 01:52:27 -0700

    :touch => :symbol also updates the updated_at attribute

M	activerecord/lib/active_record/associations.rb

commit 9e4b715	refs/heads/master
Author: José Valim 
Date:   2011-05-10 10:30:27 +0200

    Ensure assign_attributes and update_attributes do not fail on nil, closes #478.

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/persistence_test.rb

commit 86a0f7f	refs/heads/master
Author: José Valim 
Date:   2011-05-10 10:22:09 +0200

    Add tests for content_for() for read, closes #475.

M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/test/template/capture_helper_test.rb

commit 7fcf0ca	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-10 03:40:44 +0100

    removed redundant metric support check (and print when it isn't)

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit aaa85cd	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-10 02:52:10 +0100

    remove forgotten puts

M	activesupport/lib/active_support/testing/performance.rb

commit 0304d80	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-10 02:49:32 +0100

    ruby-prof's awesome call stack printer is now used by default

M	activesupport/lib/active_support/testing/performance/ruby.rb
M	railties/guides/source/performance_testing.textile

commit bb1af05	refs/heads/master
Author: James Miller 
Date:   2011-05-09 18:46:07 -0700

    Missing an end in routing docs

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 83b66f5	refs/heads/master
Merge: dcc99e2 810fb2b
Author: Gonçalo Silva 
Date:   2011-05-10 02:39:05 +0100

    Merge branch 'performance_test' of github.com:goncalossilva/rails into performance_test

commit dcc99e2	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-10 02:33:01 +0100

    benchmarker and profiler now use the new performance testing tools (support for Rubinius and JRuby and high configurability)

M	activesupport/lib/active_support/testing/performance.rb
M	railties/guides/source/performance_testing.textile
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/profiler.rb

commit ed8962c	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-09 22:21:00 -0300

    more fixed-fonts here

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 56a7db6	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-09 22:06:04 -0300

    added some fixed fonts

M	actionpack/lib/action_dispatch/routing.rb

commit 810fb2b	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-10 01:38:21 +0100

    benchmarker and profiler now use the new performance testing tools (support for Rubinius and JRuby and high configurability)

M	activesupport/lib/active_support/testing/performance.rb
M	railties/guides/source/performance_testing.textile
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/profiler.rb

commit 3f36441	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-09 23:42:26 +0530

    Update copyright year in Active Resource and Active Support
    
    Signed-off-by: Santiago Pastorino 

M	activeresource/lib/active_resource.rb
M	activesupport/lib/active_support.rb

commit 0e1dcae	refs/heads/master
Author: José Valim 
Date:   2011-05-10 00:48:31 +0200

    Disable identity map by default. Detailed documentation will be pushed later.

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 9ca97a6	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-09 23:46:07 +0100

    fixed a typo in the guide

M	railties/guides/source/performance_testing.textile

commit 0d1f758	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-09 23:29:00 +0100

    contemplate unsupported metrics

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 73ff679	refs/heads/master
Author: Aaron Patterson 
Date:   2011-05-09 13:53:46 -0700

    use a null byte as a bind parameter substitute as it is not allowed in normal SQL. fixes #411, #417

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
A	activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb

commit c56f4b2	refs/heads/master
Merge: 5b48495 d9f95c7
Author: José Valim 
Date:   2011-05-09 13:15:59 -0700

    Merge pull request #471 from joshk/remove_as_concern
    
    Removed an unneed AS::Concern from AR::IdentityMap

commit d9f95c7	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-09 22:13:25 +0200

    removed an unneed AS::Concern from AR::IdentityMap

M	activerecord/lib/active_record/identity_map.rb

commit 21be7f2	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-10 00:08:38 +0530

    fixes github fork url

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 5b48495	refs/heads/master
Merge: 59705de e585121
Author: José Valim 
Date:   2011-05-09 09:54:04 -0700

    Merge pull request #461 from chrislwade/sorted-migrations
    
    Sorted migrations

commit 59705de	refs/heads/master
Author: José Valim 
Date:   2011-05-09 17:23:41 +0200

    Warn if we cannot verify CSRF token authenticity

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 2750f2e	refs/heads/master
Author: José Valim 
Date:   2011-05-09 17:08:59 +0200

    Fix failing test.

M	activesupport/lib/active_support/xml_mini.rb

commit 372d724	refs/heads/master
Author: Mike Howard 
Date:   2011-05-08 09:08:56 -0600

    xml_mini.rb:_dasherize() replacement 20 to 25% faster
    
    Signed-off-by: José Valim 

M	activesupport/lib/active_support/xml_mini.rb

commit 851a4ea	refs/heads/master
Author: José Valim 
Date:   2011-05-09 15:10:19 +0200

    Oops, missing autoload, closes #466

M	actionpack/lib/action_view.rb

commit f1d09a2	refs/tags/v3.0.8.rc1
Merge: 9575db6 7a79ab7
Author: José Valim 
Date:   2011-05-09 04:53:23 -0700

    Merge pull request #465 from sven-q/3-0-stable
    
    Issue #342: AssetTagHelper ensures that files are in the wrong directory (again)

commit 7a79ab7	refs/tags/v3.0.8.rc1
Author: Sven Winkler 
Date:   2011-05-09 13:38:31 +0200

    Fix Issue #342

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 9b84bd3	refs/heads/master
Author: Philip Roberts 
Date:   2011-05-09 03:21:16 -0700

    Fixed typos in documentation for the date_select helper in actionpack/action_view.
    
    The description for an example of the date_select method did not match the actual code example.

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 731923d	refs/heads/master
Merge: a9b72fb 1021b51
Author: José Valim 
Date:   2011-05-09 02:26:35 -0700

    Merge pull request #460 from guilleiguaran/patch-1
    
    Just a minor fix in A.S CHANGELOG

commit a9b72fb	refs/heads/master
Author: José Valim 
Date:   2011-05-09 11:17:24 +0200

    Optimize the most common resolver case.

M	actionpack/lib/action_view/path_set.rb
M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/test/template/render_test.rb

commit 4f03e40	refs/heads/master
Author: José Valim 
Date:   2011-05-09 10:42:54 +0200

    No need for replace.

M	actionpack/lib/action_view/template/resolver.rb

commit f40a3ea	refs/heads/master
Merge: 2fae429 b97e630
Author: sgerrand 
Date:   2011-05-09 01:18:24 -0700

    Merge pull request #42 from sgerrand/master
    
    Fixed typo in association configuration example

commit b97e630	refs/heads/master
Author: Sasha Gerrand 
Date:   2011-05-09 18:14:44 +1000

    - Fixed typo in association parameters configuration (again)

M	railties/guides/source/association_basics.textile

commit e585121	refs/heads/master
Author: Christopher Wade 
Date:   2011-04-30 01:11:23 -0500

    Interleave db_list and file_list.

M	activerecord/lib/active_record/railties/databases.rake

commit 2952040	refs/heads/master
Author: Christopher Wade 
Date:   2011-04-30 00:48:06 -0500

    Sort migrations by the migration ID.

M	activerecord/lib/active_record/railties/databases.rake

commit 1021b51	refs/heads/master
Author: Guillermo Iguaran 
Date:   2011-05-08 22:59:25 -0700

    Just a minor fix in A.S CHANGELOG

M	activesupport/CHANGELOG

commit 2fae429	refs/heads/master
Merge: d6ff2ee e0fdbfd
Author: sgerrand 
Date:   2011-05-08 19:27:19 -0700

    Merge pull request #41 from sgerrand/master
    
    Corrected foreign key parameter placement in the self join example

commit e0fdbfd	refs/heads/master
Author: Sasha Gerrand 
Date:   2011-05-09 12:23:24 +1000

    - Fixed typo in the example of a self join on a model

M	railties/guides/source/association_basics.textile

commit fda9c7d	refs/heads/master
Author: Sasha Gerrand 
Date:   2011-05-09 12:20:44 +1000

    - Moved foreign key parameter to correct location for self join on a model example

M	railties/guides/source/association_basics.textile

commit a43f95d	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-09 01:00:04 +0100

    added a note about profiling options to the generators

M	railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
M	railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb

commit 72a4893	refs/heads/master
Merge: 8f10ccd 92c1076
Author: Jon Leighton 
Date:   2011-05-08 23:43:34 +0100

    Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371

commit 92c1076	refs/heads/master
Author: Nick Howard 
Date:   2011-05-07 17:19:02 -0600

    Fix for #371
    
    if a query contains a limit or an offset, ActiveRecord::FinderMethods#find_last had inconsistent behavior.
    
    If the records were loaded, it returned the last record in the cached list.
    If they were not, it reversed the order of the query and changed the limit to one.
    If the earlier limit was less than the total matching the query in the db,
    it would return a different record than if the records had been cached.
    
    This commit changes find_last so that it loads the records when getting the
    last record on a query containing a limit or an offset, which makes the behavior consistent.

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 8f10ccd	refs/heads/master
Author: Jon Leighton 
Date:   2011-05-08 23:31:16 +0100

    Ensure that ORDER BY clauses from default scopes are not included in calculation queries. Fixes #406.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/relation_scoping_test.rb

commit d6ff2ee	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-09 00:30:14 +0530

    Include examples for negative ordinalize in the guide

M	railties/guides/source/active_support_core_extensions.textile

commit 668cb42	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-09 00:02:27 +0530

    improve comment in wrap_parameters template

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit b3791da	refs/heads/master
Merge: a8daea4 91c1855
Author: José Valim 
Date:   2011-05-08 11:21:47 -0700

    Merge pull request #457 from vijaydev/master
    
    Adds examples in code for ordinalizing negative numbers

commit 91c1855	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-08 23:48:15 +0530

    adds code examples for negative ordinalize

M	activesupport/lib/active_support/inflector/methods.rb

commit eef2060	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-08 23:43:46 +0530

    included examples for negative ordinalize

M	activesupport/lib/active_support/core_ext/integer/inflections.rb

commit a8daea4	refs/heads/master
Merge: a45f300 4fbd8ad
Author: Jon Leighton 
Date:   2011-05-08 18:53:12 +0100

    Merge pull request #332 from cmeiklejohn/bug6230_optimistic_locking_double_quoted

commit 4fbd8ad	refs/heads/master
Author: Christopher Meiklejohn 
Date:   2011-03-14 22:19:47 -0400

    Don't quote ID's as Arel will quote them -- follow same conventions as the delete method.

M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/test/cases/locking_test.rb
A	activerecord/test/fixtures/string_key_objects.yml
A	activerecord/test/models/string_key_object.rb
M	activerecord/test/schema/schema.rb

commit 95ec18a	refs/heads/master
Author: Ryan Sandridge 
Date:   2011-05-08 13:26:12 -0400

    Documentation fix. Corrected a copy/paste mistake for link_to_if documentation.

M	actionpack/lib/action_view/helpers/url_helper.rb

commit a45f300	refs/heads/master
Merge: f69be6a 6b31fd8
Author: Aaron Patterson 
Date:   2011-05-08 10:13:39 -0700

    Merge pull request #445 from prakashmurthy/lighthouse_6334
    
    Fix for Lighthouse ticket # 6334 : to_xml should render valid xml or raise an error all the time

commit f69be6a	refs/heads/master
Merge: 9727dd1 b2451f4
Author: José Valim 
Date:   2011-05-08 08:19:38 -0700

    Merge pull request #455 from joshk/mass_assignment_roles
    
    Renamed mass-assignment scopes to roles

commit c7d8661	refs/heads/master
Author: Jason 
Date:   2011-05-08 08:58:48 -0600

    Fixed documentation of select tag; options with html need to pass through html_safe
    
    https://github.com/rails/rails/issues/447
    https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6759-api-document-incorrect

M	actionpack/lib/action_view/helpers/form_tag_helper.rb

commit b2451f4	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-08 16:42:00 +0200

    renamed mass-assignment scopes to roles, updated code, tests, docs and security guide

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/test/cases/mass_assignment_security_test.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	railties/guides/source/security.textile

commit 9727dd1	refs/heads/master
Merge: 80bf68a b94d94a
Author: José Valim 
Date:   2011-05-08 07:42:02 -0700

    Merge pull request #388 from smartinez87/remove_method
    
    Better use #remove_possible_method here

commit b94d94a	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-08 11:31:56 -0300

    Better use #remove_possible_method here

M	activesupport/lib/active_support/core_ext/date/conversions.rb

commit 6b31fd8	refs/heads/master
Author: prakashmurthy 
Date:   2011-05-08 06:13:18 -0600

    Lighthouse ticket # 6334; added tests to verify that spaces in key are dasherized.

M	activesupport/test/xml_mini_test.rb

commit 80bf68a	refs/heads/master
Author: José Valim 
Date:   2011-05-08 12:57:07 +0200

    prepend the assets route instead of appending, closes #436

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/sprockets/railtie.rb
A	railties/test/application/assets_test.rb
M	railties/test/application/routing_test.rb
M	railties/test/railties/shared_tests.rb

commit c2b55c4	refs/heads/master
Merge: e5a0122 099eb2b
Author: José Valim 
Date:   2011-05-08 03:44:27 -0700

    Merge pull request #454 from dlee/nested_indifferent_access
    
    indifferent access should recurse Hash subclasses

commit 099eb2b	refs/heads/master
Author: David Lee 
Date:   2011-05-08 02:21:06 -0700

    indifferent access should recurse Hash subclasses
    
    This commit makes Hash subclasses convert to HWIA by default for nested
    objects of subclasses of Hash, but allows certain subclasses to prevent nested
    conversion by introducing Hash#nested_under_indifferent_access that subclasses
    can overwrite.
    
    ActiveSupport::OrderedHash is one such subclass that overwrites
    +nested_under_indifferent_access+, since implicitly converting it to HWIA would
    remove the ordering of keys and values in Ruby 1.8.
    
    This change is necessary because commit ce9456e broke nested indifferent access
    conversion for all subclasses of Hash.

M	activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/lib/active_support/ordered_hash.rb
M	activesupport/test/core_ext/hash_ext_test.rb
M	activesupport/test/ordered_hash_test.rb

commit e5a0122	refs/heads/master
Author: José Valim 
Date:   2011-05-08 12:40:15 +0200

    Revert to use === only here because of perf. :(

M	actionpack/lib/action_view/path_set.rb

commit 843cab6	refs/heads/master
Merge: 30db3a8 06671c3
Author: José Valim 
Date:   2011-05-08 03:35:14 -0700

    Merge pull request #420 from burke/master
    
    Accept single prefix in ActionView::MissingTemplate#initialize

commit 30db3a8	refs/heads/master
Merge: ad12963 17a91a6
Author: José Valim 
Date:   2011-05-08 03:33:22 -0700

    Merge pull request #430 from dlee/methodoverride
    
    Logs should show overridden method; Issue 426

commit ad12963	refs/heads/master
Author: José Valim 
Date:   2011-05-08 12:25:02 +0200

    Fix failing xml mini test.

M	activesupport/lib/active_support/xml_mini.rb

commit 197f3f0	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-08 15:12:18 +0530

    Included more details on Rails coding conventions (from LH Source Style page)

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 67c3469	refs/heads/master
Merge: 70f9558 bfff5ea
Author: José Valim 
Date:   2011-05-08 01:13:08 -0700

    Merge pull request #452 from jrom/runner-r-alias
    
    Add alias `r` for rails runner

commit 181c842	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-05-08 04:20:14 +0100

    explicitly return from run() under minitest (metrics were printed with the previous solution)

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit bfff5ea	refs/heads/master
Author: Jordi Romero 
Date:   2011-05-07 20:12:34 -0700

    Add alias `r` for rails runner

M	railties/lib/rails/commands.rb

commit aec7456	refs/heads/master
Merge: 1c2b223 70f9558
Author: Gonçalo Silva 
Date:   2011-05-08 03:54:55 +0100

    Merge branch 'master' of https://github.com/rails/rails into performance_test
    
    Conflicts:
    	activesupport/lib/active_support/testing/performance.rb

commit 06671c3	refs/heads/master
Author: Burke Libbey 
Date:   2011-05-07 18:30:50 -0500

    Added activesupport requires for Array.wrap in previously modified files

M	actionpack/lib/action_view/path_set.rb
M	actionpack/lib/action_view/template/error.rb

commit 70f9558	refs/heads/master
Merge: 820b6f3 0bc91a4
Author: Santiago Pastorino 
Date:   2011-05-07 16:14:37 -0700

    Merge pull request #449 from msgehard/rename_duplicate_test_methods
    
    Rename duplicate tests

commit 0bc91a4	refs/heads/master
Author: Mike Gehard 
Date:   2011-05-07 17:02:42 -0600

    Rename duplicate tests.  There is now one failing test that was failing before the rename but was never getting run.

M	activesupport/test/class_cache_test.rb
M	activesupport/test/xml_mini_test.rb

commit 2ab42dc	refs/heads/master
Author: Daniel Stutzman 
Date:   2011-05-07 16:35:56 -0600

    New test: setting response_body to a Proc should be supported.

A	actionpack/test/dispatch/response_body_is_proc_test.rb

commit 820b6f3	refs/heads/master
Merge: 0ef978d e5c18ff
Author: Aaron Patterson 
Date:   2011-05-07 15:33:51 -0700

    Merge pull request #442 from jasonnoble/namespace_fixtures
    
    Namespace Fixtures in ActiveRecord

commit e5c18ff	refs/heads/master
Author: Jason Noble 
Date:   2011-05-07 16:15:09 -0600

    Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s))

M	activerecord/lib/active_record/fixtures.rb

commit 0ef978d	refs/heads/master
Author: José Valim 
Date:   2011-05-07 23:45:15 +0200

    Revert "Merge pull request #275 from pk-amooma/master"
    
    Several AP tests fail after this change.
    
    This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing
    changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.

M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 0a1ba4e	refs/heads/master
Author: José Valim 
Date:   2011-05-07 23:43:25 +0200

    Always expand */*

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/test/template/lookup_context_test.rb

commit fadd1fa	refs/heads/master
Author: mathieuravaux 
Date:   2011-02-27 01:52:08 +0100

    Fixes ticket #6379. Improved the handling of Accept headers containing */*.
    
    `lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*"
    resulted in [:js, "*/*"] formats instead of [:js, :html].
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/test/template/lookup_context_test.rb

commit 803548c	refs/heads/master
Author: José Valim 
Date:   2011-05-07 22:44:33 +0200

    xml_mini_test.rb now runs.

M	activesupport/lib/active_support/xml_mini.rb
D	activesupport/test/test_xml_mini.rb
A	activesupport/test/xml_mini_test.rb

commit 7db2ef4	refs/heads/master
Author: Jason Noble 
Date:   2011-05-07 14:20:51 -0600

    Namespace Fixtures in ActiveRecord
    
    [Fixes #439]

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb
M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
M	activerecord/test/cases/fixtures_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/fixtures/mateys.yml
M	activerecord/test/fixtures/parrots_pirates.yml

commit 3a82ff9	refs/heads/master
Merge: 7ec3f33 3880ab0
Author: Aaron Patterson 
Date:   2011-05-07 12:31:20 -0700

    Merge pull request #438 from jasonmichaelroth/ordinalize_negative_numbers
    
    ordinalize negative numbers patch

commit 3880ab0	refs/heads/master
Author: Jason 
Date:   2011-05-07 13:21:00 -0600

    ordinalize negative numbers patch
    
    Applied patch by Amir Manji
      https://github.com/rails/rails/issues/437#issuecomment-1116045
    
    Signed-off-by: Jason 

M	activesupport/lib/active_support/inflector/methods.rb
M	activesupport/test/inflector_test_cases.rb

commit e35ba99	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 22:37:56 +0530

    remove unnecessary use of 'Example'

M	railties/guides/source/rails_on_rack.textile

commit 7ec3f33	refs/heads/master
Merge: 45aec46 9d6f28d
Author: Xavier Noria 
Date:   2011-05-07 09:36:46 -0700

    Merge pull request #435 from vijaydev/master
    
    Update README template to include info about app/assets

commit 9d6f28d	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 21:40:23 +0530

    update readme to reflect app/assets

M	railties/lib/rails/generators/rails/app/templates/README

commit 45aec46	refs/heads/master
Merge: ba23bf4 4addc99
Author: José Valim 
Date:   2011-05-07 09:01:36 -0700

    Merge pull request #434 from arunagw/changelog_doc
    
    Updated changelog for jdbc* adapters template.

commit 4addc99	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-07 21:24:21 +0530

    Updated change log for jdbc* adapters template.

M	railties/CHANGELOG

commit 448845c	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 21:18:03 +0530

    replaced eg using old router api with the one in the guides. Add info on nesting with_options

M	activesupport/lib/active_support/core_ext/object/with_options.rb

commit ba23bf4	refs/heads/master
Author: José Valim 
Date:   2011-05-07 17:46:44 +0200

    Class.new.name returns an empty string on 1.8

M	activerecord/lib/active_record/base.rb

commit 5d6c8d5	refs/heads/master
Author: José Valim 
Date:   2011-05-07 17:33:40 +0200

    Revert "Revert the merge because tests did not pass."
    
    This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map_test.rb

commit ffb70cf	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 20:20:28 +0530

    minor fixes

M	activesupport/lib/active_support/core_ext/string/behavior.rb
M	activesupport/lib/active_support/core_ext/string/exclude.rb
M	activesupport/lib/active_support/core_ext/string/inquiry.rb

commit 00a1152	refs/heads/master
Author: José Valim 
Date:   2011-05-07 15:31:56 +0200

    Update CHANGELOG.

M	actionpack/CHANGELOG

commit 7d7a353	refs/heads/master
Merge: f77cd7c 8bce6e7
Author: José Valim 
Date:   2011-05-07 06:31:18 -0700

    Merge pull request #343 from asanghi/ampm
    
    Allow AM/PM format in datetime selectors

commit 6e83330	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 18:09:20 +0530

    fixes incorrect error message for sample method

M	activesupport/lib/active_support/core_ext/array/random_access.rb

commit 3056b33	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 18:08:13 +0530

    use new AR calls in examples

M	activesupport/lib/active_support/core_ext/array/conversions.rb

commit 7194b39	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 18:07:42 +0530

    fix comment alignment

M	activesupport/lib/active_support/core_ext/array/uniq_by.rb

commit f77cd7c	refs/heads/master
Merge: c444b0f 96546bb
Author: José Valim 
Date:   2011-05-07 04:39:50 -0700

    Merge pull request #286 from jasoncodes/marshal_subsec
    
    Fix marshal round-tripping of fractional seconds (Time#subsec).

commit c444b0f	refs/heads/master
Author: José Valim 
Date:   2011-05-07 13:35:04 +0200

    ADdd missing requires (thanks to @arunagw)

M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/generators/named_base.rb

commit 0e886fe	refs/heads/master
Merge: aaf01cd 2adeaa9
Author: José Valim 
Date:   2011-05-07 03:44:19 -0700

    Merge pull request #280 from jballanc/frozen-string-strip-tags
    
    Stripping tags from a frozen string

commit aaf01cd	refs/heads/master
Merge: 9cc18c5 474e313
Author: José Valim 
Date:   2011-05-07 03:41:26 -0700

    Merge pull request #275 from pk-amooma/master
    
    properly escape "'" to "'" for XML

commit 9cc18c5	refs/heads/master
Merge: b011a7a 4e873ff
Author: José Valim 
Date:   2011-05-07 03:34:28 -0700

    Merge pull request #263 from CvX/master
    
    Corrected dbconsole usage message

commit b011a7a	refs/heads/master
Merge: a761d77 512057d
Author: José Valim 
Date:   2011-05-07 12:26:45 +0200

    Merge remote branch 'rolftimmermans/desc_tracker'

commit a761d77	refs/heads/master
Merge: a6ef255 080e2a7
Author: José Valim 
Date:   2011-05-07 03:19:56 -0700

    Merge pull request #248 from bigfix/enumerable_as_json
    
    Enumerable should pass encoding options to children in #as_json/#to_json

commit 17a91a6	refs/heads/master
Author: David Lee 
Date:   2011-05-07 01:19:01 -0700

    Logs should show overridden method; Issue 426

M	actionpack/test/dispatch/request_test.rb
M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	railties/lib/rails/application.rb
M	railties/test/application/middleware_test.rb
A	railties/test/application/rack/logger_test.rb

commit a6ef255	refs/heads/master
Merge: c515f64 aba149d
Author: José Valim 
Date:   2011-05-07 02:58:16 -0700

    Merge pull request #349 from bradley178/master
    
    Hash.from_xml chokes on empty CDATA

commit 162bf8f	refs/heads/master
Author: Vijay Dev 
Date:   2011-05-07 12:13:38 +0530

    revises comment for blank? method

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit c515f64	refs/heads/master
Author: José Valim 
Date:   2011-05-07 02:21:49 +0200

    Use .ref instead of .to_sym.

M	actionpack/lib/action_controller/log_subscriber.rb
M	actionpack/lib/action_controller/metal/instrumentation.rb

commit fa8623b	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-07 00:11:13 +0200

    adds comments clarifying the role of SharedGeneratorTests

M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/plugin_new_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit 8bbf47a	refs/heads/master
Merge: 886818d 20c35bc
Author: José Valim 
Date:   2011-05-06 14:50:14 -0700

    Merge pull request #424 from gnufied/master
    
    Fixes around_filter from observer, github issue#329

commit 20c35bc	refs/heads/master
Author: Hemant Kumar 
Date:   2011-05-07 03:03:41 +0530

    fix yield not working from around filter of observers, fixes Github#329

M	activerecord/lib/active_record/observer.rb
M	activerecord/test/cases/lifecycle_test.rb

commit 886818d	refs/heads/master
Author: José Valim 
Date:   2011-05-06 23:14:39 +0200

    Revert the merge because tests did not pass.
    
    Revert "Merge pull request #423 from richardiux/master"
    
    This reverts commit b8f08c4ea7c56e34e3e17c9006f1ae6d9f7504ee, reversing
    changes made to fd9df1b1dd1196c2233835e25a6a38956e9e3959.

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map_test.rb

commit b8f08c4	refs/heads/master
Merge: fd9df1b fc2823a
Author: José Valim 
Date:   2011-05-06 14:07:24 -0700

    Merge pull request #423 from richardiux/master
    
    Identity Map caching bug

commit 4c4d5c7	refs/heads/master
Author: Burke Libbey 
Date:   2011-05-06 15:28:31 -0500

    Remove redundant check for is_a?(String)

M	actionpack/lib/action_view/path_set.rb
M	actionpack/lib/action_view/template/error.rb

commit 5e23527	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-06 13:07:14 -0700

    Made language consistent with the rest of the comments in the file.

M	railties/lib/rails/generators/base.rb

commit 156039c	refs/heads/master
Author: Burke Libbey 
Date:   2011-05-06 14:02:31 -0500

    Added a test for MissingTemplate change, and changed to use Array.wrap() as
    requested by josevalim.

M	actionpack/lib/action_view/path_set.rb
M	actionpack/lib/action_view/template/error.rb
M	actionpack/test/template/lookup_context_test.rb

commit 30d49d0	refs/heads/master
Author: Burke Libbey 
Date:   2011-05-06 12:39:11 -0500

    Made ActionView::MissingTemplate#initialize optionally accept a single string
    prefix to be converted to an array as in ActionView::PathSet#find_all.

M	actionpack/lib/action_view/template/error.rb

commit fd9df1b	refs/heads/master
Merge: dd752a5 9899f53
Author: José Valim 
Date:   2011-05-06 10:26:13 -0700

    Merge pull request #419 from smartinez87/avail_action
    
    better styling on #available_action? docs

commit 9899f53	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-06 14:23:25 -0300

    better styling on #available_action? docs

M	actionpack/lib/abstract_controller/base.rb

commit dd752a5	refs/heads/master
Merge: 9c2c25c 99363dc
Author: Aaron Patterson 
Date:   2011-05-06 10:20:04 -0700

    Merge pull request #418 from myronmarston/am_observer_doc_updates
    
    Add documentation for new observer enable/disable feature.

commit fc2823a	refs/heads/master
Author: Richard Millan 
Date:   2011-05-06 10:05:43 -0700

    Adding base method symbolized_sti_name to activerecord base to be used on identity map. Identity map now considers the inheritance when creating the caching keys

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map_test.rb

commit 99363dc	refs/heads/master
Author: Myron Marston 
Date:   2011-05-06 09:59:57 -0700

    Add documentation for new observer enable/disable feature.

M	activemodel/CHANGELOG
M	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/observing.rb

commit 9c2c25c	refs/heads/master
Author: José Valim 
Date:   2011-05-06 18:39:10 +0200

    Revert to old semantics, use available_action? instead of action_method?.

M	actionpack/lib/abstract_controller/base.rb
M	actionpack/lib/abstract_controller/callbacks.rb
M	actionpack/lib/action_controller/metal/implicit_render.rb
M	actionpack/test/controller/new_base/render_implicit_action_test.rb

commit 6acb858	refs/heads/master
Merge: cae68d2 cb2d811
Author: José Valim 
Date:   2011-05-06 09:43:57 -0700

    Merge pull request #389 from jasonrudolph/always_flush_logger_at_exit
    
    Always flush logger at exit

commit 9575db6	refs/tags/v3.0.8.rc1
Author: José Valim 
Date:   2011-05-06 18:42:06 +0200

    Revert "Pass the proper method_name instead of hardcoding to action_name."
    
    This commit was actually correct. The first parameter in process_action
    is not necessarily the same as the action_name. Use action_name to
    retrieve the action instead.
    
    This reverts commit 4e2bacdf7cbece8225552e64358fb53ad6b70540.

M	actionpack/lib/abstract_controller/callbacks.rb
M	actionpack/lib/action_controller/metal/implicit_render.rb

commit cb2d811	refs/heads/master
Author: Jason Rudolph 
Date:   2011-05-05 16:51:29 -0400

    Add test to verify production rake tasks flush logger on exit

M	railties/test/application/rake_test.rb

commit 59982ac	refs/heads/master
Author: Jason Rudolph 
Date:   2011-05-04 18:46:24 -0400

    Always flush logger at exit
    
    Prior to this change, running code via script/runner would demonstrate
    different logging behavior than running the same code via a rake task.
    In production mode the script/runner approach would always flush the
    logger, but the rake-based approach would not automatically flush the
    logger. This discrepancy violates the principle of least surprise, and
    it could lead to the loss of important production logging data.
    
    This change removes special-case code in the "runner" command, and
    replaces it with a general solution to ensure that the logger gets
    flushed at exit. This solution works for "runner", "console", "server",
    rake tasks, and any other process that loads the Rails environment.

M	railties/lib/rails/application/bootstrap.rb
M	railties/lib/rails/commands/runner.rb

commit cae68d2	refs/heads/master
Merge: 0e5adbc a8cfcec
Author: José Valim 
Date:   2011-05-06 08:35:57 -0700

    Merge pull request #414 from asanghi/lh5796
    
    config.generators.orm = false when skipping active record. LightHouse #5796

commit a8cfcec	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-06 21:02:20 +0530

    be consistent

M	railties/test/generators/app_generator_test.rb

commit ef27384	refs/heads/master
Author: Xavier Noria 
Date:   2011-05-06 17:30:00 +0200

    Revert "Small edit to the if statement simplification for blank? on the Object class. An Object doesn't need to be nil and empty to be blank? just one or the other."
    
    Reason: the original code is correct, see
    
        !nil && !empty -> !(nil || empty) -> !blank
    
    That said, this example has too many negations
    for my linking. Think should be revised to be
    more positive and straightforward to read.
    
    This reverts commit a4b6e3d9be338e93320606f7cb14759b26ced8df.

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit cdf1842	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-06 20:59:15 +0530

    review fixes

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit a4b6e3d	refs/heads/master
Author: Caley Woods 
Date:   2011-05-06 08:23:12 -0700

    Small edit to the if statement simplification for blank? on the Object class. An Object doesn't need to be nil and empty to be blank? just one or the other.

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit 24fbc47	refs/tags/v3.0.8.rc1
Author: José Valim 
Date:   2011-05-06 17:00:59 +0200

    Don't pluralize, camelize.

M	actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit 0e5adbc	refs/heads/master
Author: José Valim 
Date:   2011-05-06 17:00:59 +0200

    Don't pluralize, camelize.

M	actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit 9b5c290	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-06 20:29:11 +0530

    default orm and test_framework to false; change application.rb template accordingly

M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit d42bb68	refs/heads/master
Author: José Valim 
Date:   2011-05-06 14:56:51 +0200

    More updates to ivars list.

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/lib/action_mailer/old_api.rb
M	actionpack/lib/abstract_controller/layouts.rb
M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/metal/compatibility.rb

commit 894bdbd	refs/heads/master
Author: José Valim 
Date:   2011-05-06 14:32:48 +0200

    Move variables to underscore format, update protected instance variables list.

M	actionmailer/lib/action_mailer/base.rb
M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/abstract_controller/view_paths.rb
M	actionpack/lib/action_controller/metal/compatibility.rb
M	activesupport/lib/active_support/configurable.rb
M	activesupport/test/configurable_test.rb

commit 75e1e21	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-06 18:04:20 +0530

    When skipping skip active record, mark config.generators.orm to false; LH 5796 remainder

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb

commit be9857c	refs/heads/master
Merge: 29dbccf 65a9563
Author: José Valim 
Date:   2011-05-06 04:41:24 -0700

    Merge pull request #410 from asanghi/LH6074
    
    distance_of_time_in_words calculates wrong no of years

commit 29dbccf	refs/heads/master
Merge: 4c755f9 7d0f267
Author: Xavier Noria 
Date:   2011-05-06 03:53:17 -0700

    Merge pull request #396 from asanghi/lh_4346
    
    Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346

commit 65a9563	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-06 15:51:09 +0530

    strip space

M	actionpack/lib/action_view/helpers/date_helper.rb

commit ae7d0d8	refs/heads/master
Author: Aditya Sanghi 
Date:   2010-11-29 20:45:43 +0530

    Take leap years into account more seriously when calculating year distance [#6074 state:resolved]

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 4c755f9	refs/heads/master
Merge: 785ee65 1f1989d
Author: José Valim 
Date:   2011-05-06 02:22:06 -0700

    Merge pull request #408 from etdsoft/master
    
    Rails::Server outputs 'http://' even when running over SSL

commit 9f9446f	refs/heads/master
Author: Jacob Poulsgaard Tjoernholm 
Date:   2011-05-06 10:26:17 +0200

    Update the description of the :path option to #resources to reflect that it sets the actual path, not a prefix. Most instances were already fixed.

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 1f1989d	refs/heads/master
Author: Daniel Martin 
Date:   2011-05-06 07:22:27 +0100

    Take into account the Rack::Server :SSLEnable option when building the application's URL

M	railties/lib/rails/commands/server.rb

commit 785ee65	refs/heads/master
Author: José Valim 
Date:   2011-05-06 07:11:06 +0200

    Ensure params wrapper settings are not inherited and calculated each time.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	railties/test/application/configuration_test.rb

commit 41a6d96	refs/heads/master
Author: José Valim 
Date:   2011-05-06 05:53:27 +0200

    Update CHANGELOGs.

M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG

commit 7adfd02	refs/heads/master
Merge: 030e1d0 976a9d9
Author: José Valim 
Date:   2011-05-05 20:30:29 -0700

    Merge pull request #400 from arunagw/ruby_prof
    
    Adding ruby-prof gem for ruby platform only #jruby

commit 030e1d0	refs/heads/master
Merge: f098c80 9b7cd75
Author: Jon Leighton 
Date:   2011-05-05 13:23:15 -0700

    Merge pull request #399 from ernie/join_conditions_on_join
    
    Add association join conditions to JOIN clause, not WHERE

commit 6df7a22	refs/heads/master
Author: Paul Morganthall 
Date:   2011-05-05 12:19:01 -0700

    Restore emphasis on 'application name'.

M	railties/guides/source/testing.textile

commit 9b7cd75	refs/heads/master
Author: Ernie Miller 
Date:   2011-05-05 14:34:48 -0400

    Add a test for outer joins with conditions where value IS NULL

M	activerecord/test/cases/associations/inner_join_association_test.rb

commit f098c80	refs/heads/master
Merge: ee898e5 86ea94e
Author: Aaron Patterson 
Date:   2011-05-05 11:13:05 -0700

    Merge pull request #358 from baroquebobcat/fix_find_or_create_master
    
    Fix for lighthouse #6741

commit 976a9d9	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-05 23:17:07 +0530

    Grouped the ruby-prof into test.

M	Gemfile

commit 745c9f3	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-05 22:46:23 +0530

    Removing from duplicate places. Only in Ruby platform needed.

M	Gemfile

commit f649d13	refs/heads/master
Merge: 0f7827c 210ebd3
Author: Jason Voegele 
Date:   2011-05-05 10:03:07 -0700

    Merge branch 'master' of github.com:lifo/docrails

commit c62fcaa	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-05-05 22:21:38 +0530

    adding ruby-prof gem for ruby platform only #jruby

M	Gemfile

commit 8d270a2	refs/heads/master
Author: Ernie Miller 
Date:   2011-05-05 12:35:29 -0400

    Add join conditions to JOIN clause, not WHERE

M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb

commit 0f7827c	refs/heads/master
Author: Jason Voegele 
Date:   2011-05-05 09:22:03 -0700

    Added info on using Ehcache as cache store.

M	railties/guides/source/caching_with_rails.textile

commit 210ebd3	refs/heads/master
Author: Paul Morganthall 
Date:   2011-05-05 09:05:40 -0700

    Rails 3 requires the "new" command to create a new project.

M	railties/guides/source/testing.textile

commit d53b406	refs/heads/master
Author: Richard Millan 
Date:   2011-05-05 07:28:51 -0700

    Test: identity on inherited classes should behave the same when turned on or off

M	activerecord/test/cases/identity_map_test.rb

commit ee898e5	refs/heads/master
Merge: 5e1960e 220782e
Author: José Valim 
Date:   2011-05-05 05:14:40 -0700

    Merge pull request #397 from dchelimsky/view-path-decorator
    
    rename test case to better describe use case

commit 564922b	refs/heads/master
Author: Richard Millan 
Date:   2011-05-05 04:52:42 -0700

    Testing identity map on inherited active record classes.  Distinct models that use the same database table shouldn't be retrieved as the same object when there is not a type attribute.

M	activerecord/test/cases/identity_map_test.rb

commit 5e1960e	refs/heads/master
Merge: 008b178 97f9000
Author: José Valim 
Date:   2011-05-05 03:32:55 -0700

    Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assets
    
    Display custom asset routes in `rake routes`

commit 97f9000	refs/heads/master
Author: Peter Suschlik 
Date:   2011-05-05 12:05:25 +0200

    Display custom asset routes in `rake routes`

M	railties/lib/rails/tasks/routes.rake
M	railties/test/application/rake_test.rb

commit 7d0f267	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-05-05 15:41:14 +0530

    Multiparameter POLA, time_select fixes. See LH4346

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb

commit 008b178	refs/heads/master
Merge: ffe731c ebc5ef0
Author: José Valim 
Date:   2011-05-05 03:08:32 -0700

    Merge pull request #392 from janx/master
    
    Patch for performance test: make it run with ruby19/minitest

commit ffe731c	refs/heads/master
Author: José Valim 
Date:   2011-05-05 03:01:15 -0700

    Update respond_with docs to deal better with collections.

M	actionpack/lib/action_controller/metal/responder.rb

commit ebc5ef0	refs/heads/master
Author: Jan Xie 
Date:   2011-05-05 17:15:22 +0800

    add tests for performance test

M	Gemfile
M	railties/test/application/test_test.rb

commit 25288c1	refs/heads/master
Author: Jan Xie 
Date:   2011-05-05 16:11:49 +0800

    minitest/ruby19 compatible performance test

M	activesupport/lib/active_support/testing/performance.rb

commit 3e9bb54	refs/heads/master
Merge: 65fd004 2f331fd
Author: José Valim 
Date:   2011-05-05 00:30:42 -0700

    Merge pull request #390 from arunagw/jruby_openssl
    
    Adding jruby-openssl in Gemfile by default. #jruby

commit 65fd004	refs/heads/master
Merge: e99c1e3 a9fb511
Author: José Valim 
Date:   2011-05-05 00:24:58 -0700

    Merge pull request #391 from bradleypriest/patch-1
    
    Tidying up the language in wrap_parameters.rb

commit a9fb511	refs/heads/master
Author: Bradley Priest 
Date:   2011-05-04 23:04:30 -0700

    Tidying up the language in wrap_parameters.rb

M	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

commit 2f331fd	refs/heads/master
Author: Arun Agrawal 
Date:   2011-05-05 08:30:26 +0530

    Adding jruby-openssl in Gemfile by default. #jruby

M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/test/generators/app_generator_test.rb

commit e99c1e3	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-05-04 21:08:36 -0500

    No longer need to reference mysql2 from git

M	railties/lib/rails/generators/app_base.rb

commit 6826936	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-04 22:49:11 -0300

    Improve doc styles for ActiveModel::Conversion

M	activemodel/lib/active_model/conversion.rb

commit 169ae75	refs/tags/v3.1.0.beta1 (tag: v3.1.0.beta1)
Author: David Heinemeier Hansson 
Date:   2011-05-04 20:21:05 -0500

    Prepare for beta1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 5b88014	refs/tags/v3.1.0.beta1
Author: David Heinemeier Hansson 
Date:   2011-05-04 19:56:56 -0500

    Only show dump of regular env methods on exception screen (not all the rack crap) [DHH]

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/http/request.rb
M	actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb

commit 9f06297	refs/tags/v3.1.0.beta1
Author: David Heinemeier Hansson 
Date:   2011-05-04 19:24:41 -0500

    Dont show the assets mount in rake routes

M	railties/lib/rails/tasks/routes.rake

commit 38d92d7	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-04 15:24:26 -0700

    ensure query cache is cleared when Rack body is closed, fixes bug reported on 951e18abea9c116fc5d6b330ca1dcd2890abe006

M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit 8e69f1e	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-05-04 21:53:10 +0200

    minor correction to the ActionDispatch::Http::URL subdomain docs

M	actionpack/lib/action_dispatch/http/url.rb

commit bd4831d	refs/tags/v3.1.0.beta1
Author: Santiago Pastorino 
Date:   2011-05-04 16:47:48 -0300

    Bump up rack-cache, tzinfo and thor

M	actionpack/actionpack.gemspec
M	activerecord/activerecord.gemspec
M	railties/railties.gemspec

commit 6372d23	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-04 15:51:47 -0300

    Fix punctuation errors.

M	activesupport/lib/active_support/core_ext/date_time/conversions.rb

commit aada1a4	refs/tags/v3.1.0.beta1
Merge: 47e1cca 871096d
Author: Xavier Noria 
Date:   2011-05-04 20:15:34 +0200

    Merge branch 'master' of github.com:rails/rails

commit 47e1cca	refs/tags/v3.1.0.beta1
Merge: afc3ccf 2076295
Author: Xavier Noria 
Date:   2011-05-04 20:15:00 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 871096d	refs/tags/v3.1.0.beta1
Merge: afc3ccf 9be7911
Author: José Valim 
Date:   2011-05-04 11:14:57 -0700

    Merge pull request #387 from smartinez87/remove_method.
    
    Use #remove_possible_method instead

commit 9be7911	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-04 15:13:40 -0300

    Use #remove_possible_method instead here

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 2076295	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-05-04 23:42:29 +0530

    commented meta code

M	railties/lib/rails/paths.rb

commit afc3ccf	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-04 20:12:27 +0200

    Fix renew feature on cookies.

M	actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
M	actionpack/test/dispatch/session/cookie_store_test.rb

commit 3e7a8cc	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-05-04 23:38:21 +0530

    formatting results in comments

M	railties/lib/rails/engine.rb
M	railties/lib/rails/paths.rb

commit 1c2dc92	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-05-04 15:07:34 -0300

    Use #remove_possible_method instead

M	activesupport/lib/active_support/core_ext/class/attribute.rb

commit 6b79463	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-04 20:05:35 +0200

    Fix .subdomain regression.

M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/test/dispatch/request_test.rb

commit a93bd11	refs/heads/master
Author: José Valim 
Date:   2011-05-04 19:31:43 +0200

    Use remove possible method here.

M	actionpack/lib/action_view/test_case.rb

commit 85b8a88	refs/heads/master
Author: José Valim 
Date:   2011-05-04 19:30:23 +0200

    Relax this dependency a bit.

M	activesupport/activesupport.gemspec

commit f6dc816	refs/heads/master
Author: José Valim 
Date:   2011-05-04 18:46:19 +0200

    Let's run those precious tests against the gem.

M	Gemfile

commit 92661b0	refs/heads/master
Author: José Valim 
Date:   2011-05-04 16:39:01 +0200

    Move sandbox to AR and pass the sandbox as a value. This way, other ORMs like Datamapper can also have their own sandboxing in rails console.

M	activerecord/lib/active_record/railtie.rb
A	activerecord/lib/active_record/railties/console_sandbox.rb
M	railties/lib/rails/application.rb
D	railties/lib/rails/console/sandbox.rb
M	railties/lib/rails/railtie.rb
M	railties/test/application/console_test.rb

commit b9bba55	refs/heads/master
Author: José Valim 
Date:   2011-05-04 16:31:06 +0200

    Remove defined?(ActiveRecord) and use the railtie hook instead.

M	activerecord/lib/active_record/railtie.rb
M	railties/lib/rails/commands/console.rb

commit cea3b3c	refs/tags/v3.1.0.beta1
Merge: 897318f 24586ed
Author: Xavier Noria 
Date:   2011-05-04 14:51:04 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 897318f	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-05-04 12:10:27 +0200

    fixes typo in railties/CHANGELOG (spotted by Vijay Dev)

M	railties/CHANGELOG

commit 1632a3a	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-04 12:04:29 +0200

    More AV::Base cleanup.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers.rb
A	actionpack/lib/action_view/helpers/controller_helper.rb

commit 30bb17e	refs/tags/v3.1.0.beta1
Merge: 6afc900 dd9200c
Author: Xavier Noria 
Date:   2011-05-04 02:54:18 -0700

    Merge pull request #384 from arunagw/new_plugin_test.
    
    Fixed tests for new_plugin_generator.

commit dd9200c	refs/tags/v3.1.0.beta1
Author: Arun Agrawal 
Date:   2011-05-04 15:07:06 +0530

    Fixed tests for new_plugin_generator.

M	railties/test/generators/plugin_new_generator_test.rb

commit 6afc900	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-04 11:26:02 +0200

    Move prefixes to view paths as they are now a lookup context dependency.

M	actionpack/lib/abstract_controller/helpers.rb
M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/abstract_controller/view_paths.rb
M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/template/test_case_test.rb

commit d9c39c3	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-05-02 00:59:57 +0200

    restores the -j option, but now it accepts the name of any library
    
    If passed "foo", a gem "foo-rails" is added to the Gemfile
    and "foo" and "foo_ujs" are required in the application
    JavaScript manifest.

M	actionpack/lib/action_view/railtie.rb
M	railties/CHANGELOG
M	railties/guides/source/action_view_overview.textile
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/app_generator_test.rb

commit 5d2cdb1	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-05-01 23:34:26 +0200

    removes the :update_ujs task in railties

M	railties/Rakefile

commit 33567d1	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-05-01 23:30:04 +0200

    jQuery is no longer vendored

M	railties/CHANGELOG
D	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/jquery.js
D	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/jquery_ujs.js

commit c9fa3f0	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-04 09:07:11 +0200

    Also allow prefixes as third argument to lookup context.

M	actionpack/lib/abstract_controller/view_paths.rb
M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb

commit 4758d37	refs/tags/v3.1.0.beta1
Merge: bff3740 eb327c1
Author: José Valim 
Date:   2011-05-04 08:37:59 +0200

    Merge remote branch 'apotonick/presentation'

commit 957115f	refs/tags/v3.0.8.rc1
Merge: c751d84 cd028aa
Author: José Valim 
Date:   2011-05-03 23:24:38 -0700

    Merge pull request #383 from mathie/patch-1.
    
    Extra requires for AR::Migration

commit cd028aa	refs/tags/v3.0.8.rc1
Author: Graeme Mathieson 
Date:   2011-05-03 22:15:00 -0700

    Add a couple of missing activesupport requires so AR::Migration can be used independently.

M	activerecord/lib/active_record/migration.rb

commit 24586ed	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-03 21:38:19 -0300

    Remove extra whitespaces

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit 0ee2513	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-03 21:26:02 -0300

    Improves Mysql2 adapter docs

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit fab9bb7	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-03 21:25:38 -0300

    Added #recreate_database docs

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit f049062	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-03 21:11:17 -0300

    Fixes on schema_definitions docs

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit eb327c1	refs/tags/v3.1.0.beta1
Author: Nick Sutterer 
Date:   2011-05-04 00:12:11 +0200

    no @controller dependency in Renderers.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/renderer/renderer.rb

commit b4bc2c5	refs/tags/v3.1.0.beta1
Author: Nick Sutterer 
Date:   2011-05-04 00:11:34 +0200

    fixed test to assert initialization value.

M	actionpack/test/template/lookup_context_test.rb

commit 88c2112	refs/tags/v3.1.0.beta1
Author: Nick Sutterer 
Date:   2011-05-04 00:10:21 +0200

    initialize prefixes in LookupContext.

M	actionpack/lib/action_view/lookup_context.rb

commit 65ceccb	refs/tags/v3.1.0.beta1
Author: Nick Sutterer 
Date:   2011-05-03 23:41:38 +0200

    controller's prefixes are now added to LookupContext.

M	actionpack/lib/abstract_controller/view_paths.rb
M	actionpack/test/controller/view_paths_test.rb

commit 37f448e	refs/tags/v3.1.0.beta1
Author: Nick Sutterer 
Date:   2011-05-03 23:38:44 +0200

    added :prefixes accessor to LookupContext.

M	actionpack/lib/action_view/lookup_context.rb
M	actionpack/test/template/lookup_context_test.rb

commit bff3740	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 23:03:07 +0200

    Use latest rack-test.

M	Gemfile
M	actionpack/actionpack.gemspec

commit 836b54e	refs/tags/v3.1.0.beta1
Merge: d54ce71 323b758
Author: Aaron Patterson 
Date:   2011-05-03 13:54:00 -0700

    Merge pull request #381 from joshk/mysql2_schema_test.
    
    Added the mysql schema test to mysql2 adapter

commit 3b795c1	refs/tags/v3.1.0.beta1
Author: backspace 
Date:   2011-05-03 15:41:11 -0500

    Fix typo in Factory Girl description

M	railties/guides/source/testing.textile

commit 323b758	refs/tags/v3.1.0.beta1
Author: Josh Kalderimis 
Date:   2011-05-03 21:14:27 +0200

    added the mysql schema test to mysql2 adapter, and fixed the corresponding failures

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/test/cases/adapters/mysql/schema_test.rb
A	activerecord/test/cases/adapters/mysql2/schema_test.rb

commit d54ce71	refs/tags/v3.1.0.beta1
Merge: cb9557c f490a81
Author: José Valim 
Date:   2011-05-03 11:19:27 -0700

    Merge pull request #380 from vijaydev/master.
    
    Fixes typos in params wrapper test

commit f490a81	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-05-03 23:35:01 +0530

    Fix typos in test method names

M	actionpack/test/controller/params_wrapper_test.rb

commit cb9557c	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-03 09:57:39 -0700

    make sure IM repository is cleared after body is closed

M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map/middleware_test.rb

commit d0719c5	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-03 09:52:41 -0700

    proxying the body in the IM middleware so that IM is available for streaming ERb

M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map/middleware_test.rb

commit 3f897c1	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-03 09:32:15 -0700

    adding a test case for the identity map middleware

A	activerecord/test/cases/identity_map/middleware_test.rb

commit af8c54b	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-02 17:05:20 -0700

    cache strings in the AST for faster comparison than include?

M	actionpack/lib/action_dispatch/middleware/static.rb

commit dd7afdb	refs/tags/v3.1.0.beta1
Merge: f984907 c5d54be
Author: José Valim 
Date:   2011-05-03 08:02:14 -0700

    Merge pull request #378 from danielvlopes/master.
    
    Select_tag should have the same API of select from form_builder

commit f984907	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 16:51:08 +0200

    Add a shared entry point for AV and AC render which can be used as extension in the future.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_view/helpers/rendering_helper.rb
M	actionpack/lib/action_view/renderer/renderer.rb

commit c5d54be	refs/tags/v3.1.0.beta1
Author: Daniel Lopes 
Date:   2011-05-03 11:39:27 -0300

    fix select_tag to have the same behavior of select

M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/test/template/form_tag_helper_test.rb

commit f82767e	refs/tags/v3.1.0.beta1
Merge: 7ae3b82 2755294
Author: José Valim 
Date:   2011-05-03 07:21:35 -0700

    Merge pull request #377 from joshk/rails_legacy_mapper_message.
    
    raise an error if the old router draw method is used

commit 2755294	refs/tags/v3.1.0.beta1
Author: Josh Kalderimis 
Date:   2011-05-03 16:07:25 +0200

    raise an error if the old router draw method is used, along with a message advising them to either upgrade their routes or add rails_legacy_mapper to their Gemfile

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/controller/routing_test.rb

commit 7ae3b82	refs/tags/v3.1.0.beta1
Merge: 1ca8123 49b825e
Author: José Valim 
Date:   2011-05-03 06:44:01 -0700

    Merge pull request #375 from k33l0r/master.
    
    Google Chrome sometimes incorrectly identifies the rescues template charset

commit 49b825e	refs/tags/v3.1.0.beta1
Author: Matias Korhonen 
Date:   2011-05-03 16:30:59 +0300

    Sets the HTTP charset parameter for rescue response.

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit c7f7a45	refs/tags/v3.1.0.beta1
Author: Matias Korhonen 
Date:   2011-05-03 13:44:31 +0300

    Rescues template HTML5 doctype and the utf8 charset meta tag, and better font choices for Mac users.

M	actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb

commit 1ca8123	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 13:07:39 +0200

    Add static_cache_control as configuration option and set a default for test. Should improve performance in acceptance tests.

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

commit 06ddda0	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 12:56:57 +0200

    We no longer depend on those git repos.

M	Gemfile
M	actionpack/actionpack.gemspec
M	railties/lib/rails/generators/app_base.rb

commit f7c711b	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 12:42:42 +0200

    No need for a regexp here.

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/sprockets_helper.rb

commit e1c1685	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 12:32:14 +0200

    Static middleware accepts cache control.

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb

commit ed3e667	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 12:10:11 +0200

    Multipart is now fixed in Rack.

M	actionpack/test/dispatch/request/multipart_params_parsing_test.rb

commit ce6fef9	refs/tags/v3.1.0.beta1
Merge: 2fbbd08 31f412f
Author: José Valim 
Date:   2011-05-03 02:57:16 -0700

    Merge pull request #373 from sikachu/bomb.
    
    Fixing failing test case on 1.8.7 & bump Rack version

commit 31f412f	refs/tags/v3.1.0.beta1
Author: Prem Sichanugrist 
Date:   2011-05-03 16:51:19 +0700

    Fix broken params_wrapper_test on 1.8.7 :bomb:
    
    I have to keep in mind that 1.8.7 does *not* preserve the hash order.
    
    Guys, let's move to use 1.9.2 in production!

M	actionpack/test/controller/params_wrapper_test.rb

commit 8bf5d68	refs/tags/v3.1.0.beta1
Author: Prem Sichanugrist 
Date:   2011-05-03 15:40:52 +0700

    Update Action Pack to depend on Rack 1.3.0
    
    Rack 1.3.0 was released a while ago, which break the hard dependency we set in Action Pack. This dependency bump won't be the issue, as we always depends on edge Rack. Also, we was waiting for Rack 1.3.x release before we can release Rails 3.1 beta anyway.

M	actionpack/actionpack.gemspec

commit 2fbbd08	refs/tags/v3.1.0.beta1
Author: David Heinemeier Hansson 
Date:   2011-05-02 19:24:49 -0500

    Use require_self from latest Sprockets

M	actionpack/actionpack.gemspec
M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit b359f9f	refs/tags/v3.1.0.beta1
Merge: b29a905 35d0d82
Author: David Heinemeier Hansson 
Date:   2011-05-02 19:21:03 -0500

    Merge branch 'master' of github.com:rails/rails

commit 35d0d82	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 01:36:58 +0200

    More performance optimizations.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_dispatch/http/filter_parameters.rb

commit d53c2e4	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-02 20:30:31 -0300

    fixed-fonts on SchemaDefinitions

M	activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

commit a55f2de	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 01:03:21 +0200

    Improve performance for filtered parameters and add tests.

M	actionpack/lib/action_controller/base.rb
M	actionpack/lib/action_controller/metal/instrumentation.rb
M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/lib/action_dispatch/http/filter_parameters.rb
M	actionpack/test/controller/log_subscriber_test.rb

commit 1afb56f	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 00:47:11 +0200

    Instrumentation should have callbacks.

M	actionpack/lib/action_controller/base.rb

commit 4bddc06	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-03 00:37:40 +0200

    Move most processing to load time for performance and improve test suite.

M	actionpack/lib/action_controller/metal/params_wrapper.rb
M	actionpack/test/controller/params_wrapper_test.rb

commit 3cca866	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-02 23:53:53 +0200

    Update CHANGELOG.

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/streaming.rb

commit fa77665	refs/tags/v3.1.0.beta1
Merge: 81cfbf4 b5824a4
Author: Aaron Patterson 
Date:   2011-05-02 15:44:57 -0700

    Merge pull request #370 from joshk/unrolled_map.
    
    favor map over each in mysql* adapters

commit 81cfbf4	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-02 15:42:38 -0700

    removing auto_link and moving it to the rails_autolink gem.  :bomb:

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit b5824a4	refs/tags/v3.1.0.beta1
Author: Josh Kalderimis 
Date:   2011-05-03 00:33:39 +0200

    favor collect over each in mysql* adapters

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit e30f068	refs/tags/v3.1.0.beta1
Merge: 11db2ae c894fff
Author: David Heinemeier Hansson 
Date:   2011-05-02 15:14:24 -0700

    Merge pull request #369 from smartinez87/params_wrapper.
    
    Fix ParamsWrapper docs errors

commit c894fff	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-02 19:07:48 -0300

    Fix ParamsWrapper docs errors

M	actionpack/lib/action_controller/metal/params_wrapper.rb

commit b29a905	refs/tags/v3.1.0.beta1
Author: David Heinemeier Hansson 
Date:   2011-05-02 17:04:21 -0500

    Flunk makes a lot more sense, doesnt it (hat tip @tenderlove)

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit 11db2ae	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-02 23:44:23 +0200

    Koz asked to test something crazy.

M	actionpack/test/dispatch/request_test.rb

commit 83e35b9	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-02 23:38:39 +0200

    Allow ignore_accept_header through configuration option.

M	actionpack/lib/action_dispatch/railtie.rb
M	railties/test/application/configuration_test.rb

commit 73c94ed	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-02 23:33:58 +0200

    Add ignore_accept_header config to AD::Request.

M	actionpack/lib/action_dispatch/http/mime_negotiation.rb
M	actionpack/test/dispatch/request_test.rb

commit 79a9beb	refs/tags/v3.1.0.beta1
Merge: 7f5ff5d 8c9e4d5
Author: David Heinemeier Hansson 
Date:   2011-05-02 14:08:44 -0700

    Merge pull request #359 from sikachu/params_wrapper.
    
    Add `ActionController::ParamsWrapper` to wrap JSON parameters into a nested parameters.

commit 8c9e4d5	refs/tags/v3.1.0.beta1
Author: Prem Sichanugrist 
Date:   2011-04-28 15:56:11 +0700

    Add `ActionController::ParamsWrapper` to wrap parameters into a nested hash
    
    This will allow us to do a rootless JSON/XML request to server.

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
A	actionpack/lib/action_controller/metal/params_wrapper.rb
A	actionpack/test/controller/params_wrapper_test.rb
M	actionpack/test/dispatch/request/json_params_parsing_test.rb
M	actionpack/test/dispatch/request/xml_params_parsing_test.rb
A	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
M	railties/test/application/configuration_test.rb

commit 7f5ff5d	refs/tags/v3.1.0.beta1
Merge: 951e18a c577f18
Author: José Valim 
Date:   2011-05-02 12:56:45 -0700

    Merge pull request #367 from sikachu/credit_changelog.
    
    Update CHANGELOG file to mention my name

commit c577f18	refs/tags/v3.1.0.beta1
Author: Prem Sichanugrist 
Date:   2011-05-03 02:33:31 +0700

    Update CHANGELOG file to mention my name
    
    On the commit for updating :format parameters, seems like I've left out
    the credit name after the CHANGELOG entry. This should fix it, and in
    case someone has a problem they could seek assistance easier.

M	actionpack/CHANGELOG

commit 951e18a	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-02 11:30:49 -0700

    introduce a body proxy to ensure that query cache is enabled during streaming

M	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
M	activerecord/lib/active_record/query_cache.rb
M	activerecord/test/cases/query_cache_test.rb

commit 4300855	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-02 11:17:31 -0700

    more tests around caching

M	activerecord/test/cases/query_cache_test.rb

commit 3066ea8	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-02 11:13:49 -0700

    add a couple test cases surrounding query cache middleware

M	activerecord/test/cases/query_cache_test.rb

commit 04d37b0	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-02 10:37:34 -0300

    Remove extra whitespaces

M	activerecord/lib/active_record/base.rb

commit 09edaf4	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-05-02 17:39:46 +0530

    removed reference to verify method

M	railties/guides/source/security.textile

commit 527036e	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-05-02 17:31:00 +0530

    removed verify docs (feature removed in Rails3)

M	railties/guides/source/action_controller_overview.textile

commit 3fc37e8	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-02 09:00:54 +0200

    Fix failing AR test.

M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/log_subscriber_test.rb

commit de91663	refs/tags/v3.1.0.beta1
Merge: f76726c a962bfe
Author: José Valim 
Date:   2011-05-01 23:36:50 -0700

    Merge pull request #360 from cgriego/activeresource-performance.
    
    Optimize ActiveResource::Base.new(attributes)

commit f76726c	refs/tags/v3.1.0.beta1
Author: Joshua Peek 
Date:   2011-05-01 23:23:31 -0700

    Use sprockets beta gem

M	actionpack/actionpack.gemspec
M	railties/lib/rails/generators/app_base.rb

commit a962bfe	refs/tags/v3.1.0.beta1
Author: Chris Griego 
Date:   2011-05-01 23:05:42 -0500

    Optimize ActiveResource::Base.new(attributes)
    
    * Add performance benchmark similar to ActiveRecord
    * Lazily find_or_create_resource_for_collection to not incur the overhead for empty arrays and arrays of primatives
    * #duplicable? is faster than inline rescues when the object is not duplicable
    * Don't constantly raise and handle NameError, raising is expensive
    * Even when a resource is nested inside a module, always look inside the class first for the resource definition so we don't overwrite classes all the time
    
    Before:                                     user     system      total        real
    Model.new (instantiation)               0.120000   0.000000   0.120000 (  0.119961)
    Nested::Model.new (instantiation)       0.150000   0.010000   0.160000 (  0.151183)
    Model.new (setting attributes)         28.540000   0.680000  29.220000 ( 29.271775)
    Nested::Model.new (setting attributes) 29.740000   0.580000  30.320000 ( 30.486210)
    
    After:                                        user     system      total        real
    Model.new (instantiation)                 0.120000   0.000000   0.120000 (  0.121249)
    Nested::Model.new (instantiation)         0.150000   0.010000   0.160000 (  0.152429)
    Model.new (setting attributes)           11.480000   0.170000  11.650000 ( 11.656163)
    Nested::Model.new (setting attributes)   11.510000   0.210000  11.720000 ( 11.724249)

A	activeresource/examples/performance.rb
M	activeresource/lib/active_resource/base.rb

commit 9fa080e	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-02 00:15:36 -0300

    Update security guide with #new and #create respect mass-assignment

M	railties/guides/source/security.textile

commit 31155ee	refs/tags/v3.1.0.beta1
Author: David Heinemeier Hansson 
Date:   2011-05-01 19:10:21 -0600

    Make the identity map use the instrumentation infrastructure so we can style the messages nicely with colors (FIXME: Can someone look into why the test is not working?)

M	activerecord/lib/active_record/identity_map.rb
M	activerecord/lib/active_record/log_subscriber.rb
M	activerecord/test/cases/identity_map_test.rb

commit 635abc7	refs/tags/v3.1.0.beta1
Author: David Heinemeier Hansson 
Date:   2011-05-01 18:22:43 -0600

    Remove schema noise from logging (TODO: Deprecate/remove the name attribute to all these methods -- will take a pull request!)

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit a8861c8	refs/tags/v3.1.0.beta1
Merge: 32ef3cc 86d7ed3
Author: David Heinemeier Hansson 
Date:   2011-05-01 16:59:33 -0700

    Merge pull request #357 from joshk/assign_attributes.
    
    Assign protected attributes with create/new and control the role.

commit 32ef3cc	refs/tags/v3.1.0.beta1
Merge: 2db538c 5164c50
Author: David Heinemeier Hansson 
Date:   2011-05-01 16:54:36 -0700

    Merge pull request #340 from joshk/default_scope_changes.
    
    removed the default_scope deprecations and updated the docs and tests to

commit 2db538c	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-05-02 01:26:53 +0200

    made a copy-edit pass on the streaming RDoc

M	actionpack/lib/action_controller/metal/streaming.rb

commit 86ea94e	refs/heads/master
Author: Nick Howard 
Date:   2011-05-01 16:22:46 -0600

    Fix for lighthouse #6741
    
    - adds tests for find_or_create_by and find_or_initialize_by on has_many associations
    - changes the behavior of ActiveRecord::Associations::CollectionProxy#method_missing to differ to
      ActiveRecord::FinderMethods#find_or_instantiator_by_attributes for arg processing and saving so
      find_or_create_by's api on associations will be consistent w/ the api for model classes.

M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 86d7ed3	refs/tags/v3.1.0.beta1
Author: Josh Kalderimis 
Date:   2011-05-01 23:30:07 +0200

    singular and collection relations in AR can now specify mass-assignment security options (:as and :without_protection) in build, create and create! methods.

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/models/person.rb
M	activerecord/test/schema/schema.rb

commit 7c5ae0a	refs/tags/v3.1.0.beta1
Author: Josh Kalderimis 
Date:   2011-05-01 20:20:22 +0200

    Added mass-assignment security :as and :without_protection support to AR.new and AR.create

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/mass_assignment_security_test.rb

commit b8ccd05	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-01 12:16:12 -0700

    convert strings to lambdas so we can use a consistent interface to the objects in the collection

M	activesupport/lib/active_support/testing/assertions.rb

commit 06b9138	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-01 15:59:27 -0300

    Added some docs on ActiveResource::HttpMock

M	activeresource/lib/active_resource/http_mock.rb

commit 23eb81a	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-05-01 11:55:13 -0700

    assert_difference can take a callable piece of code rather than just evaling a string

M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activesupport/lib/active_support/testing/assertions.rb

commit 825dae1	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-01 15:50:53 -0300

    Documented ActiveResource#observing

M	activeresource/lib/active_resource/observing.rb

commit 2472428	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-01 15:46:01 -0300

    Remove extra whitespaces.

M	activeresource/lib/active_resource/http_mock.rb

commit 31110c5	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-01 15:33:27 -0300

    Fix punctuation errors.

M	activeresource/lib/active_resource/validations.rb

commit 1800a6d	refs/tags/v3.1.0.beta1
Merge: 13df194 ffc9374
Author: Aaron Patterson 
Date:   2011-05-01 10:53:41 -0700

    Merge pull request #316 from arunagw/jdbc_postgresql.
    
    Re-factored database.rake to allow Jdbcpostgresql. #jruby

commit 13df194	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 19:39:57 +0200

    Tidy up pending TODOs after discussion with Mr. Gatoz (@wycats).

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
A	actionpack/lib/action_view/helpers/rendering_helper.rb
D	actionpack/lib/action_view/rendering.rb
M	actionpack/test/controller/new_base/render_context_test.rb

commit ca608b8	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-05-01 12:28:16 -0300

    Bring this back on the contributing guide.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 8dbee3a	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 14:50:42 +0200

    Streaming docs.

M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb

commit 46611a9	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 13:39:15 +0200

    log errors when an exception happens when streaming.

M	actionpack/lib/action_view/context.rb
M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb
M	actionpack/test/template/streaming_render_test.rb

commit 6960a23	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 13:00:51 +0200

    Add a test for rendering from the controller context.

A	actionpack/test/controller/new_base/render_context_test.rb

commit b735761	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 12:56:04 +0200

    Introduce view renderer.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_view/context.rb
M	actionpack/lib/action_view/renderer/renderer.rb
M	actionpack/lib/action_view/rendering.rb

commit 367bdc5	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 12:37:57 +0200

    Remove view dependency from AV::Renderer.

M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/renderer/renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
A	actionpack/lib/action_view/rendering.rb

commit 33cc001	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 12:16:31 +0200

    More cleanup and moving responsibilities around.

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/flows.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
D	actionpack/lib/action_view/rendering.rb
M	actionpack/test/template/capture_helper_test.rb

commit 2f683fd	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 11:53:09 +0200

    Remove more dependencies from the view.

M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/renderer/renderer.rb
M	actionpack/lib/action_view/rendering.rb
M	actionpack/test/template/log_subscriber_test.rb

commit bebaccd	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 11:14:38 +0200

    Remove dependency from _template.

M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/test_case.rb
M	actionpack/test/template/template_test.rb
M	actionpack/test/template/url_helper_test.rb

commit d08f651	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-05-01 10:33:30 +0200

    Start abstracting the renderer.

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/form_helper.rb
D	actionpack/lib/action_view/partials.rb
M	actionpack/lib/action_view/renderer/abstract_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
A	actionpack/lib/action_view/renderer/renderer.rb
M	actionpack/lib/action_view/rendering.rb

commit e68b7a0	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-05-01 13:15:15 +0200

    (temporary hack) generate a main file for RDoc escaping "Rails"
    
    RDoc autolinks the word "Rails" to the doc page for the Rails module.
    But README.rdoc is displayed in the home page at GitHub and the slashes
    are visible there, which is weird. We leave by now the slashes off in
    the file, and generate a second file for the API with them.

M	.gitignore
M	README.rdoc
M	Rakefile

commit d1f7656	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-05-01 16:15:53 +0530

    remove info about adding verified tag

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 4760464	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-05-01 15:46:46 +0530

    fix GitHub guides url

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 2fbf302	refs/tags/v3.1.0.beta1
Merge: a065698 b84b759
Author: Xavier Noria 
Date:   2011-05-01 11:16:31 +0200

    Merge branch 'master' of git://github.com/lifo/docrails
    
    Conflicts:
    	railties/guides/source/contributing_to_ruby_on_rails.textile

commit a065698	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-30 17:40:53 -0700

    fixing more test warnings in 1.9.3

M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit 9274a57	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-30 17:37:58 -0700

    fixing test warnings

M	activerecord/test/cases/identity_map_test.rb

commit 1d7c033	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-30 17:26:42 -0700

    using bind parameters for updates

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation.rb

commit e14e696	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-30 17:27:25 -0700

    fixing arel requirements for released arel

M	Gemfile
M	activerecord/activerecord.gemspec

commit b84b759	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-30 20:35:25 -0300

    Improved ActiveModel Observing docs.

M	activemodel/lib/active_model/observing.rb

commit 754c2dd	refs/tags/v3.1.0.beta1
Author: Santiago Pastorino 
Date:   2011-04-30 02:16:50 -0300

    Change from LH to github way of autoclosing issues

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 0525306	refs/tags/v3.0.8.rc1
Author: Casey Dreier 
Date:   2011-04-29 23:26:31 -0400

    This patch allows a user to join through a polymorphic has_one association to another has_one polymorphic association. This also includes a fix in to the Author model test to properly define two associations to taggings as a has_one and a has_many.

M	activerecord/lib/active_record/associations.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/models/author.rb

commit b538e85	refs/tags/v3.0.8.rc1
Author: Casey Dreier 
Date:   2011-04-29 23:19:02 -0400

    This patch ensures that an inner join performed to a polymorphic resource joins on both the polymorphic_id and polymorphic_type fields.
    
    Previously, the inner joins were merely joining on the polymorphic_id field.

M	activerecord/lib/active_record/associations.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb

commit b2aacc3	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-04-30 03:52:06 +0200

    Prototype and Scriptaculous are no longer vendored, but provided by prototype-rails from now on, also the -j option of the application generator is removed

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	railties/CHANGELOG
M	railties/Rakefile
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/layouts_and_rendering.textile
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
D	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/controls.js
D	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/dragdrop.js
D	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/effects.js
D	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/prototype.js
D	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/prototype_ujs.js
M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 7ee5f2e	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 18:21:07 -0700

    making sure the `create_fixtures` method works to prevent regressions

M	activerecord/test/cases/fixtures_test.rb

commit 2987115	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 17:30:01 -0700

    make sure we flatten the fixture path list

M	activerecord/lib/active_record/railties/databases.rake

commit 1f5249b	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 17:28:34 -0700

    shorten up our fixture path resolving code

M	activerecord/lib/active_record/railties/databases.rake

commit bf3a3c2	refs/tags/v3.1.0.beta1
Author: Mike Gehard 
Date:   2011-04-29 19:19:25 -0600

    Removed so info about assigning to specific devs and adding tags.  I don't believe that you can do that in GitHub issues.  Remove state:committed notes as they also don't exist in GitHub issues.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 9ef4b70	refs/tags/v3.1.0.beta1
Author: Santiago Pastorino 
Date:   2011-04-29 21:44:40 -0300

    Update jquery-ujs and prototype-ujs

M	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/jquery_ujs.js
M	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/prototype_ujs.js

commit 5076264	refs/tags/v3.1.0.beta1
Author: Santiago Pastorino 
Date:   2011-04-29 21:44:05 -0300

    Make update_ujs task update the right files

M	railties/Rakefile

commit 1302bf2	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-29 21:22:33 -0300

    Added missing word on guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit e350641	refs/tags/v3.1.0.beta1
Author: David Heinemeier Hansson 
Date:   2011-04-28 22:17:10 -0600

    Include CSRF token in remote:true calls

M	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/jquery_ujs.js

commit 651836a	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 17:20:56 -0700

    table name needs to be classified when instantiating fixtures

M	activerecord/lib/active_record/fixtures.rb

commit 9c0196a	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-29 21:18:49 -0300

    Upload patches is for LH, we use pull requests on GitHub now

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit c751d84	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-04-29 16:26:06 -0700

    only use mysql2 0.2.x with rails 3.0.x

M	Gemfile

commit 1efaed5	refs/tags/v3.1.0.beta1
Merge: 85c8d73 010dbf7
Author: Dan Pickett 
Date:   2011-04-29 19:18:10 -0400

    Merge branch 'master' of github.com:lifo/docrails

commit 85c8d73	refs/tags/v3.1.0.beta1
Author: Dan Pickett 
Date:   2011-04-29 19:17:34 -0400

    update contributors guide to reflect GitHub use
    
    * outlines how to review pull requests
    * outlines how to issue pull requests
    * changed all references from LH => GH

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 5663e63	refs/tags/v3.0.8.rc1
Merge: d657b9e 6bcb352
Author: Aaron Patterson 
Date:   2011-04-29 16:16:42 -0700

    Merged pull request #351 from vijaydev/3-0-stable.
    
    Update the github url for the verification plugin

commit d657b9e	refs/tags/v3.0.8.rc1
Merge: 69079a1 6bcb352
Author: Aaron Patterson 
Date:   2011-04-29 16:12:27 -0700

    Merged pull request #351 from vijaydev/3-0-stable.
    
    Update the github url for the verification plugin

commit 6bcb352	refs/tags/v3.0.8.rc1
Author: Vijay Dev 
Date:   2011-04-30 03:35:22 +0530

    update verification.git plugin url

M	actionpack/lib/action_controller/deprecated/base.rb

commit 9971387	refs/tags/v3.1.0.beta1
Merge: cc35d5c 564fe7f
Author: Xavier Noria 
Date:   2011-04-29 14:23:33 -0700

    Merged pull request #350 from bcardarella/master.
    
    Fixed documentation, 'asset' -> 'assets'

commit 564fe7f	refs/tags/v3.1.0.beta1
Author: Brian Cardarella 
Date:   2011-04-29 14:17:40 -0700

    Fixed comment 'config.asset' => 'config.assets'

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit cc35d5c	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-04-29 22:14:22 +0200

    JavaScript expansions are ignored if the application uses the asset pipeline, warn the user

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 69079a1	refs/tags/v3.0.8.rc1
Author: José Valim 
Date:   2011-04-29 19:55:33 +0200

    Make postgresql faster on development (thanks to @tapajos).

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit aba149d	refs/heads/master
Author: Bradley Harris 
Date:   2011-04-29 14:47:49 -0400

    Fix bug with empty CDATA not being handled in Hash.from_xml

M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit 60c877c	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 11:47:04 -0700

    convert query results to a list of lists

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 0eea560	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 11:43:05 -0700

    requring pg ~> 0.11, so remove conditional code for supporting older versions of the gem

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 0c76eb1	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-04-29 20:15:19 +0200

    No need for &block here.

M	activesupport/lib/active_support/whiny_nil.rb

commit 58ad5e1	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-04-29 19:55:33 +0200

    Make postgresql faster on development (thanks to @tapajos).

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 1e19a05	refs/tags/v3.0.8.rc1
Merge: 8dcaf4d 92e4cfb
Author: Aaron Patterson 
Date:   2011-04-29 11:23:12 -0700

    Merged pull request #347 from pkmiec/SyntacticalSugar30.
    
    performance trumps syntactical sugar

commit 1464742	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 09:41:37 -0700

    lean on rubygems to provide error messages about missing gems

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 00f030c	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 09:27:19 -0700

    supporting delete with bind parameters in mysql2

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit ed775c6	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 09:22:01 -0700

    refactor exec_delete to reuse the statement cache from exec_query

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 4c41be9	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 09:06:37 -0700

    statement cache for deletes working on mysql

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 453bd2f	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-28 15:42:16 -0700

    sqlite3 supports prepared statement deletes

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit f1df6b2	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-28 15:35:19 -0700

    postgresql supports prepare statement deletes

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/relation.rb

commit 2450177	refs/heads/master
Author: Bradley Harris 
Date:   2011-04-29 14:09:06 -0400

    Added test for empty CDATA bug in from_xml

M	activesupport/test/core_ext/hash_ext_test.rb

commit 850b3ca	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-29 11:01:59 -0700

    supporting nil when passed in as an IN clause

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/finder_test.rb

commit 66a1885	refs/tags/v3.1.0.beta1
Author: gmile 
Date:   2011-02-12 14:42:20 +0200

    Test that passing nil member of array in conditions retrieves records with nil
    value on a selected field.

M	activerecord/test/cases/finder_test.rb

commit 3331166	refs/heads/master
Merge: e594913 36ee2ba
Author: José Valim 
Date:   2011-04-28 23:24:40 -0700

    Merged pull request #344 from asanghi/callback_if.
    
    :if should not fire on validations when not in context with :on

commit 8bce6e7	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-04-29 10:21:16 +0530

    DRY this baby up

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 92e4cfb	refs/tags/v3.0.8.rc1
Author: Paul Kmiec 
Date:   2011-04-28 21:48:48 -0700

    perofrmance trumps syntactical sugar

M	actionpack/lib/action_view/helpers/form_options_helper.rb

commit 36ee2ba	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-04-29 09:53:02 +0530

    fix typo

M	activemodel/lib/active_model/validations/callbacks.rb

commit bf5cf5d	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-04-29 02:54:37 +0530

    :if should not fire on validations when not in context with :on

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/callbacks.rb
M	activemodel/test/cases/validations_test.rb

commit 610e4d9	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-04-29 02:03:56 +0530

    add more documentation; remove unused assignment

M	actionpack/lib/action_view/helpers/date_helper.rb

commit a869382	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-04-29 01:49:45 +0530

    Allow AM/PM in datetime selectors

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit e594913	refs/heads/master
Merge: fc343d2 7db7aa5
Author: José Valim 
Date:   2011-04-28 19:17:03 +0200

    Merge remote branch 'myron/am_disabling_fix_memory_leaks'

commit fc343d2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-28 09:48:16 -0700

    clearing statement from cache on exception in order to support older versions of mysql

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 5164c50	refs/tags/v3.1.0.beta1
Author: Josh Kalderimis 
Date:   2011-04-28 18:46:26 +0200

    removed the default_scope deprecations and updated the docs and tests to reflect its use cases

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit 7db7aa5	refs/heads/master
Author: Myron Marston 
Date:   2011-04-28 08:32:22 -0700

    Add additional tests for AM::ObserverArray that I had missed yesterday.

M	activemodel/test/cases/observer_array_test.rb

commit fef2215	refs/heads/master
Author: Myron Marston 
Date:   2011-04-28 08:27:15 -0700

    Fix bug with AM::Observer disablement.
    
    Now that we propagate the enabling/disabling to descendants, we no longer have to check the disabled_observer Set on each superclass of the model class.  This was causing a bug when disabling all observers at a superclass level and then enabling an individual observer at a subclass level.
    
    Plus the logic is simpler now :).

M	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observer_array_test.rb

commit 9a38539	refs/heads/master
Author: Myron Marston 
Date:   2011-04-28 08:07:08 -0700

    Fix dev env memory leaks by using AS::DescendantsTracker rather than keeping track of subclasses manually.
    
    There's also no need to keep track of all ObserverArray instances in a hash, as this is likely to leak memory, too.

M	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/observing.rb

commit 05d4653	refs/heads/master
Author: Myron Marston 
Date:   2011-04-28 07:58:58 -0700

    Revert "Revert "Handle enabling/disabling observers at different levels of the class hierarchy.""
    
    This reverts commit 2a25c5818b03d7d6cd63aad180bff23479dbd861.
    
    I'm going to add another commit that keeps the same behavior of fixes
    the problems of leaking memory in development.

M	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observer_array_test.rb

commit bf50222	refs/heads/master
Merge: 533efd8 07bbaaa
Author: José Valim 
Date:   2011-04-28 05:38:46 -0700

    Merged pull request #327 from dcrec1/master.
    
    Prefix option for number_to_human_size

commit 533efd8	refs/heads/master
Merge: bb44cd7 502aaec
Author: José Valim 
Date:   2011-04-28 03:46:12 -0700

    Merged pull request #336 from neerajdotname/upgrade_rack_mount.
    
    upgrade rack-mount to 0.7.2

commit 502aaec	refs/heads/master
Author: Neeraj Singh 
Date:   2011-04-28 06:35:58 -0400

    upgrade rack-mount
    
    Newer version is a few minor performance fixes

M	actionpack/actionpack.gemspec

commit bb44cd7	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-04-28 09:47:07 +0200

    Tidy up previous commit.

M	activesupport/lib/active_support/cache/mem_cache_store.rb

commit 182d008	refs/tags/v3.1.0.beta1
Merge: be55228 72759f5
Author: José Valim 
Date:   2011-04-28 00:40:42 -0700

    Merged pull request #219 from panthomakos/memcache.
    
    Character encoding issues with MemCacheStore in 1.9.2

commit d793a56	refs/tags/v2.3.12
Merge: f424efe 8ca8ac3
Author: José Valim 
Date:   2011-04-28 00:37:53 -0700

    Merged pull request #198 from robdimarco/2-3-stable.
    
    Patch for issue 6440 - Session Reset undefined method `destroy' for {}:Hash

commit be55228	refs/tags/v3.1.0.beta1
Merge: 2a25c58 a07cee6
Author: José Valim 
Date:   2011-04-28 00:36:32 -0700

    Merged pull request #333 from jgarber/master.
    
    Specific translations for labels with values

commit 010dbf7	refs/tags/v3.1.0.beta1
Merge: 001a5a6 4c50a0f
Author: Stefan Rohlfing 
Date:   2011-04-28 00:35:29 -0700

    Merged pull request #40 from bytesource/master.
    
    Rails Routing from the Outside In (routing.textile): Fixed Regex

commit 2a25c58	refs/tags/v3.1.0.beta1
Author: José Valim 
Date:   2011-04-28 09:32:57 +0200

    Revert "Handle enabling/disabling observers at different levels of the class hierarchy."
    
    This reverts commit ad62f1928768bd2676958a4a08512bad342fe469 because the current
    subclasses implementation leaks memory in development.
    
    Instead of keeping an array of subclasses, the better solution is to
    ask the parent if an observer is being disabled or not.

M	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observer_array_test.rb

commit 4c50a0f	refs/tags/v3.1.0.beta1
Author: Stefan Rohlfing 
Date:   2011-04-28 00:25:03 -0700

    Edited railties/guides/source/routing.textile via GitHub

M	railties/guides/source/routing.textile

commit f424efe	refs/tags/v2.3.12
Merge: b0be721 9f7ff62
Author: José Valim 
Date:   2011-04-28 00:20:15 -0700

    Merged pull request #331 from daphonz/2-3-stable.
    
    Dynamic find_or_create_by_x_and_y always creates new records in Rails 2.3.11

commit 5297049	refs/tags/v3.1.0.beta1
Merge: ad62f19 ba9891f
Author: José Valim 
Date:   2011-04-28 00:19:13 -0700

    Merged pull request #328 from MSNexploder/fix_clear_inflector.
    
    proper reset all inflector scopes

commit a07cee6	refs/tags/v3.1.0.beta1
Author: Jason Garber 
Date:   2011-04-27 21:00:27 -0600

    Allow a label with the value option to have value-specific translations.

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit ad62f19	refs/tags/v3.1.0.beta1
Author: Myron Marston 
Date:   2011-04-28 07:35:55 +0800

    Handle enabling/disabling observers at different levels of the class hierarchy.
    
    Last call wins.

M	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/observing.rb
M	activemodel/test/cases/observer_array_test.rb

commit 1f8cc44	refs/tags/v3.1.0.beta1
Author: Myron Marston 
Date:   2011-04-28 02:07:42 +0800

    Allow observers to be enabled and disabled.
    
    This is useful in situations like model unit tests and the occasional rake task to backfill old data.

A	activemodel/lib/active_model/observer_array.rb
M	activemodel/lib/active_model/observing.rb
A	activemodel/test/cases/observer_array_test.rb
M	activemodel/test/cases/observing_test.rb
A	activemodel/test/models/observers.rb

commit 5d20c0a	refs/tags/v3.1.0.beta1
Author: Myron Marston 
Date:   2011-04-03 02:43:11 +0800

    Wrap line that is over 200 characters long.  Now it's much easier to read.

M	activemodel/lib/active_model/observing.rb

commit 9f7ff62	refs/tags/v2.3.12
Author: Casey Dreier 
Date:   2011-04-27 21:57:24 -0400

    Fixing dynamic finders on associations to properly send arguments to the find_by_* method. Closes issue #330.
    
    Commit fdfc8e3b9 introduced a bugfix to prevent additional values passed
    to a dynamic find_or_create_by_x methods from confusing the finder.
    This patch also broke the essential behavior of this method on an
    association by incorrectly sending arguments to the find_by_x methods.
    The finder method would always see its inputs as a single array of
    values instead of individual arguments, almost guaranteeing that the
    finder call would be incorrect, and that we'd always create a new
    record instead.
    
    This patch adds a splat operator to the parameter array we send along to
    the dynamic finder so that it receives its inputs correctly, and
    includes an additional test to ensure that repeated calls to
    find_or_create_by_x only creates one new record.

M	activerecord/lib/active_record/associations/association_collection.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb

commit 07bbaaa	refs/heads/master
Author: Diego Carrion 
Date:   2011-04-27 20:29:03 -0300

    added a :prefix option to number_to_human_size

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit bed6a77	refs/tags/v3.1.0.beta1
Author: Aaron Patterson 
Date:   2011-04-27 14:44:28 -0700

    requiring a newer version of the mysql2 gem

M	Gemfile
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit e190569	refs/heads/master
Merge: 9f6cafd 78e581b
Author: Aaron Patterson 
Date:   2011-04-27 14:32:49 -0700

    Merged pull request #325 from joshk/mass_assignment_tests_fixed.
    
    final corrections to the mass-assignment security tests

commit 78e581b	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-27 23:25:27 +0200

    some test renaming to avoid collisions, and some annoying issues between dbs

M	activerecord/test/cases/persistence_test.rb

commit 001a5a6	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-28 01:50:00 +0530

    document the reorder method(fb215110401c70cfc7013c6e2ad5753fa4e374e9)

M	railties/guides/source/active_record_querying.textile

commit 9f6cafd	refs/heads/master
Author: misfo 
Date:   2011-02-08 12:08:35 +0800

    prevent errors when passing a frozen string as a param to ActionController::TestCase#process
    
    since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process.  This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed
    thanks and high fives to kinsteronline

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/test/controller/test_test.rb

commit 1cd5a08	refs/heads/master
Merge: c992045 e85dbd8
Author: Aaron Patterson 
Date:   2011-04-27 12:07:36 -0700

    Merged pull request #325 from joshk/mass_assignment_tests_fixed.
    
    final corrections to the mass-assignment security tests

commit e85dbd8	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-27 20:57:56 +0200

    final corrections to the mass-assignment security tests

M	activerecord/test/cases/persistence_test.rb

commit ffc9374	refs/tags/v3.1.0.beta1
Author: Arun Agrawal 
Date:   2011-04-27 23:09:45 +0530

    Minor fixes in databases.rake

M	activerecord/lib/active_record/railties/databases.rake

commit 089ee31	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-27 22:21:50 +0530

    update the Array#from behaviour changes - returns [] if index exceeds array length

M	railties/guides/source/active_support_core_extensions.textile

commit c992045	refs/heads/master
Merge: e84788e 11537c5
Author: Joshua Peek 
Date:   2011-04-27 08:42:32 -0700

    Merged pull request #324 from joshk/fix_array_from.
    
    fixed a small bug with Array#from core_ext

commit 11537c5	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-27 17:35:00 +0200

    fixed a small bug with Array#from core_ext

M	activesupport/lib/active_support/core_ext/array/access.rb

commit e84788e	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-27 08:55:26 -0600

    Relevant options closer together

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit f76dd27	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-27 00:30:31 +0530

    minor changes

M	activesupport/lib/active_support/deprecation/reporting.rb
M	activesupport/lib/active_support/notifications/fanout.rb

commit a009c3b	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-27 21:50:21 +0800

    minor git sources formatting change in railties app_base.rb

M	railties/lib/rails/generators/app_base.rb

commit d56befb	refs/heads/master
Author: Jared McFarland 
Date:   2011-04-27 06:48:53 +0800

    using @tenderlove's suggested implementation to speed things up

M	activesupport/lib/active_support/core_ext/array/access.rb

commit bd2444d	refs/heads/master
Author: Ganesh Kumar 
Date:   2011-04-27 19:14:42 +0800

    enable uglifier gem as new version of execjs is relased

M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 8fd9982	refs/tags/v3.1.0.beta1
Author: Arun Agrawal 
Date:   2011-04-27 13:51:07 +0530

    Allowing jdbcsqlite3 to drop database, clone structure. #jruby

M	activerecord/lib/active_record/railties/databases.rake

commit c4b494b	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-26 23:37:11 -0300

    Rephrased Dirty#changed? docs

M	activemodel/lib/active_model/dirty.rb

commit 4554983	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-26 23:29:11 -0300

    Removed extra whitespace

M	activemodel/lib/active_model/naming.rb

commit a2bfa5f	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-26 23:26:10 -0300

    Better formatting on ActiveModel::Translation

M	activemodel/lib/active_model/translation.rb

commit e8c1031	refs/heads/master
Merge: 2cac007 24e4ea5
Author: Piotr Sarnacki 
Date:   2011-04-26 16:32:15 -0700

    Merged pull request #319 from nusco/master.
    
    Fixed minor typo in comment

commit 24e4ea5	refs/heads/master
Author: Paolo "Nusco" Perrotta 
Date:   2011-04-26 16:15:20 -0700

    Fixed minor typo in comment

M	activeresource/test/connection_test.rb

commit 2cac007	refs/heads/master
Merge: 344c776 fee69cb
Author: Aaron Patterson 
Date:   2011-04-26 15:34:03 -0700

    Merged pull request #318 from joshk/fix_tests.
    
    fix mass-assignment security tests

commit fee69cb	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-27 00:28:00 +0200

    fix mass-assignment security tests, this was due to a string column limit which doesn't cause issues on sqlite

M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/persistence_test.rb

commit 344c776	refs/heads/master
Merge: 4ce14fb 74634d4
Author: David Heinemeier Hansson 
Date:   2011-04-26 14:55:22 -0700

    Merged pull request #317 from jaredonline/master.
    
    Change Array#from to return consistent results

commit 74634d4	refs/heads/master
Author: Jared McFarland 
Date:   2011-04-26 14:46:52 -0700

    fixing Array#from to return consistent results

M	activesupport/lib/active_support/core_ext/array/access.rb
M	activesupport/test/core_ext/array_ext_test.rb

commit c810281	refs/tags/v3.1.0.beta1
Author: Arun Agrawal 
Date:   2011-04-27 00:57:50 +0530

    Re-factored database.rake to allow Jdbcpostgresql. #jruby

M	activerecord/lib/active_record/railties/databases.rake

commit 4ce14fb	refs/heads/master
Merge: c57320d c15108c
Author: David Heinemeier Hansson 
Date:   2011-04-26 11:56:40 -0700

    Merged pull request #313 from chadk/master.
    
    [patch] Asset helpers should understand scheme-relative URLs

commit c15108c	refs/heads/master
Author: Chad Krsek 
Date:   2011-04-26 11:50:08 -0700

    moving check fo scheme-relative URI into is_uri?

M	actionpack/lib/action_view/helpers/asset_paths.rb

commit c57320d	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-26 12:46:28 -0600

    Prem fixes 1.9 engine test issue

M	railties/test/railties/engine_test.rb

commit e36befb	refs/heads/master
Merge: 91bd195 434d757
Author: José Valim 
Date:   2011-04-26 11:15:42 -0700

    Merged pull request #279 from miloops/434d757.
    
    Fix console to accept [environment] [options] as specified in docs.

commit 8dcaf4d	refs/tags/v3.0.8.rc1
Merge: 922fb1d 7d2f472
Author: José Valim 
Date:   2011-04-26 11:10:55 -0700

    Merged pull request #278 from miloops/fix_console.
    
    Fix console to accept [environment] [options] as specified in docs.

commit c1132f7	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-26 23:40:47 +0530

    added the list of reversible commands in the newer migrations

M	railties/guides/source/migrations.textile

commit 91bd195	refs/heads/master
Merge: e28f9ad 0421002d7
Author: Aaron Patterson 
Date:   2011-04-26 11:08:00 -0700

    Merged pull request #314 from smartinez87/master.
    
    Fix #update_attributes api format error

commit 0421002d7	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-26 14:58:06 -0300

    Fix #update_attributes api format error

M	activerecord/lib/active_record/persistence.rb

commit b105dc4	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-26 23:18:55 +0530

    minor changes in migrations guide

M	railties/guides/source/migrations.textile

commit e28f9ad	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-26 10:41:59 -0700

    simplifying buffered logger for easier and slightly more performant codes. pumpkin

M	activesupport/lib/active_support/buffered_logger.rb
M	activesupport/lib/active_support/log_subscriber.rb

commit 315f555	refs/heads/master
Merge: 9dc41a2 253ba77
Author: Aaron Patterson 
Date:   2011-04-26 10:32:29 -0700

    Merged pull request #307 from arunagw/master.
    
    jdbcpostgresql support added into template.

commit b49a119	refs/heads/master
Author: Chad Krsek 
Date:   2011-04-25 21:57:28 -0700

    asset helpers should understand scheme-relative URLs

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 9dc41a2	refs/heads/master
Merge: 8111fac bb7024b
Author: David Heinemeier Hansson 
Date:   2011-04-26 10:00:51 -0700

    Merged pull request #311 from joshk/assign_attributes.
    
    AR update_attributes api is updated to reflect the addition of assign_att

commit d4259d8	refs/tags/v3.1.0.beta1
Author: Prem Sichanugrist 
Date:   2011-04-26 23:33:39 +0700

    Change from `self.(up|down)` to `(up|down)` method

M	railties/guides/source/getting_started.textile
M	railties/guides/source/migrations.textile

commit 7282280	refs/tags/v3.1.0.beta1
Author: Prem Sichanugrist 
Date:   2011-04-26 23:30:08 +0700

    Update guide to use `change` method in various places after migration generator has changed.

M	railties/guides/source/association_basics.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/migrations.textile

commit 8111fac	refs/heads/master
Merge: 472f3fb bb7024b
Author: Aaron Patterson 
Date:   2011-04-26 09:22:43 -0700

    Merged pull request #311 from joshk/assign_attributes.
    
    AR update_attributes api is updated to reflect the addition of assign_att

commit 472f3fb	refs/heads/master
Merge: 6e02a61 1233e09
Author: Joshua Peek 
Date:   2011-04-26 09:07:14 -0700

    Merged pull request #312 from joshk/bump_multi_json.
    
    bump multi_json dependency

commit bb7024b	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-26 17:51:43 +0200

    AR update_attributes api is updated to reflect the addition of assign_attributes

M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/persistence_test.rb

commit 1233e09	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-26 17:54:41 +0200

    bump multi_json dependency

M	activesupport/activesupport.gemspec

commit 6e02a61	refs/heads/master
Merge: a5b0f70 714b4a8
Author: Aaron Patterson 
Date:   2011-04-26 08:52:37 -0700

    Merged pull request #310 from beanieboi/master.
    
    Added support for tsvector datatype in postgres

commit e6898e3	refs/tags/v3.1.0.beta1
Author: Prem Sichanugrist 
Date:   2011-04-26 22:23:57 +0700

    Change examples in guide to reflect changes from XML -> JSON

M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/debugging_rails_applications.textile

commit a5b0f70	refs/heads/master
Author: Sven Fuchs 
Date:   2011-04-24 17:37:57 +0200

    bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception handler [#6739 state:committed]
    
    Signed-off-by: José Valim 

M	actionpack/actionpack.gemspec
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	activemodel/activemodel.gemspec

commit 922fb1d	refs/tags/v3.0.8.rc1
Author: Mikel Lindsaar 
Date:   2011-04-26 20:13:44 +1000

    Update actionmailer to use Mail 2.2.19

M	actionmailer/actionmailer.gemspec

commit dd44626	refs/heads/master
Author: Mikel Lindsaar 
Date:   2011-04-26 20:04:48 +1000

    Updating to use Mail v2.3.0
    
      Need to move the require of mail in test/abstract_unit to be after active support
      to make sure we use ActiveSupport multibyte handlers, otherwise, Mail will load its
      internal multibyte compat

M	actionmailer/actionmailer.gemspec
M	actionmailer/test/abstract_unit.rb

commit 714b4a8	refs/heads/master
Author: Benjamin Fritsch 
Date:   2011-04-26 09:47:40 +0200

    Added tsvector Datatype Support
    
    Applied Patch from https://rails.lighthouseapp.com/projects/8994/tickets/5577-suport-from-tsvector-data-type-in-postgresql

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/datatype_test.rb
M	activerecord/test/cases/schema_dumper_test.rb
M	activerecord/test/schema/postgresql_specific_schema.rb

commit b73c84e	refs/heads/master
Merge: 3a109f7 f9d5a7b
Author: José Valim 
Date:   2011-04-25 23:58:23 -0700

    Merged pull request #308 from joshk/assign_attributes.
    
    deprecated the use of guard_protected_attributes with attributes= in AR

commit 7469041	refs/heads/master
Author: Chad Krsek 
Date:   2011-04-25 21:57:49 -0700

    Revert "asset helpers should understand scheme-relative URLs"
    
    This reverts commit 057412ce38ead06307a887dca333837a99f84f22.

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 057412c	refs/heads/master
Author: Chad Krsek 
Date:   2011-04-25 21:57:28 -0700

    asset helpers should understand scheme-relative URLs

M	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 3a109f7	refs/heads/master
Merge: 9336445 53d3baf
Author: Aaron Patterson 
Date:   2011-04-25 17:00:52 -0700

    Merged pull request #277 from kuinak/master.
    
    Correct documentation for asset host strategy for 1.9.2

commit 474e313	refs/heads/master
Author: Philipp Kempgen 
Date:   2011-04-26 01:04:05 +0200

    test "Escapes special HTML/XML characters" do ...

M	activesupport/test/core_ext/string_ext_test.rb

commit 9336445	refs/heads/master
Merge: 242d24d 070c998
Author: Aaron Patterson 
Date:   2011-04-25 15:33:05 -0700

    Merged pull request #306 from rsim/case_insensitive_uniqueness_validation_fix.
    
    Do not use SQL LIKE operator for case insensitive uniqueness validation

commit 242d24d	refs/heads/master
Merge: 873c13f 348b5b9
Author: Aaron Patterson 
Date:   2011-04-25 15:30:02 -0700

    Merged pull request #309 from arunagw/sass_new.
    
    Using sass directly as new version is out.

commit f9d5a7b	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-25 23:56:06 +0200

    deprecated the use of the guard_protected_attributes argument with attributes= in AR in favor of assign_attributes(attrs, :without_protection => true)

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/base_test.rb

commit 348b5b9	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-26 02:52:25 +0530

    Using sass directly as new version is out.

M	Gemfile

commit 873c13f	refs/heads/master
Author: Diego Carrion 
Date:   2011-04-20 14:26:45 -0300

    added test for number_to_phone with an empty string and area code true
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/test/template/number_helper_test.rb

commit 253ba77	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-26 02:13:20 +0530

    Database creation for jdbcpostgresql #jruby

M	activerecord/lib/active_record/railties/databases.rake

commit 16d3266	refs/heads/master
Author: Vishnu Atrai 
Date:   2011-04-26 00:54:02 +0530

    jdbcpostgresql support added into template.

M	railties/lib/rails/generators/app_base.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
M	railties/test/generators/app_generator_test.rb

commit 070c998	refs/heads/master
Author: Raimonds Simanovskis 
Date:   2011-04-25 22:09:48 +0300

    Do not use SQL LIKE operator for case insensitive uniqueness validation
    
    It can result in wrong results if values contain special % or _ characters. It is safer to use SQL LOWER function and compare for equality.

M	activerecord/lib/active_record/validations/uniqueness.rb
M	activerecord/test/cases/validations/uniqueness_validation_test.rb

commit 12427c8	refs/heads/master
Merge: f3c335f 6464f7b
Author: Aaron Patterson 
Date:   2011-04-25 11:17:16 -0700

    Merged pull request #304 from arunagw/jdbcmysql_db_create.
    
    Fixed error when running db:create with jdbcmysql

commit f3c335f	refs/heads/master
Merge: 17fec02 7521624
Author: José Valim 
Date:   2011-04-25 10:58:50 -0700

    Merged pull request #305 from joshk/bump_deprecation.
    
    bump AS deprecation_horizon to 3.2

commit 7521624	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-25 19:55:09 +0200

    bump AS deprecation_horizon to 3.2

M	activesupport/lib/active_support/deprecation.rb

commit 6464f7b	refs/heads/master
Author: Rashmi Yadav 
Date:   2011-04-25 23:05:17 +0530

    Fixed error when running db:create with jdbcmysql

M	activerecord/lib/active_record/railties/databases.rake
A	activerecord/lib/active_record/railties/jdbcmysql_error.rb

commit 17fec02	refs/heads/master
Merge: 2fc8d7e 51854de
Author: Aaron Patterson 
Date:   2011-04-25 09:20:40 -0700

    Merged pull request #300 from arunagw/jdbc_test.
    
    Start Adding jdbcmysql support to new rails template.

commit 2fc8d7e	refs/heads/master
Merge: f545a50 35d0b60
Author: Aaron Patterson 
Date:   2011-04-25 09:18:39 -0700

    Merged pull request #302 from metaskills/empty_inserts.
    
    Use existing #empty_insert_statement_value for an insert with no columns.

commit f545a50	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-04-25 17:57:41 +0200

    Fix tests, main_app mounted helper must be defined explicitly now.

M	actionpack/test/dispatch/prefix_generation_test.rb

commit d4bea35	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-04-25 15:02:41 +0200

    Make ActionController::Base.modules_for_helpers and ActionController::Base.all_helpers_from_path public methods

M	actionpack/lib/abstract_controller/helpers.rb
M	actionpack/lib/action_controller/metal/helpers.rb
M	railties/lib/rails/engine.rb

commit 820c0fe	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-04-25 14:56:58 +0200

    Explicitly define main_app proxy

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	railties/lib/rails/application/finisher.rb

commit e38b443	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-04-25 13:12:07 +0200

    Add Engine#helpers method which loads all the engine's helpers

M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb

commit 723a0f8	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-25 06:34:43 -0500

    Go with latest Sass directly

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 2bc4856	refs/heads/master
Author: José Valim 
Date:   2011-04-25 11:14:39 +0200

    Fix tests.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 8d00dfc	refs/heads/master
Author: David Chelimsky 
Date:   2011-04-23 17:18:06 -0500

    rename test case to better describe use case
    
    Signed-off-by: José Valim 

M	actionpack/test/controller/view_paths_test.rb

commit f2fc921	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-24 20:21:22 +0800

    No need to check for both full and mountable.
    
    All mountable engine are considered `full?` already.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit a1c31ec	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-24 19:56:25 +0800

    Add `app/assets/images` directory to plugin new generator

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 05ce000	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-24 20:34:22 -0500

    Temporarily disable uglifier until a new version depending on execjs 0.2.0 can be released (tomorrow?)

M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit b306502	refs/heads/master
Merge: 8d7efe6 bf40c72
Author: David Heinemeier Hansson 
Date:   2011-04-24 20:33:33 -0500

    Merge branch 'master' of github.com:rails/rails

commit ba9891f	refs/tags/v3.1.0.beta1
Author: Stefan Huber 
Date:   2011-04-25 02:17:22 +0100

    proper reset all inflector scopes

M	activesupport/lib/active_support/inflector/inflections.rb
M	activesupport/test/inflector_test.rb

commit c60e207	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-24 19:44:12 -0300

    Better formatting here

M	activerecord/lib/active_record/validations.rb

commit 35d0b60	refs/heads/master
Author: Ken Collins 
Date:   2011-04-24 12:52:28 -0400

    Use existing #empty_insert_statement_value for an insert with no columns.

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation.rb

commit bf40c72	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-24 09:11:25 +0200

    minor correction to the AMo mass-assignment security docs

M	activemodel/lib/active_model/mass_assignment_security.rb

commit f3b9d3a	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-24 00:54:48 +0200

    added config.active_record.whitelist_attributes which creates an empty whitelist of attributes available for mass assignment for all models in your app

M	activerecord/lib/active_record/railtie.rb
M	railties/guides/source/configuring.textile
M	railties/guides/source/security.textile
M	railties/test/application/configuration_test.rb

commit b3ba368	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-23 15:20:19 +0200

    updated the security guide on the updated mass-assignment security scopes addition, and assign_attributes in AR

M	railties/guides/source/security.textile

commit a08d04b	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-23 15:00:24 +0200

    Added assign_attributes to Active Record which accepts a mass-assignment security scope using the :as option, while also allowing mass-assignment security to be bypassed using :with_protected

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/mass_assignment_security_test.rb
M	activerecord/test/cases/persistence_test.rb
D	activerecord/test/models/loose_person.rb
M	activerecord/test/models/person.rb

commit 1054ebd	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-23 12:50:29 +0200

    AM mass assignment security attr_accessible and attr_protected now allow for scopes using :as => scope eg.
    
        attr_accessible :name
        attr_accessible :name, :admin, :as => :admin

M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/test/cases/mass_assignment_security_test.rb
M	activemodel/test/cases/secure_password_test.rb
M	activemodel/test/models/mass_assignment_specific.rb

commit 220782e	refs/heads/master
Author: David Chelimsky 
Date:   2011-04-23 17:18:06 -0500

    rename test case to better describe use case

M	actionpack/test/controller/view_paths_test.rb

commit dcee094	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-24 02:17:06 +0530

    indentation fixes

M	railties/guides/source/active_support_core_extensions.textile

commit 51854de	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-24 01:59:20 +0530

    Adding jdbcsqlite3 name in comment.

M	railties/lib/rails/generators/app_base.rb

commit d59a950	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-24 00:17:19 +0530

    Looks more friendly.

M	railties/lib/rails/generators/app_base.rb

commit 3e1f4db	refs/tags/v3.1.0.beta1
Author: misfo 
Date:   2011-04-23 10:15:38 -0500

    document HTML::Selector's :has(string) pseudo class

M	actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb

commit b335533	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-23 18:55:17 +0530

    jdbcsqlite3 support added into template. #jruby

M	railties/lib/rails/generators/app_base.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
M	railties/test/generators/app_generator_test.rb

commit 8d7efe6	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-23 13:22:15 +0200

    Stop adding actual dummy tests (they clutter up the real ones in a new app), just show how its done

M	railties/lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb
M	railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
M	railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb
M	railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
M	railties/lib/rails/generators/test_unit/model/templates/unit_test.rb
M	railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb
M	railties/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt

commit 0887385	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 21:30:30 -0300

    Added missing docs to mysql2_adapter

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 8f1b141	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 21:17:51 -0300

    Fixed punctuation errors.

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

commit a510f5c	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 21:13:35 -0300

    Better docs formatting

M	activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb

commit 4d04641	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 21:02:49 -0300

    Fix #postgresql_version docs

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 17d34d1	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 21:01:29 -0300

    Added docs for #version on mysql_adapter

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 3e678da	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 20:58:02 -0300

    Added some docs on SQLite adapter

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 868fb38	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 20:50:15 -0300

    Make this docs more consistent with the rest of the docs present

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 0ce94f4	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 20:39:26 -0300

    dot missing here

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 616eef3	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 20:39:00 -0300

    Added doc for #table_exists?

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit e382d95	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 20:26:20 -0300

    Added docs for #rename_table on some adapters

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 5d59cd8	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 20:20:25 -0300

    Added docs for #columns on some adapters

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 384dbfd	refs/tags/v3.1.0.beta1
Merge: 900470c af1b489
Author: Xavier Noria 
Date:   2011-04-23 01:16:21 +0200

    Merge branch 'master' of git://github.com/rails/rails

commit 900470c	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 20:13:24 -0300

    Added docs for #indexes on adapters

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit af1b489	refs/heads/master
Merge: f753880 df70b9d
Author: Xavier Noria 
Date:   2011-04-23 01:11:24 +0200

    Merge branch 'master' of git://github.com/lifo/docrails
    
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 030a905	refs/tags/v3.0.8.rc1
Author: Josh Kalderimis 
Date:   2011-04-19 22:52:00 +0200

    correction to the i18n locale filter examples

M	railties/guides/source/i18n.textile

commit df70b9d	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-04-23 00:53:28 +0200

    copy-edits 0e2644c

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit ca2f826	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-04-23 00:51:43 +0200

    copy-edits e2656e0

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 2c50239	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-04-23 00:49:55 +0200

    copy-edits 3d45964

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit ec33de5	refs/tags/v3.1.0.beta1
Author: Xavier Noria 
Date:   2011-04-23 00:43:58 +0200

    copy-edits 2f0dca5

M	railties/guides/source/active_support_core_extensions.textile

commit 1a77373	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 19:44:30 -0300

    Added docs for #drop_database on MySQL adapter

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit f753880	refs/heads/master
Author: José Valim 
Date:   2011-04-22 23:55:53 +0200

    File watcher won't make the cut for 3.1. Maybe on 3.2.

M	Gemfile
M	activesupport/lib/active_support.rb
D	activesupport/test/file_watcher_test.rb

commit 3050497	refs/tags/v3.1.0.beta1
Author: Ronnie Miller 
Date:   2011-04-22 14:50:52 -0700

    Grammer fix on note about wildcard routes

M	railties/guides/source/routing.textile

commit 3f7a434	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-22 23:38:03 +0200

    The example uses erb

D	railties/lib/rails/generators/rails/app/templates/db/seeds.rb
A	railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt

commit e46e106	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-23 03:06:06 +0530

    fix block alignment

M	railties/guides/source/active_record_validations_callbacks.textile

commit 013d901	refs/heads/master
Author: José Valim 
Date:   2011-04-22 23:25:48 +0200

    Use .erb in the test.

M	railties/test/railties/shared_tests.rb

commit b22f39e	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-23 02:53:30 +0530

    fix indentation

M	railties/guides/source/active_support_core_extensions.textile

commit 98b700e	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-23 02:45:29 +0530

    add examples for array access methods

M	railties/guides/source/active_support_core_extensions.textile

commit eac264d	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-23 02:42:22 +0530

    updating to_xml example to new AR api

M	railties/guides/source/active_support_core_extensions.textile

commit 5bed649	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-22 15:35:54 -0500

    split indexes and column types on money / binary iteration

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 3d19b35	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-22 15:31:03 -0500

    fetch result row arrays from pg in C and return early if there are no money or binary columns. :heart:

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 3eae734	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-22 14:37:53 -0500

    set the backtrace to prevent AR exceptions from lying to us

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

commit d42e43b	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-23 02:40:17 +0800

    Fixed images path in plugin_new_generator

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit a8870d1	refs/heads/master
Author: Schneems 
Date:   2011-04-23 02:23:12 +0800

    show http method in routing error message

M	actionpack/lib/action_dispatch/middleware/show_exceptions.rb

commit 6cea243	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-22 23:07:46 +0530

    Start Adding jdbcmysql support to new rails template.
    
    More will come for jruby app.

M	railties/lib/rails/generators/app_base.rb
A	railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
M	railties/test/generators/app_generator_test.rb

commit eb59929	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-23 02:17:08 +0800

    Images path fixed in test.

M	railties/test/generators/app_generator_test.rb

commit bb6b172	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-22 20:03:12 +0200

    Need this for testing

M	Gemfile

commit 89f315b	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-22 19:37:52 +0200

    We cant use assert_block because its buggy in MiniTest and wont actually show you the failure message you provide -- instead you just always get a "Expected block to return true"

M	actionpack/lib/action_dispatch/testing/assertions/response.rb

commit a377221	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-22 12:21:59 -0500

    removing incorrect comment and string concatenation

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 96acdd3	refs/heads/master
Author: Pavel Forkert 
Date:   2011-02-27 23:40:10 +0200

    Added test case and fix for proper eager loading associations

M	activerecord/test/cases/associations/eager_test.rb

commit fe4932b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-22 11:27:14 -0500

    bumping the pg requirements

M	Gemfile

commit bc50c1c	refs/heads/master
Author: Ken Collins 
Date:   2011-04-22 19:55:42 +0800

    The #substitute_at gets an ActiveRecord::ConnectionAdapters::Column in #insert to match replacement in #exec_query.

M	activerecord/lib/active_record/relation.rb

commit 59ce0f6	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-22 18:00:19 +0200

    Turn on JS/CSS compression by default

M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit 02ee200	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 12:59:05 -0300

    Added docs for #disconnect! on adapters

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 0e2644c	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 12:53:02 -0300

    Added missing docs for clear_cache! on adapters

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit dab96a2	refs/heads/master
Author: Joshua Peek 
Date:   2011-04-22 10:49:55 -0500

    Add shorthand for js and css compressors

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application/configuration.rb

commit e2656e0	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 12:45:46 -0300

    Added missing docs for +supports_primary_key?+ on some adapters

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 3d45964	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 12:35:53 -0300

    Added missing docs for +support_migrations?+ on some adapters

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 00e9cbd	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 12:22:53 -0300

    Have a more connection specific rdoc for +supports_statement_cache?+

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 2000285	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-22 12:14:23 -0300

    Removed ON() on distinct comment

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 6822f39	refs/tags/v3.1.0.beta1
Author: Semyon Perepelitsa 
Date:   2011-04-22 23:12:14 +0800

    Remove HTML escaping from Record Tag Helper docs.

M	actionpack/lib/action_view/helpers/record_tag_helper.rb

commit ed2820d	refs/heads/master
Author: Ken Collins 
Date:   2011-04-22 20:33:43 +0800

    Move #exec_insert to abstract adapter's database statements.

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 0cf7b2f	refs/tags/v3.1.0.beta1
Author: Josh Kalderimis 
Date:   2011-04-22 15:24:11 +0200

    minor correction to the Active Model instantiate_observers doc

M	activemodel/lib/active_model/observing.rb

commit c389b83	refs/tags/v3.1.0.beta1
Author: Cheah Chu Yeow 
Date:   2011-04-22 15:14:14 +0800

    Grammar fixes for Object#in? documentation.

M	activesupport/lib/active_support/core_ext/object/inclusion.rb

commit 3836dc6	refs/tags/v3.0.8.rc1
Author: Pavel Forkert 
Date:   2011-02-27 23:40:10 +0200

    Added test case and fix for proper eager loading associations

M	activerecord/lib/active_record/association_preload.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 724a786	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-21 22:47:13 -0500

    stop using distinct on for the unique id queries. [#6450 state:resolved]

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/relation/finder_methods.rb

commit 84f1b83	refs/heads/master
Author: Joshua Peek 
Date:   2011-04-21 11:03:56 -0500

    Only include SprocketsHelper into assets context

M	actionpack/lib/sprockets/railtie.rb

commit 783007a	refs/tags/v3.1.0.beta1
Author: Joost Baaij 
Date:   2011-04-21 16:32:02 +0200

    Replace example hostname with "example.com".
    The hostname used in these comments actually exists, which is
    undesirable. See also RFC 2606.

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit d31af44	refs/heads/master
Author: José Valim 
Date:   2011-04-20 21:54:19 +0200

    Fix tests on 1.8 by explicitly checking for strings (which also improves performance).

M	actionpack/lib/action_dispatch/http/response.rb

commit 2f0dca5	refs/tags/v3.1.0.beta1
Author: Vijay Dev 
Date:   2011-04-20 23:25:33 +0530

    document the Active Support extension - String#inquiry

M	railties/guides/source/active_support_core_extensions.textile

commit a48f808	refs/tags/v3.1.0.beta1
Author: Eric Anderson 
Date:   2011-04-20 10:43:35 -0400

    Exception got moved to ActiveModel with Rails 3

M	railties/guides/source/active_record_querying.textile

commit aa19a7d	refs/tags/v3.1.0.beta1
Author: Sebastian Martinez 
Date:   2011-04-19 23:21:40 -0300

    Fix 'FIXME' annotation typo

M	railties/test/generators/assets_generator_test.rb

commit 1c5d5ad	refs/tags/v3.1.0.beta1
Author: Akira Matsuda 
Date:   2011-04-20 06:28:22 +0900

    NilClass is a singleton

M	activesupport/lib/active_support/core_ext/object/try.rb

commit 356dacb	refs/heads/master
Merge: 2f549b8 68eb84d
Author: Xavier Noria 
Date:   2011-04-19 23:03:28 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 68eb84d	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-19 22:52:00 +0200

    correction to the i18n locale filter examples

M	railties/guides/source/i18n.textile

commit 2f549b8	refs/heads/master
Author: José Valim 
Date:   2011-04-19 22:38:51 +0200

    Use initialize_copy! to proper initialize now on clone.

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 89ed9fb	refs/heads/master
Author: Florent Piteau 
Date:   2011-04-20 02:10:29 +0800

    Don't reuse a closed flash when using now

M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/controller/flash_test.rb

commit 22fcef9	refs/heads/master
Author: José Valim 
Date:   2011-04-19 22:01:25 +0200

    Actually add an abstract class, so it is easier to get rid of old asset paths in the future.

A	actionpack/lib/action_view/helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/sprockets_helper.rb

commit e162e91	refs/heads/master
Merge: a19c260 ad60286
Author: Xavier Noria 
Date:   2011-04-19 21:54:10 +0200

    Merge branch 'master' of git://github.com/lifo/docrails
    
    Conflicts:
    	railties/guides/source/ajax_on_rails.textile
    	railties/guides/source/generators.textile

commit a19c260	refs/heads/master
Author: José Valim 
Date:   2011-04-19 21:49:28 +0200

    Include modules to the context in the railtie.

M	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/lib/sprockets/railtie.rb

commit ad60286	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-19 21:43:17 +0200

    Revert "Better formatting"
    
    No need to change this formatting.
    
    This reverts commit 9c861e8a0e2f21959ede5f71b56f8a50996d6416.

M	railties/guides/source/action_view_overview.textile

commit 914218e	refs/heads/master
Author: José Valim 
Date:   2011-04-19 21:14:55 +0200

    Let's use inheritance here, shall we?

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit 5fee98a	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-19 21:15:15 +0200

    remove unwanted Example headers as per the guidelines, s/instaces of NilClass/nil/ and friends, completes some rdocs

M	activesupport/lib/active_support/core_ext/object/duplicable.rb

commit eaf0d1a	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-19 20:58:00 +0200

    commit copy-edit: simplifies blank? rdoc and revises formatting

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit 571b4a2	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-19 20:51:24 +0200

    Revert "Formated docs"
    
    Reason: "To be blank" and "to be empty" belongs to our everyday
    terminology, they go in regular font.
    
    This reverts commit 280a8709923d2bf707ec4d82ac1e5cb14941da3d.

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit 3265516	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-19 20:48:39 +0200

    brings a #:nodoc: back

M	actionmailer/lib/action_mailer/base.rb

commit a1639ad	refs/heads/master
Author: Florent Piteau 
Date:   2011-04-19 20:44:20 +0200

    Undocumented :openssl_verify_mode option for smtp_settings

M	actionmailer/lib/action_mailer/base.rb

commit c96bf84	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-19 20:38:38 +0200

    Add app/assets/images and include the rails.png as a sample there

M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/app/assets/images/rails.png
D	railties/lib/rails/generators/rails/app/templates/public/images/rails.png
M	railties/lib/rails/generators/rails/app/templates/public/index.html

commit 9aac54c	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-19 20:35:53 +0200

    Add note about the option to add other precompile targets

M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

commit e685013	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-19 20:33:56 +0200

    Set a default precompile target to be the application.js, application.css, and all non-css/js files (images etc)

M	railties/lib/rails/application/configuration.rb

commit 1e56c89	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-19 20:06:09 +0200

    Give assets access to asset_path during precompilation

M	railties/lib/rails/tasks/assets.rake

commit 626bcc9	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-19 19:05:07 +0200

    Switch to asset_path and make it available in the Sprockets::Context (now you can do asset_path("logo.png") in a stylesheet.css.erb file and get fingerprinting)

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	actionpack/test/template/sprockets_helper_test.rb

commit c1720fb	refs/tags/v3.0.8.rc1
Author: Rohit Arondekar 
Date:   2010-09-12 21:05:10 -0700

    Guides: Add test directory to load path to run individual test files.

M	railties/guides/source/testing.textile

commit d35c912	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-19 18:29:18 +0200

    Cleanup compute_sprockets_path -- when you are reaching for code comments, the method could be simpler

M	actionpack/lib/action_view/helpers/sprockets_helper.rb

commit 1f92d13	refs/tags/v3.0.8.rc1
Author: Moiz Raja 
Date:   2010-12-23 22:51:12 -0800

    correct links to rack articles

M	railties/guides/source/rails_on_rack.textile

commit 9b423ac	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-19 18:11:42 +0200

    let this regexp be stricter
    
    The purpose of this regexp is to detect strings that
    are valid identifiers to be used as method names.
    The anchor $ allows a trailing newline, and both ^
    and $ may be bypassed because Ruby regexps are
    multiline always. The anchors \A and \z are the
    proper ones to ensure string boundaries.

M	activemodel/lib/active_model/attribute_methods.rb

commit a3a5c7e	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-19 18:07:14 +0200

    All assets, including images, audio, and video, now uses the asset pipeline when its on

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/lib/action_view/helpers/sprockets_helper.rb
A	actionpack/test/fixtures/sprockets/app/images/logo.png
M	actionpack/test/template/sprockets_helper_test.rb

commit dca31b9	refs/heads/master
Author: José Valim 
Date:   2011-04-19 18:06:01 +0200

    Let's not dup because value may not always be duplicable.

M	activemodel/lib/active_model/attribute_methods.rb

commit afcdf9b	refs/tags/v3.0.8.rc1
Author: José Valim 
Date:   2011-04-19 18:05:10 +0200

    Avoid define_method if possible.

M	activemodel/lib/active_model/attribute_methods.rb

commit 30472d4	refs/heads/master
Author: José Valim 
Date:   2011-04-19 17:56:46 +0200

    Avoid define_method if possible.

M	activemodel/lib/active_model/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb

commit d24d938	refs/heads/master
Merge: 069e9b0 011afb7
Author: Joshua Peek 
Date:   2011-04-19 09:43:47 -0500

    Merge branch 'joshk-multi_json'

commit 011afb7	refs/heads/master
Merge: 069e9b0 b246218
Author: Joshua Peek 
Date:   2011-04-19 09:42:11 -0500

    Merge branch 'multi_json' of https://github.com/joshk/rails into joshk-multi_json

commit b246218	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-19 16:34:34 +0200

    remove MultiJson from the Gemfile and instead add the current rc to the AS gemspec

M	Gemfile
M	activesupport/activesupport.gemspec

commit 069e9b0	refs/heads/master
Author: José Valim 
Date:   2011-04-19 15:04:28 +0200

    Do not stream on HTTP/1.0.

M	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb

commit b398520	refs/heads/master
Author: José Valim 
Date:   2011-04-19 12:25:01 +0200

    Output a redirect to the 500 page if something happens when streaming.
    Currently, we output:
    
      ">

M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb
M	actionpack/test/controller/new_base/render_streaming_test.rb

commit a66c917	refs/heads/master
Author: José Valim 
Date:   2011-04-19 11:54:12 +0200

    Do not inherit from Rack::Response, remove a shit-ton of unused code.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/metal/rendering.rb
M	actionpack/lib/action_dispatch/http/response.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/dispatch/response_test.rb

commit 66a2ffc	refs/heads/master
Author: Paco Guzman 
Date:   2011-04-19 11:24:09 +0200

    Update link to Rails 2.3 guides from 2.3.8 to last release 2.3.11. Maybe someone could regenerate the guides

M	railties/guides/source/index.html.erb

commit 6380f1a	refs/heads/master
Author: José Valim 
Date:   2011-04-19 10:34:17 +0200

    Be sure to not store the closed flash in the session.

M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/controller/flash_test.rb

commit 082e299	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-18 23:37:27 -0300

    docs for ActionMailer::Base.default_i18n_subject

M	actionmailer/lib/action_mailer/base.rb

commit 3bff8bd	refs/heads/master
Merge: 019cd51 64e2a54
Author: Jon Leighton 
Date:   2011-04-18 23:35:28 +0100

    Merge branch 'master' of github.com:rails/rails

commit 019cd51	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-18 23:35:22 +0100

    Bring back support for passing a callable object to the default_scope macro. You can also just use a block.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/developer.rb

commit 6f84c73	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-18 23:15:38 +0100

    Un-deprecate using 'default_scope' as a macro, but if you are calling the macro multiple times that will give deprecation warnings, and in 3.2 we will simply overwrite the default scope when you call the macro multiple times.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/bulb.rb
M	activerecord/test/models/car.rb
M	activerecord/test/models/categorization.rb
M	activerecord/test/models/developer.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/reference.rb
M	activerecord/test/models/without_table.rb

commit e591953	refs/heads/master
Merge: 1d8be7b 64e2a54
Author: Josh Kalderimis 
Date:   2011-04-19 00:14:50 +0200

    Merge branch 'master' of https://github.com/rails/rails into multi_json

commit 1d8be7b	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-19 00:01:50 +0200

    AS Json parse_error makes a return for backwards compatibility, although it will return MultiJson::DecodeError

M	activesupport/lib/active_support/json/decoding.rb
M	activesupport/test/json/decoding_test.rb

commit 64e2a54	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-18 14:43:24 -0700

    adding a rake task to help generate changelog notes for release announcements

M	tasks/release.rb

commit d9bca64	refs/tags/v3.0.8.rc1
Author: Aaron Patterson 
Date:   2011-04-18 14:43:24 -0700

    adding a rake task to help generate changelog notes for release announcements

M	tasks/release.rb

commit 9382cb4	refs/tags/v3.0.8.rc1
Merge: c6c46e1 2c32601
Author: Aaron Patterson 
Date:   2011-04-18 14:05:23 -0700

    Merge branch '3-0-7' into 3-0-stable
    
    * 3-0-7:
      bumping version for release
      adding a rake task to update CHANGELOG dates
      Prepare for the 3.0.7.rc2 release
      Added missing CHANGELOG entries for 3.0.7
      Add missing CHANGELOG entries
      Update CHANGELOG
      Backport test assertions from 65469a6 (the behaviour is already the same, but we need to assertions to guard against regressions)
      Undo performances regressions I introduced in 36691ac9fc932cc11c59c42c7f388399f1e51f54 and add test for an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
      Return nil from read_attribute if _foo is defined, but @attributes has no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be4ed5e89b59c4ad0154d44f58e3e48d484.
      Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated
    
    Conflicts:
    	activerecord/CHANGELOG

commit 2c32601	refs/tags/v3.0.7 (tag: v3.0.7)
Author: Aaron Patterson 
Date:   2011-04-18 14:02:23 -0700

    bumping version for release

M	RAILS_VERSION
M	actionmailer/CHANGELOG
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/CHANGELOG
M	actionpack/lib/action_pack/version.rb
M	activemodel/CHANGELOG
M	activemodel/lib/active_model/version.rb
M	activerecord/CHANGELOG
M	activerecord/lib/active_record/version.rb
M	activeresource/CHANGELOG
M	activeresource/lib/active_resource/version.rb
M	activesupport/CHANGELOG
M	activesupport/lib/active_support/version.rb
M	railties/CHANGELOG
M	railties/lib/rails/version.rb
M	version.rb

commit ff3cff8	refs/tags/v3.0.7
Author: Aaron Patterson 
Date:   2011-04-18 14:01:00 -0700

    adding a rake task to update CHANGELOG dates

M	tasks/release.rb

commit e019587	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-18 21:39:15 +0200

    removed AS backends and instead rely on MultiJson for json decoding

M	Gemfile
D	activesupport/lib/active_support/json/backends/jsongem.rb
D	activesupport/lib/active_support/json/backends/yajl.rb
D	activesupport/lib/active_support/json/backends/yaml.rb
M	activesupport/lib/active_support/json/decoding.rb
M	activesupport/test/json/decoding_test.rb

commit 0acc6bd	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-18 21:07:04 +0200

    Use proper coffee comments

M	railties/lib/rails/generators/rails/assets/templates/javascript.js.coffee

commit 92537b8	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-18 17:06:07 +0530

    File should be open in read/write mode. When doing lock on a file.

M	activesupport/lib/active_support/cache/file_store.rb

commit c6c46e1	refs/tags/v3.0.8.rc1
Author: Arun Agrawal 
Date:   2011-04-18 17:06:07 +0530

    File should be open in read/write mode. When doing lock on a file.

M	activesupport/lib/active_support/cache/file_store.rb

commit 280a870	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-18 10:02:55 -0300

    Formated docs

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit 51f5209	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-18 09:34:51 -0300

    oops fixed typo

M	activesupport/lib/active_support/core_ext/object/try.rb

commit af41d55	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-18 09:33:00 -0300

    Fixed docs for NilClass#try

M	activesupport/lib/active_support/core_ext/object/try.rb

commit 3b0f917	refs/heads/master
Author: José Valim 
Date:   2011-04-18 14:27:30 +0200

    Test explicit skip.

M	actionpack/test/controller/new_base/render_streaming_test.rb

commit 07fde1a	refs/heads/master
Author: José Valim 
Date:   2011-04-18 14:25:51 +0200

    Just define the controller if fibers are defined.

M	actionpack/test/controller/new_base/render_streaming_test.rb

commit 3e33592	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-18 11:18:37 +0200

    Add description to assets:precompile such that it shows up in rake -T

M	railties/lib/rails/tasks/assets.rake

commit 3937296	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-18 10:56:37 +0200

    Add String#inquiry as a convenience method for turning a string into a StringInquirer object [DHH]

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/core_ext/string.rb
A	activesupport/lib/active_support/core_ext/string/inquiry.rb
M	activesupport/test/core_ext/string_ext_test.rb

commit 389d15e	refs/heads/master
Author: José Valim 
Date:   2011-04-18 08:52:29 +0200

    Body... wanna *stream* my body? Body... such a thrill my body!
    
    Added stream as class level method to make it explicit when to stream.
    Render also accepts :stream as option.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
A	actionpack/lib/action_controller/metal/streaming.rb
M	actionpack/lib/action_view/context.rb
A	actionpack/test/controller/new_base/render_streaming_test.rb

commit 7a152ab	refs/heads/master
Author: José Valim 
Date:   2011-04-18 08:17:47 +0200

    Rename it to DataStreaming.

M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
A	actionpack/lib/action_controller/metal/data_streaming.rb
D	actionpack/lib/action_controller/metal/streaming.rb

commit 944b4d5	refs/heads/master
Author: José Valim 
Date:   2011-04-18 08:13:28 +0200

    Add missing dependency.

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit 4f04452	refs/heads/master
Author: José Valim 
Date:   2011-04-18 08:12:51 +0200

    Slightly reorganize rendering stack.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_controller/metal/renderers.rb

commit 9556e9c	refs/heads/master
Author: Malcolm Locke 
Date:   2011-04-18 16:02:30 +1200

    best-of-bread -> best-of-breed

M	railties/guides/source/i18n.textile

commit 9dfc215	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 20:40:33 -0300

    Formatting docs

M	activesupport/lib/active_support/core_ext/object/blank.rb
M	activesupport/lib/active_support/core_ext/object/try.rb

commit 49e7555	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 20:38:50 -0300

    Docs for +duplicable?+

M	activesupport/lib/active_support/core_ext/object/duplicable.rb

commit bb626e7	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 20:22:53 -0300

    Docs for NilClass#try

M	activesupport/lib/active_support/core_ext/object/try.rb

commit 0675047	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 20:12:39 -0300

    Formatting examples

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit d0635b6	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 19:47:46 -0300

    Documented String#blank?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit b14b058	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 19:44:34 -0300

    Documented Hash#blank?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit ceeed21	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 19:42:53 -0300

    Documented Array#blank?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit c497999	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 19:39:40 -0300

    Documented TrueClass#blank?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit a48d2a7	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 19:38:32 -0300

    Documented FalseClass#blank?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit bd30254	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 19:36:56 -0300

    Documented NilClass#blank?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit b839d40	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-17 22:30:27 +0100

    Fix test_load_save in test/cases/binary_test.rb (thanks @tenderlove for actually working out how to fix it)

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 2a5e317	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-17 21:33:08 +0100

    Fix test_associate_existing in has_many_through_associations_test on mysql and postgresql

M	activerecord/test/cases/associations/has_many_through_associations_test.rb

commit daf7a8c	refs/heads/master
Author: José Valim 
Date:   2011-04-17 22:10:08 +0200

    What a lovely surprise, controller_generator_test was also failing.

M	railties/test/generators/controller_generator_test.rb

commit 6054739	refs/heads/master
Author: José Valim 
Date:   2011-04-17 22:08:21 +0200

    Fix more generator tests.

M	railties/test/generators/namespaced_generators_test.rb

commit 2814637	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-17 20:55:24 +0100

    Bring back some bits of documentation for scopes which were removed as part of the reversion in 256b363

M	activerecord/lib/active_record/named_scope.rb

commit 256b363	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-17 20:47:52 +0100

    Revert "Deprecate defining scopes with a callable (lambda, proc, etc) via the scope class method. Just define a class method yourself instead."
    
    This reverts commit f0e198bfa1e3f9689e0cde1d194a44027fc90b3c.
    
    Conflicts:
    
    	activerecord/test/models/post.rb

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/named_scope.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/topic.rb

commit d1f10e7	refs/heads/master
Author: Arun Agrawal 
Date:   2011-04-16 16:28:53 +0530

    Test failing with Jruby "uninitialized constant TestJSONEncoding::JSON"
    
    activesupport/test/json/encoding_test.rb need Json to pass against with Jruby

M	Gemfile

commit da80d87	refs/heads/master
Merge: 3dc4d54 0fd0d68
Author: Aaron Patterson 
Date:   2011-04-17 11:49:52 -0700

    Merge branch 'identity_map' of https://github.com/jasoncodes/rails into jasoncodes-identity_map
    
    * 'identity_map' of https://github.com/jasoncodes/rails:
      Bypass IdentityMap in PostgreSQL geometric tests.

commit 3dc4d54	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-15 14:34:14 -0700

    make our constructor signature match the superclass

M	actionpack/lib/action_controller/metal.rb

commit 1c2b223	refs/heads/master
Merge: 8d558cb b6843f2
Author: Gonçalo Silva 
Date:   2011-04-17 17:08:49 +0100

    Merge branch 'master' of https://github.com/rails/rails into performance_test

commit 38e7787	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-17 13:06:48 -0300

    Remove 2.3 since guides are supposed to be for Rails 3

M	railties/guides/source/i18n.textile

commit 0fd0d68	refs/heads/master
Author: Jason Weathered 
Date:   2011-04-17 23:51:20 +1000

    Bypass IdentityMap in PostgreSQL geometric tests.
    
    The identity map cache prevents us from seeing the DB formatted strings.

M	activerecord/test/cases/base_test.rb

commit 96546bb	refs/heads/master
Author: Jason Weathered 
Date:   2011-04-17 21:10:02 +1000

    Fix marshal round-tripping of fractional seconds (Time#subsec).

M	activesupport/lib/active_support/core_ext/time/marshal.rb
M	activesupport/test/core_ext/time_ext_test.rb

commit b6843f2	refs/heads/master
Author: José Valim 
Date:   2011-04-17 11:50:19 +0200

    Lazily load sprockets.

M	actionpack/lib/sprockets/railtie.rb

commit a9a2035	refs/heads/master
Author: José Valim 
Date:   2011-04-17 11:48:15 +0200

    Fix assets generators.

M	railties/lib/rails/generators.rb
M	railties/test/generators/assets_generator_test.rb

commit 3a68aec	refs/heads/master
Author: José Valim 
Date:   2011-04-17 11:44:52 +0200

    Make generators more modular, add hooks and improve test suite.

M	Gemfile
M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/generators.rb
M	railties/lib/rails/generators/rails/assets/assets_generator.rb
M	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
A	railties/lib/rails/generators/rails/scaffold/templates/scaffold.css
A	railties/lib/rails/generators/rails/scaffold/templates/scaffold.css.scss
D	railties/lib/rails/generators/rails/stylesheets/USAGE
D	railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb
D	railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
D	railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css.scss
M	railties/test/generators/scaffold_generator_test.rb
D	railties/test/generators/stylesheets_generator_test.rb

commit 8f75c3a	refs/heads/master
Author: José Valim 
Date:   2011-04-17 10:51:07 +0200

    Move app initializers to sprockets railtie.

M	actionpack/lib/sprockets/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/finisher.rb

commit 16b9547	refs/heads/master
Author: José Valim 
Date:   2011-04-17 10:26:32 +0200

    Move controller configs to sprockets own railtie.

M	actionpack/lib/action_controller/railtie.rb
A	actionpack/lib/sprockets/railtie.rb

commit eb75f15	refs/heads/master
Author: José Valim 
Date:   2011-04-17 10:23:07 +0200

    Generate app/* stubs directories for full plugins to show ththat it is possible to extend them.

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
A	railties/lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
M	railties/test/generators/plugin_new_generator_test.rb

commit 8606fff	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-16 20:09:54 -0300

    Added CHANGELOG entry for new section additions on ActionView guide

M	railties/guides/source/action_view_overview.textile

commit 9c861e8	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-16 18:29:55 -0300

    Better formatting

M	railties/guides/source/action_view_overview.textile

commit 558f096	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-16 18:26:44 -0300

    Added Templates section on ActionView guide.

M	railties/guides/source/action_view_overview.textile

commit 29caa46	refs/heads/master
Merge: 8c68bcf 143ed7e
Author: Michal Papis 
Date:   2011-04-16 22:57:29 +0200

    Merge branch 'master' of github.com:lifo/docrails

commit 8c68bcf	refs/heads/master
Author: Michal Papis 
Date:   2011-04-16 22:56:58 +0200

    Added information about grouping conditional validations

M	railties/guides/source/active_record_validations_callbacks.textile

commit 143ed7e	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-16 17:32:04 -0300

    Added Spacer Templates on Partials section of ActionView guide.

M	railties/guides/source/action_view_overview.textile

commit eecb838	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-16 17:14:46 -0300

    Added Partials section to ActionView guide.

M	railties/guides/source/action_view_overview.textile

commit 7c9927a	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-16 16:02:05 -0300

    Added Using Action View with Rails guide section.

M	railties/guides/source/action_view_overview.textile

commit 5952d4f	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-04-16 19:59:13 +0200

    Fix plugin new generator to work with new javascript/stylesheets conventions

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 2bd5e02	refs/tags/v3.0.8.rc1
Author: Mikel Lindsaar 
Date:   2011-04-16 23:32:56 +1000

    Updating mail to 2.2.16

M	actionmailer/actionmailer.gemspec

commit 1a1e4d4	refs/heads/master
Author: Mikel Lindsaar 
Date:   2011-04-16 23:30:21 +1000

    Updating mail to 2.2.16

M	actionmailer/actionmailer.gemspec

commit 0114dc3	refs/heads/master
Author: José Valim 
Date:   2011-04-16 12:25:21 +0200

    Fix CI test on 1.8

M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb

commit 2bf0d9b	refs/heads/master
Author: José Valim 
Date:   2011-04-16 12:13:29 +0200

    Class docs.

M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb

commit eec5d5d	refs/heads/master
Author: José Valim 
Date:   2011-04-16 11:42:02 +0200

    Docs.

M	actionpack/lib/action_view/buffers.rb
M	actionpack/lib/action_view/flows.rb

commit ab105e6	refs/heads/master
Author: José Valim 
Date:   2011-04-16 11:34:07 +0200

    content_for should work with provide.

M	actionpack/lib/action_view/flows.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
A	actionpack/test/fixtures/layouts/streaming.erb
A	actionpack/test/fixtures/test/nested_streaming.erb
A	actionpack/test/fixtures/test/streaming.erb
A	actionpack/test/fixtures/test/streaming_buster.erb
M	actionpack/test/template/capture_helper_test.rb
M	actionpack/test/template/streaming_render_test.rb

commit 3e0aedb	refs/heads/master
Author: José Valim 
Date:   2011-04-16 11:22:36 +0200

    Add more tests, ensure we never yield outside the fiber context and that we swap buffers when moving from parent to child.

M	actionpack/lib/action_view/flows.rb
M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb
M	actionpack/test/template/streaming_render_test.rb

commit 29078ff	refs/heads/master
Author: José Valim 
Date:   2011-04-16 10:50:33 +0200

    Basic tests for streaming. Basic tests for provide.

M	actionpack/lib/action_view/flows.rb
M	actionpack/lib/action_view/renderer/streaming_template_renderer.rb
M	actionpack/test/template/capture_helper_test.rb
M	actionpack/test/template/streaming_render_test.rb

commit 62668cc	refs/heads/master
Author: José Valim 
Date:   2011-04-16 10:31:55 +0200

    The magic medicine worked.

M	actionpack/lib/action_view/base.rb
D	actionpack/test/template/fibered_render_test.rb
A	actionpack/test/template/streaming_render_test.rb

commit e30ca00	refs/heads/master
Author: José Valim 
Date:   2011-04-16 10:28:47 +0200

    Yo dawg, I heard you like streaming. So I put a fiber, inside a block, inside a body, so you can stream.

M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/base.rb
A	actionpack/lib/action_view/buffers.rb
A	actionpack/lib/action_view/flows.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
D	actionpack/lib/action_view/renderer/fibered_template_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
A	actionpack/lib/action_view/renderer/streaming_template_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/lib/action_view/rendering.rb
M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
M	actionpack/test/template/capture_helper_test.rb

commit 50b2eb8	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 22:09:23 -0400

    Fixing another example result

M	actionpack/lib/action_view/helpers/sanitize_helper.rb

commit 1229904	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 21:56:01 -0400

    Removing incorrect example results

M	actionpack/lib/action_view/helpers/text_helper.rb

commit b6bfcc9	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 21:50:29 -0400

    Fix syntax error in example

M	actionpack/lib/action_view/helpers/text_helper.rb

commit f274394	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 21:34:49 -0400

    Fixing more spacing inconsistencies

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb

commit e8afe4e	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 20:30:51 -0400

    Making spacing consistent

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 004042c	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 20:27:05 -0400

    Fixing missing colon on symbol in example

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 7f98b54	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 20:18:30 -0400

    Negative format example should use a negative number

M	actionpack/lib/action_view/helpers/number_helper.rb

commit 2dd43c3	refs/heads/master
Author: José Valim 
Date:   2011-04-16 02:10:36 +0200

    Buffer should be an option passed down to template rendering.

M	actionpack/lib/action_view/template.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
M	actionpack/test/template/lookup_context_test.rb
M	actionpack/test/template/render_test.rb
M	actionpack/test/template/template_test.rb

commit 6ddd4a3	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 20:08:11 -0400

    Days are never approximated using 'about'

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 8ac365f	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 20:03:52 -0400

    Making example result match actual result

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 3ca6d0e	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-15 19:56:48 -0400

    Including actual usage in example

M	actionpack/lib/action_view/helpers/date_helper.rb

commit fad214b	refs/heads/master
Author: José Valim 
Date:   2011-04-16 01:09:05 +0200

    Initial work on fibered layout.

M	actionpack/lib/action_view.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
A	actionpack/lib/action_view/renderer/fibered_template_renderer.rb
M	actionpack/lib/action_view/renderer/partial_renderer.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/lib/action_view/rendering.rb
M	actionpack/test/template/capture_helper_test.rb
A	actionpack/test/template/fibered_render_test.rb

commit c630750	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-15 14:13:46 -0700

    switch to using comments to comment things

M	actionpack/test/controller/new_base/render_test.rb

commit 2c54fde	refs/heads/master
Author: José Valim 
Date:   2011-04-15 22:01:06 +0200

    Fix generator tests.

M	railties/test/generators/app_generator_test.rb

commit 9982b5a	refs/heads/master
Author: José Valim 
Date:   2011-04-15 21:32:36 +0200

    Fix missing test_helper.

M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
D	railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt

commit d6bd606	refs/heads/master
Author: José Valim 
Date:   2011-04-15 21:11:54 +0200

    render :once, YAGNI.

M	actionpack/lib/abstract_controller/rendering.rb
M	actionpack/lib/action_view/renderer/template_renderer.rb
M	actionpack/lib/action_view/rendering.rb
D	actionpack/test/controller/new_base/render_once_test.rb

commit d5ad92c	refs/heads/master
Author: José Valim 
Date:   2011-04-15 20:09:39 +0200

    Make static faster as we don't have to serve multiple paths anymore.

M	actionpack/lib/action_dispatch/middleware/static.rb
M	actionpack/test/dispatch/static_test.rb
M	actionpack/test/template/asset_tag_helper_test.rb
M	railties/lib/rails/application.rb

commit afc8288	refs/heads/master
Author: José Valim 
Date:   2011-04-15 19:57:52 +0200

    Remove the ability for engines to serve assets from the public directory.

M	actionpack/lib/action_controller/railties/paths.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/engine/configuration.rb
M	railties/lib/rails/railtie/configuration.rb
M	railties/lib/rails/tasks.rb
D	railties/lib/rails/tasks/railties.rake
M	railties/test/railties/engine_test.rb
M	railties/test/railties/shared_tests.rb

commit d84b2f3	refs/heads/master
Author: José Valim 
Date:   2011-04-15 19:17:58 +0200

    Fix tests.

M	railties/lib/rails/engine.rb
M	railties/lib/rails/tasks/railties.rake
M	railties/test/railties/engine_test.rb
M	railties/test/railties/shared_tests.rb

commit f96ad0d	refs/tags/v3.0.7.rc2 (tag: v3.0.7.rc2)
Author: Santiago Pastorino 
Date:   2011-04-15 14:15:33 -0300

    Prepare for the 3.0.7.rc2 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 91761b7	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-15 14:13:10 -0300

    Added an example of exception situation on Array#sample docs

M	activesupport/lib/active_support/core_ext/array/random_access.rb

commit 4dd84c8	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-15 14:08:37 -0300

    Improved Array#sample documentation

M	activesupport/lib/active_support/core_ext/array/random_access.rb

commit 2fe70c1	refs/heads/master
Author: José Valim 
Date:   2011-04-15 18:42:51 +0200

    Booya, sprockets now works from Engines.

M	Gemfile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/engine/configuration.rb
M	railties/test/railties/engine_test.rb
M	railties/test/railties/shared_tests.rb

commit 8e5ff7d	refs/heads/master
Author: José Valim 
Date:   2011-04-15 18:14:12 +0200

    Add some very simple docs.

M	railties/test/isolation/abstract_unit.rb

commit ae13cb1	refs/heads/master
Author: José Valim 
Date:   2011-04-15 18:13:17 +0200

    Remove rescue as it was clobbering the real error.

M	load_paths.rb

commit de42af7	refs/tags/v3.0.7.rc2
Author: Sebastian Martinez 
Date:   2011-04-15 11:44:47 -0300

    Added missing CHANGELOG entries for 3.0.7
    
    Signed-off-by: Santiago Pastorino 

M	actionmailer/CHANGELOG
M	activerecord/CHANGELOG

commit 612afa2	refs/tags/v3.0.7.rc2
Author: Andrew White 
Date:   2011-04-15 15:48:17 +0100

    Add missing CHANGELOG entries

M	activerecord/CHANGELOG

commit 20354b7	refs/tags/v3.0.7.rc2
Author: Jon Leighton 
Date:   2011-04-15 15:02:53 +0100

    Update CHANGELOG

M	activerecord/CHANGELOG

commit 364a5d4	refs/tags/v3.0.7.rc2
Author: Jon Leighton 
Date:   2011-04-15 13:27:08 +0100

    Backport test assertions from 65469a6 (the behaviour is already the same, but we need to assertions to guard against regressions)

M	activerecord/test/cases/finder_test.rb

commit ef88c0c	refs/tags/v3.0.7.rc2
Author: Jon Leighton 
Date:   2011-04-15 13:09:12 +0100

    Undo performances regressions I introduced in 36691ac9fc932cc11c59c42c7f388399f1e51f54 and add test for an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 3609642	refs/tags/v3.0.7.rc2
Author: Jon Leighton 
Date:   2011-04-15 01:52:16 +0100

    Return nil from read_attribute if _foo is defined, but @attributes has no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be4ed5e89b59c4ad0154d44f58e3e48d484.

M	activerecord/lib/active_record/attribute_methods/read.rb

commit ef95df7	refs/tags/v3.0.7.rc2
Author: Jon Leighton 
Date:   2011-04-15 01:44:27 +0100

    Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit df6117e	refs/tags/v3.0.8.rc1
Author: Jon Leighton 
Date:   2011-04-15 15:02:53 +0100

    Update CHANGELOG

M	activerecord/CHANGELOG

commit 7dea4b5	refs/heads/master
Merge: 65469a6 dd90f39
Author: Jon Leighton 
Date:   2011-04-15 13:30:21 +0100

    Merge branch 'master' of github.com:rails/rails

commit bd0fe87	refs/tags/v3.0.8.rc1
Author: Jon Leighton 
Date:   2011-04-15 13:27:08 +0100

    Backport test assertions from 65469a6 (the behaviour is already the same, but we need to assertions to guard against regressions)

M	activerecord/test/cases/finder_test.rb

commit 65469a6	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-15 13:27:08 +0100

    Return nil from read_attribute(:foo) if 'foo' is not present in the @attributes hash, but the _foo method has been defined. This brings the behaviour into line with the 3-0-stable branch and the master branch before 93641ed6c8c684f6b4db02b6c8a22fa9bc7f0eaf (there were previously no assertions about this which is why the change slipped through). Note that actually calling the 'foo' method will still raise an error if the attribute is not present.

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/finder_test.rb

commit 1302443	refs/tags/v3.0.8.rc1
Author: Jon Leighton 
Date:   2011-04-15 13:09:12 +0100

    Undo performances regressions I introduced in 36691ac9fc932cc11c59c42c7f388399f1e51f54 and add test for an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit e01dfb2	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-15 13:09:12 +0100

    Undo performances regressions I introduced in bbe0a507f287c20ab4ae8a244fbfc810665deda5 and add test for an edge case. Add comments to explain the intent of the code.

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit dd90f39	refs/heads/master
Author: José Valim 
Date:   2011-04-14 23:40:56 -0700

    attribute should be attributes

M	actionpack/lib/action_view/helpers/form_helper.rb

commit c8c012c	refs/heads/master
Author: José Valim 
Date:   2011-04-14 23:37:35 -0700

    Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 2adeaa9	refs/heads/master
Author: Joshua Ballanco 
Date:   2011-04-14 23:25:18 -0400

    Fix for stripping tags from frozen strings.
    
    This returns behavior under Ruby 1.9 to match Ruby 1.8.

M	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb

commit c095389	refs/heads/master
Author: Joshua Ballanco 
Date:   2011-04-14 23:18:12 -0400

    Test for stripping tags from a frozen string.
    
    This test will pass under Ruby 1.8 but fail under Ruby 1.9 because of
    the change in behavior of gsub! w.r.t. frozen strings that do not
    match the pattern used [ruby-core:23664].

M	actionpack/test/template/html-scanner/sanitizer_test.rb

commit 434d757	refs/heads/master
Author: Emilio Tagua 
Date:   2011-04-14 23:00:28 -0300

    Fix console to accept [environment] [options] as specified in docs.

M	railties/lib/rails/commands/console.rb

commit 7d2f472	refs/tags/v3.0.8.rc1
Author: Emilio Tagua 
Date:   2011-04-14 23:00:28 -0300

    Fix console to accept [environment] [options] as specified in docs.

M	railties/lib/rails/commands/console.rb

commit e68a83c	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-15 02:19:11 +0100

    Refactor test to avoid hackery

M	activerecord/test/cases/associations/join_model_test.rb

commit 9f5ab9a	refs/tags/v3.0.8.rc1
Author: Jon Leighton 
Date:   2011-04-15 02:01:47 +0100

    Backported 14b880fd035fcdf807051398674c9aa89bd3b4d3 (Fix various issues with the :primary_key option in :through associations)

M	activerecord/lib/active_record/associations/through_association_scope.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/models/categorization.rb
M	activerecord/test/models/post.rb

commit 912e5ff	refs/tags/v3.0.8.rc1
Author: Jon Leighton 
Date:   2011-04-15 01:52:16 +0100

    Return nil from read_attribute if _foo is defined, but @attributes has no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be4ed5e89b59c4ad0154d44f58e3e48d484.

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 36691ac	refs/tags/v3.0.8.rc1
Author: Jon Leighton 
Date:   2011-04-15 01:44:27 +0100

    Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit bbe0a50	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-15 01:44:27 +0100

    Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit ba8a715	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 21:26:20 -0300

    Added more detailed use of the +list+ command on debugging guide

M	railties/guides/source/debugging_rails_applications.textile

commit bbfc6cd	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 20:37:12 -0300

    Remove extra whitespaces from guides

M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_record_querying.textile
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/caching_with_rails.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/i18n.textile
M	railties/guides/source/initialization.textile
M	railties/guides/source/layouts_and_rendering.textile
M	railties/guides/source/migrations.textile
M	railties/guides/source/plugins.textile
M	railties/guides/source/routing.textile
M	railties/guides/source/security.textile

commit 3d44e45	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-15 01:32:26 +0200

    Use JS comments, please

M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

commit 3e23752	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-14 14:54:25 -0700

    bcrypt will encrypt anything, so validate_presence_of would not catch nil / blank passwords.  Thank you to Aleksander Kamil Modzelewski for reporting this

M	activemodel/lib/active_model/secure_password.rb
M	activemodel/test/cases/secure_password_test.rb

commit 9951af0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-14 14:26:57 -0700

    sort insert columns for better cache hits

M	activerecord/lib/active_record/relation.rb

commit 1787447	refs/tags/v3.0.7.rc1 (tag: v3.0.7.rc1)
Author: Santiago Pastorino 
Date:   2011-04-14 18:16:01 -0300

    Prepare for the 3.0.7.rc1 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 6bc9dd7	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-04-14 17:49:55 -0300

    Add missing CHANGELOG entries

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 199c0bb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-14 11:27:27 -0700

    generated session ids should be encoded as UTF-8

M	actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

commit 12ae922	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 18:07:22 -0700

    refactoring inserts to use the same method on the connection

M	activerecord/lib/active_record/relation.rb

commit 0268eac	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 16:28:23 -0700

    mimic prepared statements in the exec_insert for mysql2

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit a22ceae	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 16:05:30 -0700

    mysql type cast should return integers when typecasting true / false

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
A	activerecord/test/cases/adapters/mysql/quoting_test.rb
A	activerecord/test/cases/adapters/postgresql/quoting_test.rb

commit a0d4c8d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 15:35:53 -0700

    using the database adapter to typecast before executing prepared statement

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/binary_test.rb
M	activerecord/test/schema/schema.rb

commit 27f8c57	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 15:34:08 -0700

    inserting big decimals as strings works consistently among dbs, so use string form

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
M	activerecord/test/cases/adapters/sqlite3/quoting_test.rb

commit 8571fac	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 10:41:12 -0700

    insert statements are prepared, but values are not escaped properly

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/relation.rb

commit 4893170	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 14:03:35 -0700

    adding a type cast method for prepared statements

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
A	activerecord/test/cases/adapters/sqlite3/quoting_test.rb

commit 53d3baf	refs/heads/master
Author: Evan Petrie 
Date:   2011-04-14 12:08:18 -0700

    ruby 1.9.2 and other ruby implementations may not return the same hash value for the same string each time. This can result in your static assets being served from different asset hosts, which makes browser caching less effective. Use md5 or some other digest method instead.

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb

commit 6b6ecbe	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-13 00:15:24 +0100

    Extract the constraint-building for joins in JoinAssociation into a separate method to make it easy to change/override (requested by Ernie Miller so that MetaWhere can add to it easily)

M	activerecord/lib/active_record/associations/join_dependency/join_association.rb

commit 5be7268	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 13:45:00 -0300

    Update guide mentioning that +in?+ may raise an +ArgumentError+ exception

M	railties/guides/source/active_support_core_extensions.textile

commit cd233dd	refs/heads/master
Author: Jared McFarland 
Date:   2011-04-15 00:04:21 +0800

    Only rescue a thrown NoMethodError, don't preemptively check for #include?; added tests

M	activesupport/lib/active_support/core_ext/object/inclusion.rb
M	activesupport/test/core_ext/object/inclusion_test.rb

commit 2db9f8a	refs/heads/master
Author: Jared McFarland 
Date:   2011-04-14 09:00:34 +0800

    added an exception to Object#in? to match the methods documentation

M	activesupport/lib/active_support/core_ext/object/inclusion.rb

commit 89884c1	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-14 21:32:18 +0800

    Update scaffold controller to generate scss file if Sass is available

M	railties/CHANGELOG
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/command_line.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/getting_started.textile
M	railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb
A	railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css.scss
M	railties/test/generators/stylesheets_generator_test.rb

commit 93641ed	refs/heads/master
Author: Stian Grytøyr 
Date:   2011-04-14 16:31:08 +0200

    Fixes performance issue introduced in 3.0.6 (issue #6695)

M	activerecord/lib/active_record/attribute_methods/read.rb

commit a3639be	refs/tags/v3.0.7.rc1
Author: Stian Grytøyr 
Date:   2011-04-14 16:31:08 +0200

    Fixes performance issue introduced in 3.0.6 (issue #6695)

M	activerecord/lib/active_record/attribute_methods/read.rb

commit 328a16b	refs/heads/master
Author: Philipp Kempgen (Amooma) 
Date:   2011-04-14 07:55:10 -0700

    for escaping HTML can be treated as normal XML

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 9257106	refs/heads/master
Author: Philipp Kempgen (Amooma) 
Date:   2011-04-14 07:51:14 -0700

    properly escape "'" to "'" for XML/HTML (BTW Erubis does that as well)

M	activesupport/lib/active_support/core_ext/string/output_safety.rb

commit 28bf4c6	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 10:59:48 -0300

    Move [#ticket_number state:commited] to the end of the commit message

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit fb6fa1e	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 10:11:31 -0300

    change to use the Sass file extension .scss
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/rails/assets/USAGE

commit 1bcc705	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 10:05:08 -0300

    Remove extra whitespace

M	railties/guides/source/command_line.textile

commit 9aff7e0	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 10:04:10 -0300

    Update guides with controller generator producing asset stubs

M	railties/guides/source/command_line.textile

commit 02883a1	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-14 09:36:22 -0300

    Update Contributing to the Rails Code guide for automatically change the status of LH tickets

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit b0be721	refs/tags/v2.3.12
Author: gmarik 
Date:   2011-04-04 16:37:23 -0500

    respect :expire_after option
    
    - it was broken after
    [commit](https://github.com/rails/rails/commit/e0eb8e9c65ededce64169948d4dd51b0079cdd10)
    - there's also
    [issue](https://rails.lighthouseapp.com/projects/8994/tickets/6634-railsrack-inconsistency-about-expires_afterexpires-cookie-option)
    
    - also: maybe it worth making Rack understand :expire_after as we
    duplicate same logic in [cookie_store](https://github.com/gmarik/rails/blob/v2.3.11/actionpack/lib/action_controller/session/cookie_store.rb#L114)
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/session/abstract_store.rb
A	actionpack/test/controller/session/abstract_store_test.rb

commit 6c91b69	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-14 12:23:21 +0200

    The controller and resource generators will now automatically produce asset stubs (this can be turned off with --skip-assets). These stubs will use Coffee and Sass, if those libraries are available. [DHH]

M	railties/CHANGELOG
M	railties/lib/rails/generators.rb
A	railties/lib/rails/generators/rails/assets/USAGE
A	railties/lib/rails/generators/rails/assets/assets_generator.rb
A	railties/lib/rails/generators/rails/assets/templates/javascript.js
A	railties/lib/rails/generators/rails/assets/templates/javascript.js.coffee
A	railties/lib/rails/generators/rails/assets/templates/stylesheet.css
A	railties/lib/rails/generators/rails/assets/templates/stylesheet.css.scss
M	railties/lib/rails/generators/rails/controller/controller_generator.rb
A	railties/test/generators/assets_generator_test.rb
M	railties/test/generators/controller_generator_test.rb

commit 3d15019	refs/tags/v3.0.7.rc1
Author: Andre Arko 
Date:   2011-04-14 17:05:30 +0800

    files are a special case and need whitespace to be significant

M	activesupport/lib/active_support/core_ext/hash/conversions.rb

commit bd032fe	refs/heads/master
Author: Andre Arko 
Date:   2011-04-14 17:05:30 +0800

    files are a special case and need whitespace to be significant

M	activesupport/lib/active_support/core_ext/hash/conversions.rb

commit 45683fb	refs/tags/v3.0.7.rc1
Author: Andre Arko 
Date:   2011-04-14 16:36:13 +0800

    gsub is not needed (thanks @fxn!)

M	activesupport/lib/active_support/core_ext/hash/conversions.rb

commit b41d8f3	refs/tags/v3.0.7.rc1
Author: Andre Arko 
Date:   2011-04-14 16:25:08 +0800

    attributes no longer disappear if a tag contains whitespace
    
    old:
    Hash.from_xml("\n")
    => {"tag"=>"\n"}
    
    new:
    Hash.from_xml("\n")
    => {"tag"=>{"foo"=>"bar", "__content__"=>"\n"}

M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit d01be12	refs/heads/master
Author: Andre Arko 
Date:   2011-04-14 16:36:13 +0800

    gsub is not needed (thanks @fxn!)

M	activesupport/lib/active_support/core_ext/hash/conversions.rb

commit 90246ac	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-14 10:57:14 +0200

    Bring back tmp/cache for the default local cache to work

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit a8365ab	refs/heads/master
Author: Brian Cardarella 
Date:   2011-04-11 12:18:12 +0800

    Declaring the attr_accessor for password_confirmation is not necessary
    as the confirmation validation already adds that attr_accessor

M	activemodel/lib/active_model/secure_password.rb

commit 7660e7c	refs/heads/master
Author: Andre Arko 
Date:   2011-04-14 16:25:08 +0800

    attributes no longer disappear if a tag contains whitespace
    
    old:
    Hash.from_xml("\n")
    => {"tag"=>"\n"}
    
    new:
    Hash.from_xml("\n")
    => {"tag"=>{"foo"=>"bar", "__content__"=>"\n"}

M	activesupport/lib/active_support/core_ext/hash/conversions.rb
M	activesupport/test/core_ext/hash_ext_test.rb

commit ada550d	refs/heads/master
Author: Eric Hayes 
Date:   2011-04-14 15:57:44 +0800

    Fixed a comment typo

M	actionpack/lib/abstract_controller/layouts.rb

commit beed866	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-13 23:38:05 -0300

    Fix patch file name to make it consistent with the rest of the guide

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 4db4f8c	refs/heads/master
Author: Ben Orenstein 
Date:   2011-03-25 15:48:52 -0400

    Add tests for InheritableOptions.
    
    [#6625 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/test/ordered_options_test.rb

commit 2f24265	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-13 20:58:26 -0400

    Making colon usage consistent

M	railties/guides/source/active_record_querying.textile
M	railties/guides/source/rails_application_templates.textile

commit 974a6aa	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-13 20:49:14 -0400

    Remove trailing whitespace

M	railties/guides/source/initialization.textile
M	railties/guides/source/plugins.textile
M	railties/guides/source/ruby_on_rails_guides_guidelines.textile

commit e56b19b	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-13 20:32:36 -0400

    Aligning table cells

M	railties/guides/source/testing.textile

commit 1447ff5	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-13 20:17:22 -0400

    Making identifiers consistent in example

M	railties/guides/source/caching_with_rails.textile

commit f8ecb46	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-13 19:54:31 -0300

    Documented +ActiveSupport::Notifications+ module.

M	railties/guides/source/initialization.textile

commit 443af58	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-14 00:45:25 +0200

    Its assets.enabled, not assets.enable

M	railties/lib/rails/generators/rails/app/templates/config/application.rb

commit 04a75e0	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-13 17:19:47 -0400

    Moving note out of prologue to match other guides and so it'll display correctly

M	railties/guides/source/command_line.textile

commit a26d407	refs/heads/master
Author: David Chelimsky 
Date:   2011-04-09 12:51:22 -0500

    ActionView::PathSet# accepts String or Array
    
    - Closes #6692
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_view/path_set.rb
M	actionpack/test/controller/view_paths_test.rb

commit bd3b224	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 21:32:41 +0200

    Cleanup the Gemfile and compute whats needed depending on whether we are on 1.8 or 1.9

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 21c03a2	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-13 15:42:44 -0300

    Update guides with new scaffold.css path

M	railties/guides/source/generators.textile

commit 1f4dae9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 11:41:34 -0700

    do not depend on to_yaml being called, but rather depend on YAML being dumped

M	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
M	activerecord/test/cases/quoting_test.rb

commit 0f8a6eb	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-14 00:40:18 +0700

    Fix missing requires in Action Mailer
    
    This made the isolated test failed on CI server.
    
    Signed-off-by: Xavier Noria 

M	actionmailer/lib/action_mailer/base.rb
M	actionpack/lib/abstract_controller/rendering.rb

commit eebb19c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-13 09:42:31 -0700

    use index based substitution for bind parameters

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/adapters/mysql/connection_test.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
M	activerecord/test/cases/bind_parameter_test.rb

commit 48fb6b3	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 18:21:52 +0200

    Generate scaffold.css to app/assets/stylesheets (next step, SCSSify it if SCSS is available)

M	railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb

commit 023d4f9	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 18:09:04 +0200

    Includes have to be in the first comment

M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit e7280cb	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 18:08:40 +0200

    Use driver_ujs now that we no longer have to depend on a shared name and insert all prototype dependencies if thats specified

D	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js

commit 17c1b0f	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 18:08:02 +0200

    Use driver_ujs now that we no longer have to depend on a shared name and insert all prototype dependencies if thats specified

M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

commit 26528ef	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 18:02:49 +0200

    Blah, assets cant be turned on from initializers either

M	railties/lib/rails/generators/rails/app/templates/config/application.rb
D	railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt

commit 4eb3ee4	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:54:11 +0200

    Cleanup comments

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 5b49867	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:51:46 +0200

    Not needed

M	railties/lib/rails/generators/rails/app/app_generator.rb

commit 65ffcecc	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:50:55 +0200

    Require asset pipeline targets by default

M	railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt

commit 7e3b374	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:50:37 +0200

    Require everything by default

M	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

commit f3f28ee	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:37:48 +0200

    Dont need to make application.js into coffee since it will mostly be a manifest file anyway

A	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js
D	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee

commit cf5599d	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:31:32 +0200

    Move json requirement to user Gemfile -- still need to do better than this, though

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 1652c55	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:30:08 +0200

    Use Sass from git until the final gem is out

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit e3273f5	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 17:14:14 +0200

    Move the asset template engines to the user-generated Gemfile

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 23aa7da	refs/heads/master
Author: Joshua Peek 
Date:   2011-04-13 10:03:47 -0500

    Generate CoffeeScript stub by default

D	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js
A	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee

commit 9f09aeb	refs/heads/master
Author: Joshua Peek 
Date:   2011-04-13 09:57:22 -0500

    Include CoffeeScript in Gemfile

M	railties/lib/rails/generators/app_base.rb

commit 9333ca7	refs/heads/master
Author: Joshua Peek 
Date:   2011-04-13 09:47:29 -0500

    Add default require directives for jquery

M	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js

commit 5e7e81a	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 16:42:59 +0200

    Blah, identity_map has to be setup in application.rb to work

M	railties/lib/rails/generators/rails/app/app_generator.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt

commit 6fa7c3e	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 16:26:22 +0200

    Fix triplets

M	railties/lib/rails/generators/app_base.rb

commit 6d5e86e	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 16:19:46 +0200

    Clean up the generator, switch to assets usage, use vendor/assets for the default scripts, and more

M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/app_generator.rb
A	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js
A	railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
A	railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/application.js
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/controls.js
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/effects.js
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery_ujs.js
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js
D	railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype_ujs.js
A	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/controls.js
A	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/dragdrop.js
A	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/effects.js
A	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/jquery.js
A	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/jquery_ujs.js
A	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/prototype.js
A	railties/lib/rails/generators/rails/app/templates/vendor/assets/javascripts/prototype_ujs.js

commit b2cb991	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-13 09:59:01 -0300

    Removed Object#among? from guides

M	railties/guides/source/active_support_core_extensions.textile

commit 101406d	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 14:30:39 +0200

    Move to app/assets in anticipation of image support being added as well. Also add vendor/assets to default load path

M	railties/lib/rails/application.rb

commit ab1f913	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-13 14:13:54 +0200

    Until the latest sprockets gem is released, we need new apps to reference it directly

M	railties/lib/rails/generators/app_base.rb

commit 733bfa6	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-13 00:04:40 +0800

    Remove `#among?` from Active Support
    
    After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now.
    
    It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	activemodel/lib/active_model/validator.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activeresource/lib/active_resource/connection.rb
M	activeresource/test/cases/http_mock_test.rb
M	activesupport/CHANGELOG
M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/core_ext/object/inclusion.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/object/inclusion_test.rb
M	activesupport/test/transliterate_test.rb
M	railties/guides/rails_guides/textile_extensions.rb
M	railties/lib/rails/commands.rb
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/destroy.rb
M	railties/lib/rails/commands/generate.rb
M	railties/lib/rails/commands/profiler.rb
M	railties/lib/rails/generators/base.rb
M	railties/lib/rails/generators/generated_attribute.rb

commit 1f86911	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-13 13:41:26 +0200

    updates AP CHANGELOG

M	actionpack/CHANGELOG

commit 66e43aa	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-13 13:40:43 +0200

    updates railties CHANGELOG

M	railties/CHANGELOG

commit acdbc6a	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-05 16:03:36 +0200

    renames response_from_page_or_rjs -> response_from_page, and extracts the RJS in it

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_view/test_case.rb

commit 86d6cdd	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-03 22:28:56 +0200

    fixes the name of a test

M	actionpack/test/template/javascript_helper_test.rb

commit 06ae576	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-30 22:25:41 +0200

    removes some remaining .rjs occurrences

M	railties/lib/rails/source_annotation_extractor.rb

commit d76fbff	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-29 22:32:45 +0200

    removes reference to RJS from AC::RecordIdentifier docs

M	actionpack/lib/action_controller/record_identifier.rb

commit 404ae77	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-29 22:23:12 +0200

    removes a remaining reference to .rjs in template resolver's RDoc

M	actionpack/lib/action_view/template/resolver.rb

commit 16bccca	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-29 22:21:21 +0200

    removed references to RJS from the AP README

M	actionpack/README.rdoc

commit e06771f	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-29 22:19:47 +0200

    removes RJS documentation from AV::Base

M	actionpack/lib/action_view/base.rb

commit 6cf1fc5	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-29 22:14:11 +0200

    removes mentions to RJS in the security guide

M	railties/guides/source/security.textile

commit d8f23ca	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-27 22:23:32 +0200

    removes debug_rjs from ActionView::Base

M	actionpack/lib/action_view/base.rb
M	railties/guides/source/configuring.textile
M	railties/guides/source/debugging_rails_applications.textile
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

commit 7c9d91f	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-26 22:33:44 +0100

    removes render :update from views

M	actionpack/lib/action_view/rendering.rb
M	actionpack/test/template/render_test.rb

commit 90de267	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-26 22:25:32 +0100

    removes ActionView::Helpers::PrototypeHelper

M	actionpack/lib/action_view/helpers.rb
M	actionpack/lib/action_view/helpers/javascript_helper.rb
D	actionpack/lib/action_view/helpers/prototype_helper.rb
D	actionpack/test/template/prototype_helper_test.rb

commit 06bdaae	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-26 22:19:18 +0100

    removes ActionView::Helpers::ScriptaculousHelper

M	actionpack/lib/action_view/helpers.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/javascript_helper.rb
D	actionpack/lib/action_view/helpers/scriptaculous_helper.rb
D	actionpack/test/template/scriptaculous_helper_test.rb

commit 5850f16	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-25 23:12:09 +0100

    removes the RJS template handler

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_view/template/handlers.rb
D	actionpack/lib/action_view/template/handlers/rjs.rb
M	actionpack/test/controller/caching_test.rb
M	actionpack/test/controller/content_type_test.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/new_base/content_type_test.rb
M	actionpack/test/controller/new_base/render_layout_test.rb
D	actionpack/test/fixtures/functional_caching/formatted_fragment_cached.js.rjs
D	actionpack/test/fixtures/functional_caching/js_fragment_cached_with_partial.js.rjs
D	actionpack/test/fixtures/old_content_type/render_default_for_rjs.rjs
D	actionpack/test/fixtures/respond_to/all_types_with_layout.js.rjs
D	actionpack/test/fixtures/respond_to/using_defaults.js.rjs
D	actionpack/test/fixtures/respond_to/using_defaults_with_type_list.js.rjs
D	actionpack/test/fixtures/respond_with/using_resource.js.rjs
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/layouts_and_rendering.textile

commit eea6689	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-25 20:08:13 +0100

    removes support for render :update

M	actionpack/lib/action_controller/metal/renderers.rb
M	actionpack/test/controller/assert_select_test.rb
D	actionpack/test/controller/new_base/render_rjs_test.rb
M	actionpack/test/controller/render_js_test.rb
M	actionpack/test/controller/render_other_test.rb
M	actionpack/test/controller/render_test.rb
D	actionpack/test/fixtures/test/delete_with_js.rjs
D	actionpack/test/fixtures/test/enum_rjs_test.rjs
D	actionpack/test/fixtures/test/greeting.js.rjs
D	actionpack/test/fixtures/test/render_explicit_html_template.js.rjs
D	actionpack/test/fixtures/test/render_implicit_html_template.js.rjs
M	railties/guides/source/ajax_on_rails.textile
M	railties/guides/source/layouts_and_rendering.textile

commit 25181ca	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-25 09:44:43 +0100

    let the default function in button_to_function be nil
    
    I don't know which is the use case for button_to_function(name)
    but there's a test for it. I am focused now on RJS extraction
    and do not want to introduce a backwards incompatible change
    at this moment. Perhaps worth revisiting when the whole thing
    is done.

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit f9472f0	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-25 00:30:29 +0100

    applies API guidelines to example

M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit 3223e04	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-25 00:28:47 +0100

    removes support for RJS in button_to_function

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit b878757	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-24 23:51:17 +0100

    removes assert_select_rjs

M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/test/controller/assert_select_test.rb
M	railties/guides/source/testing.textile

commit 8449da9	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-24 23:48:07 +0100

    removes support for RJS in link_to_function

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 096fa1b	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-24 23:43:37 +0100

    jQuery is the new default

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/railtie.rb
M	railties/guides/source/layouts_and_rendering.textile
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/config/application.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/plugin_new_generator_test.rb

commit 805126b	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-13 09:01:24 +0800

    Aligning comments

M	actionpack/lib/action_view/helpers/date_helper.rb

commit 93def19	refs/heads/master
Author: Matt Duncan 
Date:   2011-04-13 08:51:25 +0800

    Fixing distance_of_time_in_words range near 2 days

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit f004c88	refs/heads/master
Merge: 1b5b53d a451851
Author: Joshua Peek 
Date:   2011-04-12 22:35:24 -0500

    Merge branch 'sprockets'

commit 1b5b53d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-12 20:29:35 -0700

    common @jonleighton :bomb:

M	activerecord/test/models/post.rb

commit a451851	refs/heads/master
Author: Joshua Peek 
Date:   2011-04-12 22:12:27 -0500

    Index sprockets environment if perform caching is enabled

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/finisher.rb

commit ed24595	refs/heads/master
Merge: d7b521d f0e198b
Author: Joshua Peek 
Date:   2011-04-12 21:56:00 -0500

    Merge branch 'master' into sprockets

commit f0e198b	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-08 23:54:54 +0100

    Deprecate defining scopes with a callable (lambda, proc, etc) via the scope class method. Just define a class method yourself instead.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/named_scope.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/models/comment.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/topic.rb

commit 788bd30	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-08 23:53:25 +0100

    ActiveRecord::Base.scopes hash is not needed

M	activerecord/lib/active_record/named_scope.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/named_scope_test.rb

commit 8572ae6	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-08 20:56:33 +0100

    Evaluate default scopes at the last possible moment in order to avoid problems with default scopes getting included into other scopes and then being unable to remove the default part via unscoped.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relation_test.rb
M	activerecord/test/models/developer.rb

commit 5740d4e	refs/heads/master
Author: Jon Leighton 
Date:   2011-04-04 00:07:45 +0100

    Deprecated support for passing hashes and relations to default_scope, in favour of defining a 'default_scope' class method in the model. See the CHANGELOG for more details.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/named_scope.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/models/bulb.rb
M	activerecord/test/models/car.rb
M	activerecord/test/models/categorization.rb
M	activerecord/test/models/developer.rb
M	activerecord/test/models/pirate.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/reference.rb
M	activerecord/test/models/without_table.rb

commit fc9a04b	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-28 22:36:29 +0100

    Removing the scope-caching which happens on association proxies, because the query is already cached by the query cacher. For formalised proof see http://www.youtube.com/watch?v=wDefXLb-FDs

M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/test/cases/named_scope_test.rb

commit a616e7a	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-12 20:10:50 -0300

    Update test name to the corresponding method name
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/test/core_ext/object/inclusion_test.rb

commit dbf32eb	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-12 18:58:41 -0300

    Changed Object#either? to Object#among? on guides

M	railties/guides/source/active_support_core_extensions.textile

commit 3366479	refs/heads/master
Merge: b53ffb3 40d1569
Author: Xavier Noria 
Date:   2011-04-12 22:45:33 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 4e873ff	refs/heads/master
Author:  
Date:   2011-04-12 00:59:55 -0700

    Corrected dbconsole usage message.

M	railties/lib/rails/commands/dbconsole.rb

commit 40d1569	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-11 22:43:27 -0300

    Update guides reflecting that scaffold_controller generator generates now code for JSON response instead of XML

M	railties/guides/source/getting_started.textile

commit 7a1189a	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-04-11 20:09:22 -0300

    Updated AS guide with new Object#in? and Object#either? methods

M	railties/guides/source/active_support_core_extensions.textile

commit b53ffb3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 15:49:37 -0700

    stop using deprecated methods in arel

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 3f283c2	refs/heads/master
Author: Xavier Noria 
Date:   2011-04-12 00:37:02 +0200

    Revert "Edited railties/guides/source/active_support_core_extensions.textile via GitHub"
    
    Reason: The original sentence is correct. Please note the guide
    covers the stable version of Active Support.
    
    This reverts commit 5265650d51713a883e6cacde8f6faf52708abc1b.

M	railties/guides/source/active_support_core_extensions.textile

commit d1575ae	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-12 00:23:07 +0200

    Change Object#either? to Object#among? -- thanks to @jamesarosen for the suggestion!

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	activemodel/lib/active_model/validator.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activeresource/lib/active_resource/connection.rb
M	activeresource/test/cases/http_mock_test.rb
M	activesupport/CHANGELOG
M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/core_ext/object/inclusion.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/object/inclusion_test.rb
M	activesupport/test/transliterate_test.rb
M	railties/guides/rails_guides/textile_extensions.rb
M	railties/lib/rails/commands.rb
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/destroy.rb
M	railties/lib/rails/commands/generate.rb
M	railties/lib/rails/commands/profiler.rb
M	railties/lib/rails/generators/base.rb
M	railties/lib/rails/generators/generated_attribute.rb

commit 5918b86	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 15:19:10 -0700

    remove so many nested if statements

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 622f23b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 14:38:42 -0700

    wrap the pg_get_serial_sequence function and reuse it for the default sequence name

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

commit 5265650	refs/heads/master
Author: Oge Nnadi 
Date:   2011-04-11 14:26:23 -0700

    Edited railties/guides/source/active_support_core_extensions.textile via GitHub

M	railties/guides/source/active_support_core_extensions.textile

commit 75dc9fb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 14:12:31 -0700

    cache table exists queries in prepared statement cache

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit f6c0c8f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 14:08:27 -0700

    only use the primary_key method, refactor schema and table name parsing

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit a9e8554	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 13:57:00 -0700

    use prepared statements for primary key queries

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 5df072d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 13:10:20 -0700

    last insert id can never be called, so remove that code path

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit d5634b2	refs/heads/master
Author: Oge Nnadi 
Date:   2011-04-11 13:08:58 -0700

    Added missing 

M	actionpack/lib/abstract_controller/callbacks.rb

commit d3dce77	refs/heads/master
Author: Oge Nnadi 
Date:   2011-04-11 12:57:52 -0700

    Edited README.rdoc via GitHub

M	README.rdoc

commit a43abfa	refs/heads/master
Author: Oge Nnadi 
Date:   2011-04-11 12:54:46 -0700

    Rewording

M	activemodel/lib/active_model/dirty.rb

commit 9ba94c8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 10:54:08 -0700

    we know the table and pk, so we can calculate a default sequence name

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit cbb65de	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 10:37:23 -0700

    always look up pk and sequence unless both are provided

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 302b6f3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 10:31:13 -0700

    pg does not know the insert_id in advance, so super will never return true

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 4c30304	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-10 19:08:20 -0700

    updating the docco for ActiveRecord::Result

M	activerecord/lib/active_record/result.rb

commit 269cd1b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-10 19:02:06 -0700

    implement exec_query on mysql2 adapter

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 8a11799	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-10 18:12:42 -0700

    make sqlite insert_sql more consistent with other adapters

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

commit 58259bb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 18:19:24 -0700

    adding exec_insert for postgresql

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M	activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit b1ba04b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 17:58:00 -0700

    fixing variable name in mysql test

M	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

commit 90a3714	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 17:45:18 -0700

    properly name schema queries for the logger

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 3d96e62	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 17:37:27 -0700

    adding mysql adapter test case

A	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

commit 0845b50	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 17:37:10 -0700

    adding client_encoding method for discovering the encoding set for this client, testing exec_insert on a string

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit f9d3f01	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 16:44:54 -0700

    properly name schema queries for logging

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit 32dbf00	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 14:50:42 -0700

    adding exec_insert to sqlite3

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit c4fc396	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-11 10:02:39 -0700

    adding a case_sensitive_modifier for forcing comparisons to be case sensitive

M	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
M	activerecord/lib/active_record/validations/uniqueness.rb

commit 35b2715	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-10 23:53:02 -0700

    only support pg >= 8.2, so no need to check

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 7379114	refs/heads/master
Author: José Valim 
Date:   2011-04-11 18:01:10 +0200

    Remove code duplication.

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb

commit df5691a	refs/heads/master
Author: José Valim 
Date:   2011-04-11 17:47:55 +0200

    No need to rescue here. Invoking the wrong method in an object can happen anywhere if you are not careful. In other words, test your shit.

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/format_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit 5bf3d46	refs/heads/master
Author: José Valim 
Date:   2011-04-11 17:41:33 +0200

    Revert "Add :use_include option to allow user to explicitly use `Range#include?` method in Ruby 1.9"
    
    Use :with => range.to_a instead.
    
    This reverts commit f6540211b5b9133c9f93c11655a04d613c237e67.

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit b93199b	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-11 15:50:05 +0200

    Keep the same API semantics for update/delete as we had for XML (just return 200 OK, no body)

M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

commit 1d8bf4f	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-04-11 15:25:39 +0200

    Cant use inclusion in commands/application.rb as the frameworks havent all been required yet

M	activesupport/lib/active_support/core_ext/object.rb
M	railties/lib/rails/commands/application.rb

commit 1f3d3eb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-10 18:02:57 -0700

    pg should define insert_sql so that query cache actually works for inserts

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit d6edaee	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-11 12:35:20 +0700

    Fix failing test case on master
    
    It turned out that I overlook at some replacements ..

M	actionpack/test/dispatch/routing_test.rb
M	activesupport/bin/generate_tables

commit 743b663	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-10 22:34:27 -0700

    adding pg support notes to the changelog

M	activerecord/CHANGELOG

commit 35dba50	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-10 22:30:27 -0700

    community support for pg < 8.2 has ended, so we can drop support for those versions

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit a30b440	refs/heads/master
Author: Brian Cardarella 
Date:   2011-03-19 13:28:36 -0400

    Refactored uniqueness validator to use Arel instead of hardcoded SQL

M	activerecord/lib/active_record/validations/uniqueness.rb

commit a9f3c9d	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-11 00:52:42 +0800

    Using Object#in? and Object#either? in various places
    
    There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.

M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/testing/assertions/response.rb
M	actionpack/lib/action_dispatch/testing/assertions/selector.rb
M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/mime_responds_test.rb
M	actionpack/test/controller/resources_test.rb
M	actionpack/test/dispatch/routing_test.rb
M	actionpack/test/template/erb_util_test.rb
M	actionpack/test/template/form_helper_test.rb
M	actionpack/test/template/form_options_helper_test.rb
M	actionpack/test/template/form_tag_helper_test.rb
M	activemodel/lib/active_model/validator.rb
M	activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/builder/belongs_to.rb
M	activerecord/lib/active_record/associations/builder/has_many.rb
M	activerecord/lib/active_record/associations/builder/has_one.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/lib/active_record/railties/databases.rake
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/attribute_methods/read_test.rb
M	activerecord/test/cases/attribute_methods_test.rb
M	activerecord/test/cases/defaults_test.rb
M	activeresource/lib/active_resource/connection.rb
M	activeresource/lib/active_resource/http_mock.rb
M	activeresource/test/cases/http_mock_test.rb
M	activesupport/bin/generate_tables
M	activesupport/lib/active_support/cache/file_store.rb
M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/transliterate_test.rb
M	railties/guides/rails_guides/textile_extensions.rb
M	railties/lib/rails/commands.rb
M	railties/lib/rails/commands/application.rb
M	railties/lib/rails/commands/benchmarker.rb
M	railties/lib/rails/commands/destroy.rb
M	railties/lib/rails/commands/generate.rb
M	railties/lib/rails/commands/profiler.rb
M	railties/lib/rails/generators/base.rb
M	railties/lib/rails/generators/generated_attribute.rb

commit 635d991	refs/heads/master
Author: Prem Sichanugrist, Brian Morearty, John Reitano 
Date:   2011-04-10 20:27:08 +0800

    Add support for Object#in? and Object#either? in Active Support [#6321 state:committed]
    
    This will allow you to check if an object is included in another object
    or the list of objects or not.
    
    This patch is derived from patch by Brian Morearty and John Reitano on
    Lighthouse ticket. I've rewrite it and make sure that we support both
    'another object' and 'list of objects' version, as it surely be useful
    to support both.

M	activesupport/CHANGELOG
A	activesupport/lib/active_support/core_ext/object/inclusion.rb
A	activesupport/test/core_ext/object/inclusion_test.rb

commit 62b2755	refs/heads/master
Author: José Valim 
Date:   2011-04-10 13:03:49 +0200

    Remove dead branch code that appeared back in a merge.

M	activerecord/lib/active_record/nested_attributes.rb

commit f654021	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-10 15:39:01 +0800

    Add :use_include option to allow user to explicitly use `Range#include?` method in Ruby 1.9
    
    In Ruby 1.9 we're currently use `Range#cover?` to fix the performance problem. However, there might be the case that you want to use `Range#include?` instead. This patch will give you that option.

M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit 58594be	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-03-11 13:35:23 +0800

    Add support for proc or lambda as an option for InclusionValidator, ExclusionValidator, and FormatValidator
    
    You can now use a proc or lambda in :in option for InclusionValidator and ExclusionValidator, and :with, :without option for FormatValidator

M	activemodel/CHANGELOG
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/exclusion_validation_test.rb
M	activemodel/test/cases/validations/format_validation_test.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit c59456a	refs/heads/master
Author: Jo Liss 
Date:   2011-04-08 20:56:38 +0200

    removed :nodoc: from ActionController::MimeResponds
    
    So we don't miss out on the nice documentation of the respond_to and
    respond_with instance methods.  Also added :nodoc: to protected method.

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit 22a3416	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-10 12:38:59 +0800

    Add --old-style-hash option to force creating old style hash on Ruby 1.9
    
    That means if you don't like the new syntax, you can pass --old-style-hash to force Rails to generate code with hash rockets.

M	railties/CHANGELOG
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/named_base.rb
M	railties/test/generators/app_generator_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb

commit 74960c3	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-10 12:30:58 +0800

    Rails will now generate Ruby 1.9 style hash when running app generator on Ruby 1.9.x
    
    The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate.

M	railties/CHANGELOG
M	railties/lib/rails/generators/app_base.rb
M	railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
M	railties/lib/rails/generators/rails/app/templates/db/seeds.rb
M	railties/test/generators/app_generator_test.rb

commit 63cd92f	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-10 12:27:26 +0800

    Rails will now generate Ruby 1.9 style hash when running scaffold_controller generator on Ruby 1.9.x
    
    The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate.
    
    This patch has been requested by DHH.

M	railties/CHANGELOG
M	railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
M	railties/lib/rails/generators/named_base.rb
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
M	railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
M	railties/test/generators/scaffold_controller_generator_test.rb

commit c0efc40	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-04-10 00:54:43 +0800

    Make scaffold_controller generator generate code for JSON response instead of XML
    
    It seems like a lot of people are using JSON in their API more than XML nowadays, so Rails should follow that convention by providing the JSON format block in scaffold_controller by default.
    
    This patch has been requested by DHH

M	railties/CHANGELOG
M	railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

commit 508c679	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 11:22:21 -0700

    moving sqlite_adapter_tests to sqlite3_adapter_test so that the tests are actually run. :bomb:

D	activerecord/test/cases/adapters/sqlite/sqlite_adapter_test.rb
M	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

commit bd79172	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-08 09:40:33 -0700

    make turn a soft dependency. generate a Gemfile that contains turn and require turn if it is available

M	railties/lib/rails/generators/rails/app/templates/Gemfile
M	railties/lib/rails/test_help.rb
M	railties/railties.gemspec

commit 2cdc1f0	refs/heads/master
Author: James Robinson 
Date:   2011-04-08 02:18:33 +0200

    Make csrf_meta_tags use the tag helper
    
    Improved formatting of csrf_helper and improved test coverage

M	actionpack/lib/action_view/helpers/csrf_helper.rb
M	actionpack/test/controller/request_forgery_protection_test.rb

commit a7c5d40	refs/heads/master
Merge: 1e90229 0e624ce
Author: Aaron Patterson 
Date:   2011-04-07 09:35:24 -0700

    Merge branch 'master' of github.com:rails/rails
    
    * 'master' of github.com:rails/rails:
      Cache flash now
      Revert "Use freeze instead of close!"
      Revert "Eagerly load Signed and Permanent cookies"
      cookies here
      Eagerly load Signed and Permanent cookies
      Use freeze instead of close!

commit 0e624ce	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-07 09:27:00 -0300

    Cache flash now

M	actionpack/lib/action_dispatch/middleware/flash.rb

commit 03d561a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-07 09:26:04 -0300

    Revert "Use freeze instead of close!"
    
    This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af.

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 5b0149a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-07 09:20:56 -0300

    Revert "Eagerly load Signed and Permanent cookies"
    
    This reverts commit dffeda377021ba8691381195f5a2889f8e040b93.

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 1720543	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-07 09:20:35 -0300

    cookies here

M	actionpack/test/dispatch/cookies_test.rb

commit dffeda3	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 22:25:07 -0300

    Eagerly load Signed and Permanent cookies

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 1e90229	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-06 18:13:16 -0700

    many args does not make sense with the current implementation because of how `use` works

M	actionpack/test/controller/flash_hash_test.rb

commit 32f8767	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-06 18:01:03 -0700

    getting the flash hash under test

M	actionpack/lib/action_dispatch/middleware/flash.rb
A	actionpack/test/controller/flash_hash_test.rb

commit 76c2ea7	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-06 17:26:55 -0700

    favor composition over inheritance, have FlashHash delegate to a Hash

M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/controller/flash_test.rb

commit 29592a7	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 20:53:48 -0300

    Use freeze instead of close!

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 0ca69ca	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-06 16:27:05 -0700

    CookieJar should prefer composition over inheritance

M	actionpack/lib/action_dispatch/middleware/cookies.rb

commit 9f765f4	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 19:17:39 -0300

    Delete useless arguments

M	actionpack/test/dispatch/cookies_test.rb

commit ed04243	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 19:15:33 -0300

    Delete useless env variable

M	actionpack/test/dispatch/cookies_test.rb

commit 0d45567	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 19:12:32 -0300

    Add tests to verify that signed and permanent cookies raises if someone tries
    to modify the cookies when it was already streamed back to the client
    or converted to HTTP headers

M	actionpack/test/dispatch/cookies_test.rb

commit 0e4748c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 16:37:55 -0300

    Make process reuse the env var passed as argument

M	actionpack/lib/action_dispatch/testing/integration.rb
M	actionpack/test/controller/integration_test.rb

commit 0c5aded	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 12:05:58 -0300

    raise if someone tries to modify the cookies when it was already streamed back to the client or converted to HTTP headers

M	actionpack/lib/action_dispatch/middleware/cookies.rb
M	actionpack/test/dispatch/cookies_test.rb

commit 90ecad0	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-06 12:30:08 -0300

    Add ClosedError message to the initializer

M	actionpack/lib/action_dispatch.rb
A	actionpack/lib/action_dispatch/middleware/closed_error.rb
M	actionpack/lib/action_dispatch/middleware/flash.rb

commit e836fc1	refs/heads/master
Author: Vijay Dev 
Date:   2011-04-06 15:14:47 +0530

    fix example query

M	railties/guides/source/active_record_querying.textile

commit c327ef4	refs/heads/master
Merge: 4ac7196 92e6255
Author: Vijay Dev 
Date:   2011-04-06 13:01:12 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 2e757bc	refs/heads/master
Author: Aaron Patterson 
Date:   2011-04-05 13:59:35 -0700

    do not return html safe strings from auto_link

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit 3940e34	refs/tags/v3.0.7.rc1
Merge: e6bc818 38df020
Author: Aaron Patterson 
Date:   2011-04-05 16:20:03 -0700

    Merge branch '3-0-6' into 3-0-stable
    
    * 3-0-6:
      bumping version to 3.0.6
      updating CHANGELOG
      updating CHANGELOG for actionpack
      do not return html safe strings from auto_link
      bumping to 3.0.6.rc2
      Support both conventions for translations for namespaced models.
      Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
      Bring back i18n_key to avoid regression
      Revert "Improve testing of cookies in functional tests:"
      bumping version to 3.0.6.rc1
      updating AR changelog

commit 38df020	refs/tags/v3.0.6 (tag: v3.0.6)
Author: Aaron Patterson 
Date:   2011-04-05 15:23:18 -0700

    bumping version to 3.0.6

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 857ec16	refs/tags/v3.0.6
Author: Aaron Patterson 
Date:   2011-04-05 15:22:40 -0700

    updating CHANGELOG

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit 6bb9efe	refs/tags/v3.0.6
Author: Aaron Patterson 
Date:   2011-04-05 15:20:30 -0700

    updating CHANGELOG for actionpack

M	actionpack/CHANGELOG

commit 61ee344	refs/tags/v3.0.6
Author: Aaron Patterson 
Date:   2011-04-05 13:59:35 -0700

    do not return html safe strings from auto_link

M	actionpack/lib/action_view/helpers/text_helper.rb
M	actionpack/test/template/text_helper_test.rb

commit e9020b4	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-05 00:33:29 +0200

    added find_zone and find_zone! to AS timezones and changed the AS Railtie to use find_zone! as well as adding Railtie tests
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/core_ext/date_time/zones.rb
M	activesupport/lib/active_support/core_ext/time/zones.rb
M	activesupport/lib/active_support/railtie.rb
M	activesupport/lib/active_support/time_with_zone.rb
M	activesupport/test/core_ext/time_with_zone_test.rb
M	railties/test/application/configuration_test.rb

commit 1c4db4d	refs/heads/master
Author: Marc-Andre Lafortune 
Date:   2011-03-16 09:43:14 -0400

    Raise on invalid timezone
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/core_ext/time/zones.rb
M	activesupport/lib/active_support/railtie.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 18dde7b	refs/heads/master
Author: Emilio Tagua 
Date:   2011-04-05 17:01:54 -0300

    Disable IdentityMap in log tests, it's not important and when running tests rake task it logs more messages in the tested buffer.
    
    Signed-off-by: José Valim 

M	activerecord/test/cases/log_subscriber_test.rb

commit e6bc818	refs/tags/v3.0.7.rc1
Author: Josh Kalderimis 
Date:   2011-04-04 13:15:28 +0200

    remove AM delegating register_observer and register_interceptor to Mail and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests
    
    Signed-off-by: José Valim 

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/lib/action_mailer/railtie.rb
M	actionmailer/test/base_test.rb
M	railties/test/application/configuration_test.rb

commit cb9e501	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-04 19:26:41 +0800

    AM register_interceptor and register_observer only constantize if the argument is a String

M	actionmailer/lib/action_mailer/base.rb

commit d907f3cb	refs/heads/master
Author: John Firebaugh 
Date:   2011-02-22 14:55:05 +0800

    Rename test directory to match code directory
    
    Hopefully "serializeration" is not an in joke that I missed.

D	activemodel/test/cases/serializeration/json_serialization_test.rb
D	activemodel/test/cases/serializeration/xml_serialization_test.rb
A	activemodel/test/cases/serializers/json_serialization_test.rb
A	activemodel/test/cases/serializers/xml_serialization_test.rb

commit 30264bb	refs/tags/v3.0.7.rc1
Author: Durran Jordan 
Date:   2011-04-05 11:01:04 +0200

    Destroying records via nested attributes works independent of reject_if:
    
    - When a :_destroy truthiness is provided in the attributes hash, the
      record should get destroyed regardless of the result of the proc or
        method supplied to :reject_if. (If :allow_destroy is true)
    
    [#6006 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit d7a5638	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-04 21:52:37 -0300

    raise if someone tries to modify the flash when it was already streamed back to the client or converted to HTTP headers

M	actionpack/lib/action_dispatch/middleware/flash.rb
M	actionpack/test/controller/flash_test.rb

commit a9b4b5d	refs/heads/master
Author: Durran Jordan 
Date:   2011-04-05 11:01:04 +0200

    Destroying records via nested attributes works independent of reject_if:
    
    - When a :_destroy truthiness is provided in the attributes hash, the
      record should get destroyed regardless of the result of the proc or
        method supplied to :reject_if. (If :allow_destroy is true)
    
    [#6006 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit 92e6255	refs/heads/master
Merge: 3575782 ac07da8
Author: Ryan Bigg 
Date:   2011-04-05 21:22:38 +1000

    Merge branch 'master' of github.com:lifo/docrails
    
    * 'master' of github.com:lifo/docrails: (57 commits)
      Made the defaults section a little more readable and more to the point, giving a overview of the possibilities.
      Added information about default values
      added .'s to headings in the initialization textile page
      s/ERb/ERB/g (part II)
      s/ERb/ERB/g
      Bump up erubis to 2.7.0
      Implicit actions named not_implemented can be rendered
      Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0
      default_executable is deprecated since rubygems 1.7.0
      Trivial fix to HTTP Digest auth MD5 example
      Moved Turn activation/dependency to railties
      fix typo
      Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH]
      Add using Turn with natural language test case names if the library is available (which it will be in Rails 3.1) [DHH]
      require turn only for minitest
      Use Turn to format all Rails tests and enable the natural language case names
      Improve docs.
      pass respond_with options to controller render when using a template for api navigation
      only try to display an api template in responders if the request is a get or there are no errors
      when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned
      ...

commit 3575782	refs/heads/master
Author: Ryan Bigg 
Date:   2011-04-05 21:22:10 +1000

    Correct documentation on url_for. It doesn't call to_s, but rather to_param

M	actionpack/lib/action_view/helpers/url_helper.rb

commit ac07da8	refs/heads/master
Author: simply-phi 
Date:   2011-04-03 09:12:07 -0700

    Made the defaults section a little more readable and more to the point, giving a overview of the possibilities.

M	actionmailer/README.rdoc

commit f323a8f	refs/heads/master
Author: simply-phi 
Date:   2011-04-03 04:17:26 -0700

    Added information about default values

M	actionmailer/README.rdoc

commit 284ca81	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-04-02 10:51:47 +0200

    remove AM delegating register_observer and register_interceptor to Mail and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests.
    
    Signed-off-by: José Valim 

M	actionmailer/lib/action_mailer/base.rb
M	actionmailer/lib/action_mailer/railtie.rb
M	actionmailer/test/base_test.rb
M	railties/test/application/configuration_test.rb

commit 454ec93	refs/heads/master
Author: Emilio Tagua 
Date:   2011-04-03 20:19:52 -0300

    Add log message when loading records from Identity Map.
    
    Signed-off-by: José Valim 

M	activerecord/lib/active_record/identity_map.rb
M	activerecord/test/cases/identity_map_test.rb

commit b356172	refs/heads/master
Author: Emilio Tagua 
Date:   2011-04-03 20:09:00 -0300

    Use IM when trying to load records using ID.
    
    Signed-off-by: José Valim 

M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/transactions.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/query_cache_test.rb

commit 16e5d15	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-03 19:16:08 -0300

    Add railties to the LOAD_PATH if running from a Rails checkout

M	bin/rails

commit 4ac7196	refs/heads/master
Merge: 4c76f68 3e24e9e
Author: Vijay Dev 
Date:   2011-04-04 02:43:12 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 3e24e9e	refs/heads/master
Merge: a000fc5 4c323bc
Author: Xavier Noria 
Date:   2011-04-03 22:22:03 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 4c323bc	refs/heads/master
Author: orta 
Date:   2011-03-14 12:37:43 +0000

    added .'s to headings in the initialization textile page

M	railties/guides/source/initialization.textile

commit 9bf5cdd	refs/heads/master
Author: Akira Matsuda 
Date:   2011-04-03 16:59:37 +0900

    s/ERb/ERB/g (part II)

M	actionmailer/README.rdoc
M	actionpack/README.rdoc
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/api_documentation_guidelines.textile
M	railties/guides/source/command_line.textile
M	railties/guides/source/testing.textile

commit bd3cdee	refs/heads/master
Author: Akira Matsuda 
Date:   2011-04-03 12:47:51 +0900

    s/ERb/ERB/g
    
    The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib.
    http://www2a.biglobe.ne.jp/~seki/ruby/erb.html

M	actionpack/lib/action_controller/base.rb
M	actionpack/lib/action_view/base.rb
M	actionpack/lib/action_view/helpers/atom_feed_helper.rb
M	actionpack/lib/action_view/helpers/capture_helper.rb
M	actionpack/lib/action_view/helpers/prototype_helper.rb
M	actionpack/lib/action_view/helpers/url_helper.rb
M	actionpack/lib/action_view/template/handlers/erb.rb
M	activerecord/lib/active_record/fixtures.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	railties/lib/rails/source_annotation_extractor.rb

commit a000fc5	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-02 23:56:52 -0300

    Bump up erubis to 2.7.0

M	actionpack/actionpack.gemspec

commit cc58fe7	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-02 23:45:07 -0300

    Implicit actions named not_implemented can be rendered

M	actionpack/CHANGELOG
M	actionpack/lib/abstract_controller/base.rb
M	actionpack/test/controller/new_base/render_implicit_action_test.rb

commit 8d558cb	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-04-03 03:16:35 +0100

    don't use internal profiler methods on Rubinius and JRuby since we're only measuring wall clock for now (and the APIs will/can change, respectively)

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit 65022ac	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-04-03 02:09:53 +0100

    removed unused class declaration

M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 5b2b513	refs/heads/master
Merge: 677ce63 99da42c
Author: Gonçalo Silva 
Date:   2011-04-03 02:02:35 +0100

    Merge branch 'master' of https://github.com/rails/rails into performance_test

commit 677ce63	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-04-03 01:09:34 +0100

    profiling enabled under JRuby. Added documentation for workaround described in JRUBY-5650.

M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/mri.rb
M	railties/guides/source/performance_testing.textile

commit 99da42c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-02 00:35:33 -0300

    Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0

M	actionmailer/actionmailer.gemspec
M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec
M	activerecord/activerecord.gemspec
M	activeresource/activeresource.gemspec
M	activesupport/activesupport.gemspec
M	railties/railties.gemspec

commit 9de8dea	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-04-01 23:58:37 -0300

    default_executable is deprecated since rubygems 1.7.0

M	rails.gemspec

commit 080e2a7	refs/heads/master
Author: John Firebaugh 
Date:   2011-04-01 12:14:53 -0700

    Enumerable should pass encoding options to children in #as_json/#to_json.

M	activesupport/lib/active_support/json/encoding.rb
M	activesupport/test/json/encoding_test.rb

commit c17b8e4	refs/heads/master
Author: Jon Cooper 
Date:   2011-03-31 16:19:18 -0700

    Trivial fix to HTTP Digest auth MD5 example

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 0eb6e5e	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-31 16:20:59 -0700

    Moved Turn activation/dependency to railties

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/test_case.rb
D	activesupport/lib/active_support/testing/turn_formatting.rb
M	rails.gemspec
M	railties/CHANGELOG
M	railties/lib/rails/commands/console.rb
M	railties/lib/rails/test_help.rb
M	railties/railties.gemspec

commit 63e4e21	refs/heads/master
Author: burningTyger 
Date:   2011-04-01 00:12:58 +0200

    fix typo

M	railties/guides/source/testing.textile

commit caf0a72	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-31 14:33:24 -0700

    Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH]

M	railties/CHANGELOG
M	railties/lib/rails/commands/console.rb

commit 6eff044	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-31 12:25:04 -0700

    Add using Turn with natural language test case names if the library is available (which it will be in Rails 3.1) [DHH]

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/test_case.rb
A	activesupport/lib/active_support/testing/mochaing.rb
A	activesupport/lib/active_support/testing/turn_formatting.rb

commit edf7c9a	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-31 12:17:28 -0700

    require turn only for minitest

M	activesupport/lib/active_support/test_case.rb

commit b270577	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-31 12:11:03 -0700

    Use Turn to format all Rails tests and enable the natural language case names

M	activesupport/lib/active_support/test_case.rb
M	rails.gemspec

commit 7a9dafd	refs/heads/master
Author: José Valim 
Date:   2011-03-31 19:00:05 +0200

    Improve docs.

M	actionpack/lib/action_controller/metal/responder.rb

commit b45302d	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-03-31 18:25:29 +0200

    pass respond_with options to controller render when using a template for api navigation
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/metal/implicit_render.rb
M	actionpack/lib/action_controller/metal/mime_responds.rb
M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/test/controller/mime_responds_test.rb
A	actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb

commit 48404a7	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-03-31 18:18:11 +0200

    only try to display an api template in responders if the request is a get or there are no errors
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/test/controller/mime_responds_test.rb
A	actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb

commit 9766997	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-03-30 20:53:42 +0200

    when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned
    
    Signed-off-by: José Valim 

M	actionpack/lib/action_controller/metal/responder.rb
M	actionpack/test/controller/mime_responds_test.rb

commit a64abdd	refs/heads/master
Author: Amaia Castro 
Date:   2011-03-31 13:19:19 +0200

    Explain in the method doc that you need to call respond_to at the class level in order to use respond_with.

M	actionpack/lib/action_controller/metal/mime_responds.rb

commit 4c76f68	refs/heads/master
Merge: 910a8d2 f44d85a
Author: Vijay Dev 
Date:   2011-03-31 16:34:07 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit b13be61	refs/tags/v3.0.6.rc2 (tag: v3.0.6.rc2)
Author: Aaron Patterson 
Date:   2011-03-30 22:26:41 -0700

    bumping to 3.0.6.rc2

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 0307c53	refs/tags/v3.0.6.rc2
Author: John Firebaugh 
Date:   2011-03-30 17:50:50 -0700

    Support both conventions for translations for namespaced models.
    
    3.0.0 - 3.0.1 required 'namespace/model'
    3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
    keeping the i18n file DRY when multiple models are in the same namespace,
    but can lead to translation key conflicts if models are nested within
    models.
    
    [#6448, #5572]

M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit 5b8dbb0	refs/tags/v3.0.7.rc1
Author: John Firebaugh 
Date:   2011-03-30 17:50:50 -0700

    Support both conventions for translations for namespaced models.
    
    3.0.0 - 3.0.1 required 'namespace/model'
    3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
    keeping the i18n file DRY when multiple models are in the same namespace,
    but can lead to translation key conflicts if models are nested within
    models.
    
    [#6448, #5572]

M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/translation_test.rb

commit f44d85a	refs/heads/master
Author: Josiah Ivey 
Date:   2011-03-31 00:16:45 -0500

    Grammar tweaks to the guides guidelines

M	railties/guides/source/ruby_on_rails_guides_guidelines.textile

commit 2867093	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-30 21:16:29 -0700

    Delegate pending to skip if Minitest is available

M	activesupport/lib/active_support/testing/pending.rb

commit d7b521d	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-30 22:17:43 -0500

    Fix assets prefix joining

M	railties/lib/rails/application.rb

commit bcde6cd	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-30 22:12:00 -0500

    Fix assets prefix joining

M	railties/lib/rails/application.rb

commit 203b151	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-30 22:00:16 -0500

    Fix config.assets.precompile option

M	railties/lib/rails/tasks/assets.rake

commit 28fee29	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-30 21:56:15 -0500

    Unify sprockets config options

M	actionpack/lib/action_controller/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb

commit 56a5da8	refs/heads/master
Merge: 5df076a 58c3ec1
Author: Joshua Peek 
Date:   2011-03-30 21:04:33 -0500

    Merge branch 'master' into sprockets
    
    Conflicts:
    	railties/lib/rails/application/configuration.rb

commit 5df076a	refs/heads/master
Merge: ac9443e 9772de8
Author: Joshua Peek 
Date:   2011-03-30 20:56:05 -0500

    Merge branch 'master' into sprockets

commit ac9443e	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-30 20:46:49 -0500

    Switch to sprockets/master

M	Gemfile

commit d6dbd54	refs/tags/v3.0.6.rc2
Author: Patrick Bacon 
Date:   2011-03-28 06:59:09 -0400

    Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.

M	activerecord/lib/active_record/associations/association_proxy.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/models/post.rb

commit 1f38cd7	refs/tags/v3.0.7.rc1
Merge: e413953 03852b6
Author: Aaron Patterson 
Date:   2011-03-30 15:39:27 -0700

    Merge branch 'eager_load_has_one_with_conditions_fix' of https://github.com/baconpat/rails into baconpat-eager_load_has_one_with_conditions_fix
    
    * 'eager_load_has_one_with_conditions_fix' of https://github.com/baconpat/rails:
      Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.

commit 05f3df3	refs/tags/v3.0.6.rc2
Author: Santiago Pastorino 
Date:   2011-03-30 16:37:01 -0300

    Bring back i18n_key to avoid regression

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb

commit 58c3ec1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-30 15:29:52 -0700

    use assert_equal so we get normal error messages along with our custom failure message

M	actionpack/lib/action_dispatch/testing/assertions/routing.rb

commit cf07da0	refs/heads/master
Author: Ryan Bigg 
Date:   2011-03-31 06:59:48 +1100

    Symbol to proc is preferred over longer form of map

M	activerecord/lib/active_record/named_scope.rb

commit 04d5dec	refs/heads/master
Author: Ryan Bigg 
Date:   2011-03-31 06:47:01 +1100

    Cleanup of named_scope documentation

M	activerecord/lib/active_record/named_scope.rb

commit 7a34ab7	refs/heads/master
Author: Ryan Bigg 
Date:   2011-03-31 06:46:02 +1100

    Fix typo in named_scope documentation

M	activerecord/lib/active_record/named_scope.rb

commit 6a17151	refs/heads/master
Author: Eadz 
Date:   2011-03-19 00:02:53 -0700

    add space to conform with style

M	activerecord/lib/active_record/named_scope.rb

commit 45d5d6b	refs/heads/master
Author: Eadz 
Date:   2011-03-19 00:00:50 -0700

    Documented undocumented feature: Class methods on your model are automatically available on scopes

M	activerecord/lib/active_record/named_scope.rb

commit e413953	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-30 16:37:01 -0300

    Bring back i18n_key to avoid regression

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb

commit 4f90b28	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-30 16:29:34 -0300

    Bring back AMo#i18n_key method

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb

commit d688a9d	refs/heads/master
Merge: cfb6f77 ba51aa0
Author: Aaron Patterson 
Date:   2011-03-30 09:55:02 -0700

    Merge branch 'master' of github.com:rails/rails
    
    * 'master' of github.com:rails/rails:
      Make action_method? public and change implicit rendering to override it instead.

commit cfb6f77	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-30 09:54:46 -0700

    TableAlias leg ordering has changed, so change accordingly

M	activerecord/lib/active_record/associations/join_dependency/join_part.rb

commit ba51aa0	refs/heads/master
Author: José Valim 
Date:   2011-03-30 17:22:05 +0200

    Make action_method? public and change implicit rendering to override it instead.

M	actionpack/lib/abstract_controller/base.rb
M	actionpack/lib/action_controller/metal/implicit_render.rb
M	actionpack/test/controller/new_base/render_implicit_action_test.rb

commit 25c0b56	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 22:11:47 -0500

    Precompile configured assets

M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/tasks/assets.rake

commit 77d8f7a	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 21:40:24 -0500

    Seperate asset directories

M	actionpack/lib/action_view/helpers/sprockets_helper.rb
D	actionpack/test/fixtures/sprockets/app/assets/javascripts/application.js
D	actionpack/test/fixtures/sprockets/app/assets/javascripts/dir/xmlhr.js
D	actionpack/test/fixtures/sprockets/app/assets/javascripts/xmlhr.js
D	actionpack/test/fixtures/sprockets/app/assets/stylesheets/application.css
D	actionpack/test/fixtures/sprockets/app/assets/stylesheets/dir/style.css
D	actionpack/test/fixtures/sprockets/app/assets/stylesheets/style.css
A	actionpack/test/fixtures/sprockets/app/javascripts/application.js
A	actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js
A	actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js
A	actionpack/test/fixtures/sprockets/app/stylesheets/application.css
A	actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css
A	actionpack/test/fixtures/sprockets/app/stylesheets/style.css
M	actionpack/test/template/sprockets_helper_test.rb

commit b8f9a45	refs/heads/master
Merge: 6212749 58becf1
Author: Gonçalo Silva 
Date:   2011-03-30 03:24:20 +0100

    Merge branch 'master' of https://github.com/rails/rails into performance_test

commit 6212749	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-30 03:23:49 +0100

    updated documentation because of the benchmark/profile improvements

M	railties/guides/source/performance_testing.textile

commit 09cdd1c	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-30 03:23:16 +0100

    check if there is support for the specified metric when profiling

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 651d371	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 21:23:05 -0500

    Rename option to config.asset_pipeline

M	actionpack/lib/action_controller/railtie.rb
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/engine.rb

commit 612454e	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 21:16:44 -0500

    Move sprockets initializers back to application

M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/application/finisher.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/engine/configuration.rb

commit 2be383b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-29 17:50:39 -0700

    test against AR class rather than the relation (thanks Andrew White!)

M	activerecord/test/cases/finder_test.rb

commit 03852b6	refs/tags/v3.0.7.rc1
Author: Patrick Bacon 
Date:   2011-03-28 06:59:09 -0400

    Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.

M	activerecord/lib/active_record/associations/association_proxy.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/models/post.rb

commit 0471fc9	refs/heads/master
Merge: 28c73f0 58becf1
Author: Aaron Patterson 
Date:   2011-03-29 17:38:43 -0700

    Merge branch 'master' into zomg
    
    * master: (51 commits)
      order is not guaranteed by this select, so add an order and call first!
      oracle stores this with microseconds, so convert to seconds before comparing
      make sure that active connections are not cleared during test when an exception happens
      clearing active connections in the ConnectionManagement middleware if an exception happens
      proxy body responses so we close database connections after body is flushed
      Pass the proper method_name instead of hardcoding to action_name.
      Quote find_in_batches ORDER BY clause [#6620 state:resolved]
      Delegate first!, last!, any? and many? to scoped
      Dont call authenticate_or_request_with_http_basic twice
      Remove 'warning: ambiguous first argument' when running ActionPack tests
      Change exists? so that it doesn't instantiate records [#6127 state:resolved]
      Move mapper_test to the appropriate location
      Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved]
      Fix examples
      Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH]
      make sure we have an active database connection before running each connection management test
      adding active_connections? to the connection pool for finding open connections
      adding active_connection? to the connection pool
      testing app delegation from the ConnectionManagement middleware
      namespacing connection management tests. :heart:
      ...

commit 58becf1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-29 17:27:32 -0700

    order is not guaranteed by this select, so add an order and call first!

M	activerecord/test/cases/finder_test.rb

commit 6067d29	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-29 17:09:22 -0700

    oracle stores this with microseconds, so convert to seconds before comparing

M	activerecord/test/cases/persistence_test.rb

commit db3e310	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 18:05:23 -0500

    Change back to /assets prefix

M	actionpack/lib/action_view/helpers/sprockets_helper.rb
M	railties/lib/rails/engine.rb

commit 391ccda	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-30 00:00:26 +0100

    fixed a bug where rubinius was creating the profiling files as directories

M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit c7b7c6a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-29 15:47:16 -0700

    make sure that active connections are not cleared during test when an exception happens

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_management_test.rb

commit a35ba6c	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-29 23:43:26 +0100

    don't allow decimal places on the amount of objects and gc runs

M	activesupport/lib/active_support/testing/performance.rb

commit 3b2a032	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-29 15:42:32 -0700

    clearing active connections in the ConnectionManagement middleware if an exception happens

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_management_test.rb

commit e524609	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-29 15:37:07 -0700

    proxy body responses so we close database connections after body is flushed

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_management_test.rb

commit 8e4d0b1	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 17:28:46 -0500

    Fix building route set with sprockets in production

M	railties/lib/rails/engine.rb

commit a5f547c	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 17:27:49 -0500

    Only add fingerprints if perform_caching is on

M	actionpack/lib/action_view/helpers/sprockets_helper.rb

commit e646385	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 17:02:29 -0500

    Fix sprockets logger

M	railties/lib/rails/engine.rb

commit be0a2b8	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-29 22:41:49 +0100

    performance tests inherit from AD::PT and not AC::PT, fixed performance test generator invocation (guide)

M	railties/guides/source/performance_testing.textile

commit bed7a1a	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 16:17:49 -0500

    Copy use_sprockets config

M	actionpack/lib/abstract_controller/asset_paths.rb
M	actionpack/lib/action_controller/railtie.rb

commit 375443a	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 15:53:28 -0500

    Use sprockets helpers if config.use_sprockets is set

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

commit 2b47059	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 15:42:57 -0500

    Add sprockets to Gemfile for testing

M	Gemfile

commit 1af295f	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-29 15:42:31 -0500

    Tests for SprocketsHelper

M	actionpack/lib/action_view/helpers/sprockets_helper.rb
A	actionpack/test/fixtures/sprockets/app/assets/javascripts/application.js
A	actionpack/test/fixtures/sprockets/app/assets/javascripts/dir/xmlhr.js
A	actionpack/test/fixtures/sprockets/app/assets/javascripts/xmlhr.js
A	actionpack/test/fixtures/sprockets/app/assets/stylesheets/application.css
A	actionpack/test/fixtures/sprockets/app/assets/stylesheets/dir/style.css
A	actionpack/test/fixtures/sprockets/app/assets/stylesheets/style.css
A	actionpack/test/template/sprockets_helper_test.rb

commit ba117b2	refs/tags/v3.0.6.rc1 (tag: v3.0.6.rc1)
Author: Aaron Patterson 
Date:   2011-03-29 13:38:24 -0700

    Revert "Improve testing of cookies in functional tests:"
    
    This reverts commit e2523ff68309f444cd052031c1fe8a3030d2865a.

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/dispatch/cookies_test.rb
M	actionpack/test/dispatch/test_request_test.rb

commit 9490703	refs/heads/master
Author: José Valim 
Date:   2011-03-29 19:30:59 +0200

    Pass the proper method_name instead of hardcoding to action_name.
    
    Conflicts:
    
    	actionpack/lib/action_controller/metal/implicit_render.rb

M	actionpack/lib/abstract_controller/callbacks.rb
M	actionpack/lib/action_controller/metal/implicit_render.rb

commit 4e2bacd	refs/tags/v3.0.7.rc1
Author: José Valim 
Date:   2011-03-29 19:29:38 +0200

    Pass the proper method_name instead of hardcoding to action_name.

M	actionpack/lib/abstract_controller/callbacks.rb
M	actionpack/lib/action_controller/metal/implicit_render.rb

commit 3ed8a33	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-27 09:54:38 +0100

    Quote find_in_batches ORDER BY clause [#6620 state:resolved]

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/primary_keys_test.rb

commit 555d016	refs/heads/master
Author: Andrew White 
Date:   2011-03-27 09:54:38 +0100

    Quote find_in_batches ORDER BY clause [#6620 state:resolved]

M	activerecord/lib/active_record/attribute_methods/primary_key.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/batches_test.rb
M	activerecord/test/cases/primary_keys_test.rb

commit a9dafbb	refs/heads/master
Author: Andrew White 
Date:   2011-03-29 15:08:40 +0100

    Delegate first!, last!, any? and many? to scoped

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/finder_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	railties/guides/source/active_record_querying.textile

commit 7f098a6	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-29 17:19:57 +0100

    Delegate any? and many? to scoped

M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/named_scope_test.rb
M	railties/guides/source/active_record_querying.textile

commit e8d20b8	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-29 07:29:10 -0700

    Dont call authenticate_or_request_with_http_basic twice

M	actionpack/lib/action_controller/metal/http_authentication.rb

commit 52351bc	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-29 09:40:42 -0300

    Remove 'warning: ambiguous first argument' when running ActionPack tests
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/test/dispatch/mapper_test.rb
M	actionpack/test/template/date_helper_test.rb

commit 827e5de	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-29 13:09:17 +0100

    Change exists? so that it doesn't instantiate records [#6127 state:resolved]

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit b155fda	refs/heads/master
Author: Andrew White 
Date:   2011-03-29 12:51:58 +0100

    Change exists? so that it doesn't instantiate records [#6127 state:resolved]

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 84a4ef6	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-03-29 03:01:46 +0700

    Move mapper_test to the appropriate location
    
    It seems like in 89c5b9aee7d7db95cec9e5a934c3761872ab107e Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate.
    
    Signed-off-by: Andrew White 

D	actionpack/test/action_dispatch/routing/mapper_test.rb
A	actionpack/test/dispatch/mapper_test.rb

commit 51551a0	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-03-29 02:59:24 +0700

    Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved]
    
    After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route.
    
    Signed-off-by: Andrew White 

M	actionpack/CHANGELOG
M	actionpack/actionpack.gemspec
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/action_dispatch/routing/mapper_test.rb
M	railties/guides/source/routing.textile

commit ff09d4b	refs/heads/master
Author: mhutchin 
Date:   2011-03-29 01:50:00 -0700

    Minor rephrasing to improve grammar and readability.

M	railties/guides/source/layout.html.erb

commit 9fdfe2e	refs/heads/master
Author: mhutchin 
Date:   2011-03-29 00:39:33 -0700

    Fixed typo and improved readability.

M	railties/guides/source/testing.textile

commit b671e4d	refs/heads/master
Author: John Firebaugh 
Date:   2011-03-28 22:31:05 -0700

    Fix formatting and broken markup

M	activemodel/lib/active_model/errors.rb

commit 07054fe	refs/heads/master
Author: John Firebaugh 
Date:   2011-03-28 22:17:20 -0700

    Fix grammar, formatting, and cross references

M	actionpack/lib/action_dispatch/testing/integration.rb

commit cc446d6	refs/heads/master
Author: Gabriel Horner 
Date:   2011-03-28 23:48:17 -0400

    Add docs for ActionController::Metal class methods

M	actionpack/lib/action_controller/metal.rb

commit 837f0ab	refs/heads/master
Merge: d5dc02b 54af8df
Author: ozzyaaron 
Date:   2011-03-29 11:23:20 +0800

    Merge branch 'master' of github.com:lifo/docrails

commit d5dc02b	refs/heads/master
Author: ozzyaaron 
Date:   2011-03-29 11:22:16 +0800

    Added back the Callback debugging section by interrogating the _*_callbacks method

M	activerecord/lib/active_record/callbacks.rb

commit 54af8df	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-28 22:49:43 -0300

    Fix Basic Authentication examples

M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/getting_started.textile

commit 70779a0	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-28 22:46:13 -0300

    Updated Basic Authentication guides to reflect new Base.http_basic_authenticate_with method

M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/getting_started.textile

commit 3d1e7c2	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-28 18:15:41 -0700

    Fix examples

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/http_authentication.rb

commit e2b07ee	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-28 18:09:50 -0700

    Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH]

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal/http_authentication.rb
M	actionpack/test/controller/http_basic_authentication_test.rb

commit aea1477	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-28 17:47:46 -0700

    make sure we have an active database connection before running each connection management test

M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/connection_management_test.rb

commit 25f9497	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-28 17:29:37 -0700

    adding active_connections? to the connection pool for finding open connections

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
A	activerecord/test/cases/connection_adapters/connection_handler_test.rb

commit 4211866	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-28 16:43:34 -0700

    adding active_connection? to the connection pool

M	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M	activerecord/test/cases/connection_pool_test.rb

commit ec0cacc	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-28 16:22:37 -0700

    testing app delegation from the ConnectionManagement middleware

M	activerecord/test/cases/connection_management_test.rb

commit 7b4866e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-28 16:08:42 -0700

    namespacing connection management tests. :heart:

M	activerecord/test/cases/connection_management_test.rb

commit e1a5007	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-28 15:27:37 -0700

    sql logger ignores schema statements

M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/log_subscriber.rb
M	activerecord/test/cases/log_subscriber_test.rb

commit 3b4e1a9	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-28 15:58:29 -0500

    Update sprockets path generation method

M	actionpack/lib/action_view/helpers/sprockets_helper.rb

commit f13fe8f	refs/tags/v3.0.6.rc1
Author: Aaron Patterson 
Date:   2011-03-28 13:32:09 -0700

    bumping version to 3.0.6.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 90e9f2c	refs/tags/v3.0.6.rc1
Author: Aaron Patterson 
Date:   2011-03-28 09:40:51 -0700

    updating AR changelog

M	activerecord/CHANGELOG

commit 9cb2645	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-28 15:19:34 -0500

    Add SprocketsHelper

M	actionpack/lib/action_view/helpers.rb
A	actionpack/lib/action_view/helpers/sprockets_helper.rb

commit 910a8d2	refs/heads/master
Merge: 7b9bdd9 62dd345
Author: Vijay Dev 
Date:   2011-03-29 00:41:11 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 235a414	refs/tags/v3.0.7.rc1
Author: Sebastian Martinez 
Date:   2011-03-28 11:26:27 -0300

    Un-deprecate #reorder method
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb

commit 41cc643	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-28 13:54:58 -0500

    Remove sprockets exception from main asset helpers

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

commit 8ceec5c	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-28 13:44:14 -0500

    Fix reference to config.use_sprockets

M	railties/lib/rails/engine.rb

commit 954d73d	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-28 13:22:13 -0500

    Add use_sprockets flag

M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/engine.rb
M	railties/lib/rails/engine/configuration.rb

commit 2dc297d	refs/tags/v3.0.7.rc1
Author: Prem Sichanugrist 
Date:   2011-03-29 01:16:46 +0800

    Do not show optional (.:format) block for wildcard route [#6605 state:resolved]
    
    This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default
    
    This commit is the second attempt on fixing the issue, as the regular expression on another commit on `master` was invalid.

M	actionpack/CHANGELOG
M	actionpack/actionpack.gemspec
M	actionpack/lib/action_dispatch/routing/mapper.rb
A	actionpack/test/dispatch/mapper_test.rb
M	railties/guides/source/routing.textile

commit 86acbf1	refs/tags/v3.0.7.rc1
Author: Jeremy Kemper 
Date:   2010-08-30 23:59:33 -0700

    Cheaper attribute reads and respond_to?. Add underscore-prefixed method aliased to the attribute name so it can be overridden but still called internally.

M	activerecord/lib/active_record/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb

commit 7197eb7	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-28 11:10:45 -0500

    Logger isn't set here

M	railties/lib/rails/engine.rb

commit 170680a	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-28 11:04:31 -0500

    Add route for assets

M	railties/lib/rails/application.rb
M	railties/lib/rails/engine.rb

commit fb21511	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-28 10:19:41 -0300

    Bring #reorder back
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb

commit 0a28073	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-28 15:09:29 +0800

    Engines that use isolate_namespace with nested modules should set correct module prefix for their routes.

M	railties/lib/rails/engine.rb
M	railties/test/railties/engine_test.rb

commit 62dd345	refs/heads/master
Author: mhutchin 
Date:   2011-03-27 23:50:51 -0700

    Minor typo correction.

M	railties/guides/source/configuring.textile

commit 6f0caa1	refs/heads/master
Merge: 726b7ed 245542e
Author: Gonçalo Silva 
Date:   2011-03-28 04:20:49 +0100

    Merge branch 'master' of https://github.com/rails/rails into performance_test

commit 726b7ed	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 04:19:39 +0100

    improved detection and feedback of supported/unsupported metrics

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/mri.rb
M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 09bd0ee	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 04:03:47 +0100

    fixed a couple of hidden bugs

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit c401ad9	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 03:11:42 +0100

    improved options handling in performance tests

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 983bd01	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 03:08:08 +0100

    we need test-unit on mri 1.9

M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit d6d059f	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 01:33:43 +0100

    added profiling and benchmarking capabilities to jruby (profiling is crippled because of a jruby bug)

M	activesupport/lib/active_support/testing/performance/jruby.rb

commit 245542e	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-27 19:12:28 -0300

    Added new #update_column method.
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit e6cb396	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 01:32:56 +0100

    benchmarking metrics are also implementation-specific

M	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit e17f608	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 01:32:32 +0100

    warn the user about unsupported benchmarking metrics he might have asked for

M	activesupport/lib/active_support/testing/performance.rb

commit e6a8a3a	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-28 01:42:30 +0200

    let these heredocs flow with the code

M	railties/lib/rails/generators/app_base.rb

commit ef988e1	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 00:33:36 +0100

    removed duplication in rubinius' benchmark code

M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit 15bff5a	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 00:33:07 +0100

    fix a bug where the GC wasn't being triggered at the start of the MRI benchmarks

M	activesupport/lib/active_support/testing/performance/ruby/mri.rb

commit 93a583e	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 00:32:21 +0100

    :min_percent only makes sense in a RubyProf context

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 1a9b1ed	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-28 00:32:00 +0100

    remove deprecated documentation

M	actionpack/lib/action_dispatch/testing/performance_test.rb

commit b023bcf	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-27 19:37:18 -0300

    Make edge and dev options use edge mysql2

M	railties/lib/rails/generators/app_base.rb

commit 0e1fed5	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-27 18:52:21 -0300

    Revert "Removed #update_attribute method. New #update_column method."
    
    This reverts commit 45c233ef819dc7b67e259dd73f24721fec28b8c8.
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit eea6a65	refs/heads/master
Merge: 884e39f 6194c6d
Author: Xavier Noria 
Date:   2011-03-27 23:50:39 +0200

    Merge branch 'master' of git://github.com/lifo/docrails

commit 6194c6d	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-27 23:49:11 +0200

    AR validations and callbacks guide: put update_attribute back

M	railties/guides/source/active_record_validations_callbacks.textile

commit 884e39f	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-03-28 04:31:19 +0800

    Fix documentation typo

M	railties/guides/source/configuring.textile

commit 7cbdfa8	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-03-28 03:05:14 +0800

    Add controller-specific `force_ssl` method to force web browser to use HTTPS protocol
    
    This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action.
    
    This featured was requested by DHH.

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller.rb
M	actionpack/lib/action_controller/base.rb
A	actionpack/lib/action_controller/metal/force_ssl.rb
A	actionpack/test/controller/force_ssl_test.rb
M	railties/guides/source/action_controller_overview.textile

commit 84aab7a	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-27 22:31:42 +0200

    s/with/when/

M	railties/test/application/middleware_test.rb

commit 2c0c4d7	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-03-27 23:55:46 +0700

    Add `config.force_ssl` configuration which will load `Rack::SSL` middleware if set to true
    
    This will allow user to be able to force all requests to be under HTTPS protocol.
    
    This commit was a request from DHH. Special thanks to Josh Peek as well for making `Rack::SSL`.

M	railties/CHANGELOG
M	railties/guides/source/configuring.textile
M	railties/guides/source/security.textile
M	railties/lib/rails/application.rb
M	railties/lib/rails/application/configuration.rb
M	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
M	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
M	railties/railties.gemspec
M	railties/test/application/middleware_test.rb

commit b2d9432	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-27 20:45:23 +0200

    fixes a couple of regexps, the suite showed warnings about them
    
    A couple of things worth mentioning here:
    
     - "{" is a metacharacter, should be escaped
       if it is meant to match a "{". The code
       worked, though, because the regexp engine
       is tolerant to this, but issued warnings.
    
     - gsub accepts a string as first argument.
       That's the best idiom to use when your
       pattern has no metacharacters, since gsub
       interprets the string as an exact substring
       to look for, rather than a regexp. The
       benefit is that your pattern is crystal
       clear and needs no backslashes.

M	actionpack/lib/action_view/template/resolver.rb

commit cc6fa2f	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-27 11:20:54 -0700

    Fix alias_method, add test

M	actionpack/lib/action_view/helpers/javascript_helper.rb
M	actionpack/test/template/javascript_helper_test.rb

commit 512057d	refs/heads/master
Merge: d89a796 a9d27c0
Author: Rolf Timmermans 
Date:   2011-03-27 17:18:32 +0200

    Merge remote-tracking branch 'upstream/master' into desc_tracker

commit 7b9bdd9	refs/heads/master
Merge: 2fc3263 738e906
Author: Vijay Dev 
Date:   2011-03-27 18:58:34 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit 738e906	refs/heads/master
Author: mhutchin 
Date:   2011-03-27 02:34:02 -0700

    A little minor rephrasing for improved readability.

M	railties/guides/source/testing.textile

commit 35129f5	refs/heads/master
Author: mhutchin 
Date:   2011-03-27 01:40:49 -0700

    Minor typo fix.

M	railties/guides/source/testing.textile

commit a9d27c0	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-26 17:16:24 -0700

    cleaning up typecast test a little

M	activerecord/test/cases/attribute_methods_test.rb

commit 004fc1c	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-26 17:16:24 -0700

    cleaning up typecast test a little

M	activerecord/test/cases/attribute_methods_test.rb

commit c9708ad	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-26 17:04:54 -0700

    refactoring tz to a variable rather than repeating it

M	activerecord/test/cases/attribute_methods_test.rb

commit 5013fe3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-26 17:04:54 -0700

    refactoring tz to a variable rather than repeating it

M	activerecord/test/cases/attribute_methods_test.rb

commit f8a05ad	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-26 14:44:36 -0700

    Allow FormHelper#form_for to specify the :method as a direct option instead of through the :html hash [DHH]

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit 84fe2b8	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-26 19:12:04 +0000

    added basic structure for jruby

M	activesupport/lib/active_support/testing/performance.rb
A	activesupport/lib/active_support/testing/performance/jruby.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit 2fc3263	refs/heads/master
Merge: 547407a 7c68072
Author: Vijay Dev 
Date:   2011-03-27 00:21:25 +0530

    Merge branch 'master' of github.com:lifo/docrails

commit dea3d2d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-26 11:47:20 -0700

    adding a test for attributes after type cast. thanks nragaz. :heart:

M	activerecord/test/cases/attribute_methods_test.rb

commit f28b08a	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-26 11:47:20 -0700

    adding a test for attributes after type cast. thanks nragaz. :heart:

M	activerecord/test/cases/attribute_methods_test.rb

commit 7643dfd	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-25 12:10:11 -0700

    fixing whitespace errors. :bomb:

M	activerecord/test/cases/attribute_methods_test.rb

commit cb3e96a	refs/heads/master
Author: David Heinemeier Hansson 
Date:   2011-03-26 10:28:39 -0700

    Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -- note this then supersedes the Object#j() method that the JSON gem adds within templates using the JavaScriptHelper [DHH]

M	actionpack/CHANGELOG
M	actionpack/lib/action_view/helpers/javascript_helper.rb

commit 3872cc4	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-26 03:10:00 +0000

    added support for profiling under rubinius

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 7c68072	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-26 12:13:39 -0300

    Updated guides for new #update_column.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 45c233e	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-26 11:42:26 -0300

    Removed #update_attribute method. New #update_column method.
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/dirty_test.rb
M	activerecord/test/cases/persistence_test.rb
M	activerecord/test/cases/timestamp_test.rb

commit 9d7ef79	refs/tags/v3.0.7.rc1
Author: Jesse Storimer 
Date:   2011-01-28 23:23:39 -0500

    Correct docs for after_find and after_initialize

M	activerecord/lib/active_record/callbacks.rb

commit 198f388	refs/heads/master
Author: Ryan Bigg 
Date:   2011-03-26 11:34:05 +1100

    Proc objects for cache_path for caches_action no longer need controller object, nor to use send when calling routing helpers

M	actionpack/lib/action_controller/caching/actions.rb

commit eb8beb3	refs/heads/master
Merge: 9d9b873 6ee5d92
Author: Xavier Noria 
Date:   2011-03-26 00:13:37 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit 6ee5d92	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-25 20:07:13 -0300

    impact recent updates to #first! and #last! methods

M	railties/guides/source/active_record_querying.textile

commit 9d9b873	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-26 00:02:40 +0100

    removes unnecessary selfs, and mentions that first! and last! take no arguments in their API docs

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 6383f67	refs/heads/master
Merge: 25be204 a094669
Author: Xavier Noria 
Date:   2011-03-25 23:47:57 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit a094669	refs/heads/master
Author: Sebastian Martinez 
Date:   2011-03-25 19:34:45 -0300

    Update AR querying guide with #first! and #last! new methods

M	railties/guides/source/active_record_querying.textile

commit 25be204	refs/heads/master
Author: Pratik Naik 
Date:   2011-03-25 22:30:36 +0000

    No arguments for first! and last!

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 65dce01	refs/heads/master
Author: Josh Susser 
Date:   2011-03-25 09:41:06 -0700

    comment typo fix

M	activerecord/lib/active_record/relation/finder_methods.rb

commit 278344b	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 19:03:59 +0000

    fixed time and size units (should be seconds / bytes), fixed typo when counting memory allocations under rubinius

M	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/mri.rb
M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 7333f50	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-25 12:10:11 -0700

    fixing whitespace errors. :bomb:

M	activerecord/test/cases/attribute_methods_test.rb

commit 417b2ba	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 18:01:39 +0000

    added gc info (runs, time) to rubinius' benchmarks

M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit c58e063	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 18:00:29 +0000

    added memory size and allocations to rubinius' benchmarks

M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit cf29d90	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 17:59:22 +0000

    added time (wall, process, cpu) to rubinius' benchmarks

M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit 9e9090f	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 17:27:26 +0000

    added missing require

M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit 4fe86a3	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 17:23:39 +0000

    removed leftovers from the copy-paste from mri

M	activesupport/lib/active_support/testing/performance/rubinius.rb

commit b0beba2	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 17:21:32 +0000

    rubinius returns "rbx" for RUBY_ENGINE, not "rubinius"

M	activesupport/lib/active_support/testing/performance.rb

commit 995d543	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 17:18:06 +0000

    added basic structure for Rubinius

M	activesupport/lib/active_support/testing/performance.rb
A	activesupport/lib/active_support/testing/performance/rubinius.rb
M	activesupport/lib/active_support/testing/performance/ruby.rb

commit 2fa426c	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 03:26:43 +0000

    divide the ruby interpreter into mri and yarv for improved modularity

M	activesupport/lib/active_support/testing/performance/ruby.rb
M	activesupport/lib/active_support/testing/performance/ruby/mri.rb
M	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 3ec79e4	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 02:59:11 +0000

    renamed "mri" to "ruby", for consistency with RUBY_ENGINE

M	activesupport/lib/active_support/testing/performance.rb
D	activesupport/lib/active_support/testing/performance/mri.rb
A	activesupport/lib/active_support/testing/performance/ruby.rb
A	activesupport/lib/active_support/testing/performance/ruby/mri.rb
A	activesupport/lib/active_support/testing/performance/ruby/yarv.rb

commit 18a81db	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 02:46:57 +0000

    check whether the user is using a supported ruby interpreter for benchmarking

M	activesupport/lib/active_support/testing/performance.rb

commit 1151608	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 02:39:43 +0000

    using number_helper to pretty print some results

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/mri.rb

commit e57d264	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 02:28:38 +0000

    extracted more generic methods, added a note for methods that need to be overridden by each implementation

M	activesupport/lib/active_support/testing/performance.rb
M	activesupport/lib/active_support/testing/performance/mri.rb

commit c50df63	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 01:49:21 +0000

    initial separation of RubyProf-specific code

M	activesupport/lib/active_support/testing/performance.rb
A	activesupport/lib/active_support/testing/performance/mri.rb

commit 6e99bb6	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-25 00:02:25 +0000

    ruby-prof only makes sense in an MRI context

M	activesupport/lib/active_support/testing/performance.rb

commit a6e2222	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-24 23:57:57 +0000

    move "check for ruby-prof" from AD/testing/performance_test to AS/testing/performance, where it is actually required

M	actionpack/lib/action_dispatch/testing/performance_test.rb
M	activesupport/lib/active_support/testing/performance.rb

commit 23be2c6	refs/heads/master
Author: Gonçalo Silva 
Date:   2011-03-24 23:38:17 +0000

    check if RubyProf's WALL_TIME and PROCESS_TIME are available before using them (similarly to other constants)

M	activesupport/lib/active_support/testing/performance.rb

commit c6b3b89	refs/tags/v3.0.7.rc1
Author: Josh Kalderimis 
Date:   2011-03-24 23:24:47 +0100

    correction to the outputted controller name in the diagnostics error template, test included
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit 5170d21	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-03-24 23:24:47 +0100

    correction to the outputted controller name in the diagnostics error template, test included
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
M	actionpack/test/dispatch/show_exceptions_test.rb

commit 28c73f0	refs/heads/master
Author: John Mileham 
Date:   2011-03-24 15:09:24 -0400

    Use Arel to build subquery.  Adapt tests to changed fixtures.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/relations_test.rb

commit b44a0ec	refs/heads/master
Merge: d5994ee 5214e73
Author: John Mileham 
Date:   2011-03-24 15:03:08 -0400

    Merge branch 'master' of github.com:rails/rails into count_behavior

commit 9887f23	refs/heads/master
Merge: aff8215 5214e73
Author: Gonçalo Silva 
Date:   2011-03-24 17:21:17 +0000

    Merge branch 'master' of https://github.com/rails/rails

commit 5214e73	refs/heads/master
Author: Josh Susser 
Date:   2011-03-23 21:52:53 -0700

    add #first! and #last! to models & relations

M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/test/cases/finder_test.rb

commit 9772de8	refs/heads/master
Author: Andrew White 
Date:   2011-03-23 23:09:00 +0000

    Fix filter :only and :except with implicit actions
    
    The method_name argument is "default_render" for implicit actions
    so use the action_name attribute to determine which callbacks to run.
    
    [#5673 state:resolved]

M	actionpack/lib/abstract_controller/callbacks.rb
M	actionpack/test/controller/filters_test.rb

commit 5da9a74	refs/heads/master
Author: Manfred Stienstra 
Date:   2011-02-25 12:34:46 +0100

    Add a failing test case for an implicit action with a before filter.
    
    Signed-off-by: Andrew White 

M	actionpack/test/controller/filters_test.rb
A	actionpack/test/fixtures/filter_test/implicit_actions/edit.html.erb
A	actionpack/test/fixtures/filter_test/implicit_actions/show.html.erb

commit 35de70f	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-23 23:29:54 +0000

    Fix filter :only and :except with implicit actions
    
    The method_name argument is "default_render" for implicit actions
    so use the action_name attribute to determine which callbacks to run.
    
    [#5673 state:resolved]

M	actionpack/lib/abstract_controller/callbacks.rb
M	actionpack/test/controller/filters_test.rb
A	actionpack/test/fixtures/filter_test/implicit_actions/edit.html.erb
A	actionpack/test/fixtures/filter_test/implicit_actions/show.html.erb

commit 0823bbd	refs/tags/v3.0.7.rc1
Author: Adam Meehan 
Date:   2011-03-01 22:18:46 +1100

    Fix before_type_cast for timezone aware attributes by caching converted value on write. Also remove read method reload arg on timezone attributes.

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit c5908a8	refs/heads/master
Author: Adam Meehan 
Date:   2011-03-01 22:18:46 +1100

    Fix before_type_cast for timezone aware attributes by caching converted value on write. Also remove read method reload arg on timezone attributes.

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 54c963c	refs/heads/master
Author: Murray Steele 
Date:   2011-03-11 12:02:49 +0000

    Make clearing of HABTM join table contents happen in an after_destory callback.
    
    The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded.  Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed.  Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too.

M	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb

commit 8ee81d2	refs/heads/master
Author: Murray Steele 
Date:   2011-03-11 11:41:30 +0000

    Failing test case to show that habtm join table contents are removed when a model is destroyed but the destruction is blocked by a before_destroy.

M	activerecord/test/cases/habtm_destroy_order_test.rb

commit 5d43977	refs/tags/v3.0.7.rc1
Author: Murray Steele 
Date:   2011-03-11 12:02:49 +0000

    Make clearing of HABTM join table contents happen in an after_destory callback.
    
    The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded.  Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed.  Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too.

M	activerecord/lib/active_record/associations.rb

commit 2f30cdc	refs/tags/v3.0.7.rc1
Author: Murray Steele 
Date:   2011-03-11 11:41:30 +0000

    Failing test case to show that habtm join table contents are removed when a model is destroyed but the destruction is blocked by a before_destroy.

M	activerecord/test/cases/habtm_destroy_order_test.rb

commit 3b91b37	refs/heads/master
Merge: 3a7c7dc ee8ca49
Author: Xavier Noria 
Date:   2011-03-23 21:52:33 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit 3a7c7dc	refs/heads/master
Author: Aditya Sanghi 
Date:   2011-03-23 18:06:22 +0100

    Fix test for prepend giving a false positive. [#5716 state:resolved]
    
    Signed-off-by: José Valim 

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
M	railties/test/generators/shared_generator_tests.rb

commit a1edbf7	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-09 21:45:45 -0300

    parse dates to yaml in json arrays
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/json/backends/yaml.rb
M	activesupport/test/json/decoding_test.rb

commit 7004434	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-09 20:27:29 -0300

    test json decoding with time parsing disabled with all backends and respect ActiveSupport.parse_json_times when converting to yaml
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/json/backends/yaml.rb
M	activesupport/test/json/decoding_test.rb

commit 63dca41	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-22 20:11:36 -0300

    use class_eval with a string when it's possible

M	activemodel/lib/active_model/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb

commit 1b7b724	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-21 21:36:05 -0300

    Allow to read and write AR attributes with non valid identifiers

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit 7717fc3	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-18 13:35:57 -0300

    Do not in place modify what table_name returns

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb
M	activerecord/lib/active_record/base.rb

commit 450f7cf	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-22 20:11:36 -0300

    use class_eval with a string when it's possible

M	activemodel/lib/active_model/attribute_methods.rb
M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb

commit baa237c	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-21 21:36:05 -0300

    Allow to read and write AR attributes with non valid identifiers

M	activerecord/lib/active_record/attribute_methods/read.rb
M	activerecord/lib/active_record/attribute_methods/write.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/schema/schema.rb

commit da6c7bd	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-18 13:35:57 -0300

    Do not in place modify what table_name returns

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb
M	activerecord/lib/active_record/base.rb

commit ee8ca49	refs/heads/master
Author: Dr Nic Williams 
Date:   2011-03-22 15:11:12 -0700

    Update 'Getting Started on Windows' tip to go to one-click Rails Installer

M	railties/guides/source/getting_started.textile

commit ce52c6f	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-22 16:36:21 -0500

    Change static root to /public

M	railties/lib/rails/application.rb

commit 137ff04	refs/heads/master
Author: Ryan Bigg 
Date:   2011-03-23 08:33:06 +1100

    Caching guide: Capitalize 'Note' so that it's rendered as a proper note

M	railties/guides/source/caching_with_rails.textile

commit 8c26d0d	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-22 16:24:01 -0500

    Use sprockets precompile

M	railties/lib/rails/tasks/assets.rake

commit 989103a	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-22 16:15:05 -0500

    Move app/javascripts and app/stylesheets under app/assets

M	railties/lib/rails/application.rb

commit 628c31b	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-22 15:43:40 -0500

    Add sprockets md5s to asset tags

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

commit 6aff1d0	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-22 14:40:18 -0500

    Remove ensure_fresh_assets flag

M	railties/lib/rails/application.rb

commit e06c448	refs/heads/master
Author: Piotr Sarnacki 
Date:   2011-03-22 19:35:37 +0100

    Install rb-fsevent gem if ENV[RB_FSEVENT] is set

M	Gemfile

commit ed97c39	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-22 10:10:33 -0700

    adding missing require

M	activerecord/test/cases/associations/join_model_test.rb

commit 2ef6270	refs/heads/master
Merge: 6ab65be 2ddfdba
Author: Aaron Patterson 
Date:   2011-03-22 09:34:33 -0700

    Merge branch 'master' into fuuu
    
    * master:
      Do not show optional (.:format) block for wildcard route [#6605 state:resolved]
      pushing id insertion and prefetch primary keys down to Relation#insert
      use prepared statements to fetch the last insert id
      escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved]
      schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved]
      Reapply extensions when using except and only
      SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test
      Improved resolver docs a bit
      [action_view] docs for FileSystemResolver
      [action_view] added custom patterns to template resolver

commit 2ddfdba	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-03-22 22:19:31 +0700

    Do not show optional (.:format) block for wildcard route [#6605 state:resolved]
    
    This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/action_dispatch/routing/mapper_test.rb

commit 15d3cc2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-22 09:18:01 -0700

    pushing id insertion and prefetch primary keys down to Relation#insert

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M	activerecord/lib/active_record/persistence.rb
M	activerecord/lib/active_record/relation.rb

commit cef10d8	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-22 11:15:24 -0500

    Assign sprockets static root

M	railties/lib/rails/application.rb

commit 5a44951	refs/heads/master
Author: Ryan Bigg 
Date:   2011-03-22 12:16:15 +1100

    Querying guide: mention that performing a where on an relation that contains an includes statement will generate a LEFT OUTER JOIN rather than an INNER JOIN or another query

M	railties/guides/source/active_record_querying.textile

commit c24e554	refs/heads/master
Author: Ryan Bigg 
Date:   2011-03-22 12:16:13 +1100

    Querying guide: mention that performing a where on an relation that contains an includes statement will generate a LEFT OUTER JOIN rather than an INNER JOIN or another query

M	railties/guides/source/active_record_querying.textile

commit 3378d77	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-21 16:32:13 -0700

    use prepared statements to fetch the last insert id

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit 10c7e61	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-21 18:09:23 -0500

    Need to load assets task file

M	railties/lib/rails/tasks.rb

commit 77ad4ca	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-21 18:05:56 -0500

    Add sprockets task to compile assets

M	railties/lib/rails/application/configuration.rb
A	railties/lib/rails/tasks/assets.rake

commit 3e7985c	refs/heads/master
Author: Joshua Peek 
Date:   2011-03-21 17:58:28 -0500

    Add sprockets environment to Application

M	railties/lib/rails/application.rb

commit 88636f7	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-21 14:48:43 -0700

    escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved]

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/adapters/sqlite/sqlite_adapter_test.rb

commit 7222786	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-21 14:48:43 -0700

    escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved]

M	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M	activerecord/test/cases/adapters/sqlite/sqlite_adapter_test.rb

commit 66c8c6c	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-21 11:39:24 -0700

    oops, forgot to commit this test!

A	activerecord/test/cases/adapters/mysql/schema_test.rb

commit ea8fcfb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-21 11:19:14 -0700

    schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved]

M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
A	activerecord/test/cases/adapters/mysql/schema_test.rb

commit eb1eac9	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-21 11:19:14 -0700

    schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved]

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

commit e508d9e	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-03-21 10:31:21 -0700

    updating ar changelog

M	activerecord/CHANGELOG

commit 96b9fc4	refs/heads/master
Author: Iain Hecker 
Date:   2011-03-19 21:53:49 +0100

    Reapply extensions when using except and only

M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relations_test.rb

commit b8ff5f0	refs/tags/v3.0.7.rc1
Author: Iain Hecker 
Date:   2011-03-19 21:53:49 +0100

    Reapply extensions when using except and only

M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 55bf087	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-21 10:00:30 -0700

    SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test

M	actionpack/test/template/render_test.rb

commit 6c309f0	refs/heads/master
Author: Gabriel Horner 
Date:   2011-03-19 19:53:36 -0400

    Beef up Rails::Railtie::Configuration docs

M	railties/lib/rails/railtie/configuration.rb

commit 1413c9b	refs/heads/master
Author: José Valim 
Date:   2011-03-19 16:06:50 -0700

    Improved resolver docs a bit

M	actionpack/lib/action_view/template/resolver.rb

commit d76fadb	refs/heads/master
Author: Chris Kowalik 
Date:   2011-03-20 06:21:11 +0800

    [action_view] docs for FileSystemResolver

M	actionpack/lib/action_view/template/resolver.rb

commit de1fe5e	refs/heads/master
Author: Chris Kowalik 
Date:   2011-03-19 12:13:59 +0800

    [action_view] added custom patterns to template resolver

M	actionpack/lib/action_view/template/resolver.rb
M	actionpack/lib/action_view/testing/resolvers.rb
A	actionpack/test/fixtures/custom_pattern/another.html.erb
A	actionpack/test/fixtures/custom_pattern/html/another.erb
A	actionpack/test/fixtures/custom_pattern/html/path.erb
A	actionpack/test/template/resolver_patterns_test.rb

commit 6ab65be	refs/heads/master
Merge: 5b84aeb 445241d
Author: Jon Leighton 
Date:   2011-03-18 23:15:01 +0000

    Merge branch 'master' into nested_has_many_through

commit 5b84aeb	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-18 23:14:45 +0000

    Add order clauses to fix some tests which were failing under 1.8 on oracle and postgres

M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/relations_test.rb

commit f366604	refs/heads/master
Author: Paco Guzman 
Date:   2011-03-18 11:29:52 +0100

    remove bank line

M	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

commit 5ec7806	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-17 23:21:30 -0300

    Update CHANGELOG entry

M	activemodel/CHANGELOG

commit 691530a	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-17 23:03:05 -0300

    Sync attribute_methods.rb with master code, tests added
    
    [#6580 state:committed]

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 445241d	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-17 23:17:20 -0300

    define_attr_method should be able to define methods that returns nil

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 4532b39	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-17 10:31:12 -0700

    remove misleading comment

M	activemodel/lib/active_model/attribute_methods.rb

commit 00f0879	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-17 10:26:11 -0700

    dup strings on return so that in place modifications do not break anything.  I am looking at you "compute_table_name"

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit 665065c	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-16 21:38:49 -0300

    Add AMo CHANGELOG entry

M	activemodel/CHANGELOG

commit c75e4ae	refs/tags/v3.0.7.rc1
Author: Robert Pankowecki 
Date:   2010-10-24 17:44:17 +0800

    Fix when database column name has some symbolic characters. [#5818 state:resolved]

M	activemodel/lib/active_model/attribute_methods.rb

commit c834a75	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-16 21:19:35 -0300

    define_attr_method correctly defines methods with invalid identifiers

M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb

commit fda45f4	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-16 21:08:02 -0300

    Add a define_attr_method test

M	activemodel/test/cases/attribute_methods_test.rb

commit 5232077	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-16 19:31:57 -0300

    Add test for define_attr_method using as name an invalid identifier

M	activemodel/test/cases/attribute_methods_test.rb

commit cb44e99	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-16 19:17:47 -0300

    Add test for define_attribute_method using as name an invalid identifier

M	activemodel/test/cases/attribute_methods_test.rb

commit 8aaf3c1	refs/heads/master
Merge: 9abc94c 0eae625
Author: Jon Leighton 
Date:   2011-03-16 18:54:51 +0000

    Merge branch 'master' into nested_has_many_through

commit 9abc94c	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-16 18:54:34 +0000

    oracle, y u defy me

M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/author.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/tagging.rb

commit cb2c5c5	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-16 15:21:00 -0300

    Add number_to_human CHANGELOG entry

M	actionpack/CHANGELOG

commit 7c8a5f5	refs/tags/v3.0.7.rc1
Author: Josh Kalderimis 
Date:   2011-03-16 19:03:25 +0100

    fixes an issue with number_to_human when converting values which are less than 1 but greater than -1 [#6576 state:resolved]
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit 0eae625	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-03-16 19:03:25 +0100

    fixes an issue with number_to_human when converting values which are less than 1 but greater than -1 [#6576 state:resolved]
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/test/template/number_helper_test.rb

commit 547407a	refs/heads/master
Author: Vijay Dev 
Date:   2011-03-16 23:16:15 +0530

    remove to from to to :)

M	railties/guides/source/2_3_release_notes.textile

commit 1cbade3	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-12 21:10:19 -0200

    Refactor length validation

M	activemodel/lib/active_model/validations/length.rb
M	activemodel/test/cases/validations/length_validation_test.rb

commit 3edba71	refs/heads/master
Author: Nicolas Cavigneaux 
Date:   2011-03-16 13:04:39 +0100

    Add link to mailing-list

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit e8458d3	refs/heads/master
Author: Andrew White 
Date:   2011-03-16 10:28:40 +0000

    Fix typo in assertion message

M	activemodel/lib/active_model/lint.rb

commit 64fe0d4	refs/heads/master
Author: Manuel Meurer 
Date:   2011-03-16 11:01:43 +0700

    Remove incorrect comment that a default value of NULL cannot be set with change_column_default.

M	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

commit 7bd70dc	refs/heads/master
Author: Norman Clarke 
Date:   2011-03-15 10:06:53 -0300

    Add messages to plain assertions.
    
    Signed-off-by: Santiago Pastorino 

M	activemodel/lib/active_model/lint.rb

commit 61781d8	refs/heads/master
Author: Gabriel Horner 
Date:   2011-03-15 09:23:17 -0400

    doc :anchor option for #match in routes

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 9f2706d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-14 18:26:30 -0700

    use a list to represent the supported verbs for a route object

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route.rb

commit 9ba2d42	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-14 16:17:05 -0700

    stop splatting arguments so that we can understand wtf is going on

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 833a905	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-14 15:15:40 -0700

    RegexpWithNamedGroups is only used for path_info, so only apply to path info

M	actionpack/lib/action_dispatch/routing/route.rb

commit 21b12d8	refs/heads/master
Merge: dfa9e28 a0826cc
Author: Xavier Noria 
Date:   2011-03-14 22:09:52 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit a0826cc	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-14 22:06:27 +0100

    be be -> be

M	railties/guides/source/testing.textile

commit de5e41f	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-14 21:59:58 +0100

    move the tips about :allow_(nil|blank) near their explanations, also no need to say these are options for all validators if they are not

M	railties/guides/source/active_record_validations_callbacks.textile

commit 377bd69	refs/heads/master
Author: Chris Kalafarski 
Date:   2011-03-13 20:22:32 -0400

    Removed some redundant Time#change time options from beginning_of_ methods in Date and Time

M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb

commit dfa9e28	refs/heads/master
Author: Jack Dempsey 
Date:   2011-03-13 08:59:20 +0800

    silence @dummy_path not defined warnings

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit 88d8ca2	refs/heads/master
Author: Jack Dempsey 
Date:   2011-03-13 08:01:12 +0800

    use parens and silence ambiguous args warnings

M	railties/test/generators/plugin_new_generator_test.rb
M	railties/test/generators/shared_generator_tests.rb

commit d89a796	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-13 17:08:33 +0100

    Revert "Revert "It should be possible to use ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free.""
    
    This reverts commit 9f5b1e1ed08df9dbedded0a6b7798d919d43b9a6.
    
    Tests have been refactored so they pass in isolation.

M	activesupport/lib/active_support/descendants_tracker.rb

commit 76e4e2f	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-13 16:52:34 +0100

    Refactored AS::DescendantsTracker test cases so they can be tested without AS::Dependencies.

D	activesupport/test/descendants_tracker_test.rb
A	activesupport/test/descendants_tracker_test_cases.rb
A	activesupport/test/descendants_tracker_with_autoloading_test.rb
A	activesupport/test/descendants_tracker_without_autoloading_test.rb

commit 56a0cba	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-13 16:21:18 +0100

    Missing dependency in MultiByte test.

M	activesupport/test/multibyte_chars_test.rb

commit e75774e	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-13 16:22:55 +0100

    Add missing dependency string inflection test.

M	activesupport/test/core_ext/string_ext_test.rb

commit 3631343	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-13 16:24:18 +0100

    Missing dependency for duration test.

M	activesupport/test/core_ext/duration_test.rb

commit 9b64399	refs/heads/master
Author: Anders Elfving 
Date:   2011-03-13 11:49:56 +0100

    Adjust unique constraint comment to include info about the RecordNotUnique exception

M	activerecord/lib/active_record/validations/uniqueness.rb

commit c2b474a	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-13 08:51:24 +0000

    Remove invalid test
    
    The test fails on PostgreSQL when trying to load the records as
    the comments_count field is not included in the GROUP BY clause.

M	activerecord/test/cases/relations_test.rb

commit 47871b0	refs/heads/master
Author: Andrew White 
Date:   2011-03-13 08:37:16 +0000

    Remove invalid test
    
    The test fails on PostgreSQL when trying to load the records as
    the comments_count field is not included in the GROUP BY clause.

M	activerecord/test/cases/relations_test.rb

commit deae670	refs/heads/master
Author: Manuel Meurer 
Date:   2011-03-13 15:14:51 +0700

    Change ActionView::ViewPathSet to ActionView::PathSet

M	actionpack/lib/abstract_controller/view_paths.rb

commit c540b35	refs/heads/master
Author: Lars Smit 
Date:   2011-03-13 09:07:23 +0100

    Removed double texts

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 9f5b1e1	refs/heads/master
Author: José Valim 
Date:   2011-03-13 08:35:50 +0100

    Revert "It should be possible to use ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free."
    
    This reverts commit 46f6a2e3889bae420589f429b09722a37dbdf18d.
    
    Caused failures on CI. rake test:isolated on activesupport directory show them.

M	activesupport/lib/active_support/descendants_tracker.rb

commit 0d1ca43	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-12 21:17:58 -0200

    Add CHANGELOG entry 'Fix length validation for fixnums'

M	activemodel/CHANGELOG

commit 01cb81a	refs/tags/v3.0.7.rc1
Author: Andriy Tyurnikov 
Date:   2011-03-10 19:50:55 +0200

    length validation for fixnums
    
    Signed-off-by: Santiago Pastorino 

M	activemodel/lib/active_model/validations/length.rb
M	activemodel/test/cases/validations/length_validation_test.rb

commit 157c37f	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-12 21:10:19 -0200

    Refactor length validation

M	activemodel/lib/active_model/validations/length.rb
M	activemodel/test/cases/validations/length_validation_test.rb

commit f48d3d4	refs/heads/master
Author: Andriy Tyurnikov 
Date:   2011-03-10 19:50:55 +0200

    length validation for fixnums
    
    Signed-off-by: Santiago Pastorino 

M	activemodel/lib/active_model/validations/length.rb
M	activemodel/test/cases/validations/length_validation_test.rb

commit 3a22e74	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-12 22:38:36 +0000

    Fixed a bug when empty? was called on a grouped Relation that wasn't loaded
    
    [#5829 state:resolved]

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 0151925	refs/heads/master
Author: Chris Oliver 
Date:   2011-03-11 16:13:44 -0600

    Fixed a bug when empty? was called on a grouped Relation that wasn't loaded
    
    [#5829 state:resolved]
    
    Signed-off-by: Andrew White 

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 1a3fe8c	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-12 23:05:52 +0800

    Prevent callbacks in child classes from being executed more than once.

M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callback_inheritance_test.rb

commit 46f6a2e	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-12 23:49:25 +0800

    It should be possible to use ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free.

M	activesupport/lib/active_support/descendants_tracker.rb

commit 4a26cd0	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-12 14:05:46 -0200

    require 'thread' in order to use Mutex

M	activesupport/lib/active_support/buffered_logger.rb

commit 58de03f	refs/heads/master
Author: Mike Gehard 
Date:   2011-02-09 06:32:40 -0700

    Add additional text to NotImplementedErrors [#6328 state:resolved]
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/template/resolver.rb
M	activemodel/lib/active_model/validator.rb
M	activerecord/lib/active_record/associations/singular_association.rb

commit 30dd123	refs/tags/v3.0.7.rc1
Author: Rolf Timmermans 
Date:   2011-03-12 14:24:36 +0100

    adds a couple of missing AS dependencies

M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/core_ext/module/deprecation.rb

commit 63c8ea9	refs/heads/master
Author: Rolf Timmermans 
Date:   2011-03-12 14:24:36 +0100

    adds a couple of missing AS dependencies

M	activesupport/lib/active_support/callbacks.rb
M	activesupport/lib/active_support/core_ext/module/deprecation.rb

commit 37d93ea	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-12 09:32:20 +0000

    Fix tests under postgres - we should always put conditions in the WHERE part not in ON constraints because postgres requires that the table has been joined before the condition references it.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/associations/join_helper.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb

commit 17ea204	refs/heads/master
Merge: 02a43f9 acd4bfb
Author: Jon Leighton 
Date:   2011-03-12 08:44:03 +0000

    Merge branch 'master' into nested_has_many_through

commit 02a43f9	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-12 08:42:57 +0000

    Resolve some TODO comments which I decided did not need anything done

M	activerecord/lib/active_record/associations/alias_tracker.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/relation/query_methods.rb

commit acd4bfb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-11 18:16:47 -0800

    Just define methods directly on the class rather than use the module
    indirection.
    
    clever--

M	actionpack/lib/action_dispatch/routing/mapper.rb

commit 89c5b9a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-11 18:06:10 -0800

    do not automatically add format to routes that end in a slash

M	actionpack/lib/action_dispatch/routing/mapper.rb
A	actionpack/test/action_dispatch/routing/mapper_test.rb

commit 72759f5	refs/tags/v3.1.0.beta1
Author: Pan Thomakos 
Date:   2011-03-11 17:57:28 -0800

    Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.

M	activesupport/lib/active_support/cache/mem_cache_store.rb
M	activesupport/test/caching_test.rb

commit 0a51e43	refs/heads/master
Author: Paco Guzman 
Date:   2011-03-11 23:08:55 +0100

    remove some blanks

M	activerecord/lib/active_record/locking/optimistic.rb
M	activerecord/lib/active_record/locking/pessimistic.rb

commit 53794cf	refs/heads/master
Author: José Valim 
Date:   2011-03-11 13:29:39 -0800

    Add missing require 'thread' to BufferedLogger.

M	activesupport/lib/active_support/buffered_logger.rb

commit 94031ef	refs/heads/master
Author: Samuel Kadolph 
Date:   2011-03-12 03:22:19 +0800

    Add require 'date' to use Date.today in plugin template MIT-LICENSE

M	railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

commit 39a6f4f	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-11 00:51:57 +0000

    Simplify implementation of ThroughReflection#chain

M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit e18679a	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-11 00:47:18 +0000

    Abstract some common code from AssociationScope and JoinDependency::JoinAssociation into a JoinHelper module

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
A	activerecord/lib/active_record/associations/join_helper.rb

commit aef3629	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-10 23:55:29 +0000

    Refactor JoinAssociation

M	activerecord/lib/active_record/associations/join_dependency/join_association.rb

commit c1f2d9b	refs/tags/v3.0.7.rc1
Author: Xavier Noria 
Date:   2011-03-11 00:38:32 +0100

    remove item in CHANGELOG that leaked in a merge

M	actionpack/CHANGELOG

commit 434e451	refs/tags/v3.0.7.rc1
Author: Prem Sichanugrist & Xavier Noria 
Date:   2011-01-01 23:51:05 +0700

    Filter sensitive query string parameters in the log [#6244 state:committed]
    
    This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens.
    
    Signed-off-by: Xavier Noria 

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/http/filter_parameters.rb
M	actionpack/test/dispatch/request_test.rb
M	railties/lib/rails/rack/logger.rb

commit 68802d0	refs/heads/master
Author: Prem Sichanugrist & Xavier Noria 
Date:   2011-01-01 23:51:05 +0700

    Filter sensitive query string parameters in the log [#6244 state:committed]
    
    This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens.
    
    Signed-off-by: Xavier Noria 

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/http/filter_parameters.rb
M	actionpack/test/dispatch/request_test.rb
M	railties/lib/rails/rack/logger.rb

commit 582edaa	refs/heads/master
Merge: 2d3d9e3 51a269b
Author: Jon Leighton 
Date:   2011-03-10 19:35:20 +0000

    Merge branch 'master' into nested_has_many_through

commit 2d3d9e3	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-10 19:28:26 +0000

    Rename Reflection#through_reflection_chain and #through_options to Reflection#chain and Reflection#options as they now no longer relate solely to through associations.

M	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit 6490d65	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-10 19:04:00 +0000

    Move the code which builds a scope for through associations into a generic AssociationScope class which is capable of building a scope for any association.

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association.rb
A	activerecord/lib/active_record/associations/association_scope.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/reflection.rb

commit ee7c486	refs/heads/master
Author: Mike Gehard 
Date:   2011-03-10 10:08:30 -0500

    Minor formatting changes and remove a comment

M	railties/guides/source/plugins.textile

commit 439ccdc	refs/heads/master
Author: Vijay Dev 
Date:   2011-03-10 19:58:55 +0530

    update plugin urls to reflect official maintainers

M	railties/guides/source/3_0_release_notes.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/debugging_rails_applications.textile
M	railties/guides/source/form_helpers.textile

commit 6fba542	refs/heads/master
Author: David Aaron Fendley 
Date:   2011-03-09 18:06:50 -0600

    Added note re: functional tests and HTTP methods.

M	railties/guides/source/testing.textile

commit 51a269b	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-09 20:17:30 -0200

    Fix typo

M	actionmailer/lib/action_mailer/mail_helper.rb

commit 8e73e58	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-09 16:06:48 -0300

    publicise ActionMailer::MailHelper.format_paragraph
    
    [#6550 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	actionmailer/lib/action_mailer/mail_helper.rb
M	actionmailer/test/mail_helper_test.rb

commit f65023c	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-09 14:56:44 -0300

    expose ActionMailer::MailHelper in the RDoc

M	Rakefile

commit ebe4fa5	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-09 18:51:15 +0100

    move the conditional definition of Float#round down
    
    Rails 3 cherry-picks as little as possible from Active Support. In particular
    the framework requires the files where extensions are exactly defined, rather
    than convenience entry points like float.rb and friends. Because of that, it
    is better to define conditionally rather than require conditionally.

M	activesupport/lib/active_support/core_ext/float.rb
M	activesupport/lib/active_support/core_ext/float/rounding.rb

commit 32b5c4b	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-09 18:43:55 +0100

    copy-edits 532b770

M	railties/guides/source/active_support_core_extensions.textile

commit 532b770	refs/heads/master
Author: Andrei Kulakov 
Date:   2011-03-10 01:22:56 +0800

    Use Rubys own Float#round method in versions 1.9 and above

M	activesupport/lib/active_support/core_ext/float.rb
M	railties/guides/source/active_support_core_extensions.textile

commit 8dab7e5	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-09 14:19:06 +0000

    Filter params that return nil for to_param

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_view/helpers/prototype_helper.rb
M	actionpack/test/controller/url_for_test.rb

commit 03cbd96	refs/heads/master
Author: Andrew White 
Date:   2011-03-09 14:44:25 +0000

    Filter params that return nil for to_param and allow through false values

M	actionpack/CHANGELOG
M	actionpack/lib/action_dispatch/http/url.rb
M	actionpack/lib/action_view/helpers/prototype_helper.rb
M	actionpack/test/controller/url_for_test.rb

commit e05e997	refs/heads/master
Author: Jeff Kreeftmeijer 
Date:   2011-03-09 10:58:18 +0100

    Add a note to discourage users from using presence validators with allow_(nil|blank)

M	railties/guides/source/active_record_validations_callbacks.textile

commit f41dd99	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-09 07:42:35 +0100

    revises links to the API websites of individual components (no longer maintained), and rewrites the section about after and around filters in the controller guide

M	activerecord/test/fixtures/tasks.yml
M	railties/guides/source/action_controller_overview.textile
M	railties/guides/source/action_view_overview.textile
M	railties/lib/rails/generators/test_unit/model/templates/fixtures.yml

commit c7cfdd0	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-05 01:57:25 -0300

    refactored Engine.#find by giving an explicit name to a variable and reducing calls
    
    [#6529 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/engine.rb

commit 0c777ba	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-08 16:18:27 -0800

    stop being clever and just call methods on the Route object

M	actionpack/lib/action_dispatch/routing/route.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb

commit f975626	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-08 14:09:44 -0800

    test/unit in ruby trunk adds a new instance variable. YAY!

M	actionpack/lib/action_view/test_case.rb

commit fb34f85	refs/heads/master
Author: Mat Brown 
Date:   2011-03-09 04:40:03 +0800

    Rename conflicting ActionMailer::MailHelper#simple_format method
    
    This was conflicting with ActionView::Helpers::TextHelper#simple_format
    from within email templates.

M	actionmailer/lib/action_mailer/mail_helper.rb

commit 0925380	refs/heads/master
Author: Chris Kalafarski 
Date:   2011-03-08 09:55:57 -0500

    The root route example was the only using double quotes; switched it to single quotes for consistency

M	railties/lib/rails/generators/rails/app/templates/config/routes.rb

commit 9798ee2	refs/heads/master
Author: Aaron Pfeifer 
Date:   2011-03-07 21:29:38 +0800

    Add better test scenario for around callback return results

M	activesupport/test/callbacks_test.rb

commit df615f1	refs/heads/master
Author: Aaron Pfeifer 
Date:   2011-03-07 21:07:46 +0800

    Allow access to a callback event's return result from around callbacks

M	activesupport/lib/active_support/callbacks.rb
M	activesupport/test/callbacks_test.rb

commit 1408b94	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-07 15:44:39 -0800

    removing stubs. 1.9.3 implements Date.today in C so mocking the return value of Time.now does nothing

M	activesupport/test/core_ext/date_ext_test.rb

commit 33f222b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-07 14:01:37 -0800

    fixing some tests on ruby 1.9.3

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb

commit a0d7247	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-07 22:20:24 +0100

    reorganizes the RDoc of Hash#to_param

M	activesupport/lib/active_support/core_ext/object/to_param.rb

commit 89ecc0a	refs/heads/master
Merge: 5968d7a f99db5a
Author: Xavier Noria 
Date:   2011-03-07 22:11:47 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit 67b17d0	refs/heads/master
Merge: bb063b2 5968d7a
Author: Jon Leighton 
Date:   2011-03-07 20:58:54 +0000

    Merge branch 'master' into nested_has_many_through

commit bb063b2	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-07 20:58:32 +0000

    Fix test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/reflection.rb

commit f99db5a	refs/heads/master
Author: Vijay Dev 
Date:   2011-03-07 23:56:16 +0530

    formatting changes

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validator.rb

commit 5968d7a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-07 09:36:07 -0800

    do not test explicit equality of predicate methods, they should be allowed to return truthy or falsey objects

M	activesupport/lib/active_support/cache.rb
M	activesupport/test/caching_test.rb

commit a032212	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-07 09:33:19 -0800

    refactor calls to to_param in expand_key method

M	activesupport/lib/active_support/cache.rb

commit 532f915	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-07 00:04:06 +0000

    Referencing a table via the ON condition in a join should force that table to be eager-loaded via a JOIN rather than via subsequent queries.

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 9cee693	refs/heads/master
Merge: 09d3e89 2159e9e
Author: Aaron Patterson 
Date:   2011-03-07 08:50:50 -0800

    Merge branch 'master' of github.com:rails/rails
    
    * 'master' of github.com:rails/rails: (44 commits)
      Fixed indentation in actionmailer base_test [#6538 state:committed]
      remove unused assigned variable
      removes merge conflicts
      removes Examples headers introduced in 9b96de6
      Revert "Fixed identation in actionmailer base_test"
      Report the correct value of nil.id in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id.
      Improve testing of cookies in functional tests: - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear
      more style changes
      Some style changes
      style changes
      Revert "style changes"
      Raise ArgumentError if route name is invalid [#6517 state:resolved]
      style changes
      Allow model to be inherited from Hash [#6487 state:resolved]
      styles applied for usage
      added failing test for fields_for with a record object that inherits from Hash
      Fixed identation in actionmailer base_test
      wrong SQL statement
      commas to set off expressions that interrupt sentence flow
      typo changes
      ...

commit cee3f9b	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-07 00:04:06 +0000

    Referencing a table via the ON condition in a join should force that table to be eager-loaded via a JOIN rather than via subsequent queries.

M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/relations_test.rb

commit 2159e9e	refs/heads/master
Merge: c528297 7e9d45c
Author: Xavier Noria 
Date:   2011-03-07 00:44:57 +0100

    Merge branch 'active_model_unused_variable' of https://github.com/pacoguzman/rails into pacoguzman-active_model_unused_variable

commit 5dc1fb3	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-06 23:38:10 +0000

    Refactor ThroughAssociation#join_to to be much smaller, and independent of construct_owner_conditions.

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/reflection.rb

commit c528297	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-06 20:03:06 +0100

    Fixed indentation in actionmailer base_test [#6538 state:committed]
    
    Signed-off-by: Xavier Noria 

M	actionmailer/test/base_test.rb

commit 55d2a21	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-06 23:54:18 +0100

    Improved docs for Hash#to_param method

M	activesupport/lib/active_support/core_ext/object/to_param.rb

commit 8e0affb	refs/heads/master
Author: Paco Guzman 
Date:   2011-03-06 22:35:26 +0100

    Configuration options are symbols

M	activemodel/lib/active_model/validations/with.rb

commit 14c254a	refs/heads/master
Author: Paco Guzman 
Date:   2011-03-06 22:34:01 +0100

    Remove Example headers. Code just flows with the text. 6ce844a3

M	activemodel/lib/active_model/conversion.rb
M	activemodel/lib/active_model/mass_assignment_security.rb
M	activemodel/lib/active_model/validator.rb

commit 7e9d45c	refs/heads/master
Author: Paco Guzman 
Date:   2011-03-06 22:24:22 +0100

    remove unused assigned variable

M	activemodel/lib/active_model/observing.rb

commit 071ddb8	refs/heads/master
Author: Akira Matsuda 
Date:   2011-03-07 06:18:32 +0900

    more "SSL everywhere" for GitHub URLs
    
    see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere

M	actionpack/lib/action_view/helpers/prototype_helper.rb
M	activesupport/lib/active_support/core_ext/array/random_access.rb
M	activesupport/lib/active_support/testing/pending.rb
M	ci/ci_setup_notes.txt
M	railties/guides/source/contribute.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/credits.html.erb
M	railties/guides/source/debugging_rails_applications.textile
M	railties/guides/source/form_helpers.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/getting_started.textile
M	railties/guides/source/i18n.textile
M	railties/guides/source/index.html.erb
M	railties/guides/source/migrations.textile
M	railties/guides/source/performance_testing.textile
M	railties/guides/source/security.textile
M	railties/guides/source/testing.textile
M	railties/lib/rails/generators/rails/app/templates/config/locales/en.yml

commit 5bed377	refs/heads/master
Author: Akira Matsuda 
Date:   2011-03-07 05:56:02 +0900

    "SSL everywhere" for GitHub URLs
    
    see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere

M	actionmailer/README.rdoc
M	actionpack/README.rdoc
M	activerecord/README.rdoc
M	activesupport/README.rdoc

commit 112c802	refs/heads/master
Author: Akira Matsuda 
Date:   2011-03-07 05:52:47 +0900

    s/a/an/

M	actionmailer/README.rdoc

commit d91be36	refs/heads/master
Author: Akira Matsuda 
Date:   2011-03-07 05:21:25 +0900

    fix typos

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 3a621e7	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-06 20:34:56 +0100

    removes merge conflicts

M	activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
M	activesupport/lib/active_support/core_ext/object/blank.rb

commit d02c326	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-06 18:14:39 +0000

    Refactor ThroughAssociation#tables to just be a flat array of tables in the order that they should be joined together.

M	activerecord/lib/active_record/associations/through_association.rb

commit 89d825d	refs/heads/master
Merge: 5e7ce47 6ce844a
Author: Xavier Noria 
Date:   2011-03-06 17:52:30 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit 6ce844a	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-06 17:49:39 +0100

    removes Examples headers introduced in 9b96de6
    
    Example headers are discouraged in the API guidelines.
    Code just flows with the text. They may be good in
    places where there's a lot of stuff and structure may
    add clarity

M	activesupport/lib/active_support/configurable.rb

commit 8bbc5b4	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-06 17:42:42 +0100

    Revert "Fixed identation in actionmailer base_test"
    
    Please excuse the revert. Albeit the commit is totally
    innocent, docrails has a strong no-code policy we need
    to enforce. Please feel free to submit the fix as a
    patch and assign it to me, I'll apply right away.
    
    This reverts commit d8462510c5378f9204778ffb9df4fdbece7dccd0.

M	actionmailer/test/base_test.rb

commit 824107b	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-06 15:29:49 +0000

    Report the correct value of nil.id in the exception message
    as different ruby implementations may have different values,
    for example Rubinius returns 53 for nil.id.
    
    [#6444 state:resolved]

M	activesupport/lib/active_support/whiny_nil.rb
M	activesupport/test/whiny_nil_test.rb

commit 5e7ce47	refs/heads/master
Author: Andrew White 
Date:   2011-03-06 15:23:31 +0000

    Report the correct value of nil.id in the exception message
    as different ruby implementations may have different values,
    for example Rubinius returns 53 for nil.id.
    
    [#6444 state:resolved]

M	activesupport/lib/active_support/whiny_nil.rb
M	activesupport/test/whiny_nil_test.rb

commit e2523ff	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-06 12:59:52 +0000

    Improve testing of cookies in functional tests:
    - cookies can be set using string or symbol keys
    - cookies are preserved across calls to get, post, etc.
    - cookie names and values are escaped
    - cookies can be cleared using @request.cookies.clear
    
    [#6272 state:resolved]

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/dispatch/cookies_test.rb
M	actionpack/test/dispatch/test_request_test.rb

commit 31f09f9	refs/heads/master
Author: Andrew White 
Date:   2011-03-06 12:49:44 +0000

    Improve testing of cookies in functional tests:
    - cookies can be set using string or symbol keys
    - cookies are preserved across calls to get, post, etc.
    - cookie names and values are escaped
    - cookies can be cleared using @request.cookies.clear
    
    [#6272 state:resolved]

M	actionpack/lib/action_controller/test_case.rb
M	actionpack/lib/action_dispatch/testing/test_process.rb
M	actionpack/lib/action_dispatch/testing/test_request.rb
M	actionpack/test/dispatch/cookies_test.rb
M	actionpack/test/dispatch/test_request_test.rb

commit b99fb66	refs/heads/master
Author: suchasurge 
Date:   2011-03-06 10:44:52 +0100

    more style changes

M	activesupport/lib/active_support/log_subscriber.rb
M	activesupport/lib/active_support/message_verifier.rb

commit 9b96de6	refs/heads/master
Author: suchasurge 
Date:   2011-03-06 10:26:24 +0100

    Some style changes

M	activesupport/lib/active_support/backtrace_cleaner.rb
M	activesupport/lib/active_support/configurable.rb
M	activesupport/lib/active_support/hash_with_indifferent_access.rb
M	activesupport/lib/active_support/i18n_railtie.rb
M	activesupport/lib/active_support/message_encryptor.rb

commit ac59a2a	refs/heads/master
Author: JudeArasu 
Date:   2011-03-06 12:55:56 +0530

    style changes

M	actionmailer/lib/rails/generators/mailer/USAGE

commit 2437c78	refs/tags/v3.0.7.rc1
Author: Andrew White 
Date:   2011-03-06 07:23:38 +0000

    Raise ArgumentError if route name is invalid [#6517 state:resolved]

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 2cd3dca	refs/heads/master
Author: JudeArasu 
Date:   2011-03-06 12:53:23 +0530

    Revert "style changes"
    
    This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8.

M	actionmailer/lib/rails/generators/mailer/USAGE

commit e00867b	refs/heads/master
Author: Andrew White 
Date:   2011-03-06 07:08:50 +0000

    Raise ArgumentError if route name is invalid [#6517 state:resolved]

M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/test/dispatch/routing_test.rb

commit 1d48269	refs/heads/master
Author: JudeArasu 
Date:   2011-03-06 11:38:18 +0530

    style changes

M	actionmailer/lib/rails/generators/mailer/USAGE

commit 0509bf3	refs/heads/master
Author: Alexander Uvarov 
Date:   2011-03-06 09:00:22 +0500

    Allow model to be inherited from Hash [#6487 state:resolved]
    
    Signed-off-by: Andrew White 

M	actionpack/lib/action_view/helpers/form_helper.rb

commit e80db41	refs/heads/master
Author: JudeArasu 
Date:   2011-03-06 10:53:44 +0530

    styles applied for usage

M	actionmailer/lib/rails/generators/mailer/USAGE

commit dff73de	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-06 00:47:15 -0300

    added failing test for fields_for with a record object that inherits from Hash
    
    Signed-off-by: Andrew White 

M	actionpack/test/template/form_options_helper_test.rb

commit 09d3e89	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-05 20:01:06 -0800

    use sort_by instead of sort()

M	activesupport/lib/active_support/cache.rb

commit d846251	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-06 00:27:37 +0100

    Fixed identation in actionmailer base_test

M	actionmailer/test/base_test.rb

commit 28ed10d	refs/heads/master
Merge: b7f1b36 74818a3
Author: Jon Leighton 
Date:   2011-03-05 22:58:48 +0000

    Merge branch 'master' into nested_has_many_through
    
    Conflicts:
    	activerecord/CHANGELOG

commit b7f1b36	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-05 22:32:49 +0000

    Use Base#type_condition in JoinAssociation

M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/base.rb

commit 7fddb94	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-05 22:07:30 +0000

    Push source_type and polymorphic conditions out of ThroughAssociation and JoinDependency::JoinAssociation and into the reflection instead.

M	activerecord/lib/active_record/associations/join_dependency/join_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/reflection_test.rb

commit ddf83d1	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-05 20:10:24 +0000

    Add a test for STI on the through where the through is nested, and change the code which support this

M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/nested_through_associations_test.rb
M	activerecord/test/fixtures/taggings.yml
M	activerecord/test/models/post.rb
M	activerecord/test/models/rating.rb

commit 74818a3	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-05 11:56:24 -0800

    use Arel::Table#alias rather than passing the :as parameter

M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb

commit 22faa2c	refs/heads/master
Author: Akira Matsuda 
Date:   2011-03-06 03:29:23 +0900

    wrong SQL statement

M	railties/guides/source/active_record_querying.textile

commit 9092052	refs/heads/master
Merge: 34f5628 2076817
Author: Xavier Noria 
Date:   2011-03-05 12:06:43 +0100

    merges rails

commit 2076817	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-05 11:54:06 +0100

    revises the RDoc of Hash#reverse_merge

M	activesupport/lib/active_support/core_ext/hash/reverse_merge.rb

commit f6a5449	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-05 11:29:57 +0100

    copy-edits 819762c
    
    * simplifies some sentences
    * use a more neutral language with less you/yours

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 5f99a89	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-05 11:08:05 +0100

    copy-edits 108561f

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit b12a4a9	refs/heads/master
Author: JudeArasu 
Date:   2011-03-05 06:08:21 +0530

    typo changes

M	actionmailer/README.rdoc

commit 737abe4	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-04 00:19:58 -0500

    Railties typos.

M	railties/lib/rails/engine.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
M	railties/lib/rails/generators/resource_helpers.rb
M	railties/lib/rails/railtie/configuration.rb

commit 87e9e3f	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-04 00:09:26 -0500

    Action Pack typos.

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/lib/action_controller/metal/instrumentation.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/lib/action_view/locale/en.yml
M	actionpack/lib/action_view/template/handlers/erb.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/template/number_helper_test.rb

commit a1b4d8e	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 23:54:58 -0500

    Active Record typos.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/callbacks.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/migration_test.rb

commit 273700c	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 23:14:18 -0500

    Active Support typos.

M	activesupport/bin/generate_tables
M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/lib/active_support/core_ext/string/multibyte.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit 48841dd	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 22:31:00 -0500

    Active Resource typos.

M	activeresource/lib/active_resource/base.rb
M	activeresource/test/cases/base_test.rb
M	activeresource/test/cases/validations_test.rb
M	activeresource/test/connection_test.rb
M	activeresource/test/fixtures/address.rb

commit 86c15d8	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 22:23:30 -0500

    Active Model typos.

M	activemodel/README.rdoc
M	activemodel/test/cases/validations/numericality_validation_test.rb

commit e95b965	refs/heads/master
Author: tashian 
Date:   2011-03-03 15:04:39 -0800

    Properly escaped a + in the dynamic segments TIP

M	railties/guides/source/routing.textile

commit 3eca9d5	refs/heads/master
Author: Jonathon D. Jones 
Date:   2011-03-03 18:10:33 -0500

    Adds link to Object.blank? from Object.present?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit 045ca30	refs/heads/master
Author: mjy 
Date:   2011-03-03 13:28:26 -0500

    fixes a missmatched column in example

M	activerecord/lib/active_record/base.rb

commit d735672	refs/heads/master
Author: JudeArasu 
Date:   2011-03-03 23:20:28 +0530

    Spelling mistake

M	railties/README.rdoc

commit 3457db7	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-03 01:03:25 +0100

    Correct spelling for Base64 in action_mailer

M	actionmailer/lib/action_mailer/base.rb

commit 3673a69	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-01 01:16:30 +0100

    Removed link to un-existing Issues page on Github

M	railties/guides/source/layout.html.erb

commit 9b01284	refs/heads/master
Author: Lars Smit 
Date:   2011-02-28 12:17:26 +0100

    Added some new advice on applying patches

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 67af97c	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-27 20:22:55 -0500

    Fix incorrect example.

M	activesupport/lib/active_support/ordered_options.rb

commit ea6a2b7	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-27 16:45:57 -0500

    Fix incorrect word.

M	activesupport/lib/active_support/log_subscriber/test_helper.rb

commit 3f97f05	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-27 10:03:50 -0800

    Pointing out that dynamic_form plugin must be installed to be able to use error_messages and error_messages_for view helpers.

M	railties/guides/source/active_record_validations_callbacks.textile

commit eef713d	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 19:07:35 -0500

    Clean up wording.

M	railties/guides/source/active_support_core_extensions.textile

commit e15973c	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-27 02:14:30 +0530

    use resources in place of map.resources

M	railties/guides/source/generators.textile

commit f305c60	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 14:29:22 -0500

    Clarify comment by removing french reference ('a la'). Should improve readability for non-native english speakers.

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit ac4c5e9	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 13:36:47 -0500

    Example descriptions and their examples were flipped. Fix.

M	activesupport/lib/active_support/core_ext/string/filters.rb

commit 8f526b3	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 13:28:40 -0500

    Warn people that these methods are deprecated.

M	railties/guides/source/active_support_core_extensions.textile

commit 4c27ad0	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 12:59:27 -0500

    Correct example that did not do what it claimed. Rework explanation.

M	activesupport/lib/active_support/core_ext/hash/reverse_merge.rb

commit feec225	refs/heads/master
Author: Ilya Zayats 
Date:   2011-02-26 07:49:50 +0300

    added information about TEST_DIR env variable

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 34f5628	refs/heads/master
Author: JudeArasu 
Date:   2011-03-05 06:19:17 +0530

    commas to set off expressions that interrupt sentence flow

M	actionmailer/README.rdoc

commit 3463247	refs/heads/master
Author: JudeArasu 
Date:   2011-03-05 06:10:35 +0530

    typo changes

M	actionmailer/README.rdoc

commit a48f46d	refs/heads/master
Author: JudeArasu 
Date:   2011-03-05 06:08:21 +0530

    typo changes

M	actionmailer/README.rdoc

commit 3b10b8a	refs/heads/master
Author: Xavier Noria 
Date:   2011-03-05 01:10:00 +0100

    implements ActiveRecord::Base.connection_config to be able to check the configuration of the current connection at runtime

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M	activerecord/test/cases/pooled_connections_test.rb

commit 28f1c21	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-04 21:38:12 -0200

    Fix CI

M	ci/ci_build.rb

commit 8987cda	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-04 22:29:40 +0000

    When preloading has_and_belongs_to_many associations, we should only instantiate one AR object per actual record in the database. (Even when IM is off.)

M	activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
M	activerecord/test/cases/associations/eager_test.rb

commit af27262	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-04 21:21:34 +0000

    Fix a couple of tests in join_model_test.rb which were failing when the identity map is turned off

M	activerecord/lib/active_record/associations/association.rb

commit 4206eff	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-04 22:36:44 +0000

    Stop identity-mapping the through records in the preloader since I fixed the underlying problem in the habtm preloader.

M	activerecord/lib/active_record/associations/preloader/through_association.rb

commit b5b5558	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-04 21:21:34 +0000

    Fix a couple of tests in join_model_test.rb which were failing when the identity map is turned off

M	activerecord/lib/active_record/associations/association.rb

commit 73c0b39	refs/heads/master
Author: Jon Leighton 
Date:   2011-03-04 22:29:40 +0000

    When preloading has_and_belongs_to_many associations, we should only instantiate one AR object per actual record in the database. (Even when IM is off.)

M	activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
M	activerecord/test/cases/associations/eager_test.rb

commit 056f05a	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-03-04 19:03:47 -0200

    Make CI test with and without IM

M	ci/ci_build.rb

commit a5ef8b9	refs/heads/master
Merge: 735844d 1db4969
Author: Jon Leighton 
Date:   2011-03-04 09:33:02 +0000

    Merge branch 'master' into nested_has_many_through

commit 1f47061	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-04 16:09:01 -0300

    reverted tests deleted by 080345baca1076a9788d, refactored implementations should not invalidate the validations
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/test/core_ext/time_ext_test.rb

commit 7872cc9	refs/heads/master
Author: Diego Carrion 
Date:   2011-03-04 12:04:22 -0300

    refactored Time#<=> and DateTime#<=> by removing unnecessary calls without losing performance
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/lib/active_support/time_with_zone.rb

commit 0db915e	refs/heads/master
Author: Alexander Uvarov 
Date:   2011-02-25 20:19:05 +0500

    Add an option to FormBuilder to omit hidden field with id
    
    [#4551 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/helpers/form_helper.rb
M	actionpack/test/template/form_helper_test.rb

commit eff41a2	refs/tags/v3.0.7.rc1
Author: José Valim 
Date:   2011-03-04 13:05:27 +0100

    log and readme should respect --quiet

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit f00a398	refs/heads/master
Author: José Valim 
Date:   2011-03-04 13:05:27 +0100

    log and readme should respect --quiet

M	railties/lib/rails/generators/actions.rb
M	railties/test/generators/actions_test.rb

commit 735844d	refs/heads/master
Merge: 9a98c76 b171b9e
Author: Jon Leighton 
Date:   2011-03-02 21:24:56 +0000

    Merge branch 'master' into nested_has_many_through
    
    Conflicts:
    	activerecord/CHANGELOG
    	activerecord/lib/active_record/association_preload.rb
    	activerecord/lib/active_record/associations.rb
    	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
    	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
    	activerecord/lib/active_record/associations/has_many_association.rb
    	activerecord/lib/active_record/associations/has_many_through_association.rb
    	activerecord/lib/active_record/associations/has_one_association.rb
    	activerecord/lib/active_record/associations/has_one_through_association.rb
    	activerecord/lib/active_record/associations/through_association_scope.rb
    	activerecord/lib/active_record/reflection.rb
    	activerecord/test/cases/associations/has_many_through_associations_test.rb
    	activerecord/test/cases/associations/has_one_through_associations_test.rb
    	activerecord/test/cases/reflection_test.rb
    	activerecord/test/cases/relations_test.rb
    	activerecord/test/fixtures/memberships.yml
    	activerecord/test/models/categorization.rb
    	activerecord/test/models/category.rb
    	activerecord/test/models/member.rb
    	activerecord/test/models/reference.rb
    	activerecord/test/models/tagging.rb

commit c8dae23	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-04 00:19:58 -0500

    Railties typos.

M	railties/lib/rails/engine.rb
M	railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
M	railties/lib/rails/generators/resource_helpers.rb
M	railties/lib/rails/railtie/configuration.rb

commit 12325cf	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-04 00:09:26 -0500

    Action Pack typos.

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/lib/action_controller/metal/instrumentation.rb
M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/form_tag_helper.rb
M	actionpack/lib/action_view/helpers/number_helper.rb
M	actionpack/lib/action_view/helpers/translation_helper.rb
M	actionpack/lib/action_view/locale/en.yml
M	actionpack/lib/action_view/template/handlers/erb.rb
M	actionpack/test/controller/routing_test.rb
M	actionpack/test/template/number_helper_test.rb

commit 238e6f0	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 23:54:58 -0500

    Active Record typos.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/callbacks.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/migration_test.rb

commit 80e3beb	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 23:14:18 -0500

    Active Support typos.

M	activesupport/bin/generate_tables
M	activesupport/lib/active_support/core_ext/object/try.rb
M	activesupport/lib/active_support/core_ext/string/multibyte.rb
M	activesupport/lib/active_support/core_ext/string/output_safety.rb
M	activesupport/lib/active_support/dependencies.rb
M	activesupport/lib/active_support/log_subscriber/test_helper.rb
M	activesupport/lib/active_support/multibyte/unicode.rb

commit 103c297	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 22:31:00 -0500

    Active Resource typos.

M	activeresource/lib/active_resource/base.rb
M	activeresource/test/cases/base_test.rb
M	activeresource/test/cases/validations_test.rb
M	activeresource/test/connection_test.rb
M	activeresource/test/fixtures/address.rb

commit fbed63a	refs/heads/master
Author: R.T. Lechow 
Date:   2011-03-03 22:23:30 -0500

    Active Model typos.

M	activemodel/README.rdoc
M	activemodel/test/cases/validations/numericality_validation_test.rb

commit d5994ee	refs/heads/master
Author: John Mileham 
Date:   2011-03-03 23:26:45 -0500

    Change behavior of count(:limit => x, :offset => y) to limit/offset before counting.

M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/test/cases/calculations_test.rb
M	activerecord/test/cases/relations_test.rb

commit fcade9f	refs/heads/master
Merge: 108561f f44e0e8
Author: Jonathon D. Jones 
Date:   2011-03-03 18:11:01 -0500

    Merge remote branch 'origin/master'

commit 108561f	refs/heads/master
Author: Jonathon D. Jones 
Date:   2011-03-03 18:10:33 -0500

    Adds link to Object.blank? from Object.present?

M	activesupport/lib/active_support/core_ext/object/blank.rb

commit f44e0e8	refs/heads/master
Author: tashian 
Date:   2011-03-03 15:04:39 -0800

    Properly escaped a + in the dynamic segments TIP

M	railties/guides/source/routing.textile

commit 3b7cf23	refs/heads/master
Author: mjy 
Date:   2011-03-03 13:28:26 -0500

    fixes a missmatched column in example

M	activerecord/lib/active_record/base.rb

commit b4b7171	refs/heads/master
Author: JudeArasu 
Date:   2011-03-03 23:20:28 +0530

    Spelling mistake

M	railties/README.rdoc

commit 80c0b00	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-03 01:03:25 +0100

    Correct spelling for Base64 in action_mailer

M	actionmailer/lib/action_mailer/base.rb

commit 1db4969	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 15:17:29 -0800

    only compute path.to_s once

M	railties/lib/rails/engine.rb

commit dc89e29	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 15:17:13 -0800

    remove to_s implementation so that inspect is helpful

M	activesupport/lib/active_support/cache/strategy/local_cache.rb

commit b247c8d	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 14:04:41 -0800

    * LocalCache strategy is now a real middleware class, not an anonymous class
    posing for pictures.

M	activesupport/CHANGELOG
M	activesupport/lib/active_support/cache/strategy/local_cache.rb

commit b7cf1f4	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-02 01:55:22 +0100

    No need of instance variable
    
    [#6502 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	actionmailer/test/base_test.rb

commit 272ede9	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 10:42:43 -0800

    require deprecation so that we can deprecate methods!

M	activesupport/lib/active_support/dependencies.rb

commit 72405ef	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 10:23:04 -0800

    anonymous classes have blank names on ruby 1.8

M	activesupport/lib/active_support/dependencies.rb

commit 1f2e721	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 10:11:28 -0800

    make sure string keys are always looked up from the class cache

M	actionpack/lib/action_dispatch/middleware/stack.rb
M	actionpack/test/dispatch/middleware_stack/middleware_test.rb

commit 9198372	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 09:43:27 -0800

    Ruby 1.8: Y U NO FUN?

M	actionpack/test/dispatch/middleware_stack/middleware_test.rb

commit dd41387	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 09:35:10 -0800

    use newer class cache api

M	actionpack/lib/action_dispatch/routing/route_set.rb

commit 69e3480	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 09:31:40 -0800

    adding deprecation noticies to deprecated class cache methods

M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/class_cache_test.rb
M	activesupport/test/dependencies_test.rb

commit 6624544	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-02 09:18:05 -0800

    adding backwards compat for class cache references. <3<3

M	activesupport/lib/active_support/dependencies.rb
M	activesupport/test/class_cache_test.rb
M	activesupport/test/dependencies_test.rb

commit 45d5663	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-02 13:50:18 -0200

    Add some CHANGELOG entries for 3.0.6

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG

commit ea026f1	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-03-02 13:23:04 -0200

    Add missing versions to CHANGELOGs

M	actionmailer/CHANGELOG
M	actionpack/CHANGELOG
M	activemodel/CHANGELOG
M	activerecord/CHANGELOG
M	activeresource/CHANGELOG
M	activesupport/CHANGELOG
M	railties/CHANGELOG

commit beec6c8	refs/tags/v3.0.7.rc1
Author: Cheah Chu Yeow 
Date:   2011-02-27 22:57:46 +0800

    Fix Action caching bug where an action that has a non-cacheable response always renders a nil response body. It now correctly renders the response body.
    
    Note that only GET and HTTP 200 responses can be cached.
    
    [#6480 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit 2ee5555	refs/heads/master
Author: Cheah Chu Yeow 
Date:   2011-02-27 22:57:46 +0800

    Fix Action caching bug where an action that has a non-cacheable response always renders a nil response body. It now correctly renders the response body.
    
    Note that only GET and HTTP 200 responses can be cached.
    
    [#6480 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_controller/caching/actions.rb
M	actionpack/test/controller/caching_test.rb

commit e4cf28f	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-02 01:18:32 +0100

    Fixed typos in asset_host_test
    
    [#6501 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	actionmailer/test/asset_host_test.rb

commit f345e23	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-01 17:43:45 -0800

    yo dawg, directly use the class cache rather than the cache of the cache

M	actionpack/lib/action_dispatch/middleware/stack.rb
M	activesupport/lib/active_support/dependencies.rb

commit 7b6bfe8	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-01 17:20:10 -0800

    refactor Reference to a ClassCache object, fix lazy lookup in Middleware so that anonymous classes are supported

M	actionpack/lib/action_dispatch/middleware/stack.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
A	actionpack/test/dispatch/middleware_stack/middleware_test.rb
M	activesupport/CHANGELOG
M	activesupport/lib/active_support/dependencies.rb
A	activesupport/test/class_cache_test.rb
M	activesupport/test/dependencies_test.rb

commit 50ed1a2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-01 13:28:59 -0800

    initialize ivars

M	actionpack/lib/action_dispatch/middleware/static.rb

commit 24faddd	refs/heads/master
Author: Alexander Uvarov 
Date:   2011-02-13 22:27:33 +0500

    Move ActiveModel::AttributeMethods#attribute_methods_generated? to ActiveRecord, so it's flexible now
    
    [#6428 state:resolved]
    
    Signed-off-by: José Valim 

M	activemodel/CHANGELOG
M	activemodel/lib/active_model/attribute_methods.rb
M	activemodel/test/cases/attribute_methods_test.rb
M	activerecord/lib/active_record/attribute_methods.rb

commit fd26afc	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-01 10:21:44 -0800

    Enumerable gives us include?, so remove include?

M	actionpack/lib/action_dispatch/middleware/stack.rb

commit 648fd60	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-01 10:14:01 -0800

    prefer composition over inheritance with AD::MS

M	actionpack/CHANGELOG
M	actionpack/lib/action_controller/metal.rb
M	actionpack/lib/action_dispatch/middleware/stack.rb

commit e477fc1	refs/heads/master
Author: Aaron Patterson 
Date:   2011-03-01 10:11:32 -0800

    fixing test case test on 1.9.3dev

M	activesupport/test/test_case_test.rb

commit 9cf3b1f	refs/heads/master
Author: Sam Elliott 
Date:   2011-02-28 22:17:38 +0000

    Remove warnings about redefined test methods
    
    [#6490 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/test/inflector_test.rb

commit 8ca8ac3	refs/tags/v2.3.12
Author: Rob Di Marco 
Date:   2011-02-28 22:54:03 -0500

    Fixed bug 6440 by checking that destroy exists on the session

M	actionpack/lib/action_controller/request.rb

commit 589ce09	refs/tags/v2.3.12
Author: Rob Di Marco 
Date:   2011-02-28 22:53:36 -0500

    Unit test that shows calling reset session twice results in an exception

M	actionpack/test/controller/session/cookie_store_test.rb

commit 46bb424	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-28 19:47:09 -0800

    Revert "compute ext in initialize, and use an attr_reader"
    
    This reverts commit 2dbb73bdda3b81947fd112486ac4285fb1a6e3a9.
    
    Conflicts:
    
    	actionpack/lib/action_dispatch/middleware/static.rb

M	actionpack/lib/action_dispatch/middleware/static.rb

commit f279422	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-28 18:03:06 -0800

    no need to pass a regex to Regexp.compile

M	actionpack/lib/action_dispatch/middleware/static.rb

commit 2dbb73b	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-28 17:54:00 -0800

    compute ext in initialize, and use an attr_reader

M	actionpack/lib/action_dispatch/middleware/static.rb

commit c563f71	refs/heads/master
Merge: 54fdd33 b171b9e
Author: Aaron Patterson 
Date:   2011-02-28 17:13:39 -0800

    Merge branch 'fuuu'
    
    * fuuu:
      Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
      Rewrote AssociationPreload.

commit cdfee85	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-02-28 16:30:14 -0800

    use a subclass of AS::TZ for testing html output

M	actionpack/test/template/date_helper_test.rb

commit 54fdd33	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-28 16:30:14 -0800

    use a subclass of AS::TZ for testing html output

M	actionpack/test/template/date_helper_test.rb

commit 4c96266	refs/heads/master
Author: Dalibor Nasevic 
Date:   2011-03-01 01:16:30 +0100

    Removed link to un-existing Issues page on Github

M	railties/guides/source/layout.html.erb

commit 19c763f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-28 15:47:03 -0800

    reduce two method calls per request, 1 to method_missing and one to send

M	railties/lib/rails/commands/server.rb

commit b171b9e	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-27 18:17:14 +0000

    Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations

M	activerecord/lib/active_record/associations.rb
D	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
D	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
D	activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
D	activerecord/lib/active_record/associations/class_methods/join_dependency/join_part.rb
A	activerecord/lib/active_record/associations/join_dependency.rb
A	activerecord/lib/active_record/associations/join_dependency/join_association.rb
A	activerecord/lib/active_record/associations/join_dependency/join_base.rb
A	activerecord/lib/active_record/associations/join_dependency/join_part.rb
M	activerecord/lib/active_record/relation/finder_methods.rb
M	activerecord/lib/active_record/relation/query_methods.rb

commit d90b4e2	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-23 00:17:01 +0000

    Rewrote AssociationPreload.

M	activerecord/lib/active_record.rb
D	activerecord/lib/active_record/association_preload.rb
M	activerecord/lib/active_record/associations.rb
A	activerecord/lib/active_record/associations/preloader.rb
A	activerecord/lib/active_record/associations/preloader/association.rb
A	activerecord/lib/active_record/associations/preloader/belongs_to.rb
A	activerecord/lib/active_record/associations/preloader/collection_association.rb
A	activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
A	activerecord/lib/active_record/associations/preloader/has_many.rb
A	activerecord/lib/active_record/associations/preloader/has_many_through.rb
A	activerecord/lib/active_record/associations/preloader/has_one.rb
A	activerecord/lib/active_record/associations/preloader/has_one_through.rb
A	activerecord/lib/active_record/associations/preloader/singular_association.rb
A	activerecord/lib/active_record/associations/preloader/through_association.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/inheritance_test.rb
M	activerecord/test/models/category.rb

commit 7112cf5	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-02-27 22:58:07 +0100

    Updated the AS guides with some information on the difference between Date.today and Date.current.

M	railties/guides/source/active_support_core_extensions.textile

commit 0f8d279	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-02-27 20:24:39 +0100

    updated Time, Date and DateTime current methods in AS to use Time.zone and not Time.zone_default.
    
    [#6410 state:committed]

M	actionpack/test/template/date_helper_test.rb
M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/date/zones.rb
M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/duration_test.rb
M	activesupport/test/core_ext/numeric_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit 7180a32	refs/tags/v3.0.7.rc1
Author: Josh Kalderimis 
Date:   2011-02-27 22:58:07 +0100

    Updated the AS guides with some information on the difference between Date.today and Date.current.

M	railties/guides/source/active_support_core_extensions.textile

commit 9ba0c7e	refs/tags/v3.0.7.rc1
Author: Josh Kalderimis 
Date:   2011-02-27 20:24:39 +0100

    updated Time, Date and DateTime current methods in AS to use Time.zone and not Time.zone_default.
    
    [#6410 state:committed]

M	actionpack/test/template/date_helper_test.rb
M	activesupport/lib/active_support/core_ext/date/calculations.rb
M	activesupport/lib/active_support/core_ext/date/zones.rb
M	activesupport/lib/active_support/core_ext/date_time/calculations.rb
M	activesupport/lib/active_support/core_ext/time/calculations.rb
M	activesupport/test/core_ext/date_ext_test.rb
M	activesupport/test/core_ext/date_time_ext_test.rb
M	activesupport/test/core_ext/duration_test.rb
M	activesupport/test/core_ext/numeric_ext_test.rb
M	activesupport/test/core_ext/time_with_zone_test.rb

commit de97131	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-28 19:57:22 +0100

    revises a few details in public/index.html

M	railties/lib/rails/generators/rails/app/templates/public/index.html

commit 726599d	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-28 10:52:09 -0500

    Remove redundant to_sym call.
    
    [#6483 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/ordered_options.rb

commit a8dae08	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-28 09:15:19 -0800

    skip this on oracle

M	activerecord/test/cases/calculations_test.rb

commit f42562f	refs/heads/master
Author: Oriol Gual and Josep M. Bach 
Date:   2011-02-28 14:31:29 +0100

    Make ActiveSupport::Configurable work with modules
    
    [#6486 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/configurable.rb
M	activesupport/test/configurable_test.rb

commit a062992	refs/heads/master
Author: Diego Carrion 
Date:   2011-02-27 22:54:02 -0300

    added activesupport/test/tmp to gitignore
    
    [#6484 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	.gitignore

commit 4c681f6	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-02-28 12:01:06 -0200

    javascript_include_tag shouldn't raise if you register an expansion key with nil or [] value

M	actionpack/lib/action_view/helpers/asset_tag_helper.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 53b17e9	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-02-28 11:52:00 -0200

    javascript_include_tag shouldn't raise if you register an expansion key with nil value

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 801e314	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-02-28 11:30:12 -0200

    Add tests for register expansion methods with key = []

M	actionpack/test/template/asset_tag_helper_test.rb

commit ff95f85	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2010-12-04 19:01:00 -0200

    Add a test for passing :rescue_format => nil to #translate
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/test/template/translation_helper_test.rb

commit 1452571	refs/tags/v3.0.7.rc1
Author: Sven Fuchs 
Date:   2011-02-28 08:18:26 +0100

    Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0 (backports 896e25e)
    
    Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n.
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/helpers/translation_helper.rb
D	actionpack/test/fixtures/test/scoped_translation.erb
D	actionpack/test/fixtures/test/translation.erb
A	actionpack/test/fixtures/translations/templates/array.erb
A	actionpack/test/fixtures/translations/templates/found.erb
A	actionpack/test/fixtures/translations/templates/missing.erb
M	actionpack/test/template/translation_helper_test.rb

commit 819762c	refs/heads/master
Author: Lars Smit 
Date:   2011-02-28 12:17:26 +0100

    Added some new advice on applying patches

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit b95f8be	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-27 20:22:55 -0500

    Fix incorrect example.

M	activesupport/lib/active_support/ordered_options.rb

commit f80eea3	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-02-27 21:47:12 -0200

    Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]"
    
    This breaks #6448, you should use :"module/class" as key for namespacing
    [#6448 state:committed]
    
    This reverts commit 8d14fa89599a30a6ab1d14faedd2de8e46651272.

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb
M	activemodel/test/models/person.rb

commit d043d20	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-02-27 21:14:11 -0200

    failing test for i18n key collision with namespaced models

M	activemodel/test/cases/translation_test.rb
M	activemodel/test/models/person.rb

commit a00bed0	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-02-27 21:23:59 -0200

    Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]"
    
    This breaks #6448, you should use :"module/class" as key for namespacing
    [#6448 state:committed]
    
    This reverts commit 8d30193b08bd2321a7a78a1f481bd5e4d4d45557.

M	activemodel/lib/active_model/errors.rb
M	activemodel/lib/active_model/naming.rb
M	activemodel/lib/active_model/translation.rb
M	activemodel/test/cases/validations/i18n_validation_test.rb
M	activemodel/test/models/person.rb

commit acf0688	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-02-27 21:14:11 -0200

    failing test for i18n key collision with namespaced models

M	activemodel/test/cases/translation_test.rb
M	activemodel/test/models/person.rb

commit 9bbbae0	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-27 16:45:57 -0500

    Fix incorrect word.

M	activesupport/lib/active_support/log_subscriber/test_helper.rb

commit f7e1703	refs/tags/v3.0.7.rc1
Author: Santiago Pastorino 
Date:   2011-02-27 19:13:09 -0200

    Bump i18n version

M	actionpack/actionpack.gemspec
M	activemodel/activemodel.gemspec

commit 86ad8a6	refs/heads/master
Author: Jeff Kreeftmeijer 
Date:   2011-02-14 19:38:12 +0100

    Make sure the Thor generator LoadError does not output --dev twice [#6431 state:resolved]
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/base.rb

commit 6ff10c1	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-27 10:03:50 -0800

    Pointing out that dynamic_form plugin must be installed to be able to use error_messages and error_messages_for view helpers.

M	railties/guides/source/active_record_validations_callbacks.textile

commit ef5e817	refs/tags/v3.0.7.rc1
Merge: 2a67e69 ecc6bb5
Author: Aaron Patterson 
Date:   2011-02-26 18:29:20 -0800

    Merge branch '3-0-5' into 3-0-stable
    
    * 3-0-5:
      prepping for 3.0.5 release

commit ecc6bb5	refs/tags/v3.0.5 (tag: v3.0.5)
Author: Aaron Patterson 
Date:   2011-02-26 18:20:22 -0800

    prepping for 3.0.5 release

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit 9b35eee	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 19:07:35 -0500

    Clean up wording.

M	railties/guides/source/active_support_core_extensions.textile

commit f3e9cbc	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-26 16:05:15 -0800

    use an attribute rather than a SQL literal

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/base_test.rb

commit 72ae724	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-27 02:14:30 +0530

    use resources in place of map.resources

M	railties/guides/source/generators.textile

commit 8f13a16	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 14:29:22 -0500

    Clarify comment by removing french reference ('a la'). Should improve readability for non-native english speakers.

M	activesupport/lib/active_support/core_ext/enumerable.rb

commit e872a8f	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 13:36:47 -0500

    Example descriptions and their examples were flipped. Fix.

M	activesupport/lib/active_support/core_ext/string/filters.rb

commit e331ec0	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 13:28:40 -0500

    Warn people that these methods are deprecated.

M	railties/guides/source/active_support_core_extensions.textile

commit 8270dcd	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-26 12:59:27 -0500

    Correct example that did not do what it claimed. Rework explanation.

M	activesupport/lib/active_support/core_ext/hash/reverse_merge.rb

commit 6de3f1f	refs/heads/master
Author: Ilya Zayats 
Date:   2011-02-26 07:49:50 +0300

    added information about TEST_DIR env variable

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 54a2bf6	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-25 15:38:59 -0800

    removing limits and offsets from COUNT queries unless both are specified. [#6268 state:resolved]

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/relation/calculations.rb
M	activerecord/lib/active_record/test_case.rb
M	activerecord/test/cases/calculations_test.rb

commit 8fc54a2	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-25 14:17:57 -0800

    only take the limit if there is a limit to take

M	activerecord/lib/active_record/relation.rb

commit 2e60b00	refs/heads/master
Merge: 515ea95 287bb69
Author: Xavier Noria 
Date:   2011-02-25 20:53:55 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit 2a67e69	refs/tags/v3.0.7.rc1
Author: Prem Sichanugrist 
Date:   2011-02-25 16:59:26 +0700

    Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved]
    
    This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match.
    
    (This is a backported version to 3-0-stable)

M	railties/lib/rails/application.rb
M	railties/test/application/middleware_test.rb

commit 69c0bad	refs/tags/v3.0.7.rc1
Author: Prem Sichanugrist 
Date:   2011-02-25 16:51:53 +0700

    Make sure that we set `env["action_dispatch.show_exceptions"]`
    
    This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash.
    
    (This is the backported version to 3-0-stable)

M	railties/lib/rails/application.rb
M	railties/test/application/configuration_test.rb

commit 515ea95	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-02-23 03:02:39 +0700

    Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved]
    
    This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match.

M	railties/lib/rails/application.rb
A	railties/test/application/middleware/show_exceptions_test.rb
M	railties/test/application/middleware_test.rb

commit 439a745	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-02-23 02:25:38 +0700

    Make sure that we set `env["action_dispatch.show_exceptions"]`
    
    This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash.

M	railties/lib/rails/application.rb
M	railties/test/application/configuration_test.rb

commit 287bb69	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-25 02:59:37 +0530

    standardize all shell commands with the $ prefix

M	railties/guides/source/3_0_release_notes.textile
M	railties/guides/source/action_mailer_basics.textile
M	railties/guides/source/action_view_overview.textile
M	railties/guides/source/active_record_validations_callbacks.textile
M	railties/guides/source/command_line.textile
M	railties/guides/source/contributing_to_ruby_on_rails.textile
M	railties/guides/source/debugging_rails_applications.textile
M	railties/guides/source/generators.textile
M	railties/guides/source/layouts_and_rendering.textile
M	railties/guides/source/migrations.textile
M	railties/guides/source/performance_testing.textile
M	railties/guides/source/plugins.textile

commit 13547c1	refs/heads/master
Author: Eric Allam 
Date:   2011-02-15 21:48:11 -0500

    fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses

M	activerecord/lib/active_record/named_scope.rb
M	activerecord/test/cases/named_scope_test.rb

commit 55105c4	refs/heads/master
Author: Josep M. Bach 
Date:   2011-02-24 10:00:09 +0100

    Fix missing inheritance from AR::Base in docs

M	activerecord/lib/active_record/base.rb

commit 77d4211	refs/tags/v3.0.7.rc1
Author: Aaron Patterson 
Date:   2011-02-23 16:04:01 -0800

    observers leak across tests, so rather than modify the object, we should just count the number of times the observer was called

M	activerecord/test/cases/lifecycle_test.rb

commit 5f1fc0c	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-23 16:04:01 -0800

    observers leak across tests, so rather than modify the object, we should just count the number of times the observer was called

M	activerecord/test/cases/lifecycle_test.rb

commit e8a5782	refs/heads/master
Author: Vinicius Baggio 
Date:   2011-02-23 10:40:08 -0300

    Removing redundant File.expand_path from generators test
    
    Signed-off-by: José Valim 

M	railties/test/generators/generators_test_helper.rb

commit 0b24129	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-23 10:23:01 -0800

    Fixing wrong class name.

M	railties/guides/source/active_record_validations_callbacks.textile

commit 29399e0	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-23 10:22:03 -0800

    ActiveModel::Validator#validate must receive have a record parameter.

M	railties/guides/source/active_record_validations_callbacks.textile

commit ef31b87	refs/tags/v3.0.5.rc1 (tag: v3.0.5.rc1)
Author: Aaron Patterson 
Date:   2011-02-22 14:27:08 -0800

    updating to 3.0.5.rc1

M	RAILS_VERSION
M	actionmailer/lib/action_mailer/version.rb
M	actionpack/lib/action_pack/version.rb
M	activemodel/lib/active_model/version.rb
M	activerecord/lib/active_record/version.rb
M	activeresource/lib/active_resource/version.rb
M	activesupport/lib/active_support/version.rb
M	railties/lib/rails/version.rb
M	version.rb

commit ee491b0	refs/tags/v3.0.5.rc1
Author: Kamal Fariz Mahyuddin 
Date:   2011-02-09 23:37:30 +0800

    Fix observer callbacks firing multiple times on descendant instances

M	activerecord/lib/active_record/observer.rb
M	activerecord/test/cases/lifecycle_test.rb

commit 6ba8caf	refs/heads/master
Author: Kamal Fariz Mahyuddin 
Date:   2011-02-09 23:37:30 +0800

    Fix observer callbacks firing multiple times on descendant instances

M	activerecord/lib/active_record/observer.rb
M	activerecord/test/cases/lifecycle_test.rb

commit 3265bbb	refs/heads/master
Author: José Valim 
Date:   2011-02-22 22:51:02 +0100

    Fix tests on 1.8.

M	activesupport/test/buffered_logger_test.rb
M	activesupport/test/file_watcher_test.rb

commit 839d06f	refs/heads/master
Author: Prem Sichanugrist 
Date:   2011-01-05 03:58:45 +0700

    We're in 2011, let's update our license
    
    Signed-off-by: Santiago Pastorino 

M	actionmailer/MIT-LICENSE
M	actionmailer/lib/action_mailer.rb
M	actionpack/MIT-LICENSE
M	actionpack/lib/action_dispatch.rb
M	actionpack/lib/action_pack.rb
M	actionpack/lib/action_view.rb
M	activemodel/MIT-LICENSE
M	activemodel/lib/active_model.rb
M	activerecord/MIT-LICENSE
M	activerecord/lib/active_record.rb
M	activeresource/MIT-LICENSE
M	activesupport/MIT-LICENSE
M	railties/MIT-LICENSE

commit 30a0e3f	refs/tags/v3.0.5.rc1
Author: Aaron Patterson 
Date:   2011-02-22 12:08:37 -0800

    silencing deprecation spam

M	activerecord/test/cases/relations_test.rb

commit 3d907a6	refs/heads/master
Author: Michael Koziarski 
Date:   2011-02-23 08:59:13 +1300

    Prepend the CSRF filter to make it much more difficult to execute application code before it fires.

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 90aede6	refs/tags/v3.0.5.rc1
Author: Michael Koziarski 
Date:   2011-02-23 08:59:13 +1300

    Prepend the CSRF filter to make it much more difficult to execute application code before it fires.

M	actionpack/lib/action_controller/metal/request_forgery_protection.rb

commit 2cce44f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-22 11:27:12 -0800

    expectations change when using IM. Change oracle tests to reflect that

M	activerecord/test/cases/autosave_association_test.rb

commit 4bd8d26	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-22 11:07:09 -0800

    Relation will delegate to AR::Base which already uses the Dynamic finders, so eliminate duplicate calls

M	activerecord/lib/active_record/relation.rb

commit f8cfa45	refs/heads/master
Merge: b3fcabb 20f2785
Author: Xavier Noria 
Date:   2011-02-22 19:06:29 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit 20f2785	refs/heads/master
Author: Mateus Paixão 
Date:   2011-02-22 10:37:59 -0300

    alteracao de HTML para HTTP

M	railties/guides/source/layouts_and_rendering.textile

commit b3fcabb	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-21 16:11:52 -0800

    adding a test case for custom locking

A	activerecord/test/cases/custom_locking_test.rb

commit ac73f50	refs/tags/v3.0.5.rc1
Author: Aaron Patterson 
Date:   2011-02-21 16:11:52 -0800

    adding a test case for custom locking

A	activerecord/test/cases/custom_locking_test.rb

commit 3ab82d8	refs/tags/v3.0.5.rc1
Author: Aaron Patterson 
Date:   2011-02-21 13:27:10 -0800

    Gem.cache is going to be deprecated, use source_index instead

M	load_paths.rb

commit 14263fa	refs/heads/master
Merge: ae78e46 f826e05
Author: Mani Tadayon 
Date:   2011-02-21 13:46:19 -0800

    Merge branch 'master' of github.com:lifo/docrails

commit ae78e46	refs/heads/master
Author: Mani Tadayon 
Date:   2011-02-21 13:45:21 -0800

    Fix typo in i18n guide: 'explicitely'

M	railties/guides/source/i18n.textile

commit 0d41fa9	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-21 11:37:08 +0100

    copy-edits 8d96b89

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activerecord/lib/active_record/validations.rb
M	activerecord/lib/active_record/validations/associated.rb

commit 5e69deb	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-21 11:01:26 +0100

    copy-edits 6d7a826

M	activemodel/lib/active_model/observing.rb

commit fa38214	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-21 11:00:03 +0100

    copy-edits 34316d8

M	activemodel/lib/active_model/serializers/xml.rb

commit 1700329	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-20 21:35:43 -0500

    Docs: Update to_xml documentation to match as_json docuemntation

M	activemodel/lib/active_model/serializers/xml.rb

commit 26a5068	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-20 22:22:52 -0300

    Adding new examples for update_all method

M	activerecord/lib/active_record/relation.rb

commit b39766f	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-20 22:03:29 -0300

    Adding examples

M	activerecord/lib/active_record/relation.rb

commit 2b6845b	refs/heads/master
Author: Andy Lindeman 
Date:   2011-02-20 13:52:41 -0600

    Specifying :partial is required when passing additional options such as :layout

M	railties/guides/source/layouts_and_rendering.textile

commit 406f7eb	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-20 21:37:39 +0530

    cleans up PS1. Sorry lifo :)

M	railties/guides/source/performance_testing.textile
M	railties/guides/source/rails_on_rack.textile

commit c86cdea	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-20 21:31:12 +0530

    minor rephrasing

M	railties/guides/source/rails_application_templates.textile

commit fab5fe7	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-20 21:05:41 -0500

    Documentation: Added small comments to Observering module

M	activemodel/lib/active_model/observing.rb

commit 746a412	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-19 23:47:12 -0500

    Tpyo: fixing several cases of the the

M	activerecord/test/cases/autosave_association_test.rb
M	railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js

commit 2a816db	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-19 23:46:30 -0500

    Typo: fixing the the

M	activerecord/lib/active_record/validations.rb

commit 2394ad6	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 18:07:00 -0500

    Edit a few lines for readability.

M	railties/guides/source/active_support_core_extensions.textile

commit 1e2ecc4	refs/heads/master
Author: Brandon Tilley 
Date:   2011-02-19 14:49:42 -0800

    Add info about I18n::Backend::Chain to I18n guide

M	railties/guides/source/i18n.textile

commit 9345e9c	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-20 01:18:03 +0530

    session is reset on token mismatch

M	railties/guides/source/security.textile

commit 308328f	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 13:04:22 -0500

    Add a forgotten word.

M	activesupport/lib/active_support/core_ext/object/with_options.rb

commit a40b715	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 12:56:55 -0500

    Improve clarity of example. Make it follow guidelines for output display.

M	activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb

commit 797af0f	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 12:15:51 -0500

    Add a clearer example for with_options (lifted from the Active Support guide).

M	activesupport/lib/active_support/core_ext/object/with_options.rb

commit 74b44df	refs/heads/master
Author: Jimmy Cuadra 
Date:   2011-02-18 22:20:04 -0800

    improve language and examples in Railtie docs

M	railties/lib/rails/railtie.rb

commit 8f17a81	refs/heads/master
Author: Peer Allan 
Date:   2011-02-18 20:51:56 -0600

    Clarification of ActiveRecord ActiveModel validation documentation

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activerecord/lib/active_record/validations.rb
M	activerecord/lib/active_record/validations/associated.rb

commit 442f8db	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-21 13:27:10 -0800

    Gem.cache is going to be deprecated, use source_index instead

M	load_paths.rb

commit 52f8e4b	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-21 01:09:41 +0000

    Use proper objects to do the work to build the associations (adding methods, callbacks etc) rather than calling a whole bunch of methods with rather long names.

M	activerecord/lib/active_record/associations.rb
A	activerecord/lib/active_record/associations/builder/association.rb
A	activerecord/lib/active_record/associations/builder/belongs_to.rb
A	activerecord/lib/active_record/associations/builder/collection_association.rb
A	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
A	activerecord/lib/active_record/associations/builder/has_many.rb
A	activerecord/lib/active_record/associations/builder/has_one.rb
A	activerecord/lib/active_record/associations/builder/singular_association.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/test/cases/associations/extension_test.rb
M	activerecord/test/cases/autosave_association_test.rb

commit a5274bb	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-20 20:58:54 +0000

    Rename target_klass to klass

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb

commit 8b00da5	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-20 20:44:29 +0000

    Delegate through_reflection and source_reflection to reflection

M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/has_one_through_association.rb
M	activerecord/lib/active_record/associations/through_association.rb

commit 32eef69	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-20 20:42:35 +0000

    Delegate Association#options to the reflection, and replace 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations.

M	activerecord/lib/active_record/associations/association.rb
M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/lib/active_record/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/reflection.rb

commit 73ff007	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-20 20:34:06 +0000

    Singular associations no longer use a proxy, so no need to check for the proxy type on assignment.

M	activerecord/lib/active_record/associations/belongs_to_association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb

commit 1d85a73	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-20 20:31:45 +0000

    Associations - where possible, call attributes methods rather than directly accessing the instance variables

M	activerecord/lib/active_record/associations/association.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/associations/collection_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/has_one_association.rb
M	activerecord/lib/active_record/associations/has_one_through_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/lib/active_record/associations/through_association.rb

commit f826e05	refs/heads/master
Merge: cd12c36 b481574
Author: Xavier Noria 
Date:   2011-02-21 11:42:26 +0100

    Merge branch 'master' of git://github.com/lifo/docrails

commit b481574	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-21 11:37:08 +0100

    copy-edits 8d96b89

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/exclusion.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activerecord/lib/active_record/validations.rb
M	activerecord/lib/active_record/validations/associated.rb

commit 9297027	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-21 11:01:26 +0100

    copy-edits 6d7a826

M	activemodel/lib/active_model/observing.rb

commit 843a5b9	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-21 11:00:03 +0100

    copy-edits 34316d8

M	activemodel/lib/active_model/serializers/xml.rb

commit cd12c36	refs/heads/master
Author: Mark Turner 
Date:   2011-02-21 15:44:30 +0800

    Added .rvmrc to gitignore

M	.gitignore

commit 34316d8	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-20 21:35:43 -0500

    Docs: Update to_xml documentation to match as_json docuemntation

M	activemodel/lib/active_model/serializers/xml.rb

commit b014f82	refs/heads/master
Merge: 6d7a826 62fd334
Author: Nicholas Rowe 
Date:   2011-02-20 21:06:03 -0500

    Merge branch 'master' of github.com:lifo/docrails

commit 6d7a826	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-20 21:05:41 -0500

    Documentation: Added small comments to Observering module

M	activemodel/lib/active_model/observing.rb

commit 62fd334	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-20 22:22:52 -0300

    Adding new examples for update_all method

M	activerecord/lib/active_record/relation.rb

commit 4da0157	refs/heads/master
Author: Rodrigo Navarro 
Date:   2011-02-20 22:03:29 -0300

    Adding examples

M	activerecord/lib/active_record/relation.rb

commit bdf83b7	refs/heads/master
Author: Andy Lindeman 
Date:   2011-02-20 13:52:41 -0600

    Specifying :partial is required when passing additional options such as :layout

M	railties/guides/source/layouts_and_rendering.textile

commit 7d12f53	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-20 21:37:39 +0530

    cleans up PS1. Sorry lifo :)

M	railties/guides/source/performance_testing.textile
M	railties/guides/source/rails_on_rack.textile

commit 35cb9b7	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-20 21:31:12 +0530

    minor rephrasing

M	railties/guides/source/rails_application_templates.textile

commit 6c42c14	refs/tags/v2.3.12
Author: Vijay Dev 
Date:   2011-02-11 00:46:20 +0530

    fix incorrect version in deprecation message
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/base.rb

commit 6c30530	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-20 11:01:07 +0100

    adds Range#cover? to the CHANGELOG

M	activesupport/CHANGELOG

commit e2d54fb	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-20 10:52:24 +0100

    documents the backported Range#cover?, and related stuff

M	activemodel/lib/active_model/validations/inclusion.rb
M	railties/guides/source/active_support_core_extensions.textile

commit e984fd4	refs/heads/master
Author: wycats 
Date:   2011-02-20 01:37:37 -0800

    Allow tests to proceed as soon as the payload changes, instead of always having to wait for a timeout

M	activesupport/test/file_watcher_test.rb

commit 89e6b19	refs/heads/master
Author: wycats 
Date:   2011-02-20 01:10:34 -0800

    Add tests for an FSSM backend for the file system watcher using the FSSM polling support.

M	Gemfile
M	activesupport/test/file_watcher_test.rb

commit 2a75c19	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-19 23:47:12 -0500

    Tpyo: fixing several cases of the the

M	activerecord/test/cases/autosave_association_test.rb
M	railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js

commit 89b3bc4	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-19 23:46:30 -0500

    Typo: fixing the the

M	activerecord/lib/active_record/validations.rb

commit 511bf2a	refs/heads/master
Author: Diego Carrion 
Date:   2011-02-19 21:13:33 -0200

    refactored ActiveModel::Validations::InclusionValidator#validate_each
    
    [#6455 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activemodel/lib/active_model/validations/inclusion.rb

commit b0da0dd	refs/heads/master
Author: Diego Carrion 
Date:   2011-02-19 21:13:07 -0200

    added Range#count? for Ruby 1.8
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/core_ext/range.rb
A	activesupport/lib/active_support/core_ext/range/cover.rb
M	activesupport/test/core_ext/range_ext_test.rb

commit 6052929	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 18:07:00 -0500

    Edit a few lines for readability.

M	railties/guides/source/active_support_core_extensions.textile

commit fe5c2c2	refs/heads/master
Author: Brandon Tilley 
Date:   2011-02-19 14:49:42 -0800

    Add info about I18n::Backend::Chain to I18n guide

M	railties/guides/source/i18n.textile

commit 7e8b075	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-20 01:18:03 +0530

    session is reset on token mismatch

M	railties/guides/source/security.textile

commit cff0aeb	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 13:04:22 -0500

    Add a forgotten word.

M	activesupport/lib/active_support/core_ext/object/with_options.rb

commit 262dd96	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 12:56:55 -0500

    Improve clarity of example. Make it follow guidelines for output display.

M	activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb

commit b3e5e25	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-19 12:15:51 -0500

    Add a clearer example for with_options (lifted from the Active Support guide).

M	activesupport/lib/active_support/core_ext/object/with_options.rb

commit 8af066b	refs/heads/master
Author: Jimmy Cuadra 
Date:   2011-02-18 22:20:04 -0800

    improve language and examples in Railtie docs

M	railties/lib/rails/railtie.rb

commit 8d96b89	refs/heads/master
Author: Peer Allan 
Date:   2011-02-18 20:51:56 -0600

    Clarification of ActiveRecord ActiveModel validation documentation

M	activemodel/lib/active_model/validations.rb
M	activemodel/lib/active_model/validations/acceptance.rb
M	activemodel/lib/active_model/validations/confirmation.rb
M	activemodel/lib/active_model/validations/format.rb
M	activemodel/lib/active_model/validations/length.rb
M	activemodel/lib/active_model/validations/numericality.rb
M	activemodel/lib/active_model/validations/presence.rb
M	activerecord/lib/active_record/validations.rb
M	activerecord/lib/active_record/validations/associated.rb

commit 289cc15	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-18 17:32:08 -0800

    instance_methods includes public and protected, so reduce funcalls and object allocs

M	activerecord/lib/active_record/attribute_methods.rb

commit 8657826	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-18 15:53:54 -0800

    oops, no need for puts!

M	activerecord/test/cases/attribute_methods/read_test.rb

commit 30679bc	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-18 15:51:39 -0800

    AR::AttributeMethods does not need to be included in an AR::Base class.

M	activerecord/lib/active_record/attribute_methods.rb
A	activerecord/test/cases/attribute_methods/read_test.rb

commit ce76cfc	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-19 00:42:15 +0100

    fixes a merge conflict

M	activerecord/test/cases/autosave_association_test.rb

commit 18439e2	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 19:53:11 -0300

    We really don't care about IM middleware order, the important is that it gets included.

M	railties/test/application/middleware_test.rb

commit f41bf69	refs/heads/master
Merge: fbfa30a 220cb10
Author: Xavier Noria 
Date:   2011-02-18 23:22:15 +0100

    merges docrails

commit 220cb10	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-18 23:13:29 +0100

    removes indent from guides example

M	railties/guides/source/association_basics.textile

commit 7c52da4	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-18 23:03:54 +0100

    Revert "Created a new Troubleshooting section in the migrations guide."
    
    Mismatches between migrations and constants have nothing to do with
    pluralization rules or model names. The mismatch happens between
    the camelization of the filename minus timestamp, and the name of
    the migration class itself.
    
    This reverts commit 1c21f75f1b32ee8723c74a9bc7af70dfa02a509c.

M	railties/guides/source/migrations.textile

commit 2acb5e3	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-18 22:54:02 +0100

    removes unrealistic example (authentication plus gender?), that it is not needed anyway

M	activerecord/lib/active_record/base.rb

commit fbfa30a	refs/heads/master
Author: Frederick Cheung 
Date:   2011-02-18 17:55:29 +0000

    Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453 state:committed]
    
    Signed-off-by: Xavier Noria 

M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit d7b539a	refs/tags/v3.0.5.rc1
Author: Frederick Cheung 
Date:   2011-02-18 17:55:29 +0000

    Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453 state:committed]
    
    Signed-off-by: Xavier Noria 

M	activemodel/lib/active_model/validations/inclusion.rb
M	activemodel/test/cases/validations/inclusion_validation_test.rb

commit ad3e4e3	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-18 14:43:53 -0500

    Clarify Example in ActiveRecord base

M	activerecord/lib/active_record/base.rb

commit 00418ac	refs/heads/master
Merge: 3927827 6975a41
Author: Emilio Tagua 
Date:   2011-02-18 16:22:50 -0300

    Merge remote branch 'rails/master' into identity_map

commit 3927827	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 16:20:15 -0300

    Don't use skip, just don't run anything, we don't have skip in Ruby 1.8

M	activerecord/test/cases/associations/identity_map_test.rb
M	activerecord/test/cases/identity_map_test.rb

commit 3e5efb3	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 16:07:58 -0300

    Remove nbproject form gitignore. This shouldn't be here in the first place.

M	.gitignore

commit d9eb007	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 16:05:24 -0300

    WeakHash is not used, remove it.

D	activesupport/lib/active_support/weak_hash.rb
D	activesupport/test/weak_hash_test.rb

commit 8052623	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 16:04:47 -0300

    No need to have reinit_with inside an InstanceMethods module.

M	activerecord/lib/active_record/identity_map.rb

commit 49f3525	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 15:55:55 -0300

    Initialize @target instead asking if it is defined.

M	activerecord/lib/active_record/associations/association.rb

commit 6975a41	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-18 18:50:17 +0000

    Remove test which was broken on 1.8. This test is now irrelevant since singular associations no longer return a proxy object.

M	activerecord/test/cases/associations_test.rb

commit 2e748fe	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-18 10:47:19 -0800

    just use the list of column names to generate attribute methods

M	activerecord/lib/active_record/attribute_methods.rb

commit eb23b22	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 15:44:23 -0300

    Should use "=" instead "replace" after this commit: 1644663ba7f678d178deab2bf1629dc05626f85b

M	activerecord/test/cases/associations/identity_map_test.rb

commit d21a454	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 15:40:48 -0300

    No need to test agaisnt target.

M	activerecord/test/cases/associations/identity_map_test.rb

commit 3560869	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 15:40:06 -0300

    Reindent and remove wrong line left in merge by mistake.

M	activerecord/lib/active_record/associations/association.rb

commit b8c2feb	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 15:38:17 -0300

    Use to_a instead :load in test, since :load changed.

M	activerecord/test/cases/identity_map_test.rb

commit 15a03ca	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-18 15:38:00 -0300

    No need to test against target anymore.

M	activerecord/test/cases/identity_map_test.rb

commit 0b702ba	refs/heads/master
Merge: 90a850a 1644663
Author: Emilio Tagua 
Date:   2011-02-18 15:29:33 -0300

    Merge remote branch 'rails/master' into identity_map
    
    Conflicts:
    	activerecord/lib/active_record/associations/association.rb
    	activerecord/lib/active_record/fixtures.rb

commit 7d9a80b	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-17 20:49:25 -0500

    Remove awkward phrasing from Ajax on Rails guide

M	railties/guides/source/ajax_on_rails.textile

commit 9a9d895	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-17 20:46:52 -0500

    Fix Typos: remove several occurences of the the

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/relation/batches.rb
M	activerecord/test/cases/autosave_association_test.rb
M	railties/guides/source/action_view_overview.textile

commit a906dea	refs/heads/master
Author: Nicholas Rowe 
Date:   2011-02-17 20:34:22 -0500

    fix type: remove extra period

M	activemodel/lib/active_model/naming.rb

commit 1c21f75	refs/heads/master
Author: Kedar Mhaswade 
Date:   2011-02-17 16:27:01 -0800

    Created a new Troubleshooting section in the migrations guide.
    Added a bullet point there showing how the Uninitialized Constant
    (missing migration class) error looks like.

M	railties/guides/source/migrations.textile

commit 1644663	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-17 23:55:05 +0000

    Split AssociationProxy into an Association class (and subclasses) which manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/association_preload.rb
M	activerecord/lib/active_record/associations.rb
A	activerecord/lib/active_record/associations/association.rb
D	activerecord/lib/active_record/associations/association_collection.rb
D	activerecord/lib/active_record/associations/association_proxy.rb
M	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
A	activerecord/lib/active_record/associations/collection_association.rb
A	activerecord/lib/active_record/associations/collection_proxy.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/has_one_through_association.rb
M	activerecord/lib/active_record/associations/singular_association.rb
M	activerecord/lib/active_record/autosave_association.rb
M	activerecord/lib/active_record/nested_attributes.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/lib/active_record/relation/predicate_builder.rb
D	activerecord/test/cases/associations/association_proxy_test.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/inverse_associations_test.rb
M	activerecord/test/cases/associations/join_model_test.rb
M	activerecord/test/cases/associations_test.rb
M	activerecord/test/cases/autosave_association_test.rb
M	activerecord/test/cases/named_scope_test.rb
M	activerecord/test/cases/nested_attributes_test.rb

commit 1d9f26e	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-15 23:23:29 +0000

    Add :nodoc: to ThroughAssociation and HasOneAssociation

M	activerecord/lib/active_record/associations/has_one_through_association.rb
M	activerecord/lib/active_record/associations/through_association.rb

commit 91fd651	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 23:14:42 +0000

    Allow building and then later saving has_many :through records, such that the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved]

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/person.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/reader.rb

commit f0b9805	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 20:39:51 +0000

    Ensure that association_ids uses the correct attribute where the association is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved]

M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/reflection.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/models/post.rb

commit 23a5be7	refs/heads/master
Author: genlinux 
Date:   2011-02-17 22:40:58 +0530

    commas to set off expressions that interrupt sentence flow

M	activerecord/RUNNING_UNIT_TESTS

commit ff5db18	refs/tags/v3.0.5.rc1
Author: Aaron Patterson 
Date:   2011-02-17 08:52:24 -0800

    updating changelog

M	activerecord/CHANGELOG

commit b131cfb	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-17 00:09:49 -0500

    Remove unused line in test setup.
    
    [#6442 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/test/core_ext/module_test.rb

commit 017012b	refs/heads/master
Author: Brian Durand 
Date:   2011-02-17 10:18:56 -0600

    Add description of transaction callbacks to ActiveRecord callbacks guide.

M	railties/guides/source/active_record_validations_callbacks.textile

commit fead0fc	refs/heads/master
Author: Brian Durand 
Date:   2011-02-17 10:12:28 -0600

    update caching guide with the changes to ActiveSupport::Cache from the 3.0.0 release.

M	railties/guides/source/caching_with_rails.textile

commit 465dd37	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-17 17:19:51 +0530

    fix typo

M	actionmailer/lib/action_mailer/base.rb

commit ed630df	refs/heads/master
Author: Vijay Dev 
Date:   2011-02-17 16:59:03 +0530

    fix typo

M	railties/guides/source/active_support_core_extensions.textile

commit 41c35ab	refs/tags/v3.0.5.rc1
Author: Aaron Patterson 
Date:   2011-02-16 15:22:48 -0800

    explicitly anding queries of the same column

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit 9c023cc	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-16 15:11:48 -0800

    explicitly allowing lolqueries

M	activerecord/lib/active_record/relation/query_methods.rb
M	activerecord/test/cases/relations_test.rb

commit bd7d866	refs/heads/master
Author: Jimmy Cuadra 
Date:   2011-02-16 14:15:48 -0800

    add note about observer config for rails apps
    
    ActiveModel::Observer and ActiveRecord::Observer have similar
    documentation, but a Rails user looking at the ActiveModel version
    might not realize that a change to config/application.rb is
    required to activate the observer. This change adds a note to
    that effect, pointing to the AR version from the AM version.

M	activemodel/lib/active_model/observing.rb

commit ceb2f0f	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-16 11:46:55 -0800

    use the arel table rather than generating strings

M	activerecord/lib/active_record/relation/predicate_builder.rb

commit 1dea7b5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-16 11:22:30 -0800

    no need for Array.wrap

M	activerecord/lib/active_record/relation/predicate_builder.rb

commit 2e2e58a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-16 11:08:01 -0800

    fixing whitespace problems

M	activerecord/test/cases/relations_test.rb

commit 9b188c5	refs/heads/master
Author: Steven Fenigstein 
Date:   2011-02-11 00:39:58 -0800

    removed an unnecessary second query when passing an ActiveRecord::Relation to a where clause.  And added ability to use subselects in where clauses.

M	activerecord/lib/active_record/relation/predicate_builder.rb
M	activerecord/test/cases/relations_test.rb

commit 149c3d6	refs/tags/v3.0.5.rc1
Author: Timothy N. Tsvetkov 
Date:   2011-02-08 04:26:42 +0300

    Fixed issue #6363, avoid to pluralized already pluralized names and singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case
    
    [#6363 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/named_base.rb
M	railties/test/generators/named_base_test.rb

commit e925acb	refs/tags/v3.0.5.rc1
Author: Dan Pickett 
Date:   2011-02-07 21:39:46 -0500

    handle double pluralization for irregular plurals
    
    [#6363]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/inflections.rb
M	activesupport/test/inflector_test.rb
M	activesupport/test/inflector_test_cases.rb

commit c6fac7b	refs/heads/master
Author: Timothy N. Tsvetkov 
Date:   2011-02-08 04:26:42 +0300

    Fixed issue #6363, avoid to pluralized already pluralized names and singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case
    
    [#6363 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/named_base.rb
M	railties/test/generators/named_base_test.rb

commit 1754bd9	refs/heads/master
Author: Dan Pickett 
Date:   2011-02-07 21:39:46 -0500

    handle double pluralization for irregular plurals
    
    [#6363]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/inflections.rb
M	activesupport/test/inflector_test.rb
M	activesupport/test/inflector_test_cases.rb

commit 2eed928	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-15 21:32:27 -0500

    Remove unused code.
    
    [#6437 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/test/core_ext/module_test.rb

commit 8276a24	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-15 15:52:27 -0800

    fixture methods can be overridden and super() is useful

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 8c4c07e	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-15 15:35:10 -0800

    fixing variable names to reflect reality

M	activerecord/lib/active_record/fixtures.rb

commit 13e72db	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-15 15:05:00 -0800

    this is in the AR namespace, so AR must exist

M	activerecord/lib/active_record/fixtures.rb

commit 0cee303	refs/tags/v3.0.5.rc1
Author: Joel Nimety 
Date:   2011-02-15 14:21:33 -0500

    GcTime incorrectly checks GC.respond_to?(:total_time), it should check GC::Profiler.respond_to?(:total_time)
    
    [#6435 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/testing/performance.rb

commit ef57334	refs/heads/master
Author: Joel Nimety 
Date:   2011-02-15 14:21:33 -0500

    GcTime incorrectly checks GC.respond_to?(:total_time), it should check GC::Profiler.respond_to?(:total_time)
    
    [#6435 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activesupport/lib/active_support/testing/performance.rb

commit 5444ed5	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-15 22:17:25 +0100

    Revert "Fix error: docrails is a fork, not a branch."
    
    Reason: Calling docrails a "branch" is fine, no need to change the terminology. It is a remote in my machine, and it has been called branch since the very beginning: http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch
    
    This reverts commit 35a266edfd9ac0f3afe7f7f13c2dcf29cb4b651f.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 09ccdc3	refs/heads/master
Author: Timothy N. Tsvetkov 
Date:   2011-02-12 21:41:03 +0300

    Optimization for postgres adapter for add_column method. Set default and not null in one query

M	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

commit f832185	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-15 10:48:01 -0800

    fixing variable names, removing FixtureFile instances from test ivars

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit f0b1173	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-15 10:07:19 -0800

    removing unused variable

M	activerecord/lib/active_record/fixtures.rb

commit f4ddb4d	refs/heads/master
Author: Steve Schwartz 
Date:   2011-02-10 17:28:53 -0500

    Added RDoc info for accepted options for simple_format in TextHelper.

M	actionpack/lib/action_view/helpers/text_helper.rb

commit 35a266e	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-15 11:51:07 -0500

    Fix error: docrails is a fork, not a branch.

M	railties/guides/source/contributing_to_ruby_on_rails.textile

commit 90a850a	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-15 12:43:15 -0300

    Fix expected queries in relation tests.

M	activerecord/test/cases/relations_test.rb

commit c13b7c4	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-15 12:41:57 -0300

    Don't shadow outer local variable.

M	activerecord/lib/active_record/associations/class_methods/join_dependency.rb

commit f1778eb	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-15 12:40:41 -0300

    Run tests without IdentityMap when IM=false is given.

M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_one_through_associations_test.rb
M	activerecord/test/cases/associations/identity_map_test.rb
M	activerecord/test/cases/helper.rb
M	activerecord/test/cases/identity_map_test.rb
M	activerecord/test/cases/relations_test.rb

commit ca75091	refs/heads/master
Author: Emilio Tagua 
Date:   2011-02-15 12:06:44 -0300

    Remove identity map from benchmark script.

M	activerecord/examples/performance.rb

commit 8ee0b44	refs/heads/master
Merge: 348c0ec c9f1ab5
Author: Emilio Tagua 
Date:   2011-02-15 12:01:04 -0300

    Merge remote branch 'rails/master' into identity_map
    
    Conflicts:
    	activerecord/examples/performance.rb
    	activerecord/lib/active_record/association_preload.rb
    	activerecord/lib/active_record/associations.rb
    	activerecord/lib/active_record/associations/association_proxy.rb
    	activerecord/lib/active_record/autosave_association.rb
    	activerecord/lib/active_record/base.rb
    	activerecord/lib/active_record/nested_attributes.rb
    	activerecord/test/cases/relations_test.rb

commit 1bedee5	refs/heads/master
Author: Ken Mazaika 
Date:   2011-02-13 19:32:27 -0500

    ActiveResource validation tests did not test ActiveModel validations. Adjust the test to be done the Rails3 way.
    
    Signed-off-by: Santiago Pastorino 

M	activeresource/test/cases/validations_test.rb
M	activeresource/test/fixtures/project.rb

commit e08873f	refs/tags/v3.0.5.rc1
Author: Sergii Boiko 
Date:   2011-02-15 15:54:50 +0200

    fixed broken link to postgresql docs
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/locking/pessimistic.rb

commit 4713271	refs/heads/master
Author: Sergii Boiko 
Date:   2011-02-15 15:54:50 +0200

    fixed broken link to postgresql docs
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/locking/pessimistic.rb

commit 25e3d2c	refs/heads/master
Author: Ben Orenstein 
Date:   2011-02-14 20:41:32 -0500

    Correct bad wording in description.

M	activesupport/lib/active_support/core_ext/string/inflections.rb

commit c9f1ab5	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 17:10:14 -0800

    bad tests are bad

M	activerecord/test/cases/adapters/mysql2/reserved_word_test.rb

commit 02fc45a	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 16:48:18 -0800

    remove accidental raise!

M	activerecord/lib/active_record/fixtures.rb

commit e4dac47	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 16:01:47 -0800

    removing irrelevant test

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/adapters/mysql/reserved_word_test.rb

commit fab9c2e	refs/heads/master
Merge: 0123ceb f9ea477
Author: Aaron Patterson 
Date:   2011-02-14 14:55:25 -0800

    Merge branch 'fixtures'
    
    * fixtures:
      remove unused methods
      extract database activity out of Fixtures instances
      extract rows that should be inserted to a method
      fixtures will return a list of tables that may be effected, delete existing fixtures will delete those tables

commit f9ea477	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 14:55:01 -0800

    remove unused methods

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit fd81c70	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 14:53:42 -0800

    extract database activity out of Fixtures instances

M	activerecord/lib/active_record/fixtures.rb

commit ca05016	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 12:01:22 -0800

    extract rows that should be inserted to a method

M	activerecord/lib/active_record/fixtures.rb

commit 2b8fad6	refs/tags/v3.0.5.rc1
Merge: abea073 756e70c
Author: Aaron Patterson 
Date:   2011-02-14 11:52:32 -0800

    Merge remote branch 'jonleighton/deprecate_string_interpolation-3-0-stable' into 3-0-stable
    
    * jonleighton/deprecate_string_interpolation-3-0-stable:
      Deprecated support for interpolated association conditions with the :conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.

commit 0123ceb	refs/heads/master
Merge: 6f4e3ff b9ea751
Author: Aaron Patterson 
Date:   2011-02-14 11:51:56 -0800

    Merge remote branch 'jonleighton/association_fixes'
    
    * jonleighton/association_fixes:
      Add a transaction wrapper in add_to_target. This means that #build will now also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create.
      Inline ensure_owner_is_persisted! as it is only called from one place
      @target should always be an array
      Rename add_record_to_target_with_callbacks to add_to_target
      Don't pass the block through build_record
      Move create and create! next to build
      Get rid of create_record as it is not only used in one place
      Get rid of AssociationCollection#save_record
      Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db
      Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings

commit 2487aab	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 11:25:19 -0800

    fixtures will return a list of tables that may be effected, delete existing fixtures will delete those tables

M	activerecord/lib/active_record/fixtures.rb
M	activerecord/test/cases/fixtures_test.rb

commit 6f4e3ff	refs/heads/master
Author: Aaron Patterson 
Date:   2011-02-14 10:04:53 -0800

    HabtmFixtures class is no longer needed

M	activerecord/lib/active_record/fixtures.rb

commit abea073	refs/tags/v3.0.5.rc1
Author: Andrew White 
Date:   2011-02-14 06:16:37 +0000

    Add test to prevent regression on namespace root nested in a resource
    
    [#6389 state:resolved]

M	actionpack/test/dispatch/routing_test.rb

commit ccc678b	refs/heads/master
Author: Andrew White 
Date:   2011-02-14 06:12:22 +0000

    Add test to prevent regression on namespace root nested in a resource
    
    [#6389 state:resolved]

M	actionpack/test/dispatch/routing_test.rb

commit 64ca278	refs/tags/v3.0.5.rc1
Author: Andrew White 
Date:   2011-02-14 03:03:24 +0000

    Fix named route helper for routes nested inside deeply nested resources
    
    [#6416 state:resolved]

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit 460a341	refs/heads/master
Author: Andrew White 
Date:   2011-02-14 02:56:09 +0000

    Fix named route helper for routes nested inside deeply nested resources
    
    [#6416 state:resolved]

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/test/dispatch/routing_test.rb

commit b9ea751	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 01:40:00 +0000

    Add a transaction wrapper in add_to_target. This means that #build will now also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create.

M	activerecord/lib/active_record/associations/association_collection.rb

commit 5d6d669	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 01:19:42 +0000

    Inline ensure_owner_is_persisted! as it is only called from one place

M	activerecord/lib/active_record/associations/association_collection.rb

commit c9b685e	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 01:07:48 +0000

    @target should always be an array

M	activerecord/lib/active_record/associations/association_collection.rb

commit db03308	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 01:02:42 +0000

    Rename add_record_to_target_with_callbacks to add_to_target

M	activerecord/lib/active_record/associations/association_collection.rb
M	activerecord/lib/active_record/nested_attributes.rb

commit 641a306	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 00:58:34 +0000

    Don't pass the block through build_record

M	activerecord/lib/active_record/associations/association_collection.rb

commit 686418c	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 00:44:10 +0000

    Move create and create! next to build

M	activerecord/lib/active_record/associations/association_collection.rb

commit b93d218	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 00:34:54 +0000

    Get rid of create_record as it is not only used in one place

M	activerecord/lib/active_record/associations/association_collection.rb

commit 7ce7ae0	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-14 00:14:16 +0000

    Get rid of AssociationCollection#save_record

M	activerecord/lib/active_record/associations/association_collection.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/autosave_association.rb

commit eab5fb4	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-11 22:32:21 +0000

    Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db

M	activerecord/test/cases/connection_pool_test.rb

commit a7e19b3	refs/heads/master
Author: Jon Leighton 
Date:   2011-02-11 22:22:19 +0000

    Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/association_preload.rb
M	activerecord/lib/active_record/associations/association_collection.rb
M	activerecord/lib/active_record/associations/association_proxy.rb
M	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/project.rb
M	activerecord/test/models/tagging.rb

commit fd76058	refs/heads/master
Author: Andrew White 
Date:   2011-02-14 00:40:53 +0000

    Add notes on how to override the default :id constraint [#5994 state:resolved]

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	railties/guides/source/routing.textile

commit b4205b4	refs/tags/v3.0.5.rc1
Author: Andrew White 
Date:   2011-02-14 00:58:58 +0000

    Add notes on how to override the default :id constraint [#5994 state:resolved]

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	railties/guides/source/routing.textile

commit a1cc07c	refs/heads/master
Author: Dan Neumann 
Date:   2011-02-13 18:14:05 -0600

    Added --sandbox option to rails console explanation.

M	railties/guides/source/getting_started.textile

commit c6ab3d1	refs/tags/v3.0.5.rc1
Author: Andrew White 
Date:   2011-02-14 00:09:59 +0000

    Remove incorrect assert_recognizes example

M	railties/guides/source/routing.textile

commit 48fe62e	refs/heads/master
Author: Andrew White 
Date:   2011-02-14 00:09:05 +0000

    Remove incorrect assert_recognizes example

M	railties/guides/source/routing.textile

commit f7a31ce	refs/heads/master
Author: Dan Neumann 
Date:   2011-02-13 17:50:39 -0600

    Added simple demonstration of has_many :through

M	railties/guides/source/association_basics.textile

commit af4fab7	refs/heads/master
Author: Andrew White 
Date:   2011-02-13 23:25:57 +0000

    Remove incorrect assert_recognizes example

M	actionpack/lib/action_dispatch/testing/assertions/routing.rb

commit 385be35	refs/heads/master
Author: Andrew White 
Date:   2011-02-13 23:24:46 +0000

    Fix assert_recognizes with block constraints [#5805 state:resolved]

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
A	actionpack/test/dispatch/routing_assertions_test.rb

commit cb9745b	refs/tags/v3.0.5.rc1
Author: Andrew White 
Date:   2011-02-13 23:11:01 +0000

    Remove incorrect assert_recognizes example

M	actionpack/lib/action_dispatch/testing/assertions/routing.rb

commit e9ae88a	refs/tags/v3.0.5.rc1
Author: Andrew White 
Date:   2011-02-13 23:09:20 +0000

    Fix assert_recognizes with block constraints [#5805 state:resolved]

M	actionpack/lib/action_dispatch/routing/mapper.rb
M	actionpack/lib/action_dispatch/routing/route_set.rb
M	actionpack/lib/action_dispatch/testing/assertions/routing.rb
A	actionpack/test/dispatch/routing_assertions_test.rb

commit 756e70c	refs/tags/v3.0.5.rc1
Author: Jon Leighton 
Date:   2011-02-13 22:38:48 +0000

    Deprecated support for interpolated association conditions with the :conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.

M	activerecord/CHANGELOG
M	activerecord/lib/active_record/association_preload.rb
M	activerecord/lib/active_record/associations.rb
M	activerecord/lib/active_record/associations/association_collection.rb
M	activerecord/lib/active_record/associations/association_proxy.rb
M	activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
M	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M	activerecord/lib/active_record/associations/has_many_association.rb
M	activerecord/lib/active_record/associations/has_many_through_association.rb
M	activerecord/lib/active_record/associations/through_association_scope.rb
M	activerecord/lib/active_record/base.rb
M	activerecord/test/cases/associations/belongs_to_associations_test.rb
M	activerecord/test/cases/associations/eager_test.rb
M	activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_associations_test.rb
M	activerecord/test/cases/associations/has_many_through_associations_test.rb
M	activerecord/test/cases/associations/has_one_associations_test.rb
M	activerecord/test/cases/base_test.rb
M	activerecord/test/cases/reflection_test.rb
M	activerecord/test/models/company.rb
M	activerecord/test/models/post.rb
M	activerecord/test/models/project.rb
M	activerecord/test/models/tagging.rb

commit 0617d3e	refs/heads/master
Author: Mike Gehard 
Date:   2011-02-13 14:21:17 -0700

    change plugins guide to favor gem based plugins, clean up to reflect the state of Rails3 plugins, remove information not compatible with Rails3.

M	railties/guides/source/plugins.textile

commit 9143032	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-02-13 02:38:31 -0200

    Add missing require

M	activerecord/test/cases/associations/inner_join_association_test.rb

commit 944d314	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-02-13 02:10:13 -0200

    Add Date#rfc3339 and Date#iso8601 to AS

M	actionpack/lib/action_view/helpers/date_helper.rb
M	activesupport/lib/active_support/core_ext/date/conversions.rb
M	activesupport/test/core_ext/date_ext_test.rb

commit fbd917f	refs/heads/master
Author: Ernie Miller 
Date:   2011-02-10 14:03:25 -0500

    Remove Relation#& alias for Relation#merge

M	activerecord/lib/active_record/associations/association_proxy.rb
M	activerecord/lib/active_record/associations/through_association.rb
M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/relation_scoping_test.rb
M	activerecord/test/cases/relations_test.rb

commit 66003f5	refs/tags/v3.0.5.rc1
Author: Ernie Miller 
Date:   2011-02-10 14:32:24 -0500

    Deprecate Relation#& alias for Relation#merge

M	activerecord/lib/active_record/relation/spawn_methods.rb
M	activerecord/test/cases/method_scoping_test.rb
M	activerecord/test/cases/relations_test.rb

commit 7eb554b	refs/heads/master
Author: Brian Lopez 
Date:   2011-02-12 16:54:27 -0800

    switch over to Mysql2::Client#ping for the mysql2 connection check

M	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

commit 22d1fee	refs/tags/v3.0.5.rc1
Author: Santiago Pastorino 
Date:   2011-02-12 22:44:12 -0200

    Make gem "ruby-debug19" require ruby-debug

M	Gemfile

commit 0e9c7a2	refs/heads/master
Author: Santiago Pastorino 
Date:   2011-02-12 22:44:12 -0200

    Make gem "ruby-debug19" require ruby-debug

M	Gemfile

commit 69f07da	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-13 01:40:32 +0100

    the shell prompt for non-root sessions is "$" by convention

M	railties/guides/source/getting_started.textile

commit 9c6f9c9	refs/tags/v3.0.5.rc1
Author: Wojciech Wnętrzak 
Date:   2011-02-12 13:31:14 +0100

    added proper require for ruby-debug19 gem to generated Gemfile
    
    [#6419 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit 22e14ea	refs/heads/master
Author: Wojciech Wnętrzak 
Date:   2011-02-12 13:31:14 +0100

    added proper require for ruby-debug19 gem to generated Gemfile
    
    [#6419 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	railties/lib/rails/generators/rails/app/templates/Gemfile

commit bc6554f	refs/heads/master
Author: Xavier Noria 
Date:   2011-02-13 01:37:37 +0100

    Revert "Add note about running `bundle install` as root. Solves issue with '#' not being rendered, and it's more clear for beginners."
    
    Reason: Running bundle as root is not recommended.
    
    This reverts commit 0d40e2c397c9ce92c839a3c318ed8757cf213413.

M	railties/guides/source/getting_started.textile

commit 33cc366	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-02-13 01:13:03 +0100

    Allow for the format of time_tag in AP to be changed via an option argument.
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit 95a5bd8	refs/heads/master
Author: Sjoerd Andringa 
Date:   2011-02-13 00:56:04 +0100

    Added time_tag helper to AP for HTML5 time tag [#5919 state:resolved]
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/helpers/date_helper.rb
M	actionpack/lib/action_view/helpers/tag_helper.rb
M	actionpack/test/template/date_helper_test.rb

commit d72add9	refs/heads/master
Author: Ernie Miller 
Date:   2011-02-12 13:59:53 -0500

    Fix table name collision due to incorrect alias count on certain joins.
    
    [#6423 state:committed]
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
M	activerecord/test/cases/associations/inner_join_association_test.rb

commit e2b99eb	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-02-13 05:39:27 +0800

    Applied changes to stylesheet_link_tag from javascript_include_tag which corrects issues with ordering and duplicates.

M	actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 1363bb8	refs/heads/master
Author: Josh Kalderimis 
Date:   2011-02-13 05:00:30 +0800

    This corrects two issues with javascript_include_tag, the order at which they are expanded, and removing duplicates.
    
    When individual js assets are specified, they will override the order of the same asset specified in an expansion.
    
    [#5938 state:resolved]

M	actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
M	actionpack/test/template/asset_tag_helper_test.rb

commit 4145810	refs/tags/v3.0.5.rc1
Author: Santiago Pastorino 
Date:   2011-02-08 18:02:16 -0200

    Backport fix from master: fields_for with inline blocks and nested attributes already persisted does not render properly
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/lib/action_view/helpers/form_helper.rb

commit 640b1f0	refs/tags/v3.0.5.rc1
Author: Carlos Antonio da Silva 
Date:   2011-02-08 01:00:59 -0200

    Add tests showing the LH issue #6381: fields_for with inline blocks and nested attributes already persisted
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/test/template/form_helper_test.rb

commit ad5b4d9	refs/heads/master
Author: Carlos Antonio da Silva 
Date:   2011-02-12 14:45:58 -0200

    Remove duplicated action pack tests added to fix issue with fields_for, nested attributes and erb
    
    Signed-off-by: Santiago Pastorino 

M	actionpack/test/template/form_helper_test.rb

commit 0d40e2c	refs/heads/master
Author: Corey Ward 
Date:   2011-02-12 08:12:24 -0800

    Add note about running `bundle install` as root. Solves issue with '#' not being rendered, and it's more clear for beginners.

M	railties/guides/source/getting_started.textile

commit cb045c0	refs/tags/v3.0.5.rc1
Author: Akira Matsuda 
Date:   2011-02-07 19:51:52 +0900

    do not to_s where you are testing that a string value is stored for the before_type_cast
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/test/cases/attribute_methods_test.rb

commit 6e04f58	refs/tags/v3.0.5.rc1
Author: Akira Matsuda 
Date:   2011-02-07 08:29:06 +0900

    avoid nil.dup
    
    Signed-off-by: Santiago Pastorino 

M	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
M	activerecord/test/cases/attribute_methods_test.rb

commit 829de9d	refs/heads/master
Author: Tom Stuart 
Date:   2011-02-12 12:07:47 +0000

    Add block support to button_tag helper
    
    As per the HTML 4.01 spec:
    
      Buttons created with the BUTTON element function just like buttons
      created with the INPUT element, but they offer richer rendering
      possibilities: the BUTTON element may have content. For example, a
      BUTTON element that contains an image functions like and may resemble
      an INPUT element whose type is set to "image", but the BUTTON element
      type allows content.
    
    Since rich content is the main purpose of the